diff options
Diffstat (limited to 'tests/junit/plugins')
241 files changed, 6087 insertions, 5718 deletions
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingScenariosMemoryLeakTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingScenariosMemoryLeakTest.java index 01efb159900..651e20ec554 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingScenariosMemoryLeakTest.java +++ b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingScenariosMemoryLeakTest.java @@ -71,7 +71,7 @@ public class EditingScenariosMemoryLeakTest extends AbstractPapyrusTest { public void testCreateNewElement() { memory.add(editor.getModel()); - CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_2008, fixture.getDiagramEditPart().getDiagramPreferencesHint()); + CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_Shape, fixture.getDiagramEditPart().getDiagramPreferencesHint()); Command command = fixture.getDiagramEditPart().getCommand(requestcreation); fixture.execute(command); } @@ -154,7 +154,7 @@ public class EditingScenariosMemoryLeakTest extends AbstractPapyrusTest { // org.eclipse.emf.common.command.Command getCreateClassInTableCommand() { - CreateElementRequest request = new CreateElementRequest(fixture.getEditingDomain(), editor.getModel(), UMLElementTypes.Class_2008); + CreateElementRequest request = new CreateElementRequest(fixture.getEditingDomain(), editor.getModel(), UMLElementTypes.Class_Shape); IElementEditService edit = ElementEditServiceUtils.getCommandProvider(editor.getModel()); org.eclipse.emf.common.command.Command create = GMFtoEMFCommandWrapper.wrap(edit.getEditCommand(request)); return TableMenuUtils.buildNattableCreationCommand(create, request); diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests.launch index ccbc3f8e016..edd0e7d5934 100644 --- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests.launch +++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests.launch @@ -26,7 +26,7 @@ <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/> diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.assistants b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.assistants index 6773b06aee8..2cae91ac591 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.assistants +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.assistants @@ -264,10 +264,10 @@ <elementTypeID>org.eclipse.papyrus.example.j2ee.Browser</elementTypeID> <elementTypeID>org.eclipse.papyrus.example.j2ee.BranchPoint</elementTypeID> <elementTypeID>org.eclipse.papyrus.example.j2ee.WebScenario</elementTypeID> - <excludedElementTypeID>org.eclipse.papyrus.uml.diagram.clazz.Association_4019</excludedElementTypeID> - <excludedElementTypeID>org.eclipse.papyrus.uml.diagram.clazz.Association_2015</excludedElementTypeID> - <excludedElementTypeID>org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018</excludedElementTypeID> - <excludedElementTypeID>org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014</excludedElementTypeID> + <excludedElementTypeID>org.eclipse.papyrus.umldi.Association_BranchEdge</excludedElementTypeID> + <excludedElementTypeID>org.eclipse.papyrus.umldi.Association_Shape</excludedElementTypeID> + <excludedElementTypeID>org.eclipse.papyrus.umldi.Dependency_BranchEdge</excludedElementTypeID> + <excludedElementTypeID>org.eclipse.papyrus.umldi.Dependency_Shape</excludedElementTypeID> <relationshipTypeID>org.eclipse.papyrus.example.j2ee.Import</relationshipTypeID> <relationshipTypeID>org.eclipse.papyrus.example.j2ee.Web</relationshipTypeID> </assistant:ModelingAssistantProvider> diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.assistants b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.assistants index a605fb70a24..af417699996 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.assistants +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.assistants @@ -1,31 +1,31 @@ <?xml version="1.0" encoding="ASCII"?> <assistant:ModelingAssistantProvider xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:assistant="http://www.eclipse.org/Papyrus/2014/diagram/assistant" xmlns:filters="http://www.eclipse.org/Papyrus/2014/common/filters" xmlns:umlfilters="http://www.eclipse.org/Papyrus/2014/uml/filters" name="j2ee"> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Extension Point" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Extension Point" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3009"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Component" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Component_3016"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Actor_3018"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3010"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Actor_3011"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Component" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Component_3013"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Package_3014"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Actor_2012"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Classifier" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Package_2016"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Constraint_2017"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Default Named Element" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.DefaultNamedElement_2022"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint Constrained Element" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.ConstraintConstrainedElement_4012"/> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Package_1000"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Extension Point" elementTypeID="org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Extension Point" elementTypeID="org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.umldi.UseCase_Shape_CCN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Component" elementTypeID="org.eclipse.papyrus.umldi.Component_Shape_CCN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.umldi.Constraint_Shape_CCN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.umldi.Actor_Shape_CCN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.umldi.Constraint_Shape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.umldi.Actor_Shape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.umldi.UseCase_Shape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Component" elementTypeID="org.eclipse.papyrus.umldi.Component_Shape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.umldi.Package_Shape_CN"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.umldi.Actor_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Actor" elementTypeID="org.eclipse.papyrus.umldi.Actor_ClassifierShape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.umldi.UseCase_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Use Case" elementTypeID="org.eclipse.papyrus.umldi.UseCase_ClassifierShape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Classifier" elementTypeID="org.eclipse.papyrus.umldi.Classifier_SubjectShape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.umldi.Package_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint" elementTypeID="org.eclipse.papyrus.umldi.Constraint_Shape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Default Named Element" elementTypeID="org.eclipse.papyrus.umldi.NamedElement_DefaultShape"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Constraint Constrained Element" elementTypeID="org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Package" elementTypeID="org.eclipse.papyrus.umldi.Package_UseCaseDiagram"/> <ownedFilter xsi:type="filters:CompoundFilter" name="pertains to Profile j2ee" filter="//@ownedFilter.21/@ownedFilter.0 //@ownedFilter.21/@ownedFilter.1" operator="or"> <ownedFilter xsi:type="umlfilters:ProfileApplied" name="j2ee is applied in context" profileQualifiedName="j2ee" profileURI="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/> <ownedFilter xsi:type="assistant:AssistedElementTypeFilter"/> </ownedFilter> - <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Association" elementTypeID="org.eclipse.papyrus.uml.diagram.usecase.Association_4011"/> + <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Association" elementTypeID="org.eclipse.papyrus.umldi.Association_Edge"/> <popupAssistant elementTypeID="org.eclipse.papyrus.example.j2ee.User_3018" filter="//@popupAssistant.0/@ownedFilter"> <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.21 //@popupAssistant.0/@ownedFilter/@ownedFilter.0"> <ownedFilter xsi:type="filters:CompoundFilter" filter="//@ownedFilter.3 //@ownedFilter.9 //@ownedFilter.10 //@ownedFilter.16 //@ownedFilter.20" operator="or"/> diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations index 2ef8577d458..9cdeee385d5 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations @@ -1,182 +1,183 @@ -<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" metamodelNsURI="j2ee" name="j2ee" xmi:id="_PDKksJgTEeSXtOdwR_uKBQ" xmi:version="2.0">
- <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.example.j2ee.Import_4013" name="Import" xmi:id="_PDKksZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_PDKkspgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKks5gTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.example.j2ee.Web_4011" name="Web" xmi:id="_PDKktJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_PDKktZgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Association_4011</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKktpgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.example.j2ee.User_3018" name="User (3018)" xmi:id="_PDKkt5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkuJgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3018</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkuZgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.example.j2ee.User_3011" name="User (3011)" xmi:id="_PDKkupgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKku5gTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3011</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkvJgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.example.j2ee.User_2011" name="User (2011)" xmi:id="_PDKkvZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkvpgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2011</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkv5gTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.example.j2ee.User_2012" name="User (2012)" xmi:id="_PDKkwJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkwZgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2012</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkwpgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.example.j2ee.Browser_3018" name="Browser (3018)" xmi:id="_PDKkw5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkxJgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3018</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkxZgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.example.j2ee.Browser_3011" name="Browser (3011)" xmi:id="_PDKkxpgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkx5gTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3011</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkyJgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.example.j2ee.Browser_2011" name="Browser (2011)" xmi:id="_PDKkyZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkypgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2011</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKky5gTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.example.j2ee.Browser_2012" name="Browser (2012)" xmi:id="_PDKkzJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkzZgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2012</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkzpgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" name="BranchPoint (3007)" xmi:id="_PDKkz5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_PDKk0JgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKk0ZgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" name="BranchPoint (3008)" xmi:id="_PDKk0pgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_PDKk05gTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKk1JgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3012" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_3012" name="WebScenario (3012)" xmi:id="_PDKk1ZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk1pgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKk15gTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2013" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2013" name="WebScenario (2013)" xmi:id="_PDKk2JgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk2ZgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKk2pgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2014" name="WebScenario (2014)" xmi:id="_PDKk25gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk3JgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKk3ZgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.import_4013" target="_PDKksZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk3pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Import" updateName="true" xmi:id="_PDKk35gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.web_4011" target="_PDKktJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk4JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Web" updateName="true" xmi:id="_PDKk4ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_3018" target="_PDKkt5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk4pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk45gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_3011" target="_PDKkupgTEeSXtOdwR_uKBQ" xmi:id="_PDKk5JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk5ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_2011" target="_PDKkvZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk5pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk55gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_2012" target="_PDKkwJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk6JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk6ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_3018" target="_PDKkw5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk6pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk65gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_3011" target="_PDKkxpgTEeSXtOdwR_uKBQ" xmi:id="_PDKk7JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk7ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_2011" target="_PDKkyZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk7pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk75gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_2012" target="_PDKkzJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk8JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk8ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3007" target="_PDKkz5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk8pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_PDKk85gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3008" target="_PDKk0pgTEeSXtOdwR_uKBQ" xmi:id="_PDKk9JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_PDKk9ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_3012" target="_PDKk1ZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk9pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk95gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_2013" target="_PDKk2JgTEeSXtOdwR_uKBQ" xmi:id="_PDKk-JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk-ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_2014" target="_PDKk25gTEeSXtOdwR_uKBQ" xmi:id="_PDKk-pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk-5gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file +<?xml version="1.0" encoding="ASCII"?> +<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmi:id="_PDKksJgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" name="j2ee" metamodelNsURI="j2ee"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKksZgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.Import_4013" name="Import" hint="4013"> + <iconEntry xmi:id="_PDKkspgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.Dependency_Edge</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKks5gTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKktJgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.Web_4011" name="Web" hint="4011"> + <iconEntry xmi:id="_PDKktZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.Association_Edge</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKktpgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkt5gTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.User_3018" name="User (3018)" hint="3018"> + <iconEntry xmi:id="_PDKkuJgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.Actor_Shape_CCN</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkuZgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkupgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.User_3011" name="User (3011)" hint="3011"> + <iconEntry xmi:id="_PDKku5gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.Actor_Shape_CN</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkvJgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkvZgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.User_2011" name="User (2011)" hint="2011"> + <iconEntry xmi:id="_PDKkvpgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.Actor_Shape</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkv5gTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkwJgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.User_2012" name="User (2012)" hint="2012"> + <iconEntry xmi:id="_PDKkwZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.Actor_ClassifierShape</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkwpgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkw5gTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.Browser_3018" name="Browser (3018)" hint="3018"> + <iconEntry xmi:id="_PDKkxJgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.Actor_Shape_CCN</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkxZgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkxpgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.Browser_3011" name="Browser (3011)" hint="3011"> + <iconEntry xmi:id="_PDKkx5gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.Actor_Shape_CN</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkyJgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkyZgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.Browser_2011" name="Browser (2011)" hint="2011"> + <iconEntry xmi:id="_PDKkypgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.Actor_Shape</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKky5gTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkzJgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.Browser_2012" name="Browser (2012)" hint="2012"> + <iconEntry xmi:id="_PDKkzZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.Actor_ClassifierShape</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKkzpgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKkz5gTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" name="BranchPoint (3007)" hint="3007"> + <iconEntry xmi:id="_PDKk0JgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk0ZgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKk0pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" name="BranchPoint (3008)" hint="3008"> + <iconEntry xmi:id="_PDKk05gTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk1JgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKk1ZgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_3012" name="WebScenario (3012)" hint="3012"> + <iconEntry xmi:id="_PDKk1pgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.UseCase_Shape_CN</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk15gTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKk2JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2013" name="WebScenario (2013)" hint="2013"> + <iconEntry xmi:id="_PDKk2ZgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.UseCase_Shape</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk2pgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_PDKk25gTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2014" name="WebScenario (2014)" hint="2014"> + <iconEntry xmi:id="_PDKk3JgTEeSXtOdwR_uKBQ" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/> + <specializedTypesID>org.eclipse.papyrus.umldi.UseCase_ClassifierShape</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_PDKk3ZgTEeSXtOdwR_uKBQ"> + <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames> + </matcherConfiguration> + </elementTypeConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk3pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.import_4013" target="_PDKksZgTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk35gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Import" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk4JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.web_4011" target="_PDKktJgTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk4ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Web" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk4pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_3018" target="_PDKkt5gTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk45gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk5JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_3011" target="_PDKkupgTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk5ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk5pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_2011" target="_PDKkvZgTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk55gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk6JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.user_2012" target="_PDKkwJgTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk6ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::User" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk6pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_3018" target="_PDKkw5gTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk65gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk7JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_3011" target="_PDKkxpgTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk7ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk7pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_2011" target="_PDKkyZgTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk75gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk8JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.browser_2012" target="_PDKkzJgTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk8ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::Browser" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk8pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3007" target="_PDKkz5gTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk85gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk9JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3008" target="_PDKk0pgTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk9ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::BranchPoint" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk9pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_3012" target="_PDKk1ZgTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk95gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk-JgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_2013" target="_PDKk2JgTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk-ZgTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_PDKk-pgTEeSXtOdwR_uKBQ" identifier="org.eclipse.papyrus.example.j2ee.webScenario_2014" target="_PDKk25gTEeSXtOdwR_uKBQ"> + <stereotypesToApply xmi:id="_PDKk-5gTEeSXtOdwR_uKBQ" stereotypeQualifiedName="j2ee::WebScenario" updateName="true"> + <requiredProfiles>j2ee</requiredProfiles> + </stereotypesToApply> + </adviceBindingsConfigurations> +</elementtypesconfigurations:ElementTypeSetConfiguration> diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/GenericModelingAssistantIntegrationTest.java b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/GenericModelingAssistantIntegrationTest.java index 84f1969c31f..80b680d83c5 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/GenericModelingAssistantIntegrationTest.java +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/GenericModelingAssistantIntegrationTest.java @@ -49,7 +49,7 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss List<IElementType> types = getTypesForPopupBar(usecase); assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.BranchPoint")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.BranchPoint"), hasID("org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.BranchPoint"), hasID("org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel"))))); } @Test @@ -59,9 +59,9 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss // Both visual presentations of a use case (as ellipse and as classifier) for the WebScenario stereotype assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.WebScenario")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.umldi.UseCase_Shape"))))); assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.WebScenario")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.umldi.UseCase_ClassifierShape"))))); } @Test @@ -70,9 +70,9 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss List<IElementType> types = getRelTypesOnSource(usecase); assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.Web")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Web"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Association_4011"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Web"), hasID("org.eclipse.papyrus.umldi.Association_Edge"))))); assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.Import")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Import"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Import"), hasID("org.eclipse.papyrus.umldi.Dependency_Edge"))))); } @Test @@ -81,9 +81,9 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss List<IElementType> types = getRelTypesOnTarget(usecase); assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.Import")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Import"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Import"), hasID("org.eclipse.papyrus.umldi.Dependency_Edge"))))); assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.Web")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Web"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Association_4011"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Web"), hasID("org.eclipse.papyrus.umldi.Association_Edge"))))); } @Test @@ -93,45 +93,45 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss List<IElementType> types = getRelTypesOnSourceAndTarget(usecase, actor); assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.Web")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Web"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Association_4011"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Web"), hasID("org.eclipse.papyrus.umldi.Association_Edge"))))); assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.Import")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Import"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.Import"), hasID("org.eclipse.papyrus.umldi.Dependency_Edge"))))); } @Test public void targetForConnectionFromSource() { IAdaptable usecase = getEditPartSurrogate(getUseCase("WebScenario1")); - List<IElementType> types = getTypesForTarget(usecase, getProxyType("org.eclipse.papyrus.example.j2ee.Web", "org.eclipse.papyrus.uml.diagram.usecase.Association_4011")); + List<IElementType> types = getTypesForTarget(usecase, getProxyType("org.eclipse.papyrus.example.j2ee.Web", "org.eclipse.papyrus.umldi.Association_Edge")); // A couple of use case presentations (ellipse and classifier) assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.WebScenario")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.umldi.UseCase_Shape"))))); assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.WebScenario")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.umldi.UseCase_ClassifierShape"))))); // A couple of actor presentations (stick-man and classifier) assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.User")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.umldi.Actor_Shape"))))); assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.User")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Actor_2012"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.umldi.Actor_ClassifierShape"))))); } @Test public void sourceForConnectionToTarget() { IAdaptable actor = getEditPartSurrogate(getActor("User1")); - List<IElementType> types = getTypesForTarget(actor, getProxyType("org.eclipse.papyrus.example.j2ee.Import", "org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013")); + List<IElementType> types = getTypesForTarget(actor, getProxyType("org.eclipse.papyrus.example.j2ee.Import", "org.eclipse.papyrus.umldi.Dependency_Edge")); // A couple of use case presentations (ellipse and classifier) assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.WebScenario")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.umldi.UseCase_Shape"))))); assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.WebScenario")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.WebScenario"), hasID("org.eclipse.papyrus.umldi.UseCase_ClassifierShape"))))); // A couple of actor presentations (stick-man and classifier) assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.User")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Actor_2011"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.umldi.Actor_Shape"))))); assertThat(types, hasItem(both(hasID("org.eclipse.papyrus.example.j2ee.User")).and( - isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.uml.diagram.usecase.Actor_2012"))))); + isProxyType(hasID("org.eclipse.papyrus.example.j2ee.User"), hasID("org.eclipse.papyrus.umldi.Actor_ClassifierShape"))))); } @Test @@ -139,8 +139,8 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss IAdaptable usecase = getEditPartSurrogate(getUseCase("WebScenario1")); List<IElementType> types = getRelTypesOnSource(usecase); - assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Association_4019")))); - assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018")))); + assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Association_BranchEdge")))); + assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Dependency_BranchEdge")))); } @Test @@ -148,8 +148,8 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss IAdaptable actor = getEditPartSurrogate(getActor("User1")); List<IElementType> types = getRelTypesOnTarget(actor); - assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Association_4019")))); - assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018")))); + assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Association_BranchEdge")))); + assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Dependency_BranchEdge")))); } @Test @@ -158,24 +158,24 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss IAdaptable actor = getEditPartSurrogate(getActor("User1")); List<IElementType> types = getRelTypesOnSourceAndTarget(usecase, actor); - assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Association_4019")))); - assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018")))); + assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Association_BranchEdge")))); + assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Dependency_BranchEdge")))); } @Test public void excludedTargetForConnectionFromSource() { IAdaptable usecase = getEditPartSurrogate(getUseCase("WebScenario1")); - List<IElementType> types = getTypesForTarget(usecase, getProxyType("org.eclipse.papyrus.example.j2ee.Web", "org.eclipse.papyrus.uml.diagram.usecase.Association_4011")); + List<IElementType> types = getTypesForTarget(usecase, getProxyType("org.eclipse.papyrus.example.j2ee.Web", "org.eclipse.papyrus.umldi.Association_Edge")); - assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Association_2015")))); + assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Association_Shape")))); } @Test public void excludedSourceForConnectionToTarget() { IAdaptable actor = getEditPartSurrogate(getActor("User1")); - List<IElementType> types = getTypesForTarget(actor, getProxyType("org.eclipse.papyrus.example.j2ee.Import", "org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013")); + List<IElementType> types = getTypesForTarget(actor, getProxyType("org.eclipse.papyrus.example.j2ee.Import", "org.eclipse.papyrus.umldi.Dependency_Edge")); - assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014")))); + assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Dependency_Shape")))); } @Test @@ -183,7 +183,7 @@ public class GenericModelingAssistantIntegrationTest extends AbstractModelingAss IAdaptable diagram = getDiagramEditPartSurrogate(); List<IElementType> types = getTypesForPopupBar(diagram); - assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Association_2015")))); - assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014")))); + assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Association_Shape")))); + assertThat(types, not(hasItem(specializes("org.eclipse.papyrus.umldi.Dependency_Shape")))); } } diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF index 49bc8a699c4..35e27236b7c 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF @@ -1,31 +1,32 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.junit;bundle-version="4.11.0",
- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0",
- org.eclipse.gmf.codegen;bundle-version="2.11.0"
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.tests,
- org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.papyrus.junit.framework;bundle-version="1.2.0", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", + org.junit;bundle-version="4.11.0", + org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0", + org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0", + org.eclipse.papyrus.infra.core;bundle-version="1.2.0", + org.eclipse.uml2.uml;bundle-version="5.1.0", + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", + com.google.guava;bundle-version="11.0.0", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", + org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0", + org.eclipse.gmf.codegen;bundle-version="2.11.0", + org.eclipse.papyrus.gmfgenextension;bundle-version="2.0.0" +Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.tests, + org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal;x-internal:=true +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: %pluginName +Bundle-Localization: plugin +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal.Activator +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical.tests +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCanonicalTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCanonicalTest.java index 962518a4d52..8c3532b2aff 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCanonicalTest.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCanonicalTest.java @@ -54,13 +54,11 @@ import org.eclipse.gef.RequestConstants; import org.eclipse.gef.commands.Command; import org.eclipse.gef.commands.CompoundCommand; import org.eclipse.gef.requests.GroupRequest; -import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage; import org.eclipse.gmf.codegen.gmfgen.GenChildNode; +import org.eclipse.gmf.codegen.gmfgen.GenCommonBase; import org.eclipse.gmf.codegen.gmfgen.GenDiagram; -import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator; import org.eclipse.gmf.codegen.gmfgen.GenLink; import org.eclipse.gmf.codegen.gmfgen.GenTopLevelNode; -import org.eclipse.gmf.codegen.gmfgen.util.GMFGenSwitch; import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.gmf.runtime.common.core.command.ICommand; import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand; @@ -95,6 +93,9 @@ import org.eclipse.papyrus.junit.utils.JUnitUtils; import org.eclipse.papyrus.junit.utils.rules.AnnotationRule; import org.eclipse.papyrus.junit.utils.rules.HouseKeeper; import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture; +import org.eclipse.papyrus.papyrusgmfgenextension.PapyrusgmfgenextensionPackage; +import org.eclipse.papyrus.papyrusgmfgenextension.VisualIDOverride; +import org.eclipse.papyrus.papyrusgmfgenextension.util.PapyrusgmfgenextensionSwitch; import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart; @@ -758,45 +759,28 @@ public class AbstractCanonicalTest extends AbstractPapyrusTest { try { URI classdiagram = URI.createPlatformPluginURI(String.format("/%s/model/classdiagram.gmfgen", UMLDiagramEditorPlugin.ID), true); - GenEditorGenerator editor = UML2Util.load(rset, classdiagram, GMFGenPackage.eINSTANCE.getGenEditorGenerator()); - - GMFGenSwitch<Class<? extends View>> typeSwitch = new GMFGenSwitch<Class<? extends View>>() { - - @Override - public Class<? extends View> caseGenDiagram(GenDiagram object) { - Class<? extends View> result = Diagram.class; - String visualID = Integer.toString(object.getVisualID()); - map.put(visualID, result); - return result; - } - - @Override - public Class<? extends View> caseGenTopLevelNode(GenTopLevelNode object) { - Class<? extends View> result = Node.class; - String visualID = Integer.toString(object.getVisualID()); - map.put(visualID, result); - return result; - } - - @Override - public Class<? extends View> caseGenChildNode(GenChildNode object) { - Class<? extends View> result = Node.class; - String visualID = Integer.toString(object.getVisualID()); - map.put(visualID, result); - return result; - } + VisualIDOverride ov = UML2Util.load(rset, classdiagram, PapyrusgmfgenextensionPackage.eINSTANCE.getVisualIDOverride()); + PapyrusgmfgenextensionSwitch<Class<? extends View>> typeSwitch = new PapyrusgmfgenextensionSwitch<Class<? extends View>>() { @Override - public Class<? extends View> caseGenLink(GenLink object) { - Class<? extends View> result = Edge.class; - String visualID = Integer.toString(object.getVisualID()); - map.put(visualID, result); + public Class<? extends View> caseVisualIDOverride(VisualIDOverride object) { + Class<? extends View> result = null; + GenCommonBase base = object.getGenView(); + if (base instanceof GenDiagram) + result = Diagram.class; + else if (base instanceof GenTopLevelNode) + result = Node.class; + else if (base instanceof GenChildNode) + result = Node.class; + else if (base instanceof GenLink) + result = Edge.class; + if (result != null) + map.put(object.getVisualID(), result); return result; } }; - map.put(editor.getModelID(), Diagram.class); - for (Iterator<? extends EObject> iter = editor.eAllContents(); iter.hasNext();) { + for (Iterator<? extends EObject> iter = ov.eAllContents(); iter.hasNext();) { typeSwitch.doSwitch(iter.next()); } } finally { diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/org.eclipse.papyrus.infra.gmfdiag.commands.tests.launch b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/org.eclipse.papyrus.infra.gmfdiag.commands.tests.launch index 5afacf2f348..e7fcca578a4 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/org.eclipse.papyrus.infra.gmfdiag.commands.tests.launch +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/org.eclipse.papyrus.infra.gmfdiag.commands.tests.launch @@ -24,7 +24,7 @@ <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.gmfdiag.commands.tests.AllTests"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.commands.tests"/> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF index dfdbcb3f064..71563f3dd83 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Require-Bundle: org.junit;bundle-version="4.10.0", org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0", org.eclipse.uml2.uml;bundle-version="5.1.0", org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0" + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="2.0.0" Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.tests, org.eclipse.papyrus.infra.gmfdiag.common.utils Bundle-Vendor: %providerName diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddBorderItem.xmi b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddBorderItem.xmi index 7068c1be528..459cd50c66c 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddBorderItem.xmi +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddBorderItem.xmi @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<expansionmodel:DiagramExpansion
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:expansionmodel="http:///expansionmodel.ecore"
- xmi:id="_BOX98NnkEeSFtu511b-yaw"
- ID="test AddBorderItem">
- <usages diagramType="Class Diagram"
- representations="//@usages.0/@gmftRepresentations.0"
- name="Add acomparment on class of papyrus">
- <gmftRepresentations
- editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"
- name="Reuse representation of class of the class diagram"
- viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"
- subRepresentations="//@libraries.0/@representations.0"
- reusedID="2008"/>
- </usages>
- <libraries
- name="library">
- <representations
- xsi:type="expansionmodel:Representation"
- editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart"
- name="Interface as BorderItem"
- viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory"
- graphicalElementType="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem"/>
- </libraries>
-</expansionmodel:DiagramExpansion>
+<?xml version="1.0" encoding="UTF-8"?> +<expansionmodel:DiagramExpansion + xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:expansionmodel="http:///expansionmodel.ecore" + xmi:id="_BOX98NnkEeSFtu511b-yaw" + ID="test AddBorderItem"> + <usages diagramType="Class Diagram" + representations="//@usages.0/@gmftRepresentations.0" + name="Add acomparment on class of papyrus"> + <gmftRepresentations + editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart" + name="Reuse representation of class of the class diagram" + viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory" + subRepresentations="//@libraries.0/@representations.0" + reusedID="Class_Shape"/> + </usages> + <libraries + name="library"> + <representations + xsi:type="expansionmodel:Representation" + editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForClassEditPart" + name="Interface as BorderItem" + viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory" + graphicalElementType="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem"/> + </libraries> +</expansionmodel:DiagramExpansion> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddChildLabel.xmi b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddChildLabel.xmi index 42ebf63e0f6..ae0d17f64d9 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddChildLabel.xmi +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddChildLabel.xmi @@ -1,35 +1,35 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<expansionmodel:DiagramExpansion
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:expansionmodel="http:///expansionmodel.ecore"
- xmi:id="_BOX98NnkEeSFtu511b-yaw"
- ID="AddChildLabel">
- <usages diagramType="Class Diagram"
- representations="//@usages.0/@gmftRepresentations.0"
- name="Add acomparment on class of papyrus">
- <gmftRepresentations
- editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"
- name="Reuse representation of class of the class diagram"
- viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"
- inducedRepresentations="//@libraries.0/@representations.0"
- reusedID="2008"/>
- </usages>
- <libraries
- name="compartmentlibrary">
- <representations
- xsi:type="expansionmodel:InducedRepresentation"
- editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart"
- name="Compartment to implement interfaces"
- viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"
- hint="Implemented Interfaces"
- children="//@libraries.0/@representations.1"/>
- <representations
- xsi:type="expansionmodel:Representation"
- editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart"
- name="Nested Interface Label"
- viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory"
- graphicalElementType="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label"/>
- </libraries>
-</expansionmodel:DiagramExpansion>
+<?xml version="1.0" encoding="UTF-8"?> +<expansionmodel:DiagramExpansion + xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:expansionmodel="http:///expansionmodel.ecore" + xmi:id="_BOX98NnkEeSFtu511b-yaw" + ID="AddChildLabel"> + <usages diagramType="Class Diagram" + representations="//@usages.0/@gmftRepresentations.0" + name="Add acomparment on class of papyrus"> + <gmftRepresentations + editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart" + name="Reuse representation of class of the class diagram" + viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory" + inducedRepresentations="//@libraries.0/@representations.0" + reusedID="Class_Shape"/> + </usages> + <libraries + name="compartmentlibrary"> + <representations + xsi:type="expansionmodel:InducedRepresentation" + editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart" + name="Compartment to implement interfaces" + viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory" + hint="Implemented Interfaces" + children="//@libraries.0/@representations.1"/> + <representations + xsi:type="expansionmodel:Representation" + editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedInterfaceForInterfaceEditPart" + name="Nested Interface Label" + viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory" + graphicalElementType="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label"/> + </libraries> +</expansionmodel:DiagramExpansion> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartment.xmi b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartment.xmi index 9a9ca8b983f..6103fdb57d8 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartment.xmi +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartment.xmi @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<expansionmodel:DiagramExpansion
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:expansionmodel="http:///expansionmodel.ecore"
- xmi:id="_BOX98NnkEeSFtu511b-yaw"
- ID="Add CompartmentText">
- <usages diagramType="Class Diagram"
- representations="//@usages.0/@gmftRepresentations.0"
- name="Add acomparment on class of papyrus">
- <gmftRepresentations
- editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"
- name="Reuse respresentation of class of the class diagram"
- viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"
- inducedRepresentations="//@libraries.0/@representations.0"
- reusedID="2008"/>
- </usages>
- <libraries
- name="compartmentlibrary">
- <representations
- xsi:type="expansionmodel:InducedRepresentation"
- editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart"
- name="Compartment to implement interfaces"
- viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"
- hint="Implemented Interfaces"/>
- </libraries>
-</expansionmodel:DiagramExpansion>
+<?xml version="1.0" encoding="UTF-8"?> +<expansionmodel:DiagramExpansion + xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:expansionmodel="http:///expansionmodel.ecore" + xmi:id="_BOX98NnkEeSFtu511b-yaw" + ID="Add CompartmentText"> + <usages diagramType="Class Diagram" + representations="//@usages.0/@gmftRepresentations.0" + name="Add acomparment on class of papyrus"> + <gmftRepresentations + editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart" + name="Reuse respresentation of class of the class diagram" + viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory" + inducedRepresentations="//@libraries.0/@representations.0" + reusedID="Class_Shape"/> + </usages> + <libraries + name="compartmentlibrary"> + <representations + xsi:type="expansionmodel:InducedRepresentation" + editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart" + name="Compartment to implement interfaces" + viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory" + hint="Implemented Interfaces"/> + </libraries> +</expansionmodel:DiagramExpansion> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartmentWithKind.xmi b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartmentWithKind.xmi index ed245656225..ee6c736c9ff 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartmentWithKind.xmi +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/AddCompartmentWithKind.xmi @@ -1,31 +1,31 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<expansionmodel:DiagramExpansion
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:expansionmodel="http:///expansionmodel.ecore"
- xmi:id="_BOX98NnkEeSFtu511b-yaw"
- ID="Add CompartmentText">
- <usages diagramType="Class Diagram"
- representations="//@usages.0/@gmftRepresentations.0"
- name="Add acomparment on class of papyrus">
- <gmftRepresentations
- editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart"
- name="Reuse respresentation of class of the class diagram"
- viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory"
- inducedRepresentations="//@libraries.0/@representations.0"
- reusedID="2008"/>
- </usages>
- <libraries
- name="compartmentlibrary">
- <representationkinds
- editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart"
- name="ListCompartment"
- viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"/>
- <representations
- xsi:type="expansionmodel:InducedRepresentation"
- kind="//@libraries.0/@representationkinds.0"
- name="Compartment to implement interfaces"
- hint="Implemented Interfaces"/>
- </libraries>
-</expansionmodel:DiagramExpansion>
+<?xml version="1.0" encoding="UTF-8"?> +<expansionmodel:DiagramExpansion + xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:expansionmodel="http:///expansionmodel.ecore" + xmi:id="_BOX98NnkEeSFtu511b-yaw" + ID="Add CompartmentText"> + <usages diagramType="Class Diagram" + representations="//@usages.0/@gmftRepresentations.0" + name="Add acomparment on class of papyrus"> + <gmftRepresentations + editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart" + name="Reuse respresentation of class of the class diagram" + viewFactory="org.eclipse.papyrus.infra.gmfdiag.common.utils.ClassifierViewFactory" + inducedRepresentations="//@libraries.0/@representations.0" + reusedID="Class_Shape"/> + </usages> + <libraries + name="compartmentlibrary"> + <representationkinds + editPartQualifiedName="org.eclipse.papyrus.uml.diagram.common.editparts.ListCompartmentEditPart" + name="ListCompartment" + viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.CompartmentViewFactory"/> + <representations + xsi:type="expansionmodel:InducedRepresentation" + kind="//@libraries.0/@representationkinds.0" + name="Compartment to implement interfaces" + hint="Implemented Interfaces"/> + </libraries> +</expansionmodel:DiagramExpansion> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.notation index 1fa43d567e3..007cff1837c 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/ExpansionModelTest.notation @@ -1,61 +1,61 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_zW-jQOKJEeSwE5hduTH6nQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_0OTz4OKJEeSwE5hduTH6nQ" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_0OVpEOKJEeSwE5hduTH6nQ" type="5029"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_0OVpEeKJEeSwE5hduTH6nQ" type="8510">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_0OVpEuKJEeSwE5hduTH6nQ" y="5"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_0OWQIOKJEeSwE5hduTH6nQ" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_0OWQIeKJEeSwE5hduTH6nQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_0OWQIuKJEeSwE5hduTH6nQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_0OWQI-KJEeSwE5hduTH6nQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OWQJOKJEeSwE5hduTH6nQ"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_0OWQJeKJEeSwE5hduTH6nQ" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_0OWQJuKJEeSwE5hduTH6nQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_0OW3MOKJEeSwE5hduTH6nQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_0OW3MeKJEeSwE5hduTH6nQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OW3MuKJEeSwE5hduTH6nQ"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_0OW3M-KJEeSwE5hduTH6nQ" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_0OW3NOKJEeSwE5hduTH6nQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_0OW3NeKJEeSwE5hduTH6nQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_0OW3NuKJEeSwE5hduTH6nQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OW3N-KJEeSwE5hduTH6nQ"/>
- </children>
- <element xmi:type="uml:Class" href="ExpansionModelTest.uml#_0ONtQOKJEeSwE5hduTH6nQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OTz4eKJEeSwE5hduTH6nQ" x="180" y="80"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_zwbhEPPMEeSh3rAaWaQzhQ" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_zwgZkPPMEeSh3rAaWaQzhQ" type="5029"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_zwhAoPPMEeSh3rAaWaQzhQ" type="8510">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zwhAofPMEeSh3rAaWaQzhQ" y="5"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_zwhnsPPMEeSh3rAaWaQzhQ" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_zwhnsfPMEeSh3rAaWaQzhQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnsvPMEeSh3rAaWaQzhQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhns_PMEeSh3rAaWaQzhQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhntPPMEeSh3rAaWaQzhQ"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_zwhntfPMEeSh3rAaWaQzhQ" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_zwhntvPMEeSh3rAaWaQzhQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnt_PMEeSh3rAaWaQzhQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhnuPPMEeSh3rAaWaQzhQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhnufPMEeSh3rAaWaQzhQ"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_zwhnuvPMEeSh3rAaWaQzhQ" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_zwhnu_PMEeSh3rAaWaQzhQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnvPPMEeSh3rAaWaQzhQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhnvfPMEeSh3rAaWaQzhQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhnvvPMEeSh3rAaWaQzhQ"/>
- </children>
- <element xmi:type="uml:Class" href="ExpansionModelTest.uml#__FNz0PMjEeSc2PGFYV7S2w"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwbhEfPMEeSh3rAaWaQzhQ" x="460" y="80"/>
- </children>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_zW-jQeKJEeSwE5hduTH6nQ" name="diagram_compatibility_version" stringValue="1.0.0"/>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_zW-jQuKJEeSwE5hduTH6nQ"/>
- <styles xmi:type="style:PapyrusViewStyle" xmi:id="_zW-jQ-KJEeSwE5hduTH6nQ">
- <owner xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>
- </styles>
- <element xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_zW-jQOKJEeSwE5hduTH6nQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_0OTz4OKJEeSwE5hduTH6nQ" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_0OVpEOKJEeSwE5hduTH6nQ" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_0OVpEeKJEeSwE5hduTH6nQ" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_0OVpEuKJEeSwE5hduTH6nQ" y="5"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_XrHXgOumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_0OWQIeKJEeSwE5hduTH6nQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_0OWQIuKJEeSwE5hduTH6nQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_0OWQI-KJEeSwE5hduTH6nQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OWQJOKJEeSwE5hduTH6nQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_XrH-kOumEeW_9Ltteg9fQQ" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_0OWQJuKJEeSwE5hduTH6nQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_0OW3MOKJEeSwE5hduTH6nQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_0OW3MeKJEeSwE5hduTH6nQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OW3MuKJEeSwE5hduTH6nQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_XrIloOumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_0OW3NOKJEeSwE5hduTH6nQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_0OW3NeKJEeSwE5hduTH6nQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_0OW3NuKJEeSwE5hduTH6nQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OW3N-KJEeSwE5hduTH6nQ"/> + </children> + <element xmi:type="uml:Class" href="ExpansionModelTest.uml#_0ONtQOKJEeSwE5hduTH6nQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0OTz4eKJEeSwE5hduTH6nQ" x="180" y="80"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_zwbhEPPMEeSh3rAaWaQzhQ" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_zwgZkPPMEeSh3rAaWaQzhQ" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_zwhAoPPMEeSh3rAaWaQzhQ" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_zwhAofPMEeSh3rAaWaQzhQ" y="5"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_XrJMsOumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_zwhnsfPMEeSh3rAaWaQzhQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnsvPMEeSh3rAaWaQzhQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhns_PMEeSh3rAaWaQzhQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhntPPMEeSh3rAaWaQzhQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_XrJzwOumEeW_9Ltteg9fQQ" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_zwhntvPMEeSh3rAaWaQzhQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnt_PMEeSh3rAaWaQzhQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhnuPPMEeSh3rAaWaQzhQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhnufPMEeSh3rAaWaQzhQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_XrKa0OumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_zwhnu_PMEeSh3rAaWaQzhQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_zwhnvPPMEeSh3rAaWaQzhQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_zwhnvfPMEeSh3rAaWaQzhQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwhnvvPMEeSh3rAaWaQzhQ"/> + </children> + <element xmi:type="uml:Class" href="ExpansionModelTest.uml#__FNz0PMjEeSc2PGFYV7S2w"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwbhEfPMEeSh3rAaWaQzhQ" x="460" y="80"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_zW-jQeKJEeSwE5hduTH6nQ" name="diagram_compatibility_version" stringValue="1.2.0"/> + <styles xmi:type="notation:DiagramStyle" xmi:id="_zW-jQuKJEeSwE5hduTH6nQ"/> + <styles xmi:type="style:PapyrusViewStyle" xmi:id="_zW-jQ-KJEeSwE5hduTH6nQ"> + <owner xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/> + </styles> + <element xmi:type="uml:Model" href="ExpansionModelTest.uml#_zV8ogOKJEeSwE5hduTH6nQ"/> +</notation:Diagram> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/MyChildLabelAssistant.assistants b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/MyChildLabelAssistant.assistants index 110358d14ce..4a7f85b1969 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/MyChildLabelAssistant.assistants +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/MyChildLabelAssistant.assistants @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?>
<assistant:ModelingAssistantProvider xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:assistant="http://www.eclipse.org/Papyrus/2014/diagram/assistant" name="PapyrusUMLClassDiagram">
- <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Class" elementTypeID="org.eclipse.papyrus.uml.diagram.clazz.Class_2008"/>
+ <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Class" elementTypeID="org.eclipse.papyrus.umldi.Class_Shape"/>
<ownedFilter xsi:type="assistant:ElementTypeFilter" name="MyNestedInterface" elementTypeID="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label"/>
<ownedFilter xsi:type="assistant:AssistedElementTypeFilter"/>
<popupAssistant elementTypeID="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" filter="//@ownedFilter.0"/>
- <elementTypeID>org.eclipse.papyrus.uml.diagram.clazz.Class_2008</elementTypeID>
+ <elementTypeID>org.eclipse.papyrus.umldi.Class_Shape</elementTypeID>
<elementTypeID>org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label</elementTypeID>
</assistant:ModelingAssistantProvider>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/sync/sync-test.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/sync/sync-test.notation index 3da2a18ea38..3ef8ea04d7e 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/sync/sync-test.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/sync/sync-test.notation @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <notation:Diagram xmi:id="_SUe9MP4pEeSWkpIORzCK6w" type="PapyrusUMLClassDiagram" name="master" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_dtgq8P4pEeSWkpIORzCK6w" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_dtmKgP4pEeSWkpIORzCK6w" type="5029"/> - <children xmi:type="notation:DecorationNode" xmi:id="_dtmKgf4pEeSWkpIORzCK6w" type="8510"> + <children xmi:type="notation:Shape" xmi:id="_dtgq8P4pEeSWkpIORzCK6w" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_dtmKgP4pEeSWkpIORzCK6w" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_dtmKgf4pEeSWkpIORzCK6w" type="Class_FloatingNameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_dtmKgv4pEeSWkpIORzCK6w" y="5"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_dtrDAP4pEeSWkpIORzCK6w" type="7017"> + <children xmi:type="notation:BasicCompartment" xmi:id="_pzAJ8OumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_dtrDAf4pEeSWkpIORzCK6w"/> <styles xmi:type="notation:SortingStyle" xmi:id="_dtrDAv4pEeSWkpIORzCK6w"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_dtrDA_4pEeSWkpIORzCK6w"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtrDBP4pEeSWkpIORzCK6w"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_dtrDBf4pEeSWkpIORzCK6w" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_pzAxAOumEeW_9Ltteg9fQQ" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_dtrDBv4pEeSWkpIORzCK6w"/> <styles xmi:type="notation:SortingStyle" xmi:id="_dtrDB_4pEeSWkpIORzCK6w"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_dtrDCP4pEeSWkpIORzCK6w"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtrDCf4pEeSWkpIORzCK6w"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_dtrDCv4pEeSWkpIORzCK6w" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_pzAxAeumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_dtrDC_4pEeSWkpIORzCK6w"/> <styles xmi:type="notation:SortingStyle" xmi:id="_dtrDDP4pEeSWkpIORzCK6w"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_dtrDDf4pEeSWkpIORzCK6w"/> @@ -27,24 +27,24 @@ <element xmi:type="uml:Class" href="sync-test.uml#_dtT2oP4pEeSWkpIORzCK6w"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dthSAP4pEeSWkpIORzCK6w" x="76" y="79"/> </children> - <children xmi:type="notation:Shape" xmi:id="_e3LowP4pEeSWkpIORzCK6w" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_e3Lowv4pEeSWkpIORzCK6w" type="5029"/> - <children xmi:type="notation:DecorationNode" xmi:id="_e3Low_4pEeSWkpIORzCK6w" type="8510"> + <children xmi:type="notation:Shape" xmi:id="_e3LowP4pEeSWkpIORzCK6w" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_e3Lowv4pEeSWkpIORzCK6w" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_e3Low_4pEeSWkpIORzCK6w" type="Class_FloatingNameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_e3LoxP4pEeSWkpIORzCK6w" y="5"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_e3MP0P4pEeSWkpIORzCK6w" type="7017"> + <children xmi:type="notation:BasicCompartment" xmi:id="_pzAxAuumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_e3MP0f4pEeSWkpIORzCK6w"/> <styles xmi:type="notation:SortingStyle" xmi:id="_e3MP0v4pEeSWkpIORzCK6w"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_e3MP0_4pEeSWkpIORzCK6w"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e3MP1P4pEeSWkpIORzCK6w"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_e3MP1f4pEeSWkpIORzCK6w" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_pzBYEOumEeW_9Ltteg9fQQ" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_e3MP1v4pEeSWkpIORzCK6w"/> <styles xmi:type="notation:SortingStyle" xmi:id="_e3MP1_4pEeSWkpIORzCK6w"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_e3MP2P4pEeSWkpIORzCK6w"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e3MP2f4pEeSWkpIORzCK6w"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_e3MP2v4pEeSWkpIORzCK6w" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_pzBYEeumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_e3MP2_4pEeSWkpIORzCK6w"/> <styles xmi:type="notation:SortingStyle" xmi:id="_e3MP3P4pEeSWkpIORzCK6w"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_e3MP3f4pEeSWkpIORzCK6w"/> @@ -53,7 +53,7 @@ <element xmi:type="uml:Class" href="sync-test.uml#_e3FiIP4pEeSWkpIORzCK6w"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e3Lowf4pEeSWkpIORzCK6w" x="216" y="289"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_SUe9Mf4pEeSWkpIORzCK6w" name="diagram_compatibility_version" stringValue="1.1.0"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_SUe9Mf4pEeSWkpIORzCK6w" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_SUe9Mv4pEeSWkpIORzCK6w"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_SUe9M_4pEeSWkpIORzCK6w"> <owner xmi:type="uml:Model" href="sync-test.uml#_SNfkYP4pEeSWkpIORzCK6w"/> @@ -62,23 +62,23 @@ <stringListValue>syncmaster</stringListValue> </styles> <element xmi:type="uml:Model" href="sync-test.uml#_SNfkYP4pEeSWkpIORzCK6w"/> - <edges xmi:type="notation:Connector" xmi:id="_jKtTcP4pEeSWkpIORzCK6w" type="4001" source="_dtgq8P4pEeSWkpIORzCK6w" target="_e3LowP4pEeSWkpIORzCK6w"> - <children xmi:type="notation:DecorationNode" xmi:id="_jKt6gP4pEeSWkpIORzCK6w" type="6001"> + <edges xmi:type="notation:Connector" xmi:id="_jKtTcP4pEeSWkpIORzCK6w" type="Association_Edge" source="_dtgq8P4pEeSWkpIORzCK6w" target="_e3LowP4pEeSWkpIORzCK6w"> + <children xmi:type="notation:DecorationNode" xmi:id="_jKt6gP4pEeSWkpIORzCK6w" type="Association_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_jKt6gf4pEeSWkpIORzCK6w" y="-20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_jKt6gv4pEeSWkpIORzCK6w" type="6002"> + <children xmi:type="notation:DecorationNode" xmi:id="_jKt6gv4pEeSWkpIORzCK6w" type="Association_NameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_jKt6g_4pEeSWkpIORzCK6w" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_jKuhkP4pEeSWkpIORzCK6w" type="6003"> + <children xmi:type="notation:DecorationNode" xmi:id="_jKuhkP4pEeSWkpIORzCK6w" type="Association_TargetRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_jKuhkf4pEeSWkpIORzCK6w" y="-20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_jKuhkv4pEeSWkpIORzCK6w" type="6005"> + <children xmi:type="notation:DecorationNode" xmi:id="_jKuhkv4pEeSWkpIORzCK6w" type="Association_SourceRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_jKuhk_4pEeSWkpIORzCK6w" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_jKuhlP4pEeSWkpIORzCK6w" type="6033"> + <children xmi:type="notation:DecorationNode" xmi:id="_jKuhlP4pEeSWkpIORzCK6w" type="Association_SourceMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_jKuhlf4pEeSWkpIORzCK6w" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_jKuhlv4pEeSWkpIORzCK6w" type="6034"> + <children xmi:type="notation:DecorationNode" xmi:id="_jKuhlv4pEeSWkpIORzCK6w" type="Association_TargetMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_jKuhl_4pEeSWkpIORzCK6w" y="-20"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_jKtTcf4pEeSWkpIORzCK6w"/> @@ -89,7 +89,7 @@ </edges> </notation:Diagram> <notation:Diagram xmi:id="_yVolgP4pEeSWkpIORzCK6w" type="PapyrusUMLClassDiagram" name="slave1" measurementUnit="Pixel"> - <styles xmi:type="notation:StringValueStyle" xmi:id="_yVolgf4pEeSWkpIORzCK6w" name="diagram_compatibility_version" stringValue="1.1.0"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_yVolgf4pEeSWkpIORzCK6w" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_yVolgv4pEeSWkpIORzCK6w"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_yVolg_4pEeSWkpIORzCK6w"> <owner xmi:type="uml:Model" href="sync-test.uml#_SNfkYP4pEeSWkpIORzCK6w"/> @@ -100,24 +100,24 @@ <element xmi:type="uml:Model" href="sync-test.uml#_SNfkYP4pEeSWkpIORzCK6w"/> </notation:Diagram> <notation:Diagram xmi:id="_ytSpAP5UEeSWkpIORzCK6w" type="PapyrusUMLClassDiagram" name="slave2" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_ytSpAf5UEeSWkpIORzCK6w" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_ytSpAv5UEeSWkpIORzCK6w" type="5029"/> - <children xmi:type="notation:DecorationNode" xmi:id="_ytSpA_5UEeSWkpIORzCK6w" type="8510"> + <children xmi:type="notation:Shape" xmi:id="_ytSpAf5UEeSWkpIORzCK6w" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_ytSpAv5UEeSWkpIORzCK6w" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_ytSpA_5UEeSWkpIORzCK6w" type="Class_FloatingNameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpBP5UEeSWkpIORzCK6w" y="5"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_ytSpBf5UEeSWkpIORzCK6w" type="7017"> + <children xmi:type="notation:BasicCompartment" xmi:id="_trYwwOumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_ytSpBv5UEeSWkpIORzCK6w"/> <styles xmi:type="notation:SortingStyle" xmi:id="_ytSpB_5UEeSWkpIORzCK6w"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_ytSpCP5UEeSWkpIORzCK6w"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytSpCf5UEeSWkpIORzCK6w"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_ytSpCv5UEeSWkpIORzCK6w" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_trZX0OumEeW_9Ltteg9fQQ" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_ytSpC_5UEeSWkpIORzCK6w"/> <styles xmi:type="notation:SortingStyle" xmi:id="_ytSpDP5UEeSWkpIORzCK6w"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_ytSpDf5UEeSWkpIORzCK6w"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytSpDv5UEeSWkpIORzCK6w"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_ytSpD_5UEeSWkpIORzCK6w" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_trZX0eumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_ytSpEP5UEeSWkpIORzCK6w"/> <styles xmi:type="notation:SortingStyle" xmi:id="_ytSpEf5UEeSWkpIORzCK6w"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_ytSpEv5UEeSWkpIORzCK6w"/> @@ -126,24 +126,24 @@ <element xmi:type="uml:Class" href="sync-test.uml#_dtT2oP4pEeSWkpIORzCK6w"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytSpFP5UEeSWkpIORzCK6w" x="76" y="79"/> </children> - <children xmi:type="notation:Shape" xmi:id="_ytSpFf5UEeSWkpIORzCK6w" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_ytSpFv5UEeSWkpIORzCK6w" type="5029"/> - <children xmi:type="notation:DecorationNode" xmi:id="_ytSpF_5UEeSWkpIORzCK6w" type="8510"> + <children xmi:type="notation:Shape" xmi:id="_ytSpFf5UEeSWkpIORzCK6w" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_ytSpFv5UEeSWkpIORzCK6w" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_ytSpF_5UEeSWkpIORzCK6w" type="Class_FloatingNameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpGP5UEeSWkpIORzCK6w" y="5"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_ytSpGf5UEeSWkpIORzCK6w" type="7017"> + <children xmi:type="notation:BasicCompartment" xmi:id="_trZX0uumEeW_9Ltteg9fQQ" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_ytSpGv5UEeSWkpIORzCK6w"/> <styles xmi:type="notation:SortingStyle" xmi:id="_ytSpG_5UEeSWkpIORzCK6w"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_ytSpHP5UEeSWkpIORzCK6w"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytSpHf5UEeSWkpIORzCK6w"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_ytSpHv5UEeSWkpIORzCK6w" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_trZX0-umEeW_9Ltteg9fQQ" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_ytSpH_5UEeSWkpIORzCK6w"/> <styles xmi:type="notation:SortingStyle" xmi:id="_ytSpIP5UEeSWkpIORzCK6w"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_ytSpIf5UEeSWkpIORzCK6w"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytSpIv5UEeSWkpIORzCK6w"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_ytSpI_5UEeSWkpIORzCK6w" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_trZ-4OumEeW_9Ltteg9fQQ" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_ytSpJP5UEeSWkpIORzCK6w"/> <styles xmi:type="notation:SortingStyle" xmi:id="_ytSpJf5UEeSWkpIORzCK6w"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_ytSpJv5UEeSWkpIORzCK6w"/> @@ -152,7 +152,7 @@ <element xmi:type="uml:Class" href="sync-test.uml#_e3FiIP4pEeSWkpIORzCK6w"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ytSpKP5UEeSWkpIORzCK6w" x="216" y="289"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_ytSpKf5UEeSWkpIORzCK6w" name="diagram_compatibility_version" stringValue="1.1.0"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_ytSpKf5UEeSWkpIORzCK6w" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_ytSpKv5UEeSWkpIORzCK6w"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_ytSpK_5UEeSWkpIORzCK6w"> <owner xmi:type="uml:Model" href="sync-test.uml#_SNfkYP4pEeSWkpIORzCK6w"/> @@ -161,23 +161,23 @@ <stringListValue>syncslave</stringListValue> </styles> <element xmi:type="uml:Model" href="sync-test.uml#_SNfkYP4pEeSWkpIORzCK6w"/> - <edges xmi:type="notation:Connector" xmi:id="_ytSpLf5UEeSWkpIORzCK6w" type="4001" source="_ytSpAf5UEeSWkpIORzCK6w" target="_ytSpFf5UEeSWkpIORzCK6w"> - <children xmi:type="notation:DecorationNode" xmi:id="_ytSpLv5UEeSWkpIORzCK6w" type="6001"> + <edges xmi:type="notation:Connector" xmi:id="_ytSpLf5UEeSWkpIORzCK6w" type="Association_Edge" source="_ytSpAf5UEeSWkpIORzCK6w" target="_ytSpFf5UEeSWkpIORzCK6w"> + <children xmi:type="notation:DecorationNode" xmi:id="_ytSpLv5UEeSWkpIORzCK6w" type="Association_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpL_5UEeSWkpIORzCK6w" y="-20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_ytSpMP5UEeSWkpIORzCK6w" type="6002"> + <children xmi:type="notation:DecorationNode" xmi:id="_ytSpMP5UEeSWkpIORzCK6w" type="Association_NameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpMf5UEeSWkpIORzCK6w" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_ytSpMv5UEeSWkpIORzCK6w" type="6003"> + <children xmi:type="notation:DecorationNode" xmi:id="_ytSpMv5UEeSWkpIORzCK6w" type="Association_TargetRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpM_5UEeSWkpIORzCK6w" y="-20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_ytSpNP5UEeSWkpIORzCK6w" type="6005"> + <children xmi:type="notation:DecorationNode" xmi:id="_ytSpNP5UEeSWkpIORzCK6w" type="Association_SourceRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpNf5UEeSWkpIORzCK6w" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_ytSpNv5UEeSWkpIORzCK6w" type="6033"> + <children xmi:type="notation:DecorationNode" xmi:id="_ytSpNv5UEeSWkpIORzCK6w" type="Association_SourceMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpN_5UEeSWkpIORzCK6w" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_ytSpOP5UEeSWkpIORzCK6w" type="6034"> + <children xmi:type="notation:DecorationNode" xmi:id="_ytSpOP5UEeSWkpIORzCK6w" type="Association_TargetMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_ytSpOf5UEeSWkpIORzCK6w" y="-20"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_ytSpOv5UEeSWkpIORzCK6w"/> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AssistantUsage.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AssistantUsage.java index d61f5a6c7c2..ee8eb964cd1 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AssistantUsage.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/AssistantUsage.java @@ -24,8 +24,7 @@ import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory; -import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry; -import org.eclipse.gmf.runtime.emf.type.core.IElementType; +import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType; import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantService; import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.View; @@ -35,7 +34,6 @@ import org.eclipse.papyrus.infra.core.utils.ServiceUtils; import org.eclipse.papyrus.infra.gmfdiag.assistant.core.IModelingAssistantModelProvider; import org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.DefaultModelingAssistantModelProvider; import org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.ModelingAssistantModelRegistry; -import org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.util.ProxyElementType; import org.eclipse.papyrus.infra.gmfdiag.common.SynchronizableGmfDiagramEditor; import org.eclipse.papyrus.infra.gmfdiag.common.expansion.ChildrenListRepresentation; import org.eclipse.papyrus.infra.gmfdiag.common.expansion.DiagramExpansionSingleton; @@ -44,6 +42,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.expansion.InducedRepresentationC import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel; import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart; import org.junit.Assert; import org.junit.Test; import org.osgi.framework.Bundle; @@ -83,7 +82,7 @@ public class AssistantUsage extends AbstractEditorTest { /** * */ - protected static final String CLASS_VISUALID = "2008"; + protected static final String CLASS_VISUALID = ClassEditPart.VISUAL_ID; /** * */ @@ -102,9 +101,9 @@ public class AssistantUsage extends AbstractEditorTest { Assert.assertNotNull("A usage contex has been defined for " + CLASS_DIAGRAM_TYPE, childrenListRepresentation); Assert.assertNotNull("The class has been redefined", childrenListRepresentation.IDMap.get(CLASS_VISUALID)); Assert.assertNotNull("The compartment of class has been added", childrenListRepresentation.IDMap.get(IMPLEMENTED_INTERFACES_HINT)); - List<String> the_2008_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID); - Assert.assertEquals("2008 can have a new compartment", 1, the_2008_Children.size()); - Assert.assertEquals("2008 has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_2008_Children.get(0)); + List<String> the_class_shape_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID); + Assert.assertEquals("class shape can have a new compartment", 1, the_class_shape_Children.size()); + Assert.assertEquals("class shape has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_class_shape_Children.get(0)); Assert.assertNotNull("The Nested Interface has to be added", childrenListRepresentation.IDMap.get(NESTED_INTERFACE_LABEL)); List<String> the_IMPLEMENTED_INTERFACES_Children = childrenListRepresentation.parentChildrenRelation.get(IMPLEMENTED_INTERFACES_HINT); @@ -129,13 +128,13 @@ public class AssistantUsage extends AbstractEditorTest { // test in the notation View classNotationView = classEditPart.getNotationView(); - Assert.assertEquals("the Type of class editpart must be 2008", classNotationView.getType(), "2008"); - Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6); + Assert.assertEquals("the class editpart must be correct", classNotationView.getType(), ClassEditPart.VISUAL_ID); + Assert.assertEquals("the class editpart must contains 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6); View compartment = (View) classNotationView.getPersistedChildren().get(5); Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartment.getType()); // test in the editpart is created for this notation - Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6); + Assert.assertEquals("the class editpart must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6); IGraphicalEditPart compartmentEdiPart = (IGraphicalEditPart) classEditPart.getChildren().get(5); Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartmentEdiPart.getNotationView().getType()); @@ -149,31 +148,29 @@ public class AssistantUsage extends AbstractEditorTest { Assert.assertNotNull("the assistant model must be loaded", result); ModelingAssistantModelRegistry.getInstance().loadModels(result); // try to create a label inside this compartment. - final IElementType interfaceLabelelementType = ElementTypeRegistry.getInstance().getType("org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label"); List<?> types = ModelingAssistantService.getInstance().getTypesForPopupBar(classEditPart); boolean founded = false; // test the construction of the popupbar for (Object object : types) { - if (object instanceof ProxyElementType) { - ProxyElementType proxyElementType = (ProxyElementType) object; - System.out.println(proxyElementType); + if (object instanceof ISpecializationType) { + ISpecializationType elementType = (ISpecializationType) object; + System.out.println(elementType); - if (("org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label".equals(proxyElementType.getId())) - && interfaceLabelelementType.equals(proxyElementType.resolveSemanticType()) - && interfaceLabelelementType.equals(proxyElementType.resolveVisualType())) { + if (("org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label".equals(elementType.getId()))) { // find the good short cut founded = true; // now construct the request and command to simulate the display inside popup bar - Request req = CreateViewRequestFactory.getCreateShapeRequest(proxyElementType, + Request req = CreateViewRequestFactory.getCreateShapeRequest(elementType, classEditPart.getDiagramPreferencesHint()); EditPart targetEditpart = classEditPart.getTargetEditPart(req); Assert.assertEquals("the request must be redirect to compartment", compartmentEdiPart, targetEditpart); Command cmd = targetEditpart.getCommand(req); Assert.assertNotNull("The command must not be null", cmd); Assert.assertTrue("The command must be executable", cmd.canExecute()); + break; } } } diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddBorderItem.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddBorderItem.java index 6697e147972..9f899509eaa 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddBorderItem.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddBorderItem.java @@ -29,6 +29,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.expansion.DiagramExpansionsRegis import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel; import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart; import org.junit.Assert; import org.junit.Test; import org.osgi.framework.Bundle; @@ -72,7 +73,7 @@ public class ExpansionAddBorderItem extends AbstractEditorTest { /** * */ - protected static final String CLASS_VISUALID = "2008"; + protected static final String CLASS_VISUALID = ClassEditPart.VISUAL_ID; /** * */ @@ -92,9 +93,9 @@ public class ExpansionAddBorderItem extends AbstractEditorTest { Assert.assertNotNull("The class has been redefined", childrenListRepresentation.IDMap.get(CLASS_VISUALID)); Assert.assertNotNull("The BorderItem of class has been added", childrenListRepresentation.IDMap.get(INTERFACE_BORDER_ITEM)); - List<String> the_2008_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID); - Assert.assertEquals("2008 can have a new compartment", 1, the_2008_Children.size()); - Assert.assertEquals("2008 has to contain " + INTERFACE_BORDER_ITEM, INTERFACE_BORDER_ITEM, the_2008_Children.get(0)); + List<String> the_class_shape_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID); + Assert.assertEquals("Class shape can have a new compartment", 1, the_class_shape_Children.size()); + Assert.assertEquals("Class shape has to contain " + INTERFACE_BORDER_ITEM, INTERFACE_BORDER_ITEM, the_class_shape_Children.get(0)); // the model is valid // now launch a class diagram diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddChildLabel.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddChildLabel.java index f7e1c9197a0..824ee28f388 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddChildLabel.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddChildLabel.java @@ -40,6 +40,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.expansion.InducedRepresentationC import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel; import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart; import org.junit.Assert; import org.junit.Test; import org.osgi.framework.Bundle; @@ -79,7 +80,7 @@ public class ExpansionAddChildLabel extends AbstractEditorTest { /** * */ - protected static final String CLASS_VISUALID = "2008"; + protected static final String CLASS_VISUALID = ClassEditPart.VISUAL_ID; /** * */ @@ -98,9 +99,9 @@ public class ExpansionAddChildLabel extends AbstractEditorTest { Assert.assertNotNull("A usage contex has been defined for " + CLASS_DIAGRAM_TYPE, childrenListRepresentation); Assert.assertNotNull("The class has been redefined", childrenListRepresentation.IDMap.get(CLASS_VISUALID)); Assert.assertNotNull("The compartment of class has been added", childrenListRepresentation.IDMap.get(IMPLEMENTED_INTERFACES_HINT)); - List<String> the_2008_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID); - Assert.assertEquals("2008 can have a new compartment", 1, the_2008_Children.size()); - Assert.assertEquals("2008 has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_2008_Children.get(0)); + List<String> the_class_shape_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID); + Assert.assertEquals("class shape can have a new compartment", 1, the_class_shape_Children.size()); + Assert.assertEquals("class shape has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_class_shape_Children.get(0)); Assert.assertNotNull("The Nested Interface has to be added", childrenListRepresentation.IDMap.get(NESTED_INTERFACE_LABEL)); List<String> the_IMPLEMENTED_INTERFACES_Children = childrenListRepresentation.parentChildrenRelation.get(IMPLEMENTED_INTERFACES_HINT); @@ -125,13 +126,13 @@ public class ExpansionAddChildLabel extends AbstractEditorTest { // test in the notation View classNotationView = classEditPart.getNotationView(); - Assert.assertEquals("the Type of class editpart must be 2008", classNotationView.getType(), "2008"); - Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6); + Assert.assertEquals("the Type of class editpart must be correct", classNotationView.getType(), ClassEditPart.VISUAL_ID); + Assert.assertEquals("the class editpart must contain 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6); View compartment = (View) classNotationView.getPersistedChildren().get(5); Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartment.getType()); // test in the editpart is created for this notation - Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6); + Assert.assertEquals("the class editpart must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6); IGraphicalEditPart compartmentEdiPart = (IGraphicalEditPart) classEditPart.getChildren().get(5); Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartmentEdiPart.getNotationView().getType()); diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartment.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartment.java index 7363af14111..deb748f197a 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartment.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartment.java @@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.expansion.InducedRepresentationC import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel; import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart; import org.junit.Assert; import org.junit.Test; import org.osgi.framework.Bundle; @@ -66,7 +67,7 @@ public class ExpansionAddCompartment extends AbstractEditorTest { /** * */ - protected static final String CLASS_VISUALID = "2008"; + protected static final String CLASS_VISUALID = ClassEditPart.VISUAL_ID; /** * */ @@ -85,9 +86,9 @@ public class ExpansionAddCompartment extends AbstractEditorTest { Assert.assertNotNull("A usage contex has been defined for " + CLASS_DIAGRAM_TYPE, childrenListRepresentation); Assert.assertNotNull("The class has been redefined", childrenListRepresentation.IDMap.get(CLASS_VISUALID)); Assert.assertNotNull("The compartment of class has been added", childrenListRepresentation.IDMap.get(IMPLEMENTED_INTERFACES_HINT)); - List<String> the_2008_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID); - Assert.assertEquals("2008 can have a new compartment", 1, the_2008_Children.size()); - Assert.assertEquals("2008 has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_2008_Children.get(0)); + List<String> the_class_shape_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID); + Assert.assertEquals("class shape can have a new compartment", 1, the_class_shape_Children.size()); + Assert.assertEquals("class shape has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_class_shape_Children.get(0)); // the model is valid // now launch a class diagram @@ -107,13 +108,13 @@ public class ExpansionAddCompartment extends AbstractEditorTest { // test in the notation View classNotationView = classEditPart.getNotationView(); - Assert.assertEquals("the Type of class editpart must be 2008", classNotationView.getType(), "2008"); - Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6); + Assert.assertEquals("the Type of class editpart is not correct", classNotationView.getType(), ClassEditPart.VISUAL_ID); + Assert.assertEquals("the class editpart must contain 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6); View compartment = (View) classNotationView.getPersistedChildren().get(5); Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartment.getType()); // test in the editpart is created for this notation - Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6); + Assert.assertEquals("the class editpart must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6); IGraphicalEditPart compartmentEdiPart = (IGraphicalEditPart) classEditPart.getChildren().get(5); if (compartmentEdiPart.getNotationView().equals(compartment)) { Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartmentEdiPart.getNotationView().getType()); diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartmentWithKind.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartmentWithKind.java index e58fc89830c..a9c82f77726 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartmentWithKind.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddCompartmentWithKind.java @@ -32,6 +32,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.expansion.InducedRepresentationC import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel; import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart; import org.junit.Assert; import org.junit.Test; import org.osgi.framework.Bundle; @@ -66,7 +67,7 @@ public class ExpansionAddCompartmentWithKind extends AbstractEditorTest { /** * */ - protected static final String CLASS_VISUALID = "2008"; + protected static final String CLASS_VISUALID = ClassEditPart.VISUAL_ID; /** * */ @@ -85,9 +86,9 @@ public class ExpansionAddCompartmentWithKind extends AbstractEditorTest { Assert.assertNotNull("A usage contex has been defined for " + CLASS_DIAGRAM_TYPE, childrenListRepresentation); Assert.assertNotNull("The class has been redefined", childrenListRepresentation.IDMap.get(CLASS_VISUALID)); Assert.assertNotNull("The compartment of class has been added", childrenListRepresentation.IDMap.get(IMPLEMENTED_INTERFACES_HINT)); - List<String> the_2008_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID); - Assert.assertEquals("2008 can have a new compartment", 1, the_2008_Children.size()); - Assert.assertEquals("2008 has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_2008_Children.get(0)); + List<String> the_class_shape_Children = childrenListRepresentation.parentChildrenRelation.get(CLASS_VISUALID); + Assert.assertEquals("Class shape can have a new compartment", 1, the_class_shape_Children.size()); + Assert.assertEquals("Class shape has to contain " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, the_class_shape_Children.get(0)); // the model is valid // now launch a class diagram @@ -107,13 +108,13 @@ public class ExpansionAddCompartmentWithKind extends AbstractEditorTest { // test in the notation View classNotationView = classEditPart.getNotationView(); - Assert.assertEquals("the Type of class editpart must be 2008", classNotationView.getType(), "2008"); - Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6); + Assert.assertEquals("the Type of class editpart must be correct", classNotationView.getType(), ClassEditPart.VISUAL_ID); + Assert.assertEquals("the class editpart must contain 2 labels and 4 compartments", classNotationView.getPersistedChildren().size(), 6); View compartment = (View) classNotationView.getPersistedChildren().get(5); Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartment.getType()); // test in the editpart is created for this notation - Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", classEditPart.getChildren().size(), 6); + Assert.assertEquals("the class editpart must contain 2 labels and 4 compartments", classEditPart.getChildren().size(), 6); IGraphicalEditPart compartmentEdiPart = (IGraphicalEditPart) classEditPart.getChildren().get(5); if (compartmentEdiPart.getNotationView().equals(compartment)) { Assert.assertEquals("The last compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartmentEdiPart.getNotationView().getType()); diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionDropElements.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionDropElements.java index 39b3ddd3375..a27f71ba811 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionDropElements.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionDropElements.java @@ -111,7 +111,7 @@ public class ExpansionDropElements extends AbstractEditorTest { Assert.assertNotNull("MyClass must have a nested Interface called --MyNestedInterface--", nestedInterface); // try to drop on my class - Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", myclassEditPart.getChildren().size(), 6); + Assert.assertEquals("the class editpart must contain 2 labels and 4 compartments", myclassEditPart.getChildren().size(), 6); IGraphicalEditPart compartmentEdiPartMyClass = (IGraphicalEditPart) myclassEditPart.getChildren().get(5); Assert.assertEquals("the compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartmentEdiPartMyClass.getNotationView().getType()); @@ -168,7 +168,7 @@ public class ExpansionDropElements extends AbstractEditorTest { Assert.assertNotNull("MyClass must have a nested Interface called --MyNestedInterface--", nestedInterface); // try to drop on my class - Assert.assertEquals("the Type of class editpart must be 2008 must contains 2 labels and 4 compartments", myclassEditPart.getChildren().size(), 6); + Assert.assertEquals("the class editpart must contains 2 labels and 4 compartments", myclassEditPart.getChildren().size(), 6); IGraphicalEditPart compartmentEdiPartMyOtherClass = (IGraphicalEditPart) myOtherclassEditPart.getChildren().get(5); Assert.assertEquals("the compartment must have the type " + IMPLEMENTED_INTERFACES_HINT, IMPLEMENTED_INTERFACES_HINT, compartmentEdiPartMyOtherClass.getNotationView().getType()); diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ClassifierViewFactory.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ClassifierViewFactory.java index 6747931d3eb..4d2f46fff41 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ClassifierViewFactory.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/ClassifierViewFactory.java @@ -24,6 +24,11 @@ import org.eclipse.gmf.runtime.notation.NotationFactory; import org.eclipse.gmf.runtime.notation.Shape; import org.eclipse.gmf.runtime.notation.TitleStyle; import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassFloatingNameEditPart; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart; /** * @@ -34,10 +39,10 @@ public class ClassifierViewFactory implements ViewFactory { public View createView(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) { - return createClass_2008((EObject) semanticAdapter.getAdapter(EObject.class), containerView, semanticHint, index, persisted, preferencesHint); + return createClass_Shape((EObject) semanticAdapter.getAdapter(EObject.class), containerView, semanticHint, index, persisted, preferencesHint); } - public Node createClass_2008(EObject domainElement, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) { + public Node createClass_Shape(EObject domainElement, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) { Shape node = NotationFactory.eINSTANCE.createShape(); node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); node.setType(semanticHint); @@ -45,15 +50,15 @@ public class ClassifierViewFactory implements ViewFactory { node.setElement(domainElement); // initializeFromPreferences - Node label5029 = createLabel(node, "5029"); - Node label8510 = createLabel(node, "8510"); - label8510.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location location8510 = (Location) label8510.getLayoutConstraint(); - location8510.setX(0); - location8510.setY(5); - createCompartment(node, "7017", true, true, true, true); - createCompartment(node, "7018", true, true, true, true); - createCompartment(node, "7019", true, true, true, true); + Node classNamelabel = createLabel(node, ClassNameEditPart.VISUAL_ID); + Node classFloatingNamelabel = createLabel(node, ClassFloatingNameEditPart.VISUAL_ID); + classFloatingNamelabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); + Location classFloatingNameLabelLocation = (Location) classFloatingNamelabel.getLayoutConstraint(); + classFloatingNameLabelLocation.setX(0); + classFloatingNameLabelLocation.setY(5); + createCompartment(node, ClassAttributeCompartmentEditPart.VISUAL_ID, true, true, true, true); + createCompartment(node, ClassOperationCompartmentEditPart.VISUAL_ID, true, true, true, true); + createCompartment(node, ClassNestedClassifierCompartmentEditPart.VISUAL_ID, true, true, true, true); return node; } diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF index bcb8a60d6fc..5316f5ad496 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF @@ -1,35 +1,36 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.8.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.tests,
- org.eclipse.papyrus.infra.gmfdiag.css.tests.tests
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: CSS Tests
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.css3.xtext;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", + org.eclipse.gmf.runtime.notation;bundle-version="1.5.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core;bundle-version="1.2.0", + org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", + org.eclipse.core.resources;bundle-version="3.8.0", + org.eclipse.uml2.uml;bundle-version="4.0.0", + org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0", + org.junit;bundle-version="4.10.0", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", + org.eclipse.core.databinding;bundle-version="1.4.1", + org.eclipse.papyrus.junit.framework;bundle-version="1.2.0", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0", + org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.clazz;bundle-version="2.0.0" +Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.tests, + org.eclipse.papyrus.infra.gmfdiag.css.tests.tests +Bundle-Vendor: Eclipse Modeling Project +Bundle-ActivationPolicy: lazy +Bundle-Version: 1.2.0.qualifier +Bundle-Name: CSS Tests +Bundle-ManifestVersion: 2 +Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator +Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch index 5355537d5fc..ad3d47d22b1 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/org.eclipse.papyrus.infra.gmfdiag.css.tests.launch @@ -1,42 +1,42 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.gmfdiag.css.tests.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.css.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.7 -Xms1024m -Xmx4086m -XX:MaxPermSize=512M -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="append.args" value="true"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/AllTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.gmfdiag.css.tests.tests.AllTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.css.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.7 -Xms1024m -Xmx4086m -XX:MaxPermSize=512M -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="false"/> +<booleanAttribute key="useProduct" value="true"/> +</launchConfiguration> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation index ad421b8149b..895b860a7c0 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/classProviderTest/model.notation @@ -1,57 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
- <notation:Diagram xmi:id="_MDVbsHTIEeG92qGoaUUGLQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_PHIj4HTIEeG92qGoaUUGLQ" type="2004" fontName="Segoe UI" lineColor="0">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHIj4nTIEeG92qGoaUUGLQ" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj43TIEeG92qGoaUUGLQ" key="fontHeight" value="true"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj5HTIEeG92qGoaUUGLQ" key="bold" value="true"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj5XTIEeG92qGoaUUGLQ" key="italic" value="true"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj5nTIEeG92qGoaUUGLQ" key="fontColor" value="true"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj53TIEeG92qGoaUUGLQ" key="fillColor" value="true"/>
- </eAnnotations>
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHSU4HTIEeG92qGoaUUGLQ" source="ShadowFigure">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHSU4XTIEeG92qGoaUUGLQ" key="ShadowFigure_Value" value="false"/>
- </eAnnotations>
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHSU4nTIEeG92qGoaUUGLQ" source="displayNameLabelIcon">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHSU43TIEeG92qGoaUUGLQ" key="displayNameLabelIcon_value" value="false"/>
- </eAnnotations>
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHSU5HTIEeG92qGoaUUGLQ" source="QualifiedName">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHSU5XTIEeG92qGoaUUGLQ" key="QualifiedNameDepth" value="1000"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_PHSU5nTIEeG92qGoaUUGLQ" type="5011"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_PHSU53TIEeG92qGoaUUGLQ" type="7006">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHlP0HTIEeG92qGoaUUGLQ" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHlP0XTIEeG92qGoaUUGLQ" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_PHSU6HTIEeG92qGoaUUGLQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_PHSU6XTIEeG92qGoaUUGLQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_PHSU6nTIEeG92qGoaUUGLQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHSU63TIEeG92qGoaUUGLQ"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_PHSU7HTIEeG92qGoaUUGLQ" type="7007">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHlP0nTIEeG92qGoaUUGLQ" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHlP03TIEeG92qGoaUUGLQ" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_PHSU7XTIEeG92qGoaUUGLQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_PHSU7nTIEeG92qGoaUUGLQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_PHSU73TIEeG92qGoaUUGLQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHSU8HTIEeG92qGoaUUGLQ"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_PHSU8XTIEeG92qGoaUUGLQ" type="7008">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHlP1HTIEeG92qGoaUUGLQ" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHlP1XTIEeG92qGoaUUGLQ" key="showTitle" value="true"/>
- </eAnnotations>
- <styles xmi:type="notation:TitleStyle" xmi:id="_PHSU8nTIEeG92qGoaUUGLQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_PHSU83TIEeG92qGoaUUGLQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_PHSU9HTIEeG92qGoaUUGLQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHSU9XTIEeG92qGoaUUGLQ"/>
- </children>
- <element xmi:type="uml:Interface" href="model.uml#_PGr38HTIEeG92qGoaUUGLQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHIj4XTIEeG92qGoaUUGLQ" x="271" y="159"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_MDVbsXTIEeG92qGoaUUGLQ"/>
- <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_ifHmEHTlEeGmJ4iNo0Pbxg" name="css_stylesheets" eObjectListValue="_ifHmEXTlEeGmJ4iNo0Pbxg"/>
- <element xmi:type="uml:Model" href="model.uml#_MBtEAHTIEeG92qGoaUUGLQ"/>
- </notation:Diagram>
- <css:StyleSheetReference xmi:id="_ifHmEXTlEeGmJ4iNo0Pbxg" path="/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css"/>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> + <notation:Diagram xmi:id="_MDVbsHTIEeG92qGoaUUGLQ" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_PHIj4HTIEeG92qGoaUUGLQ" type="Interface_Shape" fontName="Segoe UI" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHIj4nTIEeG92qGoaUUGLQ" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj43TIEeG92qGoaUUGLQ" key="fontHeight" value="true"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj5HTIEeG92qGoaUUGLQ" key="bold" value="true"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj5XTIEeG92qGoaUUGLQ" key="italic" value="true"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj5nTIEeG92qGoaUUGLQ" key="fontColor" value="true"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHIj53TIEeG92qGoaUUGLQ" key="fillColor" value="true"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHSU4HTIEeG92qGoaUUGLQ" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHSU4XTIEeG92qGoaUUGLQ" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHSU4nTIEeG92qGoaUUGLQ" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHSU43TIEeG92qGoaUUGLQ" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PHSU5HTIEeG92qGoaUUGLQ" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PHSU5XTIEeG92qGoaUUGLQ" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_PHSU5nTIEeG92qGoaUUGLQ" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_7DgGwOu5EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_PHSU6HTIEeG92qGoaUUGLQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_PHSU6XTIEeG92qGoaUUGLQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_PHSU6nTIEeG92qGoaUUGLQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHSU63TIEeG92qGoaUUGLQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_7DhU4Ou5EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_PHSU7XTIEeG92qGoaUUGLQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_PHSU7nTIEeG92qGoaUUGLQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_PHSU73TIEeG92qGoaUUGLQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHSU8HTIEeG92qGoaUUGLQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_7Dh78Ou5EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_PHSU8nTIEeG92qGoaUUGLQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_PHSU83TIEeG92qGoaUUGLQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_PHSU9HTIEeG92qGoaUUGLQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHSU9XTIEeG92qGoaUUGLQ"/> + </children> + <element xmi:type="uml:Interface" href="model.uml#_PGr38HTIEeG92qGoaUUGLQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PHIj4XTIEeG92qGoaUUGLQ" x="271" y="159"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_MDVbsXTIEeG92qGoaUUGLQ"/> + <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_ifHmEHTlEeGmJ4iNo0Pbxg" name="css_stylesheets" eObjectListValue="_ifHmEXTlEeGmJ4iNo0Pbxg"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_7DjxIOu5EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/> + <element xmi:type="uml:Model" href="model.uml#_MBtEAHTIEeG92qGoaUUGLQ"/> + </notation:Diagram> + <css:StyleSheetReference xmi:id="_ifHmEXTlEeGmJ4iNo0Pbxg" path="/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/classProviderTest.css"/> +</xmi:XMI> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation index d76d49cb8c9..1296bc7ceda 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/compartmentsTest/model.notation @@ -1,258 +1,260 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
- <notation:Diagram xmi:id="_4EGG0ImVEeOGN4dVepS-Uw" type="PapyrusUMLClassDiagram" name="compartments" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_Cz4qUImWEeOGN4dVepS-Uw" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_Cz4qUomWEeOGN4dVepS-Uw" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_Cz4qU4mWEeOGN4dVepS-Uw" type="7017">
- <children xmi:type="notation:Shape" xmi:id="_U81zwYmWEeOGN4dVepS-Uw" type="3012">
- <element xmi:type="uml:Property" href="model.uml#_U81zwImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_U81zwomWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_VDYgoYmWEeOGN4dVepS-Uw" type="3012">
- <element xmi:type="uml:Property" href="model.uml#_VDYgoImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_VDYgoomWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_VJCcsYmWEeOGN4dVepS-Uw" type="3012">
- <element xmi:type="uml:Property" href="model.uml#_VJCcsImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_VJCcsomWEeOGN4dVepS-Uw"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_Cz4qVImWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Cz4qVYmWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_Cz4qVomWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qV4mWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_Cz4qWImWEeOGN4dVepS-Uw" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_Cz4qWYmWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Cz4qWomWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_Cz4qW4mWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qXImWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_Cz4qXYmWEeOGN4dVepS-Uw" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_Cz4qXomWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Cz4qX4mWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_Cz4qYImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qYYmWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_cpYD0ImlEeO69MVKNB7cFw" type="compartment_shape_display">
- <styles xmi:type="notation:TitleStyle" xmi:id="_cpYD0YmlEeO69MVKNB7cFw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cpYD0omlEeO69MVKNB7cFw"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_CzvgYImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qUYmWEeOGN4dVepS-Uw" x="45" y="70" width="169"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_DZrfAYmWEeOGN4dVepS-Uw" type="2004">
- <children xmi:type="notation:DecorationNode" xmi:id="_DZrfA4mWEeOGN4dVepS-Uw" type="5011"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_DZrfBImWEeOGN4dVepS-Uw" type="7006">
- <children xmi:type="notation:Shape" xmi:id="_V6u_YYmWEeOGN4dVepS-Uw" type="3006">
- <element xmi:type="uml:Property" href="model.uml#_V6u_YImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_V6u_YomWEeOGN4dVepS-Uw"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_DZrfBYmWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_DZrfBomWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_DZrfB4mWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfCImWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_DZrfCYmWEeOGN4dVepS-Uw" type="7007">
- <styles xmi:type="notation:TitleStyle" xmi:id="_DZrfComWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_DZrfC4mWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_DZrfDImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfDYmWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_DZrfDomWEeOGN4dVepS-Uw" type="7008">
- <styles xmi:type="notation:TitleStyle" xmi:id="_DZrfD4mWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_DZrfEImWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_DZrfEYmWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfEomWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_cp95sImlEeO69MVKNB7cFw" type="compartment_shape_display">
- <styles xmi:type="notation:TitleStyle" xmi:id="_cp95sYmlEeO69MVKNB7cFw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cp95somlEeO69MVKNB7cFw"/>
- </children>
- <element xmi:type="uml:Interface" href="model.uml#_DZrfAImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfAomWEeOGN4dVepS-Uw" x="680" y="67"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Dp5FQImWEeOGN4dVepS-Uw" type="2006">
- <children xmi:type="notation:DecorationNode" xmi:id="_Dp5FQomWEeOGN4dVepS-Uw" type="5023"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_Dp5FQ4mWEeOGN4dVepS-Uw" type="7015">
- <children xmi:type="notation:Shape" xmi:id="_EAp_cImWEeOGN4dVepS-Uw" type="3017">
- <element xmi:type="uml:EnumerationLiteral" href="model.uml#_EAgOcImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EAp_cYmWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_ENAZYYmWEeOGN4dVepS-Uw" type="3017">
- <element xmi:type="uml:EnumerationLiteral" href="model.uml#_ENAZYImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_ENAZYomWEeOGN4dVepS-Uw"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_Dp5FRImWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Dp5FRYmWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_Dp5FRomWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dp5FR4mWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_cqHqsImlEeO69MVKNB7cFw" type="compartment_shape_display">
- <styles xmi:type="notation:TitleStyle" xmi:id="_cqHqsYmlEeO69MVKNB7cFw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHqsomlEeO69MVKNB7cFw"/>
- </children>
- <element xmi:type="uml:Enumeration" href="model.uml#_DpvUQImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dp5FQYmWEeOGN4dVepS-Uw" x="36" y="431"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_az5twYmWEeOGN4dVepS-Uw" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_az5tw4mWEeOGN4dVepS-Uw" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_az5txImWEeOGN4dVepS-Uw" type="7017">
- <children xmi:type="notation:Shape" xmi:id="_cSX24ImWEeOGN4dVepS-Uw" type="3012">
- <element xmi:type="uml:Property" href="model.uml#_cSOF4ImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cSX24YmWEeOGN4dVepS-Uw"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_az5txYmWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_az5txomWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_az5tx4mWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5tyImWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_az5tyYmWEeOGN4dVepS-Uw" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_az5tyomWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_az5ty4mWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_az5tzImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5tzYmWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_az5tzomWEeOGN4dVepS-Uw" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_az5tz4mWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_az5t0ImWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_az5t0YmWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5t0omWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_cqHqs4mlEeO69MVKNB7cFw" type="compartment_shape_display">
- <styles xmi:type="notation:TitleStyle" xmi:id="_cqHqtImlEeO69MVKNB7cFw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHqtYmlEeO69MVKNB7cFw"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_az5twImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5twomWEeOGN4dVepS-Uw" x="42" y="223" width="177" height="163"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_1epSEYmWEeOGN4dVepS-Uw" type="2004">
- <children xmi:type="notation:DecorationNode" xmi:id="_1epSE4mWEeOGN4dVepS-Uw" type="5011"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_1epSFImWEeOGN4dVepS-Uw" type="7006">
- <styles xmi:type="notation:TitleStyle" xmi:id="_1epSFYmWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_1epSFomWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_1epSF4mWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSGImWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_1epSGYmWEeOGN4dVepS-Uw" type="7007">
- <styles xmi:type="notation:TitleStyle" xmi:id="_1epSGomWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_1epSG4mWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_1epSHImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSHYmWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_1epSHomWEeOGN4dVepS-Uw" type="7008">
- <styles xmi:type="notation:TitleStyle" xmi:id="_1epSH4mWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_1epSIImWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_1epSIYmWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSIomWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_cqHqtomlEeO69MVKNB7cFw" type="compartment_shape_display">
- <styles xmi:type="notation:TitleStyle" xmi:id="_cqHqt4mlEeO69MVKNB7cFw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHquImlEeO69MVKNB7cFw"/>
- </children>
- <element xmi:type="uml:Interface" href="model.uml#_1epSEImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSEomWEeOGN4dVepS-Uw" x="683" y="219"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_61R_kYmWEeOGN4dVepS-Uw" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_61R_k4mWEeOGN4dVepS-Uw" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_61R_lImWEeOGN4dVepS-Uw" visible="false" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_61R_lYmWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_61R_lomWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_61R_l4mWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_mImWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_61R_mYmWEeOGN4dVepS-Uw" visible="false" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_61R_momWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_61R_m4mWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_61R_nImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_nYmWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_61R_nomWEeOGN4dVepS-Uw" visible="false" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_61R_n4mWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_61R_oImWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_61R_oYmWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_oomWEeOGN4dVepS-Uw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_cqHquYmlEeO69MVKNB7cFw" type="compartment_shape_display">
- <styles xmi:type="notation:TitleStyle" xmi:id="_cqHquomlEeO69MVKNB7cFw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHqu4mlEeO69MVKNB7cFw"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_61R_kImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_komWEeOGN4dVepS-Uw" x="42" y="597" height="34"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_9TcEEImWEeOGN4dVepS-Uw" type="2012">
- <children xmi:type="notation:DecorationNode" xmi:id="_9TcEEomWEeOGN4dVepS-Uw" type="5038"/>
- <element xmi:type="uml:Comment" href="model.uml#_9S_YIImWEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9TcEEYmWEeOGN4dVepS-Uw" x="309" y="101"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_D1WR4YmXEeOGN4dVepS-Uw" type="2012">
- <children xmi:type="notation:DecorationNode" xmi:id="_D1WR44mXEeOGN4dVepS-Uw" type="5038"/>
- <element xmi:type="uml:Comment" href="model.uml#_D1WR4ImXEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1WR4omXEeOGN4dVepS-Uw" x="353" y="588"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_TnYnQYmXEeOGN4dVepS-Uw" type="2012">
- <children xmi:type="notation:DecorationNode" xmi:id="_TnYnQ4mXEeOGN4dVepS-Uw" type="5038"/>
- <element xmi:type="uml:Comment" href="model.uml#_TnYnQImXEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TnYnQomXEeOGN4dVepS-Uw" x="360" y="457"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_anMSAYmXEeOGN4dVepS-Uw" type="2012">
- <children xmi:type="notation:DecorationNode" xmi:id="_anMSA4mXEeOGN4dVepS-Uw" type="5038"/>
- <element xmi:type="uml:Comment" href="model.uml#_anMSAImXEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anMSAomXEeOGN4dVepS-Uw" x="353" y="273" width="148"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Tfr8cYmaEeOGN4dVepS-Uw" type="2012">
- <children xmi:type="notation:DecorationNode" xmi:id="_Tfr8c4maEeOGN4dVepS-Uw" type="5038"/>
- <element xmi:type="uml:Comment" href="model.uml#_Tfr8cImaEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tfr8comaEeOGN4dVepS-Uw" x="997" y="72" width="167"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_TlMukYmaEeOGN4dVepS-Uw" type="2012">
- <children xmi:type="notation:DecorationNode" xmi:id="_TlV4gImaEeOGN4dVepS-Uw" type="5038"/>
- <element xmi:type="uml:Comment" href="model.uml#_TlMukImaEeOGN4dVepS-Uw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TlMukomaEeOGN4dVepS-Uw" x="881" y="248" width="149"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_4EGG0YmVEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_OgIPAImWEeOGN4dVepS-Uw" name="css_stylesheets" eObjectListValue="_OgIPAYmWEeOGN4dVepS-Uw"/>
- <styles xmi:type="notation:StringListValueStyle" xmi:id="_PR97oImWEeOGN4dVepS-Uw" name="cssClass"/>
- <element xmi:type="uml:Model" href="model.uml#_4DWgNImVEeOGN4dVepS-Uw"/>
- <edges xmi:type="notation:Connector" xmi:id="_BTVBEImXEeOGN4dVepS-Uw" type="4013" source="_9TcEEImWEeOGN4dVepS-Uw" target="_Cz4qUImWEeOGN4dVepS-Uw">
- <styles xmi:type="notation:FontStyle" xmi:id="_BTVBEYmXEeOGN4dVepS-Uw"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BTVBEomXEeOGN4dVepS-Uw" points="[-35, 6, 146, -36]$[-97, -8, 84, -50]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BTeyEImXEeOGN4dVepS-Uw" id="(0.12323943661971831,0.31666666666666665)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_GP624ImXEeOGN4dVepS-Uw" type="4013" source="_D1WR4YmXEeOGN4dVepS-Uw" target="_61R_kYmWEeOGN4dVepS-Uw">
- <styles xmi:type="notation:FontStyle" xmi:id="_GP624YmXEeOGN4dVepS-Uw"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GP624omXEeOGN4dVepS-Uw" points="[-88, 4, 270, -13]$[-308, 18, 50, 1]"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_UCAtwImXEeOGN4dVepS-Uw" type="4013" source="_TnYnQYmXEeOGN4dVepS-Uw" target="_Dp5FQImWEeOGN4dVepS-Uw">
- <styles xmi:type="notation:FontStyle" xmi:id="_UCAtwYmXEeOGN4dVepS-Uw"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UCAtwomXEeOGN4dVepS-Uw" points="[-16, 1, 271, -20]$[-237, 18, 50, -3]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UCKewImXEeOGN4dVepS-Uw" id="(0.16,0.35)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_bQjYEImXEeOGN4dVepS-Uw" type="4013" source="_anMSAYmXEeOGN4dVepS-Uw" target="_az5twYmWEeOGN4dVepS-Uw">
- <styles xmi:type="notation:FontStyle" xmi:id="_bQjYEYmXEeOGN4dVepS-Uw"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bQjYEomXEeOGN4dVepS-Uw" points="[-74, -1, 224, -18]$[-386, -47, -88, -64]"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_YgJloImaEeOGN4dVepS-Uw" type="4013" source="_TlMukYmaEeOGN4dVepS-Uw" target="_1epSEYmWEeOGN4dVepS-Uw">
- <styles xmi:type="notation:FontStyle" xmi:id="_YgJloYmaEeOGN4dVepS-Uw"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YgJloomaEeOGN4dVepS-Uw" points="[-74, -6, 126, 1]$[-192, 45, 8, 52]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yWTbwLXCEeOtu7CRWiD6kg" id="(0.0,0.4)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yWTbwbXCEeOtu7CRWiD6kg" id="(1.0,0.56)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_Y5mAYImaEeOGN4dVepS-Uw" type="4013" source="_Tfr8cYmaEeOGN4dVepS-Uw" target="_DZrfAYmWEeOGN4dVepS-Uw">
- <styles xmi:type="notation:FontStyle" xmi:id="_Y5mAYYmaEeOGN4dVepS-Uw"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y5mAYomaEeOGN4dVepS-Uw" points="[-83, -1, 122, -8]$[-198, -48, 7, -55]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yOHJELXCEeOtu7CRWiD6kg" id="(0.0,0.47)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yOHJEbXCEeOtu7CRWiD6kg" id="(1.0,0.5)"/>
- </edges>
- </notation:Diagram>
- <notation:Diagram xmi:id="_8JDKAImVEeOGN4dVepS-Uw" type="PapyrusUMLClassDiagram" name="labels" measurementUnit="Pixel">
- <styles xmi:type="notation:DiagramStyle" xmi:id="_8JDKAYmVEeOGN4dVepS-Uw"/>
- <element xmi:type="uml:Model" href="model.uml#_4DWgNImVEeOGN4dVepS-Uw"/>
- </notation:Diagram>
- <css:StyleSheetReference xmi:id="_OgIPAYmWEeOGN4dVepS-Uw" path="../../stylesheets/compartments.css"/>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> + <notation:Diagram xmi:id="_4EGG0ImVEeOGN4dVepS-Uw" type="PapyrusUMLClassDiagram" name="compartments" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_Cz4qUImWEeOGN4dVepS-Uw" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_Cz4qUomWEeOGN4dVepS-Uw" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="__YKZ4Ou5EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_U81zwYmWEeOGN4dVepS-Uw" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="model.uml#_U81zwImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_U81zwomWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_VDYgoYmWEeOGN4dVepS-Uw" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="model.uml#_VDYgoImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_VDYgoomWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_VJCcsYmWEeOGN4dVepS-Uw" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="model.uml#_VJCcsImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_VJCcsomWEeOGN4dVepS-Uw"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_Cz4qVImWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_Cz4qVYmWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_Cz4qVomWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qV4mWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__YLoAOu5EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_Cz4qWYmWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_Cz4qWomWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_Cz4qW4mWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qXImWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__YMPEOu5EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_Cz4qXomWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_Cz4qX4mWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_Cz4qYImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qYYmWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_cpYD0ImlEeO69MVKNB7cFw" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_cpYD0YmlEeO69MVKNB7cFw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cpYD0omlEeO69MVKNB7cFw"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_CzvgYImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cz4qUYmWEeOGN4dVepS-Uw" x="45" y="70" width="169"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_DZrfAYmWEeOGN4dVepS-Uw" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_DZrfA4mWEeOGN4dVepS-Uw" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="__YM2IOu5EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_V6u_YYmWEeOGN4dVepS-Uw" type="Property_InterfaceAttributeLabel"> + <element xmi:type="uml:Property" href="model.uml#_V6u_YImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_V6u_YomWEeOGN4dVepS-Uw"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_DZrfBYmWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_DZrfBomWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_DZrfB4mWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfCImWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__YOEQOu5EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_DZrfComWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_DZrfC4mWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_DZrfDImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfDYmWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__YOrUOu5EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_DZrfD4mWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_DZrfEImWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_DZrfEYmWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfEomWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_cp95sImlEeO69MVKNB7cFw" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_cp95sYmlEeO69MVKNB7cFw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cp95somlEeO69MVKNB7cFw"/> + </children> + <element xmi:type="uml:Interface" href="model.uml#_DZrfAImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZrfAomWEeOGN4dVepS-Uw" x="680" y="67"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_Dp5FQImWEeOGN4dVepS-Uw" type="Enumeration_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_Dp5FQomWEeOGN4dVepS-Uw" type="Enumeration_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="__YPSYOu5EeWb4rS4qgjiLg" type="Enumeration_LiteralCompartment"> + <children xmi:type="notation:Shape" xmi:id="_EAp_cImWEeOGN4dVepS-Uw" type="EnumerationLiteral_LiteralLabel"> + <element xmi:type="uml:EnumerationLiteral" href="model.uml#_EAgOcImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_EAp_cYmWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_ENAZYYmWEeOGN4dVepS-Uw" type="EnumerationLiteral_LiteralLabel"> + <element xmi:type="uml:EnumerationLiteral" href="model.uml#_ENAZYImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_ENAZYomWEeOGN4dVepS-Uw"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_Dp5FRImWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_Dp5FRYmWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_Dp5FRomWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dp5FR4mWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_cqHqsImlEeO69MVKNB7cFw" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_cqHqsYmlEeO69MVKNB7cFw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHqsomlEeO69MVKNB7cFw"/> + </children> + <element xmi:type="uml:Enumeration" href="model.uml#_DpvUQImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dp5FQYmWEeOGN4dVepS-Uw" x="36" y="431"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_az5twYmWEeOGN4dVepS-Uw" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_az5tw4mWEeOGN4dVepS-Uw" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="__YP5cOu5EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_cSX24ImWEeOGN4dVepS-Uw" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="model.uml#_cSOF4ImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_cSX24YmWEeOGN4dVepS-Uw"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_az5txYmWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_az5txomWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_az5tx4mWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5tyImWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__YQggOu5EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_az5tyomWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_az5ty4mWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_az5tzImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5tzYmWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__YRHkOu5EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_az5tz4mWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_az5t0ImWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_az5t0YmWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5t0omWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_cqHqs4mlEeO69MVKNB7cFw" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_cqHqtImlEeO69MVKNB7cFw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHqtYmlEeO69MVKNB7cFw"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_az5twImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_az5twomWEeOGN4dVepS-Uw" x="42" y="223" width="177" height="163"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_1epSEYmWEeOGN4dVepS-Uw" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_1epSE4mWEeOGN4dVepS-Uw" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="__YRuoOu5EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_1epSFYmWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_1epSFomWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_1epSF4mWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSGImWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__YSVsOu5EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_1epSGomWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_1epSG4mWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_1epSHImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSHYmWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__YS8wOu5EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_1epSH4mWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_1epSIImWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_1epSIYmWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSIomWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_cqHqtomlEeO69MVKNB7cFw" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_cqHqt4mlEeO69MVKNB7cFw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHquImlEeO69MVKNB7cFw"/> + </children> + <element xmi:type="uml:Interface" href="model.uml#_1epSEImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1epSEomWEeOGN4dVepS-Uw" x="683" y="219"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_61R_kYmWEeOGN4dVepS-Uw" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_61R_k4mWEeOGN4dVepS-Uw" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="__YS8weu5EeWb4rS4qgjiLg" visible="false" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_61R_lYmWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_61R_lomWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_61R_l4mWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_mImWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__YS8wuu5EeWb4rS4qgjiLg" visible="false" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_61R_momWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_61R_m4mWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_61R_nImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_nYmWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="__YS8w-u5EeWb4rS4qgjiLg" visible="false" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_61R_n4mWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_61R_oImWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_61R_oYmWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_oomWEeOGN4dVepS-Uw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_cqHquYmlEeO69MVKNB7cFw" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_cqHquomlEeO69MVKNB7cFw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cqHqu4mlEeO69MVKNB7cFw"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_61R_kImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_61R_komWEeOGN4dVepS-Uw" x="42" y="597" height="34"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_9TcEEImWEeOGN4dVepS-Uw" type="Comment_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_9TcEEomWEeOGN4dVepS-Uw" type="Comment_BodyLabel"/> + <element xmi:type="uml:Comment" href="model.uml#_9S_YIImWEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9TcEEYmWEeOGN4dVepS-Uw" x="309" y="101"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_D1WR4YmXEeOGN4dVepS-Uw" type="Comment_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_D1WR44mXEeOGN4dVepS-Uw" type="Comment_BodyLabel"/> + <element xmi:type="uml:Comment" href="model.uml#_D1WR4ImXEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1WR4omXEeOGN4dVepS-Uw" x="353" y="588"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_TnYnQYmXEeOGN4dVepS-Uw" type="Comment_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_TnYnQ4mXEeOGN4dVepS-Uw" type="Comment_BodyLabel"/> + <element xmi:type="uml:Comment" href="model.uml#_TnYnQImXEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TnYnQomXEeOGN4dVepS-Uw" x="360" y="457"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_anMSAYmXEeOGN4dVepS-Uw" type="Comment_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_anMSA4mXEeOGN4dVepS-Uw" type="Comment_BodyLabel"/> + <element xmi:type="uml:Comment" href="model.uml#_anMSAImXEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_anMSAomXEeOGN4dVepS-Uw" x="353" y="273" width="148"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_Tfr8cYmaEeOGN4dVepS-Uw" type="Comment_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_Tfr8c4maEeOGN4dVepS-Uw" type="Comment_BodyLabel"/> + <element xmi:type="uml:Comment" href="model.uml#_Tfr8cImaEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tfr8comaEeOGN4dVepS-Uw" x="997" y="72" width="167"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_TlMukYmaEeOGN4dVepS-Uw" type="Comment_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_TlV4gImaEeOGN4dVepS-Uw" type="Comment_BodyLabel"/> + <element xmi:type="uml:Comment" href="model.uml#_TlMukImaEeOGN4dVepS-Uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TlMukomaEeOGN4dVepS-Uw" x="881" y="248" width="149"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_4EGG0YmVEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_OgIPAImWEeOGN4dVepS-Uw" name="css_stylesheets" eObjectListValue="_OgIPAYmWEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:StringListValueStyle" xmi:id="_PR97oImWEeOGN4dVepS-Uw" name="cssClass"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="__YUK4Ou5EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/> + <element xmi:type="uml:Model" href="model.uml#_4DWgNImVEeOGN4dVepS-Uw"/> + <edges xmi:type="notation:Connector" xmi:id="_BTVBEImXEeOGN4dVepS-Uw" type="Comment_AnnotatedElementEdge" source="_9TcEEImWEeOGN4dVepS-Uw" target="_Cz4qUImWEeOGN4dVepS-Uw"> + <styles xmi:type="notation:FontStyle" xmi:id="_BTVBEYmXEeOGN4dVepS-Uw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BTVBEomXEeOGN4dVepS-Uw" points="[-35, 6, 146, -36]$[-97, -8, 84, -50]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BTeyEImXEeOGN4dVepS-Uw" id="(0.12323943661971831,0.31666666666666665)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_GP624ImXEeOGN4dVepS-Uw" type="Comment_AnnotatedElementEdge" source="_D1WR4YmXEeOGN4dVepS-Uw" target="_61R_kYmWEeOGN4dVepS-Uw"> + <styles xmi:type="notation:FontStyle" xmi:id="_GP624YmXEeOGN4dVepS-Uw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GP624omXEeOGN4dVepS-Uw" points="[-88, 4, 270, -13]$[-308, 18, 50, 1]"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_UCAtwImXEeOGN4dVepS-Uw" type="Comment_AnnotatedElementEdge" source="_TnYnQYmXEeOGN4dVepS-Uw" target="_Dp5FQImWEeOGN4dVepS-Uw"> + <styles xmi:type="notation:FontStyle" xmi:id="_UCAtwYmXEeOGN4dVepS-Uw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UCAtwomXEeOGN4dVepS-Uw" points="[-16, 1, 271, -20]$[-237, 18, 50, -3]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UCKewImXEeOGN4dVepS-Uw" id="(0.16,0.35)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_bQjYEImXEeOGN4dVepS-Uw" type="Comment_AnnotatedElementEdge" source="_anMSAYmXEeOGN4dVepS-Uw" target="_az5twYmWEeOGN4dVepS-Uw"> + <styles xmi:type="notation:FontStyle" xmi:id="_bQjYEYmXEeOGN4dVepS-Uw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bQjYEomXEeOGN4dVepS-Uw" points="[-74, -1, 224, -18]$[-386, -47, -88, -64]"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_YgJloImaEeOGN4dVepS-Uw" type="Comment_AnnotatedElementEdge" source="_TlMukYmaEeOGN4dVepS-Uw" target="_1epSEYmWEeOGN4dVepS-Uw"> + <styles xmi:type="notation:FontStyle" xmi:id="_YgJloYmaEeOGN4dVepS-Uw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YgJloomaEeOGN4dVepS-Uw" points="[-74, -6, 126, 1]$[-192, 45, 8, 52]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yWTbwLXCEeOtu7CRWiD6kg" id="(0.0,0.4)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yWTbwbXCEeOtu7CRWiD6kg" id="(1.0,0.56)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_Y5mAYImaEeOGN4dVepS-Uw" type="Comment_AnnotatedElementEdge" source="_Tfr8cYmaEeOGN4dVepS-Uw" target="_DZrfAYmWEeOGN4dVepS-Uw"> + <styles xmi:type="notation:FontStyle" xmi:id="_Y5mAYYmaEeOGN4dVepS-Uw"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y5mAYomaEeOGN4dVepS-Uw" points="[-83, -1, 122, -8]$[-198, -48, 7, -55]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yOHJELXCEeOtu7CRWiD6kg" id="(0.0,0.47)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yOHJEbXCEeOtu7CRWiD6kg" id="(1.0,0.5)"/> + </edges> + </notation:Diagram> + <notation:Diagram xmi:id="_8JDKAImVEeOGN4dVepS-Uw" type="PapyrusUMLClassDiagram" name="labels" measurementUnit="Pixel"> + <styles xmi:type="notation:DiagramStyle" xmi:id="_8JDKAYmVEeOGN4dVepS-Uw"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="__eqqgOu5EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/> + <element xmi:type="uml:Model" href="model.uml#_4DWgNImVEeOGN4dVepS-Uw"/> + </notation:Diagram> + <css:StyleSheetReference xmi:id="_OgIPAYmWEeOGN4dVepS-Uw" path="../../stylesheets/compartments.css"/> +</xmi:XMI> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/inferredNotationStylesTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/inferredNotationStylesTest/model.notation index ada4416768d..2be1a525f68 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/inferredNotationStylesTest/model.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/inferredNotationStylesTest/model.notation @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <notation:Diagram xmi:id="_MDVbsHTIEeG92qGoaUUGLQ" type="PapyrusUMLClassDiagram" name="main" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_cO9GAMQEEeSR9Nn53D1mFA" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_cO-UIMQEEeSR9Nn53D1mFA" type="5029"/> - <children xmi:type="notation:DecorationNode" xmi:id="_cO-7MMQEEeSR9Nn53D1mFA" type="8510"> + <children xmi:type="notation:Shape" xmi:id="_cO9GAMQEEeSR9Nn53D1mFA" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_cO-UIMQEEeSR9Nn53D1mFA" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_cO-7MMQEEeSR9Nn53D1mFA" type="Class_FloatingNameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_cO-7McQEEeSR9Nn53D1mFA" y="5"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_cO-7MsQEEeSR9Nn53D1mFA" type="7017"> + <children xmi:type="notation:BasicCompartment" xmi:id="_B1mssOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_cO-7M8QEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_cO-7NMQEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_cO-7NcQEEeSR9Nn53D1mFA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cO-7NsQEEeSR9Nn53D1mFA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_cO_iQMQEEeSR9Nn53D1mFA" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_B1nTwOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_cO_iQcQEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_cO_iQsQEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_cO_iQ8QEEeSR9Nn53D1mFA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cO_iRMQEEeSR9Nn53D1mFA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_cO_iRcQEEeSR9Nn53D1mFA" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_B1nTweu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_cO_iRsQEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_cO_iR8QEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_cO_iSMQEEeSR9Nn53D1mFA"/> @@ -27,24 +27,24 @@ <element xmi:type="uml:Class" href="model.uml#_cOP7YMQEEeSR9Nn53D1mFA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cO9GAcQEEeSR9Nn53D1mFA" x="33" y="58"/> </children> - <children xmi:type="notation:Shape" xmi:id="_drmqMMQEEeSR9Nn53D1mFA" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_drmqMsQEEeSR9Nn53D1mFA" type="5029"/> - <children xmi:type="notation:DecorationNode" xmi:id="_drnRQMQEEeSR9Nn53D1mFA" type="8510"> + <children xmi:type="notation:Shape" xmi:id="_drmqMMQEEeSR9Nn53D1mFA" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_drmqMsQEEeSR9Nn53D1mFA" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_drnRQMQEEeSR9Nn53D1mFA" type="Class_FloatingNameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_drnRQcQEEeSR9Nn53D1mFA" y="5"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_drnRQsQEEeSR9Nn53D1mFA" type="7017"> + <children xmi:type="notation:BasicCompartment" xmi:id="_B1n60Ou6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_drnRQ8QEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_drnRRMQEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_drnRRcQEEeSR9Nn53D1mFA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_drnRRsQEEeSR9Nn53D1mFA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_drnRR8QEEeSR9Nn53D1mFA" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_B1n60eu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_drnRSMQEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_drnRScQEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_drnRSsQEEeSR9Nn53D1mFA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_drnRS8QEEeSR9Nn53D1mFA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_drn4UMQEEeSR9Nn53D1mFA" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_B1oh4Ou6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_drn4UcQEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_drn4UsQEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_drn4U8QEEeSR9Nn53D1mFA"/> @@ -56,12 +56,12 @@ <element xmi:type="uml:Class" href="model.uml#_drk1AMQEEeSR9Nn53D1mFA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_drmqMcQEEeSR9Nn53D1mFA" x="159" y="58"/> </children> - <children xmi:type="notation:Shape" xmi:id="_hKqLAMQEEeSR9Nn53D1mFA" type="2006"> - <children xmi:type="notation:DecorationNode" xmi:id="_hKqLAsQEEeSR9Nn53D1mFA" type="5023"/> - <children xmi:type="notation:DecorationNode" xmi:id="_hKqyEMQEEeSR9Nn53D1mFA" type="8508"> + <children xmi:type="notation:Shape" xmi:id="_hKqLAMQEEeSR9Nn53D1mFA" type="Enumeration_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_hKqLAsQEEeSR9Nn53D1mFA" type="Enumeration_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_hKqyEMQEEeSR9Nn53D1mFA" type="Enumeration_FloatingNameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_hKqyEcQEEeSR9Nn53D1mFA" y="5"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_hKqyEsQEEeSR9Nn53D1mFA" type="7015"> + <children xmi:type="notation:BasicCompartment" xmi:id="_B1pI8Ou6EeWb4rS4qgjiLg" type="Enumeration_LiteralCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_hKqyE8QEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_hKqyFMQEEeSR9Nn53D1mFA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_hKqyFcQEEeSR9Nn53D1mFA"/> @@ -75,6 +75,7 @@ </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_MDVbsXTIEeG92qGoaUUGLQ"/> <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_ifHmEHTlEeGmJ4iNo0Pbxg" name="css_stylesheets" eObjectListValue="_ifHmEXTlEeGmJ4iNo0Pbxg"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_B1pwAOu6EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/> <element xmi:type="uml:Model" href="model.uml#_MBtEAHTIEeG92qGoaUUGLQ"/> </notation:Diagram> <css:StyleSheetReference xmi:id="_ifHmEXTlEeGmJ4iNo0Pbxg" path="/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/inferredNotationStylesTest.css"/> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.notation index 1ce4b796e3e..542e0a75f1e 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/kindSelectorTest/model.notation @@ -1,104 +1,104 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
- <notation:Diagram xmi:id="_WBxakCCUEeWbLoxdAKQ_jg" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_dtOqYCCUEeWbLoxdAKQ_jg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_dtOqYiCUEeWbLoxdAKQ_jg" type="5029"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_dtOqYyCUEeWbLoxdAKQ_jg" type="8510">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_dtOqZCCUEeWbLoxdAKQ_jg" y="5"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_dtOqZSCUEeWbLoxdAKQ_jg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_dtOqZiCUEeWbLoxdAKQ_jg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_dtOqZyCUEeWbLoxdAKQ_jg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_dtOqaCCUEeWbLoxdAKQ_jg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqaSCUEeWbLoxdAKQ_jg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_dtOqaiCUEeWbLoxdAKQ_jg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_dtOqayCUEeWbLoxdAKQ_jg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_dtOqbCCUEeWbLoxdAKQ_jg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_dtOqbSCUEeWbLoxdAKQ_jg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqbiCUEeWbLoxdAKQ_jg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_dtOqbyCUEeWbLoxdAKQ_jg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_dtOqcCCUEeWbLoxdAKQ_jg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_dtOqcSCUEeWbLoxdAKQ_jg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_dtOqciCUEeWbLoxdAKQ_jg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqcyCUEeWbLoxdAKQ_jg"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_dtIjwCCUEeWbLoxdAKQ_jg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqYSCUEeWbLoxdAKQ_jg" x="233" y="99"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_ix1zwSCUEeWbLoxdAKQ_jg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_ix1zwyCUEeWbLoxdAKQ_jg" type="5029"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_ix1zxCCUEeWbLoxdAKQ_jg" type="8510">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_ix1zxSCUEeWbLoxdAKQ_jg" y="5"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_ix1zxiCUEeWbLoxdAKQ_jg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_ix1zxyCUEeWbLoxdAKQ_jg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_ix1zyCCUEeWbLoxdAKQ_jg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_ix1zySCUEeWbLoxdAKQ_jg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1zyiCUEeWbLoxdAKQ_jg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_ix1zyyCUEeWbLoxdAKQ_jg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_ix1zzCCUEeWbLoxdAKQ_jg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_ix1zzSCUEeWbLoxdAKQ_jg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_ix1zziCUEeWbLoxdAKQ_jg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1zzyCUEeWbLoxdAKQ_jg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_ix1z0CCUEeWbLoxdAKQ_jg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_ix1z0SCUEeWbLoxdAKQ_jg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_ix1z0iCUEeWbLoxdAKQ_jg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_ix1z0yCUEeWbLoxdAKQ_jg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1z1CCUEeWbLoxdAKQ_jg"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_ix1zwCCUEeWbLoxdAKQ_jg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1zwiCUEeWbLoxdAKQ_jg" x="674" y="235"/>
- </children>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_WBxakSCUEeWbLoxdAKQ_jg" name="diagram_compatibility_version" stringValue="1.1.0"/>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_WBxakiCUEeWbLoxdAKQ_jg"/>
- <styles xmi:type="style:PapyrusViewStyle" xmi:id="_WBxakyCUEeWbLoxdAKQ_jg">
- <owner xmi:type="uml:Model" href="model.uml#_ANMzQP4fEeSePJTjmnYBcA"/>
- </styles>
- <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_aev8MCCUEeWbLoxdAKQ_jg" name="css_stylesheets" eObjectListValue="_RtvvUBjuEeWMjJEqhdMs0g"/>
- <element xmi:type="uml:Model" href="model.uml#_ANMzQP4fEeSePJTjmnYBcA"/>
- <edges xmi:type="notation:Connector" xmi:id="_tO62oCCUEeWbLoxdAKQ_jg" type="4001" source="_dtOqYCCUEeWbLoxdAKQ_jg" target="_ix1zwSCUEeWbLoxdAKQ_jg">
- <children xmi:type="notation:DecorationNode" xmi:id="_tPA9QCCUEeWbLoxdAKQ_jg" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9QSCUEeWbLoxdAKQ_jg" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_tPA9QiCUEeWbLoxdAKQ_jg" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9QyCUEeWbLoxdAKQ_jg" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_tPA9RCCUEeWbLoxdAKQ_jg" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9RSCUEeWbLoxdAKQ_jg" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_tPA9RiCUEeWbLoxdAKQ_jg" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9RyCUEeWbLoxdAKQ_jg" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_tPA9SCCUEeWbLoxdAKQ_jg" type="6033">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9SSCUEeWbLoxdAKQ_jg" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_tPA9SiCUEeWbLoxdAKQ_jg" type="6034">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9SyCUEeWbLoxdAKQ_jg" y="-20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_tO62oSCUEeWbLoxdAKQ_jg"/>
- <element xmi:type="uml:Association" href="model.uml#_tOupYCCUEeWbLoxdAKQ_jg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tO62oiCUEeWbLoxdAKQ_jg" points="[22, 7, -391, -165]$[415, 122, 2, -50]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tRTcQCCUEeWbLoxdAKQ_jg" id="(1.0,0.21)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tRTcQSCUEeWbLoxdAKQ_jg" id="(0.0,0.09)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_yudogCCUEeWbLoxdAKQ_jg" type="4006" source="_dtOqYCCUEeWbLoxdAKQ_jg" target="_ix1zwSCUEeWbLoxdAKQ_jg">
- <children xmi:type="notation:DecorationNode" xmi:id="_yudogyCUEeWbLoxdAKQ_jg" type="6014">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_yudohCCUEeWbLoxdAKQ_jg" y="40"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_yujvICCUEeWbLoxdAKQ_jg" type="6015">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_yujvISCUEeWbLoxdAKQ_jg" x="-35" y="28"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_yudogSCUEeWbLoxdAKQ_jg"/>
- <element xmi:type="uml:Abstraction" href="model.uml#_yuXh4CCUEeWbLoxdAKQ_jg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yudogiCUEeWbLoxdAKQ_jg" points="[38, 13, -357, -125]$[379, 152, -16, 14]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yvIW4CCUEeWbLoxdAKQ_jg" id="(1.0,0.91)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yvIW4SCUEeWbLoxdAKQ_jg" id="(0.0,0.74)"/>
- </edges>
- </notation:Diagram>
- <css:ModelStyleSheets xmi:id="_ZWq50CCUEeWbLoxdAKQ_jg"/>
- <css:EmbeddedStyleSheet xmi:id="_RtvvUBjuEeWMjJEqhdMs0g" label="CSSTest" content=""/>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> + <notation:Diagram xmi:id="_WBxakCCUEeWbLoxdAKQ_jg" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_dtOqYCCUEeWbLoxdAKQ_jg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_dtOqYiCUEeWbLoxdAKQ_jg" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_dtOqYyCUEeWbLoxdAKQ_jg" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_dtOqZCCUEeWbLoxdAKQ_jg" y="5"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_EC2AUOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_dtOqZiCUEeWbLoxdAKQ_jg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_dtOqZyCUEeWbLoxdAKQ_jg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_dtOqaCCUEeWbLoxdAKQ_jg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqaSCUEeWbLoxdAKQ_jg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_EC2nYOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_dtOqayCUEeWbLoxdAKQ_jg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_dtOqbCCUEeWbLoxdAKQ_jg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_dtOqbSCUEeWbLoxdAKQ_jg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqbiCUEeWbLoxdAKQ_jg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_EC2nYeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_dtOqcCCUEeWbLoxdAKQ_jg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_dtOqcSCUEeWbLoxdAKQ_jg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_dtOqciCUEeWbLoxdAKQ_jg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqcyCUEeWbLoxdAKQ_jg"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_dtIjwCCUEeWbLoxdAKQ_jg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtOqYSCUEeWbLoxdAKQ_jg" x="233" y="99"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_ix1zwSCUEeWbLoxdAKQ_jg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_ix1zwyCUEeWbLoxdAKQ_jg" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_ix1zxCCUEeWbLoxdAKQ_jg" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_ix1zxSCUEeWbLoxdAKQ_jg" y="5"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_EC2nYuu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_ix1zxyCUEeWbLoxdAKQ_jg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_ix1zyCCUEeWbLoxdAKQ_jg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_ix1zySCUEeWbLoxdAKQ_jg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1zyiCUEeWbLoxdAKQ_jg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_EC3OcOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_ix1zzCCUEeWbLoxdAKQ_jg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_ix1zzSCUEeWbLoxdAKQ_jg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_ix1zziCUEeWbLoxdAKQ_jg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1zzyCUEeWbLoxdAKQ_jg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_EC3Oceu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_ix1z0SCUEeWbLoxdAKQ_jg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_ix1z0iCUEeWbLoxdAKQ_jg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_ix1z0yCUEeWbLoxdAKQ_jg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1z1CCUEeWbLoxdAKQ_jg"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_ix1zwCCUEeWbLoxdAKQ_jg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ix1zwiCUEeWbLoxdAKQ_jg" x="674" y="235"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_WBxakSCUEeWbLoxdAKQ_jg" name="diagram_compatibility_version" stringValue="1.2.0"/> + <styles xmi:type="notation:DiagramStyle" xmi:id="_WBxakiCUEeWbLoxdAKQ_jg"/> + <styles xmi:type="style:PapyrusViewStyle" xmi:id="_WBxakyCUEeWbLoxdAKQ_jg"> + <owner xmi:type="uml:Model" href="model.uml#_ANMzQP4fEeSePJTjmnYBcA"/> + </styles> + <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_aev8MCCUEeWbLoxdAKQ_jg" name="css_stylesheets" eObjectListValue="_RtvvUBjuEeWMjJEqhdMs0g"/> + <element xmi:type="uml:Model" href="model.uml#_ANMzQP4fEeSePJTjmnYBcA"/> + <edges xmi:type="notation:Connector" xmi:id="_tO62oCCUEeWbLoxdAKQ_jg" type="Association_Edge" source="_dtOqYCCUEeWbLoxdAKQ_jg" target="_ix1zwSCUEeWbLoxdAKQ_jg"> + <children xmi:type="notation:DecorationNode" xmi:id="_tPA9QCCUEeWbLoxdAKQ_jg" type="Association_StereotypeLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9QSCUEeWbLoxdAKQ_jg" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_tPA9QiCUEeWbLoxdAKQ_jg" type="Association_NameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9QyCUEeWbLoxdAKQ_jg" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_tPA9RCCUEeWbLoxdAKQ_jg" type="Association_TargetRoleLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9RSCUEeWbLoxdAKQ_jg" y="-20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_tPA9RiCUEeWbLoxdAKQ_jg" type="Association_SourceRoleLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9RyCUEeWbLoxdAKQ_jg" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_tPA9SCCUEeWbLoxdAKQ_jg" type="Association_SourceMultiplicityLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9SSCUEeWbLoxdAKQ_jg" y="20"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_tPA9SiCUEeWbLoxdAKQ_jg" type="Association_TargetMultiplicityLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_tPA9SyCUEeWbLoxdAKQ_jg" y="-20"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_tO62oSCUEeWbLoxdAKQ_jg"/> + <element xmi:type="uml:Association" href="model.uml#_tOupYCCUEeWbLoxdAKQ_jg"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tO62oiCUEeWbLoxdAKQ_jg" points="[22, 7, -391, -165]$[415, 122, 2, -50]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tRTcQCCUEeWbLoxdAKQ_jg" id="(1.0,0.21)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tRTcQSCUEeWbLoxdAKQ_jg" id="(0.0,0.09)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_yudogCCUEeWbLoxdAKQ_jg" type="Abstraction_Edge" source="_dtOqYCCUEeWbLoxdAKQ_jg" target="_ix1zwSCUEeWbLoxdAKQ_jg"> + <children xmi:type="notation:DecorationNode" xmi:id="_yudogyCUEeWbLoxdAKQ_jg" type="Abstraction_NameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_yudohCCUEeWbLoxdAKQ_jg" y="40"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_yujvICCUEeWbLoxdAKQ_jg" type="Abstraction_StereotypeLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_yujvISCUEeWbLoxdAKQ_jg" x="-35" y="28"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_yudogSCUEeWbLoxdAKQ_jg"/> + <element xmi:type="uml:Abstraction" href="model.uml#_yuXh4CCUEeWbLoxdAKQ_jg"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yudogiCUEeWbLoxdAKQ_jg" points="[38, 13, -357, -125]$[379, 152, -16, 14]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yvIW4CCUEeWbLoxdAKQ_jg" id="(1.0,0.91)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yvIW4SCUEeWbLoxdAKQ_jg" id="(0.0,0.74)"/> + </edges> + </notation:Diagram> + <css:ModelStyleSheets xmi:id="_ZWq50CCUEeWbLoxdAKQ_jg"/> + <css:EmbeddedStyleSheet xmi:id="_RtvvUBjuEeWMjJEqhdMs0g" label="CSSTest" content=""/> +</xmi:XMI> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.notation index ff03f22d99a..98b8537e332 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/modelStylesheetTest/model.notation @@ -1,287 +1,288 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
- <notation:Diagram xmi:id="_o6cwoH_vEeGjwt6V_QPj1Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="2008" transparency="0">
- <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_prwRxX_vEeGjwt6V_QPj1Q" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_prwRxn_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_prwRx3_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRyH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRyX_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_prwRyn_vEeGjwt6V_QPj1Q" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_prwRy3_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_prwRzH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRzX_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRzn_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_prw40H_vEeGjwt6V_QPj1Q" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_prw40X_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_prw40n_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_prw403_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prw41H_vEeGjwt6V_QPj1Q"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_pqo3cH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prvDoX_vEeGjwt6V_QPj1Q" x="235" y="170"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbd3_vEeGjwt6V_QPj1Q" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbeH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbeX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIben_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbe3_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbfH_vEeGjwt6V_QPj1Q" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbfX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbfn_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbf3_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbgH_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbgX_vEeGjwt6V_QPj1Q" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbgn_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbg3_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbhH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbhX_vEeGjwt6V_QPj1Q"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_pwFYIH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwH0YX_vEeGjwt6V_QPj1Q" x="540" y="165"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="2004">
- <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="5011"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qRCwJ3_vEeGjwt6V_QPj1Q" type="7006">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qRCwKH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qRCwKX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXMH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXMX_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXMn_vEeGjwt6V_QPj1Q" type="7007">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXM3_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXNH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXNX_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXNn_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXN3_vEeGjwt6V_QPj1Q" type="7008">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXOH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXOX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXOn_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXO3_vEeGjwt6V_QPj1Q"/>
- </children>
- <element xmi:type="uml:Interface" href="model.uml#_qQ-esH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRBiAX_vEeGjwt6V_QPj1Q" x="134" y="378"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="2004">
- <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="5011"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqo3_vEeGjwt6V_QPj1Q" type="7006">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqpH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqpX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqpn_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqp3_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqqH_vEeGjwt6V_QPj1Q" type="7007">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqqX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqqn_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqq3_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqrH_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqrX_vEeGjwt6V_QPj1Q" type="7008">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqrn_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqr3_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqsH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqsX_vEeGjwt6V_QPj1Q"/>
- </children>
- <styles xmi:type="notation:StringListValueStyle" xmi:id="_yGpacH_vEeGjwt6V_QPj1Q" name="cssClass">
- <stringListValue>myInterface</stringListValue>
- </styles>
- <element xmi:type="uml:Interface" href="model.uml#_qWPZMH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWScgX_vEeGjwt6V_QPj1Q" x="450" y="375"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="2004">
- <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="5011"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwon_vEeGjwt6V_QPj1Q" type="7006">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwo3_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwpH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwpX_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwpn_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwp3_vEeGjwt6V_QPj1Q" type="7007">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwqH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwqX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwqn_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwq3_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwrH_vEeGjwt6V_QPj1Q" type="7008">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwrX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwrn_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwr3_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwsH_vEeGjwt6V_QPj1Q"/>
- </children>
- <element xmi:type="uml:Interface" href="model.uml#_qcCfMH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcFigX_vEeGjwt6V_QPj1Q" x="720" y="370"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="2007">
- <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="5026"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_j7Hqs4ABEeGwNeJPoDbgzg" type="7016">
- <styles xmi:type="notation:TitleStyle" xmi:id="_j7HqtIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7HqtYABEeGwNeJPoDbgzg"/>
- </children>
- <element xmi:type="uml:Package" href="model.uml#_j6agEIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7FOcYABEeGwNeJPoDbgzg" x="715" y="95" width="186" height="131"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="__Agjp4ABEeGwNeJPoDbgzg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="__AhKsIABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__AhKsYABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKsoABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKs4ABEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__AhKtIABEeGwNeJPoDbgzg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="__AhKtYABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__AhKtoABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKt4ABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKuIABEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__AhKuYABEeGwNeJPoDbgzg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="__AhKuoABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__AhKu4ABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKvIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKvYABEeGwNeJPoDbgzg"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#__AZ18IABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AfVgYABEeGwNeJPoDbgzg" x="105" y="525"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="__TvotYABEeGwNeJPoDbgzg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="__TvotoABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__Tvot4ABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__TvouIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TvouYABEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__TvouoABEeGwNeJPoDbgzg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="__Tvou4ABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__TvovIABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__TvovYABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPwIABEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__TwPwYABEeGwNeJPoDbgzg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="__TwPwoABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__TwPw4ABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__TwPxIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPxYABEeGwNeJPoDbgzg"/>
- </children>
- <styles xmi:type="notation:StringListValueStyle" xmi:id="_R7m7sIACEeGwNeJPoDbgzg" name="cssClass">
- <stringListValue>myClass</stringListValue>
- <stringListValue>myOtherClass</stringListValue>
- </styles>
- <element xmi:type="uml:Class" href="model.uml#__TtMcIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TuakYABEeGwNeJPoDbgzg" x="363" y="528"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="__jcRmIABEeGwNeJPoDbgzg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="__jcRmYABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__jcRmoABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__jcRm4ABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jcRnIABEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__jc4oIABEeGwNeJPoDbgzg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="__jc4oYABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__jc4ooABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4o4ABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4pIABEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__jc4pYABEeGwNeJPoDbgzg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="__jc4poABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__jc4p4ABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4qIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4qYABEeGwNeJPoDbgzg"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#__jacYIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jbqgYABEeGwNeJPoDbgzg" x="647" y="541"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_aQe79YACEeGwNeJPoDbgzg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_aQe79oACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_aQe794ACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7-IACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7-YACEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_aQe7-oACEeGwNeJPoDbgzg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_aQe7-4ACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_aQe7_IACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7_YACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7_oACEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_aQfjAIACEeGwNeJPoDbgzg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_aQfjAYACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_aQfjAoACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_aQfjA4ACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQfjBIACEeGwNeJPoDbgzg"/>
- </children>
- <styles xmi:type="notation:StringListValueStyle" xmi:id="_bTq3QIACEeGwNeJPoDbgzg" name="cssClass">
- <stringListValue>myClass</stringListValue>
- </styles>
- <element xmi:type="uml:Class" href="model.uml#_aQb4oIACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQdt0YACEeGwNeJPoDbgzg" x="859" y="555"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPQYACEeGwNeJPoDbgzg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPQoACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPQ4ACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPRIACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPRYACEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPRoACEeGwNeJPoDbgzg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPR4ACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPSIACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPSYACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPSoACEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPS4ACEeGwNeJPoDbgzg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPTIACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPTYACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPToACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPT4ACEeGwNeJPoDbgzg"/>
- </children>
- <styles xmi:type="notation:StringListValueStyle" xmi:id="_dz2VAIACEeGwNeJPoDbgzg" name="cssClass">
- <stringListValue>myClass</stringListValue>
- </styles>
- <element xmi:type="uml:Class" href="model.uml#_b0lL8IACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0maEYACEeGwNeJPoDbgzg" x="490" y="610"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_PSJHANt1EeOqjfzVFOrWIg" type="2002">
- <children xmi:type="notation:DecorationNode" xmi:id="_PSJuENt1EeOqjfzVFOrWIg" type="5005"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_PSKVINt1EeOqjfzVFOrWIg" type="7002">
- <styles xmi:type="notation:TitleStyle" xmi:id="_PSKVIdt1EeOqjfzVFOrWIg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_PSKVItt1EeOqjfzVFOrWIg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_PSKVI9t1EeOqjfzVFOrWIg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSKVJNt1EeOqjfzVFOrWIg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_PSK8MNt1EeOqjfzVFOrWIg" type="7003">
- <styles xmi:type="notation:TitleStyle" xmi:id="_PSK8Mdt1EeOqjfzVFOrWIg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_PSK8Mtt1EeOqjfzVFOrWIg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_PSK8M9t1EeOqjfzVFOrWIg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSK8NNt1EeOqjfzVFOrWIg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_PSLjQNt1EeOqjfzVFOrWIg" type="7004">
- <styles xmi:type="notation:TitleStyle" xmi:id="_PSLjQdt1EeOqjfzVFOrWIg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_PSLjQtt1EeOqjfzVFOrWIg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_PSLjQ9t1EeOqjfzVFOrWIg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSLjRNt1EeOqjfzVFOrWIg"/>
- </children>
- <element xmi:type="uml:Component" href="model.uml#_PSFcoNt1EeOqjfzVFOrWIg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSJHAdt1EeOqjfzVFOrWIg" x="121" y="158"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_o6cwoX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_wKMU0H_vEeGjwt6V_QPj1Q" name="css_stylesheets" eObjectListValue="_3CgL0Nt3EeOqjfzVFOrWIg"/>
- <element xmi:type="uml:Model" href="model.uml#_o6SYkH_vEeGjwt6V_QPj1Q"/>
- </notation:Diagram>
- <css:ModelStyleSheets xmi:id="_qfstMNtkEeODyIXFMLqUjw">
- <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_wKMU0X_vEeGjwt6V_QPj1Q" path="../../stylesheets/stylesheetTest.css"/>
- </css:ModelStyleSheets>
- <css:StyleSheetReference xmi:id="_3CgL0Nt3EeOqjfzVFOrWIg" path="../../stylesheets/ModelStylesheetTest.css"/>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> + <notation:Diagram xmi:id="_o6cwoH_vEeGjwt6V_QPj1Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="Class_Shape" transparency="0"> + <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPZ6EOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_prwRxn_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_prwRx3_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRyH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRyX_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPZ6Eeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_prwRy3_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_prwRzH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRzX_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRzn_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPZ6Euu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_prw40X_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_prw40n_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_prw403_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prw41H_vEeGjwt6V_QPj1Q"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_pqo3cH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prvDoX_vEeGjwt6V_QPj1Q" x="235" y="170"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPahIOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbeH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbeX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIben_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbe3_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPahIeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbfX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbfn_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbf3_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbgH_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPahIuu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbgn_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbg3_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbhH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbhX_vEeGjwt6V_QPj1Q"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_pwFYIH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwH0YX_vEeGjwt6V_QPj1Q" x="540" y="165"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPbIMOu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qRCwKH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qRCwKX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXMH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXMX_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPbIMeu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXM3_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXNH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXNX_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXNn_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPbIMuu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXOH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXOX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXOn_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXO3_vEeGjwt6V_QPj1Q"/> + </children> + <element xmi:type="uml:Interface" href="model.uml#_qQ-esH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRBiAX_vEeGjwt6V_QPj1Q" x="134" y="378"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPbIM-u6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqpH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqpX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqpn_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqp3_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPbvQOu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqqX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqqn_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqq3_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqrH_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPbvQeu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqrn_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqr3_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqsH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqsX_vEeGjwt6V_QPj1Q"/> + </children> + <styles xmi:type="notation:StringListValueStyle" xmi:id="_yGpacH_vEeGjwt6V_QPj1Q" name="cssClass"> + <stringListValue>myInterface</stringListValue> + </styles> + <element xmi:type="uml:Interface" href="model.uml#_qWPZMH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWScgX_vEeGjwt6V_QPj1Q" x="450" y="375"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPbvQuu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwo3_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwpH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwpX_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwpn_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPcWUOu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwqH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwqX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwqn_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwq3_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPcWUeu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwrX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwrn_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwr3_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwsH_vEeGjwt6V_QPj1Q"/> + </children> + <element xmi:type="uml:Interface" href="model.uml#_qcCfMH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcFigX_vEeGjwt6V_QPj1Q" x="720" y="370"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="Package_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="Package_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPc9YOu6EeWb4rS4qgjiLg" type="Package_PackagedElementCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_j7HqtIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7HqtYABEeGwNeJPoDbgzg"/> + </children> + <element xmi:type="uml:Package" href="model.uml#_j6agEIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7FOcYABEeGwNeJPoDbgzg" x="715" y="95" width="186" height="131"/> + </children> + <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPc9Yeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__AhKsIABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__AhKsYABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKsoABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKs4ABEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPc9Yuu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__AhKtYABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__AhKtoABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKt4ABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKuIABEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPc9Y-u6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__AhKuoABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__AhKu4ABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKvIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKvYABEeGwNeJPoDbgzg"/> + </children> + <element xmi:type="uml:Class" href="model.uml#__AZ18IABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AfVgYABEeGwNeJPoDbgzg" x="105" y="525"/> + </children> + <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPdkcOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__TvotoABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__Tvot4ABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__TvouIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TvouYABEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPdkceu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__Tvou4ABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__TvovIABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__TvovYABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPwIABEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPdkcuu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__TwPwoABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__TwPw4ABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__TwPxIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPxYABEeGwNeJPoDbgzg"/> + </children> + <styles xmi:type="notation:StringListValueStyle" xmi:id="_R7m7sIACEeGwNeJPoDbgzg" name="cssClass"> + <stringListValue>myClass</stringListValue> + <stringListValue>myOtherClass</stringListValue> + </styles> + <element xmi:type="uml:Class" href="model.uml#__TtMcIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TuakYABEeGwNeJPoDbgzg" x="363" y="528"/> + </children> + <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPeLgOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__jcRmYABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__jcRmoABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__jcRm4ABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jcRnIABEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPeLgeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__jc4oYABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__jc4ooABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4o4ABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4pIABEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPeLguu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__jc4poABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__jc4p4ABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4qIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4qYABEeGwNeJPoDbgzg"/> + </children> + <element xmi:type="uml:Class" href="model.uml#__jacYIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jbqgYABEeGwNeJPoDbgzg" x="647" y="541"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPeLg-u6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_aQe79oACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_aQe794ACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7-IACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7-YACEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPeykOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_aQe7-4ACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_aQe7_IACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7_YACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7_oACEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPeykeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_aQfjAYACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_aQfjAoACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_aQfjA4ACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQfjBIACEeGwNeJPoDbgzg"/> + </children> + <styles xmi:type="notation:StringListValueStyle" xmi:id="_bTq3QIACEeGwNeJPoDbgzg" name="cssClass"> + <stringListValue>myClass</stringListValue> + </styles> + <element xmi:type="uml:Class" href="model.uml#_aQb4oIACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQdt0YACEeGwNeJPoDbgzg" x="859" y="555"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPeykuu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPQoACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPQ4ACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPRIACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPRYACEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPfZoOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPR4ACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPSIACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPSYACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPSoACEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPfZoeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPTIACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPTYACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPToACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPT4ACEeGwNeJPoDbgzg"/> + </children> + <styles xmi:type="notation:StringListValueStyle" xmi:id="_dz2VAIACEeGwNeJPoDbgzg" name="cssClass"> + <stringListValue>myClass</stringListValue> + </styles> + <element xmi:type="uml:Class" href="model.uml#_b0lL8IACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0maEYACEeGwNeJPoDbgzg" x="490" y="610"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_PSJHANt1EeOqjfzVFOrWIg" type="Component_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_PSJuENt1EeOqjfzVFOrWIg" type="Component_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPfZouu6EeWb4rS4qgjiLg" type="Component_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_PSKVIdt1EeOqjfzVFOrWIg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_PSKVItt1EeOqjfzVFOrWIg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_PSKVI9t1EeOqjfzVFOrWIg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSKVJNt1EeOqjfzVFOrWIg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPfZo-u6EeWb4rS4qgjiLg" type="Component_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_PSK8Mdt1EeOqjfzVFOrWIg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_PSK8Mtt1EeOqjfzVFOrWIg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_PSK8M9t1EeOqjfzVFOrWIg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSK8NNt1EeOqjfzVFOrWIg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_FPgAsOu6EeWb4rS4qgjiLg" type="Component_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_PSLjQdt1EeOqjfzVFOrWIg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_PSLjQtt1EeOqjfzVFOrWIg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_PSLjQ9t1EeOqjfzVFOrWIg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSLjRNt1EeOqjfzVFOrWIg"/> + </children> + <element xmi:type="uml:Component" href="model.uml#_PSFcoNt1EeOqjfzVFOrWIg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSJHAdt1EeOqjfzVFOrWIg" x="121" y="158"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_o6cwoX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_wKMU0H_vEeGjwt6V_QPj1Q" name="css_stylesheets" eObjectListValue="_3CgL0Nt3EeOqjfzVFOrWIg"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_FPgnwOu6EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/> + <element xmi:type="uml:Model" href="model.uml#_o6SYkH_vEeGjwt6V_QPj1Q"/> + </notation:Diagram> + <css:ModelStyleSheets xmi:id="_qfstMNtkEeODyIXFMLqUjw"> + <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_wKMU0X_vEeGjwt6V_QPj1Q" path="../../stylesheets/stylesheetTest.css"/> + </css:ModelStyleSheets> + <css:StyleSheetReference xmi:id="_3CgL0Nt3EeOqjfzVFOrWIg" path="../../stylesheets/ModelStylesheetTest.css"/> +</xmi:XMI> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.notation index 0bd30352cd8..b6649ea6c9a 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedElementsTest/model.notation @@ -1,194 +1,194 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
- <notation:Diagram xmi:id="_bzQ40P76EeSxqMY0na5WMQ" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_QVnUUP77EeSStPeINaOwzA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_QV7dYP77EeSStPeINaOwzA" type="5029"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_QV7dYf77EeSStPeINaOwzA" type="8510">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_QV7dYv77EeSStPeINaOwzA" y="5"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_QV7dY_77EeSStPeINaOwzA" type="7017">
- <children xmi:type="notation:Shape" xmi:id="_hxeHMP77EeSStPeINaOwzA" type="3012">
- <element xmi:type="uml:Property" href="model.uml#_hxLMQP77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_hxeHMf77EeSStPeINaOwzA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_i3vywP77EeSStPeINaOwzA" type="3012">
- <element xmi:type="uml:Property" href="model.uml#_i3mBwP77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_i3vywf77EeSStPeINaOwzA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_jiy64P77EeSStPeINaOwzA" type="3012">
- <element xmi:type="uml:Property" href="model.uml#_jiyT0P77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_jiy64f77EeSStPeINaOwzA"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_uff5AP77EeSStPeINaOwzA" type="3012">
- <element xmi:type="uml:Property" href="model.uml#_ufWvEP77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_uff5Af77EeSStPeINaOwzA"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_QV7dZP77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_QV7dZf77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_QV7dZv77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QV7dZ_77EeSStPeINaOwzA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_QV7daP77EeSStPeINaOwzA" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_QV7daf77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_QV7dav77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_QV7da_77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QV7dbP77EeSStPeINaOwzA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_QV7dbf77EeSStPeINaOwzA" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_QV7dbv77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_QV7db_77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_QV7dcP77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QV7dcf77EeSStPeINaOwzA"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_QTkF4P77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QVnUUf77EeSStPeINaOwzA" x="262" y="70"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_lXyGkP77EeSStPeINaOwzA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_lXyGkv77EeSStPeINaOwzA" type="5029"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_lXyGk_77EeSStPeINaOwzA" type="8510">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_lXyGlP77EeSStPeINaOwzA" y="5"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_lXyGlf77EeSStPeINaOwzA" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_lXyGlv77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_lXyGl_77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_lXyGmP77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGmf77EeSStPeINaOwzA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_lXyGmv77EeSStPeINaOwzA" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_lXyGm_77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_lXyGnP77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_lXyGnf77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGnv77EeSStPeINaOwzA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_lXyGn_77EeSStPeINaOwzA" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_lXyGoP77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_lXyGof77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_lXyGov77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGo_77EeSStPeINaOwzA"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_lXoVkP77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGkf77EeSStPeINaOwzA" x="711" y="70"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_lkV74f77EeSStPeINaOwzA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_lkV74_77EeSStPeINaOwzA" type="5029"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_lkWi8P77EeSStPeINaOwzA" type="8510">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_lkWi8f77EeSStPeINaOwzA" y="5"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_lkWi8v77EeSStPeINaOwzA" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_lkWi8_77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_lkWi9P77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_lkWi9f77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkWi9v77EeSStPeINaOwzA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_lkWi9_77EeSStPeINaOwzA" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_lkWi-P77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_lkWi-f77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_lkWi-v77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkWi-_77EeSStPeINaOwzA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_lkWi_P77EeSStPeINaOwzA" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_lkWi_f77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_lkWi_v77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_lkWi__77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkWjAP77EeSStPeINaOwzA"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_lkV74P77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkV74v77EeSStPeINaOwzA" x="711" y="208"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_xZT-wf77EeSStPeINaOwzA" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_xZT-w_77EeSStPeINaOwzA" type="5029"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_xZT-xP77EeSStPeINaOwzA" type="8510">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_xZT-xf77EeSStPeINaOwzA" y="5"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_xZT-xv77EeSStPeINaOwzA" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_xZT-x_77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_xZT-yP77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_xZT-yf77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-yv77EeSStPeINaOwzA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_xZT-y_77EeSStPeINaOwzA" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_xZT-zP77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_xZT-zf77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_xZT-zv77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-z_77EeSStPeINaOwzA"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_xZT-0P77EeSStPeINaOwzA" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_xZT-0f77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_xZT-0v77EeSStPeINaOwzA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_xZT-0_77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-1P77EeSStPeINaOwzA"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_xZT-wP77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-wv77EeSStPeINaOwzA" x="711" y="349"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_9x2owP77EeSStPeINaOwzA" type="2012">
- <children xmi:type="notation:DecorationNode" xmi:id="_9x2owv77EeSStPeINaOwzA" type="5038"/>
- <element xmi:type="uml:Comment" href="model.uml#_9xte0P77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9x2owf77EeSStPeINaOwzA" x="888" y="236" height="22"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_-BeZIP77EeSStPeINaOwzA" type="2012">
- <children xmi:type="notation:DecorationNode" xmi:id="_-BeZIv77EeSStPeINaOwzA" type="5038"/>
- <element xmi:type="uml:Comment" href="model.uml#_-BdyEP77EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-BeZIf77EeSStPeINaOwzA" x="888" y="373" height="22"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_APMN4P78EeSStPeINaOwzA" type="2012">
- <children xmi:type="notation:DecorationNode" xmi:id="_APMN4v78EeSStPeINaOwzA" type="5038"/>
- <element xmi:type="uml:Comment" href="model.uml#_APDD8P78EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_APMN4f78EeSStPeINaOwzA" x="888" y="97" height="22"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_FlpVMf78EeSStPeINaOwzA" type="2012">
- <children xmi:type="notation:DecorationNode" xmi:id="_FlzGMP78EeSStPeINaOwzA" type="5038"/>
- <element xmi:type="uml:Comment" href="model.uml#_FlpVMP78EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FlpVMv78EeSStPeINaOwzA" x="42" y="102"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_N7EIAf78EeSStPeINaOwzA" type="2012">
- <children xmi:type="notation:DecorationNode" xmi:id="_N7EIA_78EeSStPeINaOwzA" type="5038"/>
- <element xmi:type="uml:Comment" href="model.uml#_N7EIAP78EeSStPeINaOwzA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N7EIAv78EeSStPeINaOwzA" x="60" y="236"/>
- </children>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_bzQ40f76EeSxqMY0na5WMQ" name="diagram_compatibility_version" stringValue="1.1.0"/>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_bzQ40v76EeSxqMY0na5WMQ"/>
- <styles xmi:type="style:PapyrusViewStyle" xmi:id="_bzQ40_76EeSxqMY0na5WMQ">
- <owner xmi:type="uml:Model" href="model.uml#_bx7cEP76EeSxqMY0na5WMQ"/>
- </styles>
- <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_3yJwIP77EeSStPeINaOwzA" name="css_stylesheets" eObjectListValue="_3yK-QP77EeSStPeINaOwzA"/>
- <element xmi:type="uml:Model" href="model.uml#_bx7cEP76EeSxqMY0na5WMQ"/>
- <edges xmi:type="notation:Connector" xmi:id="_DwbgAP78EeSStPeINaOwzA" type="4013" source="_APMN4P78EeSStPeINaOwzA" target="_lXyGkP77EeSStPeINaOwzA">
- <styles xmi:type="notation:FontStyle" xmi:id="_DwbgAf78EeSStPeINaOwzA"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DwbgAv78EeSStPeINaOwzA" points="[-70, 6, 135, -20]$[-198, -24, 7, -50]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DxCkAP78EeSStPeINaOwzA" id="(0.0,0.3333333333333333)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DxCkAf78EeSStPeINaOwzA" id="(1.0,0.36)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_ELIfAP78EeSStPeINaOwzA" type="4013" source="_9x2owP77EeSStPeINaOwzA" target="_lkV74f77EeSStPeINaOwzA">
- <styles xmi:type="notation:FontStyle" xmi:id="_ELIfAf78EeSStPeINaOwzA"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ELIfAv78EeSStPeINaOwzA" points="[-50, 4, 128, -12]$[-228, 16, -50, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ELS3EP78EeSStPeINaOwzA" id="(0.0,0.6666666666666666)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ELS3Ef78EeSStPeINaOwzA" id="(1.0,0.46)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_EbkHsP78EeSStPeINaOwzA" type="4013" source="_-BeZIP77EeSStPeINaOwzA" target="_xZT-wf77EeSStPeINaOwzA">
- <styles xmi:type="notation:FontStyle" xmi:id="_EbkHsf78EeSStPeINaOwzA"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EbkHsv78EeSStPeINaOwzA" points="[-50, 8, 127, -5]$[-127, 8, 50, -5]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ebt4sP78EeSStPeINaOwzA" id="(0.0,0.4444444444444444)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ebt4sf78EeSStPeINaOwzA" id="(1.0,0.42)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_F_rl0P78EeSStPeINaOwzA" type="4013" source="_FlpVMf78EeSStPeINaOwzA" target="_QVnUUP77EeSStPeINaOwzA">
- <styles xmi:type="notation:FontStyle" xmi:id="_F_rl0f78EeSStPeINaOwzA"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_F_rl0v78EeSStPeINaOwzA" points="[37, 6, -162, 0]$[150, 0, -49, -6]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GAT38P78EeSStPeINaOwzA" id="(1.0,0.4444444444444444)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GAT38f78EeSStPeINaOwzA" id="(0.0,0.4444444444444444)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_OSphkP78EeSStPeINaOwzA" type="4013" source="_N7EIAf78EeSStPeINaOwzA" target="_QVnUUP77EeSStPeINaOwzA">
- <styles xmi:type="notation:FontStyle" xmi:id="_OSphkf78EeSStPeINaOwzA"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OSphkv78EeSStPeINaOwzA" points="[0, 0, -133, 53]$[133, 0, 0, 53]$[133, -53, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSz5oP78EeSStPeINaOwzA" id="(1.0,0.5166666666666667)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSz5of78EeSStPeINaOwzA" id="(0.16080402010050251,1.0)"/>
- </edges>
- </notation:Diagram>
- <css:ModelStyleSheets xmi:id="_1QY-AP77EeSStPeINaOwzA"/>
- <css:EmbeddedStyleSheet xmi:id="_3yK-QP77EeSStPeINaOwzA" label="" content="Property[type] {
	bold: true;
}

[type=NamedClass]{
	fontColor: red;	
}
"/>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> + <notation:Diagram xmi:id="_bzQ40P76EeSxqMY0na5WMQ" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_QVnUUP77EeSStPeINaOwzA" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_QV7dYP77EeSStPeINaOwzA" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_QV7dYf77EeSStPeINaOwzA" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_QV7dYv77EeSStPeINaOwzA" y="5"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_HtzPIOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_hxeHMP77EeSStPeINaOwzA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="model.uml#_hxLMQP77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_hxeHMf77EeSStPeINaOwzA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_i3vywP77EeSStPeINaOwzA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="model.uml#_i3mBwP77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_i3vywf77EeSStPeINaOwzA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_jiy64P77EeSStPeINaOwzA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="model.uml#_jiyT0P77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_jiy64f77EeSStPeINaOwzA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_uff5AP77EeSStPeINaOwzA" type="Property_ClassAttributeLabel"> + <element xmi:type="uml:Property" href="model.uml#_ufWvEP77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_uff5Af77EeSStPeINaOwzA"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_QV7dZP77EeSStPeINaOwzA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_QV7dZf77EeSStPeINaOwzA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_QV7dZv77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QV7dZ_77EeSStPeINaOwzA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Htz2MOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_QV7daf77EeSStPeINaOwzA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_QV7dav77EeSStPeINaOwzA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_QV7da_77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QV7dbP77EeSStPeINaOwzA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Htz2Meu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_QV7dbv77EeSStPeINaOwzA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_QV7db_77EeSStPeINaOwzA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_QV7dcP77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QV7dcf77EeSStPeINaOwzA"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_QTkF4P77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QVnUUf77EeSStPeINaOwzA" x="262" y="70"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_lXyGkP77EeSStPeINaOwzA" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_lXyGkv77EeSStPeINaOwzA" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_lXyGk_77EeSStPeINaOwzA" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_lXyGlP77EeSStPeINaOwzA" y="5"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Ht0dQOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_lXyGlv77EeSStPeINaOwzA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_lXyGl_77EeSStPeINaOwzA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_lXyGmP77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGmf77EeSStPeINaOwzA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Ht0dQeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_lXyGm_77EeSStPeINaOwzA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_lXyGnP77EeSStPeINaOwzA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_lXyGnf77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGnv77EeSStPeINaOwzA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Ht1EUOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_lXyGoP77EeSStPeINaOwzA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_lXyGof77EeSStPeINaOwzA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_lXyGov77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGo_77EeSStPeINaOwzA"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_lXoVkP77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lXyGkf77EeSStPeINaOwzA" x="711" y="70"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_lkV74f77EeSStPeINaOwzA" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_lkV74_77EeSStPeINaOwzA" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_lkWi8P77EeSStPeINaOwzA" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_lkWi8f77EeSStPeINaOwzA" y="5"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Ht1EUeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_lkWi8_77EeSStPeINaOwzA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_lkWi9P77EeSStPeINaOwzA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_lkWi9f77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkWi9v77EeSStPeINaOwzA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Ht1rYOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_lkWi-P77EeSStPeINaOwzA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_lkWi-f77EeSStPeINaOwzA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_lkWi-v77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkWi-_77EeSStPeINaOwzA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Ht1rYeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_lkWi_f77EeSStPeINaOwzA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_lkWi_v77EeSStPeINaOwzA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_lkWi__77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkWjAP77EeSStPeINaOwzA"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_lkV74P77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkV74v77EeSStPeINaOwzA" x="711" y="208"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_xZT-wf77EeSStPeINaOwzA" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_xZT-w_77EeSStPeINaOwzA" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_xZT-xP77EeSStPeINaOwzA" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_xZT-xf77EeSStPeINaOwzA" y="5"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Ht1rYuu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xZT-x_77EeSStPeINaOwzA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_xZT-yP77EeSStPeINaOwzA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_xZT-yf77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-yv77EeSStPeINaOwzA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Ht2ScOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xZT-zP77EeSStPeINaOwzA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_xZT-zf77EeSStPeINaOwzA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_xZT-zv77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-z_77EeSStPeINaOwzA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Ht2Sceu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xZT-0f77EeSStPeINaOwzA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_xZT-0v77EeSStPeINaOwzA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_xZT-0_77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-1P77EeSStPeINaOwzA"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_xZT-wP77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZT-wv77EeSStPeINaOwzA" x="711" y="349"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_9x2owP77EeSStPeINaOwzA" type="Comment_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_9x2owv77EeSStPeINaOwzA" type="Comment_BodyLabel"/> + <element xmi:type="uml:Comment" href="model.uml#_9xte0P77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9x2owf77EeSStPeINaOwzA" x="888" y="236" height="22"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_-BeZIP77EeSStPeINaOwzA" type="Comment_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_-BeZIv77EeSStPeINaOwzA" type="Comment_BodyLabel"/> + <element xmi:type="uml:Comment" href="model.uml#_-BdyEP77EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-BeZIf77EeSStPeINaOwzA" x="888" y="373" height="22"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_APMN4P78EeSStPeINaOwzA" type="Comment_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_APMN4v78EeSStPeINaOwzA" type="Comment_BodyLabel"/> + <element xmi:type="uml:Comment" href="model.uml#_APDD8P78EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_APMN4f78EeSStPeINaOwzA" x="888" y="97" height="22"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_FlpVMf78EeSStPeINaOwzA" type="Comment_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_FlzGMP78EeSStPeINaOwzA" type="Comment_BodyLabel"/> + <element xmi:type="uml:Comment" href="model.uml#_FlpVMP78EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FlpVMv78EeSStPeINaOwzA" x="42" y="102"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_N7EIAf78EeSStPeINaOwzA" type="Comment_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_N7EIA_78EeSStPeINaOwzA" type="Comment_BodyLabel"/> + <element xmi:type="uml:Comment" href="model.uml#_N7EIAP78EeSStPeINaOwzA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N7EIAv78EeSStPeINaOwzA" x="60" y="236"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_bzQ40f76EeSxqMY0na5WMQ" name="diagram_compatibility_version" stringValue="1.2.0"/> + <styles xmi:type="notation:DiagramStyle" xmi:id="_bzQ40v76EeSxqMY0na5WMQ"/> + <styles xmi:type="style:PapyrusViewStyle" xmi:id="_bzQ40_76EeSxqMY0na5WMQ"> + <owner xmi:type="uml:Model" href="model.uml#_bx7cEP76EeSxqMY0na5WMQ"/> + </styles> + <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_3yJwIP77EeSStPeINaOwzA" name="css_stylesheets" eObjectListValue="_3yK-QP77EeSStPeINaOwzA"/> + <element xmi:type="uml:Model" href="model.uml#_bx7cEP76EeSxqMY0na5WMQ"/> + <edges xmi:type="notation:Connector" xmi:id="_DwbgAP78EeSStPeINaOwzA" type="Comment_AnnotatedElementEdge" source="_APMN4P78EeSStPeINaOwzA" target="_lXyGkP77EeSStPeINaOwzA"> + <styles xmi:type="notation:FontStyle" xmi:id="_DwbgAf78EeSStPeINaOwzA"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DwbgAv78EeSStPeINaOwzA" points="[-70, 6, 135, -20]$[-198, -24, 7, -50]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DxCkAP78EeSStPeINaOwzA" id="(0.0,0.3333333333333333)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DxCkAf78EeSStPeINaOwzA" id="(1.0,0.36)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_ELIfAP78EeSStPeINaOwzA" type="Comment_AnnotatedElementEdge" source="_9x2owP77EeSStPeINaOwzA" target="_lkV74f77EeSStPeINaOwzA"> + <styles xmi:type="notation:FontStyle" xmi:id="_ELIfAf78EeSStPeINaOwzA"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ELIfAv78EeSStPeINaOwzA" points="[-50, 4, 128, -12]$[-228, 16, -50, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ELS3EP78EeSStPeINaOwzA" id="(0.0,0.6666666666666666)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ELS3Ef78EeSStPeINaOwzA" id="(1.0,0.46)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_EbkHsP78EeSStPeINaOwzA" type="Comment_AnnotatedElementEdge" source="_-BeZIP77EeSStPeINaOwzA" target="_xZT-wf77EeSStPeINaOwzA"> + <styles xmi:type="notation:FontStyle" xmi:id="_EbkHsf78EeSStPeINaOwzA"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EbkHsv78EeSStPeINaOwzA" points="[-50, 8, 127, -5]$[-127, 8, 50, -5]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ebt4sP78EeSStPeINaOwzA" id="(0.0,0.4444444444444444)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ebt4sf78EeSStPeINaOwzA" id="(1.0,0.42)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_F_rl0P78EeSStPeINaOwzA" type="Comment_AnnotatedElementEdge" source="_FlpVMf78EeSStPeINaOwzA" target="_QVnUUP77EeSStPeINaOwzA"> + <styles xmi:type="notation:FontStyle" xmi:id="_F_rl0f78EeSStPeINaOwzA"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_F_rl0v78EeSStPeINaOwzA" points="[37, 6, -162, 0]$[150, 0, -49, -6]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GAT38P78EeSStPeINaOwzA" id="(1.0,0.4444444444444444)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GAT38f78EeSStPeINaOwzA" id="(0.0,0.4444444444444444)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_OSphkP78EeSStPeINaOwzA" type="Comment_AnnotatedElementEdge" source="_N7EIAf78EeSStPeINaOwzA" target="_QVnUUP77EeSStPeINaOwzA"> + <styles xmi:type="notation:FontStyle" xmi:id="_OSphkf78EeSStPeINaOwzA"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OSphkv78EeSStPeINaOwzA" points="[0, 0, -133, 53]$[133, 0, 0, 53]$[133, -53, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSz5oP78EeSStPeINaOwzA" id="(1.0,0.5166666666666667)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSz5of78EeSStPeINaOwzA" id="(0.16080402010050251,1.0)"/> + </edges> + </notation:Diagram> + <css:ModelStyleSheets xmi:id="_1QY-AP77EeSStPeINaOwzA"/> + <css:EmbeddedStyleSheet xmi:id="_3yK-QP77EeSStPeINaOwzA" label="" content="Property[type] {
	bold: true;
}

[type=NamedClass]{
	fontColor: red;	
}
"/> +</xmi:XMI> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.notation index e2afbef18fd..bb37cbec184 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/namedStylesTest/model.notation @@ -1,40 +1,40 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
- <notation:Diagram xmi:id="_w2EO8IeLEeWWuLbIMcUiMw" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_xoz6gIeLEeWWuLbIMcUiMw" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_xoz6goeLEeWWuLbIMcUiMw" type="5029"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_xoz6g4eLEeWWuLbIMcUiMw" type="8510">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_xoz6hIeLEeWWuLbIMcUiMw" y="5"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_xoz6hYeLEeWWuLbIMcUiMw" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_xoz6hoeLEeWWuLbIMcUiMw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_xoz6h4eLEeWWuLbIMcUiMw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_xoz6iIeLEeWWuLbIMcUiMw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6iYeLEeWWuLbIMcUiMw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_xoz6ioeLEeWWuLbIMcUiMw" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_xoz6i4eLEeWWuLbIMcUiMw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_xoz6jIeLEeWWuLbIMcUiMw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_xoz6jYeLEeWWuLbIMcUiMw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6joeLEeWWuLbIMcUiMw"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_xoz6j4eLEeWWuLbIMcUiMw" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_xoz6kIeLEeWWuLbIMcUiMw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_xoz6kYeLEeWWuLbIMcUiMw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_xoz6koeLEeWWuLbIMcUiMw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6k4eLEeWWuLbIMcUiMw"/>
- </children>
- <styles xmi:type="notation:BooleanValueStyle" xmi:id="_16dV4IeLEeWWuLbIMcUiMw" name="shapeVisibility" booleanValue="true"/>
- <element xmi:type="uml:Class" href="model.uml#_xoqJgIeLEeWWuLbIMcUiMw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6gYeLEeWWuLbIMcUiMw" x="263" y="235"/>
- </children>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_w2EO8YeLEeWWuLbIMcUiMw" name="diagram_compatibility_version" stringValue="1.1.0"/>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_w2EO8oeLEeWWuLbIMcUiMw"/>
- <styles xmi:type="style:PapyrusViewStyle" xmi:id="_w2EO84eLEeWWuLbIMcUiMw">
- <owner xmi:type="uml:Model" href="model.uml#_w0uLIIeLEeWWuLbIMcUiMw"/>
- </styles>
- <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_R4g8MIeMEeWNLI4pV5eoIA" name="css_stylesheets" eObjectListValue="_jv3Q4IePEeWNLI4pV5eoIA"/>
- <element xmi:type="uml:Model" href="model.uml#_w0uLIIeLEeWWuLbIMcUiMw"/>
- </notation:Diagram>
- <css:StyleSheetReference xmi:id="_jv3Q4IePEeWNLI4pV5eoIA" path="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/namedStyleTest.css"/>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> + <notation:Diagram xmi:id="_w2EO8IeLEeWWuLbIMcUiMw" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_xoz6gIeLEeWWuLbIMcUiMw" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_xoz6goeLEeWWuLbIMcUiMw" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_xoz6g4eLEeWWuLbIMcUiMw" type="Class_FloatingNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_xoz6hIeLEeWWuLbIMcUiMw" y="5"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_JiqfAOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xoz6hoeLEeWWuLbIMcUiMw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_xoz6h4eLEeWWuLbIMcUiMw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_xoz6iIeLEeWWuLbIMcUiMw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6iYeLEeWWuLbIMcUiMw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_JirGEOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xoz6i4eLEeWWuLbIMcUiMw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_xoz6jIeLEeWWuLbIMcUiMw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_xoz6jYeLEeWWuLbIMcUiMw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6joeLEeWWuLbIMcUiMw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_JirGEeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xoz6kIeLEeWWuLbIMcUiMw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_xoz6kYeLEeWWuLbIMcUiMw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_xoz6koeLEeWWuLbIMcUiMw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6k4eLEeWWuLbIMcUiMw"/> + </children> + <styles xmi:type="notation:BooleanValueStyle" xmi:id="_16dV4IeLEeWWuLbIMcUiMw" name="shapeVisibility" booleanValue="true"/> + <element xmi:type="uml:Class" href="model.uml#_xoqJgIeLEeWWuLbIMcUiMw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xoz6gYeLEeWWuLbIMcUiMw" x="263" y="235"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_w2EO8YeLEeWWuLbIMcUiMw" name="diagram_compatibility_version" stringValue="1.2.0"/> + <styles xmi:type="notation:DiagramStyle" xmi:id="_w2EO8oeLEeWWuLbIMcUiMw"/> + <styles xmi:type="style:PapyrusViewStyle" xmi:id="_w2EO84eLEeWWuLbIMcUiMw"> + <owner xmi:type="uml:Model" href="model.uml#_w0uLIIeLEeWWuLbIMcUiMw"/> + </styles> + <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_R4g8MIeMEeWNLI4pV5eoIA" name="css_stylesheets" eObjectListValue="_jv3Q4IePEeWNLI4pV5eoIA"/> + <element xmi:type="uml:Model" href="model.uml#_w0uLIIeLEeWWuLbIMcUiMw"/> + </notation:Diagram> + <css:StyleSheetReference xmi:id="_jv3Q4IePEeWNLI4pV5eoIA" path="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/stylesheets/namedStyleTest.css"/> +</xmi:XMI> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/projectStylesheetsTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/projectStylesheetsTest/model.notation index 933eb6ad99b..b61a622ae19 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/projectStylesheetsTest/model.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/projectStylesheetsTest/model.notation @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <notation:Diagram xmi:id="_o6cwoH_vEeGjwt6V_QPj1Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="2008" transparency="0"> - <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_prwRxX_vEeGjwt6V_QPj1Q" type="7017"> + <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="Class_Shape" transparency="0"> + <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjqB8Ou6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_prwRxn_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_prwRx3_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRyH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRyX_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_prwRyn_vEeGjwt6V_QPj1Q" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjqB8eu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_prwRy3_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_prwRzH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRzX_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRzn_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_prw40H_vEeGjwt6V_QPj1Q" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjqB8uu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_prw40X_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_prw40n_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_prw403_vEeGjwt6V_QPj1Q"/> @@ -24,21 +24,21 @@ <element xmi:type="uml:Class" href="model.uml#_pqo3cH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prvDoX_vEeGjwt6V_QPj1Q" x="235" y="170"/> </children> - <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbd3_vEeGjwt6V_QPj1Q" type="7017"> + <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjqpAOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbeH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbeX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIben_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbe3_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbfH_vEeGjwt6V_QPj1Q" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjqpAeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbfX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbfn_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbf3_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbgH_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbgX_vEeGjwt6V_QPj1Q" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjqpAuu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbgn_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbg3_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbhH_vEeGjwt6V_QPj1Q"/> @@ -47,21 +47,21 @@ <element xmi:type="uml:Class" href="model.uml#_pwFYIH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwH0YX_vEeGjwt6V_QPj1Q" x="540" y="165"/> </children> - <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="2004"> - <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="5011"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_qRCwJ3_vEeGjwt6V_QPj1Q" type="7006"> + <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjrQEOu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qRCwKH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qRCwKX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXMH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXMX_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXMn_vEeGjwt6V_QPj1Q" type="7007"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjrQEeu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXM3_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXNH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXNX_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXNn_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXN3_vEeGjwt6V_QPj1Q" type="7008"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjrQEuu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXOH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXOX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXOn_vEeGjwt6V_QPj1Q"/> @@ -70,21 +70,21 @@ <element xmi:type="uml:Interface" href="model.uml#_qQ-esH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRBiAX_vEeGjwt6V_QPj1Q" x="134" y="378"/> </children> - <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="2004"> - <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="5011"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqo3_vEeGjwt6V_QPj1Q" type="7006"> + <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjrQE-u6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqpH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqpX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqpn_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqp3_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqqH_vEeGjwt6V_QPj1Q" type="7007"> + <children xmi:type="notation:BasicCompartment" xmi:id="_Kjr3IOu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqqX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqqn_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqq3_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqrH_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqrX_vEeGjwt6V_QPj1Q" type="7008"> + <children xmi:type="notation:BasicCompartment" xmi:id="_Kjr3Ieu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqrn_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqr3_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqsH_vEeGjwt6V_QPj1Q"/> @@ -96,21 +96,21 @@ <element xmi:type="uml:Interface" href="model.uml#_qWPZMH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWScgX_vEeGjwt6V_QPj1Q" x="450" y="375"/> </children> - <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="2004"> - <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="5011"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwon_vEeGjwt6V_QPj1Q" type="7006"> + <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Kjr3Iuu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwo3_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwpH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwpX_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwpn_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwp3_vEeGjwt6V_QPj1Q" type="7007"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjseMOu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwqH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwqX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwqn_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwq3_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwrH_vEeGjwt6V_QPj1Q" type="7008"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjseMeu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwrX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwrn_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwr3_vEeGjwt6V_QPj1Q"/> @@ -119,30 +119,30 @@ <element xmi:type="uml:Interface" href="model.uml#_qcCfMH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcFigX_vEeGjwt6V_QPj1Q" x="720" y="370"/> </children> - <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="2007"> - <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="5026"/> - <children xmi:type="notation:DecorationNode" xmi:id="_j7Hqs4ABEeGwNeJPoDbgzg" type="7016"> + <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="Package_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="Package_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjtFQOu6EeWb4rS4qgjiLg" type="Package_PackagedElementCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_j7HqtIABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7HqtYABEeGwNeJPoDbgzg"/> </children> <element xmi:type="uml:Package" href="model.uml#_j6agEIABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7FOcYABEeGwNeJPoDbgzg" x="715" y="95" width="186" height="131"/> </children> - <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="__Agjp4ABEeGwNeJPoDbgzg" type="7017"> + <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjtFQeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__AhKsIABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__AhKsYABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKsoABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKs4ABEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="__AhKtIABEeGwNeJPoDbgzg" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjtFQuu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__AhKtYABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__AhKtoABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKt4ABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKuIABEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="__AhKuYABEeGwNeJPoDbgzg" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjtsUOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__AhKuoABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__AhKu4ABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKvIABEeGwNeJPoDbgzg"/> @@ -151,21 +151,21 @@ <element xmi:type="uml:Class" href="model.uml#__AZ18IABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AfVgYABEeGwNeJPoDbgzg" x="105" y="525"/> </children> - <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="__TvotYABEeGwNeJPoDbgzg" type="7017"> + <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjtsUeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__TvotoABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__Tvot4ABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__TvouIABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TvouYABEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="__TvouoABEeGwNeJPoDbgzg" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjtsUuu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__Tvou4ABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__TvovIABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__TvovYABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPwIABEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="__TwPwYABEeGwNeJPoDbgzg" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjuTYOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__TwPwoABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__TwPw4ABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__TwPxIABEeGwNeJPoDbgzg"/> @@ -178,21 +178,21 @@ <element xmi:type="uml:Class" href="model.uml#__TtMcIABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TuakYABEeGwNeJPoDbgzg" x="363" y="528"/> </children> - <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="__jcRmIABEeGwNeJPoDbgzg" type="7017"> + <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjuTYeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__jcRmYABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__jcRmoABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__jcRm4ABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jcRnIABEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="__jc4oIABEeGwNeJPoDbgzg" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjuTYuu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__jc4oYABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__jc4ooABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4o4ABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4pIABEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="__jc4pYABEeGwNeJPoDbgzg" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_Kju6cOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__jc4poABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__jc4p4ABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4qIABEeGwNeJPoDbgzg"/> @@ -201,21 +201,21 @@ <element xmi:type="uml:Class" href="model.uml#__jacYIABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jbqgYABEeGwNeJPoDbgzg" x="647" y="541"/> </children> - <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_aQe79YACEeGwNeJPoDbgzg" type="7017"> + <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Kju6ceu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_aQe79oACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_aQe794ACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7-IACEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7-YACEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_aQe7-oACEeGwNeJPoDbgzg" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_Kju6cuu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_aQe7-4ACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_aQe7_IACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7_YACEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7_oACEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_aQfjAIACEeGwNeJPoDbgzg" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjvhgOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_aQfjAYACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_aQfjAoACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_aQfjA4ACEeGwNeJPoDbgzg"/> @@ -227,21 +227,21 @@ <element xmi:type="uml:Class" href="model.uml#_aQb4oIACEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQdt0YACEeGwNeJPoDbgzg" x="859" y="555"/> </children> - <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPQYACEeGwNeJPoDbgzg" type="7017"> + <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Kjvhgeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPQoACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPQ4ACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPRIACEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPRYACEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPRoACEeGwNeJPoDbgzg" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_Kjvhguu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPR4ACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPSIACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPSYACEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPSoACEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPS4ACEeGwNeJPoDbgzg" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_Kjvhg-u6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPTIACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPTYACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPToACEeGwNeJPoDbgzg"/> @@ -253,21 +253,21 @@ <element xmi:type="uml:Class" href="model.uml#_b0lL8IACEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0maEYACEeGwNeJPoDbgzg" x="490" y="610"/> </children> - <children xmi:type="notation:Shape" xmi:id="_PSJHANt1EeOqjfzVFOrWIg" type="2002"> - <children xmi:type="notation:DecorationNode" xmi:id="_PSJuENt1EeOqjfzVFOrWIg" type="5005"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_PSKVINt1EeOqjfzVFOrWIg" type="7002"> + <children xmi:type="notation:Shape" xmi:id="_PSJHANt1EeOqjfzVFOrWIg" type="Component_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_PSJuENt1EeOqjfzVFOrWIg" type="Component_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjwIkOu6EeWb4rS4qgjiLg" type="Component_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_PSKVIdt1EeOqjfzVFOrWIg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_PSKVItt1EeOqjfzVFOrWIg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_PSKVI9t1EeOqjfzVFOrWIg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSKVJNt1EeOqjfzVFOrWIg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_PSK8MNt1EeOqjfzVFOrWIg" type="7003"> + <children xmi:type="notation:BasicCompartment" xmi:id="_KjwvoOu6EeWb4rS4qgjiLg" type="Component_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_PSK8Mdt1EeOqjfzVFOrWIg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_PSK8Mtt1EeOqjfzVFOrWIg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_PSK8M9t1EeOqjfzVFOrWIg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSK8NNt1EeOqjfzVFOrWIg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_PSLjQNt1EeOqjfzVFOrWIg" type="7004"> + <children xmi:type="notation:BasicCompartment" xmi:id="_Kjwvoeu6EeWb4rS4qgjiLg" type="Component_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_PSLjQdt1EeOqjfzVFOrWIg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_PSLjQtt1EeOqjfzVFOrWIg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_PSLjQ9t1EeOqjfzVFOrWIg"/> @@ -278,6 +278,7 @@ </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_o6cwoX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_wKMU0H_vEeGjwt6V_QPj1Q" name="css_stylesheets" eObjectListValue="_3CgL0Nt3EeOqjfzVFOrWIg"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_KjxWsOu6EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/> <element xmi:type="uml:Model" href="model.uml#_o6SYkH_vEeGjwt6V_QPj1Q"/> </notation:Diagram> <css:ModelStyleSheets xmi:id="_qfstMNtkEeODyIXFMLqUjw"> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation index da68a47987d..f3df2aa8dfa 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/stylesheetTest/model.notation @@ -1,261 +1,262 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
- <notation:Diagram xmi:id="_o6cwoH_vEeGjwt6V_QPj1Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_prwRxX_vEeGjwt6V_QPj1Q" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_prwRxn_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_prwRx3_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRyH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRyX_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_prwRyn_vEeGjwt6V_QPj1Q" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_prwRy3_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_prwRzH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRzX_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRzn_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_prw40H_vEeGjwt6V_QPj1Q" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_prw40X_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_prw40n_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_prw403_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prw41H_vEeGjwt6V_QPj1Q"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_pqo3cH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prvDoX_vEeGjwt6V_QPj1Q" x="235" y="170"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbd3_vEeGjwt6V_QPj1Q" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbeH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbeX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIben_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbe3_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbfH_vEeGjwt6V_QPj1Q" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbfX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbfn_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbf3_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbgH_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbgX_vEeGjwt6V_QPj1Q" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbgn_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbg3_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbhH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbhX_vEeGjwt6V_QPj1Q"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#_pwFYIH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwH0YX_vEeGjwt6V_QPj1Q" x="540" y="165"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="2004">
- <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="5011"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qRCwJ3_vEeGjwt6V_QPj1Q" type="7006">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qRCwKH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qRCwKX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXMH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXMX_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXMn_vEeGjwt6V_QPj1Q" type="7007">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXM3_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXNH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXNX_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXNn_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXN3_vEeGjwt6V_QPj1Q" type="7008">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXOH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXOX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXOn_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXO3_vEeGjwt6V_QPj1Q"/>
- </children>
- <element xmi:type="uml:Interface" href="model.uml#_qQ-esH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRBiAX_vEeGjwt6V_QPj1Q" x="134" y="378"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="2004">
- <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="5011"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqo3_vEeGjwt6V_QPj1Q" type="7006">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqpH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqpX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqpn_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqp3_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqqH_vEeGjwt6V_QPj1Q" type="7007">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqqX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqqn_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqq3_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqrH_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqrX_vEeGjwt6V_QPj1Q" type="7008">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqrn_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqr3_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqsH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqsX_vEeGjwt6V_QPj1Q"/>
- </children>
- <styles xmi:type="notation:StringListValueStyle" xmi:id="_yGpacH_vEeGjwt6V_QPj1Q" name="cssClass">
- <stringListValue>myInterface</stringListValue>
- </styles>
- <element xmi:type="uml:Interface" href="model.uml#_qWPZMH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWScgX_vEeGjwt6V_QPj1Q" x="450" y="375"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="2004">
- <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="5011"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwon_vEeGjwt6V_QPj1Q" type="7006">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwo3_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwpH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwpX_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwpn_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwp3_vEeGjwt6V_QPj1Q" type="7007">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwqH_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwqX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwqn_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwq3_vEeGjwt6V_QPj1Q"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwrH_vEeGjwt6V_QPj1Q" type="7008">
- <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwrX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwrn_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwr3_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwsH_vEeGjwt6V_QPj1Q"/>
- </children>
- <element xmi:type="uml:Interface" href="model.uml#_qcCfMH_vEeGjwt6V_QPj1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcFigX_vEeGjwt6V_QPj1Q" x="720" y="370"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="2007">
- <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="5026"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_j7Hqs4ABEeGwNeJPoDbgzg" type="7016">
- <styles xmi:type="notation:TitleStyle" xmi:id="_j7HqtIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7HqtYABEeGwNeJPoDbgzg"/>
- </children>
- <element xmi:type="uml:Package" href="model.uml#_j6agEIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7FOcYABEeGwNeJPoDbgzg" x="715" y="95" width="186" height="131"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="__Agjp4ABEeGwNeJPoDbgzg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="__AhKsIABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__AhKsYABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKsoABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKs4ABEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__AhKtIABEeGwNeJPoDbgzg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="__AhKtYABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__AhKtoABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKt4ABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKuIABEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__AhKuYABEeGwNeJPoDbgzg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="__AhKuoABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__AhKu4ABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKvIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKvYABEeGwNeJPoDbgzg"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#__AZ18IABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AfVgYABEeGwNeJPoDbgzg" x="105" y="525"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="__TvotYABEeGwNeJPoDbgzg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="__TvotoABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__Tvot4ABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__TvouIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TvouYABEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__TvouoABEeGwNeJPoDbgzg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="__Tvou4ABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__TvovIABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__TvovYABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPwIABEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__TwPwYABEeGwNeJPoDbgzg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="__TwPwoABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__TwPw4ABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__TwPxIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPxYABEeGwNeJPoDbgzg"/>
- </children>
- <styles xmi:type="notation:StringListValueStyle" xmi:id="_R7m7sIACEeGwNeJPoDbgzg" name="cssClass">
- <stringListValue>myClass</stringListValue>
- <stringListValue>myOtherClass</stringListValue>
- </styles>
- <element xmi:type="uml:Class" href="model.uml#__TtMcIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TuakYABEeGwNeJPoDbgzg" x="363" y="528"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="__jcRmIABEeGwNeJPoDbgzg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="__jcRmYABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__jcRmoABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__jcRm4ABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jcRnIABEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__jc4oIABEeGwNeJPoDbgzg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="__jc4oYABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__jc4ooABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4o4ABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4pIABEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="__jc4pYABEeGwNeJPoDbgzg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="__jc4poABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__jc4p4ABEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4qIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4qYABEeGwNeJPoDbgzg"/>
- </children>
- <element xmi:type="uml:Class" href="model.uml#__jacYIABEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jbqgYABEeGwNeJPoDbgzg" x="647" y="541"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_aQe79YACEeGwNeJPoDbgzg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_aQe79oACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_aQe794ACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7-IACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7-YACEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_aQe7-oACEeGwNeJPoDbgzg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_aQe7-4ACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_aQe7_IACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7_YACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7_oACEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_aQfjAIACEeGwNeJPoDbgzg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_aQfjAYACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_aQfjAoACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_aQfjA4ACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQfjBIACEeGwNeJPoDbgzg"/>
- </children>
- <styles xmi:type="notation:StringListValueStyle" xmi:id="_bTq3QIACEeGwNeJPoDbgzg" name="cssClass">
- <stringListValue>myClass</stringListValue>
- </styles>
- <element xmi:type="uml:Class" href="model.uml#_aQb4oIACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQdt0YACEeGwNeJPoDbgzg" x="859" y="555"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPQYACEeGwNeJPoDbgzg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPQoACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPQ4ACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPRIACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPRYACEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPRoACEeGwNeJPoDbgzg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPR4ACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPSIACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPSYACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPSoACEeGwNeJPoDbgzg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPS4ACEeGwNeJPoDbgzg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPTIACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPTYACEeGwNeJPoDbgzg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPToACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPT4ACEeGwNeJPoDbgzg"/>
- </children>
- <styles xmi:type="notation:StringListValueStyle" xmi:id="_dz2VAIACEeGwNeJPoDbgzg" name="cssClass">
- <stringListValue>myClass</stringListValue>
- </styles>
- <element xmi:type="uml:Class" href="model.uml#_b0lL8IACEeGwNeJPoDbgzg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0maEYACEeGwNeJPoDbgzg" x="490" y="610"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_o6cwoX_vEeGjwt6V_QPj1Q"/>
- <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_wKMU0H_vEeGjwt6V_QPj1Q" name="css_stylesheets" eObjectListValue="_wKMU0X_vEeGjwt6V_QPj1Q"/>
- <element xmi:type="uml:Model" href="model.uml#_o6SYkH_vEeGjwt6V_QPj1Q"/>
- </notation:Diagram>
- <css:StyleSheetReference xmi:id="_wKMU0X_vEeGjwt6V_QPj1Q" path="../../stylesheets/stylesheetTest.css"/>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> + <notation:Diagram xmi:id="_o6cwoH_vEeGjwt6V_QPj1Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lwx8YOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_prwRxn_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_prwRx3_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRyH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRyX_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lwx8Yeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_prwRy3_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_prwRzH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRzX_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRzn_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lwx8Yuu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_prw40X_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_prw40n_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_prw403_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prw41H_vEeGjwt6V_QPj1Q"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_pqo3cH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prvDoX_vEeGjwt6V_QPj1Q" x="235" y="170"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lwx8Y-u6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbeH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbeX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIben_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbe3_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lwx8ZOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbfX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbfn_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbf3_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbgH_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_LwyjcOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbgn_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbg3_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbhH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbhX_vEeGjwt6V_QPj1Q"/> + </children> + <element xmi:type="uml:Class" href="model.uml#_pwFYIH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwH0YX_vEeGjwt6V_QPj1Q" x="540" y="165"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lwyjceu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qRCwKH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qRCwKX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXMH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXMX_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lwyjcuu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXM3_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXNH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXNX_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXNn_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lwyjc-u6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXOH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXOX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXOn_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXO3_vEeGjwt6V_QPj1Q"/> + </children> + <element xmi:type="uml:Interface" href="model.uml#_qQ-esH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRBiAX_vEeGjwt6V_QPj1Q" x="134" y="378"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_LwyjdOu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqpH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqpX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqpn_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqp3_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_LwzKgOu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqqX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqqn_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqq3_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqrH_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_LwzKgeu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqrn_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqr3_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqsH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqsX_vEeGjwt6V_QPj1Q"/> + </children> + <styles xmi:type="notation:StringListValueStyle" xmi:id="_yGpacH_vEeGjwt6V_QPj1Q" name="cssClass"> + <stringListValue>myInterface</stringListValue> + </styles> + <element xmi:type="uml:Interface" href="model.uml#_qWPZMH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWScgX_vEeGjwt6V_QPj1Q" x="450" y="375"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_LwzKguu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwo3_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwpH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwpX_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwpn_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_LwzKg-u6EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwqH_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwqX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwqn_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwq3_vEeGjwt6V_QPj1Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_LwzKhOu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwrX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwrn_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwr3_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwsH_vEeGjwt6V_QPj1Q"/> + </children> + <element xmi:type="uml:Interface" href="model.uml#_qcCfMH_vEeGjwt6V_QPj1Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcFigX_vEeGjwt6V_QPj1Q" x="720" y="370"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="Package_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="Package_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_LwzxkOu6EeWb4rS4qgjiLg" type="Package_PackagedElementCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_j7HqtIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7HqtYABEeGwNeJPoDbgzg"/> + </children> + <element xmi:type="uml:Package" href="model.uml#_j6agEIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7FOcYABEeGwNeJPoDbgzg" x="715" y="95" width="186" height="131"/> + </children> + <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lwzxkeu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__AhKsIABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__AhKsYABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKsoABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKs4ABEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lwzxkuu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__AhKtYABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__AhKtoABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKt4ABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKuIABEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lwzxk-u6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__AhKuoABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__AhKu4ABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKvIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKvYABEeGwNeJPoDbgzg"/> + </children> + <element xmi:type="uml:Class" href="model.uml#__AZ18IABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AfVgYABEeGwNeJPoDbgzg" x="105" y="525"/> + </children> + <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0YoOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__TvotoABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__Tvot4ABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__TvouIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TvouYABEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0Yoeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__Tvou4ABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__TvovIABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__TvovYABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPwIABEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0Youu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__TwPwoABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__TwPw4ABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__TwPxIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPxYABEeGwNeJPoDbgzg"/> + </children> + <styles xmi:type="notation:StringListValueStyle" xmi:id="_R7m7sIACEeGwNeJPoDbgzg" name="cssClass"> + <stringListValue>myClass</stringListValue> + <stringListValue>myOtherClass</stringListValue> + </styles> + <element xmi:type="uml:Class" href="model.uml#__TtMcIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TuakYABEeGwNeJPoDbgzg" x="363" y="528"/> + </children> + <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0_sOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__jcRmYABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__jcRmoABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__jcRm4ABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jcRnIABEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0_seu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__jc4oYABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__jc4ooABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4o4ABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4pIABEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0_suu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="__jc4poABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="__jc4p4ABEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4qIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4qYABEeGwNeJPoDbgzg"/> + </children> + <element xmi:type="uml:Class" href="model.uml#__jacYIABEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jbqgYABEeGwNeJPoDbgzg" x="647" y="541"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lw0_s-u6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_aQe79oACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_aQe794ACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7-IACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7-YACEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lw1mwOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_aQe7-4ACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_aQe7_IACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7_YACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7_oACEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lw1mweu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_aQfjAYACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_aQfjAoACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_aQfjA4ACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQfjBIACEeGwNeJPoDbgzg"/> + </children> + <styles xmi:type="notation:StringListValueStyle" xmi:id="_bTq3QIACEeGwNeJPoDbgzg" name="cssClass"> + <stringListValue>myClass</stringListValue> + </styles> + <element xmi:type="uml:Class" href="model.uml#_aQb4oIACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQdt0YACEeGwNeJPoDbgzg" x="859" y="555"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lw1mwuu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPQoACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPQ4ACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPRIACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPRYACEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lw1mw-u6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPR4ACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPSIACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPSYACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPSoACEeGwNeJPoDbgzg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Lw1mxOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPTIACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPTYACEeGwNeJPoDbgzg"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPToACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPT4ACEeGwNeJPoDbgzg"/> + </children> + <styles xmi:type="notation:StringListValueStyle" xmi:id="_dz2VAIACEeGwNeJPoDbgzg" name="cssClass"> + <stringListValue>myClass</stringListValue> + </styles> + <element xmi:type="uml:Class" href="model.uml#_b0lL8IACEeGwNeJPoDbgzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0maEYACEeGwNeJPoDbgzg" x="490" y="610"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_o6cwoX_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_wKMU0H_vEeGjwt6V_QPj1Q" name="css_stylesheets" eObjectListValue="_wKMU0X_vEeGjwt6V_QPj1Q"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_Lw2N0Ou6EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/> + <element xmi:type="uml:Model" href="model.uml#_o6SYkH_vEeGjwt6V_QPj1Q"/> + </notation:Diagram> + <css:StyleSheetReference xmi:id="_wKMU0X_vEeGjwt6V_QPj1Q" path="../../stylesheets/stylesheetTest.css"/> +</xmi:XMI> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/workspaceThemeTest/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/workspaceThemeTest/model.notation index 0d35682ea11..d7070750faf 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/workspaceThemeTest/model.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/resources/model/workspaceThemeTest/model.notation @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <notation:Diagram xmi:id="_o6cwoH_vEeGjwt6V_QPj1Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="2008" transparency="0"> - <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_prwRxX_vEeGjwt6V_QPj1Q" type="7017"> + <children xmi:type="notation:Shape" xmi:id="_prvDoH_vEeGjwt6V_QPj1Q" type="Class_Shape" transparency="0"> + <children xmi:type="notation:DecorationNode" xmi:id="_prwRxH_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6iZwOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_prwRxn_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_prwRx3_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRyH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRyX_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_prwRyn_vEeGjwt6V_QPj1Q" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6jA0Ou6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_prwRy3_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_prwRzH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_prwRzX_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prwRzn_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_prw40H_vEeGjwt6V_QPj1Q" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6jA0eu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_prw40X_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_prw40n_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_prw403_vEeGjwt6V_QPj1Q"/> @@ -24,21 +24,21 @@ <element xmi:type="uml:Class" href="model.uml#_pqo3cH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_prvDoX_vEeGjwt6V_QPj1Q" x="235" y="170"/> </children> - <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbd3_vEeGjwt6V_QPj1Q" type="7017"> + <children xmi:type="notation:Shape" xmi:id="_pwH0YH_vEeGjwt6V_QPj1Q" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_pwIbdn_vEeGjwt6V_QPj1Q" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6jA0uu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbeH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbeX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIben_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbe3_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbfH_vEeGjwt6V_QPj1Q" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6jA0-u6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbfX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbfn_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbf3_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwIbgH_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_pwIbgX_vEeGjwt6V_QPj1Q" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6jA1Ou6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_pwIbgn_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_pwIbg3_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_pwIbhH_vEeGjwt6V_QPj1Q"/> @@ -47,21 +47,21 @@ <element xmi:type="uml:Class" href="model.uml#_pwFYIH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pwH0YX_vEeGjwt6V_QPj1Q" x="540" y="165"/> </children> - <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="2004"> - <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="5011"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_qRCwJ3_vEeGjwt6V_QPj1Q" type="7006"> + <children xmi:type="notation:Shape" xmi:id="_qRBiAH_vEeGjwt6V_QPj1Q" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_qRCwJn_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6jn4Ou6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qRCwKH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qRCwKX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXMH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXMX_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXMn_vEeGjwt6V_QPj1Q" type="7007"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6jn4eu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXM3_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXNH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXNX_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRDXNn_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_qRDXN3_vEeGjwt6V_QPj1Q" type="7008"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6jn4uu6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qRDXOH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qRDXOX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qRDXOn_vEeGjwt6V_QPj1Q"/> @@ -70,21 +70,21 @@ <element xmi:type="uml:Interface" href="model.uml#_qQ-esH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qRBiAX_vEeGjwt6V_QPj1Q" x="134" y="378"/> </children> - <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="2004"> - <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="5011"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqo3_vEeGjwt6V_QPj1Q" type="7006"> + <children xmi:type="notation:Shape" xmi:id="_qWScgH_vEeGjwt6V_QPj1Q" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_qWTqon_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6jn4-u6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqpH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqpX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqpn_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqp3_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqqH_vEeGjwt6V_QPj1Q" type="7007"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6jn5Ou6EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqqX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqqn_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqq3_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWTqrH_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_qWTqrX_vEeGjwt6V_QPj1Q" type="7008"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6kO8Ou6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qWTqrn_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qWTqr3_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qWTqsH_vEeGjwt6V_QPj1Q"/> @@ -96,21 +96,21 @@ <element xmi:type="uml:Interface" href="model.uml#_qWPZMH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qWScgX_vEeGjwt6V_QPj1Q" x="450" y="375"/> </children> - <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="2004"> - <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="5011"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwon_vEeGjwt6V_QPj1Q" type="7006"> + <children xmi:type="notation:Shape" xmi:id="_qcFigH_vEeGjwt6V_QPj1Q" type="Interface_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_qcGwoX_vEeGjwt6V_QPj1Q" type="Interface_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6kO8eu6EeWb4rS4qgjiLg" type="Interface_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwo3_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwpH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwpX_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwpn_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwp3_vEeGjwt6V_QPj1Q" type="7007"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6kO8uu6EeWb4rS4qgjiLg" type="Interface_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwqH_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwqX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwqn_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcGwq3_vEeGjwt6V_QPj1Q"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_qcGwrH_vEeGjwt6V_QPj1Q" type="7008"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6kO8-u6EeWb4rS4qgjiLg" type="Interface_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_qcGwrX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:SortingStyle" xmi:id="_qcGwrn_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_qcGwr3_vEeGjwt6V_QPj1Q"/> @@ -119,30 +119,30 @@ <element xmi:type="uml:Interface" href="model.uml#_qcCfMH_vEeGjwt6V_QPj1Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qcFigX_vEeGjwt6V_QPj1Q" x="720" y="370"/> </children> - <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="2007"> - <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="5026"/> - <children xmi:type="notation:DecorationNode" xmi:id="_j7Hqs4ABEeGwNeJPoDbgzg" type="7016"> + <children xmi:type="notation:Shape" xmi:id="_j7FOcIABEeGwNeJPoDbgzg" type="Package_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_j7HqsoABEeGwNeJPoDbgzg" type="Package_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6kO9Ou6EeWb4rS4qgjiLg" type="Package_PackagedElementCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_j7HqtIABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7HqtYABEeGwNeJPoDbgzg"/> </children> <element xmi:type="uml:Package" href="model.uml#_j6agEIABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j7FOcYABEeGwNeJPoDbgzg" x="715" y="95" width="186" height="131"/> </children> - <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="__Agjp4ABEeGwNeJPoDbgzg" type="7017"> + <children xmi:type="notation:Shape" xmi:id="__AfVgIABEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="__AgjpoABEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6kO9eu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__AhKsIABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__AhKsYABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKsoABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKs4ABEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="__AhKtIABEeGwNeJPoDbgzg" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6k2AOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__AhKtYABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__AhKtoABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKt4ABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AhKuIABEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="__AhKuYABEeGwNeJPoDbgzg" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6k2Aeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__AhKuoABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__AhKu4ABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__AhKvIABEeGwNeJPoDbgzg"/> @@ -151,21 +151,21 @@ <element xmi:type="uml:Class" href="model.uml#__AZ18IABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__AfVgYABEeGwNeJPoDbgzg" x="105" y="525"/> </children> - <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="__TvotYABEeGwNeJPoDbgzg" type="7017"> + <children xmi:type="notation:Shape" xmi:id="__TuakIABEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="__TvotIABEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6k2Auu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__TvotoABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__Tvot4ABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__TvouIABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TvouYABEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="__TvouoABEeGwNeJPoDbgzg" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6k2A-u6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__Tvou4ABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__TvovIABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__TvovYABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TwPwIABEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="__TwPwYABEeGwNeJPoDbgzg" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6k2BOu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__TwPwoABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__TwPw4ABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__TwPxIABEeGwNeJPoDbgzg"/> @@ -178,21 +178,21 @@ <element xmi:type="uml:Class" href="model.uml#__TtMcIABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__TuakYABEeGwNeJPoDbgzg" x="363" y="528"/> </children> - <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="__jcRmIABEeGwNeJPoDbgzg" type="7017"> + <children xmi:type="notation:Shape" xmi:id="__jbqgIABEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="__jcRl4ABEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6ldEOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__jcRmYABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__jcRmoABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__jcRm4ABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jcRnIABEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="__jc4oIABEeGwNeJPoDbgzg" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6ldEeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__jc4oYABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__jc4ooABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4o4ABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jc4pIABEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="__jc4pYABEeGwNeJPoDbgzg" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6ldEuu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__jc4poABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="__jc4p4ABEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="__jc4qIABEeGwNeJPoDbgzg"/> @@ -201,21 +201,21 @@ <element xmi:type="uml:Class" href="model.uml#__jacYIABEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__jbqgYABEeGwNeJPoDbgzg" x="647" y="541"/> </children> - <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_aQe79YACEeGwNeJPoDbgzg" type="7017"> + <children xmi:type="notation:Shape" xmi:id="_aQdt0IACEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_aQe79IACEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6ldE-u6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_aQe79oACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_aQe794ACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7-IACEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7-YACEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_aQe7-oACEeGwNeJPoDbgzg" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6ldFOu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_aQe7-4ACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_aQe7_IACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_aQe7_YACEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQe7_oACEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_aQfjAIACEeGwNeJPoDbgzg" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6ldFeu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_aQfjAYACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_aQfjAoACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_aQfjA4ACEeGwNeJPoDbgzg"/> @@ -227,21 +227,21 @@ <element xmi:type="uml:Class" href="model.uml#_aQb4oIACEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aQdt0YACEeGwNeJPoDbgzg" x="859" y="555"/> </children> - <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPQYACEeGwNeJPoDbgzg" type="7017"> + <children xmi:type="notation:Shape" xmi:id="_b0maEIACEeGwNeJPoDbgzg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_b0oPQIACEeGwNeJPoDbgzg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6mEIOu6EeWb4rS4qgjiLg" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPQoACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPQ4ACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPRIACEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPRYACEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPRoACEeGwNeJPoDbgzg" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6mEIeu6EeWb4rS4qgjiLg" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPR4ACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPSIACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPSYACEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0oPSoACEeGwNeJPoDbgzg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_b0oPS4ACEeGwNeJPoDbgzg" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6mEIuu6EeWb4rS4qgjiLg" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_b0oPTIACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_b0oPTYACEeGwNeJPoDbgzg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_b0oPToACEeGwNeJPoDbgzg"/> @@ -253,21 +253,21 @@ <element xmi:type="uml:Class" href="model.uml#_b0lL8IACEeGwNeJPoDbgzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b0maEYACEeGwNeJPoDbgzg" x="490" y="610"/> </children> - <children xmi:type="notation:Shape" xmi:id="_PSJHANt1EeOqjfzVFOrWIg" type="2002"> - <children xmi:type="notation:DecorationNode" xmi:id="_PSJuENt1EeOqjfzVFOrWIg" type="5005"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_PSKVINt1EeOqjfzVFOrWIg" type="7002"> + <children xmi:type="notation:Shape" xmi:id="_PSJHANt1EeOqjfzVFOrWIg" type="Component_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_PSJuENt1EeOqjfzVFOrWIg" type="Component_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6mEI-u6EeWb4rS4qgjiLg" type="Component_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_PSKVIdt1EeOqjfzVFOrWIg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_PSKVItt1EeOqjfzVFOrWIg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_PSKVI9t1EeOqjfzVFOrWIg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSKVJNt1EeOqjfzVFOrWIg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_PSK8MNt1EeOqjfzVFOrWIg" type="7003"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6mEJOu6EeWb4rS4qgjiLg" type="Component_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_PSK8Mdt1EeOqjfzVFOrWIg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_PSK8Mtt1EeOqjfzVFOrWIg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_PSK8M9t1EeOqjfzVFOrWIg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSK8NNt1EeOqjfzVFOrWIg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_PSLjQNt1EeOqjfzVFOrWIg" type="7004"> + <children xmi:type="notation:BasicCompartment" xmi:id="_M6mrMOu6EeWb4rS4qgjiLg" type="Component_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_PSLjQdt1EeOqjfzVFOrWIg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_PSLjQtt1EeOqjfzVFOrWIg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_PSLjQ9t1EeOqjfzVFOrWIg"/> @@ -278,6 +278,7 @@ </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_o6cwoX_vEeGjwt6V_QPj1Q"/> <styles xmi:type="notation:EObjectListValueStyle" xmi:id="_wKMU0H_vEeGjwt6V_QPj1Q" name="css_stylesheets" eObjectListValue="_3CgL0Nt3EeOqjfzVFOrWIg"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_M6mrMeu6EeWb4rS4qgjiLg" name="diagram_compatibility_version" stringValue="1.2.0"/> <element xmi:type="uml:Model" href="model.uml#_o6SYkH_vEeGjwt6V_QPj1Q"/> </notation:Diagram> <css:ModelStyleSheets xmi:id="_qfstMNtkEeODyIXFMLqUjw"> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java index 43c3c436003..f74f81ab5c1 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSCompartmentsTests.java @@ -1,254 +1,261 @@ -/*****************************************************************************
- * Copyright (c) 2014 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
-import org.eclipse.gmf.runtime.notation.BasicCompartment;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Shape;
-import org.eclipse.gmf.runtime.notation.StringListValueStyle;
-import org.eclipse.gmf.runtime.notation.TitleStyle;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.helper.ResetStyleHelper;
-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
-import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator;
-import org.eclipse.papyrus.junit.framework.classification.NotImplemented;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
-import org.eclipse.uml2.uml.NamedElement;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-/**
- * Test case for Compartment-related styles and properties
- * See resources/model/compartmentsTest/model.di for details
- *
- * @author Camille Letavernier
- *
- */
-public class CSSCompartmentsTests extends AbstractPapyrusTest {
-
- public static final String CLASS_ATTRIBUTE_COMPARTMENT_TYPE = "7017"; //$NON-NLS-1$
-
- public static final String CLASS_OPERATION_COMPARTMENT_TYPE = "7018"; //$NON-NLS-1$
-
- public static final String CLASS_CLASSIFIER_COMPARTMENT_TYPE = "7019"; //$NON-NLS-1$
-
- public static final String INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE = "7006"; //$NON-NLS-1$
-
- public static final String INTERFACE_OPERATION_COMPARTMENT_TYPE = "7007"; //$NON-NLS-1$
-
- public static final String INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE = "7008"; //$NON-NLS-1$
-
- public static final String ENUMERATION_LITERAL_COMPARTMENT_TYPE = "7015"; //$NON-NLS-1$
-
- @Rule
- public final HouseKeeper houseKeeper = new HouseKeeper();
-
- private CSSDiagram diagram;
-
- @Before
- public void init() {
- ResourceSet resourceSet = houseKeeper.createResourceSet();
- CSSHelper.installCSSSupport(resourceSet);
-
- URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/compartmentsTest/model.notation", true); //$NON-NLS-1$
- try {
- Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, uri);
- Assert.assertNotNull("Cannot find the model", diagram);
- Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram);
- this.diagram = (CSSDiagram)diagram;
- } catch (IOException ex) {
- Activator.log.error(ex);
- }
- }
-
- /* Test Class1 and Class2 */
- @Test
- public void testAttributeCompartment() {
- Shape class1 = findShape("Class1");
- Shape class2 = findShape("Class2");
-
- BasicCompartment attributes1 = findCompartment(class1, CLASS_ATTRIBUTE_COMPARTMENT_TYPE);
- Assert.assertTrue("Attribute compartment should be collapsed, as it contains a P1 property", attributes1.isCollapsed());
- Assert.assertTrue("Attribute compartment should be visible", attributes1.isVisible());
- BasicCompartment operations1 = findCompartment(class1, CLASS_OPERATION_COMPARTMENT_TYPE);
- Assert.assertTrue("Operation compartment should be visible", operations1.isVisible());
- BasicCompartment classifiers1 = findCompartment(class1, CLASS_CLASSIFIER_COMPARTMENT_TYPE);
- Assert.assertFalse("Classifiers compartment should be hidden", classifiers1.isVisible());
-
- BasicCompartment attributes2 = findCompartment(class2, CLASS_ATTRIBUTE_COMPARTMENT_TYPE);
- Assert.assertFalse("Attribute compartment should not be collapsed, as it doesn't contain a P1 property", attributes2.isCollapsed());
- Assert.assertTrue("Attribute compartment should be visible", attributes2.isVisible());
- BasicCompartment operations2 = findCompartment(class2, CLASS_OPERATION_COMPARTMENT_TYPE);
- Assert.assertTrue("Operation compartment should be visible", operations2.isVisible());
- BasicCompartment classifiers2 = findCompartment(class2, CLASS_CLASSIFIER_COMPARTMENT_TYPE);
- Assert.assertFalse("Classifiers compartment should be hidden", classifiers2.isVisible());
-
-
- }
-
- /* Test Enumeration1 */
- @NotImplemented("The 'case insensitive' attributes are not supported by Eclipse E4 CSS")
- @Test
- public void testCaseInsensitiveForEnumeration() {
- Shape enumeration = findShape("Enumeration1");
- BasicCompartment compartment = findCompartment(enumeration, ENUMERATION_LITERAL_COMPARTMENT_TYPE);
-
- Assert.assertFalse("EnumerationLiteral Compartment should not be collapsed", compartment.isCollapsed());
- }
-
- /* Test Interface 1 and Interface 2 */
- @Test
- public void testAttributeCompartmentForInterface() {
- Shape interface1 = findShape("Interface1");
- Shape interface2 = findShape("Interface2");
-
- BasicCompartment attributes1 = findCompartment(interface1, INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE);
- Assert.assertTrue("Attribute compartment should be visible, as it contains a Property", attributes1.isVisible());
- BasicCompartment operations1 = findCompartment(interface1, INTERFACE_OPERATION_COMPARTMENT_TYPE);
- Assert.assertTrue("Operation compartment should be visible", operations1.isVisible());
- BasicCompartment classifiers1 = findCompartment(interface1, INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE);
- Assert.assertFalse("Classifiers compartment should be hidden", classifiers1.isVisible());
-
- BasicCompartment attributes2 = findCompartment(interface2, INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE);
- Assert.assertFalse("Attribute compartment should not be visible, as it doesn't contain any property", attributes2.isVisible());
- BasicCompartment operations2 = findCompartment(interface2, INTERFACE_OPERATION_COMPARTMENT_TYPE);
- Assert.assertTrue("Operation compartment should be visible", operations2.isVisible());
- BasicCompartment classifiers2 = findCompartment(interface2, INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE);
- Assert.assertFalse("Classifiers compartment should be hidden", classifiers2.isVisible());
- }
-
- /* Test Class 3 */
- @Test
- public void testCompartmentForceValue() {
- //Test initial situation
- Shape class3 = findShape("Class3");
-
- //Check all compartments
- for(View childNode : (List<View>)class3.getChildren()) {
- if(childNode instanceof BasicCompartment) {
- Assert.assertFalse("All compartments from Class3 should be hidden. " + childNode.getType() + " is visible", childNode.isVisible());
- }
- }
-
- //We need an editingDomain for the ResetStyle operation
- createAndAttachEditingDomain(diagram);
-
- //Test resetStyle
- ResetStyleHelper.resetStyle(Collections.singleton(class3));
-
- //Check only some specific compartments. Some style rules still hide the nestedClassifier compartment. The visibility of e.g. the ShapeCompartment is undetermined.
- BasicCompartment attributesCompartment = findCompartment(class3, CLASS_ATTRIBUTE_COMPARTMENT_TYPE);
- BasicCompartment operationsCompartment = findCompartment(class3, CLASS_OPERATION_COMPARTMENT_TYPE);
-
- Assert.assertTrue("Attributes compartment should be visible after the reset style", attributesCompartment.isVisible());
- Assert.assertTrue("Operations compartment should be visible after the reset style", operationsCompartment.isVisible());
- }
-
- /* Test apply style */
- @Test
- //Currently fails. showTitle is not properly supported for BasicCompartments
- //Unlike Compartment, BasicCompartment doesn't implement TitleStyle. Instead,
- //it owns a specific instance of TitleStyle, which is not supported by the CSS Engine (?)
- public void testShowAllCompartmentsTitles() {
- //Initial state: title should be hidden
- for(View childNode : (List<View>)diagram.getChildren()) {
- for(View compartment : (List<View>)childNode.getChildren()) {
- if(compartment instanceof BasicCompartment) {
- TitleStyle titleStyle = (TitleStyle)compartment.getStyle(NotationPackage.eINSTANCE.getTitleStyle());
- Assert.assertFalse("Title should be hidden for " + childNode + ", " + compartment, titleStyle.isShowTitle());
- }
- }
- }
-
- //Apply style
- StringListValueStyle stylesList = (StringListValueStyle)diagram.getNamedStyle(NotationPackage.eINSTANCE.getStringListValueStyle(), "cssClass");
- if(stylesList == null) {
- stylesList = NotationFactory.eINSTANCE.createStringListValueStyle();
- }
- stylesList.getStringListValue().add("showTitleForAllCompartments");
-
- //Check that all titles are visible
- for(View childNode : (List<View>)diagram.getChildren()) {
- for(View compartment : (List<View>)childNode.getChildren()) {
- if(compartment instanceof BasicCompartment) {
- TitleStyle titleStyle = (TitleStyle)compartment.getStyle(NotationPackage.eINSTANCE.getTitleStyle());
- Assert.assertTrue("Title should be visible", titleStyle.isShowTitle());
- }
- }
- }
-
- }
-
- protected static TransactionalEditingDomain createAndAttachEditingDomain(EObject element) {
- TransactionalEditingDomain domain = new TransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), element.eResource().getResourceSet());
- element.eResource().getResourceSet().eAdapters().add(new AdapterFactoryEditingDomain.EditingDomainProvider(domain));
- return domain;
- }
-
- @After
- public void dispose() {
- Iterator<Resource> iterator = diagram.eResource().getResourceSet().getResources().iterator();
- while(iterator.hasNext()) {
- iterator.next().unload();
- iterator.remove();
- }
- }
-
- private BasicCompartment findCompartment(Shape element, String type) {
- for(View childNode : (List<View>)element.getChildren()) {
- if(type.equals(childNode.getType())) {
- return (BasicCompartment)childNode;
- }
- }
-
- return null;
- }
-
- private Shape findShape(String elementName) {
- for(Object viewObject : diagram.getChildren()) {
- View view = (View)viewObject;
- if(view instanceof Shape && view.getElement() instanceof NamedElement) {
- NamedElement element = (NamedElement)view.getElement();
- if(elementName.equals(element.getName())) {
- return (Shape)view;
- }
- }
- }
-
- Assert.fail("Cannot find the view associated to " + elementName);
- return null;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2014 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - bug 422257 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests; + +import java.io.IOException; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl; +import org.eclipse.gmf.runtime.notation.BasicCompartment; +import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.gmf.runtime.notation.NotationFactory; +import org.eclipse.gmf.runtime.notation.NotationPackage; +import org.eclipse.gmf.runtime.notation.Shape; +import org.eclipse.gmf.runtime.notation.StringListValueStyle; +import org.eclipse.gmf.runtime.notation.TitleStyle; +import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.infra.gmfdiag.css.helper.CSSHelper; +import org.eclipse.papyrus.infra.gmfdiag.css.helper.ResetStyleHelper; +import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram; +import org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator; +import org.eclipse.papyrus.junit.framework.classification.NotImplemented; +import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; +import org.eclipse.papyrus.junit.utils.rules.HouseKeeper; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassOperationCompartmentEditPart; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceAttributeCompartmentEditPart; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNestedClassifierCompartmentEditPart; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceOperationCompartmentEditPart; +import org.eclipse.uml2.uml.NamedElement; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +/** + * Test case for Compartment-related styles and properties + * See resources/model/compartmentsTest/model.di for details + * + * @author Camille Letavernier + * + */ +public class CSSCompartmentsTests extends AbstractPapyrusTest { + + public static final String CLASS_ATTRIBUTE_COMPARTMENT_TYPE = ClassAttributeCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$ + + public static final String CLASS_OPERATION_COMPARTMENT_TYPE = ClassOperationCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$ + + public static final String CLASS_CLASSIFIER_COMPARTMENT_TYPE = ClassNestedClassifierCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$ + + public static final String INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE = InterfaceAttributeCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$ + + public static final String INTERFACE_OPERATION_COMPARTMENT_TYPE = InterfaceOperationCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$ + + public static final String INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE = InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$ + + public static final String ENUMERATION_LITERAL_COMPARTMENT_TYPE = EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID; //$NON-NLS-1$ + + @Rule + public final HouseKeeper houseKeeper = new HouseKeeper(); + + private CSSDiagram diagram; + + @Before + public void init() { + ResourceSet resourceSet = houseKeeper.createResourceSet(); + CSSHelper.installCSSSupport(resourceSet); + + URI uri = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/model/compartmentsTest/model.notation", true); //$NON-NLS-1$ + try { + Diagram diagram = (Diagram)EMFHelper.loadEMFModel(resourceSet, uri); + Assert.assertNotNull("Cannot find the model", diagram); + Assert.assertTrue("CSS are not activated on this resource", diagram instanceof CSSDiagram); + this.diagram = (CSSDiagram)diagram; + } catch (IOException ex) { + Activator.log.error(ex); + } + } + + /* Test Class1 and Class2 */ + @Test + public void testAttributeCompartment() { + Shape class1 = findShape("Class1"); + Shape class2 = findShape("Class2"); + + BasicCompartment attributes1 = findCompartment(class1, CLASS_ATTRIBUTE_COMPARTMENT_TYPE); + Assert.assertTrue("Attribute compartment should be collapsed, as it contains a P1 property", attributes1.isCollapsed()); + Assert.assertTrue("Attribute compartment should be visible", attributes1.isVisible()); + BasicCompartment operations1 = findCompartment(class1, CLASS_OPERATION_COMPARTMENT_TYPE); + Assert.assertTrue("Operation compartment should be visible", operations1.isVisible()); + BasicCompartment classifiers1 = findCompartment(class1, CLASS_CLASSIFIER_COMPARTMENT_TYPE); + Assert.assertFalse("Classifiers compartment should be hidden", classifiers1.isVisible()); + + BasicCompartment attributes2 = findCompartment(class2, CLASS_ATTRIBUTE_COMPARTMENT_TYPE); + Assert.assertFalse("Attribute compartment should not be collapsed, as it doesn't contain a P1 property", attributes2.isCollapsed()); + Assert.assertTrue("Attribute compartment should be visible", attributes2.isVisible()); + BasicCompartment operations2 = findCompartment(class2, CLASS_OPERATION_COMPARTMENT_TYPE); + Assert.assertTrue("Operation compartment should be visible", operations2.isVisible()); + BasicCompartment classifiers2 = findCompartment(class2, CLASS_CLASSIFIER_COMPARTMENT_TYPE); + Assert.assertFalse("Classifiers compartment should be hidden", classifiers2.isVisible()); + + + } + + /* Test Enumeration1 */ + @NotImplemented("The 'case insensitive' attributes are not supported by Eclipse E4 CSS") + @Test + public void testCaseInsensitiveForEnumeration() { + Shape enumeration = findShape("Enumeration1"); + BasicCompartment compartment = findCompartment(enumeration, ENUMERATION_LITERAL_COMPARTMENT_TYPE); + + Assert.assertFalse("EnumerationLiteral Compartment should not be collapsed", compartment.isCollapsed()); + } + + /* Test Interface 1 and Interface 2 */ + @Test + public void testAttributeCompartmentForInterface() { + Shape interface1 = findShape("Interface1"); + Shape interface2 = findShape("Interface2"); + + BasicCompartment attributes1 = findCompartment(interface1, INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE); + Assert.assertTrue("Attribute compartment should be visible, as it contains a Property", attributes1.isVisible()); + BasicCompartment operations1 = findCompartment(interface1, INTERFACE_OPERATION_COMPARTMENT_TYPE); + Assert.assertTrue("Operation compartment should be visible", operations1.isVisible()); + BasicCompartment classifiers1 = findCompartment(interface1, INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE); + Assert.assertFalse("Classifiers compartment should be hidden", classifiers1.isVisible()); + + BasicCompartment attributes2 = findCompartment(interface2, INTERFACE_ATTRIBUTE_COMPARTMENT_TYPE); + Assert.assertFalse("Attribute compartment should not be visible, as it doesn't contain any property", attributes2.isVisible()); + BasicCompartment operations2 = findCompartment(interface2, INTERFACE_OPERATION_COMPARTMENT_TYPE); + Assert.assertTrue("Operation compartment should be visible", operations2.isVisible()); + BasicCompartment classifiers2 = findCompartment(interface2, INTERFACE_INTERFACEIFIER_COMPARTMENT_TYPE); + Assert.assertFalse("Classifiers compartment should be hidden", classifiers2.isVisible()); + } + + /* Test Class 3 */ + @Test + public void testCompartmentForceValue() { + //Test initial situation + Shape class3 = findShape("Class3"); + + //Check all compartments + for(View childNode : (List<View>)class3.getChildren()) { + if(childNode instanceof BasicCompartment) { + Assert.assertFalse("All compartments from Class3 should be hidden. " + childNode.getType() + " is visible", childNode.isVisible()); + } + } + + //We need an editingDomain for the ResetStyle operation + createAndAttachEditingDomain(diagram); + + //Test resetStyle + ResetStyleHelper.resetStyle(Collections.singleton(class3)); + + //Check only some specific compartments. Some style rules still hide the nestedClassifier compartment. The visibility of e.g. the ShapeCompartment is undetermined. + BasicCompartment attributesCompartment = findCompartment(class3, CLASS_ATTRIBUTE_COMPARTMENT_TYPE); + BasicCompartment operationsCompartment = findCompartment(class3, CLASS_OPERATION_COMPARTMENT_TYPE); + + Assert.assertTrue("Attributes compartment should be visible after the reset style", attributesCompartment.isVisible()); + Assert.assertTrue("Operations compartment should be visible after the reset style", operationsCompartment.isVisible()); + } + + /* Test apply style */ + @Test + //Currently fails. showTitle is not properly supported for BasicCompartments + //Unlike Compartment, BasicCompartment doesn't implement TitleStyle. Instead, + //it owns a specific instance of TitleStyle, which is not supported by the CSS Engine (?) + public void testShowAllCompartmentsTitles() { + //Initial state: title should be hidden + for(View childNode : (List<View>)diagram.getChildren()) { + for(View compartment : (List<View>)childNode.getChildren()) { + if(compartment instanceof BasicCompartment) { + TitleStyle titleStyle = (TitleStyle)compartment.getStyle(NotationPackage.eINSTANCE.getTitleStyle()); + Assert.assertFalse("Title should be hidden for " + childNode + ", " + compartment, titleStyle.isShowTitle()); + } + } + } + + //Apply style + StringListValueStyle stylesList = (StringListValueStyle)diagram.getNamedStyle(NotationPackage.eINSTANCE.getStringListValueStyle(), "cssClass"); + if(stylesList == null) { + stylesList = NotationFactory.eINSTANCE.createStringListValueStyle(); + } + stylesList.getStringListValue().add("showTitleForAllCompartments"); + + //Check that all titles are visible + for(View childNode : (List<View>)diagram.getChildren()) { + for(View compartment : (List<View>)childNode.getChildren()) { + if(compartment instanceof BasicCompartment) { + TitleStyle titleStyle = (TitleStyle)compartment.getStyle(NotationPackage.eINSTANCE.getTitleStyle()); + Assert.assertTrue("Title should be visible", titleStyle.isShowTitle()); + } + } + } + + } + + protected static TransactionalEditingDomain createAndAttachEditingDomain(EObject element) { + TransactionalEditingDomain domain = new TransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE), element.eResource().getResourceSet()); + element.eResource().getResourceSet().eAdapters().add(new AdapterFactoryEditingDomain.EditingDomainProvider(domain)); + return domain; + } + + @After + public void dispose() { + Iterator<Resource> iterator = diagram.eResource().getResourceSet().getResources().iterator(); + while(iterator.hasNext()) { + iterator.next().unload(); + iterator.remove(); + } + } + + private BasicCompartment findCompartment(Shape element, String type) { + for(View childNode : (List<View>)element.getChildren()) { + if(type.equals(childNode.getType())) { + return (BasicCompartment)childNode; + } + } + + return null; + } + + private Shape findShape(String elementName) { + for(Object viewObject : diagram.getChildren()) { + View view = (View)viewObject; + if(view instanceof Shape && view.getElement() instanceof NamedElement) { + NamedElement element = (NamedElement)view.getElement(); + if(elementName.equals(element.getName())) { + return (Shape)view; + } + } + } + + Assert.fail("Cannot find the view associated to " + elementName); + return null; + } + +} diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSKindSelectorTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSKindSelectorTest.java index 5f6a73ef812..b68cb5407d4 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSKindSelectorTest.java +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/src/org/eclipse/papyrus/infra/gmfdiag/css/tests/tests/CSSKindSelectorTest.java @@ -1,299 +1,301 @@ -/*****************************************************************************
- * Copyright (c) 2015 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.NotEnabledException;
-import org.eclipse.core.commands.NotHandledException;
-import org.eclipse.core.commands.common.NotDefinedException;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.FigureUtils;
-import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.DiagramUtils;
-import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
-import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.ICommandService;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-
-/**
- * The Class CSSKindSelectorTest defined to test CSS selector kind for Compartment, FloatingLabel and one specific external label.
- */
-@PluginResource("/resources/model/kindSelectorTest/model.di")
-public class CSSKindSelectorTest extends AbstractPapyrusTest {
-
- /** The diagram. */
- private Diagram diagram = null;
-
-
- /** The model set fixture. */
- @Rule
- public final PapyrusEditorFixture modelSetFixture = new PapyrusEditorFixture();
-
-
- @Before
- public void init() {
- diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "ClassDiagram");
- }
-
-
- /**
- * Test kind selector for compartment with:
- * Compartment[kind=attributes]{visible:false;}
- *
- * @throws ExecutionException
- * the execution exception
- * @throws NotDefinedException
- * the not defined exception
- * @throws NotEnabledException
- * the not enabled exception
- * @throws NotHandledException
- * the not handled exception
- */
- @Test
- public void testKindSelectorForCompartment() throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException {
- EditPart classEditPart = getEditPart("Class1");
- Assert.assertTrue(classEditPart instanceof GraphicalEditPart);
- Iterator<ResizableCompartmentFigure> compartments = FigureUtils.findChildFigureInstances(((GraphicalEditPart) classEditPart).getFigure(), ResizableCompartmentFigure.class).iterator();
-
- boolean visible = false;
-
- while (false == visible && compartments.hasNext()) {
- ResizableCompartmentFigure compartment = (ResizableCompartmentFigure) compartments.next();
- if ("attributes".equals(compartment.getCompartmentTitle())) {
- visible = true;
- }
- }
-
- Assert.assertTrue("attributes must be visible by default", visible);
-
- setEmbeddedStyleSheet("Compartment[kind=attributes]", "visible", String.valueOf(false), false);
- classEditPart.refresh();
-
- for (ResizableCompartmentFigure compartment : FigureUtils.findChildFigureInstances(((GraphicalEditPart) classEditPart).getFigure(), ResizableCompartmentFigure.class)) {
- Assert.assertFalse("Attributes Compartment must not be visible with Compartment[kind=attributes]{visible:false;}", "attributes".equals(compartment.getCompartmentTitle()));
- }
- }
-
- /**
- * Test kind selector for label with:
- *
- * Label[kind=FloatingLabel]{visible:true;}
- * Label[kind=TargetRole]{visible:false;}
- *
- * @throws NotHandledException
- * @throws NotEnabledException
- * @throws NotDefinedException
- * @throws ExecutionException
- */
- @Test
- public void testKindSelectorForLabel() throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException {
- EditPart classEditPart = getEditPart("Class1");
- Assert.assertTrue(classEditPart instanceof GraphicalEditPart);
-
- String classFloatingNameVisualID = "8510";
- IFigure floatingLabelFigure = findChildFigurebyVisualID(classEditPart, classFloatingNameVisualID);
-
- // Test the default visibility of floatingLabel
- Assert.assertNotNull("Flaoting label must exist", floatingLabelFigure);
- Assert.assertFalse("Floating label must be hidden by default", floatingLabelFigure.isVisible());
-
- // Set the visibility to true with CSS selector
- setEmbeddedStyleSheet("Label[kind=FloatingLabel]", "visible", String.valueOf(true), false);
- classEditPart.refresh();
-
- // Test the visibility of floatingLabel with CSS selector Label[kind=FloatingLabel]
- Assert.assertTrue("FloatingLabel must be visible with CSS selector Label[kind=FloatingLabel]", floatingLabelFigure.isVisible());
-
-
- // test the association Target Name
- EditPart associationEditPart = getEditPart("associationName");
- Assert.assertTrue(associationEditPart instanceof ConnectionEditPart);
-
- String associationTargetNameVisualID = "6003";
- IFigure associationTargetNameFigure = findChildFigurebyVisualID(associationEditPart, associationTargetNameVisualID);
-
- // Test the default visibility of associationTargetName
- Assert.assertNotNull("TargetRole Label must exist", associationTargetNameFigure);
- Assert.assertTrue("TargetRole Label must be visible by default", associationTargetNameFigure.isVisible());
-
- // Set the visibility to true with CSS selector
- setEmbeddedStyleSheet("Label[kind=TargetRole]", "visible", String.valueOf(false), false);
- associationEditPart.refresh();
-
- // Test the visibility of floatingLabel with CSS selector Label[kind=FloatingLabel]
- Assert.assertFalse("TargetRole Label must be hidden with CSS selector Label[kind=TargetRole]", associationTargetNameFigure.isVisible());
-
- }
-
-
- /**
- * Find child figure by visual id.
- *
- * @param classEditPart
- * the class edit part
- * @param classFloatingNameVisualID
- * the class floating name visual id
- * @return the figure
- */
- private IFigure findChildFigurebyVisualID(EditPart classEditPart, String classFloatingNameVisualID) {
- // Find the floatingLabelFigure
- IFigure floatingLabelFigure = null;
- Iterator<?> childsIterator = classEditPart.getChildren().iterator();
- while (null == floatingLabelFigure && childsIterator.hasNext()) {
- Object child = childsIterator.next();
-
- if (child instanceof IGraphicalEditPart && classFloatingNameVisualID.equals(((IGraphicalEditPart) child).getNotationView().getType())) {
- floatingLabelFigure = (IFigure) ((IGraphicalEditPart) child).getFigure();
- }
- }
- return floatingLabelFigure;
- }
-
-
- /**
- * Sets the embedded style sheet. Element + "{" + attribut + ":" + value + ";}"
- *
- * @param Element
- * the element
- * @param attribut
- * the attribut
- * @param value
- * the value
- * @param append
- * the append
- * @throws ExecutionException
- * the execution exception
- * @throws NotDefinedException
- * the not defined exception
- * @throws NotEnabledException
- * the not enabled exception
- * @throws NotHandledException
- * the not handled exception
- */
- private void setEmbeddedStyleSheet(final String Element, final String attribut, final String value, final boolean append) throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException {
- final EmbeddedStyleSheet embeddedStyleSheet = getEmbeddedStyleSheet(diagram);
- Assert.assertNotNull(embeddedStyleSheet);
-
- Command command = new RecordingCommand(modelSetFixture.getEditingDomain()) {
-
- @Override
- protected void doExecute() {
- String str = append ? embeddedStyleSheet.getContent() + "\n" : "";
- embeddedStyleSheet.setContent(str + Element + "{" + attribut + ":" + value + ";}");
- }
- };
- getCommandStack().execute(command);
- refreshEditor();
-
- }
-
- /**
- * Gets the embedded style sheet.
- *
- * @param diagram
- * the diagram
- * @return the embedded style sheet
- */
- private EmbeddedStyleSheet getEmbeddedStyleSheet(Diagram diagram) {
- Iterator<EObject> iterator = diagram.eResource().getContents().iterator();
- EmbeddedStyleSheet embeddedStyleSheet = null;
- while (null == embeddedStyleSheet && iterator.hasNext()) {
- Object object = iterator.next();
- if (object instanceof EmbeddedStyleSheet) {
- embeddedStyleSheet = (EmbeddedStyleSheet) object;
- }
- }
- Assert.assertNotNull(embeddedStyleSheet);
- return embeddedStyleSheet;
- }
-
- /**
- * Gets the command stack.
- *
- * @return the command stack
- */
- private CommandStack getCommandStack() {
- return modelSetFixture.getEditingDomain().getCommandStack();
- }
-
- /**
- * Refresh editor.
- */
- private void refreshEditor() throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException {
- String REFRESH_COMMAND_ID = "org.eclipse.ui.file.refresh"; //$NON-NLS-1$
- ICommandService commandService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(ICommandService.class);
- org.eclipse.core.commands.Command refreshCommand = commandService.getCommand(REFRESH_COMMAND_ID);
- if (refreshCommand.getHandler().isEnabled()) {
- refreshCommand.executeWithChecks(new ExecutionEvent());
- }
- }
-
- /**
- * Gets the edits the part.
- *
- * @param semanticElement
- * the semantic element
- * @return the edits the part
- */
- private EditPart getEditPart(String semanticElement) {
-
- modelSetFixture.getPageManager().openPage(diagram);
-
- View diagramView = DiagramUtils.findShape(diagram, semanticElement);
- if (diagramView == null) {
- diagramView = DiagramUtils.findEdge(diagram, semanticElement);
- }
- if (diagramView == null) {
- Iterator<?> iterator = diagram.eAllContents();
- while (null == diagramView && iterator.hasNext()) {
- Object object = iterator.next();
- if (object instanceof View) {
- diagramView = DiagramUtils.findShape((View) object, semanticElement);
- if (diagramView == null) {
- diagramView = DiagramUtils.findEdge((View) object, semanticElement);
- }
- }
- }
- }
-
- Assert.assertNotNull(diagramView);
-
- IGraphicalEditPart semanticEP = DiagramUtils.findEditPartforView(modelSetFixture.getEditor(), diagramView, IGraphicalEditPart.class);
- Assert.assertNotNull(semanticEP);
-
- return semanticEP;
- }
-}
+/***************************************************************************** + * Copyright (c) 2015 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST - Initial API and implementation + * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.gmfdiag.css.tests.tests; + +import java.util.Iterator; + +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.NotEnabledException; +import org.eclipse.core.commands.NotHandledException; +import org.eclipse.core.commands.common.NotDefinedException; +import org.eclipse.draw2d.IFigure; +import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.CommandStack; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.transaction.RecordingCommand; +import org.eclipse.gef.ConnectionEditPart; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.GraphicalEditPart; +import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; +import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure; +import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.infra.core.resource.ModelSet; +import org.eclipse.papyrus.infra.gmfdiag.common.utils.FigureUtils; +import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet; +import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; +import org.eclipse.papyrus.junit.utils.DiagramUtils; +import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture; +import org.eclipse.papyrus.junit.utils.rules.PluginResource; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationTargetNameEditPart; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassFloatingNameEditPart; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.commands.ICommandService; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + + +/** + * The Class CSSKindSelectorTest defined to test CSS selector kind for Compartment, FloatingLabel and one specific external label. + */ +@PluginResource("/resources/model/kindSelectorTest/model.di") +public class CSSKindSelectorTest extends AbstractPapyrusTest { + + /** The diagram. */ + private Diagram diagram = null; + + + /** The model set fixture. */ + @Rule + public final PapyrusEditorFixture modelSetFixture = new PapyrusEditorFixture(); + + + @Before + public void init() { + diagram = DiagramUtils.getNotationDiagram((ModelSet) modelSetFixture.getResourceSet(), "ClassDiagram"); + } + + + /** + * Test kind selector for compartment with: + * Compartment[kind=attributes]{visible:false;} + * + * @throws ExecutionException + * the execution exception + * @throws NotDefinedException + * the not defined exception + * @throws NotEnabledException + * the not enabled exception + * @throws NotHandledException + * the not handled exception + */ + @Test + public void testKindSelectorForCompartment() throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException { + EditPart classEditPart = getEditPart("Class1"); + Assert.assertTrue(classEditPart instanceof GraphicalEditPart); + Iterator<ResizableCompartmentFigure> compartments = FigureUtils.findChildFigureInstances(((GraphicalEditPart) classEditPart).getFigure(), ResizableCompartmentFigure.class).iterator(); + + boolean visible = false; + + while (false == visible && compartments.hasNext()) { + ResizableCompartmentFigure compartment = (ResizableCompartmentFigure) compartments.next(); + if ("attributes".equals(compartment.getCompartmentTitle())) { + visible = true; + } + } + + Assert.assertTrue("attributes must be visible by default", visible); + + setEmbeddedStyleSheet("Compartment[kind=attributes]", "visible", String.valueOf(false), false); + classEditPart.refresh(); + + for (ResizableCompartmentFigure compartment : FigureUtils.findChildFigureInstances(((GraphicalEditPart) classEditPart).getFigure(), ResizableCompartmentFigure.class)) { + Assert.assertFalse("Attributes Compartment must not be visible with Compartment[kind=attributes]{visible:false;}", "attributes".equals(compartment.getCompartmentTitle())); + } + } + + /** + * Test kind selector for label with: + * + * Label[kind=FloatingLabel]{visible:true;} + * Label[kind=TargetRole]{visible:false;} + * + * @throws NotHandledException + * @throws NotEnabledException + * @throws NotDefinedException + * @throws ExecutionException + */ + @Test + public void testKindSelectorForLabel() throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException { + EditPart classEditPart = getEditPart("Class1"); + Assert.assertTrue(classEditPart instanceof GraphicalEditPart); + + String classFloatingNameVisualID = ClassFloatingNameEditPart.VISUAL_ID; + IFigure floatingLabelFigure = findChildFigurebyVisualID(classEditPart, classFloatingNameVisualID); + + // Test the default visibility of floatingLabel + Assert.assertNotNull("Flaoting label must exist", floatingLabelFigure); + Assert.assertFalse("Floating label must be hidden by default", floatingLabelFigure.isVisible()); + + // Set the visibility to true with CSS selector + setEmbeddedStyleSheet("Label[kind=FloatingLabel]", "visible", String.valueOf(true), false); + classEditPart.refresh(); + + // Test the visibility of floatingLabel with CSS selector Label[kind=FloatingLabel] + Assert.assertTrue("FloatingLabel must be visible with CSS selector Label[kind=FloatingLabel]", floatingLabelFigure.isVisible()); + + + // test the association Target Name + EditPart associationEditPart = getEditPart("associationName"); + Assert.assertTrue(associationEditPart instanceof ConnectionEditPart); + + String associationTargetNameVisualID = AssociationTargetNameEditPart.VISUAL_ID; + IFigure associationTargetNameFigure = findChildFigurebyVisualID(associationEditPart, associationTargetNameVisualID); + + // Test the default visibility of associationTargetName + Assert.assertNotNull("TargetRole Label must exist", associationTargetNameFigure); + Assert.assertTrue("TargetRole Label must be visible by default", associationTargetNameFigure.isVisible()); + + // Set the visibility to true with CSS selector + setEmbeddedStyleSheet("Label[kind=TargetRole]", "visible", String.valueOf(false), false); + associationEditPart.refresh(); + + // Test the visibility of floatingLabel with CSS selector Label[kind=FloatingLabel] + Assert.assertFalse("TargetRole Label must be hidden with CSS selector Label[kind=TargetRole]", associationTargetNameFigure.isVisible()); + + } + + + /** + * Find child figure by visual id. + * + * @param classEditPart + * the class edit part + * @param classFloatingNameVisualID + * the class floating name visual id + * @return the figure + */ + private IFigure findChildFigurebyVisualID(EditPart classEditPart, String classFloatingNameVisualID) { + // Find the floatingLabelFigure + IFigure floatingLabelFigure = null; + Iterator<?> childsIterator = classEditPart.getChildren().iterator(); + while (null == floatingLabelFigure && childsIterator.hasNext()) { + Object child = childsIterator.next(); + + if (child instanceof IGraphicalEditPart && classFloatingNameVisualID.equals(((IGraphicalEditPart) child).getNotationView().getType())) { + floatingLabelFigure = (IFigure) ((IGraphicalEditPart) child).getFigure(); + } + } + return floatingLabelFigure; + } + + + /** + * Sets the embedded style sheet. Element + "{" + attribut + ":" + value + ";}" + * + * @param Element + * the element + * @param attribut + * the attribut + * @param value + * the value + * @param append + * the append + * @throws ExecutionException + * the execution exception + * @throws NotDefinedException + * the not defined exception + * @throws NotEnabledException + * the not enabled exception + * @throws NotHandledException + * the not handled exception + */ + private void setEmbeddedStyleSheet(final String Element, final String attribut, final String value, final boolean append) throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException { + final EmbeddedStyleSheet embeddedStyleSheet = getEmbeddedStyleSheet(diagram); + Assert.assertNotNull(embeddedStyleSheet); + + Command command = new RecordingCommand(modelSetFixture.getEditingDomain()) { + + @Override + protected void doExecute() { + String str = append ? embeddedStyleSheet.getContent() + "\n" : ""; + embeddedStyleSheet.setContent(str + Element + "{" + attribut + ":" + value + ";}"); + } + }; + getCommandStack().execute(command); + refreshEditor(); + + } + + /** + * Gets the embedded style sheet. + * + * @param diagram + * the diagram + * @return the embedded style sheet + */ + private EmbeddedStyleSheet getEmbeddedStyleSheet(Diagram diagram) { + Iterator<EObject> iterator = diagram.eResource().getContents().iterator(); + EmbeddedStyleSheet embeddedStyleSheet = null; + while (null == embeddedStyleSheet && iterator.hasNext()) { + Object object = iterator.next(); + if (object instanceof EmbeddedStyleSheet) { + embeddedStyleSheet = (EmbeddedStyleSheet) object; + } + } + Assert.assertNotNull(embeddedStyleSheet); + return embeddedStyleSheet; + } + + /** + * Gets the command stack. + * + * @return the command stack + */ + private CommandStack getCommandStack() { + return modelSetFixture.getEditingDomain().getCommandStack(); + } + + /** + * Refresh editor. + */ + private void refreshEditor() throws ExecutionException, NotDefinedException, NotEnabledException, NotHandledException { + String REFRESH_COMMAND_ID = "org.eclipse.ui.file.refresh"; //$NON-NLS-1$ + ICommandService commandService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(ICommandService.class); + org.eclipse.core.commands.Command refreshCommand = commandService.getCommand(REFRESH_COMMAND_ID); + if (refreshCommand.getHandler().isEnabled()) { + refreshCommand.executeWithChecks(new ExecutionEvent()); + } + } + + /** + * Gets the edits the part. + * + * @param semanticElement + * the semantic element + * @return the edits the part + */ + private EditPart getEditPart(String semanticElement) { + + modelSetFixture.getPageManager().openPage(diagram); + + View diagramView = DiagramUtils.findShape(diagram, semanticElement); + if (diagramView == null) { + diagramView = DiagramUtils.findEdge(diagram, semanticElement); + } + if (diagramView == null) { + Iterator<?> iterator = diagram.eAllContents(); + while (null == diagramView && iterator.hasNext()) { + Object object = iterator.next(); + if (object instanceof View) { + diagramView = DiagramUtils.findShape((View) object, semanticElement); + if (diagramView == null) { + diagramView = DiagramUtils.findEdge((View) object, semanticElement); + } + } + } + } + + Assert.assertNotNull(diagramView); + + IGraphicalEditPart semanticEP = DiagramUtils.findEditPartforView(modelSetFixture.getEditor(), diagramView, IGraphicalEditPart.class); + Assert.assertNotNull(semanticEP); + + return semanticEP; + } +} diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/org.eclipse.papyrus.infra.gmfdiag.menu.tests.launch b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/org.eclipse.papyrus.infra.gmfdiag.menu.tests.launch index a9924eadfda..1f6e709fbd9 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/org.eclipse.papyrus.infra.gmfdiag.menu.tests.launch +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/org.eclipse.papyrus.infra.gmfdiag.menu.tests.launch @@ -10,7 +10,7 @@ <booleanAttribute key="clearws" value="true"/> <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> -<booleanAttribute key="default" value="false"/> +<booleanAttribute key="default" value="true"/> <stringAttribute key="deselected_workspace_plugins" value="org.eclipse.papyrus.bundles.tests,org.eclipse.papyrus.customization.properties.tests,org.eclipse.papyrus.editor.integration.tests,org.eclipse.papyrus.infra.extendedtypes.tests,org.eclipse.papyrus.infra.gmfdiag.css.tests,org.eclipse.papyrus.infra.nattable.model.editor.tests,org.eclipse.papyrus.infra.nattable.tests,org.eclipse.papyrus.infra.nattable.views.tests,org.eclipse.papyrus.infra.services.controlmode.tests,org.eclipse.papyrus.infra.services.labelprovider.tests,org.eclipse.papyrus.infra.tools.tests,org.eclipse.papyrus.search.tests,org.eclipse.papyrus.sysml.diagram.requirement.tests,org.eclipse.papyrus.sysml.modelexplorer.tests,org.eclipse.papyrus.sysml.nattable.allocation.tests,org.eclipse.papyrus.sysml.nattable.requirement.tests,org.eclipse.papyrus.sysml.tests,org.eclipse.papyrus.tests,org.eclipse.papyrus.uml.decoratormodel.controlmode.tests,org.eclipse.papyrus.uml.decoratormodel.tests,org.eclipse.papyrus.uml.diagram.activity.tests,org.eclipse.papyrus.uml.diagram.clazz.tests,org.eclipse.papyrus.uml.diagram.common.tests,org.eclipse.papyrus.uml.diagram.communication.tests,org.eclipse.papyrus.uml.diagram.component.tests,org.eclipse.papyrus.uml.diagram.composite.tests,org.eclipse.papyrus.uml.diagram.deployment.tests,org.eclipse.papyrus.uml.diagram.dnd.tests,org.eclipse.papyrus.uml.diagram.interactionoverview.tests,org.eclipse.papyrus.uml.diagram.profile.tests,org.eclipse.papyrus.uml.diagram.sequence.tests,org.eclipse.papyrus.uml.diagram.statemachine.tests,org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests,org.eclipse.papyrus.uml.diagram.tests,org.eclipse.papyrus.uml.diagram.timing.tests,org.eclipse.papyrus.uml.diagram.usecase.tests,org.eclipse.papyrus.uml.diagram.wizards.tests,org.eclipse.papyrus.uml.modelexplorer.tests,org.eclipse.papyrus.uml.nattable.generic.tests,org.eclipse.papyrus.uml.nattable.tests,org.eclipse.papyrus.uml.textedit.parameter.tests,org.eclipse.papyrus.uml.textedit.port.tests,org.eclipse.papyrus.uml.textedit.property.tests,org.eclipse.papyrus.uml.textedit.tests,org.eclipse.papyrus.uml.tools.tests,org.eclipse.papyrus.uml.tools.utils.tests,org.eclipse.papyrus.views.modelexplorer.tests"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> @@ -24,16 +24,18 @@ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.gmfdiag.menu.tests.tests.AllTests"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.gmfdiag.menu.tests"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.7 -Xms1024m -Xmx4086m -XX:MaxPermSize=512M -Doomph.setup.skip=true -Doomph.setup.questionnaire.skip=true"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.platform.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,lpg.runtime.java@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen.xtend.ui@default:default,org.eclipse.gmf.codegen.xtend@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling.runtime@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.examples.common@default:default,org.eclipse.ocl.examples.debug.vm@default:default,org.eclipse.ocl.examples.debug@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.emf.validation.validity.ui@default:default,org.eclipse.ocl.examples.emf.validation.validity@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.xtext.base.ui@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.completeocl@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl.examples.xtext.markup.ui@default:default,org.eclipse.ocl.examples.xtext.markup@default:default,org.eclipse.ocl.examples.xtext.oclinecore@default:default,org.eclipse.ocl.examples.xtext.oclstdlib@default:default,org.eclipse.ocl@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.standard@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml.validation@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.gmf.codegen@default:default,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.customization.extendedtypes.emf@default:default,org.eclipse.papyrus.customization.extendedtypes.uml@default:default,org.eclipse.papyrus.customization.extendedtypes@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.customization@default:default,org.eclipse.papyrus.def@default:default,org.eclipse.papyrus.dev.java.utils@default:default,org.eclipse.papyrus.developer.profile@default:default,org.eclipse.papyrus.doc@default:default,org.eclipse.papyrus.documentation.plugin.edit@default:default,org.eclipse.papyrus.documentation.plugin.editor@default:default,org.eclipse.papyrus.documentation.plugin@default:default,org.eclipse.papyrus.domaincodegen.ui@default:default,org.eclipse.papyrus.domaincontextcodegen.edit@default:default,org.eclipse.papyrus.domaincontextcodegen.editor@default:default,org.eclipse.papyrus.domaincontextcodegen@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.commandstack@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmf.editpartview@default:default,org.eclipse.papyrus.gmf.editpoliciesstates@default:default,org.eclipse.papyrus.gmf.figureview@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.serviceregistry.edit@default:default,org.eclipse.papyrus.infra.core.serviceregistry.editor@default:default,org.eclipse.papyrus.infra.core.serviceregistry.tests@default:false,org.eclipse.papyrus.infra.core.serviceregistry@default:default,org.eclipse.papyrus.infra.core.tests@default:false,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.newchild@default:default,org.eclipse.papyrus.infra.emf.readonly.tests@default:false,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.tests@default:false,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.edit@default:default,org.eclipse.papyrus.infra.extendedtypes.editor@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.gmfdiag.commands.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.debug@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.uml.diagram.css.palette@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.editor@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:false,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.preferences@default:default,org.eclipse.papyrus.infra.services.resourceloading.tests@default:false,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.edit@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.editor@default:default,org.eclipse.papyrus.infra.viewpoints.configuration@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010.edit@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.viewpoints.preferences@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.moka.doc@default:default,org.eclipse.papyrus.mwe2.utils@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:false,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:false,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:false,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:false,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.developer.mde@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.emftree@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.synchronizeview.test@default:default,org.eclipse.papyrus.uml.diagram.synchronizeview@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.tests@default:false,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types.tests@default:false,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.ui.perspectiveconfiguration@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default,org.eclipse.papyrus.xwt@default:default"/> +<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.xml@default:default,lpg.runtime.java@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen.xtend.ui@default:default,org.eclipse.gmf.codegen.xtend@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling.runtime@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.examples.debug.vm@default:default,org.eclipse.ocl.examples.debug@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.emf.validation.validity.ui@default:default,org.eclipse.ocl.examples.emf.validation.validity@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.xtext.base.ui@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.completeocl@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl.examples.xtext.markup.ui@default:default,org.eclipse.ocl.examples.xtext.markup@default:default,org.eclipse.ocl.examples.xtext.oclinecore@default:default,org.eclipse.ocl.examples.xtext.oclstdlib@default:default,org.eclipse.ocl@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform@default:default,org.eclipse.search@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.standard@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml.validation@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.def@default:default,org.eclipse.papyrus.dev.assistants.codegen@default:default,org.eclipse.papyrus.dev.java.utils@default:default,org.eclipse.papyrus.dev.project.management@default:default,org.eclipse.papyrus.dev.tests.framework.ui@default:default,org.eclipse.papyrus.dev.tests.framework@default:default,org.eclipse.papyrus.dev.types@default:default,org.eclipse.papyrus.dev.view.services.edit.request@default:default,org.eclipse.papyrus.developer.profile@default:default,org.eclipse.papyrus.eclipse.project.editors.tests@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.facet.aggregate.doc@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.doc@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmf.editpartview@default:default,org.eclipse.papyrus.gmf.editpoliciesstates@default:default,org.eclipse.papyrus.gmf.figureview@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints.ui@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.clipboard.tests@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.sashwindows.di@default:default,org.eclipse.papyrus.infra.core.tests@default:false,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.editor.welcome.nattable@default:default,org.eclipse.papyrus.infra.editor.welcome.tests@default:default,org.eclipse.papyrus.infra.editor.welcome@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.commandstack@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.gmf@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.readonly.tests@default:false,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.tests@default:false,org.eclipse.papyrus.infra.emf.types.ui@default:default,org.eclipse.papyrus.infra.emf.types@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.edit@default:default,org.eclipse.papyrus.infra.extendedtypes.editor@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.ui.tests@default:default,org.eclipse.papyrus.infra.extendedtypes.ui@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.filters.edit@default:default,org.eclipse.papyrus.infra.filters.tests@default:default,org.eclipse.papyrus.infra.filters@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical@default:default,org.eclipse.papyrus.infra.gmfdiag.commands.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.debug@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gef@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.nattable.common.tests@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.gmfdiag@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model.tests@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.editor@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile.ui@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties.ui@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:false,org.eclipse.papyrus.infra.services.edit.ui.tests@default:default,org.eclipse.papyrus.infra.services.edit.ui@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.tests@default:false,org.eclipse.papyrus.infra.services.resourceloading.ui@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic.tests@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.sync@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.types.core@default:default,org.eclipse.papyrus.infra.types.edit@default:default,org.eclipse.papyrus.infra.types.editor@default:default,org.eclipse.papyrus.infra.types.rulebased@default:default,org.eclipse.papyrus.infra.types.tests@default:default,org.eclipse.papyrus.infra.types.ui.tests@default:default,org.eclipse.papyrus.infra.types.ui@default:default,org.eclipse.papyrus.infra.types@default:default,org.eclipse.papyrus.infra.ui.emf.tests@default:default,org.eclipse.papyrus.infra.ui.emf@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.ui.tests@default:default,org.eclipse.papyrus.infra.ui@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.edit@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.editor@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.tests@default:default,org.eclipse.papyrus.infra.viewpoints.configuration@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010.edit@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.viewpoints.preferences@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.mwe2.utils@default:default,org.eclipse.papyrus.releng.dev.release@default:default,org.eclipse.papyrus.releng.main.release@default:default,org.eclipse.papyrus.releng.tools@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:false,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:false,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:false,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:false,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.tests.diagramassistants@default:default,org.eclipse.papyrus.tests.framework.annotations@default:default,org.eclipse.papyrus.tests.framework.edit@default:default,org.eclipse.papyrus.tests.framework.editor@default:default,org.eclipse.papyrus.tests.framework@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.libraries@default:default,org.eclipse.papyrus.uml.alf.tests@default:default,org.eclipse.papyrus.uml.alf.to.fuml@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.developer.mde@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css.palette@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.emftree@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.linklf@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.dynamic.profile.tests@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.filters.edit@default:default,org.eclipse.papyrus.uml.filters.tests@default:default,org.eclipse.papyrus.uml.filters@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.tests@default:false,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.clazz.config.tests@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display.tests@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.tests@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.ui@default:default,org.eclipse.papyrus.uml.profile.assistants.generator@default:default,org.eclipse.papyrus.uml.profile.drafter.documentation@default:default,org.eclipse.papyrus.uml.profile.drafter.tests@default:default,org.eclipse.papyrus.uml.profile.drafter@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator@default:default,org.eclipse.papyrus.uml.profile.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.ui@default:default,org.eclipse.papyrus.uml.profile.types.generator@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types.tests@default:false,org.eclipse.papyrus.uml.service.types.ui.tests@default:default,org.eclipse.papyrus.uml.service.types.ui@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.tests@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.types.core@default:default,org.eclipse.papyrus.uml.ui.perspectiveconfiguration@default:default,org.eclipse.papyrus.uml.ui@default:default,org.eclipse.papyrus.uml.validation.tests.genvalidation@default:default,org.eclipse.papyrus.uml.validation.tests.staticprofile@default:default,org.eclipse.papyrus.uml.validation.tests@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/resources/deleteActionUtil/model.notation b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/resources/deleteActionUtil/model.notation index 8cd1edc6f7c..2b22c0fad9b 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/resources/deleteActionUtil/model.notation +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/resources/deleteActionUtil/model.notation @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <notation:Diagram xmi:id="_BwdpMG86EeSG_p8PAYDlLg" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_FUB2kG86EeSG_p8PAYDlLg" type="2007"> - <children xmi:type="notation:DecorationNode" xmi:id="_FUrW0G86EeSG_p8PAYDlLg" type="5026"/> - <children xmi:type="notation:DecorationNode" xmi:id="_FUr94G86EeSG_p8PAYDlLg" type="7016"> - <children xmi:type="notation:Shape" xmi:id="_P9U1UHYxEeSbgutMzIJcYw" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_P9WqgHYxEeSbgutMzIJcYw" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_P9XRkHYxEeSbgutMzIJcYw" type="7017"> + <children xmi:type="notation:Shape" xmi:id="_FUB2kG86EeSG_p8PAYDlLg" type="Package_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_FUrW0G86EeSG_p8PAYDlLg" type="Package_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Hf5gkOu7EeWY74UYS4X44A" type="Package_PackagedElementCompartment"> + <children xmi:type="notation:Shape" xmi:id="_P9U1UHYxEeSbgutMzIJcYw" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_P9WqgHYxEeSbgutMzIJcYw" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Hf6usOu7EeWY74UYS4X44A" type="Class_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_P9XRkXYxEeSbgutMzIJcYw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_P9XRknYxEeSbgutMzIJcYw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_P9XRk3YxEeSbgutMzIJcYw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P9XRlHYxEeSbgutMzIJcYw"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_P9XRlXYxEeSbgutMzIJcYw" type="7018"> + <children xmi:type="notation:BasicCompartment" xmi:id="_Hf7VwOu7EeWY74UYS4X44A" type="Class_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_P9XRlnYxEeSbgutMzIJcYw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_P9XRl3YxEeSbgutMzIJcYw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_P9XRmHYxEeSbgutMzIJcYw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P9XRmXYxEeSbgutMzIJcYw"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_P9X4oHYxEeSbgutMzIJcYw" type="7019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_Hf780Ou7EeWY74UYS4X44A" type="Class_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_P9X4oXYxEeSbgutMzIJcYw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_P9X4onYxEeSbgutMzIJcYw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_P9X4o3YxEeSbgutMzIJcYw"/> @@ -57,21 +57,21 @@ <element xsi:nil="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E21DM3ZLEeS6zJCWmZdMOg" x="512" y="329"/> </children> - <children xmi:type="notation:Shape" xmi:id="_xN4dgHbVEeST0aHn3TAicw" type="2002"> - <children xmi:type="notation:DecorationNode" xmi:id="_xOHHAHbVEeST0aHn3TAicw" type="5005"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_xOHuEHbVEeST0aHn3TAicw" type="7002"> + <children xmi:type="notation:Shape" xmi:id="_xN4dgHbVEeST0aHn3TAicw" type="Component_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_xOHHAHbVEeST0aHn3TAicw" type="Component_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Hf_nMOu7EeWY74UYS4X44A" type="Component_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_xOHuEXbVEeST0aHn3TAicw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_xOHuEnbVEeST0aHn3TAicw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_xOHuE3bVEeST0aHn3TAicw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xOHuFHbVEeST0aHn3TAicw"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_xOIVIHbVEeST0aHn3TAicw" type="7003"> + <children xmi:type="notation:BasicCompartment" xmi:id="_HgAOQOu7EeWY74UYS4X44A" type="Component_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_xOIVIXbVEeST0aHn3TAicw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_xOIVInbVEeST0aHn3TAicw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_xOIVI3bVEeST0aHn3TAicw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xOIVJHbVEeST0aHn3TAicw"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_xOIVJXbVEeST0aHn3TAicw" type="7004"> + <children xmi:type="notation:BasicCompartment" xmi:id="_HgA1UOu7EeWY74UYS4X44A" type="Component_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_xOIVJnbVEeST0aHn3TAicw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_xOIVJ3bVEeST0aHn3TAicw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_xOIVKHbVEeST0aHn3TAicw"/> @@ -80,21 +80,21 @@ <element xmi:type="uml:Component" href="model.uml#_B6t_IG8_EeSkzprKqshrgw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xN4dgXbVEeST0aHn3TAicw" x="498" y="71" width="232" height="159"/> </children> - <children xmi:type="notation:Shape" xmi:id="_fHft0Hb_EeSGV47xTootHw" type="2002"> - <children xmi:type="notation:DecorationNode" xmi:id="_fHuXUHb_EeSGV47xTootHw" type="5005"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_fHu-YHb_EeSGV47xTootHw" type="7002"> + <children xmi:type="notation:Shape" xmi:id="_fHft0Hb_EeSGV47xTootHw" type="Component_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_fHuXUHb_EeSGV47xTootHw" type="Component_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_HgBcYOu7EeWY74UYS4X44A" type="Component_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_fHu-YXb_EeSGV47xTootHw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_fHu-Ynb_EeSGV47xTootHw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_fHu-Y3b_EeSGV47xTootHw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHu-ZHb_EeSGV47xTootHw"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_fHvlcHb_EeSGV47xTootHw" type="7003"> + <children xmi:type="notation:BasicCompartment" xmi:id="_HgCDcOu7EeWY74UYS4X44A" type="Component_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_fHvlcXb_EeSGV47xTootHw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_fHvlcnb_EeSGV47xTootHw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_fHvlc3b_EeSGV47xTootHw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHvldHb_EeSGV47xTootHw"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_fHvldXb_EeSGV47xTootHw" type="7004"> + <children xmi:type="notation:BasicCompartment" xmi:id="_HgCDceu7EeWY74UYS4X44A" type="Component_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_fHvldnb_EeSGV47xTootHw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_fHvld3b_EeSGV47xTootHw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_fHvleHb_EeSGV47xTootHw"/> @@ -103,21 +103,21 @@ <element xmi:type="uml:Component" href="model.uml#_fFdtgHb_EeSGV47xTootHw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHft0Xb_EeSGV47xTootHw" x="149" y="300" width="210" height="133"/> </children> - <children xmi:type="notation:Shape" xmi:id="_5sP4QHoHEeSPf9bmYWALSA" type="2002"> - <children xmi:type="notation:DecorationNode" xmi:id="_5sSUgHoHEeSPf9bmYWALSA" type="5005"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_5sS7kHoHEeSPf9bmYWALSA" type="7002"> + <children xmi:type="notation:Shape" xmi:id="_5sP4QHoHEeSPf9bmYWALSA" type="Component_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_5sSUgHoHEeSPf9bmYWALSA" type="Component_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_HgCqgOu7EeWY74UYS4X44A" type="Component_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_5sS7kXoHEeSPf9bmYWALSA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_5sTioHoHEeSPf9bmYWALSA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_5sTioXoHEeSPf9bmYWALSA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5sTionoHEeSPf9bmYWALSA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_5sTio3oHEeSPf9bmYWALSA" type="7003"> + <children xmi:type="notation:BasicCompartment" xmi:id="_HgDRkOu7EeWY74UYS4X44A" type="Component_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_5sTipHoHEeSPf9bmYWALSA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_5sTipXoHEeSPf9bmYWALSA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_5sTipnoHEeSPf9bmYWALSA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5sTip3oHEeSPf9bmYWALSA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_5sUJsHoHEeSPf9bmYWALSA" type="7004"> + <children xmi:type="notation:BasicCompartment" xmi:id="_HgD4oOu7EeWY74UYS4X44A" type="Component_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_5sUJsXoHEeSPf9bmYWALSA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_5sUJsnoHEeSPf9bmYWALSA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_5sUJs3oHEeSPf9bmYWALSA"/> @@ -126,21 +126,21 @@ <element xmi:type="uml:Component" href="model.uml#__SZSAG8-EeSkzprKqshrgw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5sP4QXoHEeSPf9bmYWALSA" x="908" y="271"/> </children> - <children xmi:type="notation:Shape" xmi:id="_5sl2gHoHEeSPf9bmYWALSA" type="2002"> - <children xmi:type="notation:DecorationNode" xmi:id="_5smdkHoHEeSPf9bmYWALSA" type="5005"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_5smdkXoHEeSPf9bmYWALSA" type="7002"> + <children xmi:type="notation:Shape" xmi:id="_5sl2gHoHEeSPf9bmYWALSA" type="Component_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_5smdkHoHEeSPf9bmYWALSA" type="Component_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_HgFGwOu7EeWY74UYS4X44A" type="Component_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_5smdknoHEeSPf9bmYWALSA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_5smdk3oHEeSPf9bmYWALSA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_5smdlHoHEeSPf9bmYWALSA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5smdlXoHEeSPf9bmYWALSA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_5smdlnoHEeSPf9bmYWALSA" type="7003"> + <children xmi:type="notation:BasicCompartment" xmi:id="_HgFt0Ou7EeWY74UYS4X44A" type="Component_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_5smdl3oHEeSPf9bmYWALSA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_5smdmHoHEeSPf9bmYWALSA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_5smdmXoHEeSPf9bmYWALSA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5smdmnoHEeSPf9bmYWALSA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_5snEoHoHEeSPf9bmYWALSA" type="7004"> + <children xmi:type="notation:BasicCompartment" xmi:id="_HgGU4Ou7EeWY74UYS4X44A" type="Component_NestedClassifierCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_5snEoXoHEeSPf9bmYWALSA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_5snEonoHEeSPf9bmYWALSA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_5snEo3oHEeSPf9bmYWALSA"/> @@ -149,17 +149,17 @@ <element xmi:type="uml:Component" href="model.uml#_FW6ZMG8_EeSkzprKqshrgw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5sl2gXoHEeSPf9bmYWALSA" x="1014" y="81"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_BwdpMW86EeSG_p8PAYDlLg" name="diagram_compatibility_version" stringValue="1.0.0"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_BwdpMW86EeSG_p8PAYDlLg" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_BwdpMm86EeSG_p8PAYDlLg"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_BwdpM286EeSG_p8PAYDlLg"> <owner xmi:type="uml:Model" href="model.uml#_BnBZUG86EeSG_p8PAYDlLg"/> </styles> <element xmi:type="uml:Model" href="model.uml#_BnBZUG86EeSG_p8PAYDlLg"/> - <edges xmi:type="notation:Connector" xmi:id="_5tiRsHoHEeSPf9bmYWALSA" type="4008" source="_5sl2gHoHEeSPf9bmYWALSA" target="_5sP4QHoHEeSPf9bmYWALSA"> - <children xmi:type="notation:DecorationNode" xmi:id="_5ti4wHoHEeSPf9bmYWALSA" type="6026"> + <edges xmi:type="notation:Connector" xmi:id="_5tiRsHoHEeSPf9bmYWALSA" type="Dependency_Edge" source="_5sl2gHoHEeSPf9bmYWALSA" target="_5sP4QHoHEeSPf9bmYWALSA"> + <children xmi:type="notation:DecorationNode" xmi:id="_5ti4wHoHEeSPf9bmYWALSA" type="Dependency_NameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_5ti4wXoHEeSPf9bmYWALSA" y="40"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_5ti4wnoHEeSPf9bmYWALSA" type="6027"> + <children xmi:type="notation:DecorationNode" xmi:id="_5ti4wnoHEeSPf9bmYWALSA" type="Dependency_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_5tjf0HoHEeSPf9bmYWALSA" y="60"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_5tiRsXoHEeSPf9bmYWALSA"/> @@ -170,44 +170,44 @@ </edges> </notation:Diagram> <notation:Diagram xmi:id="_-ZPccG8-EeSkzprKqshrgw" type="PapyrusUMLComponentDiagram" name="NewComponentDiagram" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="__dqG0G8-EeSkzprKqshrgw" type="2002"> - <children xmi:type="notation:DecorationNode" xmi:id="__duYQG8-EeSkzprKqshrgw" type="5004"/> - <children xmi:type="notation:BasicCompartment" xmi:id="__du_UG8-EeSkzprKqshrgw" type="7001"> + <children xmi:type="notation:Shape" xmi:id="__dqG0G8-EeSkzprKqshrgw" type="Component_PackagedElementShape"> + <children xmi:type="notation:DecorationNode" xmi:id="__duYQG8-EeSkzprKqshrgw" type="Component_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Hv-j8Ou7EeWY74UYS4X44A" type="Component_StructureCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="__du_UW8-EeSkzprKqshrgw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__du_Um8-EeSkzprKqshrgw"/> </children> <element xmi:type="uml:Component" href="model.uml#__SZSAG8-EeSkzprKqshrgw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__dqG0W8-EeSkzprKqshrgw" x="211" y="127" width="166" height="139"/> </children> - <children xmi:type="notation:Shape" xmi:id="_B64-QG8_EeSkzprKqshrgw" type="2002"> - <children xmi:type="notation:DecorationNode" xmi:id="_B66zcG8_EeSkzprKqshrgw" type="5004"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_B67agG8_EeSkzprKqshrgw" type="7001"> + <children xmi:type="notation:Shape" xmi:id="_B64-QG8_EeSkzprKqshrgw" type="Component_PackagedElementShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_B66zcG8_EeSkzprKqshrgw" type="Component_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Hv-j8eu7EeWY74UYS4X44A" type="Component_StructureCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_B67agW8_EeSkzprKqshrgw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B67agm8_EeSkzprKqshrgw"/> </children> <element xmi:type="uml:Component" href="model.uml#_B6t_IG8_EeSkzprKqshrgw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B64-QW8_EeSkzprKqshrgw" x="547" y="164" width="162" height="123"/> </children> - <children xmi:type="notation:Shape" xmi:id="_FXBt8G8_EeSkzprKqshrgw" type="2002"> - <children xmi:type="notation:DecorationNode" xmi:id="_FXC8EG8_EeSkzprKqshrgw" type="5004"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_FXDjIG8_EeSkzprKqshrgw" type="7001"> + <children xmi:type="notation:Shape" xmi:id="_FXBt8G8_EeSkzprKqshrgw" type="Component_PackagedElementShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_FXC8EG8_EeSkzprKqshrgw" type="Component_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Hv_LAOu7EeWY74UYS4X44A" type="Component_StructureCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_FXDjIW8_EeSkzprKqshrgw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FXDjIm8_EeSkzprKqshrgw"/> </children> <element xmi:type="uml:Component" href="model.uml#_FW6ZMG8_EeSkzprKqshrgw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FXBt8W8_EeSkzprKqshrgw" x="459" y="403" width="186" height="133"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_-ZPccW8-EeSkzprKqshrgw" name="diagram_compatibility_version" stringValue="1.0.0"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_-ZPccW8-EeSkzprKqshrgw" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_-ZPccm8-EeSkzprKqshrgw"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_-ZPcc28-EeSkzprKqshrgw"> <owner xmi:type="uml:Model" href="model.uml#_BnBZUG86EeSG_p8PAYDlLg"/> </styles> <element xmi:type="uml:Model" href="model.uml#_BnBZUG86EeSG_p8PAYDlLg"/> - <edges xmi:type="notation:Connector" xmi:id="_HlLAgG8_EeSkzprKqshrgw" type="4010" source="_FXBt8G8_EeSkzprKqshrgw" target="__dqG0G8-EeSkzprKqshrgw"> - <children xmi:type="notation:DecorationNode" xmi:id="_HlNcwG8_EeSkzprKqshrgw" type="6009"> + <edges xmi:type="notation:Connector" xmi:id="_HlLAgG8_EeSkzprKqshrgw" type="Dependency_Edge" source="_FXBt8G8_EeSkzprKqshrgw" target="__dqG0G8-EeSkzprKqshrgw"> + <children xmi:type="notation:DecorationNode" xmi:id="_HlNcwG8_EeSkzprKqshrgw" type="Dependency_NameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_HlOD0G8_EeSkzprKqshrgw" y="60"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_HlPR8G8_EeSkzprKqshrgw" type="6023"> + <children xmi:type="notation:DecorationNode" xmi:id="_HlPR8G8_EeSkzprKqshrgw" type="Dependency_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_HlP5AG8_EeSkzprKqshrgw" y="60"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_HlLnkG8_EeSkzprKqshrgw"/> diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF index 9f402b3321d..a96c9988ae0 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF @@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.core.runtime, com.google.guava;bundle-version="11.0.0", org.eclipse.xtext.xbase.lib;bundle-version="2.8.0", org.eclipse.papyrus.uml.profile.types.generator.tests;bundle-version="1.2.0", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0" + org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0", + org.eclipse.papyrus.uml.diagram.usecase;bundle-version="2.0.0" Export-Package: org.eclipse.papyrus.uml.profile.assistants.generator.tests Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/resources/edges.profile.notation b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/resources/edges.profile.notation index f8980b7fd17..6ae6822d1c1 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/resources/edges.profile.notation +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/resources/edges.profile.notation @@ -1,98 +1,49 @@ <?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:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_1ci1wLhREeS255SIHoq4Gg" type="PapyrusUMLProfileDiagram" name="stereotypes" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_CELrsLhSEeS255SIHoq4Gg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CEWq0LhSEeS255SIHoq4Gg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEWq0bhSEeS255SIHoq4Gg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEWq0rhSEeS255SIHoq4Gg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEWq07hSEeS255SIHoq4Gg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEWq1LhSEeS255SIHoq4Gg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEWq1bhSEeS255SIHoq4Gg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_CERyULhSEeS255SIHoq4Gg" type="1084"/> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_1ci1wLhREeS255SIHoq4Gg" type="PapyrusUMLProfileDiagram" name="stereotypes" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_CELrsLhSEeS255SIHoq4Gg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_CERyULhSEeS255SIHoq4Gg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CERyUbhSEeS255SIHoq4Gg" x="58" y="67"/> </children> - <children xmi:type="notation:Shape" xmi:id="_CEXR4LhSEeS255SIHoq4Gg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CEXR5LhSEeS255SIHoq4Gg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEXR5bhSEeS255SIHoq4Gg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEXR5rhSEeS255SIHoq4Gg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEXR57hSEeS255SIHoq4Gg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEXR6LhSEeS255SIHoq4Gg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEXR6bhSEeS255SIHoq4Gg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_CEXR4rhSEeS255SIHoq4Gg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_CEXR4LhSEeS255SIHoq4Gg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_CEXR4rhSEeS255SIHoq4Gg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#GeneralizationSet"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CEXR47hSEeS255SIHoq4Gg" x="188" y="68"/> </children> - <children xmi:type="notation:Shape" xmi:id="_CEX48LhSEeS255SIHoq4Gg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CEX49LhSEeS255SIHoq4Gg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEX49bhSEeS255SIHoq4Gg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEX49rhSEeS255SIHoq4Gg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEYgALhSEeS255SIHoq4Gg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEYgAbhSEeS255SIHoq4Gg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEYgArhSEeS255SIHoq4Gg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_CEX48rhSEeS255SIHoq4Gg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_CEX48LhSEeS255SIHoq4Gg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_CEX48rhSEeS255SIHoq4Gg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Transition"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CEX487hSEeS255SIHoq4Gg" x="301" y="388"/> </children> - <children xmi:type="notation:Shape" xmi:id="_CEYgA7hSEeS255SIHoq4Gg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CEYgB7hSEeS255SIHoq4Gg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEYgCLhSEeS255SIHoq4Gg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEYgCbhSEeS255SIHoq4Gg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEYgCrhSEeS255SIHoq4Gg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEYgC7hSEeS255SIHoq4Gg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEYgDLhSEeS255SIHoq4Gg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_CEYgBbhSEeS255SIHoq4Gg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_CEYgA7hSEeS255SIHoq4Gg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_CEYgBbhSEeS255SIHoq4Gg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ControlFlow"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CEYgBrhSEeS255SIHoq4Gg" x="178" y="388"/> </children> - <children xmi:type="notation:Shape" xmi:id="_CEZHELhSEeS255SIHoq4Gg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CEZHFLhSEeS255SIHoq4Gg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEZHFbhSEeS255SIHoq4Gg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEZHFrhSEeS255SIHoq4Gg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEZHF7hSEeS255SIHoq4Gg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEZHGLhSEeS255SIHoq4Gg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEZHGbhSEeS255SIHoq4Gg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_CEZHErhSEeS255SIHoq4Gg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_CEZHELhSEeS255SIHoq4Gg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_CEZHErhSEeS255SIHoq4Gg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ObjectFlow"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CEZHE7hSEeS255SIHoq4Gg" x="58" y="387"/> </children> - <children xmi:type="notation:Shape" xmi:id="_CEZuILhSEeS255SIHoq4Gg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CEZuJLhSEeS255SIHoq4Gg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEZuJbhSEeS255SIHoq4Gg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEZuJrhSEeS255SIHoq4Gg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEZuJ7hSEeS255SIHoq4Gg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEZuKLhSEeS255SIHoq4Gg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEZuKbhSEeS255SIHoq4Gg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_CEZuIrhSEeS255SIHoq4Gg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_CEZuILhSEeS255SIHoq4Gg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_CEZuIrhSEeS255SIHoq4Gg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CEZuI7hSEeS255SIHoq4Gg" x="314" y="68"/> </children> - <children xmi:type="notation:Shape" xmi:id="_CEZuKrhSEeS255SIHoq4Gg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CEaVMrhSEeS255SIHoq4Gg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEaVM7hSEeS255SIHoq4Gg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEaVNLhSEeS255SIHoq4Gg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEaVNbhSEeS255SIHoq4Gg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEaVNrhSEeS255SIHoq4Gg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CEaVN7hSEeS255SIHoq4Gg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_CEaVMLhSEeS255SIHoq4Gg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_CEZuKrhSEeS255SIHoq4Gg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_CEaVMLhSEeS255SIHoq4Gg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Message"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CEaVMbhSEeS255SIHoq4Gg" x="422" y="387"/> </children> - <children xmi:type="notation:Shape" xmi:id="_G5PWILhSEeS255SIHoq4Gg" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_G5P9MLhSEeS255SIHoq4Gg" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_G5TAgLhSEeS255SIHoq4Gg" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_G5PWILhSEeS255SIHoq4Gg" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_G5P9MLhSEeS255SIHoq4Gg" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_G5TAgLhSEeS255SIHoq4Gg" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_G5TAgbhSEeS255SIHoq4Gg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_G5TAgrhSEeS255SIHoq4Gg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_G5TAg7hSEeS255SIHoq4Gg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G5TAhLhSEeS255SIHoq4Gg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_G5TAhbhSEeS255SIHoq4Gg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_G5TAhbhSEeS255SIHoq4Gg" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_G5TAhrhSEeS255SIHoq4Gg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_G5TAh7hSEeS255SIHoq4Gg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_G5TAiLhSEeS255SIHoq4Gg"/> @@ -101,15 +52,15 @@ <element xmi:type="uml:Stereotype" href="edges.profile.uml#_G5AFkLhSEeS255SIHoq4Gg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G5PWIbhSEeS255SIHoq4Gg" x="220" y="547"/> </children> - <children xmi:type="notation:Shape" xmi:id="_IL9iQLhSEeS255SIHoq4Gg" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_IL9iQrhSEeS255SIHoq4Gg" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_IL9iQ7hSEeS255SIHoq4Gg" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_IL9iQLhSEeS255SIHoq4Gg" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_IL9iQrhSEeS255SIHoq4Gg" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_IL9iQ7hSEeS255SIHoq4Gg" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_IL9iRLhSEeS255SIHoq4Gg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_IL9iRbhSEeS255SIHoq4Gg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_IL9iRrhSEeS255SIHoq4Gg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IL9iR7hSEeS255SIHoq4Gg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_IL9iSLhSEeS255SIHoq4Gg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_IL9iSLhSEeS255SIHoq4Gg" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_IL9iSbhSEeS255SIHoq4Gg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_IL9iSrhSEeS255SIHoq4Gg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_IL9iS7hSEeS255SIHoq4Gg"/> @@ -118,53 +69,179 @@ <element xmi:type="uml:Stereotype" href="edges.profile.uml#_IL7tELhSEeS255SIHoq4Gg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IL9iQbhSEeS255SIHoq4Gg" x="183" y="220"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_1ci1wbhREeS255SIHoq4Gg" name="diagram_compatibility_version" stringValue="1.0.0"/> + <children xmi:type="notation:Shape" xmi:id="_uxEBgOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_uxEBgex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uxF2sOx5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uxEBgux5EeWqj-BpY8F6OQ" x="258" y="67"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_uxoCMOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_uxoCMex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uxoCM-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#GeneralizationSet"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uxoCMux5EeWqj-BpY8F6OQ" x="388" y="68"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_uyBq0Ox5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_uyBq0ex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uyCR4Ox5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Transition"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uyBq0ux5EeWqj-BpY8F6OQ" x="501" y="388"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_uybTcOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_uybTcex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uybTc-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ControlFlow"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uybTcux5EeWqj-BpY8F6OQ" x="378" y="388"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_uyzG4Ox5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_uyzG4ex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uyzG4-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ObjectFlow"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uyzG4ux5EeWqj-BpY8F6OQ" x="258" y="387"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_uzK6UOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_uzK6Uex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uzK6U-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uzK6Uux5EeWqj-BpY8F6OQ" x="514" y="68"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_uzfDYOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_uzfDYex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uzfDY-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Message"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uzfDYux5EeWqj-BpY8F6OQ" x="622" y="387"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_1ci1wbhREeS255SIHoq4Gg" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_1ci1wrhREeS255SIHoq4Gg"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_1ci1w7hREeS255SIHoq4Gg"> <owner xmi:type="uml:Profile" href="edges.profile.uml#_1aEJgLhREeS255SIHoq4Gg"/> </styles> <element xmi:type="uml:Profile" href="edges.profile.uml#_1aEJgLhREeS255SIHoq4Gg"/> - <edges xmi:type="notation:Connector" xmi:id="_KllFALhSEeS255SIHoq4Gg" type="1013" source="_IL9iQLhSEeS255SIHoq4Gg" target="_CELrsLhSEeS255SIHoq4Gg"> + <edges xmi:type="notation:Connector" xmi:id="_KllFALhSEeS255SIHoq4Gg" type="Extension_Edge" source="_IL9iQLhSEeS255SIHoq4Gg" target="_CELrsLhSEeS255SIHoq4Gg"> <styles xmi:type="notation:FontStyle" xmi:id="_KllFAbhSEeS255SIHoq4Gg"/> <element xmi:type="uml:Extension" href="edges.profile.uml#_KlbUALhSEeS255SIHoq4Gg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KllFArhSEeS255SIHoq4Gg" points="[-10, -13, 105, 128]$[-65, -138, 50, 3]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kl_UsLhSEeS255SIHoq4Gg" id="(0.4,0.13)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_L4_NoLhSEeS255SIHoq4Gg" type="1013" source="_IL9iQLhSEeS255SIHoq4Gg" target="_CEXR4LhSEeS255SIHoq4Gg"> + <edges xmi:type="notation:Connector" xmi:id="_L4_NoLhSEeS255SIHoq4Gg" type="Extension_Edge" source="_IL9iQLhSEeS255SIHoq4Gg" target="_CEXR4LhSEeS255SIHoq4Gg"> <styles xmi:type="notation:FontStyle" xmi:id="_L4_NobhSEeS255SIHoq4Gg"/> <element xmi:type="uml:Extension" href="edges.profile.uml#_L49_gbhSEeS255SIHoq4Gg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_L4_NorhSEeS255SIHoq4Gg" points="[4, -18, 3, 127]$[4, -120, 3, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_L5C4ALhSEeS255SIHoq4Gg" id="(0.54,0.18)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_OKt_sLhSEeS255SIHoq4Gg" type="1013" source="_IL9iQLhSEeS255SIHoq4Gg" target="_CEZuILhSEeS255SIHoq4Gg"> + <edges xmi:type="notation:Connector" xmi:id="_OKt_sLhSEeS255SIHoq4Gg" type="Extension_Edge" source="_IL9iQLhSEeS255SIHoq4Gg" target="_CEZuILhSEeS255SIHoq4Gg"> <styles xmi:type="notation:FontStyle" xmi:id="_OKt_sbhSEeS255SIHoq4Gg"/> <element xmi:type="uml:Extension" href="edges.profile.uml#_OKsKgLhSEeS255SIHoq4Gg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OKt_srhSEeS255SIHoq4Gg" points="[10, -13, -92, 127]$[110, -115, 8, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OKxqELhSEeS255SIHoq4Gg" id="(0.79,0.13)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_PL2FgLhSEeS255SIHoq4Gg" type="1013" source="_G5PWILhSEeS255SIHoq4Gg" target="_CEZHELhSEeS255SIHoq4Gg"> + <edges xmi:type="notation:Connector" xmi:id="_PL2FgLhSEeS255SIHoq4Gg" type="Extension_Edge" source="_G5PWILhSEeS255SIHoq4Gg" target="_CEZHELhSEeS255SIHoq4Gg"> <styles xmi:type="notation:FontStyle" xmi:id="_PL2FgbhSEeS255SIHoq4Gg"/> <element xmi:type="uml:Extension" href="edges.profile.uml#_PL03YLhSEeS255SIHoq4Gg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PL2FgrhSEeS255SIHoq4Gg" points="[-18, -12, 205, 135]$[-173, -140, 50, 7]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PL5I0LhSEeS255SIHoq4Gg" id="(0.29,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PcRHILhSEeS255SIHoq4Gg" id="(0.76,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_QcX5QLhSEeS255SIHoq4Gg" type="1013" source="_G5PWILhSEeS255SIHoq4Gg" target="_CEYgA7hSEeS255SIHoq4Gg"> + <edges xmi:type="notation:Connector" xmi:id="_QcX5QLhSEeS255SIHoq4Gg" type="Extension_Edge" source="_G5PWILhSEeS255SIHoq4Gg" target="_CEYgA7hSEeS255SIHoq4Gg"> <styles xmi:type="notation:FontStyle" xmi:id="_QcX5QbhSEeS255SIHoq4Gg"/> <element xmi:type="uml:Extension" href="edges.profile.uml#_QcWrIbhSEeS255SIHoq4Gg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QcX5QrhSEeS255SIHoq4Gg" points="[-5, -13, 43, 134]$[-43, -122, 5, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QcbjoLhSEeS255SIHoq4Gg" id="(0.56,0.13)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_Q7my8LhSEeS255SIHoq4Gg" type="1013" source="_G5PWILhSEeS255SIHoq4Gg" target="_CEX48LhSEeS255SIHoq4Gg"> + <edges xmi:type="notation:Connector" xmi:id="_Q7my8LhSEeS255SIHoq4Gg" type="Extension_Edge" source="_G5PWILhSEeS255SIHoq4Gg" target="_CEX48LhSEeS255SIHoq4Gg"> <styles xmi:type="notation:FontStyle" xmi:id="_Q7my8bhSEeS255SIHoq4Gg"/> <element xmi:type="uml:Extension" href="edges.profile.uml#_Q7k9wbhSEeS255SIHoq4Gg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q7my8rhSEeS255SIHoq4Gg" points="[6, -18, -60, 134]$[36, -127, -30, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q7qdULhSEeS255SIHoq4Gg" id="(0.65,0.18)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_RcWvkLhSEeS255SIHoq4Gg" type="1013" source="_G5PWILhSEeS255SIHoq4Gg" target="_CEZuKrhSEeS255SIHoq4Gg"> + <edges xmi:type="notation:Connector" xmi:id="_RcWvkLhSEeS255SIHoq4Gg" type="Extension_Edge" source="_G5PWILhSEeS255SIHoq4Gg" target="_CEZuKrhSEeS255SIHoq4Gg"> <styles xmi:type="notation:FontStyle" xmi:id="_RcWvkbhSEeS255SIHoq4Gg"/> <element xmi:type="uml:Extension" href="edges.profile.uml#_RcU6YbhSEeS255SIHoq4Gg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RcWvkrhSEeS255SIHoq4Gg" points="[22, -18, -154, 135]$[226, -148, 50, 5]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RcbBALhSEeS255SIHoq4Gg" id="(0.76,0.18)"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_uxF2sex5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_CELrsLhSEeS255SIHoq4Gg" target="_uxEBgOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_uxF2sux5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uxGdwux5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uxF2s-x5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uxGdwOx5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uxGdwex5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_uxoCNOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_CEXR4LhSEeS255SIHoq4Gg" target="_uxoCMOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_uxoCNex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uxopQux5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#GeneralizationSet"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uxoCNux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uxopQOx5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uxopQex5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_uyCR4ex5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_CEX48LhSEeS255SIHoq4Gg" target="_uyBq0Ox5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_uyCR4ux5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uyCR5ux5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Transition"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uyCR4-x5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uyCR5Ox5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uyCR5ex5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_uybTdOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_CEYgA7hSEeS255SIHoq4Gg" target="_uybTcOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_uybTdex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uybTeex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ControlFlow"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uybTdux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uybTd-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uybTeOx5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_uyzG5Ox5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_CEZHELhSEeS255SIHoq4Gg" target="_uyzG4Ox5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_uyzG5ex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uyzt8ux5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ObjectFlow"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uyzG5ux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uyzt8Ox5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uyzt8ex5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_uzLhYOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_CEZuILhSEeS255SIHoq4Gg" target="_uzK6UOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_uzLhYex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uzLhZex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uzLhYux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uzLhY-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uzLhZOx5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_uzfDZOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_CEZuKrhSEeS255SIHoq4Gg" target="_uzfDYOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_uzfDZex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uzfDaex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Message"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uzfDZux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uzfDZ-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uzfDaOx5EeWqj-BpY8F6OQ"/> + </edges> </notation:Diagram> diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/resources/j2ee.profile.notation b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/resources/j2ee.profile.notation index fd2f88f33f2..a5484c35ba7 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/resources/j2ee.profile.notation +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/resources/j2ee.profile.notation @@ -1,57 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" 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:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <notation:Diagram xmi:id="_rdgrcEigEeSRp-p9nf2EsA" type="PapyrusUMLProfileDiagram" name="stereotypes" measurementUnit="Pixel"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5jumsIZCEeSuTJMIrueWyQ" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jumsYZCEeSuTJMIrueWyQ" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jvNwIZCEeSuTJMIrueWyQ" key="StereotypeList" value="Ecore::EPackage"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jvNwYZCEeSuTJMIrueWyQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jvNwoZCEeSuTJMIrueWyQ" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jvNw4ZCEeSuTJMIrueWyQ" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:Shape" xmi:id="_33LW0EigEeSRp-p9nf2EsA" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_33PoQEigEeSRp-p9nf2EsA" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_33PoQUigEeSRp-p9nf2EsA" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_33PoQkigEeSRp-p9nf2EsA" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_33PoQ0igEeSRp-p9nf2EsA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_33PoREigEeSRp-p9nf2EsA" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_33PoRUigEeSRp-p9nf2EsA" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_33OaIEigEeSRp-p9nf2EsA" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_33LW0EigEeSRp-p9nf2EsA" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_33OaIEigEeSRp-p9nf2EsA" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_33OaIUigEeSRp-p9nf2EsA" x="88" y="41"/> </children> - <children xmi:type="notation:Shape" xmi:id="_6kXV0EigEeSRp-p9nf2EsA" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6kX84EigEeSRp-p9nf2EsA" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6kX84UigEeSRp-p9nf2EsA" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6kX84kigEeSRp-p9nf2EsA" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6kX840igEeSRp-p9nf2EsA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6kX85EigEeSRp-p9nf2EsA" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6kX85UigEeSRp-p9nf2EsA" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_6kXV0kigEeSRp-p9nf2EsA" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_6kXV0EigEeSRp-p9nf2EsA" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_6kXV0kigEeSRp-p9nf2EsA" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6kXV00igEeSRp-p9nf2EsA" x="443" y="36"/> </children> - <children xmi:type="notation:Shape" xmi:id="_AYAIYEihEeSRp-p9nf2EsA" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AYAvcUihEeSRp-p9nf2EsA" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AYAvckihEeSRp-p9nf2EsA" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AYBWgEihEeSRp-p9nf2EsA" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AYBWgUihEeSRp-p9nf2EsA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AYBWgkihEeSRp-p9nf2EsA" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AYBWg0ihEeSRp-p9nf2EsA" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_AYAIYkihEeSRp-p9nf2EsA" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_AYAIYEihEeSRp-p9nf2EsA" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_AYAIYkihEeSRp-p9nf2EsA" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AYAvcEihEeSRp-p9nf2EsA" x="275" y="41"/> </children> - <children xmi:type="notation:Shape" xmi:id="_BfLy4EihEeSRp-p9nf2EsA" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_BfLy4kihEeSRp-p9nf2EsA" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_BfLy40ihEeSRp-p9nf2EsA" type="1071"> - <children xmi:type="notation:Node" xmi:id="_btXXAEihEeSRp-p9nf2EsA" type="3002"> + <children xmi:type="notation:Shape" xmi:id="_BfLy4EihEeSRp-p9nf2EsA" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_BfLy4kihEeSRp-p9nf2EsA" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_BfLy40ihEeSRp-p9nf2EsA" type="Stereotype_AttributeCompartment"> + <children xmi:type="notation:Node" xmi:id="_btXXAEihEeSRp-p9nf2EsA" type="Property_ClassAttributeLabel"> <element xmi:type="uml:Property" href="j2ee.profile.uml#_btMX4EihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_btXXAUihEeSRp-p9nf2EsA"/> </children> - <children xmi:type="notation:Node" xmi:id="_wa0NwGEcEeSRDpkdeXfJuw" type="3002"> + <children xmi:type="notation:Node" xmi:id="_wa0NwGEcEeSRDpkdeXfJuw" type="Property_ClassAttributeLabel"> <element xmi:type="uml:Property" href="j2ee.profile.uml#_wZ9SIGEcEeSRDpkdeXfJuw"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_wa0NwWEcEeSRDpkdeXfJuw"/> </children> @@ -60,7 +32,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_BfMZ8EihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BfMZ8UihEeSRp-p9nf2EsA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_BfMZ8kihEeSRp-p9nf2EsA" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_BfMZ8kihEeSRp-p9nf2EsA" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_BfMZ80ihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_BfMZ9EihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_BfMZ9UihEeSRp-p9nf2EsA"/> @@ -69,15 +41,15 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_Be-XgEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BfLy4UihEeSRp-p9nf2EsA" x="24" y="197"/> </children> - <children xmi:type="notation:Shape" xmi:id="_DNfu0EihEeSRp-p9nf2EsA" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_DNgV4EihEeSRp-p9nf2EsA" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_DNgV4UihEeSRp-p9nf2EsA" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_DNfu0EihEeSRp-p9nf2EsA" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_DNgV4EihEeSRp-p9nf2EsA" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_DNgV4UihEeSRp-p9nf2EsA" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_DNgV4kihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_DNgV40ihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_DNgV5EihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DNgV5UihEeSRp-p9nf2EsA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_DNgV5kihEeSRp-p9nf2EsA" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_DNgV5kihEeSRp-p9nf2EsA" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_DNgV50ihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_DNgV6EihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_DNgV6UihEeSRp-p9nf2EsA"/> @@ -86,18 +58,18 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_DNegsEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DNfu0UihEeSRp-p9nf2EsA" x="287" y="197"/> </children> - <children xmi:type="notation:Shape" xmi:id="_WA6KgEihEeSRp-p9nf2EsA" type="2006"> - <children xmi:type="notation:DecorationNode" xmi:id="_WA6xkEihEeSRp-p9nf2EsA" type="5023"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_WA6xkUihEeSRp-p9nf2EsA" type="1063"> - <children xmi:type="notation:Node" xmi:id="_XMi3MEihEeSRp-p9nf2EsA" type="1037"> + <children xmi:type="notation:Shape" xmi:id="_WA6KgEihEeSRp-p9nf2EsA" type="Enumeration_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_WA6xkEihEeSRp-p9nf2EsA" type="Enumeration_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_WA6xkUihEeSRp-p9nf2EsA" type="Enumeration_LiteralCompartment"> + <children xmi:type="notation:Node" xmi:id="_XMi3MEihEeSRp-p9nf2EsA" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="j2ee.profile.uml#_XMd-sEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_XMi3MUihEeSRp-p9nf2EsA"/> </children> - <children xmi:type="notation:Node" xmi:id="_YztCQEihEeSRp-p9nf2EsA" type="1037"> + <children xmi:type="notation:Node" xmi:id="_YztCQEihEeSRp-p9nf2EsA" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="j2ee.profile.uml#_Yzr0IEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_YztCQUihEeSRp-p9nf2EsA"/> </children> - <children xmi:type="notation:Node" xmi:id="_Zg3qQEihEeSRp-p9nf2EsA" type="1037"> + <children xmi:type="notation:Node" xmi:id="_Zg3qQEihEeSRp-p9nf2EsA" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="j2ee.profile.uml#_Zg2cIEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_Zg3qQUihEeSRp-p9nf2EsA"/> </children> @@ -109,15 +81,15 @@ <element xmi:type="uml:Enumeration" href="j2ee.profile.uml#_WA1SAEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WA6KgUihEeSRp-p9nf2EsA" x="73" y="339"/> </children> - <children xmi:type="notation:Shape" xmi:id="_EpBRoEihEeSRp-p9nf2EsA" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_EpBRokihEeSRp-p9nf2EsA" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_EpBRo0ihEeSRp-p9nf2EsA" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_EpBRoEihEeSRp-p9nf2EsA" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_EpBRokihEeSRp-p9nf2EsA" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_EpBRo0ihEeSRp-p9nf2EsA" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_EpBRpEihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_EpBRpUihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_EpBRpkihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EpBRp0ihEeSRp-p9nf2EsA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_EpBRqEihEeSRp-p9nf2EsA" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_EpBRqEihEeSRp-p9nf2EsA" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_EpBRqUihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_EpBRqkihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_EpBRq0ihEeSRp-p9nf2EsA"/> @@ -126,43 +98,67 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_Eo_ccEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EpBRoUihEeSRp-p9nf2EsA" x="445" y="198"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_rdgrcUigEeSRp-p9nf2EsA" name="diagram_compatibility_version" stringValue="1.0.0"/> + <children xmi:type="notation:Shape" xmi:id="_xGtqQOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xGtqQex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xGuRUOx5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xGtqQux5EeWqj-BpY8F6OQ" x="288" y="41"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_xG-I8Ox5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xG-I8ex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xG-I8-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xG-I8ux5EeWqj-BpY8F6OQ" x="643" y="36"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_xHMLYOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xHMLYex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xHMycOx5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xHMLYux5EeWqj-BpY8F6OQ" x="475" y="41"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_rdgrcUigEeSRp-p9nf2EsA" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_rdgrckigEeSRp-p9nf2EsA"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_rdgrc0igEeSRp-p9nf2EsA"> <owner xmi:type="uml:Profile" href="j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/> </styles> <element xmi:type="uml:Profile" href="j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/> - <edges xmi:type="notation:Connector" xmi:id="_Gi8AoEihEeSRp-p9nf2EsA" type="1013" source="_BfLy4EihEeSRp-p9nf2EsA" target="_33LW0EigEeSRp-p9nf2EsA"> + <edges xmi:type="notation:Connector" xmi:id="_Gi8AoEihEeSRp-p9nf2EsA" type="Extension_Edge" source="_BfLy4EihEeSRp-p9nf2EsA" target="_33LW0EigEeSRp-p9nf2EsA"> <styles xmi:type="notation:FontStyle" xmi:id="_Gi8AoUihEeSRp-p9nf2EsA"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_Gi3IIEihEeSRp-p9nf2EsA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Gi8AokihEeSRp-p9nf2EsA" points="[-2, -15, 14, 131]$[-14, -171, 2, -25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GjASEEihEeSRp-p9nf2EsA" id="(0.6607142857142857,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JshAsUihEeSRp-p9nf2EsA" id="(0.47,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_HDzSAEihEeSRp-p9nf2EsA" type="1013" source="_DNfu0EihEeSRp-p9nf2EsA" target="_AYAIYEihEeSRp-p9nf2EsA"> + <edges xmi:type="notation:Connector" xmi:id="_HDzSAEihEeSRp-p9nf2EsA" type="Extension_Edge" source="_DNfu0EihEeSRp-p9nf2EsA" target="_AYAIYEihEeSRp-p9nf2EsA"> <styles xmi:type="notation:FontStyle" xmi:id="_HDzSAUihEeSRp-p9nf2EsA"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_HDyD4EihEeSRp-p9nf2EsA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HDzSAkihEeSRp-p9nf2EsA" points="[-4, -50, 8, 131]$[-12, -156, 0, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6G7hAEiiEeSKm9FE-lgkJg" id="(0.43,0.02)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6G8IEEiiEeSKm9FE-lgkJg" id="(0.46,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_Iw5tAEihEeSRp-p9nf2EsA" type="4001" source="_BfLy4EihEeSRp-p9nf2EsA" target="_DNfu0EihEeSRp-p9nf2EsA"> - <children xmi:type="notation:DecorationNode" xmi:id="_Iw6UEEihEeSRp-p9nf2EsA" type="6001"> + <edges xmi:type="notation:Connector" xmi:id="_Iw5tAEihEeSRp-p9nf2EsA" type="Association_Edge" source="_BfLy4EihEeSRp-p9nf2EsA" target="_DNfu0EihEeSRp-p9nf2EsA"> + <children xmi:type="notation:DecorationNode" xmi:id="_Iw6UEEihEeSRp-p9nf2EsA" type="Association_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw6UEUihEeSRp-p9nf2EsA" y="60"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_Iw6UEkihEeSRp-p9nf2EsA" visible="false" type="6002"> + <children xmi:type="notation:DecorationNode" xmi:id="_Iw6UEkihEeSRp-p9nf2EsA" visible="false" type="Association_NameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw6UE0ihEeSRp-p9nf2EsA" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_Iw67IEihEeSRp-p9nf2EsA" type="6003"> + <children xmi:type="notation:DecorationNode" xmi:id="_Iw67IEihEeSRp-p9nf2EsA" type="Association_TargetRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw67IUihEeSRp-p9nf2EsA" x="-8" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_Iw67IkihEeSRp-p9nf2EsA" type="6005"> + <children xmi:type="notation:DecorationNode" xmi:id="_Iw67IkihEeSRp-p9nf2EsA" type="Association_SourceRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw67I0ihEeSRp-p9nf2EsA" y="-20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_Iw67JEihEeSRp-p9nf2EsA" type="6033"> + <children xmi:type="notation:DecorationNode" xmi:id="_Iw67JEihEeSRp-p9nf2EsA" type="Association_SourceMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw7iMEihEeSRp-p9nf2EsA" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_Iw7iMUihEeSRp-p9nf2EsA" type="6034"> + <children xmi:type="notation:DecorationNode" xmi:id="_Iw7iMUihEeSRp-p9nf2EsA" type="Association_TargetMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw7iMkihEeSRp-p9nf2EsA" y="-20"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_Iw5tAUihEeSRp-p9nf2EsA"/> @@ -171,24 +167,54 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JsgZoEihEeSRp-p9nf2EsA" id="(1.0,0.45045045045045046)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JshAsEihEeSRp-p9nf2EsA" id="(0.0,0.5)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_JiVPoHW0EeSkkId3wIdLLg" type="1013" source="_EpBRoEihEeSRp-p9nf2EsA" target="_6kXV0EigEeSRp-p9nf2EsA"> + <edges xmi:type="notation:Connector" xmi:id="_JiVPoHW0EeSkkId3wIdLLg" type="Extension_Edge" source="_EpBRoEihEeSRp-p9nf2EsA" target="_6kXV0EigEeSRp-p9nf2EsA"> <styles xmi:type="notation:FontStyle" xmi:id="_JiVPoXW0EeSkkId3wIdLLg"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_JiQXIHW0EeSkkId3wIdLLg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JiVPonW0EeSkkId3wIdLLg" points="[-3, -17, 12, 137]$[-23, -129, -8, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JiY6AHW0EeSkkId3wIdLLg" id="(0.46,0.09)"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_xGuRUex5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_33LW0EigEeSRp-p9nf2EsA" target="_xGtqQOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_xGuRUux5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xGuRVux5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xGuRU-x5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xGuRVOx5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xGuRVex5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_xG-I9Ox5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_6kXV0EigEeSRp-p9nf2EsA" target="_xG-I8Ox5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_xG-I9ex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xG-I-ex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xG-I9ux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xG-I9-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xG-I-Ox5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_xHMycex5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_AYAIYEihEeSRp-p9nf2EsA" target="_xHMLYOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_xHMycux5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xHMydux5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xHMyc-x5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xHMydOx5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xHMydex5EeWqj-BpY8F6OQ"/> + </edges> </notation:Diagram> <css:ModelStyleSheets xmi:id="_x0-j0EigEeSRp-p9nf2EsA"/> <notation:Diagram xmi:id="_OqMJsHcGEeSigYPDkthHwg" type="PapyrusUMLProfileDiagram" name="usecases" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_QF8WAHcGEeSigYPDkthHwg" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_QF89EHcGEeSigYPDkthHwg" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_QF89EXcGEeSigYPDkthHwg" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_QF8WAHcGEeSigYPDkthHwg" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_QF89EHcGEeSigYPDkthHwg" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_QF89EXcGEeSigYPDkthHwg" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QF89EncGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QF89E3cGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QF89FHcGEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QF89FXcGEeSigYPDkthHwg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_QF9kIHcGEeSigYPDkthHwg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_QF9kIHcGEeSigYPDkthHwg" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QF9kIXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QF9kIncGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QF9kI3cGEeSigYPDkthHwg"/> @@ -197,15 +223,15 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_m3yyoHcFEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QF8WAXcGEeSigYPDkthHwg" x="26" y="163"/> </children> - <children xmi:type="notation:Shape" xmi:id="_QGER0HcGEeSigYPDkthHwg" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_QGE44HcGEeSigYPDkthHwg" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGE44XcGEeSigYPDkthHwg" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_QGER0HcGEeSigYPDkthHwg" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_QGE44HcGEeSigYPDkthHwg" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGE44XcGEeSigYPDkthHwg" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGE44ncGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGE443cGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGE45HcGEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGE45XcGEeSigYPDkthHwg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGE45ncGEeSigYPDkthHwg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGE45ncGEeSigYPDkthHwg" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGE453cGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGE46HcGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGE46XcGEeSigYPDkthHwg"/> @@ -214,15 +240,15 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_qiossHcFEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGER0XcGEeSigYPDkthHwg" x="294" y="168"/> </children> - <children xmi:type="notation:Shape" xmi:id="_QGLmkHcGEeSigYPDkthHwg" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_QGLmkncGEeSigYPDkthHwg" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGLmk3cGEeSigYPDkthHwg" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_QGLmkHcGEeSigYPDkthHwg" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_QGLmkncGEeSigYPDkthHwg" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGLmk3cGEeSigYPDkthHwg" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGLmlHcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGLmlXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGLmlncGEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGLml3cGEeSigYPDkthHwg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGMNoHcGEeSigYPDkthHwg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGMNoHcGEeSigYPDkthHwg" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGMNoXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGMNoncGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGMNo3cGEeSigYPDkthHwg"/> @@ -231,15 +257,15 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_rus3MHcFEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGLmkXcGEeSigYPDkthHwg" x="416" y="166"/> </children> - <children xmi:type="notation:Shape" xmi:id="_QGSUQHcGEeSigYPDkthHwg" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_QGSUQncGEeSigYPDkthHwg" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGSUQ3cGEeSigYPDkthHwg" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_QGSUQHcGEeSigYPDkthHwg" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_QGSUQncGEeSigYPDkthHwg" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGSUQ3cGEeSigYPDkthHwg" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGSURHcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGSURXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGSURncGEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGSUR3cGEeSigYPDkthHwg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGS7UHcGEeSigYPDkthHwg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGS7UHcGEeSigYPDkthHwg" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGS7UXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGS7UncGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGS7U3cGEeSigYPDkthHwg"/> @@ -248,15 +274,15 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_4VupIHcFEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGSUQXcGEeSigYPDkthHwg" x="156" y="165"/> </children> - <children xmi:type="notation:Shape" xmi:id="_QGZpAHcGEeSigYPDkthHwg" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_QGZpAncGEeSigYPDkthHwg" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGZpA3cGEeSigYPDkthHwg" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_QGZpAHcGEeSigYPDkthHwg" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_QGZpAncGEeSigYPDkthHwg" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGZpA3cGEeSigYPDkthHwg" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGZpBHcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGZpBXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGZpBncGEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGZpB3cGEeSigYPDkthHwg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGaQEHcGEeSigYPDkthHwg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGaQEHcGEeSigYPDkthHwg" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGaQEXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGaQEncGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGaQE3cGEeSigYPDkthHwg"/> @@ -265,106 +291,150 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_8HPL4HcFEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGZpAXcGEeSigYPDkthHwg" x="554" y="163"/> </children> - <children xmi:type="notation:Shape" xmi:id="_V4Q58HcGEeSigYPDkthHwg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V4SIEHcGEeSigYPDkthHwg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4SIEXcGEeSigYPDkthHwg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4SIEncGEeSigYPDkthHwg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4SIE3cGEeSigYPDkthHwg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4SIFHcGEeSigYPDkthHwg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4SIFXcGEeSigYPDkthHwg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_V4Q58ncGEeSigYPDkthHwg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_V4Q58HcGEeSigYPDkthHwg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_V4Q58ncGEeSigYPDkthHwg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#UseCase"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V4RhAHcGEeSigYPDkthHwg" x="21" y="31"/> </children> - <children xmi:type="notation:Shape" xmi:id="_V4SvIHcGEeSigYPDkthHwg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V4TWMXcGEeSigYPDkthHwg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4T9QHcGEeSigYPDkthHwg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4T9QXcGEeSigYPDkthHwg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4T9QncGEeSigYPDkthHwg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4T9Q3cGEeSigYPDkthHwg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4T9RHcGEeSigYPDkthHwg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_V4SvIncGEeSigYPDkthHwg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_V4SvIHcGEeSigYPDkthHwg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_V4SvIncGEeSigYPDkthHwg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Actor"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V4TWMHcGEeSigYPDkthHwg" x="345" y="30"/> </children> - <children xmi:type="notation:Shape" xmi:id="_hAXPwHcGEeSigYPDkthHwg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hAYd4HcGEeSigYPDkthHwg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hAYd4XcGEeSigYPDkthHwg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hAZE8HcGEeSigYPDkthHwg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hAZE8XcGEeSigYPDkthHwg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hAZE8ncGEeSigYPDkthHwg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hAZE83cGEeSigYPDkthHwg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_hAX20HcGEeSigYPDkthHwg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_hAXPwHcGEeSigYPDkthHwg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_hAX20HcGEeSigYPDkthHwg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAX20XcGEeSigYPDkthHwg" x="551" y="26"/> </children> - <children xmi:type="notation:Shape" xmi:id="_neABkHcGEeSigYPDkthHwg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_neBPsHcGEeSigYPDkthHwg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_neBPsXcGEeSigYPDkthHwg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_neBPsncGEeSigYPDkthHwg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_neBPs3cGEeSigYPDkthHwg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_neBPtHcGEeSigYPDkthHwg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_neB2wHcGEeSigYPDkthHwg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_neABkncGEeSigYPDkthHwg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_neABkHcGEeSigYPDkthHwg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_neABkncGEeSigYPDkthHwg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ExtensionPoint"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_neAooHcGEeSigYPDkthHwg" x="160" y="27"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_OqMJsXcGEeSigYPDkthHwg" name="diagram_compatibility_version" stringValue="1.0.0"/> + <children xmi:type="notation:Shape" xmi:id="_xM81IOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xM81Iex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xM81I-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#UseCase"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xM81Iux5EeWqj-BpY8F6OQ" x="221" y="31"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_xNOh8Ox5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xNOh8ex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xNOh8-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Actor"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xNOh8ux5EeWqj-BpY8F6OQ" x="545" y="30"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_xNfnsOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xNfnsex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xNfns-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xNfnsux5EeWqj-BpY8F6OQ" x="751" y="26"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_xNu4QOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xNu4Qex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xNvfUOx5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ExtensionPoint"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xNu4Qux5EeWqj-BpY8F6OQ" x="360" y="27"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_OqMJsXcGEeSigYPDkthHwg" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_OqMJsncGEeSigYPDkthHwg"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_OqMJs3cGEeSigYPDkthHwg"> <owner xmi:type="uml:Profile" href="j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/> </styles> <element xmi:type="uml:Profile" href="j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/> - <edges xmi:type="notation:Connector" xmi:id="_iTrRwHcGEeSigYPDkthHwg" type="1013" source="_QGZpAHcGEeSigYPDkthHwg" target="_hAXPwHcGEeSigYPDkthHwg"> + <edges xmi:type="notation:Connector" xmi:id="_iTrRwHcGEeSigYPDkthHwg" type="Extension_Edge" source="_QGZpAHcGEeSigYPDkthHwg" target="_hAXPwHcGEeSigYPDkthHwg"> <styles xmi:type="notation:FontStyle" xmi:id="_iTrRwXcGEeSigYPDkthHwg"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_iTlLIHcGEeSigYPDkthHwg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iTrRwncGEeSigYPDkthHwg" points="[0, 16, 9, -108]$[0, 149, 9, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iTvjMHcGEeSigYPDkthHwg" id="(0.47,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-eZHUHdDEeSqne_6Ue1U0A" id="(0.5,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_oB5_4HcGEeSigYPDkthHwg" type="1013" source="_QGER0HcGEeSigYPDkthHwg" target="_V4SvIHcGEeSigYPDkthHwg"> + <edges xmi:type="notation:Connector" xmi:id="_oB5_4HcGEeSigYPDkthHwg" type="Extension_Edge" source="_QGER0HcGEeSigYPDkthHwg" target="_V4SvIHcGEeSigYPDkthHwg"> <styles xmi:type="notation:FontStyle" xmi:id="_oB5_4XcGEeSigYPDkthHwg"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_oB2VgHcGEeSigYPDkthHwg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oB5_4ncGEeSigYPDkthHwg" points="[16, 50, -40, -107]$[50, 132, -6, -25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-ef1AHdDEeSqne_6Ue1U0A" id="(0.75,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-egcEHdDEeSqne_6Ue1U0A" id="(0.36,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_oichIHcGEeSigYPDkthHwg" type="1013" source="_QGLmkHcGEeSigYPDkthHwg" target="_V4SvIHcGEeSigYPDkthHwg"> + <edges xmi:type="notation:Connector" xmi:id="_oichIHcGEeSigYPDkthHwg" type="Extension_Edge" source="_QGLmkHcGEeSigYPDkthHwg" target="_V4SvIHcGEeSigYPDkthHwg"> <styles xmi:type="notation:FontStyle" xmi:id="_oichIXcGEeSigYPDkthHwg"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_oiY2wHcGEeSigYPDkthHwg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oichIncGEeSigYPDkthHwg" points="[-19, 50, 47, -109]$[-58, 134, 8, -25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-egcEXdDEeSqne_6Ue1U0A" id="(0.14,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-ehDIHdDEeSqne_6Ue1U0A" id="(0.66,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_o5rVYHcGEeSigYPDkthHwg" type="1013" source="_QGSUQHcGEeSigYPDkthHwg" target="_neABkHcGEeSigYPDkthHwg"> + <edges xmi:type="notation:Connector" xmi:id="_o5rVYHcGEeSigYPDkthHwg" type="Extension_Edge" source="_QGSUQHcGEeSigYPDkthHwg" target="_neABkHcGEeSigYPDkthHwg"> <styles xmi:type="notation:FontStyle" xmi:id="_o5rVYXcGEeSigYPDkthHwg"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_o5oSEHcGEeSigYPDkthHwg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o5rVYncGEeSigYPDkthHwg" points="[3, 50, -6, -107]$[3, 182, -6, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-eLr8HdDEeSqne_6Ue1U0A" id="(0.54,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-eMTAHdDEeSqne_6Ue1U0A" id="(0.5,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_pUu5sHcGEeSigYPDkthHwg" type="1013" source="_QF8WAHcGEeSigYPDkthHwg" target="_V4Q58HcGEeSigYPDkthHwg"> + <edges xmi:type="notation:Connector" xmi:id="_pUu5sHcGEeSigYPDkthHwg" type="Extension_Edge" source="_QF8WAHcGEeSigYPDkthHwg" target="_V4Q58HcGEeSigYPDkthHwg"> <styles xmi:type="notation:FontStyle" xmi:id="_pUu5sXcGEeSigYPDkthHwg"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_pUrPUXcGEeSigYPDkthHwg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pUu5sncGEeSigYPDkthHwg" points="[-3, 13, 13, -113]$[-19, 101, -3, -25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pUykEHcGEeSigYPDkthHwg" id="(0.45,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-eTAsHdDEeSqne_6Ue1U0A" id="(0.5,1.0)"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_xM81JOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_V4Q58HcGEeSigYPDkthHwg" target="_xM81IOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_xM81Jex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xM9cMux5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#UseCase"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xM81Jux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xM9cMOx5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xM9cMex5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_xNOh9Ox5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_V4SvIHcGEeSigYPDkthHwg" target="_xNOh8Ox5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_xNOh9ex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xNOh-ex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Actor"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xNOh9ux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xNOh9-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xNOh-Ox5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_xNfntOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_hAXPwHcGEeSigYPDkthHwg" target="_xNfnsOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_xNfntex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xNfnuex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xNfntux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xNfnt-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xNfnuOx5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_xNvfUex5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_neABkHcGEeSigYPDkthHwg" target="_xNu4QOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_xNvfUux5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xNvfVux5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ExtensionPoint"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xNvfU-x5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xNvfVOx5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xNvfVex5EeWqj-BpY8F6OQ"/> + </edges> </notation:Diagram> <notation:Diagram xmi:id="_52licJbDEeSp3sLEVy9Cbw" type="PapyrusUMLProfileDiagram" name="access control" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_66cMIJbDEeSp3sLEVy9Cbw" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_66cMIpbDEeSp3sLEVy9Cbw" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_66czMJbDEeSp3sLEVy9Cbw" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_66cMIJbDEeSp3sLEVy9Cbw" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_66cMIpbDEeSp3sLEVy9Cbw" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_66czMJbDEeSp3sLEVy9Cbw" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_66czMZbDEeSp3sLEVy9Cbw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_66czMpbDEeSp3sLEVy9Cbw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_66czM5bDEeSp3sLEVy9Cbw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_66czNJbDEeSp3sLEVy9Cbw"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_66czNZbDEeSp3sLEVy9Cbw" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_66czNZbDEeSp3sLEVy9Cbw" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_66czNpbDEeSp3sLEVy9Cbw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_66czN5bDEeSp3sLEVy9Cbw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_66czOJbDEeSp3sLEVy9Cbw"/> @@ -373,82 +443,126 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_0jBXEJbDEeSp3sLEVy9Cbw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_66cMIZbDEeSp3sLEVy9Cbw" x="256" y="290"/> </children> - <children xmi:type="notation:Shape" xmi:id="_BCaP8JbEEeSp3sLEVy9Cbw" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BCcsMJbEEeSp3sLEVy9Cbw" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BCdTQJbEEeSp3sLEVy9Cbw" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BCdTQZbEEeSp3sLEVy9Cbw" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BCdTQpbEEeSp3sLEVy9Cbw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BCdTQ5bEEeSp3sLEVy9Cbw" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BCdTRJbEEeSp3sLEVy9Cbw" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_BCa3AJbEEeSp3sLEVy9Cbw" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_BCaP8JbEEeSp3sLEVy9Cbw" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_BCa3AJbEEeSp3sLEVy9Cbw" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BCa3AZbEEeSp3sLEVy9Cbw" x="387" y="117"/> </children> - <children xmi:type="notation:Shape" xmi:id="_GHq5kJbEEeSp3sLEVy9Cbw" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GHsHsJbEEeSp3sLEVy9Cbw" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHsHsZbEEeSp3sLEVy9Cbw" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHsHspbEEeSp3sLEVy9Cbw" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHsHs5bEEeSp3sLEVy9Cbw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHsHtJbEEeSp3sLEVy9Cbw" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHsHtZbEEeSp3sLEVy9Cbw" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_GHq5kpbEEeSp3sLEVy9Cbw" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_GHq5kJbEEeSp3sLEVy9Cbw" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_GHq5kpbEEeSp3sLEVy9Cbw" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GHrgoJbEEeSp3sLEVy9Cbw" x="125" y="120"/> </children> - <children xmi:type="notation:Shape" xmi:id="_GHsuwJbEEeSp3sLEVy9Cbw" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GHtV0ZbEEeSp3sLEVy9Cbw" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHt84JbEEeSp3sLEVy9Cbw" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHt84ZbEEeSp3sLEVy9Cbw" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHt84pbEEeSp3sLEVy9Cbw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHt845bEEeSp3sLEVy9Cbw" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHt85JbEEeSp3sLEVy9Cbw" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_GHsuwpbEEeSp3sLEVy9Cbw" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_GHsuwJbEEeSp3sLEVy9Cbw" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_GHsuwpbEEeSp3sLEVy9Cbw" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GHtV0JbEEeSp3sLEVy9Cbw" x="254" y="118"/> </children> - <children xmi:type="notation:Shape" xmi:id="_ynVvcJdxEeSKqojqzo808A" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ynYywJdxEeSKqojqzo808A" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ynYywZdxEeSKqojqzo808A" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ynZZ0JdxEeSKqojqzo808A" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ynZZ0ZdxEeSKqojqzo808A" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ynZZ0pdxEeSKqojqzo808A" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ynZZ05dxEeSKqojqzo808A" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_ynXkoJdxEeSKqojqzo808A" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_ynVvcJdxEeSKqojqzo808A" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_ynXkoJdxEeSKqojqzo808A" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ynXkoZdxEeSKqojqzo808A" x="41" y="194"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_52licZbDEeSp3sLEVy9Cbw" name="diagram_compatibility_version" stringValue="1.0.0"/> + <children xmi:type="notation:Shape" xmi:id="_xJyzcOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xJyzcex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xJyzc-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xJyzcux5EeWqj-BpY8F6OQ" x="587" y="117"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_xKD5MOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xKD5Mex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xKD5M-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xKD5Mux5EeWqj-BpY8F6OQ" x="325" y="120"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_xKUX4Ox5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xKUX4ex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xKUX4-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xKUX4ux5EeWqj-BpY8F6OQ" x="454" y="118"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_xKk2kOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_xKk2kex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xKk2k-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xKk2kux5EeWqj-BpY8F6OQ" x="241" y="194"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_52licZbDEeSp3sLEVy9Cbw" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_52licpbDEeSp3sLEVy9Cbw"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_52lic5bDEeSp3sLEVy9Cbw"> <owner xmi:type="uml:Profile" href="j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/> </styles> <element xmi:type="uml:Profile" href="j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/> - <edges xmi:type="notation:Connector" xmi:id="_Hvnu0JbEEeSp3sLEVy9Cbw" type="1013" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_GHq5kJbEEeSp3sLEVy9Cbw"> + <edges xmi:type="notation:Connector" xmi:id="_Hvnu0JbEEeSp3sLEVy9Cbw" type="Extension_Edge" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_GHq5kJbEEeSp3sLEVy9Cbw"> <styles xmi:type="notation:FontStyle" xmi:id="_Hvnu0ZbEEeSp3sLEVy9Cbw"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_HvfL8JbEEeSp3sLEVy9Cbw"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Hvnu0pbEEeSp3sLEVy9Cbw" points="[-10, -14, 106, 145]$[-66, -152, 50, 7]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HvucgJbEEeSp3sLEVy9Cbw" id="(0.35,0.14)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_IPmPYJbEEeSp3sLEVy9Cbw" type="1013" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_GHsuwJbEEeSp3sLEVy9Cbw"> + <edges xmi:type="notation:Connector" xmi:id="_IPmPYJbEEeSp3sLEVy9Cbw" type="Extension_Edge" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_GHsuwJbEEeSp3sLEVy9Cbw"> <styles xmi:type="notation:FontStyle" xmi:id="_IPmPYZbEEeSp3sLEVy9Cbw"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_IPh98ZbEEeSp3sLEVy9Cbw"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IPmPYpbEEeSp3sLEVy9Cbw" points="[-6, -13, -5, 147]$[-6, -135, -5, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IPru8JbEEeSp3sLEVy9Cbw" id="(0.49,0.13)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_Ip_FUJbEEeSp3sLEVy9Cbw" type="1013" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_BCaP8JbEEeSp3sLEVy9Cbw"> + <edges xmi:type="notation:Connector" xmi:id="_Ip_FUJbEEeSp3sLEVy9Cbw" type="Extension_Edge" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_BCaP8JbEEeSp3sLEVy9Cbw"> <styles xmi:type="notation:FontStyle" xmi:id="_Ip_FUZbEEeSp3sLEVy9Cbw"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_Ip6M0JbEEeSp3sLEVy9Cbw"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ip_FUpbEEeSp3sLEVy9Cbw" points="[7, -12, -104, 148]$[63, -135, -48, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IqEk4JbEEeSp3sLEVy9Cbw" id="(0.7,0.12)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_zN1HsJdxEeSKqojqzo808A" type="1013" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_ynVvcJdxEeSKqojqzo808A"> + <edges xmi:type="notation:Connector" xmi:id="_zN1HsJdxEeSKqojqzo808A" type="Extension_Edge" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_ynVvcJdxEeSKqojqzo808A"> <styles xmi:type="notation:FontStyle" xmi:id="_zN1HsZdxEeSKqojqzo808A"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_zNoTYJdxEeSKqojqzo808A"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zN1HspdxEeSKqojqzo808A" points="[-50, -32, 165, 89]$[-165, -124, 50, -3]"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_xJyzdOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_BCaP8JbEEeSp3sLEVy9Cbw" target="_xJyzcOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_xJyzdex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xJyzeex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xJyzdux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xJyzd-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xJyzeOx5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_xKD5NOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_GHq5kJbEEeSp3sLEVy9Cbw" target="_xKD5MOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_xKD5Nex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xKD5Oex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xKD5Nux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xKD5N-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xKD5OOx5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_xKUX5Ox5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_GHsuwJbEEeSp3sLEVy9Cbw" target="_xKUX4Ox5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_xKUX5ex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xKUX6ex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xKUX5ux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xKUX5-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xKUX6Ox5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_xKk2lOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_ynVvcJdxEeSKqojqzo808A" target="_xKk2kOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_xKk2lex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_xKk2mex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xKk2lux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xKk2l-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xKk2mOx5EeWqj-BpY8F6OQ"/> + </edges> </notation:Diagram> </xmi:XMI> diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/resources/nesting.profile.notation b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/resources/nesting.profile.notation index febce5398f0..84f1484d66b 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/resources/nesting.profile.notation +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/resources/nesting.profile.notation @@ -1,17 +1,17 @@ <?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:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_XDNvwKdOEeS-y569OJYknA" type="PapyrusUMLProfileDiagram" name="stereotypes" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_kZ8gUKdOEeS-y569OJYknA" type="1030"> - <children xmi:type="notation:DecorationNode" xmi:id="_kaAxwKdOEeS-y569OJYknA" type="1047"/> - <children xmi:type="notation:DecorationNode" xmi:id="_kaBY0KdOEeS-y569OJYknA" type="1042"> - <children xmi:type="notation:Shape" xmi:id="_92B5IKdOEeS-y569OJYknA" type="1023"> - <children xmi:type="notation:DecorationNode" xmi:id="_92B5IqdOEeS-y569OJYknA" type="1046"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_92B5I6dOEeS-y569OJYknA" type="1052"> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_XDNvwKdOEeS-y569OJYknA" type="PapyrusUMLProfileDiagram" name="stereotypes" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_kZ8gUKdOEeS-y569OJYknA" type="Profile_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_kaAxwKdOEeS-y569OJYknA" type="Profile_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_kaBY0KdOEeS-y569OJYknA" type="Profile_PackagedElementCompartment"> + <children xmi:type="notation:Shape" xmi:id="_92B5IKdOEeS-y569OJYknA" type="Stereotype_Shape_CN"> + <children xmi:type="notation:DecorationNode" xmi:id="_92B5IqdOEeS-y569OJYknA" type="Stereotype_NameLabel_CN"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_92B5I6dOEeS-y569OJYknA" type="Stereotype_AttributeCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_92B5JKdOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_92B5JadOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_92B5JqdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_92B5J6dOEeS-y569OJYknA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_92B5KKdOEeS-y569OJYknA" type="1053"> + <children xmi:type="notation:BasicCompartment" xmi:id="_92B5KKdOEeS-y569OJYknA" type="Stereotype_OperationCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_92B5KadOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_92B5KqdOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_92B5K6dOEeS-y569OJYknA"/> @@ -20,15 +20,15 @@ <element xmi:type="uml:Stereotype" href="nesting.profile.uml#_91_c4KdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_92B5IadOEeS-y569OJYknA" x="23" y="50"/> </children> - <children xmi:type="notation:Shape" xmi:id="_-wum0KdOEeS-y569OJYknA" type="1023"> - <children xmi:type="notation:DecorationNode" xmi:id="_-wvN4KdOEeS-y569OJYknA" type="1046"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_-wvN4adOEeS-y569OJYknA" type="1052"> + <children xmi:type="notation:Shape" xmi:id="_-wum0KdOEeS-y569OJYknA" type="Stereotype_Shape_CN"> + <children xmi:type="notation:DecorationNode" xmi:id="_-wvN4KdOEeS-y569OJYknA" type="Stereotype_NameLabel_CN"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_-wvN4adOEeS-y569OJYknA" type="Stereotype_AttributeCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_-wvN4qdOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_-wvN46dOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_-wvN5KdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-wvN5adOEeS-y569OJYknA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_-wv08KdOEeS-y569OJYknA" type="1053"> + <children xmi:type="notation:BasicCompartment" xmi:id="_-wv08KdOEeS-y569OJYknA" type="Stereotype_OperationCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_-wv08adOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_-wv08qdOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_-wv086dOEeS-y569OJYknA"/> @@ -43,18 +43,18 @@ <element xmi:type="uml:Profile" href="nesting.profile.uml#_kZoXQKdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kZ8gUadOEeS-y569OJYknA" x="106" y="341" width="297" height="205"/> </children> - <children xmi:type="notation:Shape" xmi:id="_oaSJQKdOEeS-y569OJYknA" type="2007"> - <children xmi:type="notation:DecorationNode" xmi:id="_oaSwUKdOEeS-y569OJYknA" type="5026"/> - <children xmi:type="notation:DecorationNode" xmi:id="_oaSwUadOEeS-y569OJYknA" type="1005"> - <children xmi:type="notation:Shape" xmi:id="_A0Ry8KdPEeS-y569OJYknA" type="1023"> - <children xmi:type="notation:DecorationNode" xmi:id="_A0Ry8qdPEeS-y569OJYknA" type="1046"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_A0Ry86dPEeS-y569OJYknA" type="1052"> + <children xmi:type="notation:Shape" xmi:id="_oaSJQKdOEeS-y569OJYknA" type="Package_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_oaSwUKdOEeS-y569OJYknA" type="Package_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_oaSwUadOEeS-y569OJYknA" type="Package_PackagedElementCompartment"> + <children xmi:type="notation:Shape" xmi:id="_A0Ry8KdPEeS-y569OJYknA" type="Stereotype_Shape_CN"> + <children xmi:type="notation:DecorationNode" xmi:id="_A0Ry8qdPEeS-y569OJYknA" type="Stereotype_NameLabel_CN"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_A0Ry86dPEeS-y569OJYknA" type="Stereotype_AttributeCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_A0Ry9KdPEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_A0SaAKdPEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_A0SaAadPEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A0SaAqdPEeS-y569OJYknA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_A0SaA6dPEeS-y569OJYknA" type="1053"> + <children xmi:type="notation:BasicCompartment" xmi:id="_A0SaA6dPEeS-y569OJYknA" type="Stereotype_OperationCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_A0SaBKdPEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_A0SaBadPEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_A0SaBqdPEeS-y569OJYknA"/> @@ -63,15 +63,15 @@ <element xmi:type="uml:Stereotype" href="nesting.profile.uml#_A0PWsKdPEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A0Ry8adPEeS-y569OJYknA" x="42" y="57"/> </children> - <children xmi:type="notation:Shape" xmi:id="_BmYlUKdPEeS-y569OJYknA" type="1023"> - <children xmi:type="notation:DecorationNode" xmi:id="_BmYlUqdPEeS-y569OJYknA" type="1046"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_BmYlU6dPEeS-y569OJYknA" type="1052"> + <children xmi:type="notation:Shape" xmi:id="_BmYlUKdPEeS-y569OJYknA" type="Stereotype_Shape_CN"> + <children xmi:type="notation:DecorationNode" xmi:id="_BmYlUqdPEeS-y569OJYknA" type="Stereotype_NameLabel_CN"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_BmYlU6dPEeS-y569OJYknA" type="Stereotype_AttributeCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_BmYlVKdPEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_BmYlVadPEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_BmYlVqdPEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmYlV6dPEeS-y569OJYknA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_BmYlWKdPEeS-y569OJYknA" type="1053"> + <children xmi:type="notation:BasicCompartment" xmi:id="_BmYlWKdPEeS-y569OJYknA" type="Stereotype_OperationCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_BmYlWadPEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_BmYlWqdPEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_BmYlW6dPEeS-y569OJYknA"/> @@ -86,15 +86,15 @@ <element xmi:type="uml:Package" href="nesting.profile.uml#_oaAccKdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oaSJQadOEeS-y569OJYknA" x="483" y="341" width="333" height="197"/> </children> - <children xmi:type="notation:Shape" xmi:id="_uXCbkKdOEeS-y569OJYknA" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_uXCbkqdOEeS-y569OJYknA" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_uXEQwKdOEeS-y569OJYknA" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_uXCbkKdOEeS-y569OJYknA" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_uXCbkqdOEeS-y569OJYknA" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_uXEQwKdOEeS-y569OJYknA" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_uXEQwadOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_uXEQwqdOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_uXEQw6dOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uXEQxKdOEeS-y569OJYknA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_uXE30KdOEeS-y569OJYknA" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_uXE30KdOEeS-y569OJYknA" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_uXE30adOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_uXE30qdOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_uXE306dOEeS-y569OJYknA"/> @@ -103,15 +103,15 @@ <element xmi:type="uml:Stereotype" href="nesting.profile.uml#_uW__UKdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uXCbkadOEeS-y569OJYknA" x="198" y="153"/> </children> - <children xmi:type="notation:Shape" xmi:id="_ySK0YKdOEeS-y569OJYknA" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_ySLbcadOEeS-y569OJYknA" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_ySLbcqdOEeS-y569OJYknA" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_ySK0YKdOEeS-y569OJYknA" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_ySLbcadOEeS-y569OJYknA" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_ySLbcqdOEeS-y569OJYknA" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_ySLbc6dOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_ySLbdKdOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_ySLbdadOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ySLbdqdOEeS-y569OJYknA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_ySLbd6dOEeS-y569OJYknA" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_ySLbd6dOEeS-y569OJYknA" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_ySLbeKdOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_ySLbeadOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_ySLbeqdOEeS-y569OJYknA"/> @@ -120,38 +120,40 @@ <element xmi:type="uml:Stereotype" href="nesting.profile.uml#_ySI_MKdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ySLbcKdOEeS-y569OJYknA" x="660" y="159"/> </children> - <children xmi:type="notation:Shape" xmi:id="_K3jOsKdPEeS-y569OJYknA" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K3lq8KdPEeS-y569OJYknA" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K3lq8adPEeS-y569OJYknA" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K3lq8qdPEeS-y569OJYknA" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K3lq86dPEeS-y569OJYknA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K3mSAKdPEeS-y569OJYknA" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K3mSAadPEeS-y569OJYknA" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_K3jOsqdPEeS-y569OJYknA" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_K3jOsKdPEeS-y569OJYknA" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_K3jOsqdPEeS-y569OJYknA" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3j1wKdPEeS-y569OJYknA" x="306" y="40"/> </children> - <children xmi:type="notation:Shape" xmi:id="_yWuu0KdPEeS-y569OJYknA" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yWwkAKdPEeS-y569OJYknA" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yWwkAadPEeS-y569OJYknA" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yWxLEKdPEeS-y569OJYknA" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yWxLEadPEeS-y569OJYknA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yWxLEqdPEeS-y569OJYknA" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yWxLE6dPEeS-y569OJYknA" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_yWvV4KdPEeS-y569OJYknA" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_yWuu0KdPEeS-y569OJYknA" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_yWvV4KdPEeS-y569OJYknA" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yWvV4adPEeS-y569OJYknA" x="454" y="36"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_XDNvwadOEeS-y569OJYknA" name="diagram_compatibility_version" stringValue="1.0.0"/> + <children xmi:type="notation:Shape" xmi:id="_0kNE0Ox5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_0kNE0ex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0kNE0-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0kNE0ux5EeWqj-BpY8F6OQ" x="506" y="40"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_0kagMOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_0kagMex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0kagM-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0kagMux5EeWqj-BpY8F6OQ" x="654" y="36"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_XDNvwadOEeS-y569OJYknA" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_XDNvwqdOEeS-y569OJYknA"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_XDNvw6dOEeS-y569OJYknA"> <owner xmi:type="uml:Profile" href="nesting.profile.uml#_XADuEKdOEeS-y569OJYknA"/> </styles> <element xmi:type="uml:Profile" href="nesting.profile.uml#_XADuEKdOEeS-y569OJYknA"/> - <edges xmi:type="notation:Connector" xmi:id="_EZkeoKdPEeS-y569OJYknA" type="4002" source="_92B5IKdOEeS-y569OJYknA" target="_uXCbkKdOEeS-y569OJYknA"> - <children xmi:type="notation:DecorationNode" xmi:id="_EZlFsKdPEeS-y569OJYknA" type="6007"> + <edges xmi:type="notation:Connector" xmi:id="_EZkeoKdPEeS-y569OJYknA" type="Generalization_Edge" source="_92B5IKdOEeS-y569OJYknA" target="_uXCbkKdOEeS-y569OJYknA"> + <children xmi:type="notation:DecorationNode" xmi:id="_EZlFsKdPEeS-y569OJYknA" type="Generalization_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_EZlFsadPEeS-y569OJYknA" x="-4" y="28"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_EZkeoadPEeS-y569OJYknA"/> @@ -160,8 +162,8 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O3Ke4KdPEeS-y569OJYknA" id="(0.61,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O3Ke4adPEeS-y569OJYknA" id="(0.38,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_FU10EKdPEeS-y569OJYknA" type="4002" source="_A0Ry8KdPEeS-y569OJYknA" target="_uXCbkKdOEeS-y569OJYknA"> - <children xmi:type="notation:DecorationNode" xmi:id="_FU10E6dPEeS-y569OJYknA" type="6007"> + <edges xmi:type="notation:Connector" xmi:id="_FU10EKdPEeS-y569OJYknA" type="Generalization_Edge" source="_A0Ry8KdPEeS-y569OJYknA" target="_uXCbkKdOEeS-y569OJYknA"> + <children xmi:type="notation:DecorationNode" xmi:id="_FU10E6dPEeS-y569OJYknA" type="Generalization_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_FU10FKdPEeS-y569OJYknA" x="-5" y="19"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_FU10EadPEeS-y569OJYknA"/> @@ -170,31 +172,51 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FU9I0KdPEeS-y569OJYknA" id="(0.0,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O3J30KdPEeS-y569OJYknA" id="(1.0,0.88)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_RDtO8KdPEeS-y569OJYknA" type="1013" source="_uXCbkKdOEeS-y569OJYknA" target="_K3jOsKdPEeS-y569OJYknA"> + <edges xmi:type="notation:Connector" xmi:id="_RDtO8KdPEeS-y569OJYknA" type="Extension_Edge" source="_uXCbkKdOEeS-y569OJYknA" target="_K3jOsKdPEeS-y569OJYknA"> <styles xmi:type="notation:FontStyle" xmi:id="_RDtO8adPEeS-y569OJYknA"/> <element xmi:type="uml:Extension" href="nesting.profile.uml#_RDmhQKdPEeS-y569OJYknA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RDtO8qdPEeS-y569OJYknA" points="[17, -21, -71, 88]$[81, -84, -7, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RD1KwKdPEeS-y569OJYknA" id="(0.7,0.21)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_S5mZkKdPEeS-y569OJYknA" type="1013" source="_ySK0YKdOEeS-y569OJYknA" target="_yWuu0KdPEeS-y569OJYknA"> + <edges xmi:type="notation:Connector" xmi:id="_S5mZkKdPEeS-y569OJYknA" type="Extension_Edge" source="_ySK0YKdOEeS-y569OJYknA" target="_yWuu0KdPEeS-y569OJYknA"> <styles xmi:type="notation:FontStyle" xmi:id="_S5mZkadPEeS-y569OJYknA"/> <element xmi:type="uml:Extension" href="nesting.profile.uml#_S5iIIadPEeS-y569OJYknA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_S5mZkqdPEeS-y569OJYknA" points="[-14, -14, 95, 73]$[-59, -90, 50, -3]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S5rSEKdPEeS-y569OJYknA" id="(0.01,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6MTj8KdPEeS-y569OJYknA" id="(0.9,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_Ue7_sKdPEeS-y569OJYknA" type="1013" source="_-wum0KdOEeS-y569OJYknA" target="_yWuu0KdPEeS-y569OJYknA" jumpLinkStatus="All"> + <edges xmi:type="notation:Connector" xmi:id="_Ue7_sKdPEeS-y569OJYknA" type="Extension_Edge" source="_-wum0KdOEeS-y569OJYknA" target="_yWuu0KdPEeS-y569OJYknA" jumpLinkStatus="All"> <styles xmi:type="notation:FontStyle" xmi:id="_Ue7_sadPEeS-y569OJYknA"/> <element xmi:type="uml:Extension" href="nesting.profile.uml#_Ue5jcKdPEeS-y569OJYknA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ue7_sqdPEeS-y569OJYknA" points="[20, -50, -155, 345]$[125, -396, -50, -1]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6MS84KdPEeS-y569OJYknA" id="(0.68,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_30NEIKdPEeS-y569OJYknA" id="(0.07,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_Vr_BoKdPEeS-y569OJYknA" type="1013" source="_BmYlUKdPEeS-y569OJYknA" target="_yWuu0KdPEeS-y569OJYknA"> + <edges xmi:type="notation:Connector" xmi:id="_Vr_BoKdPEeS-y569OJYknA" type="Extension_Edge" source="_BmYlUKdPEeS-y569OJYknA" target="_yWuu0KdPEeS-y569OJYknA"> <styles xmi:type="notation:FontStyle" xmi:id="_Vr_BoadPEeS-y569OJYknA"/> <element xmi:type="uml:Extension" href="nesting.profile.uml#_Vr7-UKdPEeS-y569OJYknA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Vr_BoqdPEeS-y569OJYknA" points="[-9, -14, 196, 338]$[-255, -359, -50, -7]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VsFIQKdPEeS-y569OJYknA" id="(0.08,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2ntb0KdPEeS-y569OJYknA" id="(0.38,1.0)"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_0kNE1Ox5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_K3jOsKdPEeS-y569OJYknA" target="_0kNE0Ox5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_0kNE1ex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0kNE2ex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0kNE1ux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0kNE1-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0kNE2Ox5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_0kagNOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_yWuu0KdPEeS-y569OJYknA" target="_0kagMOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_0kagNex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_0kagOex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0kagNux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0kagN-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0kagOOx5EeWqj-BpY8F6OQ"/> + </edges> </notation:Diagram> diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/BasicAssistantsGenerationTest.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/BasicAssistantsGenerationTest.java index 946cb049617..6a54192c654 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/BasicAssistantsGenerationTest.java +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/BasicAssistantsGenerationTest.java @@ -33,6 +33,7 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.ElementTypeFilter; import org.eclipse.papyrus.infra.gmfdiag.assistant.PopupAssistant; import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; import org.eclipse.papyrus.junit.utils.rules.PluginResource; +import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Stereotype; import org.eclipse.xtext.xbase.lib.Pair; @@ -80,9 +81,9 @@ public class BasicAssistantsGenerationTest extends AbstractPapyrusTest { List<PopupAssistant> popups = fixture.assertAllPopupAssistants(finderOperation); Pair<Stereotype, Class> beanClass = fixture.getMetaclassExtension("Bean", "Class"); - ElementTypeFilter filterClass = fixture.assertMetaclassFilter(beanClass, 0); + ElementTypeFilter filterClass = fixture.assertMetaclassFilter(beanClass, null); Pair<Stereotype, Class> accessControlledInterface = fixture.getMetaclassExtension("AccessControlled", "Interface"); - ElementTypeFilter filterInterface = fixture.assertMetaclassFilter(accessControlledInterface, 0); + ElementTypeFilter filterInterface = fixture.assertMetaclassFilter(accessControlledInterface, null); assertThat(transform(popups, EMFFunctions.getFeature(AssistantPackage.Literals.POPUP_ASSISTANT__FILTER, Filter.class)), // hasItems(includes(filterClass), includes(filterInterface))); @@ -95,9 +96,9 @@ public class BasicAssistantsGenerationTest extends AbstractPapyrusTest { List<ConnectionAssistant> connections = fixture.assertAllConnectionAssistants(webAssociation); Pair<Stereotype, Class> beanClass = fixture.getMetaclassExtension("Bean", "Class"); - ElementTypeFilter filterClass = fixture.assertMetaclassFilter(beanClass, 0); + ElementTypeFilter filterClass = fixture.assertMetaclassFilter(beanClass, null); Pair<Stereotype, Class> accessControlledInterface = fixture.getMetaclassExtension("AccessControlled", "Interface"); - ElementTypeFilter filterInterface = fixture.assertMetaclassFilter(accessControlledInterface, 0); + ElementTypeFilter filterInterface = fixture.assertMetaclassFilter(accessControlledInterface, null); assertThat(transform(connections, EMFFunctions.getFeature(AssistantPackage.Literals.CONNECTION_ASSISTANT__SOURCE_FILTER, Filter.class)), // hasItems(includes(filterClass), includes(filterInterface))); @@ -110,9 +111,9 @@ public class BasicAssistantsGenerationTest extends AbstractPapyrusTest { List<ConnectionAssistant> connections = fixture.assertAllConnectionAssistants(webAssociation); Pair<Stereotype, Class> beanClass = fixture.getMetaclassExtension("Bean", "Class"); - ElementTypeFilter filterClass = fixture.assertMetaclassFilter(beanClass, 0); + ElementTypeFilter filterClass = fixture.assertMetaclassFilter(beanClass, null); Pair<Stereotype, Class> accessControlledInterface = fixture.getMetaclassExtension("AccessControlled", "Interface"); - ElementTypeFilter filterInterface = fixture.assertMetaclassFilter(accessControlledInterface, 0); + ElementTypeFilter filterInterface = fixture.assertMetaclassFilter(accessControlledInterface, null); assertThat(transform(connections, EMFFunctions.getFeature(AssistantPackage.Literals.CONNECTION_ASSISTANT__TARGET_FILTER, Filter.class)), // hasItems(includes(filterClass), includes(filterInterface))); diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/DiagramSpecificAssistantsGenerationTest.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/DiagramSpecificAssistantsGenerationTest.java index a40cb5933de..c5b8e60fc8c 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/DiagramSpecificAssistantsGenerationTest.java +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/DiagramSpecificAssistantsGenerationTest.java @@ -33,6 +33,12 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.ElementTypeFilter; import org.eclipse.papyrus.infra.gmfdiag.assistant.PopupAssistant; import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; import org.eclipse.papyrus.junit.utils.rules.PluginResource; +import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN; +import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AssociationEditPart; +import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointEditPart; +import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ExtensionPointInRectangleEditPart; +import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseAsRectangleEditPartTN; +import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseEditPartTN; import org.eclipse.papyrus.uml.profile.types.generator.tests.BaseElementTypes; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Stereotype; @@ -53,7 +59,7 @@ import com.google.common.collect.Sets; * Test cases for diagram-specific diagram assistants generation for UML profiles. */ @PluginResource("/resources/j2ee.profile.uml") -@BaseElementTypes("org.eclipse.papyrus.uml.diagram.usecase.elementTypeSet") +@BaseElementTypes("org.eclipse.papyrus.umldi.service.types.UMLDIElementTypeSet") public class DiagramSpecificAssistantsGenerationTest extends AbstractPapyrusTest { @ClassRule @@ -79,16 +85,16 @@ public class DiagramSpecificAssistantsGenerationTest extends AbstractPapyrusTest public void distinctPopupHintsGenerated() { Pair<Stereotype, Class> branchPoint = fixture.getMetaclassExtension("BranchPoint", "ExtensionPoint"); List<PopupAssistant> popups = fixture.assertAllPopupAssistants(branchPoint); - Set<Integer> hints = ImmutableSet.copyOf(transform(popups, visualIDFunction())); - assertThat(hints, hasItems(3007, 3008)); + Set<String> hints = ImmutableSet.copyOf(transform(popups, visualIDFunction())); + assertThat(hints, hasItems(ExtensionPointEditPart.VISUAL_ID, ExtensionPointInRectangleEditPart.VISUAL_ID)); } @Test public void distinctConnectionHintsGenerated() { Pair<Stereotype, Class> webAssociation = fixture.getMetaclassExtension("Web", "Association"); List<ConnectionAssistant> connections = fixture.assertAllConnectionAssistants(webAssociation); - Set<Integer> hints = ImmutableSet.copyOf(transform(connections, visualIDFunction())); - assertThat(hints, hasItems(4011)); + Set<String> hints = ImmutableSet.copyOf(transform(connections, visualIDFunction())); + assertThat(hints, hasItems(AssociationEditPart.VISUAL_ID)); } @@ -99,11 +105,11 @@ public class DiagramSpecificAssistantsGenerationTest extends AbstractPapyrusTest List<PopupAssistant> popups = fixture.assertAllPopupAssistants(branchPoint); Pair<Stereotype, Class> webScenarioUseCase = fixture.getMetaclassExtension("WebScenario", "UseCase"); - ElementTypeFilter filter2013 = fixture.assertMetaclassFilter(webScenarioUseCase, 2013); - ElementTypeFilter filter2014 = fixture.assertMetaclassFilter(webScenarioUseCase, 2014); + ElementTypeFilter usecaseFilter = fixture.assertMetaclassFilter(webScenarioUseCase, UseCaseEditPartTN.VISUAL_ID); + ElementTypeFilter usecaseAsRectangleFilter = fixture.assertMetaclassFilter(webScenarioUseCase, UseCaseAsRectangleEditPartTN.VISUAL_ID); assertThat(transform(popups, EMFFunctions.getFeature(AssistantPackage.Literals.POPUP_ASSISTANT__FILTER, Filter.class)), // - hasItems(includes(filter2013), includes(filter2014))); + hasItems(includes(usecaseFilter), includes(usecaseAsRectangleFilter))); } @SuppressWarnings("unchecked") @@ -113,12 +119,12 @@ public class DiagramSpecificAssistantsGenerationTest extends AbstractPapyrusTest List<ConnectionAssistant> connections = fixture.assertAllConnectionAssistants(webAssociation); Pair<Stereotype, Class> userActor = fixture.getMetaclassExtension("User", "Actor"); - ElementTypeFilter filter2011 = fixture.assertMetaclassFilter(userActor, 2011); + ElementTypeFilter actorFilter = fixture.assertMetaclassFilter(userActor, ActorEditPartTN.VISUAL_ID); Pair<Stereotype, Class> webScenarioUseCase = fixture.getMetaclassExtension("WebScenario", "UseCase"); - ElementTypeFilter filter2013 = fixture.assertMetaclassFilter(webScenarioUseCase, 2013); + ElementTypeFilter usecaseFilter = fixture.assertMetaclassFilter(webScenarioUseCase, UseCaseEditPartTN.VISUAL_ID); assertThat(transform(connections, EMFFunctions.getFeature(AssistantPackage.Literals.CONNECTION_ASSISTANT__SOURCE_FILTER, Filter.class)), // - hasItems(includes(filter2011), includes(filter2013))); + hasItems(includes(actorFilter), includes(usecaseFilter))); } @SuppressWarnings("unchecked") @@ -128,12 +134,12 @@ public class DiagramSpecificAssistantsGenerationTest extends AbstractPapyrusTest List<ConnectionAssistant> connections = fixture.assertAllConnectionAssistants(webAssociation); Pair<Stereotype, Class> userActor = fixture.getMetaclassExtension("User", "Actor"); - ElementTypeFilter filter2011 = fixture.assertMetaclassFilter(userActor, 2011); + ElementTypeFilter actorFilter = fixture.assertMetaclassFilter(userActor, ActorEditPartTN.VISUAL_ID); Pair<Stereotype, Class> webScenarioUseCase = fixture.getMetaclassExtension("WebScenario", "UseCase"); - ElementTypeFilter filter2013 = fixture.assertMetaclassFilter(webScenarioUseCase, 2013); + ElementTypeFilter usecaseFilter = fixture.assertMetaclassFilter(webScenarioUseCase, UseCaseEditPartTN.VISUAL_ID); assertThat(transform(connections, EMFFunctions.getFeature(AssistantPackage.Literals.CONNECTION_ASSISTANT__TARGET_FILTER, Filter.class)), // - hasItems(includes(filter2011), includes(filter2013))); + hasItems(includes(actorFilter), includes(usecaseFilter))); } // @@ -142,24 +148,15 @@ public class DiagramSpecificAssistantsGenerationTest extends AbstractPapyrusTest static Function<String, String> suffixFunction() { return new Function<String, String>() { - final Pattern suffix = Pattern.compile("[._]([0-9a-zA-Z]+)$"); - @Override public String apply(String input) { - Matcher m = suffix.matcher(input); - return m.find() ? m.group(1) : null; + return input.substring(input.indexOf('_')+1); } }; } - static Function<EObject, Integer> visualIDFunction() { - Function<String, Integer> parse = new Function<String, Integer>() { - @Override - public Integer apply(String input) { - return Integer.valueOf(input); - } - }; - return Functions.compose(parse, Functions.compose(suffixFunction(), EMFFunctions.getFeature(AssistantPackage.Literals.ASSISTANT__ELEMENT_TYPE_ID, String.class))); + static Function<EObject, String> visualIDFunction() { + return Functions.compose(suffixFunction(), EMFFunctions.getFeature(AssistantPackage.Literals.ASSISTANT__ELEMENT_TYPE_ID, String.class)); } static org.hamcrest.Matcher<Filter> includes(final Filter filter) { diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/ModelGenFixture.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/ModelGenFixture.java index 96dba9a6eee..83f157d0349 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/ModelGenFixture.java +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/ModelGenFixture.java @@ -78,9 +78,9 @@ public class ModelGenFixture extends org.eclipse.papyrus.uml.profile.types.gener return String.format("%s_%s", getElementTypeID(metaclassExtension, false), visualID); } - protected String getElementTypeID(org.eclipse.uml2.uml.Class metaclass, int visualID) { + protected String getElementTypeID(org.eclipse.uml2.uml.Class metaclass, String visualID) { String metaclassID = getElementTypeID(metaclass); - return (visualID <= 0) ? metaclassID : String.format("%s_%s", metaclassID, visualID); + return (visualID == null) ? metaclassID : String.format("%s_%s", metaclassID, visualID.substring(visualID.indexOf('_')+1)); } public Assistant getAssistant(String id) { @@ -141,7 +141,7 @@ public class ModelGenFixture extends org.eclipse.papyrus.uml.profile.types.gener return result; } - public ElementTypeFilter getMetaclassFilter(Pair<Stereotype, Class> metaclassExtension, int visualID) { + public ElementTypeFilter getMetaclassFilter(Pair<Stereotype, Class> metaclassExtension, String visualID) { ElementTypeFilter result = null; String id = getElementTypeID(metaclassExtension.getValue(), visualID); @@ -171,7 +171,7 @@ public class ModelGenFixture extends org.eclipse.papyrus.uml.profile.types.gener return result; } - public ElementTypeFilter assertMetaclassFilter(Pair<Stereotype, Class> metaclassExtension, int visualID) { + public ElementTypeFilter assertMetaclassFilter(Pair<Stereotype, Class> metaclassExtension, String visualID) { ElementTypeFilter result = getMetaclassFilter(metaclassExtension, visualID); assertThat(result, notNullValue()); return result; diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/ProfilesWithPackageNestingTest.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/ProfilesWithPackageNestingTest.java index 854b23b878d..e8318eeb1ef 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/ProfilesWithPackageNestingTest.java +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/ProfilesWithPackageNestingTest.java @@ -33,6 +33,7 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.ElementTypeFilter; import org.eclipse.papyrus.infra.gmfdiag.assistant.PopupAssistant; import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; import org.eclipse.papyrus.junit.utils.rules.PluginResource; +import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AppliedStereotypePackageMergeEditPart; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Stereotype; import org.eclipse.xtext.xbase.lib.Pair; @@ -79,9 +80,9 @@ public class ProfilesWithPackageNestingTest extends AbstractPapyrusTest { Pair<Stereotype, Class> s11Class = fixture.getMetaclassExtension("S1_1", "Class"); List<PopupAssistant> popups = fixture.assertAllPopupAssistants(s11Class); - ElementTypeFilter filterClass = fixture.assertMetaclassFilter(s11Class, 0); + ElementTypeFilter filterClass = fixture.assertMetaclassFilter(s11Class, null); Pair<Stereotype, Class> s21Class = fixture.getMetaclassExtension("S2_1", "Class"); - ElementTypeFilter filterClass2 = fixture.assertMetaclassFilter(s21Class, 0); + ElementTypeFilter filterClass2 = fixture.assertMetaclassFilter(s21Class, null); assertThat(transform(popups, EMFFunctions.getFeature(AssistantPackage.Literals.POPUP_ASSISTANT__FILTER, Filter.class)), // hasItems(includes(filterClass), includes(filterClass2))); @@ -94,9 +95,9 @@ public class ProfilesWithPackageNestingTest extends AbstractPapyrusTest { List<ConnectionAssistant> connections = fixture.assertAllConnectionAssistants(s12Generalization); Pair<Stereotype, Class> s11Class = fixture.getMetaclassExtension("S1_1", "Class"); - ElementTypeFilter filterClass = fixture.assertMetaclassFilter(s11Class, 0); + ElementTypeFilter filterClass = fixture.assertMetaclassFilter(s11Class, null); Pair<Stereotype, Class> s21Class = fixture.getMetaclassExtension("S2_1", "Class"); - ElementTypeFilter filterClass2 = fixture.assertMetaclassFilter(s21Class, 0); + ElementTypeFilter filterClass2 = fixture.assertMetaclassFilter(s21Class, null); assertThat(transform(connections, EMFFunctions.getFeature(AssistantPackage.Literals.CONNECTION_ASSISTANT__SOURCE_FILTER, Filter.class)), // hasItems(includes(filterClass), includes(filterClass2))); @@ -109,9 +110,9 @@ public class ProfilesWithPackageNestingTest extends AbstractPapyrusTest { List<ConnectionAssistant> connections = fixture.assertAllConnectionAssistants(s12Generalization); Pair<Stereotype, Class> s11Class = fixture.getMetaclassExtension("S1_1", "Class"); - ElementTypeFilter filterClass = fixture.assertMetaclassFilter(s11Class, 0); + ElementTypeFilter filterClass = fixture.assertMetaclassFilter(s11Class, null); Pair<Stereotype, Class> s21Class = fixture.getMetaclassExtension("S2_1", "Class"); - ElementTypeFilter filterClass2 = fixture.assertMetaclassFilter(s21Class, 0); + ElementTypeFilter filterClass2 = fixture.assertMetaclassFilter(s21Class, null); assertThat(transform(connections, EMFFunctions.getFeature(AssistantPackage.Literals.CONNECTION_ASSISTANT__TARGET_FILTER, Filter.class)), // hasItems(includes(filterClass), includes(filterClass2))); diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF index 42646bfadd3..56c7e61344f 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF @@ -1,27 +1,28 @@ -Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.junit;bundle-version="4.11.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",
- com.google.inject;bundle-version="3.0.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.8.0"
-Export-Package: org.eclipse.papyrus.uml.profile.types.generator.tests
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0 +Require-Bundle: org.eclipse.core.runtime, + org.junit;bundle-version="4.11.0", + org.eclipse.papyrus.junit.framework;bundle-version="1.2.0", + org.eclipse.papyrus.junit.utils;bundle-version="1.2.0", + org.eclipse.emf.ecore;bundle-version="2.11.0", + org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", + org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0", + org.eclipse.uml2.uml;bundle-version="5.1.0", + org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", + org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", + org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0", + com.google.inject;bundle-version="3.0.0", + com.google.guava;bundle-version="11.0.0", + org.eclipse.xtext.xbase.lib;bundle-version="2.8.0", + org.eclipse.papyrus.uml.diagram.usecase;bundle-version="2.0.0" +Export-Package: org.eclipse.papyrus.uml.profile.types.generator.tests +Bundle-Vendor: %providerName +Bundle-ActivationPolicy: lazy +Bundle-ClassPath: . +Bundle-Version: 1.2.0.qualifier +Bundle-Localization: plugin +Bundle-Name: %pluginName +Bundle-ManifestVersion: 2 +Bundle-Description: %pluginDescription +Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.tests;singleton:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/org.eclipse.papyrus.uml.profile.types.generator.tests.launch b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/org.eclipse.papyrus.uml.profile.types.generator.tests.launch index 10eca5b82fe..c08b3ea43fd 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/org.eclipse.papyrus.uml.profile.types.generator.tests.launch +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/org.eclipse.papyrus.uml.profile.types.generator.tests.launch @@ -1,45 +1,45 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">
-<listEntry value="=org.eclipse.papyrus.uml.decoratormodel/src"/>
-</listAttribute>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.profile.types.generator.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.profile.types.generator.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms128m -Xmx1200m -XX:PermSize=256M -XX:MaxPermSize=512M"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="append.args" value="true"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS"> +<listEntry value="=org.eclipse.papyrus.uml.decoratormodel/src"/> +</listAttribute> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/AllTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.profile.types.generator.tests.AllTests"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.profile.types.generator.tests"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms128m -Xmx1200m -XX:PermSize=256M -XX:MaxPermSize=512M"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="false"/> +<booleanAttribute key="useProduct" value="true"/> +</launchConfiguration> diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/j2ee.profile.notation b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/j2ee.profile.notation index 3b5f2260540..510a295b5db 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/j2ee.profile.notation +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/j2ee.profile.notation @@ -1,57 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" 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:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <notation:Diagram xmi:id="_rdgrcEigEeSRp-p9nf2EsA" type="PapyrusUMLProfileDiagram" name="stereotypes" measurementUnit="Pixel"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5jumsIZCEeSuTJMIrueWyQ" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jumsYZCEeSuTJMIrueWyQ" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jvNwIZCEeSuTJMIrueWyQ" key="StereotypeList" value="Ecore::EPackage"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jvNwYZCEeSuTJMIrueWyQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jvNwoZCEeSuTJMIrueWyQ" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jvNw4ZCEeSuTJMIrueWyQ" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:Shape" xmi:id="_33LW0EigEeSRp-p9nf2EsA" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_33PoQEigEeSRp-p9nf2EsA" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_33PoQUigEeSRp-p9nf2EsA" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_33PoQkigEeSRp-p9nf2EsA" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_33PoQ0igEeSRp-p9nf2EsA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_33PoREigEeSRp-p9nf2EsA" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_33PoRUigEeSRp-p9nf2EsA" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_33OaIEigEeSRp-p9nf2EsA" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_33LW0EigEeSRp-p9nf2EsA" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_33OaIEigEeSRp-p9nf2EsA" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_33OaIUigEeSRp-p9nf2EsA" x="88" y="41"/> </children> - <children xmi:type="notation:Shape" xmi:id="_6kXV0EigEeSRp-p9nf2EsA" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6kX84EigEeSRp-p9nf2EsA" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6kX84UigEeSRp-p9nf2EsA" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6kX84kigEeSRp-p9nf2EsA" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6kX840igEeSRp-p9nf2EsA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6kX85EigEeSRp-p9nf2EsA" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6kX85UigEeSRp-p9nf2EsA" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_6kXV0kigEeSRp-p9nf2EsA" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_6kXV0EigEeSRp-p9nf2EsA" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_6kXV0kigEeSRp-p9nf2EsA" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6kXV00igEeSRp-p9nf2EsA" x="443" y="36"/> </children> - <children xmi:type="notation:Shape" xmi:id="_AYAIYEihEeSRp-p9nf2EsA" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AYAvcUihEeSRp-p9nf2EsA" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AYAvckihEeSRp-p9nf2EsA" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AYBWgEihEeSRp-p9nf2EsA" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AYBWgUihEeSRp-p9nf2EsA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AYBWgkihEeSRp-p9nf2EsA" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AYBWg0ihEeSRp-p9nf2EsA" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_AYAIYkihEeSRp-p9nf2EsA" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_AYAIYEihEeSRp-p9nf2EsA" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_AYAIYkihEeSRp-p9nf2EsA" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AYAvcEihEeSRp-p9nf2EsA" x="275" y="41"/> </children> - <children xmi:type="notation:Shape" xmi:id="_BfLy4EihEeSRp-p9nf2EsA" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_BfLy4kihEeSRp-p9nf2EsA" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_BfLy40ihEeSRp-p9nf2EsA" type="1071"> - <children xmi:type="notation:Node" xmi:id="_btXXAEihEeSRp-p9nf2EsA" type="3002"> + <children xmi:type="notation:Shape" xmi:id="_BfLy4EihEeSRp-p9nf2EsA" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_BfLy4kihEeSRp-p9nf2EsA" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_BfLy40ihEeSRp-p9nf2EsA" type="Stereotype_AttributeCompartment"> + <children xmi:type="notation:Node" xmi:id="_btXXAEihEeSRp-p9nf2EsA" type="Property_ClassAttributeLabel"> <element xmi:type="uml:Property" href="j2ee.profile.uml#_btMX4EihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_btXXAUihEeSRp-p9nf2EsA"/> </children> - <children xmi:type="notation:Node" xmi:id="_wa0NwGEcEeSRDpkdeXfJuw" type="3002"> + <children xmi:type="notation:Node" xmi:id="_wa0NwGEcEeSRDpkdeXfJuw" type="Property_ClassAttributeLabel"> <element xmi:type="uml:Property" href="j2ee.profile.uml#_wZ9SIGEcEeSRDpkdeXfJuw"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_wa0NwWEcEeSRDpkdeXfJuw"/> </children> @@ -60,7 +32,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_BfMZ8EihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BfMZ8UihEeSRp-p9nf2EsA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_BfMZ8kihEeSRp-p9nf2EsA" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_BfMZ8kihEeSRp-p9nf2EsA" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_BfMZ80ihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_BfMZ9EihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_BfMZ9UihEeSRp-p9nf2EsA"/> @@ -69,15 +41,15 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_Be-XgEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BfLy4UihEeSRp-p9nf2EsA" x="24" y="197"/> </children> - <children xmi:type="notation:Shape" xmi:id="_DNfu0EihEeSRp-p9nf2EsA" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_DNgV4EihEeSRp-p9nf2EsA" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_DNgV4UihEeSRp-p9nf2EsA" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_DNfu0EihEeSRp-p9nf2EsA" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_DNgV4EihEeSRp-p9nf2EsA" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_DNgV4UihEeSRp-p9nf2EsA" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_DNgV4kihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_DNgV40ihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_DNgV5EihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DNgV5UihEeSRp-p9nf2EsA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_DNgV5kihEeSRp-p9nf2EsA" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_DNgV5kihEeSRp-p9nf2EsA" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_DNgV50ihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_DNgV6EihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_DNgV6UihEeSRp-p9nf2EsA"/> @@ -86,18 +58,18 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_DNegsEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DNfu0UihEeSRp-p9nf2EsA" x="287" y="197"/> </children> - <children xmi:type="notation:Shape" xmi:id="_WA6KgEihEeSRp-p9nf2EsA" type="2006"> - <children xmi:type="notation:DecorationNode" xmi:id="_WA6xkEihEeSRp-p9nf2EsA" type="5023"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_WA6xkUihEeSRp-p9nf2EsA" type="1063"> - <children xmi:type="notation:Node" xmi:id="_XMi3MEihEeSRp-p9nf2EsA" type="1037"> + <children xmi:type="notation:Shape" xmi:id="_WA6KgEihEeSRp-p9nf2EsA" type="Enumeration_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_WA6xkEihEeSRp-p9nf2EsA" type="Enumeration_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_WA6xkUihEeSRp-p9nf2EsA" type="Enumeration_LiteralCompartment"> + <children xmi:type="notation:Node" xmi:id="_XMi3MEihEeSRp-p9nf2EsA" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="j2ee.profile.uml#_XMd-sEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_XMi3MUihEeSRp-p9nf2EsA"/> </children> - <children xmi:type="notation:Node" xmi:id="_YztCQEihEeSRp-p9nf2EsA" type="1037"> + <children xmi:type="notation:Node" xmi:id="_YztCQEihEeSRp-p9nf2EsA" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="j2ee.profile.uml#_Yzr0IEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_YztCQUihEeSRp-p9nf2EsA"/> </children> - <children xmi:type="notation:Node" xmi:id="_Zg3qQEihEeSRp-p9nf2EsA" type="1037"> + <children xmi:type="notation:Node" xmi:id="_Zg3qQEihEeSRp-p9nf2EsA" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="j2ee.profile.uml#_Zg2cIEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_Zg3qQUihEeSRp-p9nf2EsA"/> </children> @@ -109,15 +81,15 @@ <element xmi:type="uml:Enumeration" href="j2ee.profile.uml#_WA1SAEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WA6KgUihEeSRp-p9nf2EsA" x="73" y="339"/> </children> - <children xmi:type="notation:Shape" xmi:id="_EpBRoEihEeSRp-p9nf2EsA" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_EpBRokihEeSRp-p9nf2EsA" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_EpBRo0ihEeSRp-p9nf2EsA" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_EpBRoEihEeSRp-p9nf2EsA" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_EpBRokihEeSRp-p9nf2EsA" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_EpBRo0ihEeSRp-p9nf2EsA" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_EpBRpEihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_EpBRpUihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_EpBRpkihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EpBRp0ihEeSRp-p9nf2EsA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_EpBRqEihEeSRp-p9nf2EsA" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_EpBRqEihEeSRp-p9nf2EsA" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_EpBRqUihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_EpBRqkihEeSRp-p9nf2EsA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_EpBRq0ihEeSRp-p9nf2EsA"/> @@ -126,43 +98,67 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_Eo_ccEihEeSRp-p9nf2EsA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EpBRoUihEeSRp-p9nf2EsA" x="445" y="198"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_rdgrcUigEeSRp-p9nf2EsA" name="diagram_compatibility_version" stringValue="1.0.0"/> + <children xmi:type="notation:Shape" xmi:id="_4xe9kOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_4xe9kex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4xe9k-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4xe9kux5EeWqj-BpY8F6OQ" x="288" y="41"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_4xsY8Ox5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_4xsY8ex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4xsY8-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4xsY8ux5EeWqj-BpY8F6OQ" x="643" y="36"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_4x7CcOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_4x7Ccex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4x7Cc-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4x7Ccux5EeWqj-BpY8F6OQ" x="475" y="41"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_rdgrcUigEeSRp-p9nf2EsA" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_rdgrckigEeSRp-p9nf2EsA"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_rdgrc0igEeSRp-p9nf2EsA"> <owner xmi:type="uml:Profile" href="j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/> </styles> <element xmi:type="uml:Profile" href="j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/> - <edges xmi:type="notation:Connector" xmi:id="_Gi8AoEihEeSRp-p9nf2EsA" type="1013" source="_BfLy4EihEeSRp-p9nf2EsA" target="_33LW0EigEeSRp-p9nf2EsA"> + <edges xmi:type="notation:Connector" xmi:id="_Gi8AoEihEeSRp-p9nf2EsA" type="Extension_Edge" source="_BfLy4EihEeSRp-p9nf2EsA" target="_33LW0EigEeSRp-p9nf2EsA"> <styles xmi:type="notation:FontStyle" xmi:id="_Gi8AoUihEeSRp-p9nf2EsA"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_Gi3IIEihEeSRp-p9nf2EsA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Gi8AokihEeSRp-p9nf2EsA" points="[-2, -15, 14, 131]$[-14, -171, 2, -25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GjASEEihEeSRp-p9nf2EsA" id="(0.6607142857142857,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JshAsUihEeSRp-p9nf2EsA" id="(0.47,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_HDzSAEihEeSRp-p9nf2EsA" type="1013" source="_DNfu0EihEeSRp-p9nf2EsA" target="_AYAIYEihEeSRp-p9nf2EsA"> + <edges xmi:type="notation:Connector" xmi:id="_HDzSAEihEeSRp-p9nf2EsA" type="Extension_Edge" source="_DNfu0EihEeSRp-p9nf2EsA" target="_AYAIYEihEeSRp-p9nf2EsA"> <styles xmi:type="notation:FontStyle" xmi:id="_HDzSAUihEeSRp-p9nf2EsA"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_HDyD4EihEeSRp-p9nf2EsA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HDzSAkihEeSRp-p9nf2EsA" points="[-4, -50, 8, 131]$[-12, -156, 0, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6G7hAEiiEeSKm9FE-lgkJg" id="(0.43,0.02)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6G8IEEiiEeSKm9FE-lgkJg" id="(0.46,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_Iw5tAEihEeSRp-p9nf2EsA" type="4001" source="_BfLy4EihEeSRp-p9nf2EsA" target="_DNfu0EihEeSRp-p9nf2EsA"> - <children xmi:type="notation:DecorationNode" xmi:id="_Iw6UEEihEeSRp-p9nf2EsA" type="6001"> + <edges xmi:type="notation:Connector" xmi:id="_Iw5tAEihEeSRp-p9nf2EsA" type="Association_Edge" source="_BfLy4EihEeSRp-p9nf2EsA" target="_DNfu0EihEeSRp-p9nf2EsA"> + <children xmi:type="notation:DecorationNode" xmi:id="_Iw6UEEihEeSRp-p9nf2EsA" type="Association_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw6UEUihEeSRp-p9nf2EsA" y="60"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_Iw6UEkihEeSRp-p9nf2EsA" visible="false" type="6002"> + <children xmi:type="notation:DecorationNode" xmi:id="_Iw6UEkihEeSRp-p9nf2EsA" visible="false" type="Association_NameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw6UE0ihEeSRp-p9nf2EsA" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_Iw67IEihEeSRp-p9nf2EsA" type="6003"> + <children xmi:type="notation:DecorationNode" xmi:id="_Iw67IEihEeSRp-p9nf2EsA" type="Association_TargetRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw67IUihEeSRp-p9nf2EsA" x="-8" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_Iw67IkihEeSRp-p9nf2EsA" type="6005"> + <children xmi:type="notation:DecorationNode" xmi:id="_Iw67IkihEeSRp-p9nf2EsA" type="Association_SourceRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw67I0ihEeSRp-p9nf2EsA" y="-20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_Iw67JEihEeSRp-p9nf2EsA" type="6033"> + <children xmi:type="notation:DecorationNode" xmi:id="_Iw67JEihEeSRp-p9nf2EsA" type="Association_SourceMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw7iMEihEeSRp-p9nf2EsA" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_Iw7iMUihEeSRp-p9nf2EsA" type="6034"> + <children xmi:type="notation:DecorationNode" xmi:id="_Iw7iMUihEeSRp-p9nf2EsA" type="Association_TargetMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Iw7iMkihEeSRp-p9nf2EsA" y="-20"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_Iw5tAUihEeSRp-p9nf2EsA"/> @@ -171,24 +167,54 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JsgZoEihEeSRp-p9nf2EsA" id="(1.0,0.45045045045045046)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JshAsEihEeSRp-p9nf2EsA" id="(0.0,0.5)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_JiVPoHW0EeSkkId3wIdLLg" type="1013" source="_EpBRoEihEeSRp-p9nf2EsA" target="_6kXV0EigEeSRp-p9nf2EsA"> + <edges xmi:type="notation:Connector" xmi:id="_JiVPoHW0EeSkkId3wIdLLg" type="Extension_Edge" source="_EpBRoEihEeSRp-p9nf2EsA" target="_6kXV0EigEeSRp-p9nf2EsA"> <styles xmi:type="notation:FontStyle" xmi:id="_JiVPoXW0EeSkkId3wIdLLg"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_JiQXIHW0EeSkkId3wIdLLg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JiVPonW0EeSkkId3wIdLLg" points="[-3, -17, 12, 137]$[-23, -129, -8, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JiY6AHW0EeSkkId3wIdLLg" id="(0.46,0.09)"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_4xe9lOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_33LW0EigEeSRp-p9nf2EsA" target="_4xe9kOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_4xe9lex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4xe9mex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4xe9lux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4xe9l-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4xe9mOx5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_4xsY9Ox5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_6kXV0EigEeSRp-p9nf2EsA" target="_4xsY8Ox5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_4xsY9ex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4xsY-ex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4xsY9ux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4xsY9-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4xsY-Ox5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_4x7CdOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_AYAIYEihEeSRp-p9nf2EsA" target="_4x7CcOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_4x7Cdex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4x7Ceex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4x7Cdux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4x7Cd-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4x7CeOx5EeWqj-BpY8F6OQ"/> + </edges> </notation:Diagram> <css:ModelStyleSheets xmi:id="_x0-j0EigEeSRp-p9nf2EsA"/> <notation:Diagram xmi:id="_OqMJsHcGEeSigYPDkthHwg" type="PapyrusUMLProfileDiagram" name="usecases" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_QF8WAHcGEeSigYPDkthHwg" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_QF89EHcGEeSigYPDkthHwg" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_QF89EXcGEeSigYPDkthHwg" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_QF8WAHcGEeSigYPDkthHwg" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_QF89EHcGEeSigYPDkthHwg" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_QF89EXcGEeSigYPDkthHwg" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QF89EncGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QF89E3cGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QF89FHcGEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QF89FXcGEeSigYPDkthHwg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_QF9kIHcGEeSigYPDkthHwg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_QF9kIHcGEeSigYPDkthHwg" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QF9kIXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QF9kIncGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QF9kI3cGEeSigYPDkthHwg"/> @@ -197,15 +223,15 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_m3yyoHcFEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QF8WAXcGEeSigYPDkthHwg" x="26" y="163"/> </children> - <children xmi:type="notation:Shape" xmi:id="_QGER0HcGEeSigYPDkthHwg" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_QGE44HcGEeSigYPDkthHwg" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGE44XcGEeSigYPDkthHwg" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_QGER0HcGEeSigYPDkthHwg" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_QGE44HcGEeSigYPDkthHwg" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGE44XcGEeSigYPDkthHwg" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGE44ncGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGE443cGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGE45HcGEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGE45XcGEeSigYPDkthHwg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGE45ncGEeSigYPDkthHwg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGE45ncGEeSigYPDkthHwg" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGE453cGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGE46HcGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGE46XcGEeSigYPDkthHwg"/> @@ -214,15 +240,15 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_qiossHcFEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGER0XcGEeSigYPDkthHwg" x="294" y="168"/> </children> - <children xmi:type="notation:Shape" xmi:id="_QGLmkHcGEeSigYPDkthHwg" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_QGLmkncGEeSigYPDkthHwg" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGLmk3cGEeSigYPDkthHwg" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_QGLmkHcGEeSigYPDkthHwg" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_QGLmkncGEeSigYPDkthHwg" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGLmk3cGEeSigYPDkthHwg" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGLmlHcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGLmlXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGLmlncGEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGLml3cGEeSigYPDkthHwg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGMNoHcGEeSigYPDkthHwg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGMNoHcGEeSigYPDkthHwg" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGMNoXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGMNoncGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGMNo3cGEeSigYPDkthHwg"/> @@ -231,15 +257,15 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_rus3MHcFEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGLmkXcGEeSigYPDkthHwg" x="416" y="166"/> </children> - <children xmi:type="notation:Shape" xmi:id="_QGSUQHcGEeSigYPDkthHwg" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_QGSUQncGEeSigYPDkthHwg" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGSUQ3cGEeSigYPDkthHwg" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_QGSUQHcGEeSigYPDkthHwg" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_QGSUQncGEeSigYPDkthHwg" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGSUQ3cGEeSigYPDkthHwg" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGSURHcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGSURXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGSURncGEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGSUR3cGEeSigYPDkthHwg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGS7UHcGEeSigYPDkthHwg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGS7UHcGEeSigYPDkthHwg" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGS7UXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGS7UncGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGS7U3cGEeSigYPDkthHwg"/> @@ -248,15 +274,15 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_4VupIHcFEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGSUQXcGEeSigYPDkthHwg" x="156" y="165"/> </children> - <children xmi:type="notation:Shape" xmi:id="_QGZpAHcGEeSigYPDkthHwg" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_QGZpAncGEeSigYPDkthHwg" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGZpA3cGEeSigYPDkthHwg" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_QGZpAHcGEeSigYPDkthHwg" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_QGZpAncGEeSigYPDkthHwg" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGZpA3cGEeSigYPDkthHwg" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGZpBHcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGZpBXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGZpBncGEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGZpB3cGEeSigYPDkthHwg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_QGaQEHcGEeSigYPDkthHwg" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_QGaQEHcGEeSigYPDkthHwg" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_QGaQEXcGEeSigYPDkthHwg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_QGaQEncGEeSigYPDkthHwg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_QGaQE3cGEeSigYPDkthHwg"/> @@ -265,106 +291,150 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_8HPL4HcFEeSigYPDkthHwg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QGZpAXcGEeSigYPDkthHwg" x="554" y="163"/> </children> - <children xmi:type="notation:Shape" xmi:id="_V4Q58HcGEeSigYPDkthHwg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V4SIEHcGEeSigYPDkthHwg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4SIEXcGEeSigYPDkthHwg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4SIEncGEeSigYPDkthHwg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4SIE3cGEeSigYPDkthHwg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4SIFHcGEeSigYPDkthHwg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4SIFXcGEeSigYPDkthHwg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_V4Q58ncGEeSigYPDkthHwg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_V4Q58HcGEeSigYPDkthHwg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_V4Q58ncGEeSigYPDkthHwg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#UseCase"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V4RhAHcGEeSigYPDkthHwg" x="21" y="31"/> </children> - <children xmi:type="notation:Shape" xmi:id="_V4SvIHcGEeSigYPDkthHwg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V4TWMXcGEeSigYPDkthHwg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4T9QHcGEeSigYPDkthHwg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4T9QXcGEeSigYPDkthHwg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4T9QncGEeSigYPDkthHwg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4T9Q3cGEeSigYPDkthHwg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V4T9RHcGEeSigYPDkthHwg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_V4SvIncGEeSigYPDkthHwg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_V4SvIHcGEeSigYPDkthHwg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_V4SvIncGEeSigYPDkthHwg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Actor"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V4TWMHcGEeSigYPDkthHwg" x="345" y="30"/> </children> - <children xmi:type="notation:Shape" xmi:id="_hAXPwHcGEeSigYPDkthHwg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hAYd4HcGEeSigYPDkthHwg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hAYd4XcGEeSigYPDkthHwg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hAZE8HcGEeSigYPDkthHwg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hAZE8XcGEeSigYPDkthHwg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hAZE8ncGEeSigYPDkthHwg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hAZE83cGEeSigYPDkthHwg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_hAX20HcGEeSigYPDkthHwg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_hAXPwHcGEeSigYPDkthHwg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_hAX20HcGEeSigYPDkthHwg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAX20XcGEeSigYPDkthHwg" x="551" y="26"/> </children> - <children xmi:type="notation:Shape" xmi:id="_neABkHcGEeSigYPDkthHwg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_neBPsHcGEeSigYPDkthHwg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_neBPsXcGEeSigYPDkthHwg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_neBPsncGEeSigYPDkthHwg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_neBPs3cGEeSigYPDkthHwg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_neBPtHcGEeSigYPDkthHwg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_neB2wHcGEeSigYPDkthHwg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_neABkncGEeSigYPDkthHwg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_neABkHcGEeSigYPDkthHwg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_neABkncGEeSigYPDkthHwg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ExtensionPoint"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_neAooHcGEeSigYPDkthHwg" x="160" y="27"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_OqMJsXcGEeSigYPDkthHwg" name="diagram_compatibility_version" stringValue="1.0.0"/> + <children xmi:type="notation:Shape" xmi:id="_42ARMOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_42ARMex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_42ARM-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#UseCase"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_42ARMux5EeWqj-BpY8F6OQ" x="221" y="31"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_42NFgOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_42NFgex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_42NFg-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Actor"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_42NFgux5EeWqj-BpY8F6OQ" x="545" y="30"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_42YEoOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_42YEoex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_42YEo-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_42YEoux5EeWqj-BpY8F6OQ" x="751" y="26"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_42h1oOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_42h1oex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_42h1o-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ExtensionPoint"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_42h1oux5EeWqj-BpY8F6OQ" x="360" y="27"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_OqMJsXcGEeSigYPDkthHwg" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_OqMJsncGEeSigYPDkthHwg"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_OqMJs3cGEeSigYPDkthHwg"> <owner xmi:type="uml:Profile" href="j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/> </styles> <element xmi:type="uml:Profile" href="j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/> - <edges xmi:type="notation:Connector" xmi:id="_iTrRwHcGEeSigYPDkthHwg" type="1013" source="_QGZpAHcGEeSigYPDkthHwg" target="_hAXPwHcGEeSigYPDkthHwg"> + <edges xmi:type="notation:Connector" xmi:id="_iTrRwHcGEeSigYPDkthHwg" type="Extension_Edge" source="_QGZpAHcGEeSigYPDkthHwg" target="_hAXPwHcGEeSigYPDkthHwg"> <styles xmi:type="notation:FontStyle" xmi:id="_iTrRwXcGEeSigYPDkthHwg"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_iTlLIHcGEeSigYPDkthHwg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iTrRwncGEeSigYPDkthHwg" points="[0, 16, 9, -108]$[0, 149, 9, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iTvjMHcGEeSigYPDkthHwg" id="(0.47,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-eZHUHdDEeSqne_6Ue1U0A" id="(0.5,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_oB5_4HcGEeSigYPDkthHwg" type="1013" source="_QGER0HcGEeSigYPDkthHwg" target="_V4SvIHcGEeSigYPDkthHwg"> + <edges xmi:type="notation:Connector" xmi:id="_oB5_4HcGEeSigYPDkthHwg" type="Extension_Edge" source="_QGER0HcGEeSigYPDkthHwg" target="_V4SvIHcGEeSigYPDkthHwg"> <styles xmi:type="notation:FontStyle" xmi:id="_oB5_4XcGEeSigYPDkthHwg"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_oB2VgHcGEeSigYPDkthHwg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oB5_4ncGEeSigYPDkthHwg" points="[16, 50, -40, -107]$[50, 132, -6, -25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-ef1AHdDEeSqne_6Ue1U0A" id="(0.75,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-egcEHdDEeSqne_6Ue1U0A" id="(0.36,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_oichIHcGEeSigYPDkthHwg" type="1013" source="_QGLmkHcGEeSigYPDkthHwg" target="_V4SvIHcGEeSigYPDkthHwg"> + <edges xmi:type="notation:Connector" xmi:id="_oichIHcGEeSigYPDkthHwg" type="Extension_Edge" source="_QGLmkHcGEeSigYPDkthHwg" target="_V4SvIHcGEeSigYPDkthHwg"> <styles xmi:type="notation:FontStyle" xmi:id="_oichIXcGEeSigYPDkthHwg"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_oiY2wHcGEeSigYPDkthHwg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oichIncGEeSigYPDkthHwg" points="[-19, 50, 47, -109]$[-58, 134, 8, -25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-egcEXdDEeSqne_6Ue1U0A" id="(0.14,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-ehDIHdDEeSqne_6Ue1U0A" id="(0.66,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_o5rVYHcGEeSigYPDkthHwg" type="1013" source="_QGSUQHcGEeSigYPDkthHwg" target="_neABkHcGEeSigYPDkthHwg"> + <edges xmi:type="notation:Connector" xmi:id="_o5rVYHcGEeSigYPDkthHwg" type="Extension_Edge" source="_QGSUQHcGEeSigYPDkthHwg" target="_neABkHcGEeSigYPDkthHwg"> <styles xmi:type="notation:FontStyle" xmi:id="_o5rVYXcGEeSigYPDkthHwg"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_o5oSEHcGEeSigYPDkthHwg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_o5rVYncGEeSigYPDkthHwg" points="[3, 50, -6, -107]$[3, 182, -6, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-eLr8HdDEeSqne_6Ue1U0A" id="(0.54,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-eMTAHdDEeSqne_6Ue1U0A" id="(0.5,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_pUu5sHcGEeSigYPDkthHwg" type="1013" source="_QF8WAHcGEeSigYPDkthHwg" target="_V4Q58HcGEeSigYPDkthHwg"> + <edges xmi:type="notation:Connector" xmi:id="_pUu5sHcGEeSigYPDkthHwg" type="Extension_Edge" source="_QF8WAHcGEeSigYPDkthHwg" target="_V4Q58HcGEeSigYPDkthHwg"> <styles xmi:type="notation:FontStyle" xmi:id="_pUu5sXcGEeSigYPDkthHwg"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_pUrPUXcGEeSigYPDkthHwg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pUu5sncGEeSigYPDkthHwg" points="[-3, 13, 13, -113]$[-19, 101, -3, -25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pUykEHcGEeSigYPDkthHwg" id="(0.45,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-eTAsHdDEeSqne_6Ue1U0A" id="(0.5,1.0)"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_42ARNOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_V4Q58HcGEeSigYPDkthHwg" target="_42ARMOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_42ARNex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_42A4Qux5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#UseCase"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_42ARNux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_42A4QOx5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_42A4Qex5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_42NFhOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_V4SvIHcGEeSigYPDkthHwg" target="_42NFgOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_42NFhex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_42NFiex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Actor"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_42NFhux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_42NFh-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_42NFiOx5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_42YEpOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_hAXPwHcGEeSigYPDkthHwg" target="_42YEoOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_42YEpex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_42YEqex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_42YEpux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_42YEp-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_42YEqOx5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_42h1pOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_neABkHcGEeSigYPDkthHwg" target="_42h1oOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_42h1pex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_42h1qex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ExtensionPoint"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_42h1pux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_42h1p-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_42h1qOx5EeWqj-BpY8F6OQ"/> + </edges> </notation:Diagram> <notation:Diagram xmi:id="_52licJbDEeSp3sLEVy9Cbw" type="PapyrusUMLProfileDiagram" name="access control" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_66cMIJbDEeSp3sLEVy9Cbw" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_66cMIpbDEeSp3sLEVy9Cbw" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_66czMJbDEeSp3sLEVy9Cbw" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_66cMIJbDEeSp3sLEVy9Cbw" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_66cMIpbDEeSp3sLEVy9Cbw" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_66czMJbDEeSp3sLEVy9Cbw" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_66czMZbDEeSp3sLEVy9Cbw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_66czMpbDEeSp3sLEVy9Cbw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_66czM5bDEeSp3sLEVy9Cbw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_66czNJbDEeSp3sLEVy9Cbw"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_66czNZbDEeSp3sLEVy9Cbw" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_66czNZbDEeSp3sLEVy9Cbw" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_66czNpbDEeSp3sLEVy9Cbw"/> <styles xmi:type="notation:SortingStyle" xmi:id="_66czN5bDEeSp3sLEVy9Cbw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_66czOJbDEeSp3sLEVy9Cbw"/> @@ -373,65 +443,98 @@ <element xmi:type="uml:Stereotype" href="j2ee.profile.uml#_0jBXEJbDEeSp3sLEVy9Cbw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_66cMIZbDEeSp3sLEVy9Cbw" x="256" y="290"/> </children> - <children xmi:type="notation:Shape" xmi:id="_BCaP8JbEEeSp3sLEVy9Cbw" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BCcsMJbEEeSp3sLEVy9Cbw" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BCdTQJbEEeSp3sLEVy9Cbw" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BCdTQZbEEeSp3sLEVy9Cbw" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BCdTQpbEEeSp3sLEVy9Cbw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BCdTQ5bEEeSp3sLEVy9Cbw" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BCdTRJbEEeSp3sLEVy9Cbw" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_BCa3AJbEEeSp3sLEVy9Cbw" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_BCaP8JbEEeSp3sLEVy9Cbw" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_BCa3AJbEEeSp3sLEVy9Cbw" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BCa3AZbEEeSp3sLEVy9Cbw" x="387" y="117"/> </children> - <children xmi:type="notation:Shape" xmi:id="_GHq5kJbEEeSp3sLEVy9Cbw" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GHsHsJbEEeSp3sLEVy9Cbw" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHsHsZbEEeSp3sLEVy9Cbw" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHsHspbEEeSp3sLEVy9Cbw" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHsHs5bEEeSp3sLEVy9Cbw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHsHtJbEEeSp3sLEVy9Cbw" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHsHtZbEEeSp3sLEVy9Cbw" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_GHq5kpbEEeSp3sLEVy9Cbw" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_GHq5kJbEEeSp3sLEVy9Cbw" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_GHq5kpbEEeSp3sLEVy9Cbw" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GHrgoJbEEeSp3sLEVy9Cbw" x="125" y="120"/> </children> - <children xmi:type="notation:Shape" xmi:id="_GHsuwJbEEeSp3sLEVy9Cbw" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GHtV0ZbEEeSp3sLEVy9Cbw" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHt84JbEEeSp3sLEVy9Cbw" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHt84ZbEEeSp3sLEVy9Cbw" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHt84pbEEeSp3sLEVy9Cbw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHt845bEEeSp3sLEVy9Cbw" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GHt85JbEEeSp3sLEVy9Cbw" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_GHsuwpbEEeSp3sLEVy9Cbw" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_GHsuwJbEEeSp3sLEVy9Cbw" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_GHsuwpbEEeSp3sLEVy9Cbw" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GHtV0JbEEeSp3sLEVy9Cbw" x="254" y="118"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_52licZbDEeSp3sLEVy9Cbw" name="diagram_compatibility_version" stringValue="1.0.0"/> + <children xmi:type="notation:Shape" xmi:id="_4z4xUOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_4z4xUex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4z4xU-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4z4xUux5EeWqj-BpY8F6OQ" x="587" y="117"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_40E-kOx5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_40E-kex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_40E-k-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_40E-kux5EeWqj-BpY8F6OQ" x="325" y="120"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_40RL0Ox5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_40RL0ex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_40Ry4Ox5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_40RL0ux5EeWqj-BpY8F6OQ" x="454" y="118"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_52licZbDEeSp3sLEVy9Cbw" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_52licpbDEeSp3sLEVy9Cbw"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_52lic5bDEeSp3sLEVy9Cbw"> <owner xmi:type="uml:Profile" href="j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/> </styles> <element xmi:type="uml:Profile" href="j2ee.profile.uml#_raLqoEigEeSRp-p9nf2EsA"/> - <edges xmi:type="notation:Connector" xmi:id="_Hvnu0JbEEeSp3sLEVy9Cbw" type="1013" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_GHq5kJbEEeSp3sLEVy9Cbw"> + <edges xmi:type="notation:Connector" xmi:id="_Hvnu0JbEEeSp3sLEVy9Cbw" type="Extension_Edge" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_GHq5kJbEEeSp3sLEVy9Cbw"> <styles xmi:type="notation:FontStyle" xmi:id="_Hvnu0ZbEEeSp3sLEVy9Cbw"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_HvfL8JbEEeSp3sLEVy9Cbw"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Hvnu0pbEEeSp3sLEVy9Cbw" points="[-10, -14, 106, 145]$[-66, -152, 50, 7]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HvucgJbEEeSp3sLEVy9Cbw" id="(0.35,0.14)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_IPmPYJbEEeSp3sLEVy9Cbw" type="1013" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_GHsuwJbEEeSp3sLEVy9Cbw"> + <edges xmi:type="notation:Connector" xmi:id="_IPmPYJbEEeSp3sLEVy9Cbw" type="Extension_Edge" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_GHsuwJbEEeSp3sLEVy9Cbw"> <styles xmi:type="notation:FontStyle" xmi:id="_IPmPYZbEEeSp3sLEVy9Cbw"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_IPh98ZbEEeSp3sLEVy9Cbw"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IPmPYpbEEeSp3sLEVy9Cbw" points="[-6, -13, -5, 147]$[-6, -135, -5, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IPru8JbEEeSp3sLEVy9Cbw" id="(0.49,0.13)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_Ip_FUJbEEeSp3sLEVy9Cbw" type="1013" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_BCaP8JbEEeSp3sLEVy9Cbw"> + <edges xmi:type="notation:Connector" xmi:id="_Ip_FUJbEEeSp3sLEVy9Cbw" type="Extension_Edge" source="_66cMIJbDEeSp3sLEVy9Cbw" target="_BCaP8JbEEeSp3sLEVy9Cbw"> <styles xmi:type="notation:FontStyle" xmi:id="_Ip_FUZbEEeSp3sLEVy9Cbw"/> <element xmi:type="uml:Extension" href="j2ee.profile.uml#_Ip6M0JbEEeSp3sLEVy9Cbw"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ip_FUpbEEeSp3sLEVy9Cbw" points="[7, -12, -104, 148]$[63, -135, -48, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IqEk4JbEEeSp3sLEVy9Cbw" id="(0.7,0.12)"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_4z4xVOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_BCaP8JbEEeSp3sLEVy9Cbw" target="_4z4xUOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_4z4xVex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_4z4xWex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4z4xVux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4z4xV-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4z4xWOx5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_40E-lOx5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_GHq5kJbEEeSp3sLEVy9Cbw" target="_40E-kOx5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_40E-lex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_40E-mex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_40E-lux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_40E-l-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_40E-mOx5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_40Ry4ex5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_GHsuwJbEEeSp3sLEVy9Cbw" target="_40RL0Ox5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_40Ry4ux5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_40Ry5ux5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_40Ry4-x5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_40Ry5Ox5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_40Ry5ex5EeWqj-BpY8F6OQ"/> + </edges> </notation:Diagram> </xmi:XMI> diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/nesting.profile.notation b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/nesting.profile.notation index febce5398f0..1f29c034876 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/nesting.profile.notation +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/nesting.profile.notation @@ -1,17 +1,17 @@ <?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:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_XDNvwKdOEeS-y569OJYknA" type="PapyrusUMLProfileDiagram" name="stereotypes" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_kZ8gUKdOEeS-y569OJYknA" type="1030"> - <children xmi:type="notation:DecorationNode" xmi:id="_kaAxwKdOEeS-y569OJYknA" type="1047"/> - <children xmi:type="notation:DecorationNode" xmi:id="_kaBY0KdOEeS-y569OJYknA" type="1042"> - <children xmi:type="notation:Shape" xmi:id="_92B5IKdOEeS-y569OJYknA" type="1023"> - <children xmi:type="notation:DecorationNode" xmi:id="_92B5IqdOEeS-y569OJYknA" type="1046"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_92B5I6dOEeS-y569OJYknA" type="1052"> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_XDNvwKdOEeS-y569OJYknA" type="PapyrusUMLProfileDiagram" name="stereotypes" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_kZ8gUKdOEeS-y569OJYknA" type="Profile_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_kaAxwKdOEeS-y569OJYknA" type="Profile_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_kaBY0KdOEeS-y569OJYknA" type="Profile_PackagedElementCompartment"> + <children xmi:type="notation:Shape" xmi:id="_92B5IKdOEeS-y569OJYknA" type="Stereotype_Shape_CN"> + <children xmi:type="notation:DecorationNode" xmi:id="_92B5IqdOEeS-y569OJYknA" type="Stereotype_NameLabel_CN"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_92B5I6dOEeS-y569OJYknA" type="Stereotype_AttributeCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_92B5JKdOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_92B5JadOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_92B5JqdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_92B5J6dOEeS-y569OJYknA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_92B5KKdOEeS-y569OJYknA" type="1053"> + <children xmi:type="notation:BasicCompartment" xmi:id="_92B5KKdOEeS-y569OJYknA" type="Stereotype_OperationCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_92B5KadOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_92B5KqdOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_92B5K6dOEeS-y569OJYknA"/> @@ -20,15 +20,15 @@ <element xmi:type="uml:Stereotype" href="nesting.profile.uml#_91_c4KdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_92B5IadOEeS-y569OJYknA" x="23" y="50"/> </children> - <children xmi:type="notation:Shape" xmi:id="_-wum0KdOEeS-y569OJYknA" type="1023"> - <children xmi:type="notation:DecorationNode" xmi:id="_-wvN4KdOEeS-y569OJYknA" type="1046"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_-wvN4adOEeS-y569OJYknA" type="1052"> + <children xmi:type="notation:Shape" xmi:id="_-wum0KdOEeS-y569OJYknA" type="Stereotype_Shape_CN"> + <children xmi:type="notation:DecorationNode" xmi:id="_-wvN4KdOEeS-y569OJYknA" type="Stereotype_NameLabel_CN"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_-wvN4adOEeS-y569OJYknA" type="Stereotype_AttributeCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_-wvN4qdOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_-wvN46dOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_-wvN5KdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-wvN5adOEeS-y569OJYknA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_-wv08KdOEeS-y569OJYknA" type="1053"> + <children xmi:type="notation:BasicCompartment" xmi:id="_-wv08KdOEeS-y569OJYknA" type="Stereotype_OperationCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_-wv08adOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_-wv08qdOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_-wv086dOEeS-y569OJYknA"/> @@ -43,18 +43,18 @@ <element xmi:type="uml:Profile" href="nesting.profile.uml#_kZoXQKdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kZ8gUadOEeS-y569OJYknA" x="106" y="341" width="297" height="205"/> </children> - <children xmi:type="notation:Shape" xmi:id="_oaSJQKdOEeS-y569OJYknA" type="2007"> - <children xmi:type="notation:DecorationNode" xmi:id="_oaSwUKdOEeS-y569OJYknA" type="5026"/> - <children xmi:type="notation:DecorationNode" xmi:id="_oaSwUadOEeS-y569OJYknA" type="1005"> - <children xmi:type="notation:Shape" xmi:id="_A0Ry8KdPEeS-y569OJYknA" type="1023"> - <children xmi:type="notation:DecorationNode" xmi:id="_A0Ry8qdPEeS-y569OJYknA" type="1046"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_A0Ry86dPEeS-y569OJYknA" type="1052"> + <children xmi:type="notation:Shape" xmi:id="_oaSJQKdOEeS-y569OJYknA" type="Package_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_oaSwUKdOEeS-y569OJYknA" type="Package_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_oaSwUadOEeS-y569OJYknA" type="Package_PackagedElementCompartment"> + <children xmi:type="notation:Shape" xmi:id="_A0Ry8KdPEeS-y569OJYknA" type="Stereotype_Shape_CN"> + <children xmi:type="notation:DecorationNode" xmi:id="_A0Ry8qdPEeS-y569OJYknA" type="Stereotype_NameLabel_CN"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_A0Ry86dPEeS-y569OJYknA" type="Stereotype_AttributeCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_A0Ry9KdPEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_A0SaAKdPEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_A0SaAadPEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A0SaAqdPEeS-y569OJYknA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_A0SaA6dPEeS-y569OJYknA" type="1053"> + <children xmi:type="notation:BasicCompartment" xmi:id="_A0SaA6dPEeS-y569OJYknA" type="Stereotype_OperationCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_A0SaBKdPEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_A0SaBadPEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_A0SaBqdPEeS-y569OJYknA"/> @@ -63,15 +63,15 @@ <element xmi:type="uml:Stereotype" href="nesting.profile.uml#_A0PWsKdPEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A0Ry8adPEeS-y569OJYknA" x="42" y="57"/> </children> - <children xmi:type="notation:Shape" xmi:id="_BmYlUKdPEeS-y569OJYknA" type="1023"> - <children xmi:type="notation:DecorationNode" xmi:id="_BmYlUqdPEeS-y569OJYknA" type="1046"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_BmYlU6dPEeS-y569OJYknA" type="1052"> + <children xmi:type="notation:Shape" xmi:id="_BmYlUKdPEeS-y569OJYknA" type="Stereotype_Shape_CN"> + <children xmi:type="notation:DecorationNode" xmi:id="_BmYlUqdPEeS-y569OJYknA" type="Stereotype_NameLabel_CN"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_BmYlU6dPEeS-y569OJYknA" type="Stereotype_AttributeCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_BmYlVKdPEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_BmYlVadPEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_BmYlVqdPEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BmYlV6dPEeS-y569OJYknA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_BmYlWKdPEeS-y569OJYknA" type="1053"> + <children xmi:type="notation:BasicCompartment" xmi:id="_BmYlWKdPEeS-y569OJYknA" type="Stereotype_OperationCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_BmYlWadPEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_BmYlWqdPEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_BmYlW6dPEeS-y569OJYknA"/> @@ -86,15 +86,15 @@ <element xmi:type="uml:Package" href="nesting.profile.uml#_oaAccKdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oaSJQadOEeS-y569OJYknA" x="483" y="341" width="333" height="197"/> </children> - <children xmi:type="notation:Shape" xmi:id="_uXCbkKdOEeS-y569OJYknA" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_uXCbkqdOEeS-y569OJYknA" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_uXEQwKdOEeS-y569OJYknA" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_uXCbkKdOEeS-y569OJYknA" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_uXCbkqdOEeS-y569OJYknA" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_uXEQwKdOEeS-y569OJYknA" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_uXEQwadOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_uXEQwqdOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_uXEQw6dOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uXEQxKdOEeS-y569OJYknA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_uXE30KdOEeS-y569OJYknA" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_uXE30KdOEeS-y569OJYknA" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_uXE30adOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_uXE30qdOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_uXE306dOEeS-y569OJYknA"/> @@ -103,15 +103,15 @@ <element xmi:type="uml:Stereotype" href="nesting.profile.uml#_uW__UKdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uXCbkadOEeS-y569OJYknA" x="198" y="153"/> </children> - <children xmi:type="notation:Shape" xmi:id="_ySK0YKdOEeS-y569OJYknA" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_ySLbcadOEeS-y569OJYknA" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_ySLbcqdOEeS-y569OJYknA" type="1071"> + <children xmi:type="notation:Shape" xmi:id="_ySK0YKdOEeS-y569OJYknA" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_ySLbcadOEeS-y569OJYknA" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_ySLbcqdOEeS-y569OJYknA" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_ySLbc6dOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_ySLbdKdOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_ySLbdadOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ySLbdqdOEeS-y569OJYknA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_ySLbd6dOEeS-y569OJYknA" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_ySLbd6dOEeS-y569OJYknA" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_ySLbeKdOEeS-y569OJYknA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_ySLbeadOEeS-y569OJYknA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_ySLbeqdOEeS-y569OJYknA"/> @@ -120,38 +120,40 @@ <element xmi:type="uml:Stereotype" href="nesting.profile.uml#_ySI_MKdOEeS-y569OJYknA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ySLbcKdOEeS-y569OJYknA" x="660" y="159"/> </children> - <children xmi:type="notation:Shape" xmi:id="_K3jOsKdPEeS-y569OJYknA" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K3lq8KdPEeS-y569OJYknA" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K3lq8adPEeS-y569OJYknA" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K3lq8qdPEeS-y569OJYknA" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K3lq86dPEeS-y569OJYknA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K3mSAKdPEeS-y569OJYknA" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K3mSAadPEeS-y569OJYknA" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_K3jOsqdPEeS-y569OJYknA" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_K3jOsKdPEeS-y569OJYknA" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_K3jOsqdPEeS-y569OJYknA" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K3j1wKdPEeS-y569OJYknA" x="306" y="40"/> </children> - <children xmi:type="notation:Shape" xmi:id="_yWuu0KdPEeS-y569OJYknA" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yWwkAKdPEeS-y569OJYknA" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yWwkAadPEeS-y569OJYknA" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yWxLEKdPEeS-y569OJYknA" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yWxLEadPEeS-y569OJYknA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yWxLEqdPEeS-y569OJYknA" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yWxLE6dPEeS-y569OJYknA" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_yWvV4KdPEeS-y569OJYknA" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_yWuu0KdPEeS-y569OJYknA" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_yWvV4KdPEeS-y569OJYknA" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yWvV4adPEeS-y569OJYknA" x="454" y="36"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_XDNvwadOEeS-y569OJYknA" name="diagram_compatibility_version" stringValue="1.0.0"/> + <children xmi:type="notation:Shape" xmi:id="_7Ydm4Ox5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_7Ydm4ex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7Ydm4-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Ydm4ux5EeWqj-BpY8F6OQ" x="506" y="40"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_7Yn-8Ox5EeWqj-BpY8F6OQ" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_7Yn-8ex5EeWqj-BpY8F6OQ" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7Yn-8-x5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Yn-8ux5EeWqj-BpY8F6OQ" x="654" y="36"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_XDNvwadOEeS-y569OJYknA" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_XDNvwqdOEeS-y569OJYknA"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_XDNvw6dOEeS-y569OJYknA"> <owner xmi:type="uml:Profile" href="nesting.profile.uml#_XADuEKdOEeS-y569OJYknA"/> </styles> <element xmi:type="uml:Profile" href="nesting.profile.uml#_XADuEKdOEeS-y569OJYknA"/> - <edges xmi:type="notation:Connector" xmi:id="_EZkeoKdPEeS-y569OJYknA" type="4002" source="_92B5IKdOEeS-y569OJYknA" target="_uXCbkKdOEeS-y569OJYknA"> - <children xmi:type="notation:DecorationNode" xmi:id="_EZlFsKdPEeS-y569OJYknA" type="6007"> + <edges xmi:type="notation:Connector" xmi:id="_EZkeoKdPEeS-y569OJYknA" type="Generalization_Edge" source="_92B5IKdOEeS-y569OJYknA" target="_uXCbkKdOEeS-y569OJYknA"> + <children xmi:type="notation:DecorationNode" xmi:id="_EZlFsKdPEeS-y569OJYknA" type="Generalization_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_EZlFsadPEeS-y569OJYknA" x="-4" y="28"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_EZkeoadPEeS-y569OJYknA"/> @@ -160,8 +162,8 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O3Ke4KdPEeS-y569OJYknA" id="(0.61,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O3Ke4adPEeS-y569OJYknA" id="(0.38,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_FU10EKdPEeS-y569OJYknA" type="4002" source="_A0Ry8KdPEeS-y569OJYknA" target="_uXCbkKdOEeS-y569OJYknA"> - <children xmi:type="notation:DecorationNode" xmi:id="_FU10E6dPEeS-y569OJYknA" type="6007"> + <edges xmi:type="notation:Connector" xmi:id="_FU10EKdPEeS-y569OJYknA" type="Generalization_Edge" source="_A0Ry8KdPEeS-y569OJYknA" target="_uXCbkKdOEeS-y569OJYknA"> + <children xmi:type="notation:DecorationNode" xmi:id="_FU10E6dPEeS-y569OJYknA" type="Generalization_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_FU10FKdPEeS-y569OJYknA" x="-5" y="19"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_FU10EadPEeS-y569OJYknA"/> @@ -170,31 +172,51 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FU9I0KdPEeS-y569OJYknA" id="(0.0,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O3J30KdPEeS-y569OJYknA" id="(1.0,0.88)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_RDtO8KdPEeS-y569OJYknA" type="1013" source="_uXCbkKdOEeS-y569OJYknA" target="_K3jOsKdPEeS-y569OJYknA"> + <edges xmi:type="notation:Connector" xmi:id="_RDtO8KdPEeS-y569OJYknA" type="Extension_Edge" source="_uXCbkKdOEeS-y569OJYknA" target="_K3jOsKdPEeS-y569OJYknA"> <styles xmi:type="notation:FontStyle" xmi:id="_RDtO8adPEeS-y569OJYknA"/> <element xmi:type="uml:Extension" href="nesting.profile.uml#_RDmhQKdPEeS-y569OJYknA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RDtO8qdPEeS-y569OJYknA" points="[17, -21, -71, 88]$[81, -84, -7, 25]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RD1KwKdPEeS-y569OJYknA" id="(0.7,0.21)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_S5mZkKdPEeS-y569OJYknA" type="1013" source="_ySK0YKdOEeS-y569OJYknA" target="_yWuu0KdPEeS-y569OJYknA"> + <edges xmi:type="notation:Connector" xmi:id="_S5mZkKdPEeS-y569OJYknA" type="Extension_Edge" source="_ySK0YKdOEeS-y569OJYknA" target="_yWuu0KdPEeS-y569OJYknA"> <styles xmi:type="notation:FontStyle" xmi:id="_S5mZkadPEeS-y569OJYknA"/> <element xmi:type="uml:Extension" href="nesting.profile.uml#_S5iIIadPEeS-y569OJYknA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_S5mZkqdPEeS-y569OJYknA" points="[-14, -14, 95, 73]$[-59, -90, 50, -3]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S5rSEKdPEeS-y569OJYknA" id="(0.01,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6MTj8KdPEeS-y569OJYknA" id="(0.9,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_Ue7_sKdPEeS-y569OJYknA" type="1013" source="_-wum0KdOEeS-y569OJYknA" target="_yWuu0KdPEeS-y569OJYknA" jumpLinkStatus="All"> + <edges xmi:type="notation:Connector" xmi:id="_Ue7_sKdPEeS-y569OJYknA" type="Extension_Edge" source="_-wum0KdOEeS-y569OJYknA" target="_yWuu0KdPEeS-y569OJYknA" jumpLinkStatus="All"> <styles xmi:type="notation:FontStyle" xmi:id="_Ue7_sadPEeS-y569OJYknA"/> <element xmi:type="uml:Extension" href="nesting.profile.uml#_Ue5jcKdPEeS-y569OJYknA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ue7_sqdPEeS-y569OJYknA" points="[20, -50, -155, 345]$[125, -396, -50, -1]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6MS84KdPEeS-y569OJYknA" id="(0.68,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_30NEIKdPEeS-y569OJYknA" id="(0.07,1.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_Vr_BoKdPEeS-y569OJYknA" type="1013" source="_BmYlUKdPEeS-y569OJYknA" target="_yWuu0KdPEeS-y569OJYknA"> + <edges xmi:type="notation:Connector" xmi:id="_Vr_BoKdPEeS-y569OJYknA" type="Extension_Edge" source="_BmYlUKdPEeS-y569OJYknA" target="_yWuu0KdPEeS-y569OJYknA"> <styles xmi:type="notation:FontStyle" xmi:id="_Vr_BoadPEeS-y569OJYknA"/> <element xmi:type="uml:Extension" href="nesting.profile.uml#_Vr7-UKdPEeS-y569OJYknA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Vr_BoqdPEeS-y569OJYknA" points="[-9, -14, 196, 338]$[-255, -359, -50, -7]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VsFIQKdPEeS-y569OJYknA" id="(0.08,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2ntb0KdPEeS-y569OJYknA" id="(0.38,1.0)"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_7Ydm5Ox5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_K3jOsKdPEeS-y569OJYknA" target="_7Ydm4Ox5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_7Ydm5ex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7Ydm6ex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7Ydm5ux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Ydm5-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Ydm6Ox5EeWqj-BpY8F6OQ"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_7Yn-9Ox5EeWqj-BpY8F6OQ" type="StereotypeCommentLink" source="_yWuu0KdPEeS-y569OJYknA" target="_7Yn-8Ox5EeWqj-BpY8F6OQ"> + <styles xmi:type="notation:FontStyle" xmi:id="_7Yn-9ex5EeWqj-BpY8F6OQ"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7Yn--ex5EeWqj-BpY8F6OQ" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7Yn-9ux5EeWqj-BpY8F6OQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Yn-9-x5EeWqj-BpY8F6OQ"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Yn--Ox5EeWqj-BpY8F6OQ"/> + </edges> </notation:Diagram> diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/DiagramSpecificElementTypesGenerationBug461717Test.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/DiagramSpecificElementTypesGenerationBug461717Test.java index 6f1d6c1bc2e..c29cbbf2b8d 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/DiagramSpecificElementTypesGenerationBug461717Test.java +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/DiagramSpecificElementTypesGenerationBug461717Test.java @@ -42,7 +42,7 @@ import org.junit.Test; * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=461717 */ @PluginResource("/resources/j2ee.profile.uml") -@BaseElementTypes("org.eclipse.papyrus.uml.diagram.usecase.elementTypeSet") +@BaseElementTypes("org.eclipse.papyrus.umldi.service.types.UMLDIElementTypeSet") @GenOptions(SUPPRESS_SEMANTIC_SUPERTYPE) public class DiagramSpecificElementTypesGenerationBug461717Test extends AbstractPapyrusTest { @@ -70,7 +70,7 @@ public class DiagramSpecificElementTypesGenerationBug461717Test extends Abstract List<String> specializedTypeIDs = next.getSpecializedTypesID(); assertThat(specializedTypeIDs.size(), is(1)); - assertThat(specializedTypeIDs.get(0), regexContains("Actor_\\d{4}$")); // a visual ID + assertThat(specializedTypeIDs.get(0), regexContains("Actor_")); // a visual ID } } @@ -97,7 +97,7 @@ public class DiagramSpecificElementTypesGenerationBug461717Test extends Abstract Pair<Stereotype, Class> userActor = fixture.getMetaclassExtension("User", "Actor"); List<ApplyStereotypeAdviceConfiguration> advices = fixture.assertAllApplyStereotypeAdvices(userActor); for (ApplyStereotypeAdviceConfiguration advice : advices) { - String visualID = advice.getIdentifier().substring(advice.getIdentifier().lastIndexOf('_') + 1); + String visualID = advice.getIdentifier().substring(advice.getIdentifier().indexOf('_') + 1); assertThat(advice.getTarget(), is(fixture.getElementTypeConfiguration(userActor, visualID))); assertThat(advice.getStereotypesToApply(), not(isEmpty())); assertThat(advice.getStereotypesToApply().get(0).getRequiredProfiles(), hasItem("j2ee")); diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/DiagramSpecificElementTypesGenerationTest.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/DiagramSpecificElementTypesGenerationTest.java index 5abfb7028de..784e4212966 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/DiagramSpecificElementTypesGenerationTest.java +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/DiagramSpecificElementTypesGenerationTest.java @@ -32,6 +32,8 @@ import org.eclipse.papyrus.infra.types.IconEntry; import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration; import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; import org.eclipse.papyrus.junit.utils.rules.PluginResource; +import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorAsRectangleEditPartTN; +import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.ActorEditPartTN; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Stereotype; import org.eclipse.uml2.uml.UMLPackage; @@ -46,7 +48,7 @@ import com.google.common.collect.ImmutableSet; * Test cases for diagram-specific element types generation for UML profiles. */ @PluginResource("/resources/j2ee.profile.uml") -@BaseElementTypes("org.eclipse.papyrus.uml.diagram.usecase.elementTypeSet") +@BaseElementTypes("org.eclipse.papyrus.umldi.service.types.UMLDIElementTypeSet") public class DiagramSpecificElementTypesGenerationTest extends AbstractPapyrusTest { @ClassRule @@ -83,7 +85,7 @@ public class DiagramSpecificElementTypesGenerationTest extends AbstractPapyrusTe List<String> specializedTypeIDs = next.getSpecializedTypesID(); assertThat(specializedTypeIDs.size(), is(2)); assertThat(specializedTypeIDs.get(0), is(semanticParentID)); - assertThat(specializedTypeIDs.get(1), regexContains("Actor_\\d{4}$")); // a visual ID + assertThat(specializedTypeIDs.get(1), regexContains("Actor_")); // a visual ID } } @@ -92,7 +94,7 @@ public class DiagramSpecificElementTypesGenerationTest extends AbstractPapyrusTe Pair<Stereotype, Class> userActor = fixture.getMetaclassExtension("User", "Actor"); List<SpecializationTypeConfiguration> types = fixture.assertAllSpecializationTypes(userActor); Set<String> hints = ImmutableSet.copyOf(transform(types, EMFFunctions.getFeature(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__HINT, String.class))); - assertThat(hints, hasItems("2011", "2012")); + assertThat(hints, hasItems(ActorEditPartTN.VISUAL_ID, ActorAsRectangleEditPartTN.VISUAL_ID)); } @Test diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/ModelGenFixture.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/ModelGenFixture.java index 1161cfdb57a..1646ffaf023 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/ModelGenFixture.java +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/ModelGenFixture.java @@ -62,6 +62,8 @@ import com.google.common.collect.Lists; public class ModelGenFixture extends ResourceSetFixture { private static final String UML_ELEMENT_TYPES = "org.eclipse.papyrus.uml.service.types.UMLElementTypeSet"; + private static final String UMLDI_ELEMENT_TYPES = "org.eclipse.papyrus.umldi.service.types.UMLDIElementTypeSet"; + protected final String prefix = "org.eclipse.papyrus.test"; private String baseElementTypesSet = UML_ELEMENT_TYPES; @@ -138,7 +140,8 @@ public class ModelGenFixture extends ResourceSetFixture { protected String getElementTypeID(org.eclipse.uml2.uml.Class metaclass) { String metaclassName = getValidJavaIdentifier(metaclass.getName()); - return baseElementTypesSet.equals(UML_ELEMENT_TYPES) ? "org.eclipse.papyrus.uml." + metaclassName : baseElementTypesSet.replaceFirst("\\w+$", metaclassName); + return baseElementTypesSet.equals(UML_ELEMENT_TYPES) ? "org.eclipse.papyrus.uml." + metaclassName : + baseElementTypesSet.equals(UMLDI_ELEMENT_TYPES) ? "org.eclipse.papyrus.umldi." + metaclassName : baseElementTypesSet.replaceFirst("\\w+$", metaclassName); } public ElementTypeConfiguration getElementTypeConfiguration(String id) { diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActionConstraint.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActionConstraint.java index df15f39668f..701ae50e426 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActionConstraint.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActionConstraint.java @@ -57,7 +57,7 @@ public class TestActionConstraint extends AbstractPapyrusTestCase { public void testLocalPreCondConstraintInAction() { IGraphicalEditPart opaqueEP = createChild(OpaqueActionEditPart.VISUAL_ID, getActivityCompartmentEditPart()); - IElementType constraintAsPrecondType = UMLElementTypes.Constraint_3011; + IElementType constraintAsPrecondType = UMLElementTypes.Constraint_LocalPreconditionShape; Command command = opaqueEP.getCommand(constraintRequest(constraintAsPrecondType)); Assert.assertNotNull(command); @@ -126,7 +126,7 @@ public class TestActionConstraint extends AbstractPapyrusTestCase { private EReference findContainmentFeatureByType(IElementType type) { EReference result = null; - if (UMLElementTypes.Constraint_3011 == type) { + if (UMLElementTypes.Constraint_LocalPreconditionShape == type) { result = UMLPackage.eINSTANCE.getAction_LocalPrecondition(); } Assert.assertNotNull("Containment feature for " + type + " type was not found", result); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityAffixedChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityAffixedChildNode.java index db5daffefb5..f91d46477f2 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityAffixedChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityAffixedChildNode.java @@ -1,39 +1,39 @@ -/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
-
-import org.eclipse.papyrus.commands.ICreationCommand;
-import org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand;
-import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
-import org.junit.Test;
-
-
-public class TestActivityAffixedChildNode extends AbstractTestActivityAffixedChildNode{
-
-
- /**
- * Test to manageActivityParameterNode
- */
- @Test
- public void testToManageActivityParameterNode() {
- testToManageChildNode(UMLElementTypes.ActivityParameterNode_3059,5);
- }
-
- @Override
- protected ICreationCommand getDiagramCommandCreation() {
- return new CreateActivityDiagramCommand();
- }
-
+/***************************************************************************** + * Copyright (c) 2012 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.uml.diagram.activity.tests.canonical; + +import org.eclipse.papyrus.commands.ICreationCommand; +import org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand; +import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes; +import org.junit.Test; + + +public class TestActivityAffixedChildNode extends AbstractTestActivityAffixedChildNode{ + + + /** + * Test to manageActivityParameterNode + */ + @Test + public void testToManageActivityParameterNode() { + testToManageChildNode(UMLElementTypes.ActivityParameterNode_Shape,5); + } + + @Override + protected ICreationCommand getDiagramCommandCreation() { + return new CreateActivityDiagramCommand(); + } + }
\ No newline at end of file diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityChildNodeInStructuredActivity.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityChildNodeInStructuredActivity.java index c3c09467897..d933d8eec6c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityChildNodeInStructuredActivity.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityChildNodeInStructuredActivity.java @@ -1,61 +1,61 @@ -/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
-
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
-import org.eclipse.papyrus.junit.framework.classification.FailingTest;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramUpdater;
-import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.junit.Test;
-
-
-public class TestActivityChildNodeInStructuredActivity extends AbstractTestActivityChildNode {
-
- @Override
- protected String getProjectName() {
- return IActivityDiagramTestsConstants.PROJECT_NAME;
- }
-
- @Override
- protected String getFileName() {
- return IActivityDiagramTestsConstants.FILE_NAME;
- }
-
- @Override
- public DiagramUpdater getDiagramUpdater() {
- return UMLDiagramUpdater.INSTANCE;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected CreateViewRequest createViewRequestShapeContainer() {
- return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.StructuredActivityNode_3065, getDiagramEditPart().getDiagramPreferencesHint());
- }
-
- /**
- * Test to manage opaque action.
- */
- @FailingTest("Bug 425578, 431573")
- @Test
- public void testToManageOpaqueAction() {
- testToManageNode(UMLElementTypes.OpaqueAction_3007, UMLPackage.eINSTANCE.getOpaqueAction(), UMLElementTypes.StructuredActivityNode_3065, false);
- }
-}
+/***************************************************************************** + * Copyright (c) 2012 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.uml.diagram.activity.tests.canonical; + +import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest; +import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory; +import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater; +import org.eclipse.papyrus.junit.framework.classification.FailingTest; +import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramUpdater; +import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes; +import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants; +import org.eclipse.uml2.uml.UMLPackage; +import org.junit.Test; + + +public class TestActivityChildNodeInStructuredActivity extends AbstractTestActivityChildNode { + + @Override + protected String getProjectName() { + return IActivityDiagramTestsConstants.PROJECT_NAME; + } + + @Override + protected String getFileName() { + return IActivityDiagramTestsConstants.FILE_NAME; + } + + @Override + public DiagramUpdater getDiagramUpdater() { + return UMLDiagramUpdater.INSTANCE; + } + + /** + * {@inheritDoc} + */ + @Override + protected CreateViewRequest createViewRequestShapeContainer() { + return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.StructuredActivityNode_Shape, getDiagramEditPart().getDiagramPreferencesHint()); + } + + /** + * Test to manage opaque action. + */ + @FailingTest("Bug 425578, 431573") + @Test + public void testToManageOpaqueAction() { + testToManageNode(UMLElementTypes.OpaqueAction_Shape, UMLPackage.eINSTANCE.getOpaqueAction(), UMLElementTypes.StructuredActivityNode_Shape, false); + } +} diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildNode.java index 7de9ccc5956..3fef0df033e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildNode.java @@ -54,7 +54,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageCentralBufferNode() { - testToManageNode(UMLElementTypes.CentralBufferNode_3104, UMLPackage.eINSTANCE.getCentralBufferNode(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.CentralBufferNode_Shape, UMLPackage.eINSTANCE.getCentralBufferNode(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -62,7 +62,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageOpaqueAction() { - testToManageNode(UMLElementTypes.OpaqueAction_3007, UMLPackage.eINSTANCE.getOpaqueAction(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.OpaqueAction_Shape, UMLPackage.eINSTANCE.getOpaqueAction(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -70,7 +70,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageInitialNode() { - testToManageNode(UMLElementTypes.InitialNode_3004, UMLPackage.eINSTANCE.getInitialNode(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.InitialNode_Shape, UMLPackage.eINSTANCE.getInitialNode(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -78,7 +78,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageActivityFinalNode() { - testToManageNode(UMLElementTypes.ActivityFinalNode_3005, UMLPackage.eINSTANCE.getActivityFinalNode(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.ActivityFinalNode_Shape, UMLPackage.eINSTANCE.getActivityFinalNode(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -86,7 +86,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageFlowFinalNode() { - testToManageNode(UMLElementTypes.FlowFinalNode_3006, UMLPackage.eINSTANCE.getFlowFinalNode(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.FlowFinalNode_Shape, UMLPackage.eINSTANCE.getFlowFinalNode(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -94,7 +94,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageDecisionNode() { - testToManageNode(UMLElementTypes.DecisionNode_3038, UMLPackage.eINSTANCE.getDecisionNode(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.DecisionNode_Shape, UMLPackage.eINSTANCE.getDecisionNode(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -102,7 +102,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageMergeNode() { - testToManageNode(UMLElementTypes.MergeNode_3039, UMLPackage.eINSTANCE.getMergeNode(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.MergeNode_Shape, UMLPackage.eINSTANCE.getMergeNode(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -110,15 +110,15 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageJoinNode() { - testToManageNode(UMLElementTypes.JoinNode_3041, UMLPackage.eINSTANCE.getJoinNode(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.JoinNode_Shape, UMLPackage.eINSTANCE.getJoinNode(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** - * Test to manage ForkNode_3040 + * Test to manage ForkNode_Shape */ @Test public void testToManageForkNode() { - testToManageNode(UMLElementTypes.ForkNode_3040, UMLPackage.eINSTANCE.getForkNode(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.ForkNode_Shape, UMLPackage.eINSTANCE.getForkNode(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -126,7 +126,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageDataStoreNode() { - testToManageNode(UMLElementTypes.DataStoreNode_3078, UMLPackage.eINSTANCE.getDataStoreNode(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.DataStoreNode_Shape, UMLPackage.eINSTANCE.getDataStoreNode(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -136,7 +136,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode public void testToManageSendObjectAction() { // Change for Bug 438560: 2 pins were created by the Live validation actions. These validation actions are not live anymore. // FIXME: Implement a specific Palette post-action to create the pins automatically (Independently of the validation rules) - testToManageNode(UMLElementTypes.SendObjectAction_3042, UMLPackage.eINSTANCE.getSendObjectAction(), UMLElementTypes.StructuredActivityNode_3065, true, 0); + testToManageNode(UMLElementTypes.SendObjectAction_Shape, UMLPackage.eINSTANCE.getSendObjectAction(), UMLElementTypes.StructuredActivityNode_Shape, true, 0); } /** @@ -144,7 +144,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageAcceptEventAction() { - testToManageNode(UMLElementTypes.AcceptEventAction_3063, UMLPackage.eINSTANCE.getAcceptEventAction(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.AcceptEventAction_Shape, UMLPackage.eINSTANCE.getAcceptEventAction(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -152,7 +152,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageValueSpecificationAction() { - testToManageNode(UMLElementTypes.ValueSpecificationAction_3076, UMLPackage.eINSTANCE.getValueSpecificationAction(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.ValueSpecificationAction_Shape, UMLPackage.eINSTANCE.getValueSpecificationAction(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -160,7 +160,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageActivityPartition() { - testToManageNode(UMLElementTypes.ActivityPartition_3067, UMLPackage.eINSTANCE.getActivityPartition(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.ActivityPartition_Shape, UMLPackage.eINSTANCE.getActivityPartition(), UMLElementTypes.StructuredActivityNode_Shape, false); } /** @@ -169,7 +169,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode @FailingTest("IARegion hasn't label and AbstractTestNode#testNameLabel is failing") @Test public void testToManageInteruptibleActivityRegion() { - testToManageNode(UMLElementTypes.InterruptibleActivityRegion_3068, UMLPackage.eINSTANCE.getInterruptibleActivityRegion(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.InterruptibleActivityRegion_Shape, UMLPackage.eINSTANCE.getInterruptibleActivityRegion(), UMLElementTypes.StructuredActivityNode_Shape, false); } /** @@ -177,7 +177,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageStructuredActivity() { - testToManageNode(UMLElementTypes.StructuredActivityNode_3065, UMLPackage.eINSTANCE.getStructuredActivityNode(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.StructuredActivityNode_Shape, UMLPackage.eINSTANCE.getStructuredActivityNode(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -185,7 +185,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageReadSelfAction() { - testToManageNode(UMLElementTypes.ReadSelfAction_3081, UMLPackage.eINSTANCE.getReadSelfAction(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.ReadSelfAction_Shape, UMLPackage.eINSTANCE.getReadSelfAction(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -193,7 +193,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageConditionalNode() { - testToManageNode(UMLElementTypes.ConditionalNode_3069, UMLPackage.eINSTANCE.getConditionalNode(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.ConditionalNode_Shape, UMLPackage.eINSTANCE.getConditionalNode(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -201,7 +201,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageExpansionRegion() { - testToManageNode(UMLElementTypes.ExpansionRegion_3070, UMLPackage.eINSTANCE.getExpansionRegion(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.ExpansionRegion_Shape, UMLPackage.eINSTANCE.getExpansionRegion(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -209,7 +209,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageloopNode() { - testToManageNode(UMLElementTypes.LoopNode_3071, UMLPackage.eINSTANCE.getLoopNode(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.LoopNode_Shape, UMLPackage.eINSTANCE.getLoopNode(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -217,7 +217,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageSequenceNode() { - testToManageNode(UMLElementTypes.SequenceNode_3073, UMLPackage.eINSTANCE.getSequenceNode(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.SequenceNode_Shape, UMLPackage.eINSTANCE.getSequenceNode(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -226,7 +226,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode @Test @InteractiveTest public void testToManageActivity() { - testToManageNode(UMLElementTypes.Activity_3083, UMLPackage.eINSTANCE.getActivity(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.Activity_Shape_CN, UMLPackage.eINSTANCE.getActivity(), UMLElementTypes.StructuredActivityNode_Shape, false); } /** @@ -236,7 +236,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode public void testToManageReadStructuralFeatureAction() { // Change for Bug 438560: 2 pins were created by the Live validation actions. These validation actions are not live anymore. // FIXME: Implement a specific Palette post-action to create the pins automatically (Independently of the validation rules) - testToManageNode(UMLElementTypes.ReadStructuralFeatureAction_3088, UMLPackage.eINSTANCE.getReadStructuralFeatureAction(), UMLElementTypes.StructuredActivityNode_3065, true, 0); + testToManageNode(UMLElementTypes.ReadStructuralFeatureAction_Shape, UMLPackage.eINSTANCE.getReadStructuralFeatureAction(), UMLElementTypes.StructuredActivityNode_Shape, true, 0); } /** @@ -246,7 +246,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode public void testToManageDestroyObjectAction() { // Change for Bug 438560: 1 pin was created by the Live validation actions. These validation actions are not live anymore. // FIXME: Implement a specific Palette post-action to create the pins automatically (Independently of the validation rules) - testToManageNode(UMLElementTypes.DestroyObjectAction_3095, UMLPackage.eINSTANCE.getDestroyObjectAction(), UMLElementTypes.StructuredActivityNode_3065, true, 0); + testToManageNode(UMLElementTypes.DestroyObjectAction_Shape, UMLPackage.eINSTANCE.getDestroyObjectAction(), UMLElementTypes.StructuredActivityNode_Shape, true, 0); } /** @@ -256,7 +256,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode public void testToManageReadVariableAction() { // Change for Bug 438560: 1 pin was created by the Live validation actions. These validation actions are not live anymore. // FIXME: Implement a specific Palette post-action to create the pins automatically (Independently of the validation rules) - testToManageNode(UMLElementTypes.ReadVariableAction_3097, UMLPackage.eINSTANCE.getReadVariableAction(), UMLElementTypes.StructuredActivityNode_3065, true, 0); + testToManageNode(UMLElementTypes.ReadVariableAction_Shape, UMLPackage.eINSTANCE.getReadVariableAction(), UMLElementTypes.StructuredActivityNode_Shape, true, 0); } /** @@ -264,7 +264,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode */ @Test public void testToManageBroadCastSignalAction() { - testToManageNode(UMLElementTypes.BroadcastSignalAction_3102, UMLPackage.eINSTANCE.getBroadcastSignalAction(), UMLElementTypes.StructuredActivityNode_3065, true); + testToManageNode(UMLElementTypes.BroadcastSignalAction_Shape, UMLPackage.eINSTANCE.getBroadcastSignalAction(), UMLElementTypes.StructuredActivityNode_Shape, true); } /** @@ -274,7 +274,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode public void testToManageCreateObjectAction() { // Change for Bug 438560: 1 pin was created by the Live validation actions. These validation actions are not live anymore. // FIXME: Implement a specific Palette post-action to create the pins automatically (Independently of the validation rules) - testToManageNode(UMLElementTypes.CreateObjectAction_3086, UMLPackage.eINSTANCE.getCreateObjectAction(), UMLElementTypes.StructuredActivityNode_3065, true, 0); + testToManageNode(UMLElementTypes.CreateObjectAction_Shape, UMLPackage.eINSTANCE.getCreateObjectAction(), UMLElementTypes.StructuredActivityNode_Shape, true, 0); } /** @@ -284,7 +284,7 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode public void testToManageAddVariableValueAction() { // Change for Bug 438560: 2 pins were created by the Live validation actions. These validation actions are not live anymore. // FIXME: Implement a specific Palette post-action to create the pins automatically (Independently of the validation rules) - testToManageNode(UMLElementTypes.AddVariableValueAction_3099, UMLPackage.eINSTANCE.getAddVariableValueAction(), UMLElementTypes.StructuredActivityNode_3065, true, 0); + testToManageNode(UMLElementTypes.AddVariableValueAction_Shape, UMLPackage.eINSTANCE.getAddVariableValueAction(), UMLElementTypes.StructuredActivityNode_Shape, true, 0); } /** diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildWithOtherCreationNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildWithOtherCreationNode.java index 981438e6ebd..460ea640e5d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildWithOtherCreationNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildWithOtherCreationNode.java @@ -1,90 +1,90 @@ -/*****************************************************************************
- * Copyright (c) 2009 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.activity.tests.canonical;
-
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater;
-import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramUpdater;
-import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * The Class TestClassDiagramChildNode.
- */
-public class TestActivityDiagramChildWithOtherCreationNode extends AbstractTestActivityChildNode {
-
- @Override
- protected String getProjectName() {
- return IActivityDiagramTestsConstants.PROJECT_NAME;
- }
-
- @Override
- public DiagramUpdater getDiagramUpdater() {
- return UMLDiagramUpdater.INSTANCE;
- }
-
- @Override
- protected String getFileName() {
- return IActivityDiagramTestsConstants.FILE_NAME;
- }
-
- /**
- * Test to manage callbehaviorAction
- */
- @Test
- @Ignore
- public void testToManageCallbehaviorAction() {
- testToManageNode(UMLElementTypes.CallBehaviorAction_3008, UMLPackage.eINSTANCE.getCallBehaviorAction(), UMLElementTypes.StructuredActivityNode_3065, false);
- }
-
- /**
- * Test to manage callOperationAction
- */
- @Ignore
- @Test
- public void testToManageCallOperationAction() {
- testToManageNode(UMLElementTypes.CallOperationAction_3010, UMLPackage.eINSTANCE.getCallOperationAction(), UMLElementTypes.StructuredActivityNode_3065, false);
- }
-
- /**
- * Test to manage SendSignalAction Node.
- */
- @Ignore
- @Test
- public void testToManageSendSignalAction() {
- testToManageNode(UMLElementTypes.SendSignalAction_3052, UMLPackage.eINSTANCE.getSendSignalAction(), UMLElementTypes.StructuredActivityNode_3065, false);
- }
-
- /**
- * Test to SendObjectAction Node.
- */
- @Test
- public void testToManageSendObjectAction() {
- testToManageNode(UMLElementTypes.SendObjectAction_3042, UMLPackage.eINSTANCE.getSendObjectAction(), UMLElementTypes.StructuredActivityNode_3065, false);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected CreateViewRequest createViewRequestShapeContainer() {
- return null;
- }
-
-
-}
+/***************************************************************************** + * Copyright (c) 2009 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.diagram.activity.tests.canonical; + +import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest; +import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater; +import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramUpdater; +import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes; +import org.eclipse.papyrus.uml.diagram.activity.tests.IActivityDiagramTestsConstants; +import org.eclipse.uml2.uml.UMLPackage; +import org.junit.Ignore; +import org.junit.Test; + + +/** + * The Class TestClassDiagramChildNode. + */ +public class TestActivityDiagramChildWithOtherCreationNode extends AbstractTestActivityChildNode { + + @Override + protected String getProjectName() { + return IActivityDiagramTestsConstants.PROJECT_NAME; + } + + @Override + public DiagramUpdater getDiagramUpdater() { + return UMLDiagramUpdater.INSTANCE; + } + + @Override + protected String getFileName() { + return IActivityDiagramTestsConstants.FILE_NAME; + } + + /** + * Test to manage callbehaviorAction + */ + @Test + @Ignore + public void testToManageCallbehaviorAction() { + testToManageNode(UMLElementTypes.CallBehaviorAction_Shape, UMLPackage.eINSTANCE.getCallBehaviorAction(), UMLElementTypes.StructuredActivityNode_Shape, false); + } + + /** + * Test to manage callOperationAction + */ + @Ignore + @Test + public void testToManageCallOperationAction() { + testToManageNode(UMLElementTypes.CallOperationAction_Shape, UMLPackage.eINSTANCE.getCallOperationAction(), UMLElementTypes.StructuredActivityNode_Shape, false); + } + + /** + * Test to manage SendSignalAction Node. + */ + @Ignore + @Test + public void testToManageSendSignalAction() { + testToManageNode(UMLElementTypes.SendSignalAction_Shape, UMLPackage.eINSTANCE.getSendSignalAction(), UMLElementTypes.StructuredActivityNode_Shape, false); + } + + /** + * Test to SendObjectAction Node. + */ + @Test + public void testToManageSendObjectAction() { + testToManageNode(UMLElementTypes.SendObjectAction_Shape, UMLPackage.eINSTANCE.getSendObjectAction(), UMLElementTypes.StructuredActivityNode_Shape, false); + } + + /** + * {@inheritDoc} + */ + @Override + protected CreateViewRequest createViewRequestShapeContainer() { + return null; + } + + +} diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestCommentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestCommentLink.java index b5f2b2ccd93..6742ff4fce6 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestCommentLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestCommentLink.java @@ -54,7 +54,7 @@ public class TestCommentLink extends AbstractPapyrusTestCase { IGraphicalEditPart comment = createChild(CommentEditPartCN.VISUAL_ID, getActivityCompartmentEditPart()); List<IElementType> types = new LinkedList<IElementType>(); - types.add(UMLElementTypes.CommentAnnotatedElement_4006); + types.add(UMLElementTypes.Comment_AnnotatedElementEdge); AspectUnspecifiedTypeConnectionTool.CreateAspectUnspecifiedTypeConnectionRequest req = new AspectUnspecifiedTypeConnectionTool(types). diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestLinks.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestLinks.java index 34b6baef9d8..c9e1d93927d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestLinks.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestLinks.java @@ -95,7 +95,7 @@ public class TestLinks extends AbstractPapyrusTestCase { IGraphicalEditPart reduceActionEP = createChild(ReduceActionEditPart.VISUAL_ID, getActivityCompartmentEditPart()); List<IElementType> types = new LinkedList<IElementType>(); - types.add(UMLElementTypes.ObjectFlow_4003); + types.add(UMLElementTypes.ObjectFlow_Edge); AspectUnspecifiedTypeConnectionTool.CreateAspectUnspecifiedTypeConnectionRequest req = new AspectUnspecifiedTypeConnectionTool(types). @@ -124,7 +124,7 @@ public class TestLinks extends AbstractPapyrusTestCase { IGraphicalEditPart reduceActionEP = createChild(ReduceActionEditPart.VISUAL_ID, getActivityCompartmentEditPart()); IGraphicalEditPart inputPinInReduceAction = createChild(ValuePinInReduceActionAsCollectionEditPart.VISUAL_ID, reduceActionEP); - Command endCommand = createLinkCommand(outputPinInAcceptEventAction, inputPinInReduceAction, UMLElementTypes.ObjectFlow_4003); + Command endCommand = createLinkCommand(outputPinInAcceptEventAction, inputPinInReduceAction, UMLElementTypes.ObjectFlow_Edge); Assert.assertNotNull(endCommand); Assert.assertTrue(endCommand.canExecute()); @@ -139,7 +139,7 @@ public class TestLinks extends AbstractPapyrusTestCase { IGraphicalEditPart initialNodeEP = createChild(InitialNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart()); IGraphicalEditPart readExtentctionEP = createChild(ReadExtentActionEditPart.VISUAL_ID, getActivityCompartmentEditPart()); - Command endCommand = createLinkCommand(initialNodeEP, readExtentctionEP, UMLElementTypes.ControlFlow_4004); + Command endCommand = createLinkCommand(initialNodeEP, readExtentctionEP, UMLElementTypes.ControlFlow_Edge); Assert.assertNotNull(endCommand); Assert.assertTrue(endCommand.canExecute()); @@ -157,7 +157,7 @@ public class TestLinks extends AbstractPapyrusTestCase { IGraphicalEditPart createLinkACtionEP = createChild(CreateLinkActionEditPart.VISUAL_ID, getActivityCompartmentEditPart()); IGraphicalEditPart newTargetEP = createChild(InputPinInCreateLinkActionAsInputValueEditPart.VISUAL_ID, createLinkACtionEP); - Command endCommand = createLinkCommand(opaqueEP, parameterNodeEP, UMLElementTypes.ObjectFlow_4003); + Command endCommand = createLinkCommand(opaqueEP, parameterNodeEP, UMLElementTypes.ObjectFlow_Edge); Assert.assertNotNull(endCommand); Assert.assertTrue(endCommand.canExecute()); @@ -185,7 +185,7 @@ public class TestLinks extends AbstractPapyrusTestCase { IGraphicalEditPart createLinkACtionEP = createChild(CreateLinkActionEditPart.VISUAL_ID, getActivityCompartmentEditPart()); - Command endCommand = createLinkCommand(outputPinInOpaqueEP, opaqueEP, UMLElementTypes.ObjectFlow_4003); + Command endCommand = createLinkCommand(outputPinInOpaqueEP, opaqueEP, UMLElementTypes.ObjectFlow_Edge); Assert.assertNotNull(endCommand); Assert.assertTrue(endCommand.canExecute()); @@ -209,7 +209,7 @@ public class TestLinks extends AbstractPapyrusTestCase { IGraphicalEditPart broadCastSignalActionEP = createChild(BroadcastSignalActionEditPart.VISUAL_ID, getActivityCompartmentEditPart()); IGraphicalEditPart acceptEventActionEP = createChild(AcceptEventActionEditPart.VISUAL_ID, getActivityCompartmentEditPart()); - Command endCommand = createLinkCommand(parameterNodeEP, broadCastSignalActionEP, UMLElementTypes.ControlFlow_4004); + Command endCommand = createLinkCommand(parameterNodeEP, broadCastSignalActionEP, UMLElementTypes.ControlFlow_Edge); Assert.assertNotNull(endCommand); Assert.assertTrue(endCommand.canExecute()); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/edit/helper/ExpansionRegionHelperTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/edit/helper/ExpansionRegionHelperTest.java index 72673940456..48d258db593 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/edit/helper/ExpansionRegionHelperTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/edit/helper/ExpansionRegionHelperTest.java @@ -70,7 +70,7 @@ public class ExpansionRegionHelperTest extends AbstractPapyrusTest { @Test public void testExpansionNodeCreateCommand() throws Exception { - CreateElementRequest expansionNodeCreateRequest = initCreateElementRequest(UMLElementTypes.ExpansionNode_3074, UMLPackage.eINSTANCE.getExpansionRegion_InputElement()); + CreateElementRequest expansionNodeCreateRequest = initCreateElementRequest(UMLElementTypes.ExpansionNode_InputShape, UMLPackage.eINSTANCE.getExpansionRegion_InputElement()); ICommand command = myHelperInstance.getCreateCommand(expansionNodeCreateRequest); commonExpansionRegionCreateChildTest(command); CreateEditBasedElementCommand createCommand = (CreateEditBasedElementCommand) command; @@ -84,7 +84,7 @@ public class ExpansionRegionHelperTest extends AbstractPapyrusTest { @Test public void testExpansionRegionContainmentChildCreateCommand() throws Exception { - CreateElementRequest expansionRegionContainmentCreateRequest = initCreateElementRequest(UMLElementTypes.StructuredActivityNode_3065, UMLPackage.eINSTANCE.getStructuredActivityNode_Node()); + CreateElementRequest expansionRegionContainmentCreateRequest = initCreateElementRequest(UMLElementTypes.StructuredActivityNode_Shape, UMLPackage.eINSTANCE.getStructuredActivityNode_Node()); ICommand command = myHelperInstance.getCreateCommand(expansionRegionContainmentCreateRequest); commonExpansionRegionCreateChildTest(command); CreateEditBasedElementCommand createCommand = (CreateEditBasedElementCommand) command; @@ -93,7 +93,7 @@ public class ExpansionRegionHelperTest extends AbstractPapyrusTest { @Test public void testExpansionRegionBadCreateCommand() throws Exception { - CreateElementRequest badCreateCommandRequest = initCreateElementRequest(UMLElementTypes.ExpansionNode_3074, UMLPackage.eINSTANCE.getStructuredActivityNode_Edge()); + CreateElementRequest badCreateCommandRequest = initCreateElementRequest(UMLElementTypes.ExpansionNode_InputShape, UMLPackage.eINSTANCE.getStructuredActivityNode_Edge()); ICommand command = myHelperInstance.getCreateCommand(badCreateCommandRequest); assertFalse(command.canExecute()); } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/edit/part/ExpansionRegionCompartmentEPTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/edit/part/ExpansionRegionCompartmentEPTest.java index ccb191567e0..1cfe849964d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/edit/part/ExpansionRegionCompartmentEPTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/edit/part/ExpansionRegionCompartmentEPTest.java @@ -57,17 +57,17 @@ public class ExpansionRegionCompartmentEPTest extends AbstractPapyrusTest { @Test public void testExpansionNodeCreationRequest() { - assertEquals(myParentEP, getTestTargetEditPart(UMLElementTypes.ExpansionNode_3074, UMLElementTypes.ExpansionNode_3075)); + assertEquals(myParentEP, getTestTargetEditPart(UMLElementTypes.ExpansionNode_InputShape, UMLElementTypes.ExpansionNode_OutputShape)); } @Test public void testMixedElementTypesCreationRequest() { - assertNotNull(getTestTargetEditPart(UMLElementTypes.ExpansionNode_3074, UMLElementTypes.LoopNode_3071)); + assertNotNull(getTestTargetEditPart(UMLElementTypes.ExpansionNode_InputShape, UMLElementTypes.LoopNode_Shape)); } @Test public void testAlienCreationRequest() { - assertEquals(myCompartmentEP, getTestTargetEditPart(UMLElementTypes.StructuredActivityNode_3065)); + assertEquals(myCompartmentEP, getTestTargetEditPart(UMLElementTypes.StructuredActivityNode_Shape)); } private EditPart getTestTargetEditPart(IElementType... types) { diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/bug476872_ClassDiagram/uml.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/bug476872_ClassDiagram/uml.notation index 9cdbb10c49e..970a0f910ab 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/bug476872_ClassDiagram/uml.notation +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/bug476872_ClassDiagram/uml.notation @@ -1,50 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> <notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_iPu8EGzOEeWw3Lk1FWCieQ" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_3YSRwIkrEeW4O_q_qVZCoA" type="2006"> - <children xmi:type="notation:DecorationNode" xmi:id="_3YTf4IkrEeW4O_q_qVZCoA" type="5023"/> - <children xmi:type="notation:DecorationNode" xmi:id="_3YTf4YkrEeW4O_q_qVZCoA" type="8508"> + <children xmi:type="notation:Shape" xmi:id="_3YSRwIkrEeW4O_q_qVZCoA" type="Enumeration_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_3YTf4IkrEeW4O_q_qVZCoA" type="Enumeration_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_3YTf4YkrEeW4O_q_qVZCoA" type="Enumeration_FloatingNameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_3YUG8IkrEeW4O_q_qVZCoA" y="5"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_3YUG8YkrEeW4O_q_qVZCoA" type="7015"> - <children xmi:type="notation:Shape" xmi:id="_3yik0IkrEeW4O_q_qVZCoA" type="3017"> + <children xmi:type="notation:BasicCompartment" xmi:id="_c4vysMi3EeWmOPJtQdIfcQ" type="Enumeration_LiteralCompartment"> + <children xmi:type="notation:Shape" xmi:id="_c4vysci3EeWmOPJtQdIfcQ" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="uml.uml#_3ydFQIkrEeW4O_q_qVZCoA"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_3yik0YkrEeW4O_q_qVZCoA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_c4vyssi3EeWmOPJtQdIfcQ"/> </children> - <children xmi:type="notation:Shape" xmi:id="_ZKu4kIksEeW4O_q_qVZCoA" type="3017"> + <children xmi:type="notation:Shape" xmi:id="_c4vys8i3EeWmOPJtQdIfcQ" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="uml.uml#_ZKr1QIksEeW4O_q_qVZCoA"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_ZKu4kYksEeW4O_q_qVZCoA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_c4vytMi3EeWmOPJtQdIfcQ"/> </children> - <styles xmi:type="notation:TitleStyle" xmi:id="_3YUG8okrEeW4O_q_qVZCoA"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_3YUG84krEeW4O_q_qVZCoA"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_3YUG9IkrEeW4O_q_qVZCoA"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3YUG9YkrEeW4O_q_qVZCoA"/> + <styles xmi:type="notation:TitleStyle" xmi:id="_c4vytci3EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_c4vytsi3EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_c4vyt8i3EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c4vyuMi3EeWmOPJtQdIfcQ"/> </children> <element xmi:type="uml:Enumeration" href="uml.uml#_3X-vwIkrEeW4O_q_qVZCoA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3YS40IkrEeW4O_q_qVZCoA" x="161" y="107"/> </children> - <children xmi:type="notation:Shape" xmi:id="_3jA7EIkrEeW4O_q_qVZCoA" type="2006"> - <children xmi:type="notation:DecorationNode" xmi:id="_3jA7EokrEeW4O_q_qVZCoA" type="5023"/> - <children xmi:type="notation:DecorationNode" xmi:id="_3jA7E4krEeW4O_q_qVZCoA" type="8508"> + <children xmi:type="notation:Shape" xmi:id="_3jA7EIkrEeW4O_q_qVZCoA" type="Enumeration_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_3jA7EokrEeW4O_q_qVZCoA" type="Enumeration_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_3jA7E4krEeW4O_q_qVZCoA" type="Enumeration_FloatingNameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_3jA7FIkrEeW4O_q_qVZCoA" y="5"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_3jA7FYkrEeW4O_q_qVZCoA" type="7015"> - <children xmi:type="notation:Shape" xmi:id="_Y8EKcIksEeW4O_q_qVZCoA" type="3017"> + <children xmi:type="notation:BasicCompartment" xmi:id="_c4yO8Mi3EeWmOPJtQdIfcQ" type="Enumeration_LiteralCompartment"> + <children xmi:type="notation:Shape" xmi:id="_c4yO8ci3EeWmOPJtQdIfcQ" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="uml.uml#_Y7-q4IksEeW4O_q_qVZCoA"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_Y8EKcYksEeW4O_q_qVZCoA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_c4yO8si3EeWmOPJtQdIfcQ"/> </children> - <children xmi:type="notation:Shape" xmi:id="_Ze-DMIksEeW4O_q_qVZCoA" type="3017"> + <children xmi:type="notation:Shape" xmi:id="_c4yO88i3EeWmOPJtQdIfcQ" type="EnumerationLiteral_LiteralLabel"> <element xmi:type="uml:EnumerationLiteral" href="uml.uml#_Ze5xwIksEeW4O_q_qVZCoA"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_Ze-DMYksEeW4O_q_qVZCoA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_c4yO9Mi3EeWmOPJtQdIfcQ"/> </children> - <styles xmi:type="notation:TitleStyle" xmi:id="_3jA7FokrEeW4O_q_qVZCoA"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_3jA7F4krEeW4O_q_qVZCoA"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_3jA7GIkrEeW4O_q_qVZCoA"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3jA7GYkrEeW4O_q_qVZCoA"/> + <styles xmi:type="notation:TitleStyle" xmi:id="_c4yO9ci3EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_c4yO9si3EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_c4yO98i3EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c4yO-Mi3EeWmOPJtQdIfcQ"/> </children> <element xmi:type="uml:Enumeration" href="uml.uml#_3iq80IkrEeW4O_q_qVZCoA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3jA7EYkrEeW4O_q_qVZCoA" x="521" y="117"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_iPu8EWzOEeWw3Lk1FWCieQ" name="diagram_compatibility_version" stringValue="1.1.0"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_iPu8EWzOEeWw3Lk1FWCieQ" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_iPu8EmzOEeWw3Lk1FWCieQ"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_iPu8E2zOEeWw3Lk1FWCieQ"> <owner xmi:type="uml:Model" href="uml.uml#_uGj_YGw6EeWDCZ2SxMaACA"/> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/copyPaste/ConstraintPasteStrategy.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/copyPaste/ConstraintPasteStrategy.notation index c7eb0c853b6..e3a71a21593 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/copyPaste/ConstraintPasteStrategy.notation +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/copyPaste/ConstraintPasteStrategy.notation @@ -1,31 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> <notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_MQtE8ODIEeOARK60pOvVqQ" type="PapyrusUMLClassDiagram" name="ConstraintClassDiagram" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_N2U-8ODIEeOARK60pOvVqQ" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_N2nS0ODIEeOARK60pOvVqQ" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_N22jYODIEeOARK60pOvVqQ" type="7017"> - <styles xmi:type="notation:TitleStyle" xmi:id="_N22jYeDIEeOARK60pOvVqQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_N22jYuDIEeOARK60pOvVqQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_N22jY-DIEeOARK60pOvVqQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N22jZODIEeOARK60pOvVqQ"/> + <children xmi:type="notation:Shape" xmi:id="_N2U-8ODIEeOARK60pOvVqQ" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_N2nS0ODIEeOARK60pOvVqQ" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_3tGmAMi3EeWmOPJtQdIfcQ" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_3tGmAci3EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_3tGmAsi3EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_3tGmA8i3EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3tGmBMi3EeWmOPJtQdIfcQ"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_N22jZeDIEeOARK60pOvVqQ" type="7018"> - <styles xmi:type="notation:TitleStyle" xmi:id="_N22jZuDIEeOARK60pOvVqQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_N22jZ-DIEeOARK60pOvVqQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_N22jaODIEeOARK60pOvVqQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N22jaeDIEeOARK60pOvVqQ"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_3tGmBci3EeWmOPJtQdIfcQ" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_3tGmBsi3EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_3tGmB8i3EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_3tGmCMi3EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3tGmCci3EeWmOPJtQdIfcQ"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_N23KcODIEeOARK60pOvVqQ" type="7019"> - <styles xmi:type="notation:TitleStyle" xmi:id="_N23KceDIEeOARK60pOvVqQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_N23KcuDIEeOARK60pOvVqQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_N23Kc-DIEeOARK60pOvVqQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N23KdODIEeOARK60pOvVqQ"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_3tGmCsi3EeWmOPJtQdIfcQ" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_3tGmC8i3EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_3tGmDMi3EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_3tGmDci3EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3tGmDsi3EeWmOPJtQdIfcQ"/> </children> <element xmi:type="uml:Class" href="ConstraintPasteStrategy.uml#_N0UMwODIEeOARK60pOvVqQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N2U-8eDIEeOARK60pOvVqQ" x="391" y="110"/> </children> - <children xmi:type="notation:Shape" xmi:id="_OQWogODIEeOARK60pOvVqQ" type="2011"> - <children xmi:type="notation:DecorationNode" xmi:id="_OQXPkODIEeOARK60pOvVqQ" type="5037"/> - <children xmi:type="notation:DecorationNode" xmi:id="_OQXPkeDIEeOARK60pOvVqQ" type="5159"/> + <children xmi:type="notation:Shape" xmi:id="_OQWogODIEeOARK60pOvVqQ" type="Constraint_PackagedElementShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_OQXPkODIEeOARK60pOvVqQ" type="Constraint_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_OQXPkeDIEeOARK60pOvVqQ" type="Constraint_BodyLabel"/> <element xmi:type="uml:Constraint" href="ConstraintPasteStrategy.uml#_OQJ0MODIEeOARK60pOvVqQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OQWogeDIEeOARK60pOvVqQ" x="78" y="152"/> </children> @@ -33,9 +33,10 @@ <styles xmi:type="style:PapyrusViewStyle" xmi:id="_MQtE8uDIEeOARK60pOvVqQ"> <owner xmi:type="uml:Model" href="ConstraintPasteStrategy.uml#_ML1zEODIEeOARK60pOvVqQ"/> </styles> + <styles xmi:type="notation:StringValueStyle" xmi:id="_4VSAUMi3EeWmOPJtQdIfcQ" name="diagram_compatibility_version" stringValue="1.2.0"/> <element xmi:type="uml:Model" href="ConstraintPasteStrategy.uml#_ML1zEODIEeOARK60pOvVqQ"/> - <edges xmi:type="notation:Connector" xmi:id="_OaMhAODIEeOARK60pOvVqQ" type="8500" source="_OQWogODIEeOARK60pOvVqQ" target="_N2U-8ODIEeOARK60pOvVqQ"> - <children xmi:type="notation:DecorationNode" xmi:id="_OaNIEODIEeOARK60pOvVqQ" type="8501"> + <edges xmi:type="notation:Connector" xmi:id="_OaMhAODIEeOARK60pOvVqQ" type="Constraint_ContextEdge" source="_OQWogODIEeOARK60pOvVqQ" target="_N2U-8ODIEeOARK60pOvVqQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_OaNIEODIEeOARK60pOvVqQ" type="Constraint_KeywordLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_OaNIEeDIEeOARK60pOvVqQ" y="15"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_OaMhAeDIEeOARK60pOvVqQ"/> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/testInstanceSpecificationLink/model.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/testInstanceSpecificationLink/model.notation index 8f5fd1d9e85..252b0acdf7d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/testInstanceSpecificationLink/model.notation +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/testInstanceSpecificationLink/model.notation @@ -1,167 +1,167 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <notation:Diagram xmi:id="_eVKSUG_2EeSvZv9bRuRjlg" type="PapyrusUMLClassDiagram" name="DC" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_fw9h8G_2EeSvZv9bRuRjlg" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_fxRrAG_2EeSvZv9bRuRjlg" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_fxqFgG_2EeSvZv9bRuRjlg" type="7017"> - <styles xmi:type="notation:TitleStyle" xmi:id="_fxqskG_2EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_fxqskW_2EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_fxqskm_2EeSvZv9bRuRjlg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fxqsk2_2EeSvZv9bRuRjlg"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_fxr6sG_2EeSvZv9bRuRjlg" type="7018"> - <styles xmi:type="notation:TitleStyle" xmi:id="_fxr6sW_2EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_fxr6sm_2EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_fxr6s2_2EeSvZv9bRuRjlg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fxr6tG_2EeSvZv9bRuRjlg"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_fxshwG_2EeSvZv9bRuRjlg" type="7019"> - <styles xmi:type="notation:TitleStyle" xmi:id="_fxshwW_2EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_fxshwm_2EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_fxshw2_2EeSvZv9bRuRjlg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fxshxG_2EeSvZv9bRuRjlg"/> + <children xmi:type="notation:Shape" xmi:id="_fw9h8G_2EeSvZv9bRuRjlg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_fxRrAG_2EeSvZv9bRuRjlg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhd9sMi4EeWmOPJtQdIfcQ" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhd9sci4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhd9ssi4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhd9s8i4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhd9tMi4EeWmOPJtQdIfcQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhekwMi4EeWmOPJtQdIfcQ" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhekwci4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhekwsi4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhekw8i4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhekxMi4EeWmOPJtQdIfcQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhekxci4EeWmOPJtQdIfcQ" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhekxsi4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhekx8i4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhekyMi4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhekyci4EeWmOPJtQdIfcQ"/> </children> <element xmi:type="uml:Class" href="model.uml#_ftLOIG_2EeSvZv9bRuRjlg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fw9h8W_2EeSvZv9bRuRjlg" x="24" y="19" width="132" height="96"/> </children> - <children xmi:type="notation:Shape" xmi:id="_q9z04G_2EeSvZv9bRuRjlg" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_q97JoG_2EeSvZv9bRuRjlg" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_q9-M8G_2EeSvZv9bRuRjlg" type="7017"> - <styles xmi:type="notation:TitleStyle" xmi:id="_q9-M8W_2EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_q9-M8m_2EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_q9-0AG_2EeSvZv9bRuRjlg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q9-0AW_2EeSvZv9bRuRjlg"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_q-DsgG_2EeSvZv9bRuRjlg" type="7018"> - <styles xmi:type="notation:TitleStyle" xmi:id="_q-DsgW_2EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_q-ETkG_2EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_q-ETkW_2EeSvZv9bRuRjlg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q-ETkm_2EeSvZv9bRuRjlg"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_q-KaMG_2EeSvZv9bRuRjlg" type="7019"> - <styles xmi:type="notation:TitleStyle" xmi:id="_q-LoUG_2EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_q-MPYG_2EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_q-MPYW_2EeSvZv9bRuRjlg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q-MPYm_2EeSvZv9bRuRjlg"/> + <children xmi:type="notation:Shape" xmi:id="_q9z04G_2EeSvZv9bRuRjlg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_q97JoG_2EeSvZv9bRuRjlg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhekysi4EeWmOPJtQdIfcQ" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jheky8i4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhekzMi4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhekzci4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhekzsi4EeWmOPJtQdIfcQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhekz8i4EeWmOPJtQdIfcQ" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhek0Mi4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhek0ci4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhek0si4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhek08i4EeWmOPJtQdIfcQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhek1Mi4EeWmOPJtQdIfcQ" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhek1ci4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhek1si4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhek18i4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhek2Mi4EeWmOPJtQdIfcQ"/> </children> <element xmi:type="uml:Class" href="model.uml#_q9LiwG_2EeSvZv9bRuRjlg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q90b8G_2EeSvZv9bRuRjlg" x="422" y="17" width="139" height="94"/> </children> - <children xmi:type="notation:Shape" xmi:id="_SHdJ4G_3EeSvZv9bRuRjlg" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_SHeYAG_3EeSvZv9bRuRjlg" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_SHe_EG_3EeSvZv9bRuRjlg" type="7017"> - <styles xmi:type="notation:TitleStyle" xmi:id="_SHe_EW_3EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_SHe_Em_3EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_SHe_E2_3EeSvZv9bRuRjlg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SHe_FG_3EeSvZv9bRuRjlg"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_SHfmIG_3EeSvZv9bRuRjlg" type="7018"> - <styles xmi:type="notation:TitleStyle" xmi:id="_SHfmIW_3EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_SHfmIm_3EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_SHfmI2_3EeSvZv9bRuRjlg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SHfmJG_3EeSvZv9bRuRjlg"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_SHgNMG_3EeSvZv9bRuRjlg" type="7019"> - <styles xmi:type="notation:TitleStyle" xmi:id="_SHgNMW_3EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_SHgNMm_3EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_SHgNM2_3EeSvZv9bRuRjlg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SHgNNG_3EeSvZv9bRuRjlg"/> + <children xmi:type="notation:Shape" xmi:id="_SHdJ4G_3EeSvZv9bRuRjlg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_SHeYAG_3EeSvZv9bRuRjlg" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhfL0Mi4EeWmOPJtQdIfcQ" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhfL0ci4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhfL0si4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhfL08i4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhfL1Mi4EeWmOPJtQdIfcQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhfL1ci4EeWmOPJtQdIfcQ" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhfL1si4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhfL18i4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhfL2Mi4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhfL2ci4EeWmOPJtQdIfcQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhfL2si4EeWmOPJtQdIfcQ" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhfL28i4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhfL3Mi4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhfL3ci4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhfL3si4EeWmOPJtQdIfcQ"/> </children> <element xmi:type="uml:Class" href="model.uml#_SHXqUG_3EeSvZv9bRuRjlg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SHdJ4W_3EeSvZv9bRuRjlg" x="423" y="228" width="132" height="97"/> </children> - <children xmi:type="notation:Shape" xmi:id="_dn6REHDCEeSAifI4sMbueQ" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_dn-igHDCEeSAifI4sMbueQ" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_dn_JkHDCEeSAifI4sMbueQ" type="7017"> - <styles xmi:type="notation:TitleStyle" xmi:id="_dn_JkXDCEeSAifI4sMbueQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_dn_JknDCEeSAifI4sMbueQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_dn_Jk3DCEeSAifI4sMbueQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dn_JlHDCEeSAifI4sMbueQ"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_dn_woHDCEeSAifI4sMbueQ" type="7018"> - <styles xmi:type="notation:TitleStyle" xmi:id="_dn_woXDCEeSAifI4sMbueQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_dn_wonDCEeSAifI4sMbueQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_dn_wo3DCEeSAifI4sMbueQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dn_wpHDCEeSAifI4sMbueQ"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_doAXsHDCEeSAifI4sMbueQ" type="7019"> - <styles xmi:type="notation:TitleStyle" xmi:id="_doAXsXDCEeSAifI4sMbueQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_doAXsnDCEeSAifI4sMbueQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_doAXs3DCEeSAifI4sMbueQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_doAXtHDCEeSAifI4sMbueQ"/> + <children xmi:type="notation:Shape" xmi:id="_dn6REHDCEeSAifI4sMbueQ" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_dn-igHDCEeSAifI4sMbueQ" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhfL38i4EeWmOPJtQdIfcQ" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhfL4Mi4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhfL4ci4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhfL4si4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhfL48i4EeWmOPJtQdIfcQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhfL5Mi4EeWmOPJtQdIfcQ" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhfL5ci4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhfL5si4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhfL58i4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhfL6Mi4EeWmOPJtQdIfcQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhfL6ci4EeWmOPJtQdIfcQ" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhfL6si4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhfL68i4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhfL7Mi4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhfL7ci4EeWmOPJtQdIfcQ"/> </children> <element xmi:type="uml:Class" href="model.uml#_dXcMIHDCEeSAifI4sMbueQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dn6REXDCEeSAifI4sMbueQ" x="787" y="12" width="177" height="97"/> </children> - <children xmi:type="notation:Shape" xmi:id="_gb_iQHDCEeSAifI4sMbueQ" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_gcClkHDCEeSAifI4sMbueQ" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_gcFB0HDCEeSAifI4sMbueQ" type="7017"> - <styles xmi:type="notation:TitleStyle" xmi:id="_gcFB0XDCEeSAifI4sMbueQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_gcFB0nDCEeSAifI4sMbueQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_gcFB03DCEeSAifI4sMbueQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gcFB1HDCEeSAifI4sMbueQ"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_gcG3AHDCEeSAifI4sMbueQ" type="7018"> - <styles xmi:type="notation:TitleStyle" xmi:id="_gcG3AXDCEeSAifI4sMbueQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_gcG3AnDCEeSAifI4sMbueQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_gcG3A3DCEeSAifI4sMbueQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gcG3BHDCEeSAifI4sMbueQ"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_gcIsMHDCEeSAifI4sMbueQ" type="7019"> - <styles xmi:type="notation:TitleStyle" xmi:id="_gcIsMXDCEeSAifI4sMbueQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_gcIsMnDCEeSAifI4sMbueQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_gcIsM3DCEeSAifI4sMbueQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gcIsNHDCEeSAifI4sMbueQ"/> + <children xmi:type="notation:Shape" xmi:id="_gb_iQHDCEeSAifI4sMbueQ" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_gcClkHDCEeSAifI4sMbueQ" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhfL7si4EeWmOPJtQdIfcQ" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhfL78i4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhfL8Mi4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhfL8ci4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhfL8si4EeWmOPJtQdIfcQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhfy4Mi4EeWmOPJtQdIfcQ" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhfy4ci4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhfy4si4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhfy48i4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhfy5Mi4EeWmOPJtQdIfcQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhfy5ci4EeWmOPJtQdIfcQ" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhfy5si4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhfy58i4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhfy6Mi4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhfy6ci4EeWmOPJtQdIfcQ"/> </children> <element xmi:type="uml:Class" href="model.uml#_gb1KMHDCEeSAifI4sMbueQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gcAJUHDCEeSAifI4sMbueQ" x="824" y="206" width="153" height="89"/> </children> - <children xmi:type="notation:Shape" xmi:id="_OpcNAHDKEeSAifI4sMbueQ" type="2008"> - <children xmi:type="notation:DecorationNode" xmi:id="_OpepQHDKEeSAifI4sMbueQ" type="5029"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_OpfQUHDKEeSAifI4sMbueQ" type="7017"> - <styles xmi:type="notation:TitleStyle" xmi:id="_OpfQUXDKEeSAifI4sMbueQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_OpfQUnDKEeSAifI4sMbueQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_OpfQU3DKEeSAifI4sMbueQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OpfQVHDKEeSAifI4sMbueQ"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_OpgecHDKEeSAifI4sMbueQ" type="7018"> - <styles xmi:type="notation:TitleStyle" xmi:id="_OphFgHDKEeSAifI4sMbueQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_OphFgXDKEeSAifI4sMbueQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_OphFgnDKEeSAifI4sMbueQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OphFg3DKEeSAifI4sMbueQ"/> - </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_OpiToHDKEeSAifI4sMbueQ" type="7019"> - <styles xmi:type="notation:TitleStyle" xmi:id="_OpiToXDKEeSAifI4sMbueQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_OpiTonDKEeSAifI4sMbueQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_OpiTo3DKEeSAifI4sMbueQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OpiTpHDKEeSAifI4sMbueQ"/> + <children xmi:type="notation:Shape" xmi:id="_OpcNAHDKEeSAifI4sMbueQ" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_OpepQHDKEeSAifI4sMbueQ" type="Class_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhfy6si4EeWmOPJtQdIfcQ" type="Class_AttributeCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhfy68i4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhfy7Mi4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhfy7ci4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhfy7si4EeWmOPJtQdIfcQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhfy78i4EeWmOPJtQdIfcQ" type="Class_OperationCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhfy8Mi4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhfy8ci4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhfy8si4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhfy88i4EeWmOPJtQdIfcQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_jhfy9Mi4EeWmOPJtQdIfcQ" type="Class_NestedClassifierCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jhfy9ci4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_jhfy9si4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_jhfy98i4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhfy-Mi4EeWmOPJtQdIfcQ"/> </children> <element xmi:type="uml:Class" href="model.uml#_OpTDEHDKEeSAifI4sMbueQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OpcNAXDKEeSAifI4sMbueQ" x="1088" y="94" width="158" height="117"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_eVK5YG_2EeSvZv9bRuRjlg" name="diagram_compatibility_version" stringValue="1.0.0"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_eVK5YG_2EeSvZv9bRuRjlg" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_eVK5YW_2EeSvZv9bRuRjlg"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_eVK5Ym_2EeSvZv9bRuRjlg"> <owner xmi:type="uml:Model" href="model.uml#_rCNpMG_1EeSvZv9bRuRjlg"/> </styles> <element xmi:type="uml:Model" href="model.uml#_rCNpMG_1EeSvZv9bRuRjlg"/> - <edges xmi:type="notation:Connector" xmi:id="_bxF9oG_3EeSvZv9bRuRjlg" type="4001" source="_fw9h8G_2EeSvZv9bRuRjlg" target="_q9z04G_2EeSvZv9bRuRjlg"> - <children xmi:type="notation:DecorationNode" xmi:id="_bxJoAG_3EeSvZv9bRuRjlg" type="6001"> + <edges xmi:type="notation:Connector" xmi:id="_bxF9oG_3EeSvZv9bRuRjlg" type="Association_Edge" source="_fw9h8G_2EeSvZv9bRuRjlg" target="_q9z04G_2EeSvZv9bRuRjlg"> + <children xmi:type="notation:DecorationNode" xmi:id="_bxJoAG_3EeSvZv9bRuRjlg" type="Association_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_bxKPEG_3EeSvZv9bRuRjlg" y="-20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_bxLdMG_3EeSvZv9bRuRjlg" type="6002"> + <children xmi:type="notation:DecorationNode" xmi:id="_bxLdMG_3EeSvZv9bRuRjlg" type="Association_NameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_bxLdMW_3EeSvZv9bRuRjlg" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_bxMrUG_3EeSvZv9bRuRjlg" type="6003"> + <children xmi:type="notation:DecorationNode" xmi:id="_bxMrUG_3EeSvZv9bRuRjlg" type="Association_TargetRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_bxNSYG_3EeSvZv9bRuRjlg" y="-20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_bxOggG_3EeSvZv9bRuRjlg" type="6005"> + <children xmi:type="notation:DecorationNode" xmi:id="_bxOggG_3EeSvZv9bRuRjlg" type="Association_SourceRoleLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_bxPHkG_3EeSvZv9bRuRjlg" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_bxQVsG_3EeSvZv9bRuRjlg" type="6033"> + <children xmi:type="notation:DecorationNode" xmi:id="_bxQVsG_3EeSvZv9bRuRjlg" type="Association_SourceMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_bxQ8wG_3EeSvZv9bRuRjlg" y="20"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_bxSK4G_3EeSvZv9bRuRjlg" type="6034"> + <children xmi:type="notation:DecorationNode" xmi:id="_bxSK4G_3EeSvZv9bRuRjlg" type="Association_TargetMultiplicityLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_bxTZAG_3EeSvZv9bRuRjlg" y="-20"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_bxGksG_3EeSvZv9bRuRjlg"/> @@ -170,8 +170,8 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dri4IG_3EeSvZv9bRuRjlg" id="(1.0,0.59375)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_drkGQG_3EeSvZv9bRuRjlg" id="(0.02877697841726619,0.6808510638297872)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_clDxMG_3EeSvZv9bRuRjlg" type="4002" source="_SHdJ4G_3EeSvZv9bRuRjlg" target="_q9z04G_2EeSvZv9bRuRjlg"> - <children xmi:type="notation:DecorationNode" xmi:id="_clFmYG_3EeSvZv9bRuRjlg" type="6007"> + <edges xmi:type="notation:Connector" xmi:id="_clDxMG_3EeSvZv9bRuRjlg" type="Generalization_Edge" source="_SHdJ4G_3EeSvZv9bRuRjlg" target="_q9z04G_2EeSvZv9bRuRjlg"> + <children xmi:type="notation:DecorationNode" xmi:id="_clFmYG_3EeSvZv9bRuRjlg" type="Generalization_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_clGNcG_3EeSvZv9bRuRjlg" y="40"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_clDxMW_3EeSvZv9bRuRjlg"/> @@ -180,8 +180,8 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dsU7QG_3EeSvZv9bRuRjlg" id="(0.14393939393939395,0.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dsWJYG_3EeSvZv9bRuRjlg" id="(0.19424460431654678,0.9574468085106383)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_fzMc4HDCEeSAifI4sMbueQ" type="4002" source="_q9z04G_2EeSvZv9bRuRjlg" target="_dn6REHDCEeSAifI4sMbueQ"> - <children xmi:type="notation:DecorationNode" xmi:id="_fzPgMHDCEeSAifI4sMbueQ" type="6007"> + <edges xmi:type="notation:Connector" xmi:id="_fzMc4HDCEeSAifI4sMbueQ" type="Generalization_Edge" source="_q9z04G_2EeSvZv9bRuRjlg" target="_dn6REHDCEeSAifI4sMbueQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_fzPgMHDCEeSAifI4sMbueQ" type="Generalization_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_fzQuUHDCEeSAifI4sMbueQ" y="40"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_fzMc4XDCEeSAifI4sMbueQ"/> @@ -190,8 +190,8 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fz_uIHDCEeSAifI4sMbueQ" id="(0.7841726618705036,0.5425531914893617)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f0A8QHDCEeSAifI4sMbueQ" id="(0.1694915254237288,0.4948453608247423)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_hjShgHDCEeSAifI4sMbueQ" type="4002" source="_dn6REHDCEeSAifI4sMbueQ" target="_gb_iQHDCEeSAifI4sMbueQ"> - <children xmi:type="notation:DecorationNode" xmi:id="_hjYoIHDCEeSAifI4sMbueQ" type="6007"> + <edges xmi:type="notation:Connector" xmi:id="_hjShgHDCEeSAifI4sMbueQ" type="Generalization_Edge" source="_dn6REHDCEeSAifI4sMbueQ" target="_gb_iQHDCEeSAifI4sMbueQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_hjYoIHDCEeSAifI4sMbueQ" type="Generalization_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_hjZPMHDCEeSAifI4sMbueQ" y="40"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_hjShgXDCEeSAifI4sMbueQ"/> @@ -199,8 +199,8 @@ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hjShgnDCEeSAifI4sMbueQ" points="[-2, 10, 34, -141]$[41, 148, 77, -3]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hkv6EHDCEeSAifI4sMbueQ" id="(0.8418079096045198,0.8969072164948454)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_Kxj8gHDKEeSAifI4sMbueQ" type="4002" source="_SHdJ4G_3EeSvZv9bRuRjlg" target="_gb_iQHDCEeSAifI4sMbueQ"> - <children xmi:type="notation:DecorationNode" xmi:id="_Kxm_0HDKEeSAifI4sMbueQ" type="6007"> + <edges xmi:type="notation:Connector" xmi:id="_Kxj8gHDKEeSAifI4sMbueQ" type="Generalization_Edge" source="_SHdJ4G_3EeSvZv9bRuRjlg" target="_gb_iQHDCEeSAifI4sMbueQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_Kxm_0HDKEeSAifI4sMbueQ" type="Generalization_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_KxoN8HDKEeSAifI4sMbueQ" y="40"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_Kxj8gXDKEeSAifI4sMbueQ"/> @@ -209,8 +209,8 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KyrW0HDKEeSAifI4sMbueQ" id="(0.8939393939393939,0.3711340206185567)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Kysk8HDKEeSAifI4sMbueQ" id="(0.24836601307189543,0.5056179775280899)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_PTaXEHDKEeSAifI4sMbueQ" type="4002" source="_gb_iQHDCEeSAifI4sMbueQ" target="_OpcNAHDKEeSAifI4sMbueQ"> - <children xmi:type="notation:DecorationNode" xmi:id="_PTblMHDKEeSAifI4sMbueQ" type="6007"> + <edges xmi:type="notation:Connector" xmi:id="_PTaXEHDKEeSAifI4sMbueQ" type="Generalization_Edge" source="_gb_iQHDCEeSAifI4sMbueQ" target="_OpcNAHDKEeSAifI4sMbueQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_PTblMHDKEeSAifI4sMbueQ" type="Generalization_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_PTblMXDKEeSAifI4sMbueQ" y="40"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_PTaXEXDKEeSAifI4sMbueQ"/> @@ -218,8 +218,8 @@ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PTaXEnDKEeSAifI4sMbueQ" points="[77, -20, -129, 34]$[188, -42, -18, 12]"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PTl9QHDKEeSAifI4sMbueQ" id="(0.11392405063291139,0.8717948717948718)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_PvEYUHDKEeSAifI4sMbueQ" type="4002" source="_OpcNAHDKEeSAifI4sMbueQ" target="_dn6REHDCEeSAifI4sMbueQ"> - <children xmi:type="notation:DecorationNode" xmi:id="_PvHboHDKEeSAifI4sMbueQ" type="6007"> + <edges xmi:type="notation:Connector" xmi:id="_PvEYUHDKEeSAifI4sMbueQ" type="Generalization_Edge" source="_OpcNAHDKEeSAifI4sMbueQ" target="_dn6REHDCEeSAifI4sMbueQ"> + <children xmi:type="notation:DecorationNode" xmi:id="_PvHboHDKEeSAifI4sMbueQ" type="Generalization_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_PvICsHDKEeSAifI4sMbueQ" y="40"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_PvEYUXDKEeSAifI4sMbueQ"/> @@ -230,40 +230,40 @@ </edges> </notation:Diagram> <notation:Diagram xmi:id="_h2RMIG_3EeSvZv9bRuRjlg" type="PapyrusUMLClassDiagram" name="DI" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_jdzxsG_3EeSvZv9bRuRjlg" type="2001"> - <children xmi:type="notation:DecorationNode" xmi:id="_jd0_0G_3EeSvZv9bRuRjlg" type="5002"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_jd1m4G_3EeSvZv9bRuRjlg" type="7001"> - <styles xmi:type="notation:TitleStyle" xmi:id="_jd1m4W_3EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_jd1m4m_3EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_jd1m42_3EeSvZv9bRuRjlg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jd1m5G_3EeSvZv9bRuRjlg"/> + <children xmi:type="notation:Shape" xmi:id="_jdzxsG_3EeSvZv9bRuRjlg" type="InstanceSpecification_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_jd0_0G_3EeSvZv9bRuRjlg" type="InstanceSpecification_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_kDbbQMi4EeWmOPJtQdIfcQ" type="InstanceSpecification_SlotCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kDbbQci4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_kDbbQsi4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_kDbbQ8i4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kDbbRMi4EeWmOPJtQdIfcQ"/> </children> <element xmi:type="uml:InstanceSpecification" href="model.uml#_jdWesG_3EeSvZv9bRuRjlg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jdzxsW_3EeSvZv9bRuRjlg" x="122" y="253" width="119" height="68"/> </children> - <children xmi:type="notation:Shape" xmi:id="_IP6LEG_5EeSvZv9bRuRjlg" type="2001"> - <children xmi:type="notation:DecorationNode" xmi:id="_IP7ZMG_5EeSvZv9bRuRjlg" type="5002"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_IP8AQG_5EeSvZv9bRuRjlg" type="7001"> - <styles xmi:type="notation:TitleStyle" xmi:id="_IP8AQW_5EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_IP8AQm_5EeSvZv9bRuRjlg"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_IP8AQ2_5EeSvZv9bRuRjlg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IP8ARG_5EeSvZv9bRuRjlg"/> + <children xmi:type="notation:Shape" xmi:id="_IP6LEG_5EeSvZv9bRuRjlg" type="InstanceSpecification_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_IP7ZMG_5EeSvZv9bRuRjlg" type="InstanceSpecification_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_kDcCUMi4EeWmOPJtQdIfcQ" type="InstanceSpecification_SlotCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kDcCUci4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_kDcCUsi4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_kDcCU8i4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kDcCVMi4EeWmOPJtQdIfcQ"/> </children> <element xmi:type="uml:InstanceSpecification" href="model.uml#_IPy2UG_5EeSvZv9bRuRjlg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IP6LEW_5EeSvZv9bRuRjlg" x="549" y="86" width="111" height="54"/> </children> - <children xmi:type="notation:Shape" xmi:id="_RXXoUHDJEeSAifI4sMbueQ" type="2001"> - <children xmi:type="notation:DecorationNode" xmi:id="_RXY2cHDJEeSAifI4sMbueQ" type="5002"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_RXY2cXDJEeSAifI4sMbueQ" type="7001"> - <styles xmi:type="notation:TitleStyle" xmi:id="_RXY2cnDJEeSAifI4sMbueQ"/> - <styles xmi:type="notation:SortingStyle" xmi:id="_RXY2c3DJEeSAifI4sMbueQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_RXY2dHDJEeSAifI4sMbueQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RXY2dXDJEeSAifI4sMbueQ"/> + <children xmi:type="notation:Shape" xmi:id="_RXXoUHDJEeSAifI4sMbueQ" type="InstanceSpecification_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_RXY2cHDJEeSAifI4sMbueQ" type="InstanceSpecification_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_kDcCVci4EeWmOPJtQdIfcQ" type="InstanceSpecification_SlotCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kDcCVsi4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_kDcCV8i4EeWmOPJtQdIfcQ"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_kDcCWMi4EeWmOPJtQdIfcQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kDcCWci4EeWmOPJtQdIfcQ"/> </children> <element xmi:type="uml:InstanceSpecification" href="model.uml#_RXSIwHDJEeSAifI4sMbueQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RXXoUXDJEeSAifI4sMbueQ" x="551" y="260" width="156" height="59"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_h2RMIW_3EeSvZv9bRuRjlg" name="diagram_compatibility_version" stringValue="1.0.0"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_h2RMIW_3EeSvZv9bRuRjlg" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_h2RMIm_3EeSvZv9bRuRjlg"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_h2RMI2_3EeSvZv9bRuRjlg"> <owner xmi:type="uml:Model" href="model.uml#_rCNpMG_1EeSvZv9bRuRjlg"/> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestAppearanceClassDiagramTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestAppearanceClassDiagramTopNode.java index 9ba4c0b3a5b..1866d72ee63 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestAppearanceClassDiagramTopNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestAppearanceClassDiagramTopNode.java @@ -50,7 +50,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageComponent() { - testAppearance(UMLElementTypes.Component_2002); + testAppearance(UMLElementTypes.Component_Shape); } /** @@ -58,7 +58,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageInstanceSpecification() { - testAppearance(UMLElementTypes.InstanceSpecification_2001); + testAppearance(UMLElementTypes.InstanceSpecification_Shape); } /** @@ -66,7 +66,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageSignal() { - testAppearance(UMLElementTypes.Signal_2003); + testAppearance(UMLElementTypes.Signal_Shape); } /** @@ -74,7 +74,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageModel() { - testAppearance(UMLElementTypes.Model_2005); + testAppearance(UMLElementTypes.Model_Shape); } /** @@ -82,7 +82,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageEnumeration() { - testAppearance(UMLElementTypes.Enumeration_2006); + testAppearance(UMLElementTypes.Enumeration_Shape); } /** @@ -90,7 +90,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageIPackage() { - testAppearance(UMLElementTypes.Package_2007); + testAppearance(UMLElementTypes.Package_Shape); } /** @@ -98,7 +98,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageClass() { - testAppearance(UMLElementTypes.Class_2008); + testAppearance(UMLElementTypes.Class_Shape); } /** @@ -106,7 +106,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManagePrimitiveType() { - testAppearance(UMLElementTypes.PrimitiveType_2009); + testAppearance(UMLElementTypes.PrimitiveType_Shape); } /** @@ -114,7 +114,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageDataType() { - testAppearance(UMLElementTypes.DataType_2010); + testAppearance(UMLElementTypes.DataType_Shape); } /** @@ -122,7 +122,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageConstraint() { - testAppearance(UMLElementTypes.Constraint_2011); + testAppearance(UMLElementTypes.Constraint_PackagedElementShape); } /** @@ -130,7 +130,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageComment() { - testAppearance(UMLElementTypes.Comment_2012); + testAppearance(UMLElementTypes.Comment_Shape); } /** @@ -138,7 +138,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageInformationItem() { - testAppearance(UMLElementTypes.InformationItem_2099); + testAppearance(UMLElementTypes.InformationItem_Shape); } /** @@ -146,7 +146,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageInterface() { - testAppearance(UMLElementTypes.Interface_2004); + testAppearance(UMLElementTypes.Interface_Shape); } /** @@ -154,7 +154,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageTimeObservation() { - testAppearance(UMLElementTypes.TimeObservation_2096); + testAppearance(UMLElementTypes.TimeObservation_Shape); } /** @@ -162,7 +162,7 @@ public class TestAppearanceClassDiagramTopNode extends AbstractAppearanceNodeTes */ @Test public void testToManageDurationObservation() { - testAppearance(UMLElementTypes.DurationObservation_2095); + testAppearance(UMLElementTypes.DurationObservation_Shape); } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramAssociationClass.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramAssociationClass.java index ecdc88c7c3f..9caba5353ff 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramAssociationClass.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramAssociationClass.java @@ -34,7 +34,7 @@ public class TestClassDiagramAssociationClass extends TestLink { @Test
public void testManageAssociationClass() {
- testToManageLink(UMLElementTypes.Class_2008, UMLElementTypes.Class_2008, UMLElementTypes.AssociationClass_4017, UMLElementTypes.Package_2007, true);
+ testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.AssociationClass_Edge, UMLElementTypes.Package_Shape, true);
}
@Override
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramAssociationLinkSemantic.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramAssociationLinkSemantic.java index f4a87633d15..78acf6384bc 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramAssociationLinkSemantic.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramAssociationLinkSemantic.java @@ -49,19 +49,19 @@ public class TestClassDiagramAssociationLinkSemantic extends AbstractPapyrusTest @Test public void testAssociationLink() { - IGraphicalEditPart source = createChild(UMLElementTypes.Class_2008, getDiagramEditPart(), 0); - IGraphicalEditPart target = createChild(UMLElementTypes.Class_2008, getDiagramEditPart(), 1); + IGraphicalEditPart source = createChild(UMLElementTypes.Class_Shape, getDiagramEditPart(), 0); + IGraphicalEditPart target = createChild(UMLElementTypes.Class_Shape, getDiagramEditPart(), 1); Association association = createAssociation(source, target); checkAssociationSemantic(source, target, association); } @Test public void testAssociationLinkReorient() { - IGraphicalEditPart source = createChild(UMLElementTypes.Class_2008, getDiagramEditPart(), 0); - IGraphicalEditPart target = createChild(UMLElementTypes.Class_2008, getDiagramEditPart(), 1); + IGraphicalEditPart source = createChild(UMLElementTypes.Class_Shape, getDiagramEditPart(), 0); + IGraphicalEditPart target = createChild(UMLElementTypes.Class_Shape, getDiagramEditPart(), 1); Association association = createAssociation(source, target); checkAssociationSemantic(source, target, association); - IGraphicalEditPart newSource = createChild(UMLElementTypes.Class_2008, getDiagramEditPart(), 2); + IGraphicalEditPart newSource = createChild(UMLElementTypes.Class_Shape, getDiagramEditPart(), 2); IElementEditService service = ElementEditServiceUtils.getCommandProvider(association); ReorientRelationshipRequest req = new ReorientRelationshipRequest(getEditingDomain(), association, newSource.resolveSemanticElement(), source.resolveSemanticElement(), ReorientRequest.REORIENT_SOURCE); ICommand cmd = service.getEditCommand(req); @@ -116,7 +116,7 @@ public class TestClassDiagramAssociationLinkSemantic extends AbstractPapyrusTest } private Association createAssociation(IGraphicalEditPart source, IGraphicalEditPart target) { - createLink(UMLElementTypes.Association_4001, source, target); + createLink(UMLElementTypes.Association_Edge, source, target); return findAssociation(source); } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java index 7b7e678344f..85b6d09c827 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java @@ -67,192 +67,192 @@ public class TestClassDiagramChildLabel extends TestChildLabel { @FailingTest
public void testToManageInstanceSlot() {
//instance specification
- testToManageTopNode(UMLElementTypes.InstanceSpecification_2001, UMLElementTypes.Slot_3030, InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID, "<UNDEFINED>");
+ testToManageTopNode(UMLElementTypes.InstanceSpecification_Shape, UMLElementTypes.Slot_SlotLabel, InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID, "<UNDEFINED>");
}
@Test
public void testToManageComponentProperty() {
//instance specification
- testToManageTopNodeWithMask(UMLElementTypes.Component_2002, UMLElementTypes.Property_3002, ComponentAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
+ testToManageTopNodeWithMask(UMLElementTypes.Component_Shape, UMLElementTypes.Property_ComponentAttributeLabel, ComponentAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
}
@Test
public void testToManageComponentNestedClass() {
//Class
- testToManageTopNode(UMLElementTypes.Component_2002, UMLElementTypes.Class_3004, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Class_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageComponentNestedInterface() {
//Interface
- testToManageTopNode(UMLElementTypes.Component_2002, UMLElementTypes.Interface_3037, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Interface_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageComponentNestedSignal() {
//Signal
- testToManageTopNode(UMLElementTypes.Component_2002, UMLElementTypes.Signal_3051, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Signal_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageComponentNestedDataType() {
//Data Type
- testToManageTopNode(UMLElementTypes.Component_2002, UMLElementTypes.DataType_3045, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.DataType_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageComponentNestedEnumeration() {
//Enumeration
- testToManageTopNode(UMLElementTypes.Component_2002, UMLElementTypes.Enumeration_3053, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Enumeration_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageComponentNestedPrimitiveType() {
//primitive Type
- testToManageTopNode(UMLElementTypes.Component_2002, UMLElementTypes.PrimitiveType_3046, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.PrimitiveType_ComponentNestedClassifierLabel, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageComponentOperation() {
//instance specification
- testToManageTopNodeWithMask(UMLElementTypes.Component_2002, UMLElementTypes.Operation_3003, ComponentOperationCompartmentEditPart.VISUAL_ID,null);
+ testToManageTopNodeWithMask(UMLElementTypes.Component_Shape, UMLElementTypes.Operation_ComponentOperationLabel, ComponentOperationCompartmentEditPart.VISUAL_ID,null);
}
@Test
public void testToManageSignalProperty() {
//instance specification
- testToManageTopNodeWithMask(UMLElementTypes.Signal_2003, UMLElementTypes.Property_3005, SignalAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
+ testToManageTopNodeWithMask(UMLElementTypes.Signal_Shape, UMLElementTypes.Property_SignalAttributeLabel, SignalAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
}
@Test
public void testToManageInterfaceProperty() {
//interface
- testToManageTopNodeWithMask(UMLElementTypes.Interface_2004, UMLElementTypes.Property_3006, InterfaceAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
+ testToManageTopNodeWithMask(UMLElementTypes.Interface_Shape, UMLElementTypes.Property_InterfaceAttributeLabel, InterfaceAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
}
@Test
public void testToManageInterfaceOperation() {
//interface
- testToManageTopNodeWithMask(UMLElementTypes.Interface_2004, UMLElementTypes.Operation_3007, InterfaceOperationCompartmentEditPart.VISUAL_ID,null);
+ testToManageTopNodeWithMask(UMLElementTypes.Interface_Shape, UMLElementTypes.Operation_InterfaceOperationLabel, InterfaceOperationCompartmentEditPart.VISUAL_ID,null);
}
@Test
public void testToManageInterfaceNestedClass() {
//Class
- testToManageTopNode(UMLElementTypes.Interface_2004, UMLElementTypes.Class_3008, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Class_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageInterfaceNestedInterface() {
//Interface
- testToManageTopNode(UMLElementTypes.Interface_2004, UMLElementTypes.Interface_3038, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Interface_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageInterfaceNestedSignal() {
//Signal
- testToManageTopNode(UMLElementTypes.Interface_2004, UMLElementTypes.Signal_3049, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Signal_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageInterfaceNestedDataType() {
//Data Type
- testToManageTopNode(UMLElementTypes.Interface_2004, UMLElementTypes.DataType_3043, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.DataType_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageInterfaceNestedEnumeration() {
//Enumeration
- testToManageTopNode(UMLElementTypes.Interface_2004, UMLElementTypes.Enumeration_3054, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Enumeration_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageInterfaceNestedPrimitiveType() {
//Primitive Type
- testToManageTopNode(UMLElementTypes.Interface_2004, UMLElementTypes.PrimitiveType_3048, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.PrimitiveType_InterfaceNestedClassifierLabel, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageEnumerationLiteralEnumeration() {
//Enumeration
- testToManageTopNode(UMLElementTypes.Enumeration_2006, UMLElementTypes.EnumerationLiteral_3017, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Enumeration_Shape, UMLElementTypes.EnumerationLiteral_LiteralLabel, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageClassProperty() {
//Enumeration
- testToManageTopNodeWithMask(UMLElementTypes.Class_2008, UMLElementTypes.Property_3012, ClassAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
+ testToManageTopNodeWithMask(UMLElementTypes.Class_Shape, UMLElementTypes.Property_ClassAttributeLabel, ClassAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
}
@Test
public void testToManageClassReception() {
//Enumeration
- testToManageTopNode(UMLElementTypes.Class_2008, UMLElementTypes.Reception_3011, ClassOperationCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Reception_ReceptionLabel, ClassOperationCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageClassOperation() {
//Enumeration
- testToManageTopNodeWithMask(UMLElementTypes.Class_2008, UMLElementTypes.Operation_3013, ClassOperationCompartmentEditPart.VISUAL_ID,null);
+ testToManageTopNodeWithMask(UMLElementTypes.Class_Shape, UMLElementTypes.Operation_ClassOperationLabel, ClassOperationCompartmentEditPart.VISUAL_ID,null);
}
@Test
public void testToManageClassNestedClass() {
//class
- testToManageTopNode(UMLElementTypes.Class_2008, UMLElementTypes.Class_3014, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Class_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageClassNestedInetrface() {
//Interface
- testToManageTopNode(UMLElementTypes.Class_2008, UMLElementTypes.Interface_3036, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Interface_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageClassNestedSignal() {
//Signal
- testToManageTopNode(UMLElementTypes.Class_2008, UMLElementTypes.Signal_3050, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Signal_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageClassNestedDataType() {
//Data Type
- testToManageTopNode(UMLElementTypes.Class_2008, UMLElementTypes.DataType_3044, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.DataType_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageClassNestedEnumeration() {
//Enumeration
- testToManageTopNode(UMLElementTypes.Class_2008, UMLElementTypes.Enumeration_3052, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.Enumeration_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageClassNestedPrimitiveType() {
//Primitive Type
- testToManageTopNode(UMLElementTypes.Class_2008, UMLElementTypes.PrimitiveType_3047, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Class_Shape, UMLElementTypes.PrimitiveType_ClassNestedClassifierLabel, ClassNestedClassifierCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageComponentReception() {
//class
- testToManageTopNode(UMLElementTypes.Component_2002, UMLElementTypes.Reception_3011, ComponentOperationCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Component_Shape, UMLElementTypes.Reception_ReceptionLabel, ComponentOperationCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManageInterfaceReception() {
//class
- testToManageTopNode(UMLElementTypes.Interface_2004, UMLElementTypes.Reception_3039, InterfaceOperationCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Interface_Shape, UMLElementTypes.Reception_InterfaceReceptionLabel, InterfaceOperationCompartmentEditPart.VISUAL_ID);
}
@Test
public void testToManagePrimitiveTypeProperty() {
//class
- testToManageTopNodeWithMask(UMLElementTypes.PrimitiveType_2009, UMLElementTypes.Property_3041, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
+ testToManageTopNodeWithMask(UMLElementTypes.PrimitiveType_Shape, UMLElementTypes.Property_PrimitiveTypeAttributeLabel, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID,"Attribute");
}
@Test
public void testToManagePrimitiveTypeOperation() {
//class
- testToManageTopNodeWithMask(UMLElementTypes.PrimitiveType_2009, UMLElementTypes.Operation_3042, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID,null);
+ testToManageTopNodeWithMask(UMLElementTypes.PrimitiveType_Shape, UMLElementTypes.Operation_PrimitiveTypeOperationLabel, PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID,null);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramChildNode.java index 4487be8bca5..60bc24206e0 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramChildNode.java @@ -38,7 +38,7 @@ public class TestClassDiagramChildNode extends TestChildNode { @Override protected CreateViewRequest createViewRequestShapeContainer() { - return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_2007, getDiagramEditPart().getDiagramPreferencesHint()); + return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_Shape, getDiagramEditPart().getDiagramPreferencesHint()); } @Override @@ -69,7 +69,7 @@ public class TestClassDiagramChildNode extends TestChildNode { */ @Test public void testToManageComponent() { - testToManageNode(UMLElementTypes.Component_3021, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Package_3009, true); + testToManageNode(UMLElementTypes.Component_Shape_CN, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -77,7 +77,7 @@ public class TestClassDiagramChildNode extends TestChildNode { */ @Test public void testToManageInstanceSpecification() { - testToManageNode(UMLElementTypes.InstanceSpecification_3020, UMLPackage.eINSTANCE.getInstanceSpecification(), UMLElementTypes.Package_3009, true); + testToManageNode(UMLElementTypes.InstanceSpecification_Shape_CN, UMLPackage.eINSTANCE.getInstanceSpecification(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -85,7 +85,7 @@ public class TestClassDiagramChildNode extends TestChildNode { */ @Test public void testToManageSignal() { - testToManageNode(UMLElementTypes.Signal_3022, UMLPackage.eINSTANCE.getSignal(), UMLElementTypes.Package_3009, true); + testToManageNode(UMLElementTypes.Signal_Shape_CN, UMLPackage.eINSTANCE.getSignal(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -94,7 +94,7 @@ public class TestClassDiagramChildNode extends TestChildNode { @Test @FailingTest public void testToManageModel() { - testToManageNode(UMLElementTypes.Model_3024, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_3009, true); + testToManageNode(UMLElementTypes.Model_Shape_CN, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -102,7 +102,7 @@ public class TestClassDiagramChildNode extends TestChildNode { */ @Test public void testToManageEnumeration() { - testToManageNode(UMLElementTypes.Enumeration_3025, UMLPackage.eINSTANCE.getEnumeration(), UMLElementTypes.Package_3009, true); + testToManageNode(UMLElementTypes.Enumeration_Shape_CN, UMLPackage.eINSTANCE.getEnumeration(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -111,7 +111,7 @@ public class TestClassDiagramChildNode extends TestChildNode { @Test @FailingTest public void testToManageIPackage() { - testToManageNode(UMLElementTypes.Package_3009, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_3009, true); + testToManageNode(UMLElementTypes.Package_Shape_CN, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -119,7 +119,7 @@ public class TestClassDiagramChildNode extends TestChildNode { */ @Test public void testToManageClass() { - testToManageNode(UMLElementTypes.Class_3010, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Package_3009, true); + testToManageNode(UMLElementTypes.Class_Shape_CN, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -127,7 +127,7 @@ public class TestClassDiagramChildNode extends TestChildNode { */ @Test public void testToManageInformationItem() { - testToManageNode(UMLElementTypes.InformationItem_3040, UMLPackage.eINSTANCE.getInformationItem(), UMLElementTypes.Package_3009, true); + testToManageNode(UMLElementTypes.InformationItem_Shape_CN, UMLPackage.eINSTANCE.getInformationItem(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -135,7 +135,7 @@ public class TestClassDiagramChildNode extends TestChildNode { */ @Test public void testToManagePrimitiveType() { - testToManageNode(UMLElementTypes.PrimitiveType_3026, UMLPackage.eINSTANCE.getPrimitiveType(), UMLElementTypes.Package_3009, true); + testToManageNode(UMLElementTypes.PrimitiveType_Shape_CN, UMLPackage.eINSTANCE.getPrimitiveType(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -143,7 +143,7 @@ public class TestClassDiagramChildNode extends TestChildNode { */ @Test public void testToManageDataType() { - testToManageNode(UMLElementTypes.DataType_3027, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Package_3009, true); + testToManageNode(UMLElementTypes.DataType_Shape_CN, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -151,7 +151,7 @@ public class TestClassDiagramChildNode extends TestChildNode { */ @Test public void testToManageConstraint() { - testToManageNode(UMLElementTypes.Constraint_3029, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_3009, true); + testToManageNode(UMLElementTypes.Constraint_PackagedElementShape_CN, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -159,7 +159,7 @@ public class TestClassDiagramChildNode extends TestChildNode { */ @Test public void testToManageComment() { - testToManageNode(UMLElementTypes.Comment_3028, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_3009, true); + testToManageNode(UMLElementTypes.Comment_Shape_CN, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -167,7 +167,7 @@ public class TestClassDiagramChildNode extends TestChildNode { */ @Test public void testToManageInterface() { - testToManageNode(UMLElementTypes.Interface_3023, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Package_3009, true); + testToManageNode(UMLElementTypes.Interface_Shape_CN, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Package_Shape_CN, true); } @Override diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramContainment.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramContainment.java index 42d3f3fe71e..bfb927ec725 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramContainment.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramContainment.java @@ -48,6 +48,6 @@ public class TestClassDiagramContainment extends TestContainmentLink { */
@Test
public void testToManageContainment() {
- testToManageLink(UMLElementTypes.Class_2008, UMLElementTypes.Class_2008, UMLElementTypes.Link_4023, UMLElementTypes.Package_2007);
+ testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Element_ContainmentEdge, UMLElementTypes.Package_Shape);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramContextLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramContextLink.java index 0f7a8ff1572..c259e4d99ac 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramContextLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramContextLink.java @@ -46,6 +46,6 @@ public class TestClassDiagramContextLink extends TestContextLink { @Test public void testToManageContextLink() { - manageContextLink(UMLElementTypes.Constraint_2011, UMLElementTypes.Class_2008, UMLElementTypes.ConstraintContext_8500, UMLElementTypes.Package_2007); + manageContextLink(UMLElementTypes.Constraint_PackagedElementShape, UMLElementTypes.Class_Shape, UMLElementTypes.Constraint_ContextEdge, UMLElementTypes.Package_Shape); } } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramInstanceSpecification.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramInstanceSpecification.java index bdb227a8a21..122db440dbf 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramInstanceSpecification.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramInstanceSpecification.java @@ -38,7 +38,7 @@ public class TestClassDiagramInstanceSpecification extends TestInstanceSpecifica @Test
public void testInstanceSpecification() {
- testInstanceSpecification(UMLElementTypes.Class_2008, UMLElementTypes.Association_4001, UMLElementTypes.InstanceSpecification_2001, UMLElementTypes.InstanceSpecification_4021);
+ testInstanceSpecification(UMLElementTypes.Class_Shape, UMLElementTypes.Association_Edge, UMLElementTypes.InstanceSpecification_Shape, UMLElementTypes.InstanceSpecification_Edge);
}
@Override
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLink.java index 85383fe1b50..0b6693486d1 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLink.java @@ -53,7 +53,7 @@ public class TestClassDiagramLink extends TestLink { @Test
@FailingTest
public void testToManageDependency() {
- testToManageLink(UMLElementTypes.Component_2002, UMLElementTypes.Component_2002, UMLElementTypes.Dependency_4008, UMLElementTypes.Package_2007, true);
+ testToManageLink(UMLElementTypes.Component_Shape, UMLElementTypes.Component_Shape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_Shape, true);
}
/**
@@ -62,7 +62,7 @@ public class TestClassDiagramLink extends TestLink { @Test
@FailingTest
public void testToManageAssociation() {
- testToManageLink(UMLElementTypes.Class_2008, UMLElementTypes.Class_2008, UMLElementTypes.Association_4001, UMLElementTypes.Package_2007, true,"srcMulA_cla");
+ testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Association_Edge, UMLElementTypes.Package_Shape, true,"srcMulA_cla");
}
//test generatlization
@@ -74,7 +74,7 @@ public class TestClassDiagramLink extends TestLink { @Test
@FailingTest
public void testToManageRealization() {
- testToManageLink(UMLElementTypes.Class_2008, UMLElementTypes.Class_2008, UMLElementTypes.Realization_4005, UMLElementTypes.Package_2007, true);
+ testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Realization_Edge, UMLElementTypes.Package_Shape, true);
}
/**
@@ -83,7 +83,7 @@ public class TestClassDiagramLink extends TestLink { @Test
@FailingTest
public void testToManageAbstraction() {
- testToManageLink(UMLElementTypes.Class_2008, UMLElementTypes.Class_2008, UMLElementTypes.Abstraction_4006, UMLElementTypes.Package_2007, true);
+ testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_Shape, true);
}
/**
@@ -92,7 +92,7 @@ public class TestClassDiagramLink extends TestLink { @Test
@FailingTest
public void testToManageUsage() {
- testToManageLink(UMLElementTypes.Class_2008, UMLElementTypes.Class_2008, UMLElementTypes.Usage_4007, UMLElementTypes.Package_2007, true);
+ testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_Shape, true);
}
/**
@@ -101,7 +101,7 @@ public class TestClassDiagramLink extends TestLink { @Test
@FailingTest
public void testToManageInformationFlow() {
- testToManageLink(UMLElementTypes.Class_2008, UMLElementTypes.Class_2008, UMLElementTypes.InformationFlow_4026, UMLElementTypes.Package_2007, true);
+ testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.InformationFlow_Edge, UMLElementTypes.Package_Shape, true);
}
//test Element import
//testPackageImport
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java index f7e8980f0db..c8ef4b7b4b2 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java @@ -58,7 +58,7 @@ public class TestClassDiagramLinkOwnedBySource extends TestLinkOwnedBySource { */
@Test
public void testToManageGeneralization() {
- testToManageLink(UMLElementTypes.Class_2008, UMLElementTypes.Class_2008, UMLElementTypes.Generalization_4002, UMLElementTypes.Package_2007, false);
+ testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_Shape, false);
}
/**
@@ -66,7 +66,7 @@ public class TestClassDiagramLinkOwnedBySource extends TestLinkOwnedBySource { */
@Test
public void testToManageInterfaceRealization() {
- testToManageLink(UMLElementTypes.Class_2008, UMLElementTypes.Interface_2004, UMLElementTypes.InterfaceRealization_4003, UMLElementTypes.Package_2007, false);
+ testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Interface_Shape, UMLElementTypes.InterfaceRealization_Edge, UMLElementTypes.Package_Shape, false);
}
/**
@@ -74,7 +74,7 @@ public class TestClassDiagramLinkOwnedBySource extends TestLinkOwnedBySource { */
@Test
public void testToManageSubstitution() {
- testToManageLink(UMLElementTypes.Class_2008, UMLElementTypes.Class_2008, UMLElementTypes.Substitution_4004, UMLElementTypes.Package_2007, false);
+ testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Substitution_Edge, UMLElementTypes.Package_Shape, false);
}
/**
@@ -82,7 +82,7 @@ public class TestClassDiagramLinkOwnedBySource extends TestLinkOwnedBySource { */
@Test
public void testToManageElementImport() {
- testToManageLink(UMLElementTypes.Class_2008, UMLElementTypes.Class_2008, UMLElementTypes.ElementImport_4009, UMLElementTypes.Package_2007, true);
+ testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.ElementImport_Edge, UMLElementTypes.Package_Shape, true);
}
/**
@@ -90,13 +90,13 @@ public class TestClassDiagramLinkOwnedBySource extends TestLinkOwnedBySource { */
@Test
public void testToManagePackageImport() {
- testToManageLink(UMLElementTypes.Package_2007, UMLElementTypes.Package_2007, UMLElementTypes.PackageImport_4010, UMLElementTypes.Package_2007, true);
+ testToManageLink(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.PackageImport_Edge, UMLElementTypes.Package_Shape, true);
}
@TargetConfigurator(CreateRedefinableTemplateSignature.class)
@Test
public void testToManageTemplateBinding() {
- testToManageLink(UMLElementTypes.Class_2008, UMLElementTypes.Class_2008, UMLElementTypes.TemplateBinding_4015, UMLElementTypes.Package_2007, false);
+ testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.TemplateBinding_Edge, UMLElementTypes.Package_Shape, false);
}
// test comment link
@@ -110,7 +110,7 @@ public class TestClassDiagramLinkOwnedBySource extends TestLinkOwnedBySource { public static class CreateRedefinableTemplateSignature implements FixtureEditPartConfigurator {
public Command configureFixtureEditPart(IGraphicalEditPart editPart, IElementType elementType, boolean isSource) {
- CreateViewRequest request = CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.RedefinableTemplateSignature_3015, editPart.getDiagramPreferencesHint());
+ CreateViewRequest request = CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.RedefinableTemplateSignature_Shape, editPart.getDiagramPreferencesHint());
return editPart.getCommand(request);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramNestedClassifier.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramNestedClassifier.java index 7f54bf1fe29..60588f13fe6 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramNestedClassifier.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramNestedClassifier.java @@ -47,108 +47,108 @@ public class TestClassDiagramNestedClassifier extends TestNested { @Test
public void testToManageComponentNestedClass() {
//Class
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Component_3021, UMLElementTypes.Class_3004, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.Class_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageComponentNestedInterface() {
//Interface
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Component_3021, UMLElementTypes.Interface_3037, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.Interface_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageComponentNestedSignal() {
//Signal
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Component_3021, UMLElementTypes.Signal_3051, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.Signal_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageComponentNestedDataType() {
//Data Type
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Component_3021, UMLElementTypes.DataType_3045, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.DataType_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageComponentNestedEnumeration() {
//Enumeration
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Component_3021, UMLElementTypes.Enumeration_3053, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.Enumeration_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageComponentNestedPrimitiveType() {
//primitive Type
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Component_3021, UMLElementTypes.PrimitiveType_3046, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Component_Shape_CN, UMLElementTypes.PrimitiveType_ComponentNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageInterfaceNestedClass() {
//Class
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Interface_3023, UMLElementTypes.Class_3008, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.Class_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageInterfaceNestedInterface() {
//Interface
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Interface_3023, UMLElementTypes.Interface_3038, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.Interface_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageInterfaceNestedSignal() {
//Signal
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Interface_3023, UMLElementTypes.Signal_3049, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.Signal_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageInterfaceNestedDataType() {
//Data Type
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Interface_3023, UMLElementTypes.DataType_3043, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.DataType_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageInterfaceNestedEnumeration() {
//Enumeration
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Interface_3023, UMLElementTypes.Enumeration_3054, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.Enumeration_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageInterfaceNestedPrimitiveType() {
//Primitive Type
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Interface_3023, UMLElementTypes.PrimitiveType_3048, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Interface_Shape_CN, UMLElementTypes.PrimitiveType_InterfaceNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageClassNestedClass() {
//class
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Class_3010, UMLElementTypes.Class_3014, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.Class_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageClassNestedInetrface() {
//Interface
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Class_3010, UMLElementTypes.Interface_3036, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.Interface_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageClassNestedSignal() {
//Signal
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Class_3010, UMLElementTypes.Signal_3050, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.Signal_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageClassNestedDataType() {
//Data Type
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Class_3010, UMLElementTypes.DataType_3044, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.DataType_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageclassNestedEnumeration() {
//Enumeration
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Class_3010, UMLElementTypes.Enumeration_3052, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.Enumeration_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
@Test
public void testToManageClassNestedPrimitiveType() {
//Primitive Type
- testToManageTopNode(UMLElementTypes.Package_2007, UMLElementTypes.Class_3010, UMLElementTypes.PrimitiveType_3047, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Class_Shape_CN, UMLElementTypes.PrimitiveType_ClassNestedClassifierLabel, PackagePackageableElementCompartmentEditPart.VISUAL_ID, ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramTopNode.java index 0f1c709b1a7..685b7bad748 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramTopNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestClassDiagramTopNode.java @@ -55,7 +55,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageComponent() { - testToManageNode(UMLElementTypes.Component_2002, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.Component_Shape, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Package_Shape, true); } /** @@ -63,7 +63,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageInstanceSpecification() { - testToManageNode(UMLElementTypes.InstanceSpecification_2001, UMLPackage.eINSTANCE.getInstanceSpecification(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.InstanceSpecification_Shape, UMLPackage.eINSTANCE.getInstanceSpecification(), UMLElementTypes.Package_Shape, true); } /** @@ -71,7 +71,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageSignal() { - testToManageNode(UMLElementTypes.Signal_2003, UMLPackage.eINSTANCE.getSignal(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.Signal_Shape, UMLPackage.eINSTANCE.getSignal(), UMLElementTypes.Package_Shape, true); } /** @@ -79,7 +79,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageModel() { - testToManageNode(UMLElementTypes.Model_2005, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.Model_Shape, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_Shape, true); } /** @@ -87,7 +87,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageEnumeration() { - testToManageNode(UMLElementTypes.Enumeration_2006, UMLPackage.eINSTANCE.getEnumeration(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.Enumeration_Shape, UMLPackage.eINSTANCE.getEnumeration(), UMLElementTypes.Package_Shape, true); } /** @@ -95,7 +95,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageIPackage() { - testToManageNode(UMLElementTypes.Package_2007, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_Shape, true); } /** @@ -103,7 +103,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageClass() { - testToManageNode(UMLElementTypes.Class_2008, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.Class_Shape, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Package_Shape, true); } /** @@ -111,7 +111,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManagePrimitiveType() { - testToManageNode(UMLElementTypes.PrimitiveType_2009, UMLPackage.eINSTANCE.getPrimitiveType(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.PrimitiveType_Shape, UMLPackage.eINSTANCE.getPrimitiveType(), UMLElementTypes.Package_Shape, true); } /** @@ -119,7 +119,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageDataType() { - testToManageNode(UMLElementTypes.DataType_2010, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.DataType_Shape, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Package_Shape, true); } /** @@ -127,7 +127,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageConstraint() { - testToManageNode(UMLElementTypes.Constraint_2011, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.Constraint_PackagedElementShape, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_Shape, true); } /** @@ -135,7 +135,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageComment() { - testToManageNode(UMLElementTypes.Comment_2012, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.Comment_Shape, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_Shape, true); } /** @@ -143,7 +143,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageInformationItem() { - testToManageNode(UMLElementTypes.InformationItem_2099, UMLPackage.eINSTANCE.getInformationItem(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.InformationItem_Shape, UMLPackage.eINSTANCE.getInformationItem(), UMLElementTypes.Package_Shape, true); } /** @@ -151,7 +151,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageInterface() { - testToManageNode(UMLElementTypes.Interface_2004, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.Interface_Shape, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Package_Shape, true); } /** @@ -159,7 +159,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageTimeObservation() { - testToManageNode(UMLElementTypes.TimeObservation_2096, UMLPackage.eINSTANCE.getTimeObservation(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.TimeObservation_Shape, UMLPackage.eINSTANCE.getTimeObservation(), UMLElementTypes.Package_Shape, true); } /** @@ -167,7 +167,7 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Test public void testToManageDurationObservation() { - testToManageNode(UMLElementTypes.DurationObservation_2095, UMLPackage.eINSTANCE.getDurationObservation(), UMLElementTypes.Package_2007, true); + testToManageNode(UMLElementTypes.DurationObservation_Shape, UMLPackage.eINSTANCE.getDurationObservation(), UMLElementTypes.Package_Shape, true); } @@ -176,6 +176,6 @@ public class TestClassDiagramTopNode extends TestTopNode { */ @Override protected CreateViewRequest createViewRequestShapeContainer() { - return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_2007, getDiagramEditPart().getDiagramPreferencesHint()); + return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_Shape, getDiagramEditPart().getDiagramPreferencesHint()); } } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestDropfunction.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestDropfunction.java index e889a44e029..3939262be00 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestDropfunction.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestDropfunction.java @@ -74,9 +74,9 @@ public class TestDropfunction extends TestChildLabel { @Test
public void testDropWithOrder() {
- testToCreateATopNode(UMLElementTypes.Enumeration_2006);
- testToCreateSetOfNode(UMLElementTypes.EnumerationLiteral_3017, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);
- testSetOfDrop(UMLElementTypes.EnumerationLiteral_3017, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);
+ testToCreateATopNode(UMLElementTypes.Enumeration_Shape);
+ testToCreateSetOfNode(UMLElementTypes.EnumerationLiteral_LiteralLabel, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);
+ testSetOfDrop(UMLElementTypes.EnumerationLiteral_LiteralLabel, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);
}
protected void testToCreateSetOfNode(IElementType type, String containerType) {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestEditableClassDiagramTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestEditableClassDiagramTopNode.java index 4e12904df15..86ce41cbf1c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestEditableClassDiagramTopNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestEditableClassDiagramTopNode.java @@ -56,7 +56,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManageComponent() { - testEdition(UMLElementTypes.Component_2002); + testEdition(UMLElementTypes.Component_Shape); } /** @@ -64,7 +64,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManageInstanceSpecification() { - testEdition(UMLElementTypes.InstanceSpecification_2001); + testEdition(UMLElementTypes.InstanceSpecification_Shape); } /** @@ -72,7 +72,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManageSignal() { - testEdition(UMLElementTypes.Signal_2003); + testEdition(UMLElementTypes.Signal_Shape); } /** @@ -80,7 +80,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManageModel() { - testEdition(UMLElementTypes.Model_2005); + testEdition(UMLElementTypes.Model_Shape); } /** @@ -88,7 +88,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManageEnumeration() { - testEdition(UMLElementTypes.Enumeration_2006); + testEdition(UMLElementTypes.Enumeration_Shape); } /** @@ -96,7 +96,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManageIPackage() { - testEdition(UMLElementTypes.Package_2007); + testEdition(UMLElementTypes.Package_Shape); } /** @@ -104,7 +104,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManageClass() { - testEdition(UMLElementTypes.Class_2008); + testEdition(UMLElementTypes.Class_Shape); } /** @@ -112,7 +112,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManagePrimitiveType() { - testEdition(UMLElementTypes.PrimitiveType_2009); + testEdition(UMLElementTypes.PrimitiveType_Shape); } /** @@ -120,7 +120,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManageDataType() { - testEdition(UMLElementTypes.DataType_2010); + testEdition(UMLElementTypes.DataType_Shape); } /** @@ -129,7 +129,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { @Test @ExpectedDirectEditor(DEFAULT_DIRECT_EDITOR | EXTENDED_DIRECT_EDITOR) public void testToManageConstraint() { - testEdition(UMLElementTypes.Constraint_2011); + testEdition(UMLElementTypes.Constraint_PackagedElementShape); } /** @@ -137,7 +137,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManageComment() { - testEdition(UMLElementTypes.Comment_2012); + testEdition(UMLElementTypes.Comment_Shape); } /** @@ -145,7 +145,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManageInformationItem() { - testEdition(UMLElementTypes.InformationItem_2099); + testEdition(UMLElementTypes.InformationItem_Shape); } /** @@ -153,7 +153,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManageInterface() { - testEdition(UMLElementTypes.Interface_2004); + testEdition(UMLElementTypes.Interface_Shape); } /** @@ -161,7 +161,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManageTimeObservation() { - testEdition(UMLElementTypes.TimeObservation_2096); + testEdition(UMLElementTypes.TimeObservation_Shape); } /** @@ -169,7 +169,7 @@ public class TestEditableClassDiagramTopNode extends AbstractEditableNodeTest { */ @Test public void testToManageDurationObservation() { - testEdition(UMLElementTypes.DurationObservation_2095); + testEdition(UMLElementTypes.DurationObservation_Shape); } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentPropertiesOperationsDrop.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentPropertiesOperationsDrop.java index 1c953be2ee5..45bbf3657b4 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentPropertiesOperationsDrop.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestListCompartmentPropertiesOperationsDrop.java @@ -242,32 +242,32 @@ public class TestListCompartmentPropertiesOperationsDrop extends AbstractPapyrus @Test
public void testDropProperty2InterfaceAttributeCompartment() throws Exception {
- getHelper().checkDropAssociationPropertyFromModelExplorer(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Association_4001);
+ getHelper().checkDropAssociationPropertyFromModelExplorer(InterfaceEditPart.VISUAL_ID, InterfaceAttributeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Association_Edge);
}
@Test
public void testDropProperty2ClassAttributeCompartment() throws Exception {
- getHelper().checkDropAssociationPropertyFromModelExplorer(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Association_4001);
+ getHelper().checkDropAssociationPropertyFromModelExplorer(ClassEditPart.VISUAL_ID, ClassAttributeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Association_Edge);
}
@Test
public void testDropProperty2DataTypeAttributeCompartment() throws Exception {
- getHelper().checkDropAssociationPropertyFromModelExplorer(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Association_4001);
+ getHelper().checkDropAssociationPropertyFromModelExplorer(DataTypeEditPart.VISUAL_ID, DataTypeAttributeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Association_Edge);
}
@Test
public void testDropProperty2SignalAttributeCompartment() throws Exception {
- getHelper().checkDropAssociationPropertyFromModelExplorer(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Association_4001);
+ getHelper().checkDropAssociationPropertyFromModelExplorer(SignalEditPart.VISUAL_ID, SignalAttributeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Association_Edge);
}
@Test
public void testDropProperty2PrimitiveTypeAttributeCompartment() throws Exception {
- getHelper().checkDropAssociationPropertyFromModelExplorer(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Association_4001);
+ getHelper().checkDropAssociationPropertyFromModelExplorer(PrimitiveTypeEditPart.VISUAL_ID, PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Association_Edge);
}
@Test
public void testDropProperty2ComponentAttributeCompartment() throws Exception {
- getHelper().checkDropAssociationPropertyFromModelExplorer(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Association_4001);
+ getHelper().checkDropAssociationPropertyFromModelExplorer(ComponentEditPart.VISUAL_ID, ComponentAttributeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Association_Edge);
}
private TestListCompartmentHelper getHelper() {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestMultiLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestMultiLink.java index c8b67f92030..365e3db8c09 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestMultiLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestMultiLink.java @@ -26,7 +26,7 @@ public class TestMultiLink extends AbstractTestMultiLink { @Override
protected CreateViewRequest createViewRequestShapeContainer() {
// TODO Auto-generated method stub
- return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_2008, getDiagramEditPart().getDiagramPreferencesHint());
+ return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_Shape, getDiagramEditPart().getDiagramPreferencesHint());
}
@Override
@@ -44,7 +44,7 @@ public class TestMultiLink extends AbstractTestMultiLink { */
@Test
public void testToManageMultiDependency() {
- testToManageMultiLink(UMLElementTypes.Dependency_4008, UMLElementTypes.Dependency_4018, true);
+ testToManageMultiLink(UMLElementTypes.Dependency_Edge, UMLElementTypes.Dependency_BranchEdge, true);
}
/**
@@ -52,7 +52,7 @@ public class TestMultiLink extends AbstractTestMultiLink { */
@Test
public void testToManageMultiAssociation() {
- testToManageMultiLink(UMLElementTypes.Association_4001, UMLElementTypes.Association_4019, false);
+ testToManageMultiLink(UMLElementTypes.Association_Edge, UMLElementTypes.Association_BranchEdge, false);
}
@Override
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestRedefinableTemplateSignature.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestRedefinableTemplateSignature.java index 41f10b42ecb..45bfca77b8a 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestRedefinableTemplateSignature.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestRedefinableTemplateSignature.java @@ -46,7 +46,7 @@ public class TestRedefinableTemplateSignature extends AbstractPapyrusTestCase { */
@Test
public void testToManageInterface() {
- testRedefinableTemplateSignature(UMLElementTypes.Interface_2004);
+ testRedefinableTemplateSignature(UMLElementTypes.Interface_Shape);
}
/**
@@ -54,7 +54,7 @@ public class TestRedefinableTemplateSignature extends AbstractPapyrusTestCase { */
@Test
public void testToManageClass() {
- testRedefinableTemplateSignature(UMLElementTypes.Class_2008);
+ testRedefinableTemplateSignature(UMLElementTypes.Class_Shape);
}
/**
@@ -62,7 +62,7 @@ public class TestRedefinableTemplateSignature extends AbstractPapyrusTestCase { */
@Test
public void testToManageSignal() {
- testRedefinableTemplateSignature(UMLElementTypes.Signal_2003);
+ testRedefinableTemplateSignature(UMLElementTypes.Signal_Shape);
}
/**
@@ -70,7 +70,7 @@ public class TestRedefinableTemplateSignature extends AbstractPapyrusTestCase { */
@Test
public void testToManageDataType() {
- testRedefinableTemplateSignature(UMLElementTypes.DataType_2010);
+ testRedefinableTemplateSignature(UMLElementTypes.DataType_Shape);
}
/**
@@ -78,7 +78,7 @@ public class TestRedefinableTemplateSignature extends AbstractPapyrusTestCase { */
@Test
public void testToManagePrimitiveType() {
- testRedefinableTemplateSignature(UMLElementTypes.PrimitiveType_2009);
+ testRedefinableTemplateSignature(UMLElementTypes.PrimitiveType_Shape);
}
/**
@@ -86,7 +86,7 @@ public class TestRedefinableTemplateSignature extends AbstractPapyrusTestCase { */
@Test
public void testToManageEnumeration() {
- testRedefinableTemplateSignature(UMLElementTypes.Enumeration_2006);
+ testRedefinableTemplateSignature(UMLElementTypes.Enumeration_Shape);
}
/**
@@ -94,7 +94,7 @@ public class TestRedefinableTemplateSignature extends AbstractPapyrusTestCase { */
@Test
public void testToManageComponent() {
- testRedefinableTemplateSignature(UMLElementTypes.Component_2002);
+ testRedefinableTemplateSignature(UMLElementTypes.Component_Shape);
}
protected void testRedefinableTemplateSignature(IElementType container) {
@@ -102,7 +102,7 @@ public class TestRedefinableTemplateSignature extends AbstractPapyrusTestCase { }
protected IElementType getTemplateableSignature() {
- return UMLElementTypes.RedefinableTemplateSignature_3015;
+ return UMLElementTypes.RedefinableTemplateSignature_Shape;
}
protected void createAffixedChildNode(IElementType container, IElementType child) {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestStaticFeatureRepresentation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestStaticFeatureRepresentation.java index 863e2954e08..d09899e24d5 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestStaticFeatureRepresentation.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/canonical/TestStaticFeatureRepresentation.java @@ -72,14 +72,14 @@ public class TestStaticFeatureRepresentation extends TestChildLabel { @Test
public void testStaticOperation() {
- testToCreateATopNode(UMLElementTypes.Class_2008);
- testToTestStaticoperation(UMLElementTypes.Operation_3013, ClassOperationCompartmentEditPart.VISUAL_ID);
+ testToCreateATopNode(UMLElementTypes.Class_Shape);
+ testToTestStaticoperation(UMLElementTypes.Operation_ClassOperationLabel, ClassOperationCompartmentEditPart.VISUAL_ID);
}
@Test
public void testStaticProperty() {
- testToCreateATopNode(UMLElementTypes.Class_2008);
- testToTestStaticoperation(UMLElementTypes.Property_3012, ClassAttributeCompartmentEditPart.VISUAL_ID);
+ testToCreateATopNode(UMLElementTypes.Class_Shape);
+ testToTestStaticoperation(UMLElementTypes.Property_ClassAttributeLabel, ClassAttributeCompartmentEditPart.VISUAL_ID);
}
protected void testToTestStaticoperation(IElementType type, String containerType) {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load100ClassTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load100ClassTest.java index 4bbe6432c03..0fa05992ec8 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load100ClassTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load100ClassTest.java @@ -65,7 +65,7 @@ public class Load100ClassTest extends AbstractPapyrusTestCase { @Test
public void testLoad100Class() {
for(int i = 0; i < 100; i++) {
- testToCreateANode(UMLElementTypes.Class_2008);
+ testToCreateANode(UMLElementTypes.Class_Shape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load10ClassTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load10ClassTest.java index 4c36e954e71..f79c23d021b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load10ClassTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load10ClassTest.java @@ -65,7 +65,7 @@ public class Load10ClassTest extends AbstractPapyrusTestCase { @Test
public void testLoad10Class() {
for(int i = 0; i < 10; i++) {
- testToCreateANode(UMLElementTypes.Class_2008);
+ testToCreateANode(UMLElementTypes.Class_Shape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load200ClassTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load200ClassTest.java index 7eb5f103cbf..1139d06823d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load200ClassTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load200ClassTest.java @@ -65,7 +65,7 @@ public class Load200ClassTest extends AbstractPapyrusTestCase { @Test
public void testLoad200Class() {
for(int i = 0; i < 200; i++) {
- testToCreateANode(UMLElementTypes.Class_2008);
+ testToCreateANode(UMLElementTypes.Class_Shape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load300ClassTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load300ClassTest.java index 9147d9f7c7d..5b02e95952f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load300ClassTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load300ClassTest.java @@ -65,7 +65,7 @@ public class Load300ClassTest extends AbstractPapyrusTestCase { @Test
public void testLoad300Class() {
for(int i = 0; i < 300; i++) {
- testToCreateANode(UMLElementTypes.Class_2008);
+ testToCreateANode(UMLElementTypes.Class_Shape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load400ClassTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load400ClassTest.java index 0622a493169..12d029cae3f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load400ClassTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load400ClassTest.java @@ -65,7 +65,7 @@ public class Load400ClassTest extends AbstractPapyrusTestCase { @Test
public void testLoad400Class() {
for(int i = 0; i < 400; i++) {
- testToCreateANode(UMLElementTypes.Class_2008);
+ testToCreateANode(UMLElementTypes.Class_Shape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load500ClassTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load500ClassTest.java index e1fb445985d..968873dce83 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load500ClassTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/load/Load500ClassTest.java @@ -65,7 +65,7 @@ public class Load500ClassTest extends AbstractPapyrusTestCase { @Test
public void testLoad500Class() {
for(int i = 0; i < 500; i++) {
- testToCreateANode(UMLElementTypes.Class_2008);
+ testToCreateANode(UMLElementTypes.Class_Shape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/tests/Bug382954_InstanceSpecificationLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/tests/Bug382954_InstanceSpecificationLink.java index 6178a5a0747..9ce90091f01 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/tests/Bug382954_InstanceSpecificationLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/tests/Bug382954_InstanceSpecificationLink.java @@ -53,7 +53,7 @@ public class Bug382954_InstanceSpecificationLink extends AbstractPapyrusTest { NamedElement targetLink = modelSetFixture.getModel().getMember("c"); // Create the command with the creation request and service edit - CreateRelationshipRequest relationshipRequest = new CreateRelationshipRequest(modelSetFixture.getModel(), sourceLink, targetLink, UMLElementTypes.InstanceSpecification_4021); + CreateRelationshipRequest relationshipRequest = new CreateRelationshipRequest(modelSetFixture.getModel(), sourceLink, targetLink, UMLElementTypes.InstanceSpecification_Edge); IElementEditService editService = ElementEditServiceUtils.getCommandProvider(modelSetFixture.getModel()); ICommand editCommand = editService.getEditCommand(relationshipRequest); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramChildNode.java index 1cac457cec1..c1a9dcdef5f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramChildNode.java @@ -65,21 +65,21 @@ public class TestCommunicationDiagramChildNode extends TestChildNode { */
@Test
public void testToLifeline() {
- testToManageNode(UMLElementTypes.Lifeline_8001, UMLPackage.eINSTANCE.getLifeline(), UMLElementTypes.Interaction_8002, false);
+ testToManageNode(UMLElementTypes.Lifeline_Shape, UMLPackage.eINSTANCE.getLifeline(), UMLElementTypes.Interaction_Shape, false);
}
/**
* Test to manage Constraint.
*/
@Test
public void testToConstraint() {
- testToManageNode(UMLElementTypes.Constraint_8004, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Interaction_8002, false);
+ testToManageNode(UMLElementTypes.Constraint_Shape, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Interaction_Shape, false);
}
/**
* Test to manage Comment.
*/
@Test
public void testToComment() {
- testToManageNode(UMLElementTypes.Comment_8005, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Interaction_8002, false);
+ testToManageNode(UMLElementTypes.Comment_Shape, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Interaction_Shape, false);
}
/**
* Test to manage TimeObservation.
@@ -87,7 +87,7 @@ public class TestCommunicationDiagramChildNode extends TestChildNode { @Test
@FailingTest
public void testToTimeObservation() {
- testToManageNode(UMLElementTypes.TimeObservation_8006, UMLPackage.eINSTANCE.getTimeObservation(), UMLElementTypes.Interaction_8002, false);
+ testToManageNode(UMLElementTypes.TimeObservation_Shape, UMLPackage.eINSTANCE.getTimeObservation(), UMLElementTypes.Interaction_Shape, false);
}
/**
* Test to manage DurationObservation.
@@ -95,7 +95,7 @@ public class TestCommunicationDiagramChildNode extends TestChildNode { @Test
@FailingTest
public void testToDurationObservation() {
- testToManageNode(UMLElementTypes.DurationObservation_8007, UMLPackage.eINSTANCE.getDurationObservation(), UMLElementTypes.Interaction_8002, false);
+ testToManageNode(UMLElementTypes.DurationObservation_Shape, UMLPackage.eINSTANCE.getDurationObservation(), UMLElementTypes.Interaction_Shape, false);
}
@Override
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramLink.java index 266f87866fd..15baa4b0cb9 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/src/org/eclipse/papyrus/uml/diagram/communication/tests/canonical/TestCommunicationDiagramLink.java @@ -53,7 +53,7 @@ public class TestCommunicationDiagramLink extends TestLink { @Test
@InvalidTest
public void testToMessage() {
- testToManageLink(UMLElementTypes.Lifeline_8001, UMLElementTypes.Lifeline_8001, UMLElementTypes.Message_8009, UMLElementTypes.Interaction_8002, false);
+ testToManageLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Path_Edge, UMLElementTypes.Interaction_Shape, false);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/plugin.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/plugin.properties index 837292babc8..fc4a2a67d98 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/plugin.properties +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/plugin.properties @@ -18,13 +18,13 @@ prefpage.org.eclipse.uml2.uml.diagram.connections=Connections prefpage.org.eclipse.uml2.uml.diagram.printing=Printing
prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid=Rulers And Grid
metatype.name.Model_1000=ComponentDiagram
-metatype.name.Component_2002=Component
+metatype.name.Component_PackagedElementShape=Component
metatype.name.Interface_2003=Interface
-metatype.name.Package_3200=Package
-metatype.name.Comment_3201=Comment
-metatype.name.Constraint_3199=Constraint
-metatype.name.Port_3069=Port
-metatype.name.Component_3070=Component
+metatype.name.Package_Shape=Package
+metatype.name.Comment_Shape=Comment
+metatype.name.Constraint_Shape=Constraint
+metatype.name.Port_Shape=Port
+metatype.name.Component_PackagedElementShape_CCN=Component
metatype.name.Component_3071=Component
metatype.name.Interface_3072=Interface
metatype.name.Comment_3074=Comment
@@ -37,8 +37,8 @@ metatype.name.Manifestation_4014=Manifestation metatype.name.ComponentRealization_4007=ComponentRealization
metatype.name.Abstraction_4013=Abstraction
metatype.name.Link_4016=Undefined
-metatype.name.CommentAnnotatedElement_4015=CommentAnnotatedElement
-metatype.name.ConstraintConstrainedElement_4009=ConstraintConstrainedElement
+metatype.name.Comment_AnnotatedElementEdge=CommentAnnotatedElement
+metatype.name.Constraint_ConstrainedElementEdge=ConstraintConstrainedElement
metatype.name.Dependency_4010=Dependency
cmdcategory.name=PapyrusUMLComponentDiagram Editor Commands
cmdcategory.desc=PapyrusUMLComponentDiagram Editor Commands
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramChildLabel.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramChildLabel.java index ffc12f9aa41..6cf192085b7 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramChildLabel.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramChildLabel.java @@ -54,7 +54,7 @@ public class TestComponentDiagramChildLabel extends TestChildLabel { */
@Test
public void testToManageProperty() {
- testToManageTopNode(UMLElementTypes.Interface_3205,UMLElementTypes.Property_1, InterfaceAttributeCompartmentEditPart.VISUAL_ID, "Attribute");
+ testToManageTopNode(UMLElementTypes.Interface_ClassifierShape,UMLElementTypes.Property_InterfaceAttributeLabel, InterfaceAttributeCompartmentEditPart.VISUAL_ID, "Attribute");
}
/**
@@ -62,7 +62,7 @@ public class TestComponentDiagramChildLabel extends TestChildLabel { */
@Test
public void testToManageOperation() {
- testToManageTopNode(UMLElementTypes.Interface_3205,UMLElementTypes.Operation_5, InterfaceOperationCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Interface_ClassifierShape,UMLElementTypes.Operation_InterfaceOperationLabel, InterfaceOperationCompartmentEditPart.VISUAL_ID);
}
/**
@@ -70,7 +70,7 @@ public class TestComponentDiagramChildLabel extends TestChildLabel { */
@Test
public void testToManageReception() {
- testToManageTopNode(UMLElementTypes.Interface_3205,UMLElementTypes.Reception_6, InterfaceOperationCompartmentEditPart.VISUAL_ID);
+ testToManageTopNode(UMLElementTypes.Interface_ClassifierShape,UMLElementTypes.Reception_InterfaceReceptionLabel, InterfaceOperationCompartmentEditPart.VISUAL_ID);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java index 73af509ab73..847d0cb6f55 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramCommentLink.java @@ -47,6 +47,6 @@ public class TestComponentDiagramCommentLink extends TestCommentLink { */
@Test
public void testToManageComment() {
- testToManageLink(UMLElementTypes.Comment_3201, UMLElementTypes.Package_3200, UMLElementTypes.CommentAnnotatedElement_4015, UMLElementTypes.Package_3200, true);
+ testToManageLink(UMLElementTypes.Comment_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Comment_AnnotatedElementEdge, UMLElementTypes.Package_Shape, true);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramComponentChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramComponentChildNode.java index f5d84236f18..959730ba832 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramComponentChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramComponentChildNode.java @@ -44,7 +44,7 @@ public class TestComponentDiagramComponentChildNode extends TestChildNode { @Override
protected CreateViewRequest createViewRequestShapeContainer() {
- return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Component_2002, getDiagramEditPart().getDiagramPreferencesHint());
+ return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Component_PackagedElementShape, getDiagramEditPart().getDiagramPreferencesHint());
}
@Override
@@ -63,7 +63,7 @@ public class TestComponentDiagramComponentChildNode extends TestChildNode { */
@Test
public void testToManagePropertyPart() {
- testToManageNodeWithMask(UMLElementTypes.Property_3079, UMLPackage.eINSTANCE.getProperty(), UMLElementTypes.Component_2002, false, "Attribute", 0);
+ testToManageNodeWithMask(UMLElementTypes.Property_Shape, UMLPackage.eINSTANCE.getProperty(), UMLElementTypes.Component_PackagedElementShape, false, "Attribute", 0);
}
/**
@@ -72,13 +72,13 @@ public class TestComponentDiagramComponentChildNode extends TestChildNode { @Test
public void testToManagePort() {
setTestAffixedNode(true);
- testToManageNode(UMLElementTypes.Port_3069, UMLPackage.eINSTANCE.getPort(), UMLElementTypes.Component_2002, false, 4, 0, 1, 1, true, null, 0);
+ testToManageNode(UMLElementTypes.Port_Shape, UMLPackage.eINSTANCE.getPort(), UMLElementTypes.Component_PackagedElementShape, false, 4, 0, 1, 1, true, null, 0);
setTestAffixedNode(false);
}
@FailingTest
@Test
public void testToManageComponent() {
- testToManageNode(UMLElementTypes.Component_3070, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Component_2002, true, 0, 0, 1, 1, false, "Component", 0);
+ testToManageNode(UMLElementTypes.Component_PackagedElementShape_CCN, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Component_PackagedElementShape, true, 0, 0, 1, 1, false, "Component", 0);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConnector.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConnector.java index ee7ff1ff9e6..46e5a055409 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConnector.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConnector.java @@ -37,7 +37,7 @@ public class TestComponentDiagramConnector extends TestChildNode { @Override
protected CreateViewRequest createViewRequestShapeContainer() {
- return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Component_2002, getDiagramEditPart().getDiagramPreferencesHint());
+ return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Component_PackagedElementShape, getDiagramEditPart().getDiagramPreferencesHint());
}
@Override
@@ -52,14 +52,14 @@ public class TestComponentDiagramConnector extends TestChildNode { @Test
public void testToManagePropertyPortConnection() {
- testToManageNodeWithMask(UMLElementTypes.Property_3079, UMLPackage.eINSTANCE.getProperty(), UMLElementTypes.Component_2002, false, "Attribute", 0);
+ testToManageNodeWithMask(UMLElementTypes.Property_Shape, UMLPackage.eINSTANCE.getProperty(), UMLElementTypes.Component_PackagedElementShape, false, "Attribute", 0);
setTestAffixedNode(true);
- testToManageNode(UMLElementTypes.Port_3069, UMLPackage.eINSTANCE.getPort(), UMLElementTypes.Component_2002, false, 4, 0, 1, 1, true, null, 0);
+ testToManageNode(UMLElementTypes.Port_Shape, UMLPackage.eINSTANCE.getPort(), UMLElementTypes.Component_PackagedElementShape, false, 4, 0, 1, 1, true, null, 0);
GraphicalEditPart parent = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);
- GraphicalEditPart source = (GraphicalEditPart) parent.getChildBySemanticHint(((IHintedType) UMLElementTypes.Port_3069).getSemanticHint());
+ GraphicalEditPart source = (GraphicalEditPart) parent.getChildBySemanticHint(((IHintedType) UMLElementTypes.Port_Shape).getSemanticHint());
GraphicalEditPart targetCompartment = (GraphicalEditPart) parent.getChildren().get(2);
GraphicalEditPart target = (GraphicalEditPart) targetCompartment.getChildren().get(0);
- Command command = target.getCommand(createConnectionViewRequest(UMLElementTypes.Connector_4019, source, target));
+ Command command = target.getCommand(createConnectionViewRequest(UMLElementTypes.Connector_Edge, source, target));
assertNotNull(CREATION + COMMAND_NULL, command);
assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java index 87bc2bc6992..a81b4752c96 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramConstraintLink.java @@ -47,6 +47,6 @@ public class TestComponentDiagramConstraintLink extends TestConstraintLink { */
@Test
public void testToManageConstraint() {
- testToManageLink(UMLElementTypes.Constraint_3199, UMLElementTypes.Package_3200, UMLElementTypes.ConstraintConstrainedElement_4009, UMLElementTypes.Package_3200, true);
+ testToManageLink(UMLElementTypes.Constraint_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Constraint_ConstrainedElementEdge, UMLElementTypes.Package_Shape, true);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLink.java index 0c314809065..7f7255327e5 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLink.java @@ -58,7 +58,7 @@ public class TestComponentDiagramLink extends TestLink { @Test
@FailingTest
public void testToManageAbstraction() {
- testToManageLink(UMLElementTypes.Component_2002, UMLElementTypes.Component_2002, UMLElementTypes.Abstraction_4013, UMLElementTypes.Package_3200, true);
+ testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_Shape, true);
}
/**
@@ -67,7 +67,7 @@ public class TestComponentDiagramLink extends TestLink { @Test
@FailingTest
public void testToManageDependency() {
- testToManageLink(UMLElementTypes.Component_2002, UMLElementTypes.Component_2002, UMLElementTypes.Dependency_4010, UMLElementTypes.Package_3200, true);
+ testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_Shape, true);
}
@@ -77,7 +77,7 @@ public class TestComponentDiagramLink extends TestLink { @Test
@FailingTest
public void testToManageManifestation() {
- testToManageLink(UMLElementTypes.Component_2002, UMLElementTypes.Component_2002, UMLElementTypes.Manifestation_4014, UMLElementTypes.Package_3200, true);
+ testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Manifestation_Edge, UMLElementTypes.Package_Shape, true);
}
/**
@@ -86,7 +86,7 @@ public class TestComponentDiagramLink extends TestLink { @Test
@FailingTest
public void testToManageUsage() {
- testToManageLink(UMLElementTypes.Component_2002, UMLElementTypes.Interface_3205, UMLElementTypes.Usage_4001, UMLElementTypes.Package_3200, true);
+ testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_Shape, true);
}
/**
@@ -95,7 +95,7 @@ public class TestComponentDiagramLink extends TestLink { @Test
@FailingTest
public void testToManageInterfaceRealization() {
- testToManageLink(UMLElementTypes.Component_2002, UMLElementTypes.Interface_3205, UMLElementTypes.InterfaceRealization_4006, UMLElementTypes.Package_3200, true);
+ testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.InterfaceRealization_Edge, UMLElementTypes.Package_Shape, true);
}
/**
@@ -104,7 +104,7 @@ public class TestComponentDiagramLink extends TestLink { @Test
@FailingTest
public void testToManageComponentRealization() {
- testToManageLink(UMLElementTypes.Component_2002, UMLElementTypes.Component_2002, UMLElementTypes.ComponentRealization_4007, UMLElementTypes.Package_3200, true);
+ testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.ComponentRealization_Edge, UMLElementTypes.Package_Shape, true);
}
/**
@@ -112,7 +112,7 @@ public class TestComponentDiagramLink extends TestLink { */
@Test
public void testToManageInterfaceAbstraction() {
- testToManageLink(UMLElementTypes.Interface_3205, UMLElementTypes.Interface_3205, UMLElementTypes.Abstraction_4013, UMLElementTypes.Package_3200, true);
+ testToManageLink(UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_Shape, true);
}
/**
@@ -120,7 +120,7 @@ public class TestComponentDiagramLink extends TestLink { */
@Test
public void testToManageInterfaceDependency() {
- testToManageLink(UMLElementTypes.Interface_3205, UMLElementTypes.Interface_3205, UMLElementTypes.Dependency_4010, UMLElementTypes.Package_3200, true);
+ testToManageLink(UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_Shape, true);
}
@@ -129,7 +129,7 @@ public class TestComponentDiagramLink extends TestLink { */
@Test
public void testToManageInterfaceManifestation() {
- testToManageLink(UMLElementTypes.Interface_3205, UMLElementTypes.Interface_3205, UMLElementTypes.Manifestation_4014, UMLElementTypes.Package_3200, false);
+ testToManageLink(UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Manifestation_Edge, UMLElementTypes.Package_Shape, false);
}
/**
@@ -137,7 +137,7 @@ public class TestComponentDiagramLink extends TestLink { */
@Test
public void testToManageInterfaceUsage() {
- testToManageLink(UMLElementTypes.Interface_3205, UMLElementTypes.Interface_3205, UMLElementTypes.Usage_4001, UMLElementTypes.Package_3200, true);
+ testToManageLink(UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Interface_ClassifierShape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_Shape, true);
}
/**
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLinkOwnedBySource.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLinkOwnedBySource.java index 3bf273d6f17..723d309c1f2 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLinkOwnedBySource.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramLinkOwnedBySource.java @@ -53,7 +53,7 @@ public class TestComponentDiagramLinkOwnedBySource extends TestLinkOwnedBySource */
@Test
public void testToManageGeneralization() {
- testToManageLink(UMLElementTypes.Component_2002, UMLElementTypes.Component_2002, UMLElementTypes.Generalization_4003, UMLElementTypes.Package_3200, false);
+ testToManageLink(UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Component_PackagedElementShape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_Shape, false);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramPackageChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramPackageChildNode.java index 645ba599e0f..966f8b67603 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramPackageChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramPackageChildNode.java @@ -43,7 +43,7 @@ public class TestComponentDiagramPackageChildNode extends TestChildNode { @Override protected CreateViewRequest createViewRequestShapeContainer() { - return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_3200, getDiagramEditPart().getDiagramPreferencesHint()); + return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_Shape, getDiagramEditPart().getDiagramPreferencesHint()); } @Override @@ -61,7 +61,7 @@ public class TestComponentDiagramPackageChildNode extends TestChildNode { */ @Test public void testToManagePackage() { - testToManageNode(UMLElementTypes.Package_3076, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_3076, true); + testToManageNode(UMLElementTypes.Package_Shape_CN, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -69,7 +69,7 @@ public class TestComponentDiagramPackageChildNode extends TestChildNode { */ @Test public void testToManageModel() { - testToManageNode(UMLElementTypes.Model_3077, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_3076, true); + testToManageNode(UMLElementTypes.Model_Shape_CN, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -77,7 +77,7 @@ public class TestComponentDiagramPackageChildNode extends TestChildNode { */ @Test public void testToManageComponent() { - testToManageNode(UMLElementTypes.Component_3071, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Package_3076, true); + testToManageNode(UMLElementTypes.Component_PackagedElementShape_CN, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -85,7 +85,7 @@ public class TestComponentDiagramPackageChildNode extends TestChildNode { */ @Test public void testToManageInterface() { - testToManageNode(UMLElementTypes.Interface_3078, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Package_3076, true); + testToManageNode(UMLElementTypes.Interface_ClassifierShape_CN, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Package_Shape_CN, true); } @@ -94,7 +94,7 @@ public class TestComponentDiagramPackageChildNode extends TestChildNode { */ @Test public void testToManageComment() { - testToManageNode(UMLElementTypes.Comment_3074, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_3076, true); + testToManageNode(UMLElementTypes.Comment_Shape_CN, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -102,6 +102,6 @@ public class TestComponentDiagramPackageChildNode extends TestChildNode { */ @Test public void testToManageConstraint() { - testToManageNode(UMLElementTypes.Constraint_3075, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_3076, true); + testToManageNode(UMLElementTypes.Constraint_Shape_CN, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_Shape_CN, true); } } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramPortLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramPortLink.java index 8495e1ce982..8926bcbbb8a 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramPortLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramPortLink.java @@ -46,7 +46,7 @@ public class TestComponentDiagramPortLink extends TestLinkWithParent { @Override public void setUp() throws Exception { super.setUp(); - parentType = UMLElementTypes.Component_2002; + parentType = UMLElementTypes.Component_PackagedElementShape; } @Override @@ -73,7 +73,7 @@ public class TestComponentDiagramPortLink extends TestLinkWithParent { */ @Test public void testToManagePortConnector() { - testImpossibleToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Connector_4019); + testImpossibleToManageLink(UMLElementTypes.Port_Shape, UMLElementTypes.Port_Shape, UMLElementTypes.Connector_Edge); } /** @@ -82,7 +82,7 @@ public class TestComponentDiagramPortLink extends TestLinkWithParent { @Test public void testToManagePortUsage() { initConfLinkOwnedByParent(); - testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Usage_4001, UMLElementTypes.Component_2002, true); + testToManageLink(UMLElementTypes.Port_Shape, UMLElementTypes.Port_Shape, UMLElementTypes.Usage_Edge, UMLElementTypes.Component_PackagedElementShape, true); } /** @@ -91,7 +91,7 @@ public class TestComponentDiagramPortLink extends TestLinkWithParent { @Test public void testToManagePortAbstraction() { initConfLinkOwnedByParent(); - testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Abstraction_4013, UMLElementTypes.Component_2002, true); + testToManageLink(UMLElementTypes.Port_Shape, UMLElementTypes.Port_Shape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Component_PackagedElementShape, true); } @@ -100,7 +100,7 @@ public class TestComponentDiagramPortLink extends TestLinkWithParent { */ @Test public void testToManagePortGeneralization() { - testImpossibleToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Generalization_4003); + testImpossibleToManageLink(UMLElementTypes.Port_Shape, UMLElementTypes.Port_Shape, UMLElementTypes.Generalization_Edge); } private void initConfLinkOwnedByParent() { diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramTopNode.java index b4c73e83b43..9c7948b4d9d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramTopNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestComponentDiagramTopNode.java @@ -56,7 +56,7 @@ public class TestComponentDiagramTopNode extends TestTopNode { @Override protected CreateViewRequest createViewRequestShapeContainer() { - return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_3200, getDiagramEditPart().getDiagramPreferencesHint()); + return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_Shape, getDiagramEditPart().getDiagramPreferencesHint()); } /** @@ -64,7 +64,7 @@ public class TestComponentDiagramTopNode extends TestTopNode { */ @Test public void testToManagePackage() { - testToManageNode(UMLElementTypes.Package_3200, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_3200, true); + testToManageNode(UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_Shape, true); } /** @@ -72,7 +72,7 @@ public class TestComponentDiagramTopNode extends TestTopNode { */ @Test public void testToManageModel() { - testToManageNode(UMLElementTypes.Model_3202, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_3200, true); + testToManageNode(UMLElementTypes.Model_Shape, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_Shape, true); } /** @@ -80,7 +80,7 @@ public class TestComponentDiagramTopNode extends TestTopNode { */ @Test public void testToManageComponent() { - testToManageNode(UMLElementTypes.Component_2002, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Package_3200, true); + testToManageNode(UMLElementTypes.Component_PackagedElementShape, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Package_Shape, true); } @@ -89,7 +89,7 @@ public class TestComponentDiagramTopNode extends TestTopNode { */ @Test public void testToManageInterface() { - testToManageNode(UMLElementTypes.Interface_3205, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Package_3200, true); + testToManageNode(UMLElementTypes.Interface_ClassifierShape, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Package_Shape, true); } @@ -98,7 +98,7 @@ public class TestComponentDiagramTopNode extends TestTopNode { */ @Test public void testToManageComment() { - testToManageNode(UMLElementTypes.Comment_3201, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_3200, true); + testToManageNode(UMLElementTypes.Comment_Shape, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_Shape, true); } @@ -107,7 +107,7 @@ public class TestComponentDiagramTopNode extends TestTopNode { */ @Test public void testToManageConstraint() { - testToManageNode(UMLElementTypes.Constraint_3199, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_3200, true); + testToManageNode(UMLElementTypes.Constraint_Shape, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_Shape, true); } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestPortLocation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestPortLocation.java index 32ac8fd237a..5efd132fb6b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestPortLocation.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/canonical/TestPortLocation.java @@ -33,16 +33,16 @@ public class TestPortLocation extends org.eclipse.papyrus.uml.diagram.tests.cano @Test
public void testComponentPortLocation() {
- testPortLocation(UMLElementTypes.Component_2002);
+ testPortLocation(UMLElementTypes.Component_PackagedElementShape);
}
@Test
public void testComponentPartPortLocation() {
- testPortLocation(UMLElementTypes.Component_2002, ComponentCompositeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Property_3079);
+ testPortLocation(UMLElementTypes.Component_PackagedElementShape, ComponentCompositeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Property_Shape);
}
@Override
protected IElementType getPortType() {
- return UMLElementTypes.Port_3069;
+ return UMLElementTypes.Port_Shape;
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java index 1bb985fc6b0..419b523a87f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load1000ComponentTest.java @@ -62,7 +62,7 @@ public class Load1000ComponentTest extends AbstractPapyrusTestCase { @Test
public void testLoad1000Component() {
for(int i = 0; i < 1000; i++) {
- testToCreateANode(UMLElementTypes.Component_2002);
+ testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java index 65969e27832..c85cf41a084 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load100ComponentTest.java @@ -62,7 +62,7 @@ public class Load100ComponentTest extends AbstractPapyrusTestCase { @Test
public void testLoad100Component() {
for(int i = 0; i < 100; i++) {
- testToCreateANode(UMLElementTypes.Component_2002);
+ testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java index 92263cdf523..bbd3479fd4f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load10ComponentTest.java @@ -62,7 +62,7 @@ public class Load10ComponentTest extends AbstractPapyrusTestCase { @Test
public void testLoad10Component() {
for(int i = 0; i < 10; i++) {
- testToCreateANode(UMLElementTypes.Component_2002);
+ testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java index 85b9a4b1836..3db39006ecb 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load200ComponentTest.java @@ -62,7 +62,7 @@ public class Load200ComponentTest extends AbstractPapyrusTestCase { @Test
public void testLoad200Component() {
for(int i = 0; i < 200; i++) {
- testToCreateANode(UMLElementTypes.Component_2002);
+ testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java index a3f4d0f1006..12789f5e99d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load300ComponentTest.java @@ -62,7 +62,7 @@ public class Load300ComponentTest extends AbstractPapyrusTestCase { @Test
public void testLoad300Component() {
for(int i = 0; i < 300; i++) {
- testToCreateANode(UMLElementTypes.Component_2002);
+ testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java index c15854ebdeb..3ea5b665c0f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load400ComponentTest.java @@ -62,7 +62,7 @@ public class Load400ComponentTest extends AbstractPapyrusTestCase { @Test
public void testLoad400Component() {
for(int i = 0; i < 400; i++) {
- testToCreateANode(UMLElementTypes.Component_2002);
+ testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java index 1677c07e401..def277e05c8 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/src/org/eclipse/papyrus/uml/diagram/component/test/load/Load500ComponentTest.java @@ -62,7 +62,7 @@ public class Load500ComponentTest extends AbstractPapyrusTestCase { @Test
public void testLoad500Component() {
for(int i = 0; i < 500; i++) {
- testToCreateANode(UMLElementTypes.Component_2002);
+ testToCreateANode(UMLElementTypes.Component_PackagedElementShape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/model/copyPaste/ConstraintPasteStrategy.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/model/copyPaste/ConstraintPasteStrategy.notation index c16ef34cc6e..d2b69ef1930 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/model/copyPaste/ConstraintPasteStrategy.notation +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/model/copyPaste/ConstraintPasteStrategy.notation @@ -1,36 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> <notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_4PWoMF0vEeWrbP7DiPc3Mg" type="CompositeStructure" name="ConstraintCompositeStructureDiagram" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_GJ7ssF0wEeWrbP7DiPc3Mg" type="2073"> - <children xmi:type="notation:DecorationNode" xmi:id="_GJ860F0wEeWrbP7DiPc3Mg" type="5156"/> - <children xmi:type="notation:DecorationNode" xmi:id="_GJ860V0wEeWrbP7DiPc3Mg" type="6089"> + <children xmi:type="notation:Shape" xmi:id="_GJ7ssF0wEeWrbP7DiPc3Mg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_GJ860F0wEeWrbP7DiPc3Mg" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_GJ860V0wEeWrbP7DiPc3Mg" type="Class_FloatingNameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_GJ860l0wEeWrbP7DiPc3Mg" y="5"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_GJ86010wEeWrbP7DiPc3Mg" type="7073"> - <children xmi:type="notation:Shape" xmi:id="_KJy0gF0wEeWrbP7DiPc3Mg" type="3120"> - <children xmi:type="notation:DecorationNode" xmi:id="_KJzbkF0wEeWrbP7DiPc3Mg" type="6048"/> - <children xmi:type="notation:DecorationNode" xmi:id="_KJzbkV0wEeWrbP7DiPc3Mg" type="6049"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_8uRFAM6lEeWouI9Op8khTQ" type="Class_StructureCompartment"> + <children xmi:type="notation:Shape" xmi:id="_8uRFAc6lEeWouI9Op8khTQ" type="Constraint_Shape_CN"> + <children xmi:type="notation:DecorationNode" xmi:id="_8uRFAs6lEeWouI9Op8khTQ" type="Constraint_NameLabel_CN"/> + <children xmi:type="notation:DecorationNode" xmi:id="_8uRFA86lEeWouI9Op8khTQ" type="Constraint_BodyLabel_CN"/> <element xmi:type="uml:Constraint" href="ConstraintPasteStrategy.uml#_KJt8AF0wEeWrbP7DiPc3Mg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KJy0gV0wEeWrbP7DiPc3Mg" x="68" y="75"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8uRFBM6lEeWouI9Op8khTQ" x="68" y="75"/> </children> - <styles xmi:type="notation:TitleStyle" xmi:id="_GJ861F0wEeWrbP7DiPc3Mg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GJ861V0wEeWrbP7DiPc3Mg"/> + <styles xmi:type="notation:TitleStyle" xmi:id="_8uRFBc6lEeWouI9Op8khTQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8uRFBs6lEeWouI9Op8khTQ"/> </children> <element xmi:type="uml:Class" href="ConstraintPasteStrategy.uml#_GJ4CUF0wEeWrbP7DiPc3Mg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GJ7ssV0wEeWrbP7DiPc3Mg" x="113" y="135" width="236" height="232"/> </children> - <children xmi:type="notation:Shape" xmi:id="_IXOqsF0wEeWrbP7DiPc3Mg" type="2073"> - <children xmi:type="notation:DecorationNode" xmi:id="_IXOqsl0wEeWrbP7DiPc3Mg" type="5156"/> - <children xmi:type="notation:DecorationNode" xmi:id="_IXOqs10wEeWrbP7DiPc3Mg" type="6089"> + <children xmi:type="notation:Shape" xmi:id="_IXOqsF0wEeWrbP7DiPc3Mg" type="Class_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_IXOqsl0wEeWrbP7DiPc3Mg" type="Class_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_IXOqs10wEeWrbP7DiPc3Mg" type="Class_FloatingNameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_IXOqtF0wEeWrbP7DiPc3Mg" y="5"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_IXOqtV0wEeWrbP7DiPc3Mg" type="7073"> - <styles xmi:type="notation:TitleStyle" xmi:id="_IXOqtl0wEeWrbP7DiPc3Mg"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IXOqt10wEeWrbP7DiPc3Mg"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_8uUvYM6lEeWouI9Op8khTQ" type="Class_StructureCompartment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_8uUvYc6lEeWouI9Op8khTQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8uUvYs6lEeWouI9Op8khTQ"/> </children> <element xmi:type="uml:Class" href="ConstraintPasteStrategy.uml#_IXNckF0wEeWrbP7DiPc3Mg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IXOqsV0wEeWrbP7DiPc3Mg" x="614" y="128" width="248" height="239"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_4PWoMV0vEeWrbP7DiPc3Mg" name="diagram_compatibility_version" stringValue="1.1.0"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_4PWoMV0vEeWrbP7DiPc3Mg" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_4PWoMl0vEeWrbP7DiPc3Mg"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_4PWoM10vEeWrbP7DiPc3Mg"> <owner xmi:type="uml:Model" href="ConstraintPasteStrategy.uml#_4POsYF0vEeWrbP7DiPc3Mg"/> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramActivityChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramActivityChildNode.java index 7e4965c5a06..17920674c14 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramActivityChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramActivityChildNode.java @@ -43,7 +43,7 @@ public class TestCompositeDiagramActivityChildNode extends TestChildNode { @Override
protected CreateViewRequest createViewRequestShapeContainer() {
- return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Activity_2060, getDiagramEditPart().getDiagramPreferencesHint());
+ return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Activity_Shape, getDiagramEditPart().getDiagramPreferencesHint());
}
@Override
@@ -62,7 +62,7 @@ public class TestCompositeDiagramActivityChildNode extends TestChildNode { @Test
public void testToParameter() {
setTestAffixedNode(true);
- testToManageNode(UMLElementTypes.Parameter_3088, UMLPackage.eINSTANCE.getParameter(), UMLElementTypes.Activity_2060, false, 4, 0, 1, 1, false, null, 0);
+ testToManageNode(UMLElementTypes.Parameter_Shape, UMLPackage.eINSTANCE.getParameter(), UMLElementTypes.Activity_Shape, false, 4, 0, 1, 1, false, null, 0);
setTestAffixedNode(false);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramChildLabel.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramChildLabel.java index 5013463e2e3..1168fab2afd 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramChildLabel.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramChildLabel.java @@ -57,7 +57,7 @@ public class TestCompositeDiagramChildLabel extends TestChildLabel { @Test
@FailingTest
public void testToProperty() {
- testToManageTopNodeWithMask(UMLElementTypes.DataType_2068,UMLElementTypes.Property_3101, DataTypeAttributeCompartmentEditPart.VISUAL_ID,null);
+ testToManageTopNodeWithMask(UMLElementTypes.DataType_Shape,UMLElementTypes.Property_AttributeLabel, DataTypeAttributeCompartmentEditPart.VISUAL_ID,null);
}
/**
* Test to manage Operation.
@@ -65,7 +65,7 @@ public class TestCompositeDiagramChildLabel extends TestChildLabel { @Test
@FailingTest
public void testToOperation() {
- testToManageTopNodeWithMask(UMLElementTypes.DataType_2068,UMLElementTypes.Operation_3102, DataTypeOperationCompartmentEditPart.VISUAL_ID,null);
+ testToManageTopNodeWithMask(UMLElementTypes.DataType_Shape,UMLElementTypes.Operation_OperationLabel, DataTypeOperationCompartmentEditPart.VISUAL_ID,null);
}
/**
* Test to manage EnumerationLiteral.
@@ -73,7 +73,7 @@ public class TestCompositeDiagramChildLabel extends TestChildLabel { @Test
@FailingTest
public void testToEnumerationLiteral() {
- testToManageTopNode(UMLElementTypes.Enumeration_2067,UMLElementTypes.EnumerationLiteral_3066, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID,null);
+ testToManageTopNode(UMLElementTypes.Enumeration_Shape,UMLElementTypes.EnumerationLiteral_LiteralLabel, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID,null);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramCompositeChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramCompositeChildNode.java index 3e36f72a781..d366265c00a 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramCompositeChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramCompositeChildNode.java @@ -44,7 +44,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Override
protected CreateViewRequest createViewRequestShapeContainer() {
- return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_2073, getDiagramEditPart().getDiagramPreferencesHint());
+ return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_Shape, getDiagramEditPart().getDiagramPreferencesHint());
}
@Override
@@ -63,7 +63,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { */
@Test
public void testToProperty() {
- testToManageNodeWithMask(UMLElementTypes.Property_3070, UMLPackage.eINSTANCE.getProperty(), UMLElementTypes.Class_2073, false, "Attribute", 0);
+ testToManageNodeWithMask(UMLElementTypes.Property_Shape, UMLPackage.eINSTANCE.getProperty(), UMLElementTypes.Class_Shape, false, "Attribute", 0);
}
/**
@@ -71,7 +71,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { */
@Test
public void testToCollaborationUse() {
- testToManageNode(UMLElementTypes.CollaborationUse_3071, UMLPackage.eINSTANCE.getCollaborationUse(), UMLElementTypes.Class_2073, false);
+ testToManageNode(UMLElementTypes.CollaborationUse_Shape, UMLPackage.eINSTANCE.getCollaborationUse(), UMLElementTypes.Class_Shape, false);
}
/**
@@ -80,7 +80,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToActivity() {
- testToManageNode(UMLElementTypes.Activity_3072, UMLPackage.eINSTANCE.getActivity(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.Activity_Shape_CN, UMLPackage.eINSTANCE.getActivity(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -89,7 +89,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToInteraction() {
- testToManageNode(UMLElementTypes.Interaction_3073, UMLPackage.eINSTANCE.getInteraction(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.Interaction_Shape_CN, UMLPackage.eINSTANCE.getInteraction(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -98,7 +98,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToProtocolStateMachine() {
- testToManageNode(UMLElementTypes.ProtocolStateMachine_3074, UMLPackage.eINSTANCE.getProtocolStateMachine(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.ProtocolStateMachine_Shape_CN, UMLPackage.eINSTANCE.getProtocolStateMachine(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -107,7 +107,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToStateMachine() {
- testToManageNode(UMLElementTypes.StateMachine_3075, UMLPackage.eINSTANCE.getStateMachine(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.StateMachine_Shape_CN, UMLPackage.eINSTANCE.getStateMachine(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -116,7 +116,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToFunctionBehavior() {
- testToManageNode(UMLElementTypes.FunctionBehavior_3076, UMLPackage.eINSTANCE.getFunctionBehavior(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.FunctionBehavior_Shape_CN, UMLPackage.eINSTANCE.getFunctionBehavior(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -125,7 +125,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToOpaqueBehavior() {
- testToManageNode(UMLElementTypes.OpaqueBehavior_3077, UMLPackage.eINSTANCE.getOpaqueBehavior(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.OpaqueBehavior_Shape_CN, UMLPackage.eINSTANCE.getOpaqueBehavior(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -134,7 +134,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToComponent() {
- testToManageNode(UMLElementTypes.Component_3081, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.Component_Shape_CN, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -143,7 +143,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToDevice() {
- testToManageNode(UMLElementTypes.Device_3082, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.Device_Shape_CN, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -152,7 +152,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToExecutionEnvironment() {
- testToManageNode(UMLElementTypes.ExecutionEnvironment_3083, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Class_2073, false);
+ testToManageNode(UMLElementTypes.ExecutionEnvironment_Shape_CN, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Class_Shape, false);
}
/**
@@ -161,7 +161,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToNode() {
- testToManageNode(UMLElementTypes.Node_3084, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.Node_Shape_CN, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -170,7 +170,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToClass() {
- testToManageNode(UMLElementTypes.Class_3085, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.Class_Shape_CN, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -179,7 +179,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToCollaboration() {
- testToManageNode(UMLElementTypes.Collaboration_3086, UMLPackage.eINSTANCE.getCollaboration(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.Collaboration_Shape_CN, UMLPackage.eINSTANCE.getCollaboration(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -188,7 +188,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToInterface() {
- testToManageNode(UMLElementTypes.Interface_3087, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.Interface_Shape_CN, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -197,7 +197,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToPrimitiveType() {
- testToManageNode(UMLElementTypes.PrimitiveType_3078, UMLPackage.eINSTANCE.getPrimitiveType(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.PrimitiveType_Shape_CN, UMLPackage.eINSTANCE.getPrimitiveType(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -206,7 +206,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToEnumeration() {
- testToManageNode(UMLElementTypes.Enumeration_3079, UMLPackage.eINSTANCE.getEnumeration(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.Enumeration_Shape_CN, UMLPackage.eINSTANCE.getEnumeration(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -215,7 +215,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToDataType() {
- testToManageNode(UMLElementTypes.DataType_3080, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.DataType_Shape_CN, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -224,7 +224,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToActor() {
- testToManageNode(UMLElementTypes.Actor_3091, UMLPackage.eINSTANCE.getActor(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.Actor_Shape_CN, UMLPackage.eINSTANCE.getActor(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -233,7 +233,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToDeploymentSpecification() {
- testToManageNode(UMLElementTypes.DeploymentSpecification_3092, UMLPackage.eINSTANCE.getDeploymentSpecification(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.DeploymentSpecification_Shape_CN, UMLPackage.eINSTANCE.getDeploymentSpecification(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -242,7 +242,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToArtifact() {
- testToManageNode(UMLElementTypes.Artifact_3093, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.Artifact_Shape_CN, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -251,7 +251,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToInformationItem() {
- testToManageNode(UMLElementTypes.InformationItem_3094, UMLPackage.eINSTANCE.getInformationItem(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.InformationItem_Shape_CN, UMLPackage.eINSTANCE.getInformationItem(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -260,7 +260,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToSignal() {
- testToManageNode(UMLElementTypes.Signal_3095, UMLPackage.eINSTANCE.getSignal(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.Signal_Shape_CN, UMLPackage.eINSTANCE.getSignal(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -269,7 +269,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToUseCase() {
- testToManageNode(UMLElementTypes.UseCase_3096, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.UseCase_Shape_CN, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -277,7 +277,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { */
@Test
public void testToComment() {
- testToManageNode(UMLElementTypes.Comment_3097, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Class_2073, false);
+ testToManageNode(UMLElementTypes.Comment_Shape_CN, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Class_Shape, false);
}
/**
@@ -286,7 +286,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToDurationConstraint() {
- testToManageNode(UMLElementTypes.DurationConstraint_3116, UMLPackage.eINSTANCE.getDurationConstraint(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.DurationConstraint_Shape_CN, UMLPackage.eINSTANCE.getDurationConstraint(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -295,7 +295,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToTimeConstraint() {
- testToManageNode(UMLElementTypes.TimeConstraint_3117, UMLPackage.eINSTANCE.getTimeConstraint(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.TimeConstraint_Shape_CN, UMLPackage.eINSTANCE.getTimeConstraint(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -304,7 +304,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToIntervalConstraint() {
- testToManageNode(UMLElementTypes.IntervalConstraint_3118, UMLPackage.eINSTANCE.getIntervalConstraint(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.IntervalConstraint_Shape_CN, UMLPackage.eINSTANCE.getIntervalConstraint(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -313,7 +313,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
@InteractiveTest
public void testToInteractionConstraint() {
- testToManageNode(UMLElementTypes.InteractionConstraint_3119, UMLPackage.eINSTANCE.getInteractionConstraint(), UMLElementTypes.Class_2073, true);
+ testToManageNode(UMLElementTypes.InteractionConstraint_Shape_CN, UMLPackage.eINSTANCE.getInteractionConstraint(), UMLElementTypes.Class_Shape, true);
}
/**
@@ -321,7 +321,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { */
@Test
public void testToConstraint() {
- testToManageNode(UMLElementTypes.Constraint_3120, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Class_2073, false);
+ testToManageNode(UMLElementTypes.Constraint_Shape_CN, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Class_Shape, false);
}
/**
@@ -330,7 +330,7 @@ public class TestCompositeDiagramCompositeChildNode extends TestChildNode { @Test
public void testToPort() {
setTestAffixedNode(true);
- testToManageNode(UMLElementTypes.Port_3069, UMLPackage.eINSTANCE.getPort(), UMLElementTypes.Class_2073, false, 4, 0, 1, 1, true, null, 0);
+ testToManageNode(UMLElementTypes.Port_Shape, UMLPackage.eINSTANCE.getPort(), UMLElementTypes.Class_Shape, false, 4, 0, 1, 1, true, null, 0);
setTestAffixedNode(false);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramDropOntoChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramDropOntoChildNode.java index 5754d5c5d54..a0db7637940 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramDropOntoChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramDropOntoChildNode.java @@ -59,7 +59,7 @@ public class TestCompositeDiagramDropOntoChildNode extends TestChildNode { @Override protected CreateViewRequest createViewRequestShapeContainer() { - return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_2073, getDiagramEditPart().getDiagramPreferencesHint()); + return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_Shape, getDiagramEditPart().getDiagramPreferencesHint()); } @Override @@ -79,7 +79,7 @@ public class TestCompositeDiagramDropOntoChildNode extends TestChildNode { @Test public void dropAssociationOntoPart_bug470823() { // first, create a part in the diagram - testToCreateANode(UMLElementTypes.Property_3070, 0, 0, 1, 1, true, "Attribute", 0); + testToCreateANode(UMLElementTypes.Property_Shape, 0, 0, 1, 1, true, "Attribute", 0); EditPart partEditPart = (EditPart) getContainerEditPart().getChildren().get((getContainerEditPart().getChildren().size() - 1)); // then, create an association between two classes diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithDifferentParentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithDifferentParentLink.java index 15e1a6f495e..af5f367f996 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithDifferentParentLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithDifferentParentLink.java @@ -93,7 +93,7 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink @Override public void setUp() throws Exception { super.setUp(); - parentType = UMLElementTypes.Class_2073; + parentType = UMLElementTypes.Class_Shape; } @@ -157,7 +157,7 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink */ @Test public void testToManagePortConnector() { - testImpossibleToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Connector_4013); + testImpossibleToManageLink(UMLElementTypes.Port_Shape, UMLElementTypes.Port_Shape, UMLElementTypes.Connector_Edge); } /** @@ -166,7 +166,7 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink @Test public void testToManagePortUsage() { initConfLinkOwnedByParent(); - testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Usage_4008, UMLElementTypes.Class_2073, true); + testToManageLink(UMLElementTypes.Port_Shape, UMLElementTypes.Port_Shape, UMLElementTypes.Usage_Edge, UMLElementTypes.Class_Shape, true); } /** @@ -175,7 +175,7 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink @Test public void testToManagePortAbstraction() { initConfLinkOwnedByParent(); - testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Abstraction_4007, UMLElementTypes.Class_2073, true); + testToManageLink(UMLElementTypes.Port_Shape, UMLElementTypes.Port_Shape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Class_Shape, true); } @@ -184,7 +184,7 @@ public class TestCompositeDiagramElementWithDifferentParentLink extends TestLink */ @Test public void testToManagePortGeneralization() { - testImpossibleToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Generalization_4015); + testImpossibleToManageLink(UMLElementTypes.Port_Shape, UMLElementTypes.Port_Shape, UMLElementTypes.Generalization_Edge); } } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java index b9f6b7fc634..2f9bfc59c40 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java @@ -90,7 +90,7 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP @Override public void setUp() throws Exception { super.setUp(); - parentType = UMLElementTypes.Class_2073; + parentType = UMLElementTypes.Class_Shape; } @@ -162,7 +162,7 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP @Test public void testToManagePortConnector() { initConfLinkOwnedByParent(); - testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Connector_4013, UMLElementTypes.Class_2073, true); + testToManageLink(UMLElementTypes.Port_Shape, UMLElementTypes.Port_Shape, UMLElementTypes.Connector_Edge, UMLElementTypes.Class_Shape, true); } /** @@ -171,7 +171,7 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP @Test public void testToManagePortUsage() { initConfLinkOwnedByDiagram(); - testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Usage_4008, UMLElementTypes.Class_2073, true); + testToManageLink(UMLElementTypes.Port_Shape, UMLElementTypes.Port_Shape, UMLElementTypes.Usage_Edge, UMLElementTypes.Class_Shape, true); } /** @@ -180,7 +180,7 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP @Test public void testToManagePortAbstraction() { initConfLinkOwnedByDiagram(); - testToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Abstraction_4007, UMLElementTypes.Class_2073, true); + testToManageLink(UMLElementTypes.Port_Shape, UMLElementTypes.Port_Shape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Class_Shape, true); } @@ -189,7 +189,7 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP */ @Test public void testToManagePortGeneralization() { - testImpossibleToManageLink(UMLElementTypes.Port_3069, UMLElementTypes.Port_3069, UMLElementTypes.Generalization_4015); + testImpossibleToManageLink(UMLElementTypes.Port_Shape, UMLElementTypes.Port_Shape, UMLElementTypes.Generalization_Edge); } /** @@ -198,7 +198,7 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP @Test @InteractiveTest public void testToDeployment() { - testToManageLink(UMLElementTypes.Node_3084, UMLElementTypes.DeploymentSpecification_3092, UMLElementTypes.Deployment_4009, UMLElementTypes.Class_2073, true); + testToManageLink(UMLElementTypes.Node_Shape_CN, UMLElementTypes.DeploymentSpecification_Shape_CN, UMLElementTypes.Deployment_Edge, UMLElementTypes.Class_Shape, true); } } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramLinkOwnedBySource.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramLinkOwnedBySource.java index 55c97508aa4..3fabd11bc30 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramLinkOwnedBySource.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramLinkOwnedBySource.java @@ -71,7 +71,7 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource */ @Test public void testToManageGeneralization() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Generalization_4015, UMLElementTypes.Package_1000, false); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_CompositeStructureDiagram, false); } @@ -80,7 +80,7 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource */ @Test public void testClassToCollaborationGeneralization() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Collaboration_2075, UMLElementTypes.Generalization_4015, UMLElementTypes.Package_1000, false); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Collaboration_Shape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_CompositeStructureDiagram, false); } /** @@ -88,7 +88,7 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource */ @Test public void testCollaborationToClassGeneralization() { - testToManageLink(UMLElementTypes.Collaboration_2075, UMLElementTypes.Class_2073, UMLElementTypes.Generalization_4015, UMLElementTypes.Package_1000, false); + testToManageLink(UMLElementTypes.Collaboration_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_CompositeStructureDiagram, false); } /** @@ -97,7 +97,7 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource @Test @InvalidTest public void testToComponentRealization() { - testToManageLink(UMLElementTypes.Component_2069, UMLElementTypes.Interface_2076, UMLElementTypes.ComponentRealization_4004, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Component_Shape, UMLElementTypes.Interface_Shape, UMLElementTypes.ComponentRealization_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } /** @@ -105,7 +105,7 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource */ @Test public void testToManageActivitySubstitution() { - testToManageLink(UMLElementTypes.Activity_2060, UMLElementTypes.Activity_2060, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, false); + testToManageLink(UMLElementTypes.Activity_Shape, UMLElementTypes.Activity_Shape, UMLElementTypes.Substitution_Edge, UMLElementTypes.Package_CompositeStructureDiagram, false); } /** @@ -113,7 +113,7 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource */ @Test public void testToManageStateMachineSubstitution() { - testToManageLink(UMLElementTypes.StateMachine_2063, UMLElementTypes.StateMachine_2063, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, false); + testToManageLink(UMLElementTypes.StateMachine_Shape, UMLElementTypes.StateMachine_Shape, UMLElementTypes.Substitution_Edge, UMLElementTypes.Package_CompositeStructureDiagram, false); } /** @@ -121,7 +121,7 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource */ @Test public void testToManageCollaborationSubstitution() { - testToManageLink(UMLElementTypes.Collaboration_2075, UMLElementTypes.Collaboration_2075, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, false); + testToManageLink(UMLElementTypes.Collaboration_Shape, UMLElementTypes.Collaboration_Shape, UMLElementTypes.Substitution_Edge, UMLElementTypes.Package_CompositeStructureDiagram, false); } /** @@ -129,7 +129,7 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource */ @Test public void testToSubstitution() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, false); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Substitution_Edge, UMLElementTypes.Package_CompositeStructureDiagram, false); } /** @@ -137,7 +137,7 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource */ @Test public void testToManageClassSubstitution() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Substitution_4011, UMLElementTypes.Package_1000, false); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Substitution_Edge, UMLElementTypes.Package_CompositeStructureDiagram, false); } @@ -147,7 +147,7 @@ public class TestCompositeDiagramLinkOwnedBySource extends TestLinkOwnedBySource */ @Test public void testToInterfaceRealization() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Interface_2076, UMLElementTypes.InterfaceRealization_4005, UMLElementTypes.Package_1000, false); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Interface_Shape, UMLElementTypes.InterfaceRealization_Edge, UMLElementTypes.Package_CompositeStructureDiagram, false); } } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramSimpleLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramSimpleLink.java index d9649d559b3..3cadffe0464 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramSimpleLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramSimpleLink.java @@ -73,7 +73,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageClassUsage() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Usage_4008, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } /** @@ -81,7 +81,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageClassDependency() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Dependency_4010, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } /** @@ -89,7 +89,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageClassAbstraction() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Abstraction_4007, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } /** @@ -97,7 +97,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageClassRealization() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Realization_4006, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Realization_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } // Activity @@ -106,7 +106,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageActivityUsage() { - testToManageLink(UMLElementTypes.Activity_2060, UMLElementTypes.Activity_2060, UMLElementTypes.Usage_4008, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Activity_Shape, UMLElementTypes.Activity_Shape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } @@ -116,7 +116,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageActivityDependency() { - testToManageLink(UMLElementTypes.Activity_2060, UMLElementTypes.Activity_2060, UMLElementTypes.Dependency_4010, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Activity_Shape, UMLElementTypes.Activity_Shape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } /** @@ -124,7 +124,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageActivityAbstraction() { - testToManageLink(UMLElementTypes.Activity_2060, UMLElementTypes.Activity_2060, UMLElementTypes.Abstraction_4007, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Activity_Shape, UMLElementTypes.Activity_Shape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } /** @@ -132,7 +132,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageActivityRealization() { - testToManageLink(UMLElementTypes.Activity_2060, UMLElementTypes.Activity_2060, UMLElementTypes.Realization_4006, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Activity_Shape, UMLElementTypes.Activity_Shape, UMLElementTypes.Realization_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } @@ -142,7 +142,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageStateMachineUsage() { - testToManageLink(UMLElementTypes.StateMachine_2063, UMLElementTypes.StateMachine_2063, UMLElementTypes.Usage_4008, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.StateMachine_Shape, UMLElementTypes.StateMachine_Shape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } @@ -151,7 +151,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageStateMachineDependency() { - testToManageLink(UMLElementTypes.StateMachine_2063, UMLElementTypes.StateMachine_2063, UMLElementTypes.Dependency_4010, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.StateMachine_Shape, UMLElementTypes.StateMachine_Shape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } /** @@ -159,7 +159,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageStateMachineAbstraction() { - testToManageLink(UMLElementTypes.StateMachine_2063, UMLElementTypes.StateMachine_2063, UMLElementTypes.Abstraction_4007, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.StateMachine_Shape, UMLElementTypes.StateMachine_Shape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } /** @@ -167,7 +167,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageStateMachineRealization() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Realization_4006, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Realization_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } @@ -177,7 +177,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageCollaborationUsage() { - testToManageLink(UMLElementTypes.Collaboration_2075, UMLElementTypes.Collaboration_2075, UMLElementTypes.Usage_4008, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Collaboration_Shape, UMLElementTypes.Collaboration_Shape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } @@ -186,7 +186,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageCollaborationDependency() { - testToManageLink(UMLElementTypes.Collaboration_2075, UMLElementTypes.Collaboration_2075, UMLElementTypes.Dependency_4010, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Collaboration_Shape, UMLElementTypes.Collaboration_Shape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } /** @@ -194,7 +194,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageCollaborationAbstraction() { - testToManageLink(UMLElementTypes.Collaboration_2075, UMLElementTypes.Collaboration_2075, UMLElementTypes.Abstraction_4007, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Collaboration_Shape, UMLElementTypes.Collaboration_Shape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } /** @@ -202,7 +202,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManageCollaborationRealization() { - testToManageLink(UMLElementTypes.Collaboration_2075, UMLElementTypes.Collaboration_2075, UMLElementTypes.Realization_4006, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Collaboration_Shape, UMLElementTypes.Collaboration_Shape, UMLElementTypes.Realization_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } @@ -211,7 +211,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToRealization() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Realization_4006, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Realization_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } /** @@ -219,7 +219,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToManifestation() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Manifestation_4012, UMLElementTypes.Package_1000, false); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Manifestation_Edge, UMLElementTypes.Package_CompositeStructureDiagram, false); } /** @@ -227,7 +227,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToAbstraction() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Abstraction_4007, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Abstraction_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } /** @@ -235,7 +235,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { */ @Test public void testToUsage() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.Usage_4008, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Usage_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } @@ -245,7 +245,7 @@ public class TestCompositeDiagramSimpleLink extends TestLink { @Test @InteractiveTest public void testToInformationFlow() { - testToManageLink(UMLElementTypes.Class_2073, UMLElementTypes.Class_2073, UMLElementTypes.InformationFlow_4021, UMLElementTypes.Package_1000, true); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.InformationFlow_Edge, UMLElementTypes.Package_CompositeStructureDiagram, true); } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramTopNode.java index 46be94d8f31..c249bc681e9 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramTopNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramTopNode.java @@ -72,7 +72,7 @@ public class TestCompositeDiagramTopNode extends TestTopNode { */ @Override protected CreateViewRequest createViewRequestShapeContainer() { - return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_2073, getDiagramEditPart().getDiagramPreferencesHint()); + return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_Shape, getDiagramEditPart().getDiagramPreferencesHint()); } /** @@ -80,342 +80,342 @@ public class TestCompositeDiagramTopNode extends TestTopNode { */ @Test public void testToActivity() { - testToManageNode(UMLElementTypes.Activity_2060, UMLPackage.eINSTANCE.getActivity(), UMLElementTypes.Activity_2060, false); + testToManageNode(UMLElementTypes.Activity_Shape, UMLPackage.eINSTANCE.getActivity(), UMLElementTypes.Activity_Shape, false); } /** * Test to manage Interaction. */ @Test public void testToInteraction() { - testToManageNode(UMLElementTypes.Interaction_2061, UMLPackage.eINSTANCE.getInteraction(), UMLElementTypes.Interaction_2061, false); + testToManageNode(UMLElementTypes.Interaction_Shape, UMLPackage.eINSTANCE.getInteraction(), UMLElementTypes.Interaction_Shape, false); } /** * Test to manage ProtocolStateMachine. */ @Test public void testToProtocolStateMachine() { - testToManageNode(UMLElementTypes.ProtocolStateMachine_2062, UMLPackage.eINSTANCE.getProtocolStateMachine(), UMLElementTypes.ProtocolStateMachine_2062, false); + testToManageNode(UMLElementTypes.ProtocolStateMachine_Shape, UMLPackage.eINSTANCE.getProtocolStateMachine(), UMLElementTypes.ProtocolStateMachine_Shape, false); } /** * Test to manage StateMachine. */ @Test public void testToStateMachine() { - testToManageNode(UMLElementTypes.StateMachine_2063, UMLPackage.eINSTANCE.getStateMachine(), UMLElementTypes.StateMachine_2063, false); + testToManageNode(UMLElementTypes.StateMachine_Shape, UMLPackage.eINSTANCE.getStateMachine(), UMLElementTypes.StateMachine_Shape, false); } /** * Test to manage FunctionBehavior. */ @Test public void testToFunctionBehavior() { - testToManageNode(UMLElementTypes.FunctionBehavior_2064, UMLPackage.eINSTANCE.getFunctionBehavior(), UMLElementTypes.FunctionBehavior_2064, false); + testToManageNode(UMLElementTypes.FunctionBehavior_Shape, UMLPackage.eINSTANCE.getFunctionBehavior(), UMLElementTypes.FunctionBehavior_Shape, false); } /** * Test to manage OpaqueBehavior. */ @Test public void testToOpaqueBehavior() { - testToManageNode(UMLElementTypes.OpaqueBehavior_2065, UMLPackage.eINSTANCE.getOpaqueBehavior(), UMLElementTypes.OpaqueBehavior_2065, false); + testToManageNode(UMLElementTypes.OpaqueBehavior_Shape, UMLPackage.eINSTANCE.getOpaqueBehavior(), UMLElementTypes.OpaqueBehavior_Shape, false); } /** * Test to manage Component. */ @Test public void testToComponent() { - testToManageNode(UMLElementTypes.Component_2069, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Component_2069, false); + testToManageNode(UMLElementTypes.Component_Shape, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Component_Shape, false); } /** * Test to manage Device. */ @Test public void testToDevice() { - testToManageNode(UMLElementTypes.Device_2070, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Device_2070, false); + testToManageNode(UMLElementTypes.Device_Shape, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Device_Shape, false); } /** * Test to manage ExecutionEnvironment. */ @Test public void testToExecutionEnvironment() { - testToManageNode(UMLElementTypes.ExecutionEnvironment_2071, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.ExecutionEnvironment_2071, false); + testToManageNode(UMLElementTypes.ExecutionEnvironment_Shape, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.ExecutionEnvironment_Shape, false); } /** * Test to manage Node. */ @Test public void testToNode() { - testToManageNode(UMLElementTypes.Node_2072, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Node_2072, false); + testToManageNode(UMLElementTypes.Node_Shape, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Node_Shape, false); } /** * Test to manage Class. */ @Test public void testToClass() { - testToManageNode(UMLElementTypes.Class_2073, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Class_2073, false); + testToManageNode(UMLElementTypes.Class_Shape, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Class_Shape, false); } /** * Test to manage Collaboration. */ @Test public void testToCollaboration() { - testToManageNode(UMLElementTypes.Collaboration_2075, UMLPackage.eINSTANCE.getCollaboration(), UMLElementTypes.Collaboration_2075, false); + testToManageNode(UMLElementTypes.Collaboration_Shape, UMLPackage.eINSTANCE.getCollaboration(), UMLElementTypes.Collaboration_Shape, false); } /** * Test to manage Interface. */ @Test public void testToInterface() { - testToManageNode(UMLElementTypes.Interface_2076, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Interface_2076, false); + testToManageNode(UMLElementTypes.Interface_Shape, UMLPackage.eINSTANCE.getInterface(), UMLElementTypes.Interface_Shape, false); } /** * Test to manage PrimitiveType. */ @Test public void testToPrimitiveType() { - testToManageNode(UMLElementTypes.PrimitiveType_2066, UMLPackage.eINSTANCE.getPrimitiveType(), UMLElementTypes.PrimitiveType_2066, false); + testToManageNode(UMLElementTypes.PrimitiveType_Shape, UMLPackage.eINSTANCE.getPrimitiveType(), UMLElementTypes.PrimitiveType_Shape, false); } /** * Test to manage Enumeration. */ @Test public void testToEnumeration() { - testToManageNode(UMLElementTypes.Enumeration_2067, UMLPackage.eINSTANCE.getEnumeration(), UMLElementTypes.Enumeration_2067, false); + testToManageNode(UMLElementTypes.Enumeration_Shape, UMLPackage.eINSTANCE.getEnumeration(), UMLElementTypes.Enumeration_Shape, false); } /** * Test to manage DataType. */ @Test public void testToDataType() { - testToManageNode(UMLElementTypes.DataType_2068, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.DataType_2068, false); + testToManageNode(UMLElementTypes.DataType_Shape, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.DataType_Shape, false); } /** * Test to manage Actor. */ @Test public void testToActor() { - testToManageNode(UMLElementTypes.Actor_2077, UMLPackage.eINSTANCE.getActor(), UMLElementTypes.Actor_2077, false); + testToManageNode(UMLElementTypes.Actor_Shape, UMLPackage.eINSTANCE.getActor(), UMLElementTypes.Actor_Shape, false); } /** * Test to manage DeploymentSpecification. */ @Test public void testToDeploymentSpecification() { - testToManageNode(UMLElementTypes.DeploymentSpecification_2078, UMLPackage.eINSTANCE.getDeploymentSpecification(), UMLElementTypes.DeploymentSpecification_2078, false); + testToManageNode(UMLElementTypes.DeploymentSpecification_Shape, UMLPackage.eINSTANCE.getDeploymentSpecification(), UMLElementTypes.DeploymentSpecification_Shape, false); } /** * Test to manage Artifact. */ @Test public void testToArtifact() { - testToManageNode(UMLElementTypes.Artifact_2079, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Artifact_2079, false); + testToManageNode(UMLElementTypes.Artifact_Shape, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Artifact_Shape, false); } /** * Test to manage InformationItem. */ @Test public void testToInformationItem() { - testToManageNode(UMLElementTypes.InformationItem_2080, UMLPackage.eINSTANCE.getInformationItem(), UMLElementTypes.InformationItem_2080, false); + testToManageNode(UMLElementTypes.InformationItem_Shape, UMLPackage.eINSTANCE.getInformationItem(), UMLElementTypes.InformationItem_Shape, false); } /** * Test to manage Signal. */ @Test public void testToSignal() { - testToManageNode(UMLElementTypes.Signal_2081, UMLPackage.eINSTANCE.getSignal(), UMLElementTypes.Signal_2081, false); + testToManageNode(UMLElementTypes.Signal_Shape, UMLPackage.eINSTANCE.getSignal(), UMLElementTypes.Signal_Shape, false); } /** * Test to manage UseCase. */ @Test public void testToUseCase() { - testToManageNode(UMLElementTypes.UseCase_2082, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.UseCase_2082, false); + testToManageNode(UMLElementTypes.UseCase_Shape, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.UseCase_Shape, false); } /** * Test to manage SignalEvent. */ @Test public void testToSignalEvent() { - testToManageNode(UMLElementTypes.SignalEvent_2083, UMLPackage.eINSTANCE.getSignalEvent(), UMLElementTypes.SignalEvent_2083, false); + testToManageNode(UMLElementTypes.SignalEvent_Shape, UMLPackage.eINSTANCE.getSignalEvent(), UMLElementTypes.SignalEvent_Shape, false); } /** * Test to manage CallEvent. */ @Test public void testToCallEvent() { - testToManageNode(UMLElementTypes.CallEvent_2084, UMLPackage.eINSTANCE.getCallEvent(), UMLElementTypes.CallEvent_2084, false); + testToManageNode(UMLElementTypes.CallEvent_Shape, UMLPackage.eINSTANCE.getCallEvent(), UMLElementTypes.CallEvent_Shape, false); } /** * Test to manage AnyReceiveEvent. */ @Test public void testToAnyReceiveEvent() { - testToManageNode(UMLElementTypes.AnyReceiveEvent_2085, UMLPackage.eINSTANCE.getAnyReceiveEvent(), UMLElementTypes.AnyReceiveEvent_2085, false); + testToManageNode(UMLElementTypes.AnyReceiveEvent_Shape, UMLPackage.eINSTANCE.getAnyReceiveEvent(), UMLElementTypes.AnyReceiveEvent_Shape, false); } /** * Test to manage ChangeEvent. */ @Test public void testToChangeEvent() { - testToManageNode(UMLElementTypes.ChangeEvent_2088, UMLPackage.eINSTANCE.getChangeEvent(), UMLElementTypes.ChangeEvent_2088, false); + testToManageNode(UMLElementTypes.ChangeEvent_Shape, UMLPackage.eINSTANCE.getChangeEvent(), UMLElementTypes.ChangeEvent_Shape, false); } /** * Test to manage TimeEvent. */ @Test public void testToTimeEvent() { - testToManageNode(UMLElementTypes.TimeEvent_2089, UMLPackage.eINSTANCE.getTimeEvent(), UMLElementTypes.TimeEvent_2089, false); + testToManageNode(UMLElementTypes.TimeEvent_Shape, UMLPackage.eINSTANCE.getTimeEvent(), UMLElementTypes.TimeEvent_Shape, false); } /** * Test to manage DurationObservation. */ @Test public void testToDurationObservation() { - testToManageNode(UMLElementTypes.DurationObservation_2093, UMLPackage.eINSTANCE.getDurationObservation(), UMLElementTypes.DurationObservation_2093, false); + testToManageNode(UMLElementTypes.DurationObservation_Shape, UMLPackage.eINSTANCE.getDurationObservation(), UMLElementTypes.DurationObservation_Shape, false); } /** * Test to manage TimeObservation. */ @Test public void testToTimeObservation() { - testToManageNode(UMLElementTypes.TimeObservation_2094, UMLPackage.eINSTANCE.getTimeObservation(), UMLElementTypes.TimeObservation_2094, false); + testToManageNode(UMLElementTypes.TimeObservation_Shape, UMLPackage.eINSTANCE.getTimeObservation(), UMLElementTypes.TimeObservation_Shape, false); } /** * Test to manage LiteralBoolean. */ @Test public void testToLiteralBoolean() { - testToManageNode(UMLElementTypes.LiteralBoolean_2095, UMLPackage.eINSTANCE.getLiteralBoolean(), UMLElementTypes.LiteralBoolean_2095, false); + testToManageNode(UMLElementTypes.LiteralBoolean_Shape, UMLPackage.eINSTANCE.getLiteralBoolean(), UMLElementTypes.LiteralBoolean_Shape, false); } /** * Test to manage LiteralInteger. */ @Test public void testToLiteralInteger() { - testToManageNode(UMLElementTypes.LiteralInteger_2096, UMLPackage.eINSTANCE.getLiteralInteger(), UMLElementTypes.LiteralInteger_2096, false); + testToManageNode(UMLElementTypes.LiteralInteger_Shape, UMLPackage.eINSTANCE.getLiteralInteger(), UMLElementTypes.LiteralInteger_Shape, false); } /** * Test to manage LiteralNull. */ @Test public void testToLiteralNull() { - testToManageNode(UMLElementTypes.LiteralNull_2097, UMLPackage.eINSTANCE.getLiteralNull(), UMLElementTypes.LiteralNull_2097, false); + testToManageNode(UMLElementTypes.LiteralNull_Shape, UMLPackage.eINSTANCE.getLiteralNull(), UMLElementTypes.LiteralNull_Shape, false); } /** * Test to manage LiteralString. */ @Test public void testToLiteralString() { - testToManageNode(UMLElementTypes.LiteralString_2098, UMLPackage.eINSTANCE.getLiteralString(), UMLElementTypes.LiteralString_2098, false); + testToManageNode(UMLElementTypes.LiteralString_Shape, UMLPackage.eINSTANCE.getLiteralString(), UMLElementTypes.LiteralString_Shape, false); } /** * Test to manage LiteralUnlimitedNatural. */ @Test public void testToLiteralUnlimitedNatural() { - testToManageNode(UMLElementTypes.LiteralUnlimitedNatural_2099, UMLPackage.eINSTANCE.getLiteralUnlimitedNatural(), UMLElementTypes.LiteralUnlimitedNatural_2099, false); + testToManageNode(UMLElementTypes.LiteralUnlimitedNatural_Shape, UMLPackage.eINSTANCE.getLiteralUnlimitedNatural(), UMLElementTypes.LiteralUnlimitedNatural_Shape, false); } /** * Test to manage StringExpression. */ @Test public void testToStringExpression() { - testToManageNode(UMLElementTypes.StringExpression_2100, UMLPackage.eINSTANCE.getStringExpression(), UMLElementTypes.StringExpression_2100, false); + testToManageNode(UMLElementTypes.StringExpression_PackagedElementShape, UMLPackage.eINSTANCE.getStringExpression(), UMLElementTypes.StringExpression_PackagedElementShape, false); } /** * Test to manage OpaqueExpression. */ @Test public void testToOpaqueExpression() { - testToManageNode(UMLElementTypes.OpaqueExpression_2101, UMLPackage.eINSTANCE.getOpaqueExpression(), UMLElementTypes.OpaqueExpression_2101, false); + testToManageNode(UMLElementTypes.OpaqueExpression_Shape, UMLPackage.eINSTANCE.getOpaqueExpression(), UMLElementTypes.OpaqueExpression_Shape, false); } /** * Test to manage TimeExpression. */ @Test public void testToTimeExpression() { - testToManageNode(UMLElementTypes.TimeExpression_2102, UMLPackage.eINSTANCE.getTimeExpression(), UMLElementTypes.TimeExpression_2102, false); + testToManageNode(UMLElementTypes.TimeExpression_Shape, UMLPackage.eINSTANCE.getTimeExpression(), UMLElementTypes.TimeExpression_Shape, false); } /** * Test to manage Expression. */ @Test public void testToExpression() { - testToManageNode(UMLElementTypes.Expression_2103, UMLPackage.eINSTANCE.getExpression(), UMLElementTypes.Expression_2103, false); + testToManageNode(UMLElementTypes.Expression_Shape, UMLPackage.eINSTANCE.getExpression(), UMLElementTypes.Expression_Shape, false); } /** * Test to manage Duration. */ @Test public void testToDuration() { - testToManageNode(UMLElementTypes.Duration_2104, UMLPackage.eINSTANCE.getDuration(), UMLElementTypes.Duration_2104, false); + testToManageNode(UMLElementTypes.Duration_Shape, UMLPackage.eINSTANCE.getDuration(), UMLElementTypes.Duration_Shape, false); } /** * Test to manage TimeInterval. */ @Test public void testToTimeInterval() { - testToManageNode(UMLElementTypes.TimeInterval_2105, UMLPackage.eINSTANCE.getTimeInterval(), UMLElementTypes.TimeInterval_2105, false); + testToManageNode(UMLElementTypes.TimeInterval_Shape, UMLPackage.eINSTANCE.getTimeInterval(), UMLElementTypes.TimeInterval_Shape, false); } /** * Test to manage DurationInterval. */ @Test public void testToDurationInterval() { - testToManageNode(UMLElementTypes.DurationInterval_2106, UMLPackage.eINSTANCE.getDurationInterval(), UMLElementTypes.DurationInterval_2106, false); + testToManageNode(UMLElementTypes.DurationInterval_Shape, UMLPackage.eINSTANCE.getDurationInterval(), UMLElementTypes.DurationInterval_Shape, false); } /** * Test to manage Interval. */ @Test public void testToInterval() { - testToManageNode(UMLElementTypes.Interval_2107, UMLPackage.eINSTANCE.getInterval(), UMLElementTypes.Interval_2107, false); + testToManageNode(UMLElementTypes.Interval_Shape, UMLPackage.eINSTANCE.getInterval(), UMLElementTypes.Interval_Shape, false); } /** * Test to manage InstanceValue. */ @Test public void testToInstanceValue() { - testToManageNode(UMLElementTypes.InstanceValue_2108, UMLPackage.eINSTANCE.getInstanceValue(), UMLElementTypes.InstanceValue_2108, false); + testToManageNode(UMLElementTypes.InstanceValue_Shape, UMLPackage.eINSTANCE.getInstanceValue(), UMLElementTypes.InstanceValue_Shape, false); } /** * Test to manage Comment. */ @Test public void testToComment() { - testToManageNode(UMLElementTypes.Comment_2109, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Comment_2109, false); + testToManageNode(UMLElementTypes.Comment_Shape, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Comment_Shape, false); } /** * Test to manage DurationConstraint. */ @Test public void testToDurationConstraint() { - testToManageNode(UMLElementTypes.DurationConstraint_2110, UMLPackage.eINSTANCE.getDurationConstraint(), UMLElementTypes.DurationConstraint_2110, false); + testToManageNode(UMLElementTypes.DurationConstraint_Shape, UMLPackage.eINSTANCE.getDurationConstraint(), UMLElementTypes.DurationConstraint_Shape, false); } /** * Test to manage TimeConstraint. */ @Test public void testToTimeConstraint() { - testToManageNode(UMLElementTypes.TimeConstraint_2111, UMLPackage.eINSTANCE.getTimeConstraint(), UMLElementTypes.TimeConstraint_2111, false); + testToManageNode(UMLElementTypes.TimeConstraint_Shape, UMLPackage.eINSTANCE.getTimeConstraint(), UMLElementTypes.TimeConstraint_Shape, false); } /** * Test to manage IntervalConstraint. */ @Test public void testToIntervalConstraint() { - testToManageNode(UMLElementTypes.IntervalConstraint_2112, UMLPackage.eINSTANCE.getIntervalConstraint(), UMLElementTypes.IntervalConstraint_2112, false); + testToManageNode(UMLElementTypes.IntervalConstraint_Shape, UMLPackage.eINSTANCE.getIntervalConstraint(), UMLElementTypes.IntervalConstraint_Shape, false); } /** * Test to manage InteractionConstraint. */ @Test public void testToInteractionConstraint() { - testToManageNode(UMLElementTypes.InteractionConstraint_2113, UMLPackage.eINSTANCE.getInteractionConstraint(), UMLElementTypes.InteractionConstraint_2113, false); + testToManageNode(UMLElementTypes.InteractionConstraint_Shape, UMLPackage.eINSTANCE.getInteractionConstraint(), UMLElementTypes.InteractionConstraint_Shape, false); } /** * Test to manage Constraint. */ @Test public void testToConstraint() { - testToManageNode(UMLElementTypes.Constraint_2114, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Constraint_2114, false); + testToManageNode(UMLElementTypes.Constraint_Shape, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Constraint_Shape, false); } } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestPortLocation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestPortLocation.java index 672c6a67a69..bf1cd30781f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestPortLocation.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestPortLocation.java @@ -27,36 +27,36 @@ public class TestPortLocation extends org.eclipse.papyrus.uml.diagram.tests.cano @Test
public void testStateMachinePortLocation() {
- testPortLocation(UMLElementTypes.StateMachine_2063);
+ testPortLocation(UMLElementTypes.StateMachine_Shape);
}
@Test
public void testProtocolStateMachinePortLocation() {
- testPortLocation(UMLElementTypes.ProtocolStateMachine_2062);
+ testPortLocation(UMLElementTypes.ProtocolStateMachine_Shape);
}
@Test
public void testInteractionItemPortLocation() {
- testPortLocation(UMLElementTypes.Interaction_2061);
+ testPortLocation(UMLElementTypes.Interaction_Shape);
}
@Test
public void testClassPortLocation() {
- testPortLocation(UMLElementTypes.Class_2073);
+ testPortLocation(UMLElementTypes.Class_Shape);
}
@Test
public void testClassPartPortLocation() {
- testPortLocation(UMLElementTypes.Class_2073, ClassCompositeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Property_3070);
+ testPortLocation(UMLElementTypes.Class_Shape, ClassCompositeCompartmentEditPart.VISUAL_ID, UMLElementTypes.Property_Shape);
}
@Test
public void testActivityPortLocation() {
- testPortLocation(UMLElementTypes.Activity_2060);
+ testPortLocation(UMLElementTypes.Activity_Shape);
}
@Override
protected IElementType getPortType() {
- return UMLElementTypes.Port_3069;
+ return UMLElementTypes.Port_Shape;
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/AllModelTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/AllModelTests.java index 16429aca71f..683895c398e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/AllModelTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/AllModelTests.java @@ -12,8 +12,8 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.composite.test.model; -import org.junit.runner.RunWith; import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite; +import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; /** @@ -23,7 +23,6 @@ import org.junit.runners.Suite.SuiteClasses; @SuiteClasses({ CompositeDiagramElementTypeConfigurationTest.class, CompositeDiagramGmfGenTest.class, - CompositeDiagramNotationElementTypeConfigurationTest.class }) public class AllModelTests { } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/plugin.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/plugin.properties index 7fb05649149..55e711487d1 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/plugin.properties +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/plugin.properties @@ -18,21 +18,21 @@ prefpage.org.eclipse.uml2.uml.diagram.connections=Connections prefpage.org.eclipse.uml2.uml.diagram.printing=Printing
prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid=Rulers And Grid
metatype.name.Model_1000=DeploymentDiagram
-metatype.name.Comment_2001=Comment
-metatype.name.Constraint_2005=Constraint
+metatype.name.Comment_Shape=Comment
+metatype.name.Constraint_Shape=Constraint
metatype.name.ExecutionEnvironment_2002=ExecutionEnvironment
metatype.name.Device_2003=Device
-metatype.name.Artifact_2006=Artifact
-metatype.name.Node_2008=Node
-metatype.name.Node_23=Node
-metatype.name.Device_16=Device
-metatype.name.ExecutionEnvironment_21=ExecutionEnvironment
-metatype.name.Artifact_25=Artifact
+metatype.name.Artifact_Shape=Artifact
+metatype.name.Node_Shape=Node
+metatype.name.Node_Shape_CCN=Node
+metatype.name.Device_Shape_CCN=Device
+metatype.name.ExecutionEnvironment_Shape_CCN=ExecutionEnvironment
+metatype.name.Artifact_Shape_CCN=Artifact
metatype.name.Artifact_28=Artifact
metatype.name.Link_4005=Undefined
-metatype.name.CommentAnnotatedElement_4008=CommentAnnotatedElement
-metatype.name.ConstraintConstrainedElement_4009=ConstraintConstrainedElement
-metatype.name.Deployment_4001=Deployment
+metatype.name.Comment_AnnotatedElementEdge=CommentAnnotatedElement
+metatype.name.Constraint_ConstrainedElementEdge=ConstraintConstrainedElement
+metatype.name.Deployment_Edge=Deployment
metatype.name.Manifestation_4002=Manifestation
metatype.name.Generalization_4003=Generalization
metatype.name.Dependency_4004=Dependency
@@ -40,16 +40,16 @@ metatype.name.Dependency_4004=Dependency cmdcategory.desc=PapyrusUMLDeploymentDiagram Editor Commands
metatype.name.Package_1000=DeploymentDiagram
-metatype.name.Dependency_2011=DependencyNode
+metatype.name.Dependency_Shape=DependencyNode
metatype.name.Model_2010=Model
-metatype.name.Package_2009=Package
-metatype.name.NamedElement_2012=DefaultNamedElement
-metatype.name.Model_49=Model
-metatype.name.Package_36=Package
-metatype.name.Device_44=Device
-metatype.name.ExecutionEnvironment_46=ExecutionEnvironment
-metatype.name.Node_42=Node
-metatype.name.Artifact_40=Artifact
-metatype.name.Comment_54=Comment
-metatype.name.Constraint_56=Constraint
-metatype.name.Dependency_4010=DependencyBranchLink
+metatype.name.Package_Shape=Package
+metatype.name.NamedElement_DefaultShape=DefaultNamedElement
+metatype.name.Model_Shape_CN=Model
+metatype.name.Package_Shape_CN=Package
+metatype.name.Device_Shape_CN=Device
+metatype.name.ExecutionEnvironment_Shape_CN=ExecutionEnvironment
+metatype.name.Node_Shape_CN=Node
+metatype.name.Artifact_Shape_CN=Artifact
+metatype.name.Comment_Shape_CN=Comment
+metatype.name.Constraint_Shape_CN=Constraint
+metatype.name.Dependency_BranchEdge=DependencyBranchLink
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramCommentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramCommentLink.java index 141acadd3b6..fac1b3475e0 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramCommentLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramCommentLink.java @@ -47,6 +47,6 @@ public class TestDeploymentDiagramCommentLink extends TestCommentLink { */
@Test
public void testToManageComment() {
- testToManageLink(UMLElementTypes.Comment_2001, UMLElementTypes.Package_2009, UMLElementTypes.CommentAnnotatedElement_4008, UMLElementTypes.Package_2009, true);
+ testToManageLink(UMLElementTypes.Comment_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Comment_AnnotatedElementEdge, UMLElementTypes.Package_Shape, true);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramConstraintLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramConstraintLink.java index 85d52a7eeb2..1d233a46eef 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramConstraintLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramConstraintLink.java @@ -47,6 +47,6 @@ public class TestDeploymentDiagramConstraintLink extends TestConstraintLink { */
@Test
public void testToManageConstraint() {
- testToManageLink(UMLElementTypes.Constraint_2005, UMLElementTypes.Package_2009, UMLElementTypes.ConstraintConstrainedElement_4009, UMLElementTypes.Package_2009, true);
+ testToManageLink(UMLElementTypes.Constraint_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Constraint_ConstrainedElementEdge, UMLElementTypes.Package_Shape, true);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramDeploymentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramDeploymentLink.java index cb69b91cb76..52bf2b500ad 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramDeploymentLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramDeploymentLink.java @@ -58,22 +58,22 @@ public class TestDeploymentDiagramDeploymentLink extends TestWithoutReconnectAMu @Test
public void testToManageDeployment() {
- testToManageLink(UMLElementTypes.Artifact_2006, UMLElementTypes.Node_2008, UMLElementTypes.Deployment_4001, UMLElementTypes.Package_2009, false);
+ testToManageLink(UMLElementTypes.Artifact_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Deployment_Edge, UMLElementTypes.Package_Shape, false);
}
@Test
public void testUnexecutableNodeArtifactDeployment() {
- testUnexecutableLink(UMLElementTypes.Node_2008, UMLElementTypes.Artifact_2006, UMLElementTypes.Deployment_4001);
+ testUnexecutableLink(UMLElementTypes.Node_Shape, UMLElementTypes.Artifact_Shape, UMLElementTypes.Deployment_Edge);
}
@Test
public void testUnexecutableNodeNodeDeployment() {
- testUnexecutableLink(UMLElementTypes.Node_2008, UMLElementTypes.Node_2008, UMLElementTypes.Deployment_4001);
+ testUnexecutableLink(UMLElementTypes.Node_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Deployment_Edge);
}
@Test
public void testUnexecutableArtifactArtifactDeployment() {
- testUnexecutableLink(UMLElementTypes.Artifact_2006, UMLElementTypes.Artifact_2006, UMLElementTypes.Deployment_4001);
+ testUnexecutableLink(UMLElementTypes.Artifact_Shape, UMLElementTypes.Artifact_Shape, UMLElementTypes.Deployment_Edge);
}
@Override
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramForNodeChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramForNodeChildNode.java index e86649a7da7..12d244d2542 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramForNodeChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramForNodeChildNode.java @@ -50,7 +50,7 @@ public class TestDeploymentDiagramForNodeChildNode extends TestChildNode { @Override
protected CreateViewRequest createViewRequestShapeContainer() {
- return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Node_2008, getDiagramEditPart().getDiagramPreferencesHint());
+ return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Node_Shape, getDiagramEditPart().getDiagramPreferencesHint());
}
@Override
@@ -68,7 +68,7 @@ public class TestDeploymentDiagramForNodeChildNode extends TestChildNode { */
@Test
public void testToDevice() {
- testToManageNode(UMLElementTypes.Device_16, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Node_23, false);
+ testToManageNode(UMLElementTypes.Device_Shape_CCN, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Node_Shape_CCN, false);
}
/**
@@ -76,7 +76,7 @@ public class TestDeploymentDiagramForNodeChildNode extends TestChildNode { */
@Test
public void testToExecutionEnvironment() {
- testToManageNode(UMLElementTypes.ExecutionEnvironment_21, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Node_23, false);
+ testToManageNode(UMLElementTypes.ExecutionEnvironment_Shape_CCN, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Node_Shape_CCN, false);
}
/**
@@ -84,7 +84,7 @@ public class TestDeploymentDiagramForNodeChildNode extends TestChildNode { */
@Test
public void testToNode() {
- testToManageNode(UMLElementTypes.Node_23, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Node_23, false);
+ testToManageNode(UMLElementTypes.Node_Shape_CCN, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Node_Shape_CCN, false);
}
/**
@@ -92,6 +92,6 @@ public class TestDeploymentDiagramForNodeChildNode extends TestChildNode { */
@Test
public void testToArtifact() {
- testToManageNode(UMLElementTypes.Artifact_25, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Node_23, false);
+ testToManageNode(UMLElementTypes.Artifact_Shape_CCN, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Node_Shape_CCN, false);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramForPackageChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramForPackageChildNode.java index 25da0c85462..2ac4c256bb8 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramForPackageChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramForPackageChildNode.java @@ -43,7 +43,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { @Override protected CreateViewRequest createViewRequestShapeContainer() { - return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_2009, getDiagramEditPart().getDiagramPreferencesHint()); + return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_Shape, getDiagramEditPart().getDiagramPreferencesHint()); } @Override @@ -61,7 +61,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToManagePackage() { - testToManageNode(UMLElementTypes.Package_36, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.Package_Shape_CN, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -69,7 +69,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToManageModel() { - testToManageNode(UMLElementTypes.Model_49, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.Model_Shape_CN, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -77,7 +77,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToManageNode() { - testToManageNode(UMLElementTypes.Node_42, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.Node_Shape_CN, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -85,7 +85,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToManageArtifact() { - testToManageNode(UMLElementTypes.Artifact_40, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.Artifact_Shape_CN, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -93,7 +93,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToManageDevice() { - testToManageNode(UMLElementTypes.Device_44, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.Device_Shape_CN, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -101,7 +101,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToManageExecutionEnvironment() { - testToManageNode(UMLElementTypes.ExecutionEnvironment_46, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.ExecutionEnvironment_Shape_CN, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -109,7 +109,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToManageComment() { - testToManageNode(UMLElementTypes.Comment_54, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.Comment_Shape_CN, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -117,7 +117,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToManageConstraint() { - testToManageNode(UMLElementTypes.Constraint_56, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.Constraint_Shape_CN, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -125,7 +125,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToModel() { - testToManageNode(UMLElementTypes.Model_49, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.Model_Shape_CN, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -133,7 +133,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToPackage() { - testToManageNode(UMLElementTypes.Package_36, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.Package_Shape_CN, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -141,7 +141,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToExecutionEnvironment() { - testToManageNode(UMLElementTypes.ExecutionEnvironment_46, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.ExecutionEnvironment_Shape_CN, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -149,7 +149,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToNode() { - testToManageNode(UMLElementTypes.Node_42, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.Node_Shape_CN, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -157,7 +157,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToArtifact3() { - testToManageNode(UMLElementTypes.Artifact_40, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.Artifact_Shape_CN, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -165,7 +165,7 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToComment() { - testToManageNode(UMLElementTypes.Comment_54, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.Comment_Shape_CN, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -173,6 +173,6 @@ public class TestDeploymentDiagramForPackageChildNode extends TestChildNode { */ @Test public void testToConstraint() { - testToManageNode(UMLElementTypes.Constraint_56, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_36, true); + testToManageNode(UMLElementTypes.Constraint_Shape_CN, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_Shape_CN, true); } } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLink.java index d2a04736a79..d514d78ac68 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLink.java @@ -53,7 +53,7 @@ public class TestDeploymentDiagramLink extends TestLink { @Test
@FailingTest
public void testToManageDependency() {
- testToManageLink(UMLElementTypes.Node_2008, UMLElementTypes.Node_2008, UMLElementTypes.Dependency_4004, UMLElementTypes.Package_2009, true);
+ testToManageLink(UMLElementTypes.Node_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Dependency_Edge, UMLElementTypes.Package_Shape, true);
}
/**
* Test to manage component.
@@ -61,7 +61,7 @@ public class TestDeploymentDiagramLink extends TestLink { @Test
@FailingTest
public void testToManifestation() {
- testToManageLink(UMLElementTypes.Package_2009, UMLElementTypes.Package_2009, UMLElementTypes.Manifestation_4002, UMLElementTypes.Package_2009, true);
+ testToManageLink(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.Manifestation_Edge, UMLElementTypes.Package_Shape, true);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLinkOwnedBySource.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLinkOwnedBySource.java index 75a6404107a..326cfd806b0 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLinkOwnedBySource.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramLinkOwnedBySource.java @@ -53,6 +53,6 @@ public class TestDeploymentDiagramLinkOwnedBySource extends TestLinkOwnedBySourc */
@Test
public void testToManageGeneralization() {
- testToManageLink(UMLElementTypes.Node_2008, UMLElementTypes.Node_2008, UMLElementTypes.Generalization_4003, UMLElementTypes.Package_2009, false);
+ testToManageLink(UMLElementTypes.Node_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_Shape, false);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramManifestationLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramManifestationLink.java index 68031d461cb..cdca3492176 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramManifestationLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramManifestationLink.java @@ -50,7 +50,7 @@ public class TestDeploymentDiagramManifestationLink extends TestWithoutReconnect @Test
public void testToManageManifestation() {
- testToManageLink(UMLElementTypes.Artifact_2006, UMLElementTypes.Node_2008, UMLElementTypes.Manifestation_4002, UMLElementTypes.Package_2009, true);
+ testToManageLink(UMLElementTypes.Artifact_Shape, UMLElementTypes.Node_Shape, UMLElementTypes.Manifestation_Edge, UMLElementTypes.Package_Shape, true);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramTopNode.java index c7faa1b8573..98eb03398ae 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramTopNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/canonical/TestDeploymentDiagramTopNode.java @@ -41,7 +41,7 @@ public class TestDeploymentDiagramTopNode extends TestTopNode { @Override protected CreateViewRequest createViewRequestShapeContainer() { - return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_2009, getDiagramEditPart().getDiagramPreferencesHint()); + return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_Shape, getDiagramEditPart().getDiagramPreferencesHint()); } @Override @@ -59,7 +59,7 @@ public class TestDeploymentDiagramTopNode extends TestTopNode { */ @Test public void testToManageIPackage() { - testToManageNode(UMLElementTypes.Package_2009, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_2009, true); + testToManageNode(UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_Shape, true); } /** @@ -67,7 +67,7 @@ public class TestDeploymentDiagramTopNode extends TestTopNode { */ @Test public void testToManageModel() { - testToManageNode(UMLElementTypes.Model_2010, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_2009, true); + testToManageNode(UMLElementTypes.Model_Shape, UMLPackage.eINSTANCE.getModel(), UMLElementTypes.Package_Shape, true); } /** @@ -75,7 +75,7 @@ public class TestDeploymentDiagramTopNode extends TestTopNode { */ @Test public void testToManageNode() { - testToManageNode(UMLElementTypes.Node_2008, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Package_2009, true); + testToManageNode(UMLElementTypes.Node_Shape, UMLPackage.eINSTANCE.getNode(), UMLElementTypes.Package_Shape, true); } /** @@ -83,7 +83,7 @@ public class TestDeploymentDiagramTopNode extends TestTopNode { */ @Test public void testToManageArtifact() { - testToManageNode(UMLElementTypes.Artifact_2006, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Package_2009, true); + testToManageNode(UMLElementTypes.Artifact_Shape, UMLPackage.eINSTANCE.getArtifact(), UMLElementTypes.Package_Shape, true); } /** @@ -91,7 +91,7 @@ public class TestDeploymentDiagramTopNode extends TestTopNode { */ @Test public void testToManageDevice() { - testToManageNode(UMLElementTypes.Device_2003, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Package_2009, true); + testToManageNode(UMLElementTypes.Device_Shape, UMLPackage.eINSTANCE.getDevice(), UMLElementTypes.Package_Shape, true); } /** @@ -99,7 +99,7 @@ public class TestDeploymentDiagramTopNode extends TestTopNode { */ @Test public void testToManageExecutionEnvironment() { - testToManageNode(UMLElementTypes.ExecutionEnvironment_2002, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Package_2009, true); + testToManageNode(UMLElementTypes.ExecutionEnvironment_Shape, UMLPackage.eINSTANCE.getExecutionEnvironment(), UMLElementTypes.Package_Shape, true); } /** @@ -107,7 +107,7 @@ public class TestDeploymentDiagramTopNode extends TestTopNode { */ @Test public void testToManageComment() { - testToManageNode(UMLElementTypes.Comment_2001, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_2009, true); + testToManageNode(UMLElementTypes.Comment_Shape, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_Shape, true); } /** @@ -115,7 +115,7 @@ public class TestDeploymentDiagramTopNode extends TestTopNode { */ @Test public void testToManageConstraint() { - testToManageNode(UMLElementTypes.Constraint_2005, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_2009, true); + testToManageNode(UMLElementTypes.Constraint_Shape, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_Shape, true); } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load1000NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load1000NodeTest.java index cc462415c4d..bfef77a6fee 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load1000NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load1000NodeTest.java @@ -62,7 +62,7 @@ public class Load1000NodeTest extends AbstractPapyrusTestCase { @Test
public void testLoad10Node() {
for(int i = 0; i < 1000; i++) {
- testToCreateANode(UMLElementTypes.Node_2008);
+ testToCreateANode(UMLElementTypes.Node_Shape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load100NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load100NodeTest.java index 09c44c66f53..fec7535c3c6 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load100NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load100NodeTest.java @@ -62,7 +62,7 @@ public class Load100NodeTest extends AbstractPapyrusTestCase { @Test
public void testLoad10Node() {
for(int i = 0; i < 100; i++) {
- testToCreateANode(UMLElementTypes.Node_2008);
+ testToCreateANode(UMLElementTypes.Node_Shape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load10NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load10NodeTest.java index b792d9d3de9..f70e85f234f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load10NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load10NodeTest.java @@ -62,7 +62,7 @@ public class Load10NodeTest extends AbstractPapyrusTestCase { @Test
public void testLoad10Node() {
for(int i = 0; i < 10; i++) {
- testToCreateANode(UMLElementTypes.Node_2008);
+ testToCreateANode(UMLElementTypes.Node_Shape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load200NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load200NodeTest.java index 3c4bc10acd5..4af4536967c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load200NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load200NodeTest.java @@ -62,7 +62,7 @@ public class Load200NodeTest extends AbstractPapyrusTestCase { @Test
public void testLoad10Node() {
for(int i = 0; i < 200; i++) {
- testToCreateANode(UMLElementTypes.Node_2008);
+ testToCreateANode(UMLElementTypes.Node_Shape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load300NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load300NodeTest.java index c053e5c4f64..7dde36cc8d2 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load300NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load300NodeTest.java @@ -62,7 +62,7 @@ public class Load300NodeTest extends AbstractPapyrusTestCase { @Test
public void testLoad10Node() {
for(int i = 0; i < 300; i++) {
- testToCreateANode(UMLElementTypes.Node_2008);
+ testToCreateANode(UMLElementTypes.Node_Shape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load400NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load400NodeTest.java index 7e2e9278cde..7ac2b65643b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load400NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load400NodeTest.java @@ -62,7 +62,7 @@ public class Load400NodeTest extends AbstractPapyrusTestCase { @Test
public void testLoad10Node() {
for(int i = 0; i < 400; i++) {
- testToCreateANode(UMLElementTypes.Node_2008);
+ testToCreateANode(UMLElementTypes.Node_Shape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load500NodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load500NodeTest.java index 54941ec0b42..6f58fa8786c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load500NodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/src/org/eclipse/papyrus/uml/diagram/deployment/test/load/Load500NodeTest.java @@ -62,7 +62,7 @@ public class Load500NodeTest extends AbstractPapyrusTestCase { @Test
public void testLoad10Node() {
for(int i = 0; i < 500; i++) {
- testToCreateANode(UMLElementTypes.Node_2008);
+ testToCreateANode(UMLElementTypes.Node_Shape);
}
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AbstractInteractionOverviewDiagramTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AbstractInteractionOverviewDiagramTestCase.java index ee44c2f6e4b..d3e54774633 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AbstractInteractionOverviewDiagramTestCase.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AbstractInteractionOverviewDiagramTestCase.java @@ -212,7 +212,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { } protected CustomActivityEditPartTN createActivity(final Point location, final Dimension dimension) { - createView(UMLElementTypes.Activity_2001, location, dimension, getDiagramEditPart()); + createView(UMLElementTypes.Activity_Shape, location, dimension, getDiagramEditPart()); List<?> diagramChildren = getDiagramEditPart().getChildren(); int diagramChildrenAmount = diagramChildren.size(); CustomActivityEditPartTN activityEditPartTN = (CustomActivityEditPartTN) diagramChildren.get(diagramChildrenAmount - 1); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionOverviewDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionOverviewDiagramChildNode.java index 2e7fa9d6a57..994399cdc05 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionOverviewDiagramChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionOverviewDiagramChildNode.java @@ -68,56 +68,56 @@ public class TestInteractionOverviewDiagramChildNode extends AbstractInteraction @InvalidTest("To be verified") @InteractiveTest("Opens a dialog") public void testToManageCallBehaviorAction() { - testToManageNode(UMLElementTypes.CallBehaviorAction_3008, UMLPackage.eINSTANCE.getCallBehaviorAction(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.CallBehaviorAction_Shape, UMLPackage.eINSTANCE.getCallBehaviorAction(), UMLElementTypes.StructuredActivityNode_Shape, false); } @Test public void testToManageInitialNode() { - testToManageNode(UMLElementTypes.InitialNode_3004, UMLPackage.eINSTANCE.getInitialNode(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.InitialNode_Shape, UMLPackage.eINSTANCE.getInitialNode(), UMLElementTypes.StructuredActivityNode_Shape, false); } @Test public void testToManageActivityFinalNode() { - testToManageNode(UMLElementTypes.ActivityFinalNode_3005, UMLPackage.eINSTANCE.getActivityFinalNode(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.ActivityFinalNode_Shape, UMLPackage.eINSTANCE.getActivityFinalNode(), UMLElementTypes.StructuredActivityNode_Shape, false); } @Test public void testToManageDecisionNode() { - testToManageNode(UMLElementTypes.DecisionNode_3038, UMLPackage.eINSTANCE.getDecisionNode(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.DecisionNode_Shape, UMLPackage.eINSTANCE.getDecisionNode(), UMLElementTypes.StructuredActivityNode_Shape, false); } @Test public void testToManageFlowFinalNode() { - testToManageNode(UMLElementTypes.FlowFinalNode_3006, UMLPackage.eINSTANCE.getFlowFinalNode(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.FlowFinalNode_Shape, UMLPackage.eINSTANCE.getFlowFinalNode(), UMLElementTypes.StructuredActivityNode_Shape, false); } @Test public void testToManageForkNode() { - testToManageNode(UMLElementTypes.ForkNode_3040, UMLPackage.eINSTANCE.getForkNode(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.ForkNode_Shape, UMLPackage.eINSTANCE.getForkNode(), UMLElementTypes.StructuredActivityNode_Shape, false); } @Test public void testToManageJoinNode() { - testToManageNode(UMLElementTypes.JoinNode_3041, UMLPackage.eINSTANCE.getJoinNode(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.JoinNode_Shape, UMLPackage.eINSTANCE.getJoinNode(), UMLElementTypes.StructuredActivityNode_Shape, false); } @Test public void testToManageMergeNode() { - testToManageNode(UMLElementTypes.MergeNode_3039, UMLPackage.eINSTANCE.getMergeNode(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.MergeNode_Shape, UMLPackage.eINSTANCE.getMergeNode(), UMLElementTypes.StructuredActivityNode_Shape, false); } @Test public void testToManageConditionalNode() { - testToManageNode(UMLElementTypes.ConditionalNode_3069, UMLPackage.eINSTANCE.getConditionalNode(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.ConditionalNode_Shape, UMLPackage.eINSTANCE.getConditionalNode(), UMLElementTypes.StructuredActivityNode_Shape, false); } @Test public void testToManageLoopNode() { - testToManageNode(UMLElementTypes.LoopNode_3071, UMLPackage.eINSTANCE.getLoopNode(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.LoopNode_Shape, UMLPackage.eINSTANCE.getLoopNode(), UMLElementTypes.StructuredActivityNode_Shape, false); } @Test public void testToManageSequenceNode() { - testToManageNode(UMLElementTypes.SequenceNode_3073, UMLPackage.eINSTANCE.getSequenceNode(), UMLElementTypes.StructuredActivityNode_3065, false); + testToManageNode(UMLElementTypes.SequenceNode_Shape, UMLPackage.eINSTANCE.getSequenceNode(), UMLElementTypes.StructuredActivityNode_Shape, false); } } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionUse.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionUse.java index ec7dab676b6..962e002c0c7 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionUse.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/TestInteractionUse.java @@ -35,19 +35,19 @@ public class TestInteractionUse extends AbstractInteractionOverviewDiagramTestCa @Test public void testCreateInteractionUse() { - createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_3008); + createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_Shape); } @Test public void testDeleteInteractionUse() { - final CustomInteractionUseEditPartCN interactionUse = (CustomInteractionUseEditPartCN)createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_3008); + final CustomInteractionUseEditPartCN interactionUse = (CustomInteractionUseEditPartCN)createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_Shape); testDelete(interactionUse); } @Test public void testDropLifeline() { // create a Lifeline and hide its View, so as to be able to drop it after that - final UMLNodeEditPart interactionUseEditPart = createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_3008); + final UMLNodeEditPart interactionUseEditPart = createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_Shape); final CallBehaviorAction callBehaviorAction = (CallBehaviorAction)((View)interactionUseEditPart.getModel()).getElement(); assertNotNull("The CallBehavior should not be null", callBehaviorAction); testHide(interactionUseEditPart); @@ -57,9 +57,9 @@ public class TestInteractionUse extends AbstractInteractionOverviewDiagramTestCa @Test public void testCreateThreeInteractions() { - final UMLNodeEditPart interactionUse1 = createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_3008); - final UMLNodeEditPart interactionUse2 = createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_3008); - final UMLNodeEditPart interactionUse3 = createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_3008); + final UMLNodeEditPart interactionUse1 = createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_Shape); + final UMLNodeEditPart interactionUse2 = createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_Shape); + final UMLNodeEditPart interactionUse3 = createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_Shape); assertEquals("The diagram should only contain the 3 interactionUse", 3, getDefaultActivityCompartment().getChildren().size()); assertTrue("The first interaction should be found in the diagram", getDefaultActivityCompartment().getChildren().contains(interactionUse1)); assertTrue("The second interaction should be found in the diagram", getDefaultActivityCompartment().getChildren().contains(interactionUse2)); @@ -68,7 +68,7 @@ public class TestInteractionUse extends AbstractInteractionOverviewDiagramTestCa @Test public void testEditInteractionName() { - final UMLNodeEditPart interactionUse = createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_3008); + final UMLNodeEditPart interactionUse = createChildNodeInTopNode(UMLElementTypes.CallBehaviorAction_Shape); final CustomInteractionUseNameEditPart callBehaviorNameEditPart = (CustomInteractionUseNameEditPart)EditPartUtils.findFirstChildEditPartWithId(interactionUse, CustomInteractionUseNameEditPart.VISUAL_ID); final NamedElement namedElement = ((CallBehaviorAction)interactionUse.getUMLElement()).getBehavior(); testSetNameWithDirectEditRequest(callBehaviorNameEditPart, namedElement); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/resource/profile_dependencies/datatypes.profile.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/resource/profile_dependencies/datatypes.profile.notation index a4a1ea4482a..ac0708f714e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/resource/profile_dependencies/datatypes.profile.notation +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/resource/profile_dependencies/datatypes.profile.notation @@ -1,12 +1,12 @@ <?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:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_o4T4kG6kEeSZfPEMQPlFwg" type="PapyrusUMLProfileDiagram" name="overview" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_RFpfMG6lEeS5SaiahSFsUg" type="1030"> - <children xmi:type="notation:DecorationNode" xmi:id="_RFqtUG6lEeS5SaiahSFsUg" type="1047"/> - <children xmi:type="notation:DecorationNode" xmi:id="_RFqtUW6lEeS5SaiahSFsUg" type="1042"> - <children xmi:type="notation:Shape" xmi:id="_XdB4AG6lEeS5SaiahSFsUg" type="1023"> - <children xmi:type="notation:DecorationNode" xmi:id="_XdB4Am6lEeS5SaiahSFsUg" type="1046"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_XdB4A26lEeS5SaiahSFsUg" type="1052"> - <children xmi:type="notation:Shape" xmi:id="_iEu2gG6lEeS5SaiahSFsUg" type="3002"> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_o4T4kG6kEeSZfPEMQPlFwg" type="PapyrusUMLProfileDiagram" name="overview" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_RFpfMG6lEeS5SaiahSFsUg" type="Profile_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_RFqtUG6lEeS5SaiahSFsUg" type="Profile_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_RFqtUW6lEeS5SaiahSFsUg" type="Profile_PackagedElementCompartment"> + <children xmi:type="notation:Shape" xmi:id="_XdB4AG6lEeS5SaiahSFsUg" type="Stereotype_Shape_CN"> + <children xmi:type="notation:DecorationNode" xmi:id="_XdB4Am6lEeS5SaiahSFsUg" type="Stereotype_NameLabel_CN"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_XdB4A26lEeS5SaiahSFsUg" type="Stereotype_AttributeCompartment_CN"> + <children xmi:type="notation:Shape" xmi:id="_iEu2gG6lEeS5SaiahSFsUg" type="Property_ClassAttributeLabel"> <element xmi:type="uml:Property" href="datatypes.profile.uml#_iEqlEG6lEeS5SaiahSFsUg"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_iEu2gW6lEeS5SaiahSFsUg"/> </children> @@ -15,7 +15,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_XdB4Bm6lEeS5SaiahSFsUg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XdB4B26lEeS5SaiahSFsUg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_XdB4CG6lEeS5SaiahSFsUg" type="1053"> + <children xmi:type="notation:BasicCompartment" xmi:id="_XdB4CG6lEeS5SaiahSFsUg" type="Stereotype_OperationCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_XdB4CW6lEeS5SaiahSFsUg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_XdB4Cm6lEeS5SaiahSFsUg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_XdB4C26lEeS5SaiahSFsUg"/> @@ -30,17 +30,17 @@ <element xmi:type="uml:Profile" href="datatypes.profile.uml#_REtEAG6lEeS5SaiahSFsUg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RFpfMW6lEeS5SaiahSFsUg" x="23" y="72" width="281" height="256"/> </children> - <children xmi:type="notation:Shape" xmi:id="_RxzakG6lEeS5SaiahSFsUg" type="1030"> - <children xmi:type="notation:DecorationNode" xmi:id="_Rxzakm6lEeS5SaiahSFsUg" type="1047"/> - <children xmi:type="notation:DecorationNode" xmi:id="_Rxzak26lEeS5SaiahSFsUg" type="1042"> - <children xmi:type="notation:Shape" xmi:id="_ZnF70G6lEeS5SaiahSFsUg" type="3027"> - <children xmi:type="notation:DecorationNode" xmi:id="_ZnGi4G6lEeS5SaiahSFsUg" type="5061"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_ZnGi4W6lEeS5SaiahSFsUg" type="1069"> - <children xmi:type="notation:Shape" xmi:id="_apGycG6lEeS5SaiahSFsUg" type="3018"> + <children xmi:type="notation:Shape" xmi:id="_RxzakG6lEeS5SaiahSFsUg" type="Profile_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_Rxzakm6lEeS5SaiahSFsUg" type="Profile_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_Rxzak26lEeS5SaiahSFsUg" type="Profile_PackagedElementCompartment"> + <children xmi:type="notation:Shape" xmi:id="_ZnF70G6lEeS5SaiahSFsUg" type="DataType_Shape_CN"> + <children xmi:type="notation:DecorationNode" xmi:id="_ZnGi4G6lEeS5SaiahSFsUg" type="DataType_NameLabel_CN"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_ZnGi4W6lEeS5SaiahSFsUg" type="DataType_AttributeCompartment_CN"> + <children xmi:type="notation:Shape" xmi:id="_apGycG6lEeS5SaiahSFsUg" type="Property_DataTypeAttributeLabel"> <element xmi:type="uml:Property" href="datatypes.profile.uml#_ao6lMG6lEeS5SaiahSFsUg"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_apGycW6lEeS5SaiahSFsUg"/> </children> - <children xmi:type="notation:Shape" xmi:id="_dWXC4G6lEeS5SaiahSFsUg" type="3018"> + <children xmi:type="notation:Shape" xmi:id="_dWXC4G6lEeS5SaiahSFsUg" type="Property_DataTypeAttributeLabel"> <element xmi:type="uml:Property" href="datatypes.profile.uml#_dWV0wG6lEeS5SaiahSFsUg"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_dWXC4W6lEeS5SaiahSFsUg"/> </children> @@ -49,7 +49,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_ZnGi5G6lEeS5SaiahSFsUg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZnGi5W6lEeS5SaiahSFsUg"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_ZnGi5m6lEeS5SaiahSFsUg" type="1070"> + <children xmi:type="notation:BasicCompartment" xmi:id="_ZnGi5m6lEeS5SaiahSFsUg" type="DataType_OperationCompartment_CN"> <styles xmi:type="notation:TitleStyle" xmi:id="_ZnGi526lEeS5SaiahSFsUg"/> <styles xmi:type="notation:SortingStyle" xmi:id="_ZnGi6G6lEeS5SaiahSFsUg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_ZnGi6W6lEeS5SaiahSFsUg"/> @@ -64,29 +64,40 @@ <element xmi:type="uml:Profile" href="datatypes.profile.uml#_RxwXQG6lEeS5SaiahSFsUg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RxzakW6lEeS5SaiahSFsUg" x="349" y="69" width="300" height="264"/> </children> - <children xmi:type="notation:Shape" xmi:id="_V3gEoG6lEeS5SaiahSFsUg" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V3h50G6lEeS5SaiahSFsUg" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3ig4G6lEeS5SaiahSFsUg" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3ig4W6lEeS5SaiahSFsUg" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3ig4m6lEeS5SaiahSFsUg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3ig426lEeS5SaiahSFsUg" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_V3ig5G6lEeS5SaiahSFsUg" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_V3grsG6lEeS5SaiahSFsUg" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_V3gEoG6lEeS5SaiahSFsUg" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_V3grsG6lEeS5SaiahSFsUg" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3grsW6lEeS5SaiahSFsUg" x="241" y="377"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_o4T4kW6kEeSZfPEMQPlFwg" name="diagram_compatibility_version" stringValue="1.0.0"/> + <children xmi:type="notation:Shape" xmi:id="_zhYC0MlvEeWk9IvnfLnVcw" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_zhYC0clvEeWk9IvnfLnVcw" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zhYC08lvEeWk9IvnfLnVcw" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zhYC0slvEeWk9IvnfLnVcw" x="441" y="377"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_o4T4kW6kEeSZfPEMQPlFwg" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_o4T4km6kEeSZfPEMQPlFwg"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_o4T4k26kEeSZfPEMQPlFwg"> <owner xmi:type="uml:Profile" href="datatypes.profile.uml#_o3c88G6kEeSZfPEMQPlFwg"/> </styles> <element xmi:type="uml:Profile" href="datatypes.profile.uml#_o3c88G6kEeSZfPEMQPlFwg"/> - <edges xmi:type="notation:Connector" xmi:id="_YmyVYG6lEeS5SaiahSFsUg" type="1013" source="_XdB4AG6lEeS5SaiahSFsUg" target="_V3gEoG6lEeS5SaiahSFsUg"> + <edges xmi:type="notation:Connector" xmi:id="_YmyVYG6lEeS5SaiahSFsUg" type="Extension_Edge" source="_XdB4AG6lEeS5SaiahSFsUg" target="_V3gEoG6lEeS5SaiahSFsUg"> <styles xmi:type="notation:FontStyle" xmi:id="_YmyVYW6lEeS5SaiahSFsUg"/> <element xmi:type="uml:Extension" href="datatypes.profile.uml#_YmsOwG6lEeS5SaiahSFsUg"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YmyVYm6lEeS5SaiahSFsUg" points="[43, 50, -148, -160]$[141, 202, -50, -8]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AUCGsG6mEeS5SaiahSFsUg" id="(0.8434782608695652,1.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AUCGsW6mEeS5SaiahSFsUg" id="(0.3,0.0)"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_zhYC1MlvEeWk9IvnfLnVcw" type="StereotypeCommentLink" source="_V3gEoG6lEeS5SaiahSFsUg" target="_zhYC0MlvEeWk9IvnfLnVcw"> + <styles xmi:type="notation:FontStyle" xmi:id="_zhYC1clvEeWk9IvnfLnVcw"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_zhYC2clvEeWk9IvnfLnVcw" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zhYC1slvEeWk9IvnfLnVcw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zhYC18lvEeWk9IvnfLnVcw"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zhYC2MlvEeWk9IvnfLnVcw"/> + </edges> </notation:Diagram> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/resource/profile_simple/simple.profile.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/resource/profile_simple/simple.profile.notation index cdd557437e2..5253130c78a 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/resource/profile_simple/simple.profile.notation +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/resource/profile_simple/simple.profile.notation @@ -1,14 +1,14 @@ <?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:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_VZOPYG60EeS2Prjkx98SQA" type="PapyrusUMLProfileDiagram" name="stereotypes" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_X2KL4G60EeS2Prjkx98SQA" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_X2LaAG60EeS2Prjkx98SQA" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_X2MBEG60EeS2Prjkx98SQA" type="1071"> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_VZOPYG60EeS2Prjkx98SQA" type="PapyrusUMLProfileDiagram" name="stereotypes" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_X2KL4G60EeS2Prjkx98SQA" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_X2LaAG60EeS2Prjkx98SQA" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_X2MBEG60EeS2Prjkx98SQA" type="Stereotype_AttributeCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_X2MBEW60EeS2Prjkx98SQA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_X2MBEm60EeS2Prjkx98SQA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_X2MBE260EeS2Prjkx98SQA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2MBFG60EeS2Prjkx98SQA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_X2MBFW60EeS2Prjkx98SQA" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_X2MBFW60EeS2Prjkx98SQA" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_X2MBFm60EeS2Prjkx98SQA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_X2MBF260EeS2Prjkx98SQA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_X2MBGG60EeS2Prjkx98SQA"/> @@ -17,10 +17,10 @@ <element xmi:type="uml:Stereotype" href="simple.profile.uml#_X18JcG60EeS2Prjkx98SQA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X2KL4W60EeS2Prjkx98SQA" x="74" y="119"/> </children> - <children xmi:type="notation:Shape" xmi:id="_ZIA1UG60EeS2Prjkx98SQA" type="1026"> - <children xmi:type="notation:DecorationNode" xmi:id="_ZIA1Um60EeS2Prjkx98SQA" type="1034"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_ZIA1U260EeS2Prjkx98SQA" type="1071"> - <children xmi:type="notation:Shape" xmi:id="_fMUhIG60EeS2Prjkx98SQA" type="3002"> + <children xmi:type="notation:Shape" xmi:id="_ZIA1UG60EeS2Prjkx98SQA" type="Stereotype_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_ZIA1Um60EeS2Prjkx98SQA" type="Stereotype_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_ZIA1U260EeS2Prjkx98SQA" type="Stereotype_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_fMUhIG60EeS2Prjkx98SQA" type="Property_ClassAttributeLabel"> <element xmi:type="uml:Property" href="simple.profile.uml#_fMFQkG60EeS2Prjkx98SQA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_fMUhIW60EeS2Prjkx98SQA"/> </children> @@ -29,7 +29,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_ZIA1Vm60EeS2Prjkx98SQA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZIA1V260EeS2Prjkx98SQA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_ZIA1WG60EeS2Prjkx98SQA" type="1019"> + <children xmi:type="notation:BasicCompartment" xmi:id="_ZIA1WG60EeS2Prjkx98SQA" type="Stereotype_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_ZIA1WW60EeS2Prjkx98SQA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_ZIA1Wm60EeS2Prjkx98SQA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_ZIA1W260EeS2Prjkx98SQA"/> @@ -38,26 +38,19 @@ <element xmi:type="uml:Stereotype" href="simple.profile.uml#_ZH_AIG60EeS2Prjkx98SQA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZIA1UW60EeS2Prjkx98SQA" x="346" y="121"/> </children> - <children xmi:type="notation:Shape" xmi:id="_c8nIUG60EeS2Prjkx98SQA" type="1031"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_c8oWcG60EeS2Prjkx98SQA" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_c8oWcW60EeS2Prjkx98SQA" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_c8oWcm60EeS2Prjkx98SQA" key="StereotypeList" value="StandardProfile::Metaclass"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_c8oWc260EeS2Prjkx98SQA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_c8oWdG60EeS2Prjkx98SQA" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_c8o9gG60EeS2Prjkx98SQA" key="StereotypePropertyLocation" value="Compartment"/> - </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_c8nvYG60EeS2Prjkx98SQA" type="1084"/> + <children xmi:type="notation:Shape" xmi:id="_c8nIUG60EeS2Prjkx98SQA" type="Class_MetaclassShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_c8nvYG60EeS2Prjkx98SQA" type="Class_MetaclassNameLabel"/> <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c8nvYW60EeS2Prjkx98SQA" x="74" y="295"/> </children> - <children xmi:type="notation:Shape" xmi:id="_irhL4G60EeS2Prjkx98SQA" type="2010"> - <children xmi:type="notation:DecorationNode" xmi:id="_irhy8G60EeS2Prjkx98SQA" type="5035"/> - <children xmi:type="notation:BasicCompartment" xmi:id="_irhy8W60EeS2Prjkx98SQA" type="1067"> - <children xmi:type="notation:Shape" xmi:id="_j4tXwG60EeS2Prjkx98SQA" type="3018"> + <children xmi:type="notation:Shape" xmi:id="_irhL4G60EeS2Prjkx98SQA" type="DataType_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_irhy8G60EeS2Prjkx98SQA" type="DataType_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_irhy8W60EeS2Prjkx98SQA" type="DataType_AttributeCompartment"> + <children xmi:type="notation:Shape" xmi:id="_j4tXwG60EeS2Prjkx98SQA" type="Property_DataTypeAttributeLabel"> <element xmi:type="uml:Property" href="simple.profile.uml#_j4pGUG60EeS2Prjkx98SQA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_j4tXwW60EeS2Prjkx98SQA"/> </children> - <children xmi:type="notation:Shape" xmi:id="_nZVl4G60EeS2Prjkx98SQA" type="3018"> + <children xmi:type="notation:Shape" xmi:id="_nZVl4G60EeS2Prjkx98SQA" type="Property_DataTypeAttributeLabel"> <element xmi:type="uml:Property" href="simple.profile.uml#_nZTwsG60EeS2Prjkx98SQA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_nZVl4W60EeS2Prjkx98SQA"/> </children> @@ -66,7 +59,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_irhy9G60EeS2Prjkx98SQA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irhy9W60EeS2Prjkx98SQA"/> </children> - <children xmi:type="notation:BasicCompartment" xmi:id="_iriaAG60EeS2Prjkx98SQA" type="1068"> + <children xmi:type="notation:BasicCompartment" xmi:id="_iriaAG60EeS2Prjkx98SQA" type="DataType_OperationCompartment"> <styles xmi:type="notation:TitleStyle" xmi:id="_iriaAW60EeS2Prjkx98SQA"/> <styles xmi:type="notation:SortingStyle" xmi:id="_iriaAm60EeS2Prjkx98SQA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_iriaA260EeS2Prjkx98SQA"/> @@ -75,25 +68,43 @@ <element xmi:type="uml:DataType" href="simple.profile.uml#_irfWsG60EeS2Prjkx98SQA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irhL4W60EeS2Prjkx98SQA" x="570" y="141"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_VZOPYW60EeS2Prjkx98SQA" name="diagram_compatibility_version" stringValue="1.0.0"/> + <children xmi:type="notation:Shape" xmi:id="_q3teUMlvEeWk9IvnfLnVcw" type="StereotypeComment"> + <styles xmi:type="notation:TitleStyle" xmi:id="_q3teUclvEeWk9IvnfLnVcw" showTitle="true"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_q3uscMlvEeWk9IvnfLnVcw" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/> + </styles> + <element xsi:nil="true"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q3teUslvEeWk9IvnfLnVcw" x="274" y="295"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_VZOPYW60EeS2Prjkx98SQA" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_VZOPYm60EeS2Prjkx98SQA"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_VZOPY260EeS2Prjkx98SQA"> <owner xmi:type="uml:Profile" href="simple.profile.uml#_VYM7sG60EeS2Prjkx98SQA"/> </styles> <element xmi:type="uml:Profile" href="simple.profile.uml#_VYM7sG60EeS2Prjkx98SQA"/> - <edges xmi:type="notation:Connector" xmi:id="_arn9IG60EeS2Prjkx98SQA" type="4002" source="_ZIA1UG60EeS2Prjkx98SQA" target="_X2KL4G60EeS2Prjkx98SQA"> - <children xmi:type="notation:DecorationNode" xmi:id="_arn9I260EeS2Prjkx98SQA" type="6007"> + <edges xmi:type="notation:Connector" xmi:id="_arn9IG60EeS2Prjkx98SQA" type="Generalization_Edge" source="_ZIA1UG60EeS2Prjkx98SQA" target="_X2KL4G60EeS2Prjkx98SQA"> + <children xmi:type="notation:DecorationNode" xmi:id="_arn9I260EeS2Prjkx98SQA" type="Generalization_StereotypeLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_arokMG60EeS2Prjkx98SQA" y="60"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_arn9IW60EeS2Prjkx98SQA"/> <element xmi:type="uml:Generalization" href="simple.profile.uml#_aq16AG60EeS2Prjkx98SQA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_arn9Im60EeS2Prjkx98SQA" points="[-50, -5, 222, -3]$[-270, -52, 2, -50]"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_deMLYG60EeS2Prjkx98SQA" type="1013" source="_X2KL4G60EeS2Prjkx98SQA" target="_c8nIUG60EeS2Prjkx98SQA"> + <edges xmi:type="notation:Connector" xmi:id="_deMLYG60EeS2Prjkx98SQA" type="Extension_Edge" source="_X2KL4G60EeS2Prjkx98SQA" target="_c8nIUG60EeS2Prjkx98SQA"> <styles xmi:type="notation:FontStyle" xmi:id="_deMLYW60EeS2Prjkx98SQA"/> <element xmi:type="uml:Extension" href="simple.profile.uml#_deH58G60EeS2Prjkx98SQA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_deMLYm60EeS2Prjkx98SQA" points="[8, 50, 0, -64]$[-2, 104, -10, -10]"/> <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ePz1kG60EeS2Prjkx98SQA" id="(0.44,1.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dePOsG60EeS2Prjkx98SQA" id="(0.44,0.0)"/> </edges> + <edges xmi:type="notation:Connector" xmi:id="_q3uscclvEeWk9IvnfLnVcw" type="StereotypeCommentLink" source="_c8nIUG60EeS2Prjkx98SQA" target="_q3teUMlvEeWk9IvnfLnVcw"> + <styles xmi:type="notation:FontStyle" xmi:id="_q3uscslvEeWk9IvnfLnVcw"/> + <styles xmi:type="notation:EObjectValueStyle" xmi:id="_q3vTgMlvEeWk9IvnfLnVcw" name="BASE_ELEMENT"> + <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/> + </styles> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_q3usc8lvEeWk9IvnfLnVcw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q3usdMlvEeWk9IvnfLnVcw"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q3usdclvEeWk9IvnfLnVcw"/> + </edges> </notation:Diagram> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestImportMetaClass.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestImportMetaClass.java index 498a035b75a..1098c04bdb9 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestImportMetaClass.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestImportMetaClass.java @@ -42,7 +42,7 @@ public class TestImportMetaClass extends TestTopNode { @Override protected CreateViewRequest createViewRequestShapeContainer() { - return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_2007, getDiagramEditPart().getDiagramPreferencesHint()); + return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_Shape, getDiagramEditPart().getDiagramPreferencesHint()); } @Override @@ -63,11 +63,11 @@ public class TestImportMetaClass extends TestTopNode { @Test public void testImportMetaClass() { // create Stereotype - GraphicalEditPart stereotypeEditPart = createNodeOnDiagram(UMLElementTypes.Stereotype_1026, new Point(100, 100), 1); + GraphicalEditPart stereotypeEditPart = createNodeOnDiagram(UMLElementTypes.Stereotype_Shape, new Point(100, 100), 1); // import metaclass GraphicalEditPart metaClassEditPart = createMetaclassOnDiagram(new Point(100, 300), 2); // create a extension link between stereotype and metaclass - createALink(UMLElementTypes.Extension_1013, stereotypeEditPart, metaClassEditPart); + createALink(UMLElementTypes.Extension_Edge, stereotypeEditPart, metaClassEditPart); // test enable for delete metaclass from model testEnableForDeleteFromModel(metaClassEditPart); // delete metaclass from diagram @@ -88,7 +88,7 @@ public class TestImportMetaClass extends TestTopNode { } private GraphicalEditPart createMetaclassOnDiagram(Point loc, int childrenDiagramEditPartId) { - CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_1031, getDiagramEditPart().getDiagramPreferencesHint()); + CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_MetaclassShape, getDiagramEditPart().getDiagramPreferencesHint()); Profile parentProfile = MetaclassHelper.getParentProfile(getDiagramEditPart()); List<Object> importedElements = Arrays.asList(new UMLMetaclassContentProvider(parentProfile).getElements()); List<Object> forDialogSetup = new ArrayList<Object>(); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramChildNode.java index 7f544f68c48..b416db9dc13 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramChildNode.java @@ -35,7 +35,7 @@ public class TestProfileDiagramChildNode extends TestChildNode { } protected CreateViewRequest createViewRequestShapeContainer() { - return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_2007, getDiagramEditPart().getDiagramPreferencesHint()); + return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_Shape, getDiagramEditPart().getDiagramPreferencesHint()); } protected ICreationCommand getDiagramCommandCreation() { @@ -52,51 +52,51 @@ public class TestProfileDiagramChildNode extends TestChildNode { @Test public void testToManageClassInPackage() { - testToManageNode(UMLElementTypes.Class_3010, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Package_2007, false); + testToManageNode(UMLElementTypes.Class_Shape_CN, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Package_Shape, false); } @Test public void testToManageDatatypeInPackage() { - testToManageNode(UMLElementTypes.DataType_3027, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Package_2007, false); + testToManageNode(UMLElementTypes.DataType_Shape_CN, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Package_Shape, false); } @Test public void testToManagePackageInPackage() { - testToManageNode(UMLElementTypes.Package_1012, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_2007, false); + testToManageNode(UMLElementTypes.Package_Shape_CN, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_Shape, false); } @Test public void testToManageStereoTypeInPackage() { - testToManageNode(UMLElementTypes.Stereotype_1023, UMLPackage.eINSTANCE.getStereotype(), UMLElementTypes.Package_2007, false); + testToManageNode(UMLElementTypes.Stereotype_Shape_CN, UMLPackage.eINSTANCE.getStereotype(), UMLElementTypes.Package_Shape, false); } @Test public void testToManageProfileInPackage() { - testToManageNode(UMLElementTypes.Profile_1024, UMLPackage.eINSTANCE.getProfile(), UMLElementTypes.Package_2007, false); + testToManageNode(UMLElementTypes.Profile_Shape_CN, UMLPackage.eINSTANCE.getProfile(), UMLElementTypes.Package_Shape, false); } @Test public void testToManageClassInProfile() { - testToManageNode(UMLElementTypes.Class_3010, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Profile_1030, false); + testToManageNode(UMLElementTypes.Class_Shape_CN, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Profile_Shape, false); } @Test public void testToManageDatatypeInProfile() { - testToManageNode(UMLElementTypes.DataType_3027, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Profile_1030, false); + testToManageNode(UMLElementTypes.DataType_Shape_CN, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Profile_Shape, false); } @Test public void testToManagePackageInProfile() { - testToManageNode(UMLElementTypes.Package_1012, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Profile_1030, false); + testToManageNode(UMLElementTypes.Package_Shape_CN, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Profile_Shape, false); } @Test public void testToManageStereoTypeInProfile() { - testToManageNode(UMLElementTypes.Stereotype_1023, UMLPackage.eINSTANCE.getStereotype(), UMLElementTypes.Profile_1030, false); + testToManageNode(UMLElementTypes.Stereotype_Shape_CN, UMLPackage.eINSTANCE.getStereotype(), UMLElementTypes.Profile_Shape, false); } @Test public void testToManageProfileInProfile() { - testToManageNode(UMLElementTypes.Profile_1024, UMLPackage.eINSTANCE.getProfile(), UMLElementTypes.Profile_1030, false); + testToManageNode(UMLElementTypes.Profile_Shape_CN, UMLPackage.eINSTANCE.getProfile(), UMLElementTypes.Profile_Shape, false); } } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramContextLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramContextLink.java index cb7fbcd1952..7cb11087b95 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramContextLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramContextLink.java @@ -30,6 +30,6 @@ public class TestProfileDiagramContextLink extends TestContextLink { @Test public void testToManageContextLink() { - manageContextLink(UMLElementTypes.Constraint_1014, UMLElementTypes.Class_2008, UMLElementTypes.ConstraintContext_8500, UMLElementTypes.Package_2007); + manageContextLink(UMLElementTypes.Constraint_PackagedElementShape, UMLElementTypes.Class_Shape, UMLElementTypes.Constraint_ContextEdge, UMLElementTypes.Package_Shape); } }
\ No newline at end of file diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramExtension.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramExtension.java index f51a034c014..dd21a7a3e81 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramExtension.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramExtension.java @@ -60,7 +60,7 @@ public class TestProfileDiagramExtension extends AbstractPapyrusTestCase { @Test public void testDestroyExtensionProperty() { // create Stereotype - GraphicalEditPart stereotypeEditPart = createNodeOnDiagram(UMLElementTypes.Stereotype_1026, new Point(100, 100), 1); + GraphicalEditPart stereotypeEditPart = createNodeOnDiagram(UMLElementTypes.Stereotype_Shape, new Point(100, 100), 1); EObject stereotypeObject = ((View) stereotypeEditPart.getModel()).getElement(); Assert.assertTrue("Expected StereotypeImpl.", stereotypeObject instanceof Stereotype); Stereotype stereotypeElement = (Stereotype) stereotypeObject; @@ -71,7 +71,7 @@ public class TestProfileDiagramExtension extends AbstractPapyrusTestCase { int linksAtStart = 1; checkLinksCount(linksAtStart); // create a extension link between stereotype and metaclass - createLink(UMLElementTypes.Extension_1013, stereotypeEditPart, metaClassEditPart); + createLink(UMLElementTypes.Extension_Edge, stereotypeEditPart, metaClassEditPart); checkLinksCount(linksAtStart + 1); Assert.assertEquals("Expected just one stereotype owned attr.", 1, stereotypeElement.getOwnedAttributes().size()); Property extensionProperty = stereotypeElement.getOwnedAttributes().get(0); @@ -114,7 +114,7 @@ public class TestProfileDiagramExtension extends AbstractPapyrusTestCase { } private GraphicalEditPart createMetaclassOnDiagram(Point loc, int childrensCount) { - CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_1031, getDiagramEditPart().getDiagramPreferencesHint()); + CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_MetaclassShape, getDiagramEditPart().getDiagramPreferencesHint()); Profile parentProfile = MetaclassHelper.getParentProfile(getDiagramEditPart()); List<Object> importedElements = Arrays.asList(new UMLMetaclassContentProvider(parentProfile).getElements()); List<Object> forDialogSetup = new ArrayList<Object>(); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramLink.java index c3248c11b7a..8e32320024a 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramLink.java @@ -38,12 +38,12 @@ public class TestProfileDiagramLink extends TestLink { @FailingTest @Test public void testToManageAssociation() { - testToManageLink(UMLElementTypes.Class_2008, UMLElementTypes.Class_2008, UMLElementTypes.Association_4001, UMLElementTypes.Package_2007, true, "srcMulA_cla"); + testToManageLink(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Association_Edge, UMLElementTypes.Package_Shape, true, "srcMulA_cla"); } @Test public void testToManageAssociationWithoutMulti() { - testToManageLinkWithoutMulti(UMLElementTypes.Class_2008, UMLElementTypes.Class_2008, UMLElementTypes.Association_4001, UMLElementTypes.Package_2007, true, null); // name of associations are not set now + testToManageLinkWithoutMulti(UMLElementTypes.Class_Shape, UMLElementTypes.Class_Shape, UMLElementTypes.Association_Edge, UMLElementTypes.Package_Shape, true, null); // name of associations are not set now } @Override diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramTopNode.java index 93a45182438..06c9aa1635c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramTopNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/tests/canonical/TestProfileDiagramTopNode.java @@ -33,7 +33,7 @@ public class TestProfileDiagramTopNode extends TestTopNode { @Override protected CreateViewRequest createViewRequestShapeContainer() { - return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_2007, getDiagramEditPart().getDiagramPreferencesHint()); + return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_Shape, getDiagramEditPart().getDiagramPreferencesHint()); } @Override @@ -53,26 +53,26 @@ public class TestProfileDiagramTopNode extends TestTopNode { @Test public void testToManageClass() { - testToManageNode(UMLElementTypes.Class_2008, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Package_2007, false); + testToManageNode(UMLElementTypes.Class_Shape, UMLPackage.eINSTANCE.getClass_(), UMLElementTypes.Package_Shape, false); } @Test public void testToManagePackage() { - testToManageNode(UMLElementTypes.Package_2007, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_2007, false); + testToManageNode(UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_Shape, false); } @Test public void testToManageDataType() { - testToManageNode(UMLElementTypes.DataType_2010, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Package_2007, false); + testToManageNode(UMLElementTypes.DataType_Shape, UMLPackage.eINSTANCE.getDataType(), UMLElementTypes.Package_Shape, false); } @Test public void testToManageStereoType() { - testToManageNode(UMLElementTypes.Stereotype_1026, UMLPackage.eINSTANCE.getStereotype(), UMLElementTypes.Package_2007, false); + testToManageNode(UMLElementTypes.Stereotype_Shape, UMLPackage.eINSTANCE.getStereotype(), UMLElementTypes.Package_Shape, false); } @Test public void testToManageProfile() { - testToManageNode(UMLElementTypes.Profile_1030, UMLPackage.eINSTANCE.getProfile(), UMLElementTypes.Package_2007, false); + testToManageNode(UMLElementTypes.Profile_Shape, UMLPackage.eINSTANCE.getProfile(), UMLElementTypes.Package_Shape, false); } } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/resource/bug477463/bug477463.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/resource/bug477463/bug477463.notation index a2fa8f292ea..ac04e4d8dd3 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/resource/bug477463/bug477463.notation +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/resource/bug477463/bug477463.notation @@ -1,64 +1,64 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_y9SnsGeuEeW_sJdBHKjxSg" type="PapyrusUMLSequenceDiagram" name="Sequence Diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_y9SnsWeuEeW_sJdBHKjxSg" type="2001">
- <children xmi:type="notation:DecorationNode" xmi:id="_y9SnsmeuEeW_sJdBHKjxSg" type="5001"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_y9Sns2euEeW_sJdBHKjxSg" type="7001">
- <children xmi:type="notation:Shape" xmi:id="_Fdo9cGevEeW_sJdBHKjxSg" type="3001">
- <children xmi:type="notation:DecorationNode" xmi:id="_FdpkgGevEeW_sJdBHKjxSg" type="5002"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_Fhgw0GevEeW_sJdBHKjxSg" type="compartment_shape_display">
- <styles xmi:type="notation:TitleStyle" xmi:id="_Fhgw0WevEeW_sJdBHKjxSg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fhgw0mevEeW_sJdBHKjxSg"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_Jad_YGevEeW_sJdBHKjxSg" type="3003">
- <children xmi:type="notation:DecorationNode" xmi:id="_JaemcGevEeW_sJdBHKjxSg" type="BehaviorExecutionSpecification_Behavior">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_JaemcWevEeW_sJdBHKjxSg" x="18" y="18"/>
- </children>
- <element xmi:type="uml:BehaviorExecutionSpecification" href="bug477463.uml#_JaGL8GevEeW_sJdBHKjxSg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jad_YWevEeW_sJdBHKjxSg" x="28" y="102" height="50"/>
- </children>
- <element xmi:type="uml:Lifeline" href="bug477463.uml#_FdIAEGevEeW_sJdBHKjxSg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fdo9cWevEeW_sJdBHKjxSg" x="143" y="10" width="72" height="697"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_F5HYgGevEeW_sJdBHKjxSg" type="3001">
- <children xmi:type="notation:DecorationNode" xmi:id="_F5H_kGevEeW_sJdBHKjxSg" type="5002"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_F5S-sGevEeW_sJdBHKjxSg" type="compartment_shape_display">
- <styles xmi:type="notation:TitleStyle" xmi:id="_F5TlwGevEeW_sJdBHKjxSg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F5TlwWevEeW_sJdBHKjxSg"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_J80egGevEeW_sJdBHKjxSg" type="3003">
- <children xmi:type="notation:DecorationNode" xmi:id="_J81FkGevEeW_sJdBHKjxSg" type="BehaviorExecutionSpecification_Behavior">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_J81FkWevEeW_sJdBHKjxSg" x="18" y="18"/>
- </children>
- <element xmi:type="uml:BehaviorExecutionSpecification" href="bug477463.uml#_J8lN8GevEeW_sJdBHKjxSg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J80egWevEeW_sJdBHKjxSg" x="31" y="90" height="50"/>
- </children>
- <element xmi:type="uml:Lifeline" href="bug477463.uml#_F47LQGevEeW_sJdBHKjxSg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F5HYgWevEeW_sJdBHKjxSg" x="413" y="10" width="78" height="697"/>
- </children>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y9SntGeuEeW_sJdBHKjxSg"/>
- </children>
- <element xmi:type="uml:Interaction" href="bug477463.uml#_y4uQwGeuEeW_sJdBHKjxSg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y9SntWeuEeW_sJdBHKjxSg"/>
- </children>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_y9SntmeuEeW_sJdBHKjxSg" name="diagram_compatibility_version" stringValue="1.1.0"/>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_y9Snt2euEeW_sJdBHKjxSg"/>
- <styles xmi:type="style:PapyrusViewStyle" xmi:id="_y9SnuGeuEeW_sJdBHKjxSg">
- <owner xmi:type="uml:Model" href="bug477463.uml#_y0i7YGeuEeW_sJdBHKjxSg"/>
- </styles>
- <element xmi:type="uml:Interaction" href="bug477463.uml#_y4uQwGeuEeW_sJdBHKjxSg"/>
- <edges xmi:type="notation:Edge" xmi:id="_LroJsGevEeW_sJdBHKjxSg" type="4005" source="_J80egGevEeW_sJdBHKjxSg" target="_Jad_YGevEeW_sJdBHKjxSg">
- <children xmi:type="notation:DecorationNode" xmi:id="_LrowwGevEeW_sJdBHKjxSg" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_LrowwWevEeW_sJdBHKjxSg" x="1" y="-13"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_LrpX0GevEeW_sJdBHKjxSg" type="6010">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_LrpX0WevEeW_sJdBHKjxSg" x="1" y="-33"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_LroJsWevEeW_sJdBHKjxSg"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_LroJsmevEeW_sJdBHKjxSg"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_Lrql8GevEeW_sJdBHKjxSg"/>
- <element xmi:type="uml:Message" href="bug477463.uml#_LqIU4GevEeW_sJdBHKjxSg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LroJs2evEeW_sJdBHKjxSg" points="[-6, 0, 260, -28]$[-263, 35, 3, 7]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LtPTQGevEeW_sJdBHKjxSg" id="(0.0,1.0){32}"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LtPTQWevEeW_sJdBHKjxSg" id="(0.8125,0.76)"/>
- </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?> +<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_y9SnsGeuEeW_sJdBHKjxSg" type="PapyrusUMLSequenceDiagram" name="Sequence Diagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_y9SnsWeuEeW_sJdBHKjxSg" type="Interaction_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_y9SnsmeuEeW_sJdBHKjxSg" type="Interaction_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_jVKG4NYoEeWN369Mxthi8g" type="Interaction_SubfragmentCompartment"> + <children xmi:type="notation:Shape" xmi:id="_jVKt8NYoEeWN369Mxthi8g" type="Lifeline_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_jVKt8dYoEeWN369Mxthi8g" type="Lifeline_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_jVKt8tYoEeWN369Mxthi8g" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jVKt89YoEeWN369Mxthi8g"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jVKt9NYoEeWN369Mxthi8g"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_jVKt9dYoEeWN369Mxthi8g" type="BehaviorExecutionSpecification_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_jVKt9tYoEeWN369Mxthi8g" type="BehaviorExecutionSpecification_Behavior"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_jVKt99YoEeWN369Mxthi8g" x="18" y="18"/> + </children> + <element xmi:type="uml:BehaviorExecutionSpecification" href="bug477463.uml#_JaGL8GevEeW_sJdBHKjxSg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jVKt-NYoEeWN369Mxthi8g" x="28" y="102" height="50"/> + </children> + <element xmi:type="uml:Lifeline" href="bug477463.uml#_FdIAEGevEeW_sJdBHKjxSg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jVKt-dYoEeWN369Mxthi8g" x="143" y="10" width="100" height="699"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_jVKt-tYoEeWN369Mxthi8g" type="Lifeline_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_jVKt-9YoEeWN369Mxthi8g" type="Lifeline_NameLabel"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_jVKt_NYoEeWN369Mxthi8g" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_jVKt_dYoEeWN369Mxthi8g"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jVKt_tYoEeWN369Mxthi8g"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_jVKt_9YoEeWN369Mxthi8g" type="BehaviorExecutionSpecification_Shape"> + <children xmi:type="notation:DecorationNode" xmi:id="_jVKuANYoEeWN369Mxthi8g" type="BehaviorExecutionSpecification_Behavior"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_jVKuAdYoEeWN369Mxthi8g" x="18" y="18"/> + </children> + <element xmi:type="uml:BehaviorExecutionSpecification" href="bug477463.uml#_J8lN8GevEeW_sJdBHKjxSg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jVKuAtYoEeWN369Mxthi8g" x="31" y="90" height="50"/> + </children> + <element xmi:type="uml:Lifeline" href="bug477463.uml#_F47LQGevEeW_sJdBHKjxSg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jVKuA9YoEeWN369Mxthi8g" x="413" y="10" width="100" height="699"/> + </children> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jVKuBNYoEeWN369Mxthi8g"/> + </children> + <element xmi:type="uml:Interaction" href="bug477463.uml#_y4uQwGeuEeW_sJdBHKjxSg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y9SntWeuEeW_sJdBHKjxSg"/> + </children> + <styles xmi:type="notation:StringValueStyle" xmi:id="_y9SntmeuEeW_sJdBHKjxSg" name="diagram_compatibility_version" stringValue="1.2.0"/> + <styles xmi:type="notation:DiagramStyle" xmi:id="_y9Snt2euEeW_sJdBHKjxSg"/> + <styles xmi:type="style:PapyrusViewStyle" xmi:id="_y9SnuGeuEeW_sJdBHKjxSg"> + <owner xmi:type="uml:Model" href="bug477463.uml#_y0i7YGeuEeW_sJdBHKjxSg"/> + </styles> + <element xmi:type="uml:Interaction" href="bug477463.uml#_y4uQwGeuEeW_sJdBHKjxSg"/> + <edges xmi:type="notation:Edge" xmi:id="_LroJsGevEeW_sJdBHKjxSg" type="Message_ReplyEdge"> + <children xmi:type="notation:DecorationNode" xmi:id="_LrowwGevEeW_sJdBHKjxSg" type="Message_ReplyNameLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_LrowwWevEeW_sJdBHKjxSg" x="1" y="-13"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_LrpX0GevEeW_sJdBHKjxSg" type="Message_ReplyStereotypeLabel"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_LrpX0WevEeW_sJdBHKjxSg" x="1" y="-33"/> + </children> + <styles xmi:type="notation:RoutingStyle" xmi:id="_LroJsWevEeW_sJdBHKjxSg"/> + <styles xmi:type="notation:FontStyle" xmi:id="_LroJsmevEeW_sJdBHKjxSg"/> + <styles xmi:type="notation:LineStyle" xmi:id="_Lrql8GevEeW_sJdBHKjxSg"/> + <element xmi:type="uml:Message" href="bug477463.uml#_LqIU4GevEeW_sJdBHKjxSg"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LroJs2evEeW_sJdBHKjxSg" points="[-6, 0, 260, -28]$[-263, 35, 3, 7]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LtPTQGevEeW_sJdBHKjxSg" id="(0.0,1.0){32}"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LtPTQWevEeW_sJdBHKjxSg" id="(0.8125,0.76)"/> + </edges> +</notation:Diagram> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java index 1e157599dfe..01f80cc319a 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java @@ -69,22 +69,22 @@ public class TestCombinedFragmentDeletion_364804 extends TestTopNode { @Test
public void testCombinedFragmentDeleteAll() {
- deleteAll(UMLElementTypes.CombinedFragment_3004);
+ deleteAll(UMLElementTypes.CombinedFragment_Shape);
}
@Test
public void testConsiderIgnoreFragmentDeleteAll() {
- deleteAll(UMLElementTypes.ConsiderIgnoreFragment_3007);
+ deleteAll(UMLElementTypes.ConsiderIgnoreFragment_Shape);
}
@Test
public void testCombinedFragmentKeepContents() {
- keepContents(UMLElementTypes.CombinedFragment_3004);
+ keepContents(UMLElementTypes.CombinedFragment_Shape);
}
@Test
public void testConsiderIgnoreFragmentKeepContents() {
- keepContents(UMLElementTypes.ConsiderIgnoreFragment_3007);
+ keepContents(UMLElementTypes.ConsiderIgnoreFragment_Shape);
}
protected void deleteAll(IElementType type) {
@@ -98,13 +98,13 @@ public class TestCombinedFragmentDeletion_364804 extends TestTopNode { createNode(type, op, new Point(150, 150), new Dimension(100, 100));
assertTrue(CREATION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 1);
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 200), new Dimension(60, 240));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(200, 200), new Dimension(60, 240));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 2);
LifelineEditPart lifelineEP = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
- createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifelineEP, getAbsoluteCenter(lifelineEP).translate(0, 10), null);
+ createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifelineEP, getAbsoluteCenter(lifelineEP).translate(0, 10), null);
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifelineEP.getChildren().size() == 2);
@@ -162,13 +162,13 @@ public class TestCombinedFragmentDeletion_364804 extends TestTopNode { createNode(type, op, new Point(150, 150), new Dimension(100, 100));
assertTrue(CREATION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 1);
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 200), new Dimension(60, 240));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(200, 200), new Dimension(60, 240));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 2);
LifelineEditPart lifelineEP = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
- createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifelineEP, getAbsoluteCenter(lifelineEP).translate(0, 10), null);
+ createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifelineEP, getAbsoluteCenter(lifelineEP).translate(0, 10), null);
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifelineEP.getChildren().size() == 2);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java index d71380ff540..753e3763a8c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java @@ -71,19 +71,19 @@ public class TestCombinedFragmentGates_364816 extends TestLink { @Test
public void testMessageAsyc_Gate() {
- installEnvironment(UMLElementTypes.Lifeline_3001, UMLElementTypes.CombinedFragment_3004);
+ installEnvironment(UMLElementTypes.Lifeline_Shape, UMLElementTypes.CombinedFragment_Shape);
CombinedFragmentEditPart cep = (CombinedFragmentEditPart)target;
CombinedFragment cf = (CombinedFragment)cep.resolveSemanticElement();
// prepare link and gate
- createLink(UMLElementTypes.Message_4004, source, target, getAbsoluteCenter(source), getLeft(target));
+ createLink(UMLElementTypes.Message_AsynchEdge, source, target, getAbsoluteCenter(source), getLeft(target));
assertTrue(CREATION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);
assertTrue(CREATION + INITIALIZATION_TEST, source.getSourceConnections().get(0) instanceof Message2EditPart);
assertTrue(CREATION + INITIALIZATION_TEST, cf.getCfragmentGates().size() == 1);
// check reuse of gate
new PopupUtil(houseKeeper).addDialogCloseHandler();
- createLink(UMLElementTypes.Message_4004, source, target, getAbsoluteCenter(source).translate(0, 40), getLeft(target).translate(0, 40));
+ createLink(UMLElementTypes.Message_AsynchEdge, source, target, getAbsoluteCenter(source).translate(0, 40), getLeft(target).translate(0, 40));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 2);
assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().get(1) instanceof Message2EditPart);
@@ -105,21 +105,21 @@ public class TestCombinedFragmentGates_364816 extends TestLink { @Test
public void testMessageFound_Gate() {
- installEnvironment(UMLElementTypes.Lifeline_3001, UMLElementTypes.CombinedFragment_3004);
+ installEnvironment(UMLElementTypes.Lifeline_Shape, UMLElementTypes.CombinedFragment_Shape);
source = (GraphicalEditPart)source.getParent().getParent(); //interaction
CombinedFragmentEditPart cep = (CombinedFragmentEditPart)target;
CombinedFragment cf = (CombinedFragment)cep.resolveSemanticElement();
// prepare link and gate
- createLink(UMLElementTypes.Message_4009, source, target, new Point(0, 0), getLeft(target));
+ createLink(UMLElementTypes.Message_FoundEdge, source, target, new Point(0, 0), getLeft(target));
assertTrue(CREATION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);
assertTrue(CREATION + INITIALIZATION_TEST, source.getSourceConnections().get(0) instanceof Message7EditPart);
assertTrue(CREATION + INITIALIZATION_TEST, cf.getCfragmentGates().size() == 1);
// check reuse of gate
new PopupUtil(houseKeeper).addDialogCloseHandler();
- createLink(UMLElementTypes.Message_4009, source, target, new Point(0, 20), getLeft(target).translate(0, 40));
+ createLink(UMLElementTypes.Message_FoundEdge, source, target, new Point(0, 20), getLeft(target).translate(0, 40));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 2);
assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().get(1) instanceof Message7EditPart);
@@ -141,21 +141,21 @@ public class TestCombinedFragmentGates_364816 extends TestLink { @Test
public void testMessageLost_Gate() {
- installEnvironment(UMLElementTypes.CombinedFragment_3004, UMLElementTypes.Lifeline_3001);
+ installEnvironment(UMLElementTypes.CombinedFragment_Shape, UMLElementTypes.Lifeline_Shape);
target = (GraphicalEditPart)target.getParent().getParent(); //interaction
CombinedFragmentEditPart cep = (CombinedFragmentEditPart)source;
CombinedFragment cf = (CombinedFragment)cep.resolveSemanticElement();
// prepare link and gate
- createLink(UMLElementTypes.Message_4008, source, target, getLeft(source), new Point(0, 150));
+ createLink(UMLElementTypes.Message_LostEdge, source, target, getLeft(source), new Point(0, 150));
assertTrue(CREATION + INITIALIZATION_TEST, source.getSourceConnections().size() == 1);
assertTrue(CREATION + INITIALIZATION_TEST, source.getSourceConnections().get(0) instanceof Message6EditPart);
assertTrue(CREATION + INITIALIZATION_TEST, cf.getCfragmentGates().size() == 1);
// check reuse of gate
new PopupUtil(houseKeeper).addDialogCloseHandler();
- createLink(UMLElementTypes.Message_4008, source, target, getLeft(source), new Point(0, 200));
+ createLink(UMLElementTypes.Message_LostEdge, source, target, getLeft(source), new Point(0, 200));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 2);
assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().get(1) instanceof Message6EditPart);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java index 2ce3b085c8e..f02f42140db 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java @@ -86,12 +86,12 @@ public class TestCombinedFragmentKind_364710 extends TestTopNode { @Test
public void testConsiderIgnoreFragment() {
- createNode(UMLElementTypes.ConsiderIgnoreFragment_3007, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
+ createNode(UMLElementTypes.ConsiderIgnoreFragment_Shape, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
CustomConsiderIgnoreFragmentEditPart cep = (CustomConsiderIgnoreFragmentEditPart)getRootEditPart().getChildren().get(0);
final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart)cep.getChildren().get(0);
// add operand
- createNode(UMLElementTypes.InteractionOperand_3005, cfp, new Point(30, 100), new Dimension(100, 100));
+ createNode(UMLElementTypes.InteractionOperand_Shape, cfp, new Point(30, 100), new Dimension(100, 100));
assertTrue(CREATION + TEST_THE_EXECUTION, cfp.getChildren().size() == 2);
CombinedFragment cf = (CombinedFragment)cep.resolveSemanticElement();
@@ -104,12 +104,12 @@ public class TestCombinedFragmentKind_364710 extends TestTopNode { @Test
public void testCombinedFragment() {
- createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
+ createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
CombinedFragmentEditPart cep = (CombinedFragmentEditPart)getRootEditPart().getChildren().get(0);
final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart)cep.getChildren().get(0);
// add operand
- createNode(UMLElementTypes.InteractionOperand_3005, cfp, new Point(30, 100), new Dimension(100, 100));
+ createNode(UMLElementTypes.InteractionOperand_Shape, cfp, new Point(30, 100), new Dimension(100, 100));
assertTrue(CREATION + TEST_THE_EXECUTION, cfp.getChildren().size() == 2);
CombinedFragment cf = (CombinedFragment)cep.resolveSemanticElement();
@@ -121,7 +121,7 @@ public class TestCombinedFragmentKind_364710 extends TestTopNode { @Test
public void testCombinedFragmentContinuation() throws CoreException {
- createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
+ createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
CombinedFragmentEditPart cep = (CombinedFragmentEditPart)getRootEditPart().getChildren().get(0);
final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart)cep.getChildren().get(0);
@@ -130,7 +130,7 @@ public class TestCombinedFragmentKind_364710 extends TestTopNode { // add continuation
InteractionOperandEditPart op = (InteractionOperandEditPart)cfp.getChildren().get(0);
- createNode(UMLElementTypes.Continuation_3016, op, new Point(1, 1), new Dimension(20, 60));
+ createNode(UMLElementTypes.Continuation_Shape, op, new Point(1, 1), new Dimension(20, 60));
assertTrue(CREATION + TEST_THE_EXECUTION, op.getChildren().size() == 2);
CustomContinuationEditPart ccep = (CustomContinuationEditPart)op.getChildren().get(1);
Continuation continuation = (Continuation) ccep.resolveSemanticElement();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java index 719d269d849..a1d7ceb9962 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java @@ -74,7 +74,7 @@ public class TestCombinedFragmentName_382951 extends TestTopNode { IEclipsePreferences store = InstanceScope.INSTANCE.getNode(PREF_STORE);
store.putBoolean(COMBINED_FRAGMENT_KEY, true);
- createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
+ createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
CustomCombinedFragmentEditPart cep = (CustomCombinedFragmentEditPart)getRootEditPart().getChildren().get(0);
CombinedFragment cf = (CombinedFragment)cep.resolveSemanticElement();
WrappingLabel label = cep.getTitleLabel();
@@ -90,7 +90,7 @@ public class TestCombinedFragmentName_382951 extends TestTopNode { IEclipsePreferences store = InstanceScope.INSTANCE.getNode(PREF_STORE);
store.putBoolean(CONSIDER_FRAGMENT_KEY, false);
- createNode(UMLElementTypes.ConsiderIgnoreFragment_3007, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
+ createNode(UMLElementTypes.ConsiderIgnoreFragment_Shape, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
CustomConsiderIgnoreFragmentEditPart cep = (CustomConsiderIgnoreFragmentEditPart)getRootEditPart().getChildren().get(0);
ConsiderIgnoreFragment cf = (ConsiderIgnoreFragment)cep.resolveSemanticElement();
WrappingLabel label = cep.getTitleLabel();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java index 82537c832a5..6b960a3fbda 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java @@ -76,7 +76,7 @@ public class TestCombinedFragmentOperand_364701 extends TestTopNode { // add operand
{
- createNode(UMLElementTypes.InteractionOperand_3005, cfp, new Point(50, 100), new Dimension(100, 100));
+ createNode(UMLElementTypes.InteractionOperand_Shape, cfp, new Point(50, 100), new Dimension(100, 100));
assertTrue(CREATION + TEST_THE_EXECUTION, cfp.getChildren().size() == 2);
getDiagramCommandStack().undo();
@@ -126,7 +126,7 @@ public class TestCombinedFragmentOperand_364701 extends TestTopNode { }
private CombinedFragmentCombinedFragmentCompartmentEditPart setupCombinedFragment() {
- createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(30, 80), new Dimension(100, 100));
+ createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(30, 80), new Dimension(100, 100));
CombinedFragmentEditPart cep = (CombinedFragmentEditPart) getRootEditPart().getChildren().get(0);
final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart) cep.getChildren().get(0);
assertTrue(CREATION + INITIALIZATION_TEST, cfp.getChildren().size() == 1);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java index c823fe4aafe..c571068e3a9 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java @@ -61,7 +61,7 @@ public class TestCreationUndo_384618 extends TestLink { @Test
public void testLifeline() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 1);
@@ -76,11 +76,11 @@ public class TestCreationUndo_384618 extends TestLink { @Test
public void testActionExecution() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
- createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline1, new Point(131, 200), new Dimension(20, 40));
+ createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline1, new Point(131, 200), new Dimension(20, 40));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getChildren().size() == 2);
@@ -95,11 +95,11 @@ public class TestCreationUndo_384618 extends TestLink { @Test
public void testBehaviorExecution() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
- createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline1, new Point(131, 200), new Dimension(20, 40));
+ createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline1, new Point(131, 200), new Dimension(20, 40));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getChildren().size() == 2);
@@ -114,13 +114,13 @@ public class TestCreationUndo_384618 extends TestLink { @Test
public void testMessageAsync() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
- createLink(UMLElementTypes.Message_4004, lifeline1, lifeline2, getAbsoluteCenter(lifeline1), getAbsoluteCenter(lifeline2).translate(0, 10));
+ createLink(UMLElementTypes.Message_AsynchEdge, lifeline1, lifeline2, getAbsoluteCenter(lifeline1), getAbsoluteCenter(lifeline2).translate(0, 10));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getSourceConnections().size() == 1);
@@ -135,13 +135,13 @@ public class TestCreationUndo_384618 extends TestLink { @Test
public void testMessageDelete() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
- createLink(UMLElementTypes.Message_4007, lifeline1, lifeline2, getAbsoluteCenter(lifeline1), getAbsoluteCenter(lifeline2).translate(0, 10));
+ createLink(UMLElementTypes.Message_DeleteEdge, lifeline1, lifeline2, getAbsoluteCenter(lifeline1), getAbsoluteCenter(lifeline2).translate(0, 10));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getSourceConnections().size() == 1);
@@ -157,13 +157,13 @@ public class TestCreationUndo_384618 extends TestLink { @Test
public void testMessageCreate() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(150, 150), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(150, 150), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
- createLink(UMLElementTypes.Message_4006, lifeline1, lifeline2, getAbsoluteCenter(lifeline1), getAbsoluteCenter(lifeline2));
+ createLink(UMLElementTypes.Message_CreateEdge, lifeline1, lifeline2, getAbsoluteCenter(lifeline1), getAbsoluteCenter(lifeline2));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getSourceConnections().size() == 1);
@@ -178,20 +178,20 @@ public class TestCreationUndo_384618 extends TestLink { @Test
public void testMessageSync() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
- createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline1, new Point(131, 140), new Dimension(20, 60));
- createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline2, new Point(331, 200), new Dimension(20, 60));
+ createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline1, new Point(131, 140), new Dimension(20, 60));
+ createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline2, new Point(331, 200), new Dimension(20, 60));
waitForComplete();
IGraphicalEditPart source = (IGraphicalEditPart)lifeline1.getChildren().get(1);
IGraphicalEditPart target = (IGraphicalEditPart)lifeline2.getChildren().get(1);
- createLink(UMLElementTypes.Message_4003, source, target, getAbsoluteCenter(source), getAbsoluteCenter(target).translate(0, -28));
+ createLink(UMLElementTypes.Message_SynchEdge, source, target, getAbsoluteCenter(source), getAbsoluteCenter(target).translate(0, -28));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 1);
@@ -207,20 +207,20 @@ public class TestCreationUndo_384618 extends TestLink { @Test
public void testMessageReply() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
- createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline1, new Point(131, 140), new Dimension(20, 60));
- createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline2, new Point(331, 200), new Dimension(20, 60));
+ createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline1, new Point(131, 140), new Dimension(20, 60));
+ createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline2, new Point(331, 200), new Dimension(20, 60));
waitForComplete();
IGraphicalEditPart source = (IGraphicalEditPart)lifeline1.getChildren().get(1);
IGraphicalEditPart target = (IGraphicalEditPart)lifeline2.getChildren().get(1);
- createLink(UMLElementTypes.Message_4005, source, target, getAbsoluteCenter(source), getAbsoluteCenter(target).translate(0, -28));
+ createLink(UMLElementTypes.Message_ReplyEdge, source, target, getAbsoluteCenter(source), getAbsoluteCenter(target).translate(0, -28));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 1);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionCombinedFragment_364813.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionCombinedFragment_364813.java index 7e3563fa3c2..612a628cd6e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionCombinedFragment_364813.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionCombinedFragment_364813.java @@ -147,9 +147,9 @@ public class TestDecompositionCombinedFragment_364813 extends TestTopNode { @Test
public void testCover() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(240, 200));
- createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(80, 120), new Dimension(200, 200));
- createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(200, 120), new Dimension(200, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(240, 200));
+ createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(80, 120), new Dimension(200, 200));
+ createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(200, 120), new Dimension(200, 200));
Interaction interaction = (Interaction) getRootSemanticModel();
CustomLifelineEditPart lifeline1 = (CustomLifelineEditPart) getRootEditPart().getChildren().get(0);
@@ -160,8 +160,8 @@ public class TestDecompositionCombinedFragment_364813 extends TestTopNode { waitForComplete();
new PopupUtil(houseKeeper).addDialogCloseHandler();
- createNode(UMLElementTypes.Lifeline_3001, lifeline1, new Point(100, 120), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, lifeline1, new Point(200, 120), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, lifeline1, new Point(100, 120), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, lifeline1, new Point(200, 120), new Dimension(62, 200));
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getChildren().size() == 3);
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getChildren().get(1) instanceof LifelineEditPart);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionMove_364812.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionMove_364812.java index 971ab70925c..9c0b112731d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionMove_364812.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionMove_364812.java @@ -230,7 +230,7 @@ public class TestDecompositionMove_364812 extends TestTopNode { }
protected LifelineEditPart setupDecomposition() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(300, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(300, 200));
Interaction interaction = (Interaction) getRootSemanticModel();
CustomLifelineEditPart lifeline1 = (CustomLifelineEditPart) getRootEditPart().getChildren().get(0);
@@ -241,8 +241,8 @@ public class TestDecompositionMove_364812 extends TestTopNode { waitForComplete();
new PopupUtil(houseKeeper).addDialogCloseHandler();
- createNode(UMLElementTypes.Lifeline_3001, lifeline1, new Point(100, 120), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, lifeline1, new Point(250, 120), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, lifeline1, new Point(100, 120), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, lifeline1, new Point(250, 120), new Dimension(62, 200));
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getChildren().size() == 3);
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getChildren().get(1) instanceof LifelineEditPart);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java index 3ddc4e95d7d..8a36d8954bd 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java @@ -69,11 +69,11 @@ public class TestDestructionNode_384201 extends TestTopNode { @InvalidTest("DestructionOccurrenceSpecification is nonresizable")
@Test
public void testResizeNorth() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
- createNode(UMLElementTypes.DestructionOccurrenceSpecification_3022, lifeline1, new Point(131, 150), new Dimension(20, 20));
+ createNode(UMLElementTypes.DestructionOccurrenceSpecification_Shape, lifeline1, new Point(131, 150), new Dimension(20, 20));
DestructionOccurrenceSpecificationEditPart dsep = (DestructionOccurrenceSpecificationEditPart)lifeline1.getChildren().get(1);
resize(dsep, getAbsoluteBounds(dsep).getTop(), PositionConstants.NORTH, new Dimension(0, 20));
resize(dsep, getAbsoluteBounds(dsep).getTop(), PositionConstants.NORTH, new Dimension(0, -20));
@@ -83,11 +83,11 @@ public class TestDestructionNode_384201 extends TestTopNode { @InvalidTest("DestructionOccurrenceSpecification is nonresizable")
@Test
public void testResizeWest() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
- createNode(UMLElementTypes.DestructionOccurrenceSpecification_3022, lifeline1, new Point(131, 150), new Dimension(20, 20));
+ createNode(UMLElementTypes.DestructionOccurrenceSpecification_Shape, lifeline1, new Point(131, 150), new Dimension(20, 20));
DestructionOccurrenceSpecificationEditPart dsep = (DestructionOccurrenceSpecificationEditPart)lifeline1.getChildren().get(1);
resize(dsep, getAbsoluteBounds(dsep).getLeft(), PositionConstants.WEST, new Dimension(20, 0));
resize(dsep, getAbsoluteBounds(dsep).getLeft(), PositionConstants.WEST, new Dimension(-20, 0));
@@ -96,11 +96,11 @@ public class TestDestructionNode_384201 extends TestTopNode { @InvalidTest("DestructionOccurrenceSpecification is nonresizable")
@Test
public void testResizeEast() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
- createNode(UMLElementTypes.DestructionOccurrenceSpecification_3022, lifeline1, new Point(131, 150), new Dimension(20, 20));
+ createNode(UMLElementTypes.DestructionOccurrenceSpecification_Shape, lifeline1, new Point(131, 150), new Dimension(20, 20));
DestructionOccurrenceSpecificationEditPart dsep = (DestructionOccurrenceSpecificationEditPart)lifeline1.getChildren().get(1);
resize(dsep, getAbsoluteBounds(dsep).getRight(), PositionConstants.EAST, new Dimension(20, 0));
resize(dsep, getAbsoluteBounds(dsep).getRight(), PositionConstants.EAST, new Dimension(-20, 0));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java index 243e04fb0ea..77efb7b0b61 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java @@ -91,11 +91,11 @@ public class TestDurationConstraints_384596 extends TestTopNode { @Test
public void testDurationEdition() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200), null);
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200), null);
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
- createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline1, new Point(131, 200), new Dimension(20, 40), null);
+ createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline1, new Point(131, 200), new Dimension(20, 40), null);
waitForComplete();
ActionExecutionSpecificationEditPart esp = (ActionExecutionSpecificationEditPart)lifeline1.getChildren().get(1);
@@ -149,7 +149,7 @@ public class TestDurationConstraints_384596 extends TestTopNode { events.add(aes.getFinish());
extendedData.put(NEAREST_OCCURRENCE_SPECIFICATION_2, events);
- createNode(UMLElementTypes.DurationConstraint_3021, lifeline1, getAbsoluteBounds(esp).getBottom(), new Dimension(20, 40), extendedData);
+ createNode(UMLElementTypes.DurationConstraint_Shape, lifeline1, getAbsoluteBounds(esp).getBottom(), new Dimension(20, 40), extendedData);
waitForComplete();
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java index e1ef2898c38..039c03679f5 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java @@ -65,26 +65,26 @@ public class TestExecutionSpecificationDimension_384572 extends TestTopNode { @Test
public void testResizeActionExecutionNorth() {
- resizeNorth(UMLElementTypes.ActionExecutionSpecification_3006);
+ resizeNorth(UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testResizeBehaviorExecutionNorth() {
- resizeNorth(UMLElementTypes.BehaviorExecutionSpecification_3003);
+ resizeNorth(UMLElementTypes.BehaviorExecutionSpecification_Shape);
}
@Test
public void testResizeActionExecutionSouth() {
- resizeSouth(UMLElementTypes.ActionExecutionSpecification_3006);
+ resizeSouth(UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testResizeBehaviorExecutionSouth() {
- resizeSouth(UMLElementTypes.BehaviorExecutionSpecification_3003);
+ resizeSouth(UMLElementTypes.BehaviorExecutionSpecification_Shape);
}
protected void resizeNorth(IElementType elementType) {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart) getRootEditPart().getChildren().get(0);
waitForComplete();
@@ -98,7 +98,7 @@ public class TestExecutionSpecificationDimension_384572 extends TestTopNode { }
protected void resizeSouth(IElementType elementType) {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart) getRootEditPart().getChildren().get(0);
waitForComplete();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java index 30530f17c8e..4ad9c330172 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java @@ -138,7 +138,7 @@ public class TestGuardEdition_364808 extends TestTopNode { }
protected InteractionOperandEditPart setupOperand() {
- createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
+ createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
CombinedFragmentEditPart cep = (CombinedFragmentEditPart)getRootEditPart().getChildren().get(0);
final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart)cep.getChildren().get(0);
InteractionOperandEditPart op = (InteractionOperandEditPart)cfp.getChildren().get(0);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java index 3f8241ee035..e4c1e3c1f45 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java @@ -167,7 +167,7 @@ public class TestInteractionConstraint_382966 extends TestTopNode { };
protected InteractionOperandEditPart setupOperand() {
- createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
+ createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
CombinedFragmentEditPart cep = (CombinedFragmentEditPart)getRootEditPart().getChildren().get(0);
final CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart)cep.getChildren().get(0);
InteractionOperandEditPart op = (InteractionOperandEditPart)cfp.getChildren().get(0);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java index 14b7a34e503..a0994c6bc71 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java @@ -65,9 +65,9 @@ public class TestLifelineAlignment_364688 extends TestLink { @Test
public void testAlignment() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(20, 20), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(150, 150), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(20, 20), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(150, 150), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
@@ -77,7 +77,7 @@ public class TestLifelineAlignment_364688 extends TestLink { assertTrue(ALIGNMENT + TEST_THE_EXECUTION, getAbsoluteBounds(lifeline3).y == getAbsoluteBounds(lifeline2).y);
waitForComplete();
- createLink(UMLElementTypes.Message_4006, lifeline2, lifeline3);
+ createLink(UMLElementTypes.Message_CreateEdge, lifeline2, lifeline3);
assertTrue(ALIGNMENT + TEST_THE_EXECUTION, getAbsoluteBounds(lifeline1).y == getAbsoluteBounds(lifeline2).y);
assertTrue(ALIGNMENT + TEST_THE_EXECUTION, getAbsoluteBounds(lifeline3).y > getAbsoluteBounds(lifeline2).y);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java index 1e7d1fb9b98..41c71de44c4 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java @@ -98,7 +98,7 @@ public class TestLifelineAutoResize_383723 extends TestTopNode { @Test
public void testManualSize() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
@@ -121,7 +121,7 @@ public class TestLifelineAutoResize_383723 extends TestTopNode { @Test
public void testAutoSize() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
@@ -144,7 +144,7 @@ public class TestLifelineAutoResize_383723 extends TestTopNode { @Test
public void testPropertyChanged() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java index 179e4cc4552..9bc06a0c3c0 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java @@ -172,7 +172,7 @@ public class TestLifelineLabelCustomize_383722 extends TestTopNode { }
protected LifelineEditPart setupLifeline() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java index 10f6dd8c4fd..b91e2c2f961 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java @@ -69,8 +69,8 @@ public class TestMessageCreate_379661 extends TestLink { @Test
public void testHeaderAnchor() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(150, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(150, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
@@ -79,7 +79,7 @@ public class TestMessageCreate_379661 extends TestLink { Rectangle bounds = fig.getBounds().getCopy();
fig.translateToAbsolute(bounds);
- createLink(UMLElementTypes.Message_4006, lifeline1, lifeline2, getAbsoluteCenter(lifeline1), bounds.getCenter());
+ createLink(UMLElementTypes.Message_CreateEdge, lifeline1, lifeline2, getAbsoluteCenter(lifeline1), bounds.getCenter());
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getSourceConnections().size() == 1);
@@ -95,8 +95,8 @@ public class TestMessageCreate_379661 extends TestLink { @Test
public void testVerticalBarAnchor() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(150, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(150, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
@@ -105,7 +105,7 @@ public class TestMessageCreate_379661 extends TestLink { Rectangle bounds = fig.getBounds().getCopy();
fig.translateToAbsolute(bounds);
- createLink(UMLElementTypes.Message_4006, lifeline1, lifeline2, getAbsoluteCenter(lifeline1), bounds.getCenter());
+ createLink(UMLElementTypes.Message_CreateEdge, lifeline1, lifeline2, getAbsoluteCenter(lifeline1), bounds.getCenter());
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getSourceConnections().size() == 1);
@@ -120,8 +120,8 @@ public class TestMessageCreate_379661 extends TestLink { @Test
public void testMove() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(150, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(150, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
@@ -130,7 +130,7 @@ public class TestMessageCreate_379661 extends TestLink { Rectangle bounds = fig.getBounds().getCopy();
fig.translateToAbsolute(bounds);
- createLink(UMLElementTypes.Message_4006, lifeline1, lifeline2, getAbsoluteCenter(lifeline1), bounds.getCenter());
+ createLink(UMLElementTypes.Message_CreateEdge, lifeline1, lifeline2, getAbsoluteCenter(lifeline1), bounds.getCenter());
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getSourceConnections().size() == 1);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java index 7f4bcbd4453..f2ab5462508 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java @@ -66,7 +66,7 @@ public class TestMessageEndConstraint_364817 extends TestLink { public void checkConstraintLink(IElementType sourceType, IElementType targetType, IElementType linkType, IElementType subNodeType) {
installEnvironment(sourceType, targetType, subNodeType);
- createNode(UMLElementTypes.Constraint_3008, getRootEditPart(), new Point(200, 400), new Dimension(100, 50));
+ createNode(UMLElementTypes.Constraint_Shape, getRootEditPart(), new Point(200, 400), new Dimension(100, 50));
createLink(linkType, source, target, getAbsoluteCenter(source), getAbsoluteCenter(target));
waitForComplete();
@@ -79,7 +79,7 @@ public class TestMessageEndConstraint_364817 extends TestLink { }
ConstraintEditPart constraintEditPart = (ConstraintEditPart)getRootEditPart().getChildren().get(2);
- createLink(UMLElementTypes.ConstraintConstrainedElement_4011, constraintEditPart, linkEndPoint, getAbsoluteCenter(constraintEditPart), getAbsoluteCenter(linkEndPoint));
+ createLink(UMLElementTypes.Constraint_ConstrainedElementEdge, constraintEditPart, linkEndPoint, getAbsoluteCenter(constraintEditPart), getAbsoluteCenter(linkEndPoint));
Constraint constraint = (Constraint)constraintEditPart.resolveSemanticElement();
assertTrue(CREATION + TEST_THE_EXECUTION, constraint.getConstrainedElements().get(0) instanceof MessageEnd);
@@ -94,27 +94,27 @@ public class TestMessageEndConstraint_364817 extends TestLink { @Test
public void testMessageAsync_4004() {
- checkConstraintLink(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4004, null);
+ checkConstraintLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_AsynchEdge, null);
}
@Test
public void testMessageSync_4003() {
- checkConstraintLink(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4003, UMLElementTypes.ActionExecutionSpecification_3006);
+ checkConstraintLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_SynchEdge, UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testMessageReply_4005() {
- checkConstraintLink(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4005, UMLElementTypes.ActionExecutionSpecification_3006);
+ checkConstraintLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_ReplyEdge, UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testMessageDelete_4007() {
- checkConstraintLink(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4007, null);
+ checkConstraintLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_DeleteEdge, null);
}
@Test
public void testMessageCreate_4006() {
- checkConstraintLink(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4006, null);
+ checkConstraintLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_CreateEdge, null);
}
public void createLink(IElementType linkType, EditPart source, EditPart target, Point sourcePoint, Point targetPoint) {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java index 69ef1988eae..797a028e74b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java @@ -74,14 +74,14 @@ public class TestMessageLostFound_384202 extends TestLink { @Test
public void testMessageFound() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
source = (GraphicalEditPart)getRootEditPart().getParent();
- createLink(UMLElementTypes.Message_4009, source, lifeline1, getAbsoluteCenter(source), getAbsoluteCenter(lifeline1)); // new Point(100,0)
+ createLink(UMLElementTypes.Message_FoundEdge, source, lifeline1, getAbsoluteCenter(source), getAbsoluteCenter(lifeline1)); // new Point(100,0)
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 1);
@@ -96,14 +96,14 @@ public class TestMessageLostFound_384202 extends TestLink { @Test
public void testMessageLost() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
target = (GraphicalEditPart)getRootEditPart().getParent();
- createLink(UMLElementTypes.Message_4008, lifeline1, target, getAbsoluteCenter(lifeline1), getAbsoluteCenter(target)); // getAbsoluteBounds(target).getBottomRight());
+ createLink(UMLElementTypes.Message_LostEdge, lifeline1, target, getAbsoluteCenter(lifeline1), getAbsoluteCenter(target)); // getAbsoluteBounds(target).getBottomRight());
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getSourceConnections().size() == 1);
@@ -118,20 +118,20 @@ public class TestMessageLostFound_384202 extends TestLink { @Test
public void testGeneralOrderingOnExecution() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
- createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline1, new Point(131, 140), new Dimension(20, 60));
- createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline2, new Point(331, 200), new Dimension(20, 60));
+ createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline1, new Point(131, 140), new Dimension(20, 60));
+ createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline2, new Point(331, 200), new Dimension(20, 60));
waitForComplete();
IGraphicalEditPart source = (IGraphicalEditPart)lifeline1.getChildren().get(1);
IGraphicalEditPart target = (IGraphicalEditPart)lifeline2.getChildren().get(1);
- createLink(UMLElementTypes.GeneralOrdering_4012, source, target, getAbsoluteBounds(source).getTop(), getAbsoluteBounds(target).getTop());
+ createLink(UMLElementTypes.GeneralOrdering_Edge, source, target, getAbsoluteBounds(source).getTop(), getAbsoluteBounds(target).getTop());
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 1);
@@ -147,18 +147,18 @@ public class TestMessageLostFound_384202 extends TestLink { @Test
public void testGeneralOrderingOnMessage() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(400, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(200, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(400, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
final LifelineEditPart lifeline3 = (LifelineEditPart)getRootEditPart().getChildren().get(2);
final LifelineEditPart lifeline4 = (LifelineEditPart)getRootEditPart().getChildren().get(3);
waitForComplete();
- createLink(UMLElementTypes.Message_4004, lifeline1, lifeline2, getAbsoluteCenter(lifeline1).translate(0, -20), getAbsoluteCenter(lifeline2).translate(0, -20));
- createLink(UMLElementTypes.Message_4004, lifeline3, lifeline4, getAbsoluteCenter(lifeline3).translate(0, 20), getAbsoluteCenter(lifeline4).translate(0, 20));
+ createLink(UMLElementTypes.Message_AsynchEdge, lifeline1, lifeline2, getAbsoluteCenter(lifeline1).translate(0, -20), getAbsoluteCenter(lifeline2).translate(0, -20));
+ createLink(UMLElementTypes.Message_AsynchEdge, lifeline3, lifeline4, getAbsoluteCenter(lifeline3).translate(0, 20), getAbsoluteCenter(lifeline4).translate(0, 20));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline1.getSourceConnections().size() == 1);
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline3.getSourceConnections().size() == 1);
@@ -166,7 +166,7 @@ public class TestMessageLostFound_384202 extends TestLink { AbstractMessageEditPart s = (AbstractMessageEditPart)lifeline1.getSourceConnections().get(0);
AbstractMessageEditPart t = (AbstractMessageEditPart)lifeline3.getSourceConnections().get(0);
- createLink(UMLElementTypes.GeneralOrdering_4012, lifeline1, lifeline3, getAbsoluteEdgeExtremity(s, true), getAbsoluteEdgeExtremity(t, true));
+ createLink(UMLElementTypes.GeneralOrdering_Edge, lifeline1, lifeline3, getAbsoluteEdgeExtremity(s, true), getAbsoluteEdgeExtremity(t, true));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifeline3.getTargetConnections().size() == 1);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java index 4a9289affa1..0308454c036 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java @@ -110,7 +110,7 @@ public class TestMessagesDeletion_364828 extends TestLink { assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, delCommand != UnexecutableCommand.INSTANCE);
assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, delCommand.canExecute() == true);
getEMFCommandStack().execute(new GEFtoEMFCommandWrapper(delCommand));
- int fragmentsAfterMessageDeletion = (linkType.equals(UMLElementTypes.Message_4007)) ? 1 : 0;
+ int fragmentsAfterMessageDeletion = (linkType.equals(UMLElementTypes.Message_DeleteEdge)) ? 1 : 0;
assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getMessageEndCount(interaction.getFragments()) == fragmentsAfterMessageDeletion);
getEMFCommandStack().undo();
@@ -133,27 +133,27 @@ public class TestMessagesDeletion_364828 extends TestLink { @Test
public void testMessageAsync_4004() {
- deleteMessageEvents(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4004, lifelineProvider);
+ deleteMessageEvents(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_AsynchEdge, lifelineProvider);
}
@Test
public void testMessageSync_4003() {
- deleteMessageEvents(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4003, executionProvider);
+ deleteMessageEvents(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_SynchEdge, executionProvider);
}
@Test
public void testMessageReply_4005() {
- deleteMessageEvents(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4005, executionProvider);
+ deleteMessageEvents(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_ReplyEdge, executionProvider);
}
@Test
public void testMessageDelete_4007() {
- deleteMessageEvents(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4007, lifelineProvider);
+ deleteMessageEvents(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_DeleteEdge, lifelineProvider);
}
@Test
public void testMessageCreate_4006() {
- deleteMessageEvents(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4006, lifelineProvider);
+ deleteMessageEvents(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_CreateEdge, lifelineProvider);
}
protected ILinkTestProvider executionProvider = new ILinkTestProvider() {
@@ -204,7 +204,7 @@ public class TestMessagesDeletion_364828 extends TestLink { }
public void setUp() {
- IElementType childNodeType = UMLElementTypes.ActionExecutionSpecification_3006;
+ IElementType childNodeType = UMLElementTypes.ActionExecutionSpecification_Shape;
source = createSubNode(source, childNodeType, getChildLocation(source));
sourcePlayer = createSubNode(sourcePlayer, childNodeType, getChildLocation(sourcePlayer));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java index 614173bf32e..e8152d1cc50 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java @@ -66,9 +66,9 @@ public class TestMovingCombinedFragment_364711 extends TestTopNode { @Test
public void testMovingRight() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 20));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(200, 20));
final LifelineEditPart lifelineEP = (LifelineEditPart)getRootEditPart().getChildren().get(0);
- createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), SequenceUtil.getAbsoluteBounds(lifelineEP).getCenter().getTranslated(-210, 70));
+ createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), SequenceUtil.getAbsoluteBounds(lifelineEP).getCenter().getTranslated(-210, 70));
final CombinedFragmentEditPart cep = (CombinedFragmentEditPart)getRootEditPart().getChildren().get(1);
waitForComplete(); // wait for updating covered field
@@ -98,9 +98,9 @@ public class TestMovingCombinedFragment_364711 extends TestTopNode { @Test
public void testMovingLeft() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(70, 20));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(70, 20));
final LifelineEditPart lifelineEP = (LifelineEditPart)getRootEditPart().getChildren().get(0);
- createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), SequenceUtil.getAbsoluteBounds(lifelineEP).getCenter().getTranslated(-2, 70));
+ createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), SequenceUtil.getAbsoluteBounds(lifelineEP).getCenter().getTranslated(-2, 70));
final CombinedFragmentEditPart cep = (CombinedFragmentEditPart)getRootEditPart().getChildren().get(1);
waitForComplete(); // wait for updating covered field
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java index 14038d63bcf..426bb291e37 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java @@ -65,17 +65,17 @@ public class TestNestedCombinedFragment_364795 extends TestTopNode { @Test
public void testCover() {
// create parent combined fragment
- createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(10, 80), new Dimension(300, 200));
+ createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(10, 80), new Dimension(300, 200));
waitForComplete(); // wait for updating covered field
CombinedFragmentEditPart parentCFP = (CombinedFragmentEditPart)getRootEditPart().getChildren().get(0);
InteractionOperandEditPart oep = (InteractionOperandEditPart)((GraphicalEditPart)parentCFP.getChildren().get(0)).getChildren().get(0);
// create child combined fragment
- createNode(UMLElementTypes.CombinedFragment_3004, oep, new Point(90, 90), new Dimension(200, 100));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(120, 20), new Dimension(62, 240));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 20), new Dimension(62, 240));
+ createNode(UMLElementTypes.CombinedFragment_Shape, oep, new Point(90, 90), new Dimension(200, 100));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(120, 20), new Dimension(62, 240));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(200, 20), new Dimension(62, 240));
//the first child would be Guard now.
- CombinedFragmentEditPart childCFP = (CombinedFragmentEditPart)oep.getChildBySemanticHint("3004");
+ CombinedFragmentEditPart childCFP = (CombinedFragmentEditPart)oep.getChildBySemanticHint(CombinedFragmentEditPart.VISUAL_ID);
final CombinedFragment parentCF = (CombinedFragment)parentCFP.resolveSemanticElement();
final CombinedFragment childCF = (CombinedFragment)childCFP.resolveSemanticElement();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java index d62b73d3d02..50bc06b4d5e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java @@ -71,16 +71,16 @@ public class TestNestedExecution_384616 extends TestTopNode { @Test
public void testActionExecutionSpecification() {
- manageActions(UMLElementTypes.ActionExecutionSpecification_3006);
+ manageActions(UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testBehaviorExecutionSpecification() {
- manageActions(UMLElementTypes.BehaviorExecutionSpecification_3003);
+ manageActions(UMLElementTypes.BehaviorExecutionSpecification_Shape);
}
protected void manageActions(IElementType elementType) {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java index 2803d777785..9edacac79e8 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java @@ -106,90 +106,90 @@ public class TestObservationLink_364826 extends TestLink { @Test
public void testTimeObservationExecution1() {
- manageTimeObservationExecution(UMLElementTypes.ActionExecutionSpecification_3006);
+ manageTimeObservationExecution(UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testTimeObservationExecution2() {
- manageTimeObservationExecution(UMLElementTypes.BehaviorExecutionSpecification_3003);
+ manageTimeObservationExecution(UMLElementTypes.BehaviorExecutionSpecification_Shape);
}
@Test
public void testTimeObservationLink1() {
- manageTimeObservationLink(UMLElementTypes.Message_4004, null);
+ manageTimeObservationLink(UMLElementTypes.Message_AsynchEdge, null);
}
@Test
public void testTimeObservationLink2() {
- manageTimeObservationLink(UMLElementTypes.Message_4006, null);
+ manageTimeObservationLink(UMLElementTypes.Message_CreateEdge, null);
}
@Test
public void testTimeObservationLink3() {
- manageTimeObservationLink(UMLElementTypes.Message_4007, null);
+ manageTimeObservationLink(UMLElementTypes.Message_DeleteEdge, null);
}
@Test
public void testTimeObservationLink4() {
- manageTimeObservationLink(UMLElementTypes.Message_4003, UMLElementTypes.ActionExecutionSpecification_3006);
+ manageTimeObservationLink(UMLElementTypes.Message_SynchEdge, UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testTimeObservationLink5() {
- manageTimeObservationLink(UMLElementTypes.Message_4003, UMLElementTypes.BehaviorExecutionSpecification_3003);
+ manageTimeObservationLink(UMLElementTypes.Message_SynchEdge, UMLElementTypes.BehaviorExecutionSpecification_Shape);
}
@Test
public void testTimeObservationLink6() {
- manageTimeObservationLink(UMLElementTypes.Message_4005, UMLElementTypes.ActionExecutionSpecification_3006);
+ manageTimeObservationLink(UMLElementTypes.Message_ReplyEdge, UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testTimeObservationLink7() {
- manageTimeObservationLink(UMLElementTypes.Message_4005, UMLElementTypes.BehaviorExecutionSpecification_3003);
+ manageTimeObservationLink(UMLElementTypes.Message_ReplyEdge, UMLElementTypes.BehaviorExecutionSpecification_Shape);
}
@Test
public void testDurationObservationLink1() {
- manageDurationObservationLink(UMLElementTypes.Message_4004, null);
+ manageDurationObservationLink(UMLElementTypes.Message_AsynchEdge, null);
}
@Test
public void testDurationObservationLink2() {
- manageDurationObservationLink(UMLElementTypes.Message_4006, null);
+ manageDurationObservationLink(UMLElementTypes.Message_CreateEdge, null);
}
@Test
public void testDurationObservationLink3() {
- manageDurationObservationLink(UMLElementTypes.Message_4007, null);
+ manageDurationObservationLink(UMLElementTypes.Message_DeleteEdge, null);
}
@Test
public void testDurationObservationLink4() {
- manageDurationObservationLink(UMLElementTypes.Message_4003, UMLElementTypes.ActionExecutionSpecification_3006);
+ manageDurationObservationLink(UMLElementTypes.Message_SynchEdge, UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testDurationObservationLink5() {
- manageDurationObservationLink(UMLElementTypes.Message_4003, UMLElementTypes.BehaviorExecutionSpecification_3003);
+ manageDurationObservationLink(UMLElementTypes.Message_SynchEdge, UMLElementTypes.BehaviorExecutionSpecification_Shape);
}
@Test
public void testDurationObservationLink6() {
- manageDurationObservationLink(UMLElementTypes.Message_4005, UMLElementTypes.ActionExecutionSpecification_3006);
+ manageDurationObservationLink(UMLElementTypes.Message_ReplyEdge, UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testDurationObservationLink7() {
- manageDurationObservationLink(UMLElementTypes.Message_4005, UMLElementTypes.BehaviorExecutionSpecification_3003);
+ manageDurationObservationLink(UMLElementTypes.Message_ReplyEdge, UMLElementTypes.BehaviorExecutionSpecification_Shape);
}
public void manageDurationObservationLink(IElementType linkType, IElementType execType) {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(62, 250));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(500, 100), new Dimension(62, 250));
- createNode(UMLElementTypes.DurationObservation_3024, getRootEditPart(), new Point(100, 100), new Dimension(20, 15));
- createNode(UMLElementTypes.DurationObservation_3024, getRootEditPart(), new Point(100, 200), new Dimension(20, 15));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(62, 250));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(500, 100), new Dimension(62, 250));
+ createNode(UMLElementTypes.DurationObservation_Shape, getRootEditPart(), new Point(100, 100), new Dimension(20, 15));
+ createNode(UMLElementTypes.DurationObservation_Shape, getRootEditPart(), new Point(100, 200), new Dimension(20, 15));
waitForComplete();
GraphicalEditPart lifeline1 = (GraphicalEditPart)getRootEditPart().getChildren().get(0);
@@ -221,10 +221,10 @@ public class TestObservationLink_364826 extends TestLink { public void manageTimeObservationLink(IElementType linkType, IElementType execType) {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(62, 250));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(500, 100), new Dimension(62, 250));
- createNode(UMLElementTypes.TimeObservation_3020, getRootEditPart(), new Point(100, 100), new Dimension(20, 15));
- createNode(UMLElementTypes.TimeObservation_3020, getRootEditPart(), new Point(100, 200), new Dimension(20, 15));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(62, 250));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(500, 100), new Dimension(62, 250));
+ createNode(UMLElementTypes.TimeObservation_Shape, getRootEditPart(), new Point(100, 100), new Dimension(20, 15));
+ createNode(UMLElementTypes.TimeObservation_Shape, getRootEditPart(), new Point(100, 200), new Dimension(20, 15));
waitForComplete();
GraphicalEditPart lifeline1 = (GraphicalEditPart)getRootEditPart().getChildren().get(0);
@@ -260,9 +260,9 @@ public class TestObservationLink_364826 extends TestLink { public void manageTimeObservationExecution(IElementType type) {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(62, 250));
- createNode(UMLElementTypes.TimeObservation_3020, getRootEditPart(), new Point(100, 100), new Dimension(20, 15));
- createNode(UMLElementTypes.TimeObservation_3020, getRootEditPart(), new Point(100, 200), new Dimension(20, 15));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(62, 250));
+ createNode(UMLElementTypes.TimeObservation_Shape, getRootEditPart(), new Point(100, 100), new Dimension(20, 15));
+ createNode(UMLElementTypes.TimeObservation_Shape, getRootEditPart(), new Point(100, 200), new Dimension(20, 15));
waitForComplete();
GraphicalEditPart lifeline1 = (GraphicalEditPart)getRootEditPart().getChildren().get(0);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestOccurrenceSpecificationDeletion_430552.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestOccurrenceSpecificationDeletion_430552.java index a515989ec14..c253bab8a15 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestOccurrenceSpecificationDeletion_430552.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestOccurrenceSpecificationDeletion_430552.java @@ -69,23 +69,23 @@ public class TestOccurrenceSpecificationDeletion_430552 extends TestLink { @Test
public void testGeneralOrderingDeletion() {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 200));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(62, 200));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
final LifelineEditPart lifeline2 = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
- createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline1, new Point(131, 140), new Dimension(20, 60));
- createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline2, new Point(331, 200), new Dimension(20, 60));
- createNode(UMLElementTypes.DestructionOccurrenceSpecification_3022, lifeline1, getAbsoluteBounds(lifeline1).getBottom(), null);
+ createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline1, new Point(131, 140), new Dimension(20, 60));
+ createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline2, new Point(331, 200), new Dimension(20, 60));
+ createNode(UMLElementTypes.DestructionOccurrenceSpecification_Shape, lifeline1, getAbsoluteBounds(lifeline1).getBottom(), null);
waitForComplete();
IGraphicalEditPart source = (IGraphicalEditPart)lifeline1.getChildren().get(1);
IGraphicalEditPart target = (IGraphicalEditPart)lifeline2.getChildren().get(1);
IGraphicalEditPart target2 = (IGraphicalEditPart)lifeline1.getChildren().get(2);
- createLink(UMLElementTypes.GeneralOrdering_4012, source, target, getAbsoluteBounds(source).getTop(), getAbsoluteBounds(target).getTop());
- createLink(UMLElementTypes.GeneralOrdering_4012, target, target2, getAbsoluteBounds(target).getBottom(), getAbsoluteBounds(target2).getTop());
+ createLink(UMLElementTypes.GeneralOrdering_Edge, source, target, getAbsoluteBounds(source).getTop(), getAbsoluteBounds(target).getTop());
+ createLink(UMLElementTypes.GeneralOrdering_Edge, target, target2, getAbsoluteBounds(target).getBottom(), getAbsoluteBounds(target2).getTop());
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, source.getSourceConnections().size() == 1);
assertTrue(CREATION + TEST_THE_EXECUTION, target.getSourceConnections().size() == 1);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java index fdb9df97c85..63367681431 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java @@ -71,26 +71,26 @@ public class TestParentBarAutoresize_385603 extends TestTopNode { @Test
public void testActionExecutionSpecificationUp() {
- moveUp(UMLElementTypes.ActionExecutionSpecification_3006);
+ moveUp(UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testActionExecutionSpecificationDown() {
- moveDown(UMLElementTypes.ActionExecutionSpecification_3006);
+ moveDown(UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testBehaviorExecutionSpecificationDown() {
- moveDown(UMLElementTypes.BehaviorExecutionSpecification_3003);
+ moveDown(UMLElementTypes.BehaviorExecutionSpecification_Shape);
}
@Test
public void testBehaviorExecutionSpecificationUp() {
- moveUp(UMLElementTypes.BehaviorExecutionSpecification_3003);
+ moveUp(UMLElementTypes.BehaviorExecutionSpecification_Shape);
}
private void moveUp(IElementType elementType) {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 300));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 300));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
@@ -126,7 +126,7 @@ public class TestParentBarAutoresize_385603 extends TestTopNode { }
private void moveDown(IElementType elementType) {
- createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 300));
+ createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(62, 300));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
waitForComplete();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java index 903c7fc99c1..0a2c036c3b4 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java @@ -121,22 +121,22 @@ public class TestSynchronousMessageCreation_364827 extends TestLink { @Test
public void testMessageSync_4003_Action() {
- selectActionExecution(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4003, UMLElementTypes.ActionExecutionSpecification_3006);
+ selectActionExecution(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_SynchEdge, UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testMessageSync_4003_Behavior() {
- selectBehaviorExecution(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4003, UMLElementTypes.BehaviorExecutionSpecification_3003);
+ selectBehaviorExecution(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_SynchEdge, UMLElementTypes.BehaviorExecutionSpecification_Shape);
}
@Test
public void testMessageReply_4005_Action() {
- selectActionExecution(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4005, UMLElementTypes.ActionExecutionSpecification_3006);
+ selectActionExecution(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_ReplyEdge, UMLElementTypes.ActionExecutionSpecification_Shape);
}
@Test
public void testMessageReply_4005_Behavior() {
- selectBehaviorExecution(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4005, UMLElementTypes.BehaviorExecutionSpecification_3003);
+ selectBehaviorExecution(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_ReplyEdge, UMLElementTypes.BehaviorExecutionSpecification_Shape);
}
public void createLink(IElementType linkType, EditPart source, EditPart target, Point sourcePoint, Point targetPoint) {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/AbstractNodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/AbstractNodeTest.java index 9242529eb03..74ef1bdd305 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/AbstractNodeTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/AbstractNodeTest.java @@ -284,7 +284,7 @@ public abstract class AbstractNodeTest extends TestTopNode { request.setTargetEditPart(sourceEditPart);
request.getExtendedData().put(SequenceRequestConstant.SOURCE_MODEL_CONTAINER, SequenceUtil.findInteractionFragmentContainerAt(startLocation, sourceEditPart));
Command command = null;
- if(UMLElementTypes.GeneralOrdering_4012 == elementType) {
+ if(UMLElementTypes.GeneralOrdering_Edge == elementType) {
LifelineEditPart lifelinePart = sourceEditPart instanceof ConnectionEditPart ? SequenceUtil.getParentLifelinePart(((ConnectionEditPart)sourceEditPart).getSource()) : SequenceUtil.getParentLifelinePart(sourceEditPart);
assertNotNull(lifelinePart);
Entry<Point, List<OccurrenceSpecification>> eventAndLocation = SequenceUtil.findNearestEvent(request.getLocation(), lifelinePart);
@@ -316,7 +316,7 @@ public abstract class AbstractNodeTest extends TestTopNode { assertNotNull("Can not find connecting end at " + endLocation, targetEditPart);
request.setTargetEditPart(targetEditPart);
request.getExtendedData().put(SequenceRequestConstant.TARGET_MODEL_CONTAINER, SequenceUtil.findInteractionFragmentContainerAt(endLocation, targetEditPart));
- if(UMLElementTypes.GeneralOrdering_4012 == elementType) {
+ if(UMLElementTypes.GeneralOrdering_Edge == elementType) {
LifelineEditPart lifelinePart = targetEditPart instanceof ConnectionEditPart ? SequenceUtil.getParentLifelinePart(((ConnectionEditPart)targetEditPart).getTarget()) : SequenceUtil.getParentLifelinePart(targetEditPart);
assertNotNull(lifelinePart);
Entry<Point, List<OccurrenceSpecification>> eventAndLocation = SequenceUtil.findNearestEvent(request.getLocation(), lifelinePart);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestDurationConstraint_402967.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestDurationConstraint_402967.java index a46df9aec72..131cf6ef5ab 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestDurationConstraint_402967.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestDurationConstraint_402967.java @@ -190,12 +190,12 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { @Test
// test property view of duration link
public void testDurationLinkProperty() {
- LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(200, 100), null);
assertNotNull(lifeline);
AbstractExecutionSpecificationEditPart es = createExecutionSpecification(lifeline, new Point(231, 150), null);
assertNotNull(es);
- DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(400, 200), null);
+ DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_Shape, getRootEditPart(), new Point(400, 200), null);
assertNotNull(dc);
// start connection
@@ -286,7 +286,7 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { @Test
public void testDurationRotate() {
- DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(100, 200), null);
+ DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_Shape, getRootEditPart(), new Point(100, 200), null);
assertNotNull(dc);
assertEquals(CREATION + TEST_THE_EXECUTION, 1, getRootEditPart().getChildren().size());
assertEquals(CREATION + TEST_THE_EXECUTION, PositionConstants.TOP | PositionConstants.BOTTOM, getBorderSides(dc));
@@ -323,7 +323,7 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { @Test
public void testDurationCreation() {
- DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(400, 200), null);
+ DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_Shape, getRootEditPart(), new Point(400, 200), null);
assertNotNull(dc);
assertTrue(CREATION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 1);
@@ -341,20 +341,20 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { @Test
public void testDurationMoveResize() {
// test move
- DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(400, 200), null);
+ DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_Shape, getRootEditPart(), new Point(400, 200), null);
assertNotNull(dc);
moveEditPart(dc, new Point(50, 0));
moveEditPart(dc, new Point(-20, 0));
// test resize
int move = 30;
- DurationConstraintEditPart dc2 = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(200, 100), null);
+ DurationConstraintEditPart dc2 = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_Shape, getRootEditPart(), new Point(200, 100), null);
assertNotNull(dc2);
resize(dc2, getAbsoluteBounds(dc2).getLocation(), PositionConstants.NORTH, new Dimension(0, move));
resize(dc2, getAbsoluteBounds(dc2).getLocation(), PositionConstants.SOUTH, new Dimension(0, move));
waitForComplete();
- DurationConstraintEditPart dc3 = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(300, 300), null);
+ DurationConstraintEditPart dc3 = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_Shape, getRootEditPart(), new Point(300, 300), null);
assertNotNull(dc3);
resize(dc3, getAbsoluteBounds(dc3).getLocation(), PositionConstants.WEST, new Dimension(move, 0));
resize(dc3, getAbsoluteBounds(dc3).getLocation(), PositionConstants.EAST, new Dimension(move, 0));
@@ -363,7 +363,7 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { @Test
// test direct edit of duration expression
public void testDurationEditExpr() {
- DurationConstraintEditPart dp = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(400, 200), null);
+ DurationConstraintEditPart dp = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_Shape, getRootEditPart(), new Point(400, 200), null);
assertNotNull(dp);
// edit text
@@ -383,12 +383,12 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { @Test
// link to the top and bottom of execution specification on the single lifeline
public void testLinkingExecutionOnSameLifeline() {
- LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(200, 100), null);
assertNotNull(lifeline);
AbstractExecutionSpecificationEditPart es = createExecutionSpecification(lifeline, new Point(231, 150), null);
assertNotNull(es);
- DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(400, 200), null);
+ DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_Shape, getRootEditPart(), new Point(400, 200), null);
assertNotNull(dc);
// start connection
{
@@ -445,17 +445,17 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { @Test
// link to different execution specification on two lifeline
public void testLinkingExecutionOnTwoLifeline() {
- LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(10, 100), null);
+ LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(10, 100), null);
assertNotNull(lifeline1);
AbstractExecutionSpecificationEditPart es1 = createExecutionSpecification(lifeline1, new Point(41, 150), null);
assertNotNull(es1);
- LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline2);
AbstractExecutionSpecificationEditPart es2 = createExecutionSpecification(lifeline2, new Point(131, 150), null);
assertNotNull(es2);
- DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(50, 150), null);
+ DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_Shape, getRootEditPart(), new Point(50, 150), null);
assertNotNull(dc);
Point fromLocation = getAbsoluteBounds(dc).getTop();
@@ -482,13 +482,13 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { @FailingTest
@Test
public void testLinkingMessageOnTwoLifeline() {
- LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(10, 80), null);
+ LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(10, 80), null);
assertNotNull(lifeline1);
- LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(150, 80), null);
+ LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(150, 80), null);
assertNotNull(lifeline2);
- DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(80, 170), null);
+ DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_Shape, getRootEditPart(), new Point(80, 170), null);
assertNotNull(dc);
waitForComplete();
@@ -533,13 +533,13 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { @Test
// duration link to message and execution
public void testLinkingExecutionMessageOnTwoLifeline() {
- LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(10, 80), null);
+ LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(10, 80), null);
assertNotNull(lifeline1);
- LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(150, 80), null);
+ LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(150, 80), null);
assertNotNull(lifeline2);
- DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(80, 150), null);
+ DurationConstraintEditPart dc = (DurationConstraintEditPart) createNode(UMLElementTypes.DurationConstraint_Shape, getRootEditPart(), new Point(80, 150), null);
assertNotNull(dc);
waitForComplete();
@@ -586,7 +586,7 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { private void createConnection(EditPartViewer viewer, Point fromLocation, Point toLocation) {
EditPart sourceEditPart = null;
EditPart targetEditPart = null;
- CreateConnectionViewRequest request = CreateViewRequestFactory.getCreateConnectionRequest(UMLElementTypes.Message_4004, ((IGraphicalEditPart) getDiagramEditPart()).getDiagramPreferencesHint());
+ CreateConnectionViewRequest request = CreateViewRequestFactory.getCreateConnectionRequest(UMLElementTypes.Message_AsynchEdge, ((IGraphicalEditPart) getDiagramEditPart()).getDiagramPreferencesHint());
assertNotNull(request);
request.setLocation(fromLocation);
request.setType(RequestConstants.REQ_CONNECTION_START);
@@ -616,7 +616,7 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { private CommentAnnotatedElementEditPart createDurationLink(DurationConstraintEditPart dc, Point fromLocation, Point toLocation) {
EditPart sourceEditPart = dc;
EditPart targetEditPart = null;
- CreateConnectionViewRequest request = CreateViewRequestFactory.getCreateConnectionRequest(UMLElementTypes.CommentAnnotatedElement_4010, ((IGraphicalEditPart) getDiagramEditPart()).getDiagramPreferencesHint());
+ CreateConnectionViewRequest request = CreateViewRequestFactory.getCreateConnectionRequest(UMLElementTypes.Comment_AnnotatedElementEdge, ((IGraphicalEditPart) getDiagramEditPart()).getDiagramPreferencesHint());
assertNotNull(request);
request.setLocation(fromLocation);
request.setType(REQ_ANNOTATED_LINK_START);
@@ -729,7 +729,7 @@ public class TestDurationConstraint_402967 extends AbstractNodeTest { private AbstractExecutionSpecificationEditPart createExecutionSpecification(LifelineEditPart lifeline, Point location, Dimension size) {
- return (AbstractExecutionSpecificationEditPart) createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline, location, size);
+ return (AbstractExecutionSpecificationEditPart) createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline, location, size);
}
protected void moveEditPart(IGraphicalEditPart lifelineEP, Point moveDelta) {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestElementIcon_396799.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestElementIcon_396799.java index c722e744527..61384872a9e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestElementIcon_396799.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestElementIcon_396799.java @@ -152,7 +152,7 @@ public class TestElementIcon_396799 extends AbstractNodeTest { @Test
public void testLifeline() {
- LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline);
View view = lifeline.getNotationView();
LifelineNameEditPart nameEditPart = (LifelineNameEditPart) lifeline.getChildBySemanticHint("" + LifelineNameEditPart.VISUAL_ID);
@@ -192,7 +192,7 @@ public class TestElementIcon_396799 extends AbstractNodeTest { @Test
public void testCombinedFragment() {
- CombinedFragmentEditPart cf = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 100), new Dimension(200, 200));
+ CombinedFragmentEditPart cf = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(100, 100), new Dimension(200, 200));
assertNotNull(cf);
testElementIcon(cf.getPrimaryShape().getHeaderLabel(), cf.getNotationView(), true);
}
@@ -207,7 +207,7 @@ public class TestElementIcon_396799 extends AbstractNodeTest { @Test
public void testInteractionOperand() {
- CombinedFragmentEditPart cf = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 100), new Dimension(200, 200));
+ CombinedFragmentEditPart cf = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(100, 100), new Dimension(200, 200));
assertNotNull(cf);
CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart) cf.getChildBySemanticHint("" + CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID);
assertNotNull(compartment);
@@ -219,7 +219,7 @@ public class TestElementIcon_396799 extends AbstractNodeTest { @Test
public void testInteractionUse() {
- InteractionUseEditPart interactionUse = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_3002, getRootEditPart(), new Point(100, 100), new Dimension(200, 200));
+ InteractionUseEditPart interactionUse = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_Shape, getRootEditPart(), new Point(100, 100), new Dimension(200, 200));
assertNotNull(interactionUse);
InteractionUseNameEditPart editPart = (InteractionUseNameEditPart) interactionUse.getChildBySemanticHint("" + InteractionUseNameEditPart.VISUAL_ID);
assertNotNull(editPart);
@@ -228,9 +228,9 @@ public class TestElementIcon_396799 extends AbstractNodeTest { @Test
public void testStateInvariant() {
- LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline);
- StateInvariantEditPart stateInvariant = (StateInvariantEditPart) createNode(UMLElementTypes.StateInvariant_3017, lifeline, getAbsoluteCenter(lifeline), null);
+ StateInvariantEditPart stateInvariant = (StateInvariantEditPart) createNode(UMLElementTypes.StateInvariant_Shape, lifeline, getAbsoluteCenter(lifeline), null);
assertNotNull(stateInvariant);
StateInvariantNameEditPart editPart = (StateInvariantNameEditPart) stateInvariant.getChildBySemanticHint("" + StateInvariantNameEditPart.VISUAL_ID);
assertNotNull(editPart);
@@ -239,7 +239,7 @@ public class TestElementIcon_396799 extends AbstractNodeTest { @Test
public void testComment() {
- CommentEditPart comment = (CommentEditPart) createNode(UMLElementTypes.Comment_3009, getRootEditPart(), new Point(100, 100), new Dimension(100, 100));
+ CommentEditPart comment = (CommentEditPart) createNode(UMLElementTypes.Comment_Shape, getRootEditPart(), new Point(100, 100), new Dimension(100, 100));
assertNotNull(comment);
CommentBodyEditPart editPart = (CommentBodyEditPart) comment.getChildBySemanticHint("" + CommentBodyEditPart.VISUAL_ID);
assertNotNull(editPart);
@@ -248,7 +248,7 @@ public class TestElementIcon_396799 extends AbstractNodeTest { @Test
public void testConstraint() {
- ConstraintEditPart constraint = (ConstraintEditPart) createNode(UMLElementTypes.Constraint_3008, getRootEditPart(), new Point(100, 100), new Dimension(100, 100));
+ ConstraintEditPart constraint = (ConstraintEditPart) createNode(UMLElementTypes.Constraint_Shape, getRootEditPart(), new Point(100, 100), new Dimension(100, 100));
assertNotNull(constraint);
Constraint2EditPart editPart = (Constraint2EditPart) constraint.getChildBySemanticHint("" + Constraint2EditPart.VISUAL_ID);
assertNotNull(editPart);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionEndsWithMessageOccurrenceSpecification.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionEndsWithMessageOccurrenceSpecification.java index a467e82cea6..b284f9d73fd 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionEndsWithMessageOccurrenceSpecification.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionEndsWithMessageOccurrenceSpecification.java @@ -45,9 +45,9 @@ import org.junit.Test; public class TestExecutionEndsWithMessageOccurrenceSpecification extends AbstractNodeTest {
private AbstractExecutionSpecificationEditPart createExecutionSpecificationWithLifeline(Point lifelineLocation, Dimension executionSize) {
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), lifelineLocation, null);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), lifelineLocation, null);
assertNotNull("create ExecutionSpecification's Lifeline", lifeline);
- AbstractExecutionSpecificationEditPart es = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline, getAbsoluteBounds(lifeline).getCenter(), executionSize);
+ AbstractExecutionSpecificationEditPart es = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline, getAbsoluteBounds(lifeline).getCenter(), executionSize);
assertNotNull("create ExecutionSpecification", es);
return es;
}
@@ -88,7 +88,7 @@ public class TestExecutionEndsWithMessageOccurrenceSpecification extends Abstrac AbstractExecutionSpecificationEditPart execution2 = createExecutionSpecificationWithLifeline(new Point(300, 100), null);
//1. create message: execution1.start ----message----> execution2
ExecutionSpecificationEndEditPart source = findEndEditPart(execution1, true);
- AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), source, SequenceUtil.getAbsoluteBounds(execution2).getCenter(), execution2);
+ AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), source, SequenceUtil.getAbsoluteBounds(execution2).getCenter(), execution2);
assertNotNull("Message", message);
Message umlMsg = (Message)message.resolveSemanticElement();
ExecutionSpecification umlExecution = (ExecutionSpecification)execution1.resolveSemanticElement();
@@ -121,7 +121,7 @@ public class TestExecutionEndsWithMessageOccurrenceSpecification extends Abstrac AbstractExecutionSpecificationEditPart execution2 = createExecutionSpecificationWithLifeline(new Point(300, 100), null);
//1. create message: execution1 ----message----> execution2.start
ExecutionSpecificationEndEditPart target = findEndEditPart(execution2, true);
- AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getCenter(), execution1, SequenceUtil.getAbsoluteBounds(execution2).getTop(), target);
+ AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getCenter(), execution1, SequenceUtil.getAbsoluteBounds(execution2).getTop(), target);
assertNotNull("Message", message);
Message umlMsg = (Message)message.resolveSemanticElement();
ExecutionSpecification umlExecution = (ExecutionSpecification)execution2.resolveSemanticElement();
@@ -155,10 +155,10 @@ public class TestExecutionEndsWithMessageOccurrenceSpecification extends Abstrac public void testReconnectSourceToChildExecution() {
AbstractExecutionSpecificationEditPart execution1 = createExecutionSpecificationWithLifeline(new Point(100, 100), new Dimension(16, 80));
AbstractExecutionSpecificationEditPart execution2 = createExecutionSpecificationWithLifeline(new Point(300, 100), new Dimension(16, 150));
- AbstractExecutionSpecificationEditPart execution3 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, execution1.getParent(), SequenceUtil.getAbsoluteBounds(execution1).getCenter(), null);
+ AbstractExecutionSpecificationEditPart execution3 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, execution1.getParent(), SequenceUtil.getAbsoluteBounds(execution1).getCenter(), null);
//1. create message: execution1.start ----message----> execution2
ExecutionSpecificationEndEditPart source = findEndEditPart(execution1, true);
- AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), source, SequenceUtil.getAbsoluteBounds(execution2).getCenter(), execution2);
+ AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), source, SequenceUtil.getAbsoluteBounds(execution2).getCenter(), execution2);
assertNotNull("Message", message);
Message umlMsg = (Message)message.resolveSemanticElement();
ExecutionSpecification umlExecution = (ExecutionSpecification)execution1.resolveSemanticElement();
@@ -176,10 +176,10 @@ public class TestExecutionEndsWithMessageOccurrenceSpecification extends Abstrac public void testReconnectTargetToChildExecution() {
AbstractExecutionSpecificationEditPart execution1 = createExecutionSpecificationWithLifeline(new Point(100, 100), new Dimension(16, 100));
AbstractExecutionSpecificationEditPart execution2 = createExecutionSpecificationWithLifeline(new Point(300, 100), new Dimension(16, 80));
- AbstractExecutionSpecificationEditPart execution3 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, execution1.getParent(), SequenceUtil.getAbsoluteBounds(execution1).getCenter(), null);
+ AbstractExecutionSpecificationEditPart execution3 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, execution1.getParent(), SequenceUtil.getAbsoluteBounds(execution1).getCenter(), null);
//1. create message: execution2 ----message----> execution1.start
ExecutionSpecificationEndEditPart target = findEndEditPart(execution1, true);
- AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution2).getCenter(), execution2, SequenceUtil.getAbsoluteBounds(execution1).getTop(), target);
+ AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution2).getCenter(), execution2, SequenceUtil.getAbsoluteBounds(execution1).getTop(), target);
assertNotNull("Message", message);
Message umlMsg = (Message)message.resolveSemanticElement();
ExecutionSpecification umlExecution = (ExecutionSpecification)execution1.resolveSemanticElement();
@@ -200,7 +200,7 @@ public class TestExecutionEndsWithMessageOccurrenceSpecification extends Abstrac //1. create message: execution1.start ----message----> execution2.start
ExecutionSpecificationEndEditPart source = findEndEditPart(execution1, true);
ExecutionSpecificationEndEditPart target = findEndEditPart(execution2, true);
- AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), source, SequenceUtil.getAbsoluteBounds(execution2).getTop(), target);
+ AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), source, SequenceUtil.getAbsoluteBounds(execution2).getTop(), target);
assertNotNull("Message", message);
Message umlMsg = (Message)message.resolveSemanticElement();
ExecutionSpecification umlExecution1 = (ExecutionSpecification)execution1.resolveSemanticElement();
@@ -226,7 +226,7 @@ public class TestExecutionEndsWithMessageOccurrenceSpecification extends Abstrac //1. create message: execution1.start ----message----> execution2.start
ExecutionSpecificationEndEditPart source = findEndEditPart(execution1, true);
ExecutionSpecificationEndEditPart target = findEndEditPart(execution2, true);
- AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), source, SequenceUtil.getAbsoluteBounds(execution2).getTop(), target);
+ AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), source, SequenceUtil.getAbsoluteBounds(execution2).getTop(), target);
assertNotNull("Message", message);
Message umlMsg = (Message)message.resolveSemanticElement();
ExecutionSpecification umlExecution1 = (ExecutionSpecification)execution1.resolveSemanticElement();
@@ -251,7 +251,7 @@ public class TestExecutionEndsWithMessageOccurrenceSpecification extends Abstrac //1. create message: execution1.start ----message----> execution2.start
ExecutionSpecificationEndEditPart source = findEndEditPart(execution1, true);
ExecutionSpecificationEndEditPart target = findEndEditPart(execution2, true);
- AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), source, SequenceUtil.getAbsoluteBounds(execution2).getTop(), target);
+ AbstractMessageEditPart message = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, execution1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), source, SequenceUtil.getAbsoluteBounds(execution2).getTop(), target);
assertNotNull("Message", message);
Message umlMsg = (Message)message.resolveSemanticElement();
ExecutionSpecification umlExecution1 = (ExecutionSpecification)execution1.resolveSemanticElement();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionSpecificationPosition_395462.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionSpecificationPosition_395462.java index 0f9a0ddcd8a..2533c303ee6 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionSpecificationPosition_395462.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestExecutionSpecificationPosition_395462.java @@ -190,7 +190,7 @@ public class TestExecutionSpecificationPosition_395462 extends AbstractNodeTest * @return
*/
private AbstractExecutionSpecificationEditPart createExecutionSpecification(LifelineEditPart lifeline, Point location, Dimension size) {
- return (AbstractExecutionSpecificationEditPart) createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline, location, size);
+ return (AbstractExecutionSpecificationEditPart) createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline, location, size);
}
/**
@@ -200,7 +200,7 @@ public class TestExecutionSpecificationPosition_395462 extends AbstractNodeTest * @return
*/
private LifelineEditPart createLifeline(String name, Point location, Dimension size) {
- LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), location, size);
+ LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), location, size);
if (name != null) {
rename(lifeline, name);
}
@@ -284,7 +284,7 @@ public class TestExecutionSpecificationPosition_395462 extends AbstractNodeTest */
private LifelineEditPart createLifeline(LifelineEditPart lifeline, Point location, final Property property) {
// CREATION
- IElementType type = UMLElementTypes.Lifeline_3001;
+ IElementType type = UMLElementTypes.Lifeline_Shape;
CreateViewRequest createReq = CreateViewRequestFactory.getCreateShapeRequest(type, getRootEditPart().getDiagramPreferencesHint());
createReq.setLocation(location);
Command command = lifeline.getCommand(createReq);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGateNameOnCombinedFragment.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGateNameOnCombinedFragment.java index e92bd03ce3c..967c96d8395 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGateNameOnCombinedFragment.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGateNameOnCombinedFragment.java @@ -79,7 +79,7 @@ public class TestGateNameOnCombinedFragment extends AbstractNodeTest { private void testGateName(String gateNamePrefix, boolean lifelineCovered, boolean messageFromLifeline2CombinedFragment) {
//1. Create CombinedFragment
- CombinedFragmentEditPart cfEditPart = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 200), null);
+ CombinedFragmentEditPart cfEditPart = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(100, 200), null);
assertNotNull("CombinedFragment creation", cfEditPart);
//2. Create Lifeline
@@ -91,7 +91,7 @@ public class TestGateNameOnCombinedFragment extends AbstractNodeTest { } else {
lifelineLocation.x = cfBounds.getRight().x + 100;
}
- LifelineEditPart lifelineEp = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), lifelineLocation, null);
+ LifelineEditPart lifelineEp = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), lifelineLocation, null);
assertNotNull("Lifeline Creation", lifelineEp);
//3. Check covered.
@@ -117,7 +117,7 @@ public class TestGateNameOnCombinedFragment extends AbstractNodeTest { target = lifelineEp;
targetLocation = SequenceUtil.getAbsoluteBounds(lifelineEp).getCenter().setY(startLocation.y);
}
- AbstractMessageEditPart messageEditPart = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, cfEditPart.getViewer(), startLocation, source, targetLocation, target);
+ AbstractMessageEditPart messageEditPart = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, cfEditPart.getViewer(), startLocation, source, targetLocation, target);
assertNotNull("Message creation between Lifeline and CombinedFragment", messageEditPart);
//5. Check Gate name
@@ -226,7 +226,7 @@ public class TestGateNameOnCombinedFragment extends AbstractNodeTest { private void testFixedGateName(String gateName, boolean lifelineCovered, boolean messageFromLifeline2Gate) {
//1. Create CombinedFragment
- CombinedFragmentEditPart cfEditPart = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 200), null);
+ CombinedFragmentEditPart cfEditPart = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(100, 200), null);
assertNotNull("CombinedFragment creation", cfEditPart);
//1.1 Create Gate on CombinedFragment
Rectangle cfBounds = SequenceUtil.getAbsoluteBounds(cfEditPart);
@@ -244,7 +244,7 @@ public class TestGateNameOnCombinedFragment extends AbstractNodeTest { } else {
lifelineLocation.x = cfBounds.getRight().x + 100;
}
- LifelineEditPart lifelineEp = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), lifelineLocation, null);
+ LifelineEditPart lifelineEp = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), lifelineLocation, null);
assertNotNull("Lifeline Creation", lifelineEp);
//3. Check covered.
@@ -270,7 +270,7 @@ public class TestGateNameOnCombinedFragment extends AbstractNodeTest { target = lifelineEp;
targetLocation = SequenceUtil.getAbsoluteBounds(lifelineEp).getCenter().setY(startLocation.y);
}
- AbstractMessageEditPart messageEditPart = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, cfEditPart.getViewer(), startLocation, source, targetLocation, target);
+ AbstractMessageEditPart messageEditPart = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, cfEditPart.getViewer(), startLocation, source, targetLocation, target);
assertNotNull("Message creation between Lifeline and Gate of CombinedFragment", messageEditPart);
//5. Check Gate name
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGraphicalGate_389531.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGraphicalGate_389531.java index 0cf647b4f78..c156784392d 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGraphicalGate_389531.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGraphicalGate_389531.java @@ -170,13 +170,13 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { assertNotNull(parentType); EditPart parentEditPart = null; InteractionEditPart interactionEditPart = (InteractionEditPart) getRootEditPart().getParent(); - if (UMLElementTypes.Interaction_2001 == parentType) { + if (UMLElementTypes.Interaction_Shape == parentType) { parentEditPart = interactionEditPart; } else { parentEditPart = createNode(parentType, getRootEditPart(), parentLocation, parentSize); } assertNotNull("create Gate parent", parentEditPart); - if (UMLElementTypes.InteractionUse_3002 == parentType) { + if (UMLElementTypes.InteractionUse_Shape == parentType) { // set refersTo value. updateValue(getEditingDomain(), ((IGraphicalEditPart) parentEditPart).resolveSemanticElement(), UMLPackage.Literals.INTERACTION_USE__REFERS_TO, interactionEditPart.resolveSemanticElement()); } @@ -201,9 +201,9 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { } protected AbstractExecutionSpecificationEditPart createExecutionSpecificationWithLifeline(Point lifelineLocation, Dimension lifelineSize) { - LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), lifelineLocation, lifelineSize); + LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), lifelineLocation, lifelineSize); assertNotNull("create ExecutionSpecification's Lifeline", lifeline); - AbstractExecutionSpecificationEditPart es = (AbstractExecutionSpecificationEditPart) createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline, getAbsoluteBounds(lifeline).getCenter(), null); + AbstractExecutionSpecificationEditPart es = (AbstractExecutionSpecificationEditPart) createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline, getAbsoluteBounds(lifeline).getCenter(), null); assertNotNull("create ExecutionSpecification", es); return es; } @@ -227,8 +227,8 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { */ @Test public void testGateCreateOnCombinedFragment() { - createGateWithParent(UMLElementTypes.CombinedFragment_3004, new Point(100, 100), new Dimension(200, 200), true); - createGateWithParent(UMLElementTypes.CombinedFragment_3004, new Point(100, 100), new Dimension(200, 200), false); + createGateWithParent(UMLElementTypes.CombinedFragment_Shape, new Point(100, 100), new Dimension(200, 200), true); + createGateWithParent(UMLElementTypes.CombinedFragment_Shape, new Point(100, 100), new Dimension(200, 200), false); } /** @@ -236,8 +236,8 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { */ @Test public void testGateCreateOnInteraction() { - createGateWithParent(UMLElementTypes.Interaction_2001, new Point(100, 100), new Dimension(200, 200), true); - createGateWithParent(UMLElementTypes.Interaction_2001, new Point(100, 100), new Dimension(200, 200), false); + createGateWithParent(UMLElementTypes.Interaction_Shape, new Point(100, 100), new Dimension(200, 200), true); + createGateWithParent(UMLElementTypes.Interaction_Shape, new Point(100, 100), new Dimension(200, 200), false); } /** @@ -245,7 +245,7 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { */ @Test public void testGateCreateOnInteractionUse() { - GateEditPart gateOnInteractionUse = createGateWithParent(UMLElementTypes.InteractionUse_3002, new Point(100, 100), new Dimension(200, 200), true); + GateEditPart gateOnInteractionUse = createGateWithParent(UMLElementTypes.InteractionUse_Shape, new Point(100, 100), new Dimension(200, 200), true); InteractionEditPart iep = (InteractionEditPart) getRootEditPart().getParent(); Gate selfGate = (Gate) gateOnInteractionUse.resolveSemanticElement(); assertNotNull(selfGate); @@ -262,10 +262,10 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { */ @Test public void testGateCreateWithMessageAsyncOnGate() { - LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(100, 400)); + LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(100, 400)); // the lifeline2 should be covered by the CombinedFragment. - LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(400, 100), new Dimension(100, 400)); - CombinedFragmentEditPart cf = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(300, 100), new Dimension(200, 200)); + LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(400, 100), new Dimension(100, 400)); + CombinedFragmentEditPart cf = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(300, 100), new Dimension(200, 200)); CombinedFragment combinedFragment = (CombinedFragment) cf.resolveSemanticElement(); Lifeline covered = (Lifeline) lifeline2.resolveSemanticElement(); assertTrue("lifeline should be covered by CombinedFragment", combinedFragment.getCovereds().contains(covered)); @@ -276,7 +276,7 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { Rectangle r = getAbsoluteBounds(outerGateEditPart); Point endLocation = r.getCenter(); Point startLocation = getAbsoluteBounds(lifeline1).getCenter().setY(endLocation.y); - Message2EditPart message1EditPart = (Message2EditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), startLocation, endLocation); + Message2EditPart message1EditPart = (Message2EditPart) createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), startLocation, endLocation); assertNotNull("Message from Lifeline1 to Gate(outer gate) of CombinedFragment should be created", message1EditPart); // Check names with the outer gate and message1. Message message1 = (Message) message1EditPart.resolveSemanticElement(); @@ -290,10 +290,10 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { */ @Test public void testGateCreateWithMessageSyncFromGate() { - LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(100, 400)); + LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(100, 400)); // the lifeline2 should be covered by the CombinedFragment. - LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(400, 100), new Dimension(100, 400)); - CombinedFragmentEditPart cf = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(300, 100), new Dimension(200, 200)); + LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(400, 100), new Dimension(100, 400)); + CombinedFragmentEditPart cf = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(300, 100), new Dimension(200, 200)); CombinedFragment combinedFragment = (CombinedFragment) cf.resolveSemanticElement(); Lifeline covered = (Lifeline) lifeline2.resolveSemanticElement(); assertTrue("lifeline should be covered by CombinedFragment", combinedFragment.getCovereds().contains(covered)); @@ -304,7 +304,7 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { Rectangle r = getAbsoluteBounds(outerGateEditPart); Point startLocation = r.getCenter(); Point endLocation = getAbsoluteBounds(lifeline1).getCenter().setY(startLocation.y); - MessageEditPart messageEditPart = (MessageEditPart) createLink(UMLElementTypes.Message_4003, lifeline1.getViewer(), startLocation, endLocation); + MessageEditPart messageEditPart = (MessageEditPart) createLink(UMLElementTypes.Message_SynchEdge, lifeline1.getViewer(), startLocation, endLocation); assertNotNull("Message from Gate(outer gate) of CombinedFragment to Lifeline1 should be created", messageEditPart); } @@ -325,11 +325,11 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { */ @Test public void testGateCreateWithMessageAsyncOnCombinedFragment() { - LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(10, 100), new Dimension(75, 400)); + LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(10, 100), new Dimension(75, 400)); // the lifeline2 should be covered by the CombinedFragment. - LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(120, 100), new Dimension(75, 400)); + LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(120, 100), new Dimension(75, 400)); Rectangle lifeline2Rect = new Rectangle(new Point(120, 100), new Dimension(75, 400)); - CombinedFragmentEditPart cf = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(90, 100), new Dimension(120, 200)); + CombinedFragmentEditPart cf = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(90, 100), new Dimension(120, 200)); // create CombinedFragment CombinedFragment combinedFragment = (CombinedFragment) cf.resolveSemanticElement(); Lifeline covered = (Lifeline) lifeline2.resolveSemanticElement(); @@ -338,7 +338,7 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { Point startLocation = getAbsoluteBounds(lifeline1).getTop().translate(0, 100); Rectangle r = getAbsoluteBounds(cf); Point endLocation = r.getLocation().setY(startLocation.y); - Message2EditPart message1EditPart = (Message2EditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), startLocation, endLocation); + Message2EditPart message1EditPart = (Message2EditPart) createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), startLocation, endLocation); assertNotNull("Message from Lifeline1 to Gate(outer gate) of CombinedFragment should be created", message1EditPart); // The outer gate should be created automatically. GateEditPart message1EndGate = getPrimaryGateEditPart(cf); @@ -350,7 +350,7 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { startLocation = getAbsoluteBounds(message1EndGateInner).getCenter(); // endLocation = getAbsoluteBounds(lifeline2).getCenter().setY(startLocation.y); endLocation = lifeline2Rect.getCenter().setY(startLocation.y);// Workaround because lifeline2 location on combined fragment is not well done - Message2EditPart message2EditPart = (Message2EditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), startLocation, endLocation); + Message2EditPart message2EditPart = (Message2EditPart) createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), startLocation, endLocation); assertNotNull("Message from inner Gate of CombinedFragment to Lifeline2 should be created", message2EditPart); // Check names with the outer gate, inner gate , message1 and message2. Message message1 = (Message) message1EditPart.resolveSemanticElement(); @@ -361,12 +361,12 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { // assertEquals("Suggestion name of outer gate", "in_m1", getGateName(message1EndGate)); // assertEquals("Suggestion name of inner gate", "in_m1", getGateName(message1EndGateInner)); // 3. Message from CombinedFragment to Lifeline3. - LifelineEditPart lifeline3 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(230, 100), new Dimension(75, 400)); + LifelineEditPart lifeline3 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(230, 100), new Dimension(75, 400)); assertNotNull(lifeline3); waitForComplete(); startLocation = new Point(getAbsoluteBounds(cf).right() - 2, getAbsoluteBounds(cf).getCenter().y); endLocation = startLocation.getCopy().setX(getAbsoluteBounds(lifeline3).getCenter().x); - Message2EditPart message3EditPart = (Message2EditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), startLocation, cf, endLocation, lifeline3); + Message2EditPart message3EditPart = (Message2EditPart) createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), startLocation, cf, endLocation, lifeline3); assertNotNull("Message from CombinedFragment to Lifeline3 should be created", message3EditPart); GateEditPart message3StartGate = getPrimaryGateEditPart(cf); assertNotNull("New Gate created", message3StartGate); @@ -377,7 +377,7 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { assertNotNull("a inner Gate should be created", message3StartGateInner); endLocation = getAbsoluteBounds(message3StartGateInner).getCenter(); startLocation = new Point(lifeline2Rect.getCenter().x, endLocation.y); - Message2EditPart message4EditPart = (Message2EditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), startLocation, endLocation); + Message2EditPart message4EditPart = (Message2EditPart) createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), startLocation, endLocation); assertNotNull("Message from Lifeline2 to message3StartGateInner", message4EditPart); Message message4 = (Message) message4EditPart.resolveSemanticElement(); assertEquals("Suggestion name of message4", message3.getName(), message4.getName()); @@ -391,12 +391,12 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { @Test public void testGateCreateWithMessageAsyncOnInteraction() { InteractionEditPart interaction = (InteractionEditPart) getRootEditPart().getParent(); - LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null); + LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null); Rectangle lifelineBounds = getAbsoluteBounds(lifeline); // 1. message1 Point endLocation = lifelineBounds.getCenter(); Point startLocation = new Point(0, endLocation.y); - Message2EditPart message1ep = (Message2EditPart) createLink(UMLElementTypes.Message_4004, interaction.getViewer(), startLocation, interaction, endLocation, lifeline); + Message2EditPart message1ep = (Message2EditPart) createLink(UMLElementTypes.Message_AsynchEdge, interaction.getViewer(), startLocation, interaction, endLocation, lifeline); assertNotNull("message1: Interaction --> Lifeline", message1ep); Message message1 = (Message) message1ep.resolveSemanticElement(); Gate gate1 = (Gate) message1.getSendEvent(); @@ -406,7 +406,7 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { // 2. message2 startLocation = endLocation.getTranslated(0, 50); endLocation = new Point(0, startLocation.y); - Message2EditPart message2ep = (Message2EditPart) createLink(UMLElementTypes.Message_4004, interaction.getViewer(), startLocation, lifeline, endLocation, interaction); + Message2EditPart message2ep = (Message2EditPart) createLink(UMLElementTypes.Message_AsynchEdge, interaction.getViewer(), startLocation, lifeline, endLocation, interaction); assertNotNull("message2: Lifeline --> Interaction", message2ep); Message message2 = (Message) message2ep.resolveSemanticElement(); Gate gate2 = (Gate) message2.getReceiveEvent(); @@ -422,16 +422,16 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { */ @Test public void testGateCreateWithMessageAsyncOnInteractionUse() { - LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(100, 400)); - LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(600, 100), new Dimension(100, 400)); - InteractionUseEditPart interactionUse = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_3002, getRootEditPart(), new Point(300, 200), new Dimension(200, 100)); + LifelineEditPart lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(100, 400)); + LifelineEditPart lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(600, 100), new Dimension(100, 400)); + InteractionUseEditPart interactionUse = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_Shape, getRootEditPart(), new Point(300, 200), new Dimension(200, 100)); InteractionEditPart iep = (InteractionEditPart) getRootEditPart().getParent(); // set refersTo value. updateValue(getEditingDomain(), interactionUse.resolveSemanticElement(), UMLPackage.Literals.INTERACTION_USE__REFERS_TO, iep.resolveSemanticElement()); // 1. message1 Point endLocation = getAbsoluteBounds(lifeline1).getCenter(); Point startLocation = new Point(getAbsoluteBounds(interactionUse).x, endLocation.y); - Message2EditPart message1ep = (Message2EditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), startLocation, lifeline1, endLocation, interactionUse); + Message2EditPart message1ep = (Message2EditPart) createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), startLocation, lifeline1, endLocation, interactionUse); assertNotNull("message1: Lifeline1 --> InteractionUse", message1ep); Message message1 = (Message) message1ep.resolveSemanticElement(); Gate gate1 = (Gate) message1.getReceiveEvent(); @@ -441,7 +441,7 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { // 2. message2 endLocation = getAbsoluteBounds(lifeline2).getCenter(); startLocation = new Point(getAbsoluteBounds(interactionUse).right(), endLocation.y); - Message2EditPart message2ep = (Message2EditPart) createLink(UMLElementTypes.Message_4004, interactionUse.getViewer(), startLocation, interactionUse, endLocation, lifeline2); + Message2EditPart message2ep = (Message2EditPart) createLink(UMLElementTypes.Message_AsynchEdge, interactionUse.getViewer(), startLocation, interactionUse, endLocation, lifeline2); assertNotNull("message2: InteractionUse --> Lifeline2", message2ep); Message message2 = (Message) message2ep.resolveSemanticElement(); Gate gate2 = (Gate) message2.getSendEvent(); @@ -452,12 +452,12 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { @Test public void testGateCreateWithMessageReplyOnGate() { - GateEditPart gateEditPart = createGateWithParent(UMLElementTypes.CombinedFragment_3004, new Point(20, 100), new Dimension(100, 200), false); + GateEditPart gateEditPart = createGateWithParent(UMLElementTypes.CombinedFragment_Shape, new Point(20, 100), new Dimension(100, 200), false); AbstractExecutionSpecificationEditPart es = createExecutionSpecificationWithLifeline(new Point(300, 100), null); // Message reply Point startLocation = getAbsoluteBounds(es).getCenter(); Point endLocation = getAbsoluteBounds(gateEditPart).getCenter().setY(startLocation.y); - AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4005, gateEditPart.getViewer(), startLocation, es, endLocation, gateEditPart); + AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_ReplyEdge, gateEditPart.getViewer(), startLocation, es, endLocation, gateEditPart); assertNotNull("Message Reply", messageReply); } @@ -487,12 +487,12 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { @Test public void testGateCreateWithMessageReplyOnCombinedFragment() { - CombinedFragmentEditPart combinedFragment = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(50, 100), new Dimension(100, 200)); + CombinedFragmentEditPart combinedFragment = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(50, 100), new Dimension(100, 200)); AbstractExecutionSpecificationEditPart es = createExecutionSpecificationWithLifeline(new Point(400, 50), null); // Message reply Point startLocation = getAbsoluteBounds(es).getCenter(); Point endLocation = new Point(getAbsoluteBounds(combinedFragment).right() - 1, startLocation.y); - AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4005, combinedFragment.getViewer(), startLocation, es, endLocation, combinedFragment); + AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_ReplyEdge, combinedFragment.getViewer(), startLocation, es, endLocation, combinedFragment); assertNotNull("Message Reply", messageReply); checkGateCreatedWithMessage(combinedFragment, messageReply, 2); } @@ -504,7 +504,7 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { // Message reply Point startLocation = getAbsoluteBounds(es).getCenter(); Point endLocation = new Point(0, startLocation.y); - AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4005, iep.getViewer(), startLocation, es, endLocation, iep); + AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_ReplyEdge, iep.getViewer(), startLocation, es, endLocation, iep); assertNotNull("Message Reply", messageReply); checkGateCreatedWithMessage(iep, messageReply, 2); } @@ -512,14 +512,14 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { @Test public void testGateCreateWithMessageReplyOnInteractionUse() { AbstractExecutionSpecificationEditPart es = createExecutionSpecificationWithLifeline(new Point(300, 100), new Dimension(100, 400)); - InteractionUseEditPart interactionUse = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_3002, getRootEditPart(), new Point(100, 220), new Dimension(100, 100)); + InteractionUseEditPart interactionUse = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_Shape, getRootEditPart(), new Point(100, 220), new Dimension(100, 100)); InteractionEditPart iep = (InteractionEditPart) getRootEditPart().getParent(); // set refersTo value. updateValue(getEditingDomain(), interactionUse.resolveSemanticElement(), UMLPackage.Literals.INTERACTION_USE__REFERS_TO, iep.resolveSemanticElement()); // Message reply Point endLocation = getAbsoluteBounds(es).getCenter(); Point startLocation = new Point(getAbsoluteBounds(interactionUse).x, endLocation.y); - AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4005, es.getViewer(), startLocation, es, endLocation, interactionUse); + AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_ReplyEdge, es.getViewer(), startLocation, es, endLocation, interactionUse); assertNotNull("Message Reply", messageReply); checkGateCreatedWithMessage(interactionUse, messageReply, 2); } @@ -527,90 +527,90 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { private void testGateCreateWithMessageFound(IElementType targetType, Point targetLocation, Dimension targetSize) { IGraphicalEditPart targetEditPart = (IGraphicalEditPart) createGateParent(targetType, targetLocation, targetSize); Point endLocation = null; - if (UMLElementTypes.Interaction_2001 == targetType) { + if (UMLElementTypes.Interaction_Shape == targetType) { endLocation = getAbsoluteBounds(targetEditPart).getRight().getTranslated(-1, 0); } else { endLocation = getAbsoluteBounds(targetEditPart).getLeft().getTranslated(1, 0); } Point startLocation = endLocation.getTranslated(-100, -1); - AbstractMessageEditPart messageFound = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4009, targetEditPart.getViewer(), startLocation, getRootEditPart().getParent(), endLocation, targetEditPart); + AbstractMessageEditPart messageFound = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_FoundEdge, targetEditPart.getViewer(), startLocation, getRootEditPart().getParent(), endLocation, targetEditPart); assertNotNull("Message Found", messageFound); checkGateCreatedWithMessage(targetEditPart, messageFound, 2); } @Test public void testGateCreateWithMessageFoundOnGate() { - GateEditPart gate = createGateWithParent(UMLElementTypes.CombinedFragment_3004, new Point(150, 100), new Dimension(200, 100), true); + GateEditPart gate = createGateWithParent(UMLElementTypes.CombinedFragment_Shape, new Point(150, 100), new Dimension(200, 100), true); Point endLocation = getAbsoluteBounds(gate).getCenter(); Point startLocation = endLocation.getTranslated(-80, 0); - EditPart messageFound = createLink(UMLElementTypes.Message_4009, gate.getViewer(), startLocation, endLocation); + EditPart messageFound = createLink(UMLElementTypes.Message_FoundEdge, gate.getViewer(), startLocation, endLocation); assertNotNull("Message Found", messageFound); } @Test public void testGateCreateWithMessageFoundOnCombinedFragment() { - testGateCreateWithMessageFound(UMLElementTypes.CombinedFragment_3004, new Point(300, 100), new Dimension(200, 100)); + testGateCreateWithMessageFound(UMLElementTypes.CombinedFragment_Shape, new Point(300, 100), new Dimension(200, 100)); } @Test public void testGateCreateWithMessageFoundOnInteraction() { - testGateCreateWithMessageFound(UMLElementTypes.Interaction_2001, null, null); + testGateCreateWithMessageFound(UMLElementTypes.Interaction_Shape, null, null); } @Test public void testGateCreateWithMessageFoundOnInteractionUse() { - testGateCreateWithMessageFound(UMLElementTypes.InteractionUse_3002, new Point(300, 100), new Dimension(200, 100)); + testGateCreateWithMessageFound(UMLElementTypes.InteractionUse_Shape, new Point(300, 100), new Dimension(200, 100)); } @Test public void testGateCreateWithMessageLostOnGate() { - GateEditPart gateEditPart = createGateWithParent(UMLElementTypes.CombinedFragment_3004, new Point(100, 100), new Dimension(200, 100), false); + GateEditPart gateEditPart = createGateWithParent(UMLElementTypes.CombinedFragment_Shape, new Point(100, 100), new Dimension(200, 100), false); Point startLocation = getAbsoluteBounds(gateEditPart).getCenter(); Point endLocation = startLocation.getTranslated(100, 0); - EditPart messageLost = createLink(UMLElementTypes.Message_4008, gateEditPart.getViewer(), startLocation, endLocation); + EditPart messageLost = createLink(UMLElementTypes.Message_LostEdge, gateEditPart.getViewer(), startLocation, endLocation); assertNotNull("Message Lost", messageLost); } private void testGateCreateWithMessageLost(IElementType targetType, Point targetLocation, Dimension targetSize) { IGraphicalEditPart targetEditPart = (IGraphicalEditPart) createGateParent(targetType, targetLocation, targetSize); Point startLocation = null; - if (UMLElementTypes.Interaction_2001 == targetType) { + if (UMLElementTypes.Interaction_Shape == targetType) { startLocation = getAbsoluteBounds(targetEditPart).getLeft().getTranslated(1, 0); } else { startLocation = getAbsoluteBounds(targetEditPart).getRight().getTranslated(-1, 0); } Point endLocation = startLocation.getTranslated(100, 1); - AbstractMessageEditPart messageFound = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4008, targetEditPart.getViewer(), startLocation, targetEditPart, endLocation, getRootEditPart().getParent()); + AbstractMessageEditPart messageFound = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_LostEdge, targetEditPart.getViewer(), startLocation, targetEditPart, endLocation, getRootEditPart().getParent()); assertNotNull("Message Lost", messageFound); checkGateCreatedWithMessage(targetEditPart, messageFound, 1); } @Test public void testGateCreateWithMessageLostOnCombinedFragment() { - testGateCreateWithMessageLost(UMLElementTypes.CombinedFragment_3004, new Point(100, 100), new Dimension(200, 100)); + testGateCreateWithMessageLost(UMLElementTypes.CombinedFragment_Shape, new Point(100, 100), new Dimension(200, 100)); } @Test public void testGateCreateWithMessageLostOnInteraction() { - testGateCreateWithMessageLost(UMLElementTypes.Interaction_2001, null, null); + testGateCreateWithMessageLost(UMLElementTypes.Interaction_Shape, null, null); } @Test public void testGateCreateWithMessageLostOnInteractionUse() { - testGateCreateWithMessageLost(UMLElementTypes.InteractionUse_3002, new Point(100, 100), new Dimension(200, 100)); + testGateCreateWithMessageLost(UMLElementTypes.InteractionUse_Shape, new Point(100, 100), new Dimension(200, 100)); } @Test public void testReconnectMessageAsyncTargetToGate() { - LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null); - CombinedFragmentEditPart combinedFragment = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(300, 80), new Dimension(100, 200)); + LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null); + CombinedFragmentEditPart combinedFragment = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(300, 80), new Dimension(100, 200)); Rectangle rect = getAbsoluteBounds(combinedFragment); GateEditPart gate1 = createGate(combinedFragment, rect.getLeft().getTranslated(0, -20)); // gate2 and gate 1 are located on same CombinedFrament GateEditPart gate2 = createGate(combinedFragment, rect.getLeft().getTranslated(0, 20)); // gate3 is located on different CombinedFragment. - GateEditPart gate3 = createGateWithParent(UMLElementTypes.CombinedFragment_3004, new Point(300, 300), new Dimension(100, 100), true); - AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline.getViewer(), getAbsoluteBounds(lifeline).getTop().translate(0, 50), getAbsoluteCenter(gate1)); + GateEditPart gate3 = createGateWithParent(UMLElementTypes.CombinedFragment_Shape, new Point(300, 300), new Dimension(100, 100), true); + AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_AsynchEdge, lifeline.getViewer(), getAbsoluteBounds(lifeline).getTop().translate(0, 50), getAbsoluteCenter(gate1)); assertNotNull("Message Async", messageAsync); checkGraphicalElements(messageAsync, gate1, false); checkSemanticElements(messageAsync, gate1, false); @@ -624,13 +624,13 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { @Test public void testReconnectMessageAsyncSourceToGate() { - LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null); - CombinedFragmentEditPart combinedFragment = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 80), new Dimension(100, 100)); + LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null); + CombinedFragmentEditPart combinedFragment = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(100, 80), new Dimension(100, 100)); Rectangle rect = getAbsoluteBounds(combinedFragment); GateEditPart gate1 = createGate(combinedFragment, rect.getRight().getTranslated(0, -20)); GateEditPart gate2 = createGate(combinedFragment, rect.getRight().getTranslated(0, 20)); - GateEditPart gate3 = createGateWithParent(UMLElementTypes.CombinedFragment_3004, new Point(100, 380), new Dimension(100, 100), false); - AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline.getViewer(), getAbsoluteCenter(gate1), getAbsoluteBounds(lifeline).getTop().getTranslated(0, 70)); + GateEditPart gate3 = createGateWithParent(UMLElementTypes.CombinedFragment_Shape, new Point(100, 380), new Dimension(100, 100), false); + AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_AsynchEdge, lifeline.getViewer(), getAbsoluteCenter(gate1), getAbsoluteBounds(lifeline).getTop().getTranslated(0, 70)); assertNotNull("Message Async", messageAsync); checkGraphicalElements(messageAsync, gate1, true); checkSemanticElements(messageAsync, gate1, true); @@ -672,11 +672,11 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { */ @Test public void testReconnectMessageAsyncSourceToCombinedFragment() { - GateEditPart gate1 = createGateWithParent(UMLElementTypes.CombinedFragment_3004, new Point(100, 100), new Dimension(100, 100), false); + GateEditPart gate1 = createGateWithParent(UMLElementTypes.CombinedFragment_Shape, new Point(100, 100), new Dimension(100, 100), false); CombinedFragmentEditPart cf1 = (CombinedFragmentEditPart) gate1.getParent(); - CombinedFragmentEditPart cf2 = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 220), new Dimension(100, 80)); - LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(100, 500)); - AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline.getViewer(), getAbsoluteCenter(gate1), getAbsoluteBounds(lifeline).getTop().getTranslated(0, 150)); + CombinedFragmentEditPart cf2 = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(100, 220), new Dimension(100, 80)); + LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(100, 500)); + AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_AsynchEdge, lifeline.getViewer(), getAbsoluteCenter(gate1), getAbsoluteBounds(lifeline).getTop().getTranslated(0, 150)); checkSemanticElements(messageAsync, gate1, true); // 1. moved on same combinedFragment. reconnectSource(messageAsync, cf1, getAbsoluteCenter(gate1).getTranslated(0, 30)); @@ -694,11 +694,11 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { @Test public void testReconnectMessageAsyncTargetToCombinedFragment() { - LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(100, 500)); - GateEditPart gate1 = createGateWithParent(UMLElementTypes.CombinedFragment_3004, new Point(300, 100), new Dimension(100, 100), true); + LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(100, 500)); + GateEditPart gate1 = createGateWithParent(UMLElementTypes.CombinedFragment_Shape, new Point(300, 100), new Dimension(100, 100), true); CombinedFragmentEditPart cf1 = (CombinedFragmentEditPart) gate1.getParent(); - CombinedFragmentEditPart cf2 = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(300, 220), new Dimension(100, 80)); - AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline.getViewer(), getAbsoluteBounds(lifeline).getTop().getTranslated(0, 50), getAbsoluteCenter(gate1)); + CombinedFragmentEditPart cf2 = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(300, 220), new Dimension(100, 80)); + AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_AsynchEdge, lifeline.getViewer(), getAbsoluteBounds(lifeline).getTop().getTranslated(0, 50), getAbsoluteCenter(gate1)); checkSemanticElements(messageAsync, gate1, false); // 1. moved on same combinedFragment. reconnectTarget(messageAsync, cf1, getAbsoluteCenter(gate1).getTranslated(0, 30)); @@ -718,10 +718,10 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { public void testReconnectMessageAsyncSourceToInteraction() { EditPart iep = getRootEditPart().getParent(); GateEditPart gate = createGate(iep, new Point(0, 100)); - LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null); + LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null); Point startLocation = getAbsoluteCenter(gate); Point endLocation = getAbsoluteCenter(lifeline).setY(startLocation.y + 1); - AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, iep.getViewer(), startLocation, gate, endLocation, lifeline); + AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_AsynchEdge, iep.getViewer(), startLocation, gate, endLocation, lifeline); checkGraphicalElements(messageAsync, gate, true); checkSemanticElements(messageAsync, gate, true); reconnectSource(messageAsync, iep, startLocation.getTranslated(0, 50)); @@ -733,10 +733,10 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { public void testReconnectMessageAsyncTargetToInteraction() { EditPart iep = getRootEditPart().getParent(); GateEditPart gate = createGate(iep, new Point(0, 100)); - LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null); + LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null); Point endLocation = getAbsoluteCenter(gate); Point startLocation = getAbsoluteCenter(lifeline).setY(endLocation.y); - AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, iep.getViewer(), startLocation, lifeline, endLocation, gate); + AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_AsynchEdge, iep.getViewer(), startLocation, lifeline, endLocation, gate); checkGraphicalElements(messageAsync, gate, false); checkSemanticElements(messageAsync, gate, false); reconnectTarget(messageAsync, iep, startLocation.getTranslated(0, 50)); @@ -747,17 +747,17 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { @Test public void testReconnectMessageAsyncSourceToInteractionUse() { InteractionEditPart iep = (InteractionEditPart) getRootEditPart().getParent(); - LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(100, 300)); - InteractionUseEditPart iuep1 = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_3002, getRootEditPart(), new Point(100, 150), new Dimension(100, 100)); + LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(100, 300)); + InteractionUseEditPart iuep1 = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_Shape, getRootEditPart(), new Point(100, 150), new Dimension(100, 100)); updateValue(getEditingDomain(), ((IGraphicalEditPart) iuep1).resolveSemanticElement(), UMLPackage.Literals.INTERACTION_USE__REFERS_TO, iep.resolveSemanticElement()); - InteractionUseEditPart iuep2 = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_3002, getRootEditPart(), new Point(100, 280), new Dimension(100, 100)); + InteractionUseEditPart iuep2 = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_Shape, getRootEditPart(), new Point(100, 280), new Dimension(100, 100)); updateValue(getEditingDomain(), ((IGraphicalEditPart) iuep2).resolveSemanticElement(), UMLPackage.Literals.INTERACTION_USE__REFERS_TO, iep.resolveSemanticElement()); // messageAsync = iuep1 --> lifeline GateEditPart gate1 = getPrimaryGateEditPart(iuep1); assertNull(gate1); Point startLocation = getAbsoluteBounds(iuep1).getRight().getTranslated(-1, 0); Point endLocation = getAbsoluteCenter(lifeline).setY(startLocation.y + 1); - AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline.getViewer(), startLocation, iuep1, endLocation, lifeline); + AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_AsynchEdge, lifeline.getViewer(), startLocation, iuep1, endLocation, lifeline); gate1 = getPrimaryGateEditPart(iuep1); assertNotNull("gate1 should be created", gate1); checkGraphicalElements(messageAsync, gate1, true); @@ -775,15 +775,15 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { @Test public void testReconnectMessageAsyncTargetToInteractionUse() { InteractionEditPart iep = (InteractionEditPart) getRootEditPart().getParent(); - LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(100, 300)); - InteractionUseEditPart iuep1 = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_3002, getRootEditPart(), new Point(300, 150), new Dimension(100, 100)); + LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(100, 300)); + InteractionUseEditPart iuep1 = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_Shape, getRootEditPart(), new Point(300, 150), new Dimension(100, 100)); updateValue(getEditingDomain(), ((IGraphicalEditPart) iuep1).resolveSemanticElement(), UMLPackage.Literals.INTERACTION_USE__REFERS_TO, iep.resolveSemanticElement()); - InteractionUseEditPart iuep2 = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_3002, getRootEditPart(), new Point(300, 280), new Dimension(100, 100)); + InteractionUseEditPart iuep2 = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_Shape, getRootEditPart(), new Point(300, 280), new Dimension(100, 100)); updateValue(getEditingDomain(), ((IGraphicalEditPart) iuep2).resolveSemanticElement(), UMLPackage.Literals.INTERACTION_USE__REFERS_TO, iep.resolveSemanticElement()); // messageAsync = lifeline --> iuep1 GateEditPart gate1 = getPrimaryGateEditPart(iuep1); assertNull(gate1); - AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline.getViewer(), getAbsoluteCenter(lifeline), lifeline, getAbsoluteBounds(iuep1).getLeft().getTranslated(1, 0), iuep1); + AbstractMessageEditPart messageAsync = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_AsynchEdge, lifeline.getViewer(), getAbsoluteCenter(lifeline), lifeline, getAbsoluteBounds(iuep1).getLeft().getTranslated(1, 0), iuep1); gate1 = getPrimaryGateEditPart(iuep1); assertNotNull("gate1 should be created", gate1); checkGraphicalElements(messageAsync, gate1, false); @@ -801,17 +801,17 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { @Test public void testReconnectMessageReplyToCombinedFragment() { AbstractExecutionSpecificationEditPart es = createExecutionSpecificationWithLifeline(new Point(100, 100), new Dimension(100, 500)); - CombinedFragmentEditPart cf1 = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(300, 200), new Dimension(200, 200)); + CombinedFragmentEditPart cf1 = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(300, 200), new Dimension(200, 200)); // messageReply: es --> cf1 GateEditPart gate1 = getPrimaryGateEditPart(cf1); assertNull(gate1); - AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4005, es.getViewer(), getAbsoluteCenter(es), es, getAbsoluteBounds(cf1).getLeft().getTranslated(1, 0), cf1); + AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_ReplyEdge, es.getViewer(), getAbsoluteCenter(es), es, getAbsoluteBounds(cf1).getLeft().getTranslated(1, 0), cf1); gate1 = getPrimaryGateEditPart(cf1); assertNotNull("gate1 should be created", gate1); checkGraphicalElements(messageReply, gate1, false); checkSemanticElements(messageReply, gate1, false); // reconnect: es --> cf2 - CombinedFragmentEditPart cf2 = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(300, 420), new Dimension(200, 200)); + CombinedFragmentEditPart cf2 = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(300, 420), new Dimension(200, 200)); GateEditPart gate2 = getPrimaryGateEditPart(cf2); assertNull(gate2); reconnectTarget(messageReply, cf2, getAbsoluteBounds(cf2).getLeft().getTranslated(1, 0)); @@ -829,7 +829,7 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { Point endLocation = getAbsoluteBounds(iep).getLocation().setY(startLocation.y); GateEditPart gate = getPrimaryGateEditPart(iep); assertNull(gate); - AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4005, es.getViewer(), startLocation, es, endLocation, iep); + AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_ReplyEdge, es.getViewer(), startLocation, es, endLocation, iep); gate = getPrimaryGateEditPart(iep); assertNotNull("gate should be created", gate); checkGraphicalElements(messageReply, gate, false); @@ -845,14 +845,14 @@ public class TestGraphicalGate_389531 extends AbstractNodeTest { public void testReconnectMessageReplyToInteractionUse() { InteractionEditPart iep = (InteractionEditPart) getRootEditPart().getParent(); AbstractExecutionSpecificationEditPart es = createExecutionSpecificationWithLifeline(new Point(100, 100), new Dimension(100, 300)); - InteractionUseEditPart iuep1 = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_3002, getRootEditPart(), new Point(300, 150), new Dimension(100, 100)); + InteractionUseEditPart iuep1 = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_Shape, getRootEditPart(), new Point(300, 150), new Dimension(100, 100)); updateValue(getEditingDomain(), ((IGraphicalEditPart) iuep1).resolveSemanticElement(), UMLPackage.Literals.INTERACTION_USE__REFERS_TO, iep.resolveSemanticElement()); - InteractionUseEditPart iuep2 = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_3002, getRootEditPart(), new Point(300, 280), new Dimension(100, 100)); + InteractionUseEditPart iuep2 = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_Shape, getRootEditPart(), new Point(300, 280), new Dimension(100, 100)); updateValue(getEditingDomain(), ((IGraphicalEditPart) iuep2).resolveSemanticElement(), UMLPackage.Literals.INTERACTION_USE__REFERS_TO, iep.resolveSemanticElement()); // messageReply: es --> iuep1 GateEditPart gate1 = getPrimaryGateEditPart(iuep1); assertNull(gate1); - AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4005, es.getViewer(), getAbsoluteCenter(es), es, getAbsoluteBounds(iuep1).getLeft().getTranslated(1, 0), iuep1); + AbstractMessageEditPart messageReply = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_ReplyEdge, es.getViewer(), getAbsoluteCenter(es), es, getAbsoluteBounds(iuep1).getLeft().getTranslated(1, 0), iuep1); gate1 = getPrimaryGateEditPart(iuep1); assertNotNull("gate1 should be created", gate1); checkGraphicalElements(messageReply, gate1, false); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGuardVisibility_402966.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGuardVisibility_402966.java index 2d1d0c0d7b1..460956cbcc3 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGuardVisibility_402966.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestGuardVisibility_402966.java @@ -116,11 +116,11 @@ public class TestGuardVisibility_402966 extends AbstractNodeTest { @Test
public void testPropertySheetPage() {
- CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 100), new Dimension(400, 100));
+ CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(100, 100), new Dimension(400, 100));
assertNotNull(cf);
CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart)cf.getChildBySemanticHint("" + CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID);
assertNotNull(compartment);
- InteractionOperandEditPart operand = (InteractionOperandEditPart)createNode(UMLElementTypes.InteractionOperand_3005, compartment, getAbsoluteCenter(compartment), null);
+ InteractionOperandEditPart operand = (InteractionOperandEditPart)createNode(UMLElementTypes.InteractionOperand_Shape, compartment, getAbsoluteCenter(compartment), null);
assertNotNull(operand);
waitForComplete();
try {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestInteractionUse.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestInteractionUse.java index 23f88f5905a..e0d0b7ab7a1 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestInteractionUse.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestInteractionUse.java @@ -65,12 +65,12 @@ public class TestInteractionUse extends AbstractNodeTest { */
@Test
public void testInteractionUseCoveredBy_389538() {
- LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
Lifeline lf = (Lifeline) lifeline.resolveSemanticElement();
assertTrue("Lifeline coveredby should be empty: ", lf.getCoveredBys().isEmpty());
- InteractionUseEditPart interactionUse = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_3002, getRootEditPart(), new Point(90, 120), new Dimension(100, 60));
+ InteractionUseEditPart interactionUse = (InteractionUseEditPart) createNode(UMLElementTypes.InteractionUse_Shape, getRootEditPart(), new Point(90, 120), new Dimension(100, 60));
InteractionUse iu = (InteractionUse) interactionUse.resolveSemanticElement();
assertTrue("Lifeline coveredby should contain InteractionUse: ", lf.getCoveredBys().contains(iu));
@@ -97,7 +97,7 @@ public class TestInteractionUse extends AbstractNodeTest { @FailingTest
@Test
public void testInteractionUseInCombinedFragment_402971() {
- CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 100), new Dimension(500, 200));
+ CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(100, 100), new Dimension(500, 200));
assertNotNull(cf);
CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart)cf.getChildBySemanticHint("" + CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID);
assertNotNull(compartment);
@@ -110,7 +110,7 @@ public class TestInteractionUse extends AbstractNodeTest { for(int x = r.x + width; x < r.right();) {
int y = r.y + height + 10;
Point location = new Point(x, y);
- InteractionUseEditPart interactionUse = (InteractionUseEditPart)createNode(UMLElementTypes.InteractionUse_3002, operand, location, null);
+ InteractionUseEditPart interactionUse = (InteractionUseEditPart)createNode(UMLElementTypes.InteractionUse_Shape, operand, location, null);
assertNotNull(interactionUse);
Rectangle bounds = getAbsoluteBounds(interactionUse);
assertTrue("InteractionUse should be at " + location.toString() + ", but " + bounds.getLocation().toString(), location.equals(bounds.getLocation()));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMakeSameHeightForLifelines_402978.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMakeSameHeightForLifelines_402978.java index fcaed9abad5..dd3f9e2ae0a 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMakeSameHeightForLifelines_402978.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMakeSameHeightForLifelines_402978.java @@ -56,9 +56,9 @@ public class TestMakeSameHeightForLifelines_402978 extends AbstractNodeTest { @InvalidTest("Platform-specific failure")
@Test
public void testLifelinesSameSizeHeight() {
- LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(80, 100));
+ LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(80, 100));
assertNotNull("lifeline1", lifeline1);
- LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 100), new Dimension(80, 200));
+ LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(200, 100), new Dimension(80, 200));
assertNotNull("lifeline2", lifeline2);
StructuredSelection selection = new StructuredSelection(new Object[]{ lifeline2, lifeline1 });
lifeline1.getViewer().setSelection(selection);
@@ -74,9 +74,9 @@ public class TestMakeSameHeightForLifelines_402978 extends AbstractNodeTest { @InvalidTest("Platform-specific failure")
@Test
public void testLifelinesSameSizeBoth() {
- LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 100), new Dimension(80, 200));
+ LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(200, 100), new Dimension(80, 200));
assertNotNull("lifeline1", lifeline1);
- LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(80, 300));
+ LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(80, 300));
assertNotNull("lifeline2", lifeline2);
StructuredSelection selection = new StructuredSelection(new Object[]{ lifeline2, lifeline1 });
lifeline1.getViewer().setSelection(selection);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageCreateWithLifeline_403134.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageCreateWithLifeline_403134.java index 0f27e6feb2c..410538093b0 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageCreateWithLifeline_403134.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageCreateWithLifeline_403134.java @@ -44,10 +44,10 @@ public class TestMessageCreateWithLifeline_403134 extends AbstractNodeTest { @Test
public void test() {
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline);
Point fromLocation = getAbsoluteBounds(lifeline).getTop().translate(0, 50);
- EditPart editPart = createLink(UMLElementTypes.Message_4006, lifeline.getViewer(), fromLocation, fromLocation.getTranslated(100, 0));
+ EditPart editPart = createLink(UMLElementTypes.Message_CreateEdge, lifeline.getViewer(), fromLocation, fromLocation.getTranslated(100, 0));
//check result
assertNotNull("editpart not found", editPart);
assertTrue("not a messageCreate editpart", editPart instanceof Message4EditPart);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageOccurrenceSpecification_402975.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageOccurrenceSpecification_402975.java index 44acd5ff1b4..c70353755e8 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageOccurrenceSpecification_402975.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMessageOccurrenceSpecification_402975.java @@ -58,9 +58,9 @@ public class TestMessageOccurrenceSpecification_402975 extends AbstractNodeTest }
protected AbstractExecutionSpecificationEditPart createExecutionSpecificationWithLifeline(Point lifelineLocation, Dimension lifelineSize) {
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), lifelineLocation, lifelineSize);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), lifelineLocation, lifelineSize);
assertNotNull("create ExecutionSpecification's Lifeline", lifeline);
- AbstractExecutionSpecificationEditPart es = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline, getAbsoluteBounds(lifeline).getCenter(), null);
+ AbstractExecutionSpecificationEditPart es = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline, getAbsoluteBounds(lifeline).getCenter(), null);
assertNotNull("create ExecutionSpecification", es);
return es;
}
@@ -99,7 +99,7 @@ public class TestMessageOccurrenceSpecification_402975 extends AbstractNodeTest ExecutionSpecification execution = (ExecutionSpecification)part2.resolveSemanticElement();
assertNotNull("execution", execution);
doCheckExecution(execution);
- MessageEditPart message = (MessageEditPart)createLink(UMLElementTypes.Message_4003, part1.getViewer(), startLocation, part1, endLocation, part2);
+ MessageEditPart message = (MessageEditPart)createLink(UMLElementTypes.Message_SynchEdge, part1.getViewer(), startLocation, part1, endLocation, part2);
assertNotNull("Sync message", message);
Message msg = (Message)message.resolveSemanticElement();
assertNotNull("message", msg);
@@ -122,12 +122,12 @@ public class TestMessageOccurrenceSpecification_402975 extends AbstractNodeTest ExecutionSpecification execution2 = (ExecutionSpecification)part2.resolveSemanticElement();
assertNotNull("execution2", execution2);
doCheckExecution(execution2);
- MessageEditPart messagePart = (MessageEditPart)createLink(UMLElementTypes.Message_4003, part1.getViewer(), startLocation, part1, endLocation, part2);
+ MessageEditPart messagePart = (MessageEditPart)createLink(UMLElementTypes.Message_SynchEdge, part1.getViewer(), startLocation, part1, endLocation, part2);
assertNotNull("Sync message", messagePart);
Message message = (Message)messagePart.resolveSemanticElement();
assertNotNull("message", message);
doCheckExecution(execution2, message, true);
- AbstractExecutionSpecificationEditPart part3 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, part2.getParent(), getAbsoluteBounds(part2).getLocation().getTranslated(0, 100), null);
+ AbstractExecutionSpecificationEditPart part3 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, part2.getParent(), getAbsoluteBounds(part2).getLocation().getTranslated(0, 100), null);
ExecutionSpecification execution3 = (ExecutionSpecification)part3.resolveSemanticElement();
assertNotNull("execution3", execution3);
//reconnect from execution2 to execution3.
@@ -152,7 +152,7 @@ public class TestMessageOccurrenceSpecification_402975 extends AbstractNodeTest ExecutionSpecification execution2 = (ExecutionSpecification)part2.resolveSemanticElement();
assertNotNull("execution2", execution2);
doCheckExecution(execution2);
- MessageEditPart messagePart = (MessageEditPart)createLink(UMLElementTypes.Message_4003, part1.getViewer(), startLocation, part1, endLocation, part2);
+ MessageEditPart messagePart = (MessageEditPart)createLink(UMLElementTypes.Message_SynchEdge, part1.getViewer(), startLocation, part1, endLocation, part2);
assertNotNull("Sync message", messagePart);
Message message = (Message)messagePart.resolveSemanticElement();
assertNotNull("message", message);
@@ -183,7 +183,7 @@ public class TestMessageOccurrenceSpecification_402975 extends AbstractNodeTest ExecutionSpecification execution = (ExecutionSpecification)part1.resolveSemanticElement();
assertNotNull("execution", execution);
doCheckExecution(execution);
- Message3EditPart messagePart = (Message3EditPart)createLink(UMLElementTypes.Message_4005, part1.getViewer(), startLocation, part1, endLocation, part2);
+ Message3EditPart messagePart = (Message3EditPart)createLink(UMLElementTypes.Message_ReplyEdge, part1.getViewer(), startLocation, part1, endLocation, part2);
assertNotNull("Reply message", messagePart);
Message message = (Message)messagePart.resolveSemanticElement();
assertNotNull("message", message);
@@ -206,13 +206,13 @@ public class TestMessageOccurrenceSpecification_402975 extends AbstractNodeTest ExecutionSpecification execution = (ExecutionSpecification)part1.resolveSemanticElement();
assertNotNull("execution", execution);
doCheckExecution(execution);
- Message3EditPart messagePart = (Message3EditPart)createLink(UMLElementTypes.Message_4005, part1.getViewer(), startLocation, part1, endLocation, part2);
+ Message3EditPart messagePart = (Message3EditPart)createLink(UMLElementTypes.Message_ReplyEdge, part1.getViewer(), startLocation, part1, endLocation, part2);
assertNotNull("Reply message", messagePart);
Message message = (Message)messagePart.resolveSemanticElement();
assertNotNull("message", message);
doCheckExecution(execution, message, false);
Point location = startLocation.getTranslated(0, -100);
- AbstractExecutionSpecificationEditPart part3 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, part1.getParent(), location, null);
+ AbstractExecutionSpecificationEditPart part3 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, part1.getParent(), location, null);
ExecutionSpecification execution3 = (ExecutionSpecification)part3.resolveSemanticElement();
assertNotNull("execution3", execution3);
//reconnect from execution to execution3.
@@ -237,7 +237,7 @@ public class TestMessageOccurrenceSpecification_402975 extends AbstractNodeTest ExecutionSpecification execution = (ExecutionSpecification)part1.resolveSemanticElement();
assertNotNull("execution", execution);
doCheckExecution(execution);
- Message3EditPart messagePart = (Message3EditPart)createLink(UMLElementTypes.Message_4005, part1.getViewer(), startLocation, part1, endLocation, part2);
+ Message3EditPart messagePart = (Message3EditPart)createLink(UMLElementTypes.Message_ReplyEdge, part1.getViewer(), startLocation, part1, endLocation, part2);
assertNotNull("Reply message", messagePart);
Message message = (Message)messagePart.resolveSemanticElement();
assertNotNull("message", message);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveAnchorInsideCoRegion_402970.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveAnchorInsideCoRegion_402970.java index e362a638664..9596f653226 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveAnchorInsideCoRegion_402970.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveAnchorInsideCoRegion_402970.java @@ -48,12 +48,12 @@ public class TestMoveAnchorInsideCoRegion_402970 extends AbstractNodeTest { @Test
public void testMoveMessageDown() {
- LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(100, 300));
- LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(100, 300));
- CombinedFragment2EditPart coRegion = (CombinedFragment2EditPart)createNode(UMLElementTypes.CombinedFragment_3018, lifeline1, getAbsoluteBounds(lifeline1).getTop().translate(0, 50), new Dimension(50, 100));
+ LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(100, 300));
+ LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(100, 300));
+ CombinedFragment2EditPart coRegion = (CombinedFragment2EditPart)createNode(UMLElementTypes.CombinedFragment_CoRegionShape, lifeline1, getAbsoluteBounds(lifeline1).getTop().translate(0, 50), new Dimension(50, 100));
Point startLocation = getAbsoluteBounds(coRegion).getCenter().getTranslated(0, -30);
Point endLocation = getAbsoluteBounds(lifeline2).getCenter().setY(startLocation.y);
- Message2EditPart messagePart = (Message2EditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), startLocation, coRegion, endLocation, lifeline2);
+ Message2EditPart messagePart = (Message2EditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), startLocation, coRegion, endLocation, lifeline2);
waitForComplete();
Point sourceLoc = SequenceUtil.getAbsoluteEdgeExtremity(messagePart, true);
Point targetLoc = SequenceUtil.getAbsoluteEdgeExtremity(messagePart, false);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveMessageLostFound_403138.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveMessageLostFound_403138.java index f78bf1939ad..19a1fd6f5b2 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveMessageLostFound_403138.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestMoveMessageLostFound_403138.java @@ -49,10 +49,10 @@ public class TestMoveMessageLostFound_403138 extends AbstractNodeTest { @Test
public void testMoveMessageFound() {
- LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(100, 300));
+ LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(100, 300));
Point endLocation = getAbsoluteBounds(lifeline1).getTop().translate(0, 50);
Point startLocation = endLocation.getTranslated(-200, 0);
- Message7EditPart messageFound = (Message7EditPart)createLink(UMLElementTypes.Message_4009, lifeline1.getViewer(), startLocation, endLocation);
+ Message7EditPart messageFound = (Message7EditPart)createLink(UMLElementTypes.Message_FoundEdge, lifeline1.getViewer(), startLocation, endLocation);
waitForComplete();
Point sourceLoc = SequenceUtil.getAbsoluteEdgeExtremity(messageFound, true);
Point targetLoc = SequenceUtil.getAbsoluteEdgeExtremity(messageFound, false);
@@ -80,10 +80,10 @@ public class TestMoveMessageLostFound_403138 extends AbstractNodeTest { @Test
public void testMoveMessageLost() {
- LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(75, 200));
+ LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(75, 200));
Point startLocation = getAbsoluteBounds(lifeline1).getTop().translate(0, 50);
Point endLocation = startLocation.getTranslated(100, 0);
- Message6EditPart messageFound = (Message6EditPart)createLink(UMLElementTypes.Message_4008, lifeline1.getViewer(), startLocation, endLocation);
+ Message6EditPart messageFound = (Message6EditPart)createLink(UMLElementTypes.Message_LostEdge, lifeline1.getViewer(), startLocation, endLocation);
waitForComplete();
Point sourceLoc = SequenceUtil.getAbsoluteEdgeExtremity(messageFound, true);
Point targetLoc = SequenceUtil.getAbsoluteEdgeExtremity(messageFound, false);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestOrderingFragments_403233.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestOrderingFragments_403233.java index 2fa4f9a5329..f39134f328b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestOrderingFragments_403233.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestOrderingFragments_403233.java @@ -49,9 +49,9 @@ public class TestOrderingFragments_403233 extends AbstractNodeTest { @Test
public void testOrderingAfterCreateExecutions() {
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 100), null);
- AbstractExecutionSpecificationEditPart executionPart1 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline, getAbsoluteBounds(lifeline).getCenter(), null);
- AbstractExecutionSpecificationEditPart executionPart2 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline, getAbsoluteBounds(executionPart1).getCenter().getTranslated(0, -100), null);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(200, 100), null);
+ AbstractExecutionSpecificationEditPart executionPart1 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline, getAbsoluteBounds(lifeline).getCenter(), null);
+ AbstractExecutionSpecificationEditPart executionPart2 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline, getAbsoluteBounds(executionPart1).getCenter().getTranslated(0, -100), null);
ExecutionSpecification execution1 = (ExecutionSpecification)executionPart1.resolveSemanticElement();
ExecutionSpecification execution2 = (ExecutionSpecification)executionPart2.resolveSemanticElement();
validOrderWithPosition(execution1, getAbsoluteBounds(executionPart1).y, execution2, getAbsoluteBounds(executionPart2).y);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestResizeStateInvariant_395774.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestResizeStateInvariant_395774.java index fa559e75fd3..14d5cb4e899 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestResizeStateInvariant_395774.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestResizeStateInvariant_395774.java @@ -44,10 +44,10 @@ public class TestResizeStateInvariant_395774 extends AbstractNodeTest { @Test
public void testResize() {
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline);
Rectangle r = getAbsoluteBounds(lifeline);
- StateInvariantEditPart stateInvariant = (StateInvariantEditPart)createNode(UMLElementTypes.StateInvariant_3017, lifeline, r.getCenter(), null);
+ StateInvariantEditPart stateInvariant = (StateInvariantEditPart)createNode(UMLElementTypes.StateInvariant_Shape, lifeline, r.getCenter(), null);
assertNotNull(stateInvariant);
int move = 30;
Rectangle beforeBounds = getAbsoluteBounds(stateInvariant);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestShiftEnclosingMessageInOperand_402969.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestShiftEnclosingMessageInOperand_402969.java index 5e4a9514f26..d291eda4065 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestShiftEnclosingMessageInOperand_402969.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestShiftEnclosingMessageInOperand_402969.java @@ -51,17 +51,17 @@ public class TestShiftEnclosingMessageInOperand_402969 extends AbstractNodeTest @Test
public void testResizeOperand() {
- LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 100), new Dimension(80, 300));
- LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(400, 100), new Dimension(80, 300));
- CombinedFragmentEditPart combinedFragment = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(150, 150), new Dimension(380, 100));
+ LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(200, 100), new Dimension(80, 300));
+ LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(400, 100), new Dimension(80, 300));
+ CombinedFragmentEditPart combinedFragment = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(150, 150), new Dimension(380, 100));
CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart)combinedFragment.getChildBySemanticHint("" + CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID);
IGraphicalEditPart operand1 = compartment.getChildBySemanticHint(InteractionOperandEditPart.VISUAL_ID + "");
- InteractionOperandEditPart operand2 = (InteractionOperandEditPart)createNode(UMLElementTypes.InteractionOperand_3005, compartment, getAbsoluteBounds(compartment).getCenter(), new Dimension(100, 200));
+ InteractionOperandEditPart operand2 = (InteractionOperandEditPart)createNode(UMLElementTypes.InteractionOperand_Shape, compartment, getAbsoluteBounds(compartment).getCenter(), new Dimension(100, 200));
Rectangle operandBounds = getAbsoluteBounds(operand2);
int offset = 10;
Point startLocation = getAbsoluteBounds(lifeline1).getCenter().setY(operandBounds.y + offset);
Point endLocation = getAbsoluteBounds(lifeline2).getCenter().setY(operandBounds.y + offset);
- Message2EditPart message = (Message2EditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), startLocation, lifeline1, endLocation, lifeline2);
+ Message2EditPart message = (Message2EditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), startLocation, lifeline1, endLocation, lifeline2);
checkMessageEnclosing(message, operandBounds);
resize(operand1, operandBounds.getTop(), PositionConstants.SOUTH, new Dimension(0, offset * 2));
Rectangle newOperandBounds = getAbsoluteBounds(operand2);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestTooltip_402964.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestTooltip_402964.java index 501c430d22d..7214cad0b5b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestTooltip_402964.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/TestTooltip_402964.java @@ -90,7 +90,7 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testLifelineTooltip() {
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline);
final Package model = getPackage();
getDiagramCommandStack().execute(new ICommandProxy(new AbstractTransactionalCommand(getEditingDomain(), "", Collections.singletonList(file)) {
@@ -119,9 +119,9 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testActionExecutionSpecification() {
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline);
- ActionExecutionSpecificationEditPart aes = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline, getAbsoluteCenter(lifeline), null);
+ ActionExecutionSpecificationEditPart aes = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline, getAbsoluteCenter(lifeline), null);
assertNotNull(aes);
String name = "TestActionExecutionSpecification";
changeName(getEditingDomain(), (NamedElement)aes.resolveSemanticElement(), name);
@@ -130,9 +130,9 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testBehaviorExecutionSpecification() {
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline);
- BehaviorExecutionSpecificationEditPart bes = (BehaviorExecutionSpecificationEditPart)createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline, getAbsoluteCenter(lifeline), null);
+ BehaviorExecutionSpecificationEditPart bes = (BehaviorExecutionSpecificationEditPart)createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline, getAbsoluteCenter(lifeline), null);
assertNotNull(bes);
String name = "TestBehaviorExecutionSpecification";
changeName(getEditingDomain(), (NamedElement)bes.resolveSemanticElement(), name);
@@ -141,7 +141,7 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testCombinedFragment() {
- CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
+ CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
assertNotNull(cf);
String name = "Test Combined Fragment";
CombinedFragment elt = (CombinedFragment)cf.resolveSemanticElement();
@@ -151,14 +151,14 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testInteractionOperand() {
- CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
+ CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
assertNotNull(cf);
String cfName = "Test Combined Fragment";
CombinedFragment elt = (CombinedFragment)cf.resolveSemanticElement();
changeName(getEditingDomain(), elt, cfName);
CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart)cf.getChildBySemanticHint("" + CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID);
assertNotNull(compartment);
- InteractionOperandEditPart operand = (InteractionOperandEditPart)createNode(UMLElementTypes.InteractionOperand_3005, compartment, getAbsoluteCenter(compartment), null);
+ InteractionOperandEditPart operand = (InteractionOperandEditPart)createNode(UMLElementTypes.InteractionOperand_Shape, compartment, getAbsoluteCenter(compartment), null);
assertNotNull(operand);
String name = "Test Interaction Operand";
changeName(getEditingDomain(), (NamedElement)operand.resolveSemanticElement(), name);
@@ -167,15 +167,15 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testSynchronousMessage() {
- LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline1);
- ActionExecutionSpecificationEditPart source = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline1, getAbsoluteBounds(lifeline1).getTop().translate(0, 50), null);
+ ActionExecutionSpecificationEditPart source = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline1, getAbsoluteBounds(lifeline1).getTop().translate(0, 50), null);
assertNotNull(source);
- LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(lifeline2);
- ActionExecutionSpecificationEditPart target = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline2, getAbsoluteBounds(lifeline2).getTop().translate(0, 50), null);
+ ActionExecutionSpecificationEditPart target = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline2, getAbsoluteBounds(lifeline2).getTop().translate(0, 50), null);
assertNotNull(target);
- MessageEditPart message = (MessageEditPart)createLink(UMLElementTypes.Message_4003, lifeline1.getViewer(), getAbsoluteCenter(source), getAbsoluteCenter(target));
+ MessageEditPart message = (MessageEditPart)createLink(UMLElementTypes.Message_SynchEdge, lifeline1.getViewer(), getAbsoluteCenter(source), getAbsoluteCenter(target));
assertNotNull(message);
String name = "Test Synchronous Message";
changeName(getEditingDomain(), (NamedElement)message.resolveSemanticElement(), name);
@@ -184,11 +184,11 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testAsynchronousMessage() {
- LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(source);
- LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(target);
- Message2EditPart message = (Message2EditPart)createLink(UMLElementTypes.Message_4004, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
+ Message2EditPart message = (Message2EditPart)createLink(UMLElementTypes.Message_AsynchEdge, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
assertNotNull(message);
String name = "Test Asynchronous Message";
changeName(getEditingDomain(), (NamedElement)message.resolveSemanticElement(), name);
@@ -197,11 +197,11 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testCreateMessage() {
- LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(source);
- LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(target);
- Message4EditPart message = (Message4EditPart)createLink(UMLElementTypes.Message_4006, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
+ Message4EditPart message = (Message4EditPart)createLink(UMLElementTypes.Message_CreateEdge, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
assertNotNull(message);
String name = "Test Create Message";
changeName(getEditingDomain(), (NamedElement)message.resolveSemanticElement(), name);
@@ -210,15 +210,15 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testReplyMessage() {
- LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(lifeline1);
- ActionExecutionSpecificationEditPart source = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline1, getAbsoluteBounds(lifeline1).getTop().translate(0, 50), null);
+ ActionExecutionSpecificationEditPart source = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline1, getAbsoluteBounds(lifeline1).getTop().translate(0, 50), null);
assertNotNull(source);
- LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline2);
- ActionExecutionSpecificationEditPart target = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline2, getAbsoluteBounds(lifeline2).getTop().translate(0, 150), null);
+ ActionExecutionSpecificationEditPart target = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline2, getAbsoluteBounds(lifeline2).getTop().translate(0, 150), null);
assertNotNull(target);
- Message3EditPart message = (Message3EditPart)createLink(UMLElementTypes.Message_4005, source.getViewer(), getAbsoluteCenter(source), getAbsoluteCenter(target));
+ Message3EditPart message = (Message3EditPart)createLink(UMLElementTypes.Message_ReplyEdge, source.getViewer(), getAbsoluteCenter(source), getAbsoluteCenter(target));
assertNotNull(message);
String name = "Test Reply Message";
changeName(getEditingDomain(), (NamedElement)message.resolveSemanticElement(), name);
@@ -227,11 +227,11 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testFoundMessage() {
- LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(target);
Point targetLocation = getAbsoluteBounds(target).getTop().translate(0, 50);
Point sourceLocation = targetLocation.getTranslated(-100, 0);
- Message7EditPart message = (Message7EditPart)createLink(UMLElementTypes.Message_4009, target.getViewer(), sourceLocation, targetLocation);
+ Message7EditPart message = (Message7EditPart)createLink(UMLElementTypes.Message_FoundEdge, target.getViewer(), sourceLocation, targetLocation);
assertNotNull(message);
String name = "Test Found Message";
changeName(getEditingDomain(), (NamedElement)message.resolveSemanticElement(), name);
@@ -240,11 +240,11 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testLostMessage() {
- LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(source);
Point sourceLocation = getAbsoluteBounds(source).getTop().translate(0, 50);
Point targetLocation = sourceLocation.getTranslated(100, 0);
- Message6EditPart message = (Message6EditPart)createLink(UMLElementTypes.Message_4008, source.getViewer(), sourceLocation, targetLocation);
+ Message6EditPart message = (Message6EditPart)createLink(UMLElementTypes.Message_LostEdge, source.getViewer(), sourceLocation, targetLocation);
assertNotNull(message);
String name = "Test Lost Message";
changeName(getEditingDomain(), (NamedElement)message.resolveSemanticElement(), name);
@@ -253,11 +253,11 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testDeleteMessage() {
- LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(source);
- LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(target);
- Message5EditPart message = (Message5EditPart)createLink(UMLElementTypes.Message_4007, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
+ Message5EditPart message = (Message5EditPart)createLink(UMLElementTypes.Message_DeleteEdge, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
assertNotNull(message);
String name = "Test Delete Message";
changeName(getEditingDomain(), (NamedElement)message.resolveSemanticElement(), name);
@@ -266,11 +266,11 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testMessageOccurrenceSpecification() {
- LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(source);
- LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(target);
- Message2EditPart message = (Message2EditPart)createLink(UMLElementTypes.Message_4004, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
+ Message2EditPart message = (Message2EditPart)createLink(UMLElementTypes.Message_AsynchEdge, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
assertNotNull(message);
MessageEndEditPart messageEnd = (MessageEndEditPart)message.getChildBySemanticHint(MessageEndEditPart.VISUAL_ID);
assertNotNull(messageEnd);
@@ -281,9 +281,9 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testExecutionOccurrenceSpecification() {
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline);
- ActionExecutionSpecificationEditPart es = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline, getAbsoluteCenter(lifeline), null);
+ ActionExecutionSpecificationEditPart es = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline, getAbsoluteCenter(lifeline), null);
assertNotNull(es);
ExecutionSpecificationEndEditPart esEnd = (ExecutionSpecificationEndEditPart)es.getChildren().get(0);
assertNotNull(esEnd);
@@ -294,7 +294,7 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testInteractionUse() {
- InteractionUseEditPart interactionUse = (InteractionUseEditPart)createNode(UMLElementTypes.InteractionUse_3002, getRootEditPart(), new Point(300, 200), new Dimension(200, 100));
+ InteractionUseEditPart interactionUse = (InteractionUseEditPart)createNode(UMLElementTypes.InteractionUse_Shape, getRootEditPart(), new Point(300, 200), new Dimension(200, 100));
assertNotNull(interactionUse);
String name = "Test Interaction Use";
NamedElement element = (NamedElement)interactionUse.resolveSemanticElement();
@@ -325,10 +325,10 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testStateInvariant() {
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline);
Rectangle r = getAbsoluteBounds(lifeline);
- StateInvariantEditPart stateInvariant = (StateInvariantEditPart)createNode(UMLElementTypes.StateInvariant_3017, lifeline, r.getCenter(), null);
+ StateInvariantEditPart stateInvariant = (StateInvariantEditPart)createNode(UMLElementTypes.StateInvariant_Shape, lifeline, r.getCenter(), null);
assertNotNull(stateInvariant);
String name = "Test State Invariant";
changeName(getEditingDomain(), (NamedElement)stateInvariant.resolveSemanticElement(), name);
@@ -337,38 +337,38 @@ public class TestTooltip_402964 extends AbstractNodeTest { @Test
public void testDestructionEvent() {
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline);
- DestructionOccurrenceSpecificationEditPart destructionEvent = (DestructionOccurrenceSpecificationEditPart)createNode(UMLElementTypes.DestructionOccurrenceSpecification_3022, lifeline, getAbsoluteCenter(lifeline), null);
+ DestructionOccurrenceSpecificationEditPart destructionEvent = (DestructionOccurrenceSpecificationEditPart)createNode(UMLElementTypes.DestructionOccurrenceSpecification_Shape, lifeline, getAbsoluteCenter(lifeline), null);
assertNotNull(destructionEvent);
checkTooltip(destructionEvent.getFigure().getToolTip(), "Destruction Event", "");
}
@Test
public void testGeneralOrdering() {
- LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(source);
- LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(target);
Point sourcePoint = getAbsoluteBounds(source).getTop().translate(0, 50);
Point targetPoint = getAbsoluteBounds(target).getTop().translate(0, 50);
- Message2EditPart message1 = (Message2EditPart)createLink(UMLElementTypes.Message_4004, source.getViewer(), sourcePoint, targetPoint);
+ Message2EditPart message1 = (Message2EditPart)createLink(UMLElementTypes.Message_AsynchEdge, source.getViewer(), sourcePoint, targetPoint);
assertNotNull(message1);
- Message2EditPart message2 = (Message2EditPart)createLink(UMLElementTypes.Message_4004, source.getViewer(), sourcePoint.getTranslated(0, 50), targetPoint.getTranslated(0, 50));
+ Message2EditPart message2 = (Message2EditPart)createLink(UMLElementTypes.Message_AsynchEdge, source.getViewer(), sourcePoint.getTranslated(0, 50), targetPoint.getTranslated(0, 50));
assertNotNull(message2);
sourcePoint = SequenceUtil.getAbsoluteEdgeExtremity(message1, true);
targetPoint = SequenceUtil.getAbsoluteEdgeExtremity(message2, false);
- GeneralOrderingEditPart generalOrdering = (GeneralOrderingEditPart)createLink(UMLElementTypes.GeneralOrdering_4012, source.getViewer(), sourcePoint, targetPoint);
+ GeneralOrderingEditPart generalOrdering = (GeneralOrderingEditPart)createLink(UMLElementTypes.GeneralOrdering_Edge, source.getViewer(), sourcePoint, targetPoint);
assertNotNull(generalOrdering);
checkTooltip(generalOrdering.getFigure().getToolTip(), "General Ordering", "");
}
@Test
public void testCoRegion() {
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline);
Rectangle r = getAbsoluteBounds(lifeline);
- CombinedFragment2EditPart coRegion = (CombinedFragment2EditPart)createNode(UMLElementTypes.CombinedFragment_3018, lifeline, r.getCenter(), null);
+ CombinedFragment2EditPart coRegion = (CombinedFragment2EditPart)createNode(UMLElementTypes.CombinedFragment_CoRegionShape, lifeline, r.getCenter(), null);
assertNotNull(coRegion);
String name = "Test CoRegion";
changeName(getEditingDomain(), (NamedElement)coRegion.resolveSemanticElement(), name);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/CombinedFragmentStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/CombinedFragmentStereotypesTest.java index 4ddea4fa887..222425e276a 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/CombinedFragmentStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/CombinedFragmentStereotypesTest.java @@ -39,7 +39,7 @@ public class CombinedFragmentStereotypesTest extends BaseStereotypesTest { @Override
public void setUp() throws Exception {
super.setUp();
- combinedFragment = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
+ combinedFragment = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
assertNotNull(combinedFragment);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ContinuationStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ContinuationStereotypesTest.java index 27eb2b21982..5c4da776d50 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ContinuationStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ContinuationStereotypesTest.java @@ -45,7 +45,7 @@ public class ContinuationStereotypesTest extends BaseStereotypesTest { @Override
public void setUp() throws Exception {
super.setUp();
- CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
+ CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart)cf.getChildBySemanticHint("" + CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID);
InteractionOperandEditPart operand = (InteractionOperandEditPart)compartment.getChildBySemanticHint("" + InteractionOperandEditPart.VISUAL_ID);
final CombinedFragment element = (CombinedFragment)cf.resolveSemanticElement();
@@ -56,7 +56,7 @@ public class ContinuationStereotypesTest extends BaseStereotypesTest { element.setInteractionOperator(InteractionOperatorKind.ALT_LITERAL);
}
});
- continuation = (ContinuationEditPart)createNode(UMLElementTypes.Continuation_3016, operand, SequenceUtil.getAbsoluteBounds(operand).getCenter(), null);
+ continuation = (ContinuationEditPart)createNode(UMLElementTypes.Continuation_Shape, operand, SequenceUtil.getAbsoluteBounds(operand).getCenter(), null);
assertNotNull(continuation);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationConstraintStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationConstraintStereotypesTest.java index e8ff49bf8e4..8d3bcdadbf7 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationConstraintStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationConstraintStereotypesTest.java @@ -38,7 +38,7 @@ public class DurationConstraintStereotypesTest extends BaseStereotypesTest { @Override
public void setUp() throws Exception {
super.setUp();
- durationConstraint = (DurationConstraintEditPart)createNode(UMLElementTypes.DurationConstraint_3021, getRootEditPart(), new Point(100, 100), null);
+ durationConstraint = (DurationConstraintEditPart)createNode(UMLElementTypes.DurationConstraint_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(durationConstraint);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationObservationStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationObservationStereotypesTest.java index 7228a48efe1..fa66d8d1e11 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationObservationStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/DurationObservationStereotypesTest.java @@ -38,7 +38,7 @@ public class DurationObservationStereotypesTest extends BaseStereotypesTest { @Override
public void setUp() throws Exception {
super.setUp();
- durationObservation = (DurationObservationEditPart)createNode(UMLElementTypes.DurationObservation_3024, getRootEditPart(), new Point(100, 100), null);
+ durationObservation = (DurationObservationEditPart)createNode(UMLElementTypes.DurationObservation_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(durationObservation);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ExecutionSpecificationStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ExecutionSpecificationStereotypesTest.java index 43f25a948ee..efa8cf67bbd 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ExecutionSpecificationStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/ExecutionSpecificationStereotypesTest.java @@ -38,27 +38,27 @@ public class ExecutionSpecificationStereotypesTest extends BaseStereotypesTest { @Override
public void setUp() throws Exception {
super.setUp();
- lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 300), null);
+ lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 300), null);
assertNotNull(lifeline);
}
@Test
public void testDisplayStereotypeComment_ActionExecutionSpecification() {
- EditPart es = createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline, new Point(131, 150), null);
+ EditPart es = createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline, new Point(131, 150), null);
assertNotNull("actionExecutionSpecification", es);
doTestDisplayStereotypeComment(es);
}
@Test
public void testDisplayStereotypeComment_BehaviorExecutionSpecification() {
- EditPart es = createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline, new Point(131, 220), null);
+ EditPart es = createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline, new Point(131, 220), null);
assertNotNull("behaviorExecutionSpecification", es);
doTestDisplayStereotypeComment(es);
}
@Test
public void testDisplayStereotypeComment_DestructionExecutionSpecification() {
- EditPart es = createNode(UMLElementTypes.DestructionOccurrenceSpecification_3022, lifeline, new Point(131, 250), null);
+ EditPart es = createNode(UMLElementTypes.DestructionOccurrenceSpecification_Shape, lifeline, new Point(131, 250), null);
assertNotNull("destructionExecutionSpecification", es);
doTestDisplayStereotypeComment(es);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_EditorCrashesWhenMovingGeneralOrdering_417373.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_EditorCrashesWhenMovingGeneralOrdering_417373.java index ad66ea686ff..3bc06503417 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_EditorCrashesWhenMovingGeneralOrdering_417373.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_EditorCrashesWhenMovingGeneralOrdering_417373.java @@ -34,16 +34,16 @@ public class Fixbug_EditorCrashesWhenMovingGeneralOrdering_417373 extends Abstra @Test
public void test() {
- EditPart lifeline1 = createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 400), new Dimension(100, 400));
- EditPart lifeline2 = createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(350, 400), new Dimension(100, 400));
+ EditPart lifeline1 = createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 400), new Dimension(100, 400));
+ EditPart lifeline2 = createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(350, 400), new Dimension(100, 400));
Point startLocation = SequenceUtil.getAbsoluteBounds((IGraphicalEditPart)lifeline1).getCenter().getCopy();
Point endLocation = SequenceUtil.getAbsoluteBounds((IGraphicalEditPart)lifeline2).getCenter().getCopy();
- AbstractMessageEditPart message1 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), startLocation, lifeline1, endLocation, lifeline2);
- AbstractMessageEditPart message2 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), endLocation.getTranslated(0, 79), lifeline2, startLocation.getTranslated(0, 80), lifeline1);
+ AbstractMessageEditPart message1 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), startLocation, lifeline1, endLocation, lifeline2);
+ AbstractMessageEditPart message2 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), endLocation.getTranslated(0, 79), lifeline2, startLocation.getTranslated(0, 80), lifeline1);
//create General Ordering
startLocation = SequenceUtil.getAbsoluteEdgeExtremity(message1, false);
endLocation = SequenceUtil.getAbsoluteEdgeExtremity(message2, false);
- EditPart generalOrdering = createLink(UMLElementTypes.GeneralOrdering_4012, lifeline1.getViewer(), startLocation, lifeline2, endLocation, lifeline1);
+ EditPart generalOrdering = createLink(UMLElementTypes.GeneralOrdering_Edge, lifeline1.getViewer(), startLocation, lifeline2, endLocation, lifeline1);
assertNotNull("generalOrdering", generalOrdering);
//Move down the end of message2 10 times.
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_LifelineManagement_417365.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_LifelineManagement_417365.java index 82c71298fdc..23d0a2dbdfe 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_LifelineManagement_417365.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_LifelineManagement_417365.java @@ -113,9 +113,9 @@ public class Fixbug_LifelineManagement_417365 extends BaseStereotypesTest { */
protected void prepareDiagram() {
//Create Lifelines
- lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(100, 800));
- lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(100, 800));
- lifeline3 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(500, 100), null);
+ lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(100, 800));
+ lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(100, 800));
+ lifeline3 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(500, 100), null);
int y = 120;
//Create message from Interaction to Lifeline1.
@@ -123,63 +123,63 @@ public class Fixbug_LifelineManagement_417365 extends BaseStereotypesTest { Rectangle interactionBounds = SequenceUtil.getAbsoluteBounds(interaction);
Rectangle lifeline1Bounds = SequenceUtil.getAbsoluteBounds(lifeline1);
Point pt = lifeline1Bounds.getCenter();
- message1 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), new Point(0, y - 1), interaction, new Point(pt.x, y), lifeline1);
+ message1 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), new Point(0, y - 1), interaction, new Point(pt.x, y), lifeline1);
//Create ExecutionSpecification on lifeline1 and Lifeline2
y += 20;
- AbstractExecutionSpecificationEditPart execution1 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline1, new Point(pt.x, y), null);
- AbstractExecutionSpecificationEditPart execution2 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline2, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y), null);
+ AbstractExecutionSpecificationEditPart execution1 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline1, new Point(pt.x, y), null);
+ AbstractExecutionSpecificationEditPart execution2 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline2, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y), null);
//Create Message between execution1 and execution2.
- message2 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4003, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), execution1, SequenceUtil.getAbsoluteBounds(execution2).getTop(), execution2);
- message3 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution2).getBottom(), execution2, SequenceUtil.getAbsoluteBounds(execution1).getBottom(), execution1);
+ message2 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_SynchEdge, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), execution1, SequenceUtil.getAbsoluteBounds(execution2).getTop(), execution2);
+ message3 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution2).getBottom(), execution2, SequenceUtil.getAbsoluteBounds(execution1).getBottom(), execution1);
//Create Message from execution2 to Lifeline3
y = SequenceUtil.getAbsoluteBounds(execution2).getCenter().y;
- message4 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution2).getCenter(), execution2, SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y + 1), lifeline3);
+ message4 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution2).getCenter(), execution2, SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y + 1), lifeline3);
- lifeline4 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(650, 100), new Dimension(70, 100));
+ lifeline4 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(650, 100), new Dimension(70, 100));
//Create Message Create from lifeline3 to lifeline4
y += 20;
- message5 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4006, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y), lifeline3, SequenceUtil.getAbsoluteBounds(lifeline4).getTop(), lifeline4);
+ message5 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_CreateEdge, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y), lifeline3, SequenceUtil.getAbsoluteBounds(lifeline4).getTop(), lifeline4);
//Create message from interaction to lifeline4
y += 40;
- //message6 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), interactionBounds.getRight().setY(y).translate(0, -1), interaction, SequenceUtil.getAbsoluteBounds(lifeline4).getCenter().setY(y), lifeline4);
- message6 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), new Point(interactionBounds.right(), y - 1), interaction, SequenceUtil.getAbsoluteBounds(lifeline4).getCenter().setY(y), lifeline4);
+ //message6 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), interactionBounds.getRight().setY(y).translate(0, -1), interaction, SequenceUtil.getAbsoluteBounds(lifeline4).getCenter().setY(y), lifeline4);
+ message6 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), new Point(interactionBounds.right(), y - 1), interaction, SequenceUtil.getAbsoluteBounds(lifeline4).getCenter().setY(y), lifeline4);
//Create message found and message lost
y += 20;
- message7 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4009, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y).getTranslated(-80, 0), interaction, SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y), lifeline3);
+ message7 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_FoundEdge, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y).getTranslated(-80, 0), interaction, SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y), lifeline3);
y += 20;
- message8 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4008, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y), lifeline3, SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y).getTranslated(250, 1), interaction);
+ message8 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_LostEdge, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y), lifeline3, SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y).getTranslated(250, 1), interaction);
//Create CombinedFragment
- CombinedFragmentEditPart combinedFragment = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(50, 300), new Dimension(500, 200));
+ CombinedFragmentEditPart combinedFragment = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(50, 300), new Dimension(500, 200));
CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart)combinedFragment.getChildBySemanticHint(CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID + "");
InteractionOperandEditPart firstOperand = (InteractionOperandEditPart)compartment.getPrimaryChildEditPart();
- InteractionOperandEditPart secondOperand = (InteractionOperandEditPart)createNode(UMLElementTypes.InteractionOperand_3005, compartment, SequenceUtil.getAbsoluteBounds(combinedFragment).getCenter(), null);
+ InteractionOperandEditPart secondOperand = (InteractionOperandEditPart)createNode(UMLElementTypes.InteractionOperand_Shape, compartment, SequenceUtil.getAbsoluteBounds(combinedFragment).getCenter(), null);
//create message in firstOperand
y = SequenceUtil.getAbsoluteBounds(firstOperand).getCenter().y;
- AbstractExecutionSpecificationEditPart execution3 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline1, new Point(pt.x, y), null);
- AbstractExecutionSpecificationEditPart execution4 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline2, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y), null);
+ AbstractExecutionSpecificationEditPart execution3 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline1, new Point(pt.x, y), null);
+ AbstractExecutionSpecificationEditPart execution4 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline2, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y), null);
//Create Message between execution1 and execution2.
- message9 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4003, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution3).getTop(), execution3, SequenceUtil.getAbsoluteBounds(execution4).getTop(), execution4);
- message10 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution4).getBottom(), execution4, SequenceUtil.getAbsoluteBounds(execution3).getBottom(), execution3);
+ message9 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_SynchEdge, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution3).getTop(), execution3, SequenceUtil.getAbsoluteBounds(execution4).getTop(), execution4);
+ message10 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution4).getBottom(), execution4, SequenceUtil.getAbsoluteBounds(execution3).getBottom(), execution3);
//create message in secondOperand
y = SequenceUtil.getAbsoluteBounds(secondOperand).getCenter().y;
- message11 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline1).getCenter().setY(y), lifeline1, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y + 1), lifeline2);
- //message11 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), new Point(SequenceUtil.getAbsoluteBounds(lifeline1).right(), y), lifeline1, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y + 1), lifeline2);
+ message11 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline1).getCenter().setY(y), lifeline1, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y + 1), lifeline2);
+ //message11 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), new Point(SequenceUtil.getAbsoluteBounds(lifeline1).right(), y), lifeline1, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y + 1), lifeline2);
//Create message between Interaction and CombinedFragment
y = SequenceUtil.getAbsoluteBounds(combinedFragment).getLeft().y;
- message12 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), new Point(0, y - 1), interaction, SequenceUtil.getAbsoluteBounds(combinedFragment).getLeft(), combinedFragment);
+ message12 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), new Point(0, y - 1), interaction, SequenceUtil.getAbsoluteBounds(combinedFragment).getLeft(), combinedFragment);
y = SequenceUtil.getAbsoluteBounds(combinedFragment).getRight().y;
- message13 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), new Point(interactionBounds.right(), y - 1), interaction, SequenceUtil.getAbsoluteBounds(combinedFragment).getRight(), combinedFragment);
+ message13 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), new Point(interactionBounds.right(), y - 1), interaction, SequenceUtil.getAbsoluteBounds(combinedFragment).getRight(), combinedFragment);
waitForComplete();
validateMessageHorizontally();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterMessageReconnection_417375.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterMessageReconnection_417375.java index 30709adcd74..a8783a8cb30 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterMessageReconnection_417375.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterMessageReconnection_417375.java @@ -48,12 +48,12 @@ public class Fixbug_OrderFragmentsAfterMessageReconnection_417375 extends Abstra @Test
public void test() {
- EditPart lifeline1 = createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(100, 500));
- EditPart lifeline2 = createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(100, 500));
+ EditPart lifeline1 = createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(100, 500));
+ EditPart lifeline2 = createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), new Dimension(100, 500));
final Interaction interaction = (Interaction)getRootEditPart().resolveSemanticElement();
- ActionExecutionSpecificationEditPart execution1 = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline1, new Point(131, 200), new Dimension(16, 150));
+ ActionExecutionSpecificationEditPart execution1 = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline1, new Point(131, 200), new Dimension(16, 150));
ActionExecutionSpecification actionES = (ActionExecutionSpecification)execution1.resolveSemanticElement();
waitForComplete();
//validate after create action
@@ -63,7 +63,7 @@ public class Fixbug_OrderFragmentsAfterMessageReconnection_417375 extends Abstra actualList.add(actionES.getFinish());
validateOrders(interaction.getFragments(), actualList);
- BehaviorExecutionSpecificationEditPart execution2 = (BehaviorExecutionSpecificationEditPart)createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline1, new Point(148, 230), new Dimension(16, 80));
+ BehaviorExecutionSpecificationEditPart execution2 = (BehaviorExecutionSpecificationEditPart)createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline1, new Point(148, 230), new Dimension(16, 80));
BehaviorExecutionSpecification behaviorES = (BehaviorExecutionSpecification)execution2.resolveSemanticElement();
waitForComplete();
//validate after create behavior
@@ -78,7 +78,7 @@ public class Fixbug_OrderFragmentsAfterMessageReconnection_417375 extends Abstra Point endLocation = SequenceUtil.getAbsoluteBounds(execution2).getCenter().getCopy().getTranslated(0, 20);
Point startLocation = SequenceUtil.getAbsoluteBounds((IGraphicalEditPart)lifeline2).getCenter().setY(endLocation.y - 1);
- AbstractMessageEditPart messageEditPart = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), startLocation, lifeline2, endLocation, execution2);
+ AbstractMessageEditPart messageEditPart = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline1.getViewer(), startLocation, lifeline2, endLocation, execution2);
Message message = (Message)messageEditPart.resolveSemanticElement();
waitForComplete();
//validate after create message
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterResizeExecutions_417374.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterResizeExecutions_417374.java index cca0545a425..012ff3f71ac 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterResizeExecutions_417374.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_OrderFragmentsAfterResizeExecutions_417374.java @@ -43,11 +43,11 @@ public class Fixbug_OrderFragmentsAfterResizeExecutions_417374 extends AbstractN @Test
public void test() {
- EditPart lifeline = createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(100, 500));
+ EditPart lifeline = createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), new Dimension(100, 500));
Interaction interaction = (Interaction)getRootEditPart().resolveSemanticElement();
- ActionExecutionSpecificationEditPart execution1 = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline, new Point(131, 200), new Dimension(16, 150));
+ ActionExecutionSpecificationEditPart execution1 = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline, new Point(131, 200), new Dimension(16, 150));
ActionExecutionSpecification actionES = (ActionExecutionSpecification)execution1.resolveSemanticElement();
waitForComplete();
//validate after create action
@@ -57,7 +57,7 @@ public class Fixbug_OrderFragmentsAfterResizeExecutions_417374 extends AbstractN actualList.add(actionES.getFinish());
validateOrders(interaction.getFragments(), actualList);
- BehaviorExecutionSpecificationEditPart execution2 = (BehaviorExecutionSpecificationEditPart)createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline, new Point(148, 230), new Dimension(16, 80));
+ BehaviorExecutionSpecificationEditPart execution2 = (BehaviorExecutionSpecificationEditPart)createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline, new Point(148, 230), new Dimension(16, 80));
BehaviorExecutionSpecification behaviorES = (BehaviorExecutionSpecification)execution2.resolveSemanticElement();
waitForComplete();
//validate after create behavior
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/GeneralOrderingStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/GeneralOrderingStereotypesTest.java index 461a7626928..c1abb55d651 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/GeneralOrderingStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/GeneralOrderingStereotypesTest.java @@ -40,19 +40,19 @@ public class GeneralOrderingStereotypesTest extends BaseStereotypesTest { @Override
public void setUp() throws Exception {
super.setUp();
- LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(source);
- LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(target);
Point sourcePoint = getAbsoluteBounds(source).getTop().translate(0, 50);
Point targetPoint = getAbsoluteBounds(target).getTop().translate(0, 50);
- Message2EditPart message1 = (Message2EditPart)createLink(UMLElementTypes.Message_4004, source.getViewer(), sourcePoint, targetPoint);
+ Message2EditPart message1 = (Message2EditPart)createLink(UMLElementTypes.Message_AsynchEdge, source.getViewer(), sourcePoint, targetPoint);
assertNotNull(message1);
- Message2EditPart message2 = (Message2EditPart)createLink(UMLElementTypes.Message_4004, source.getViewer(), sourcePoint.getTranslated(0, 50), targetPoint.getTranslated(0, 50));
+ Message2EditPart message2 = (Message2EditPart)createLink(UMLElementTypes.Message_AsynchEdge, source.getViewer(), sourcePoint.getTranslated(0, 50), targetPoint.getTranslated(0, 50));
assertNotNull(message2);
sourcePoint = SequenceUtil.getAbsoluteEdgeExtremity(message1, true);
targetPoint = SequenceUtil.getAbsoluteEdgeExtremity(message2, false);
- generalOrdering = (GeneralOrderingEditPart)createLink(UMLElementTypes.GeneralOrdering_4012, source.getViewer(), sourcePoint, targetPoint);
+ generalOrdering = (GeneralOrderingEditPart)createLink(UMLElementTypes.GeneralOrdering_Edge, source.getViewer(), sourcePoint, targetPoint);
assertNotNull(generalOrdering);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionOperandStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionOperandStereotypesTest.java index 7fa1714652e..f19f028fe24 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionOperandStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionOperandStereotypesTest.java @@ -42,7 +42,7 @@ public class InteractionOperandStereotypesTest extends BaseStereotypesTest { @Override
public void setUp() throws Exception {
super.setUp();
- CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
+ CombinedFragmentEditPart cf = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_Shape, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart)cf.getChildBySemanticHint("" + CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID);
operand = (InteractionOperandEditPart)compartment.getChildBySemanticHint("" + InteractionOperandEditPart.VISUAL_ID);
assertNotNull(operand);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionStereotypesTest.java index d22ea86fd0e..8ae75292381 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionStereotypesTest.java @@ -50,20 +50,20 @@ public class InteractionStereotypesTest extends BaseStereotypesTest { interaction = (InteractionEditPart)getRootEditPart().getParent();
assertNotNull(interaction);
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(150, 100), null);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(150, 100), null);
Rectangle lifelineBounds = getAbsoluteBounds(lifeline);
//1. messageWithGate
Point endLocation = lifelineBounds.getTop().translate(0, 100);
Point startLocation = new Point(0, endLocation.y);
- messageWithGate = (ConnectionNodeEditPart)createLink(UMLElementTypes.Message_4004, interaction.getViewer(), startLocation, interaction, endLocation, lifeline);
+ messageWithGate = (ConnectionNodeEditPart)createLink(UMLElementTypes.Message_AsynchEdge, interaction.getViewer(), startLocation, interaction, endLocation, lifeline);
assertNotNull("messageWithGate", messageWithGate);
//2. messagefound
- messageFound = (ConnectionNodeEditPart)createLink(UMLElementTypes.Message_4009, lifeline.getViewer(), endLocation.getTranslated(-100, 50), endLocation.getTranslated(0, 50));
+ messageFound = (ConnectionNodeEditPart)createLink(UMLElementTypes.Message_FoundEdge, lifeline.getViewer(), endLocation.getTranslated(-100, 50), endLocation.getTranslated(0, 50));
assertNotNull("messageFound", messageFound);
//3. messageLost
- messageLost = (ConnectionNodeEditPart)createLink(UMLElementTypes.Message_4008, lifeline.getViewer(), endLocation.getTranslated(0, -50), endLocation.getTranslated(100, -50));
+ messageLost = (ConnectionNodeEditPart)createLink(UMLElementTypes.Message_LostEdge, lifeline.getViewer(), endLocation.getTranslated(0, -50), endLocation.getTranslated(100, -50));
assertNotNull("messageLost", messageLost);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionUseStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionUseStereotypesTest.java index e36247957a3..a01df5adb90 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionUseStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/InteractionUseStereotypesTest.java @@ -38,7 +38,7 @@ public class InteractionUseStereotypesTest extends BaseStereotypesTest { @Override
public void setUp() throws Exception {
super.setUp();
- interactionUse = (InteractionUseEditPart)createNode(UMLElementTypes.InteractionUse_3002, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
+ interactionUse = (InteractionUseEditPart)createNode(UMLElementTypes.InteractionUse_Shape, getRootEditPart(), new Point(100, 100), new Dimension(200, 100));
assertNotNull(interactionUse);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/LifelineStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/LifelineStereotypesTest.java index 26e3b4f3ea4..4f18a062d60 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/LifelineStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/LifelineStereotypesTest.java @@ -43,14 +43,14 @@ public class LifelineStereotypesTest extends BaseStereotypesTest { @Override
public void setUp() throws Exception {
super.setUp();
- lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline);
- LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(400, 100), null);
+ LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(400, 100), null);
Point start = SequenceUtil.getAbsoluteBounds(lifeline).getTop().translate(0, 50);
Point end = SequenceUtil.getAbsoluteBounds(lifeline2).getTop().translate(0, 50);
alignVertically(start, end);
- link = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline2.getViewer(), start, lifeline, end, lifeline2);
+ link = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_AsynchEdge, lifeline2.getViewer(), start, lifeline, end, lifeline2);
assertNotNull("link", link);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/MessageStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/MessageStereotypesTest.java index 79365955ee2..275ee60569c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/MessageStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/MessageStereotypesTest.java @@ -41,85 +41,85 @@ public class MessageStereotypesTest extends BaseStereotypesTest { @Test
public void testSynchronousMessage() {
- LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline1);
- ActionExecutionSpecificationEditPart source = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline1, getAbsoluteBounds(lifeline1).getTop().translate(0, 50), null);
+ ActionExecutionSpecificationEditPart source = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline1, getAbsoluteBounds(lifeline1).getTop().translate(0, 50), null);
assertNotNull(source);
- LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(lifeline2);
- ActionExecutionSpecificationEditPart target = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline2, getAbsoluteBounds(lifeline2).getTop().translate(0, 50), null);
+ ActionExecutionSpecificationEditPart target = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline2, getAbsoluteBounds(lifeline2).getTop().translate(0, 50), null);
assertNotNull(target);
- MessageEditPart message = (MessageEditPart)createLink(UMLElementTypes.Message_4003, lifeline1.getViewer(), getAbsoluteCenter(source), getAbsoluteCenter(target));
+ MessageEditPart message = (MessageEditPart)createLink(UMLElementTypes.Message_SynchEdge, lifeline1.getViewer(), getAbsoluteCenter(source), getAbsoluteCenter(target));
assertNotNull(message);
doTest(message);
}
@Test
public void testAsynchronousMessage() {
- LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(source);
- LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(target);
- Message2EditPart message = (Message2EditPart)createLink(UMLElementTypes.Message_4004, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
+ Message2EditPart message = (Message2EditPart)createLink(UMLElementTypes.Message_AsynchEdge, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
assertNotNull(message);
doTest(message);
}
@Test
public void testCreateMessage() {
- LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(source);
- LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(target);
- Message4EditPart message = (Message4EditPart)createLink(UMLElementTypes.Message_4006, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
+ Message4EditPart message = (Message4EditPart)createLink(UMLElementTypes.Message_CreateEdge, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
assertNotNull(message);
doTest(message);
}
@Test
public void testReplyMessage() {
- LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(lifeline1);
- ActionExecutionSpecificationEditPart source = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline1, getAbsoluteBounds(lifeline1).getTop().translate(0, 50), null);
+ ActionExecutionSpecificationEditPart source = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline1, getAbsoluteBounds(lifeline1).getTop().translate(0, 50), null);
assertNotNull(source);
- LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(lifeline2);
- ActionExecutionSpecificationEditPart target = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline2, getAbsoluteBounds(lifeline1).getTop().translate(0, 150), null);
+ ActionExecutionSpecificationEditPart target = (ActionExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline2, getAbsoluteBounds(lifeline1).getTop().translate(0, 150), null);
assertNotNull(target);
- Message3EditPart message = (Message3EditPart)createLink(UMLElementTypes.Message_4005, source.getViewer(), getAbsoluteCenter(source), getAbsoluteCenter(target));
+ Message3EditPart message = (Message3EditPart)createLink(UMLElementTypes.Message_ReplyEdge, source.getViewer(), getAbsoluteCenter(source), getAbsoluteCenter(target));
assertNotNull(message);
doTest(message);
}
@Test
public void testFoundMessage() {
- LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(target);
Point targetLocation = getAbsoluteBounds(target).getTop().translate(0, 50);
Point sourceLocation = targetLocation.getTranslated(-100, 0);
- Message7EditPart message = (Message7EditPart)createLink(UMLElementTypes.Message_4009, target.getViewer(), sourceLocation, targetLocation);
+ Message7EditPart message = (Message7EditPart)createLink(UMLElementTypes.Message_FoundEdge, target.getViewer(), sourceLocation, targetLocation);
assertNotNull(message);
doTest(message);
}
@Test
public void testLostMessage() {
- LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(source);
Point sourceLocation = getAbsoluteBounds(source).getTop().translate(0, 50);
Point targetLocation = sourceLocation.getTranslated(100, 0);
- Message6EditPart message = (Message6EditPart)createLink(UMLElementTypes.Message_4008, source.getViewer(), sourceLocation, targetLocation);
+ Message6EditPart message = (Message6EditPart)createLink(UMLElementTypes.Message_LostEdge, source.getViewer(), sourceLocation, targetLocation);
assertNotNull(message);
doTest(message);
}
@Test
public void testDeleteMessage() {
- LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ LifelineEditPart source = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(source);
- LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), null);
+ LifelineEditPart target = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(300, 100), null);
assertNotNull(target);
- Message5EditPart message = (Message5EditPart)createLink(UMLElementTypes.Message_4007, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
+ Message5EditPart message = (Message5EditPart)createLink(UMLElementTypes.Message_DeleteEdge, source.getViewer(), getAbsoluteBounds(source).getTop().translate(0, 50), getAbsoluteBounds(target).getTop().translate(0, 50));
assertNotNull(message);
doTest(message);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayBehaviorForBehaviorExecutionSpecification_417376.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayBehaviorForBehaviorExecutionSpecification_417376.java index 8815b68d757..6081543c2ac 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayBehaviorForBehaviorExecutionSpecification_417376.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayBehaviorForBehaviorExecutionSpecification_417376.java @@ -121,9 +121,9 @@ public class New_DisplayBehaviorForBehaviorExecutionSpecification_417376 extends @Override
public void setUp() throws Exception {
super.setUp();
- EditPart lifeline = createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ EditPart lifeline = createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull("lifeline", lifeline);
- behaviorExecutionSpecificationEditPart = (BehaviorExecutionSpecificationEditPart)createNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifeline, new Point(131, 150), null);
+ behaviorExecutionSpecificationEditPart = (BehaviorExecutionSpecificationEditPart)createNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifeline, new Point(131, 150), null);
assertNotNull("execution", behaviorExecutionSpecificationEditPart);
EObject element = behaviorExecutionSpecificationEditPart.resolveSemanticElement();
assertNotNull("element", element);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayInvariantForStateInvariant_417377.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayInvariantForStateInvariant_417377.java index d36f199d2a2..422acb6899c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayInvariantForStateInvariant_417377.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/New_DisplayInvariantForStateInvariant_417377.java @@ -69,9 +69,9 @@ public class New_DisplayInvariantForStateInvariant_417377 extends AbstractNodeTe @Override
public void setUp() throws Exception {
super.setUp();
- EditPart lifeline = createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
+ EditPart lifeline = createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull("lifeline", lifeline);
- stateInvarintEditPart = (StateInvariantEditPart)createNode(UMLElementTypes.StateInvariant_3017, lifeline, new Point(131, 150), null);
+ stateInvarintEditPart = (StateInvariantEditPart)createNode(UMLElementTypes.StateInvariant_Shape, lifeline, new Point(131, 150), null);
assertNotNull("stateInvariant", stateInvarintEditPart);
stateInvariant = (StateInvariant)stateInvarintEditPart.resolveSemanticElement();
assertNotNull("uml element", stateInvariant);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/StateInvariantStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/StateInvariantStereotypesTest.java index c3b5b60918b..744a0c49f8b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/StateInvariantStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/StateInvariantStereotypesTest.java @@ -39,8 +39,8 @@ public class StateInvariantStereotypesTest extends BaseStereotypesTest { @Override
public void setUp() throws Exception {
super.setUp();
- LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
- stateInvariant = (StateInvariantEditPart)createNode(UMLElementTypes.StateInvariant_3017, lifeline, new Point(131, 150), null);
+ LifelineEditPart lifeline = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
+ stateInvariant = (StateInvariantEditPart)createNode(UMLElementTypes.StateInvariant_Shape, lifeline, new Point(131, 150), null);
assertNotNull(stateInvariant);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeConstraintStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeConstraintStereotypesTest.java index 8aee35edd9c..b6590b53caa 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeConstraintStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeConstraintStereotypesTest.java @@ -44,10 +44,10 @@ public class TimeConstraintStereotypesTest extends BaseStereotypesTest { @Override
public void setUp() throws Exception {
super.setUp();
- EditPart lifeline = createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), null);
- AbstractExecutionSpecificationEditPart es = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline, new Point(131, 100), null);
+ EditPart lifeline = createNode(UMLElementTypes.Lifeline_Shape, getRootEditPart(), new Point(100, 100), null);
+ AbstractExecutionSpecificationEditPart es = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifeline, new Point(131, 100), null);
Point location = SequenceUtil.getAbsoluteBounds(es).getTop().getCopy();
- timeObservation = (TimeObservationEditPart)createNode(UMLElementTypes.TimeObservation_3020, getRootEditPart(), location, null);
+ timeObservation = (TimeObservationEditPart)createNode(UMLElementTypes.TimeObservation_Shape, getRootEditPart(), location, null);
assertNotNull(timeObservation);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeObservationStereotypesTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeObservationStereotypesTest.java index deb3d61284c..610d751011e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeObservationStereotypesTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/TimeObservationStereotypesTest.java @@ -41,7 +41,7 @@ public class TimeObservationStereotypesTest extends BaseStereotypesTest { @Override
public void setUp() throws Exception {
super.setUp();
- timeObservation = (TimeObservationEditPart)createNode(UMLElementTypes.TimeObservation_3020, getRootEditPart(), new Point(100, 100), null);
+ timeObservation = (TimeObservationEditPart)createNode(UMLElementTypes.TimeObservation_Shape, getRootEditPart(), new Point(100, 100), null);
assertNotNull(timeObservation);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java index 626495f908e..974b7955656 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java @@ -58,17 +58,17 @@ public class TestCombinedFragmentChildNode extends TestChildNode { @Test
public void testToManageOperand() {
- testToManageChildNode(UMLElementTypes.InteractionOperand_3005, combinedFragmentProvider);
+ testToManageChildNode(UMLElementTypes.InteractionOperand_Shape, combinedFragmentProvider);
}
@Test
public void testToManageContinuation() {
- testToManageChildNode(UMLElementTypes.Continuation_3016, operandProvider);
+ testToManageChildNode(UMLElementTypes.Continuation_Shape, operandProvider);
}
@Override
protected CreateViewRequest createViewRequestShapeContainer() {
- return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.CombinedFragment_3004, getDiagramEditPart().getDiagramPreferencesHint());
+ return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.CombinedFragment_Shape, getDiagramEditPart().getDiagramPreferencesHint());
}
@Override
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramChildNode.java index 633bd608f72..58e9a230e3f 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramChildNode.java @@ -48,7 +48,7 @@ public class TestSequenceDiagramChildNode extends TestChildNode { @Override
protected CreateViewRequest createViewRequestShapeContainer() {
- return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Lifeline_3001, getDiagramEditPart().getDiagramPreferencesHint());
+ return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Lifeline_Shape, getDiagramEditPart().getDiagramPreferencesHint());
}
@Override
@@ -68,48 +68,48 @@ public class TestSequenceDiagramChildNode extends TestChildNode { @Test
public void testToManageActionExecution() {
- testToManageChildNode(UMLElementTypes.ActionExecutionSpecification_3006, lifelineProvider);
+ testToManageChildNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifelineProvider);
}
@Test
public void testToManageBehaviorExecution() {
- testToManageChildNode(UMLElementTypes.BehaviorExecutionSpecification_3003, lifelineProvider);
+ testToManageChildNode(UMLElementTypes.BehaviorExecutionSpecification_Shape, lifelineProvider);
}
@Test
public void testToManageDestructionOccurrence() {
- testToManageChildNode(UMLElementTypes.DestructionOccurrenceSpecification_3022, lifelineProvider);
+ testToManageChildNode(UMLElementTypes.DestructionOccurrenceSpecification_Shape, lifelineProvider);
}
@Test
public void testToManageCoRegion() {
semanticChild = false;
- testToManageChildNode(UMLElementTypes.CombinedFragment_3018, lifelineProvider);
+ testToManageChildNode(UMLElementTypes.CombinedFragment_CoRegionShape, lifelineProvider);
semanticChild = true;
}
@Test
public void testToManageStateInvariant() {
semanticChild = false;
- testToManageChildNode(UMLElementTypes.StateInvariant_3017, lifelineProvider);
+ testToManageChildNode(UMLElementTypes.StateInvariant_Shape, lifelineProvider);
semanticChild = true;
}
@Test
public void testToManageTimeConstraint() {
- createChildNode(UMLElementTypes.ActionExecutionSpecification_3006, lifelineProvider);
+ createChildNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifelineProvider);
semanticChild = false;
- testToManageChildNode(UMLElementTypes.TimeConstraint_3019, executionProvider);
+ testToManageChildNode(UMLElementTypes.TimeConstraint_Shape, executionProvider);
semanticChild = true;
}
@Test
public void testToManageDurationConstraint() {
- createChildNode(UMLElementTypes.ActionExecutionSpecification_3006, lifelineProvider);
+ createChildNode(UMLElementTypes.ActionExecutionSpecification_Shape, lifelineProvider);
semanticChild = false;
- testToCreateChildNode(UMLElementTypes.ActionExecutionSpecification_3006, executionProvider);
+ testToCreateChildNode(UMLElementTypes.ActionExecutionSpecification_Shape, executionProvider);
{
//DESTROY SEMANTIC+ VIEW
IChildTestProvider provider = executionProvider;
@@ -133,7 +133,7 @@ public class TestSequenceDiagramChildNode extends TestChildNode { getEMFCommandStack().undo();
// the node and the UML element are present
- testViewDeletion(UMLElementTypes.ActionExecutionSpecification_3006, executionProvider);
+ testViewDeletion(UMLElementTypes.ActionExecutionSpecification_Shape, executionProvider);
semanticChild = true;
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramLink.java index 3283b29df56..95989fe13b5 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramLink.java @@ -53,65 +53,65 @@ public class TestSequenceDiagramLink extends TestLink { @Test
public void testToManageGeneralOrdering() {
- testToManageLink(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.GeneralOrdering_4012, executionProvider, false);
+ testToManageLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.GeneralOrdering_Edge, executionProvider, false);
}
@Test
public void testToManageMessageSync_4003() {
- testToManageLink(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4003, executionProvider, false);
+ testToManageLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_SynchEdge, executionProvider, false);
}
@Test
public void testToManageMessageReply_4005() {
- testToManageLink(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4005, executionProvider, false);
+ testToManageLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_ReplyEdge, executionProvider, false);
}
@Test
public void testToManageMessageFound_4009() {
- installEnvironment(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, lifelineProvider);
+ installEnvironment(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, lifelineProvider);
source = (GraphicalEditPart)source.getParent().getParent();
- testToCreateALink(UMLElementTypes.Message_4009, lifelineProvider);
+ testToCreateALink(UMLElementTypes.Message_FoundEdge, lifelineProvider);
- testDestroy(UMLElementTypes.Message_4009, lifelineProvider);
+ testDestroy(UMLElementTypes.Message_FoundEdge, lifelineProvider);
getEMFCommandStack().undo();
- testViewDeletion(UMLElementTypes.Message_4009, lifelineProvider);
+ testViewDeletion(UMLElementTypes.Message_FoundEdge, lifelineProvider);
}
@Test
public void testToManageMessageLost_4008() {
- installEnvironment(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, lifelineProvider);
+ installEnvironment(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, lifelineProvider);
target = (GraphicalEditPart)target.getParent().getParent();
- testToCreateALink(UMLElementTypes.Message_4008, lifelineProvider);
+ testToCreateALink(UMLElementTypes.Message_LostEdge, lifelineProvider);
- testDestroy(UMLElementTypes.Message_4008, lifelineProvider);
+ testDestroy(UMLElementTypes.Message_LostEdge, lifelineProvider);
getEMFCommandStack().undo();
- testViewDeletion(UMLElementTypes.Message_4008, lifelineProvider);
+ testViewDeletion(UMLElementTypes.Message_LostEdge, lifelineProvider);
}
@Test
public void testToManageCommentLink() {
- testToManageLink(UMLElementTypes.Comment_3009, UMLElementTypes.Lifeline_3001, UMLElementTypes.CommentAnnotatedElement_4010, lifelineProvider, true);
+ testToManageLink(UMLElementTypes.Comment_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Comment_AnnotatedElementEdge, lifelineProvider, true);
}
@Test
public void testToManageConstraintLink() {
- testToManageLink(UMLElementTypes.Constraint_3008, UMLElementTypes.Lifeline_3001, UMLElementTypes.ConstraintConstrainedElement_4011, lifelineProvider, true);
+ testToManageLink(UMLElementTypes.Constraint_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Constraint_ConstrainedElementEdge, lifelineProvider, true);
}
@Test
public void testToManageMessageAsync_4004() {
- testToManageLink(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4004, lifelineProvider, true);
+ testToManageLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_AsynchEdge, lifelineProvider, true);
}
@Test
public void testToManageMessageDelete_4007() {
- testToManageLink(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4007, lifelineProvider, true);
+ testToManageLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_DeleteEdge, lifelineProvider, true);
}
@Test
public void testToManageMessageCreate_4006() {
- testToManageLink(UMLElementTypes.Lifeline_3001, UMLElementTypes.Lifeline_3001, UMLElementTypes.Message_4006, lifelineProvider, false);
+ testToManageLink(UMLElementTypes.Lifeline_Shape, UMLElementTypes.Lifeline_Shape, UMLElementTypes.Message_CreateEdge, lifelineProvider, false);
}
@Override
@@ -179,7 +179,7 @@ public class TestSequenceDiagramLink extends TestLink { }
public void setUp() {
- IElementType childNodeType = UMLElementTypes.ActionExecutionSpecification_3006;
+ IElementType childNodeType = UMLElementTypes.ActionExecutionSpecification_Shape;
source = createSubNode(source, childNodeType, getChildLocation(source));
sourcePlayer = createSubNode(sourcePlayer, childNodeType, getChildLocation(sourcePlayer));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramTopNode.java index 1776a2deeb5..b994db67c41 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramTopNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramTopNode.java @@ -40,7 +40,7 @@ public class TestSequenceDiagramTopNode extends TestTopNode { @Test
public void testToManageLifeline() {
- testToManageTopNode(UMLElementTypes.Lifeline_3001, provider);
+ testToManageTopNode(UMLElementTypes.Lifeline_Shape, provider);
}
/**
@@ -48,7 +48,7 @@ public class TestSequenceDiagramTopNode extends TestTopNode { */
@Test
public void testToManageConstraint() {
- testToManageTopNode(UMLElementTypes.Constraint_3008, provider);
+ testToManageTopNode(UMLElementTypes.Constraint_Shape, provider);
}
/**
@@ -56,18 +56,18 @@ public class TestSequenceDiagramTopNode extends TestTopNode { */
@Test
public void testToManageComment() {
- testToManageTopNode(UMLElementTypes.Comment_3009, provider);
+ testToManageTopNode(UMLElementTypes.Comment_Shape, provider);
}
@Test
public void testToManageInteractionUse() {
- testToManageTopNode(UMLElementTypes.InteractionUse_3002, provider);
+ testToManageTopNode(UMLElementTypes.InteractionUse_Shape, provider);
}
// @Test
// public void testToManageConsiderIgnoreFragment() { // popup menu when delete
// PopupUtil.addMenuListener(0);
- // testToManageTopNode(UMLElementTypes.ConsiderIgnoreFragment_3007, provider);
+ // testToManageTopNode(UMLElementTypes.ConsiderIgnoreFragment_Shape, provider);
//
// waitForComplete();
// PopupUtil.removeMenuListener();
@@ -76,7 +76,7 @@ public class TestSequenceDiagramTopNode extends TestTopNode { // @Test
// public void testToManageCombinedFragment() { // popup menu when delete
// PopupUtil.addMenuListener(0);
- // testToManageTopNode(UMLElementTypes.CombinedFragment_3004, provider);
+ // testToManageTopNode(UMLElementTypes.CombinedFragment_Shape, provider);
//
// waitForComplete();
// PopupUtil.removeMenuListener();
@@ -84,12 +84,12 @@ public class TestSequenceDiagramTopNode extends TestTopNode { @Test
public void testToManageTimeObservation() {
- testToManageTopNode(UMLElementTypes.TimeObservation_3020, observationProvider);
+ testToManageTopNode(UMLElementTypes.TimeObservation_Shape, observationProvider);
}
@Test
public void testToManageDurationObservation() {
- testToManageTopNode(UMLElementTypes.DurationObservation_3024, observationProvider);
+ testToManageTopNode(UMLElementTypes.DurationObservation_Shape, observationProvider);
}
ITestProvider provider = new ITestProvider() {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestLinks.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestLinks.java index 1d5e63189bf..5a68e77b961 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestLinks.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestLinks.java @@ -43,7 +43,7 @@ public class TestLinks extends TestStateMachineLink { IGraphicalEditPart constraint = createChild(ConstraintEditPart.VISUAL_ID, getRegionCompartmentEditPart()); IGraphicalEditPart state = createChild(StateEditPart.VISUAL_ID, getRegionCompartmentEditPart()); - Command endCommand = createLinkCommand(constraint, state, UMLElementTypes.ConstraintConstrainedElement_670); + Command endCommand = createLinkCommand(constraint, state, UMLElementTypes.Constraint_ConstrainedElementEdge); Assert.assertNotNull(endCommand); Assert.assertTrue(endCommand.canExecute()); @@ -60,7 +60,7 @@ public class TestLinks extends TestStateMachineLink { IGraphicalEditPart constraint = createChild(ConstraintEditPart.VISUAL_ID, getRegionCompartmentEditPart()); IGraphicalEditPart state = createChild(StateEditPart.VISUAL_ID, getRegionCompartmentEditPart()); - Command endCommand = createLinkCommand(constraint, state, UMLElementTypes.ConstraintContext_8500); + Command endCommand = createLinkCommand(constraint, state, UMLElementTypes.Constraint_ContextEdge); Assert.assertNotNull(endCommand); Assert.assertTrue(endCommand.canExecute()); @@ -76,7 +76,7 @@ public class TestLinks extends TestStateMachineLink { IGraphicalEditPart comment = createChild(CommentEditPart.VISUAL_ID, getRegionCompartmentEditPart()); IGraphicalEditPart state = createChild(StateEditPart.VISUAL_ID, getRegionCompartmentEditPart()); - Command endCommand = createLinkCommand(comment, state, UMLElementTypes.CommentAnnotatedElement_667); + Command endCommand = createLinkCommand(comment, state, UMLElementTypes.Comment_AnnotatedElementEdge); executeOnUIThread(endCommand); Assert.assertEquals(1, getDiagramEditPart().getConnections().size()); @@ -90,7 +90,7 @@ public class TestLinks extends TestStateMachineLink { */ @Test public void testCommentLinkCannotBeStarted() { - IElementType link = UMLElementTypes.CommentAnnotatedElement_667; + IElementType link = UMLElementTypes.Comment_AnnotatedElementEdge; ckeckCannotStartConnectionCommand(link, PseudostateChoiceEditPart.VISUAL_ID, PseudostateEntryPointEditPart.VISUAL_ID, @@ -105,7 +105,7 @@ public class TestLinks extends TestStateMachineLink { */ @Test public void testConstraintContextLinkCannotBeStarted() { - IElementType link = UMLElementTypes.ConstraintContext_8500; + IElementType link = UMLElementTypes.Constraint_ContextEdge; ckeckCannotStartConnectionCommand(link, PseudostateShallowHistoryEditPart.VISUAL_ID, CommentEditPart.VISUAL_ID, @@ -119,7 +119,7 @@ public class TestLinks extends TestStateMachineLink { */ @Test public void testConstraintConstrainedElementLinkCannotBeStarted() { - IElementType link = UMLElementTypes.ConstraintConstrainedElement_670; + IElementType link = UMLElementTypes.Constraint_ConstrainedElementEdge; ckeckCannotStartConnectionCommand(link, PseudostateExitPointEditPart.VISUAL_ID, CommentEditPart.VISUAL_ID, @@ -142,7 +142,7 @@ public class TestLinks extends TestStateMachineLink { } Assert.assertNotNull(commentEP2); - Command endCommand = createLinkCommand(commentEP1, pseudostateEP, UMLElementTypes.CommentAnnotatedElement_667); + Command endCommand = createLinkCommand(commentEP1, pseudostateEP, UMLElementTypes.Comment_AnnotatedElementEdge); executeOnUIThread(endCommand); Assert.assertEquals(1, getDiagramEditPart().getConnections().size()); @@ -181,7 +181,7 @@ public class TestLinks extends TestStateMachineLink { } Assert.assertNotNull(constraintEP2); - Command endCommand = createLinkCommand(constraintEP1, finalStateEP, UMLElementTypes.ConstraintConstrainedElement_670); + Command endCommand = createLinkCommand(constraintEP1, finalStateEP, UMLElementTypes.Constraint_ConstrainedElementEdge); executeOnUIThread(endCommand); Assert.assertEquals(1, getDiagramEditPart().getConnections().size()); @@ -222,7 +222,7 @@ public class TestLinks extends TestStateMachineLink { } Assert.assertNotNull(constraintEP2); - Command endCommand = createLinkCommand(constraintEP1, stateEP, UMLElementTypes.ConstraintContext_8500); + Command endCommand = createLinkCommand(constraintEP1, stateEP, UMLElementTypes.Constraint_ContextEdge); executeOnUIThread(endCommand); Assert.assertEquals(1, getDiagramEditPart().getConnections().size()); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineContextLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineContextLink.java index 7622ad2ab5d..dca5fe15659 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineContextLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineContextLink.java @@ -56,7 +56,7 @@ public class TestStateMachineContextLink extends TestContextLink { @Test public void testToManageContextLink() { - manageContextLink(UMLElementTypes.Constraint_668, UMLElementTypes.State_6000, UMLElementTypes.ConstraintContext_8500, UMLElementTypes.StateMachine_2000); + manageContextLink(UMLElementTypes.Constraint_Shape, UMLElementTypes.State_Shape, UMLElementTypes.Constraint_ContextEdge, UMLElementTypes.StateMachine_Shape); } @Override diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineDiagramChildNode.java index 965b25136a1..6fa8eb840c5 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineDiagramChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestStateMachineDiagramChildNode.java @@ -70,77 +70,77 @@ public class TestStateMachineDiagramChildNode extends AbstractSMTestChildNode { @Test
@InvalidTest
public void testToRegion() {
- testToManageNode(UMLElementTypes.Region_3000, UMLPackage.eINSTANCE.getRegion(), UMLElementTypes.Region_3000, false);
+ testToManageNode(UMLElementTypes.Region_Shape, UMLPackage.eINSTANCE.getRegion(), UMLElementTypes.Region_Shape, false);
}
/**
* Test to manage FinalState.
*/
@Test
public void testToFinalState() {
- testToManageNode(UMLElementTypes.FinalState_5000, UMLPackage.eINSTANCE.getFinalState(), UMLElementTypes.Region_3000, false);
+ testToManageNode(UMLElementTypes.FinalState_Shape, UMLPackage.eINSTANCE.getFinalState(), UMLElementTypes.Region_Shape, false);
}
/**
* Test to manage State.
*/
@Test
public void testToState() {
- testToManageNode(UMLElementTypes.State_6000, UMLPackage.eINSTANCE.getState(), UMLElementTypes.Region_3000, false);
+ testToManageNode(UMLElementTypes.State_Shape, UMLPackage.eINSTANCE.getState(), UMLElementTypes.Region_Shape, false);
}
/**
* Test to manage Pseudostate.
*/
@Test
public void testToPseudostate8000() {
- testToManageNode(UMLElementTypes.Pseudostate_8000, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_3000, false);
+ testToManageNode(UMLElementTypes.Pseudostate_InitialShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
}
/**
* Test to manage Pseudostate.
*/
@Test
public void testToPseudostate9000() {
- testToManageNode(UMLElementTypes.Pseudostate_9000, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_3000, false);
+ testToManageNode(UMLElementTypes.Pseudostate_JoinShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
}
/**
* Test to manage Pseudostate.
*/
@Test
public void testToPseudostate10000() {
- testToManageNode(UMLElementTypes.Pseudostate_10000, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_3000, false);
+ testToManageNode(UMLElementTypes.Pseudostate_ForkShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
}
/**
* Test to manage Pseudostate.
*/
@Test
public void testToPseudostate1100() {
- testToManageNode(UMLElementTypes.Pseudostate_11000, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_3000, false);
+ testToManageNode(UMLElementTypes.Pseudostate_ChoiceShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
}
/**
* Test to manage Pseudostate.
*/
@Test
public void testToPseudostate12000() {
- testToManageNode(UMLElementTypes.Pseudostate_12000, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_3000, false);
+ testToManageNode(UMLElementTypes.Pseudostate_JunctionShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
}
/**
* Test to manage Pseudostate.
*/
@Test
public void testToPseudostate13000() {
- testToManageNode(UMLElementTypes.Pseudostate_13000, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_3000, false);
+ testToManageNode(UMLElementTypes.Pseudostate_ShallowHistoryShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
}
/**
* Test to manage Pseudostate.
*/
@Test
public void testToPseudostate14000() {
- testToManageNode(UMLElementTypes.Pseudostate_14000, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_3000, false);
+ testToManageNode(UMLElementTypes.Pseudostate_DeepHistoryShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
}
/**
* Test to manage Pseudostate.
*/
@Test
public void testToPseudostate15000() {
- testToManageNode(UMLElementTypes.Pseudostate_15000, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_3000, false);
+ testToManageNode(UMLElementTypes.Pseudostate_TerminateShape, UMLPackage.eINSTANCE.getPseudostate(), UMLElementTypes.Region_Shape, false);
}
/**
* Test to manage Comment.
@@ -148,7 +148,7 @@ public class TestStateMachineDiagramChildNode extends AbstractSMTestChildNode { @Test
@InvalidTest
public void testToComment() {
- testToManageNode(UMLElementTypes.Comment_666, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Region_3000, false);
+ testToManageNode(UMLElementTypes.Comment_Shape, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Region_Shape, false);
}
/**
* Test to manage Constraint.
@@ -156,6 +156,6 @@ public class TestStateMachineDiagramChildNode extends AbstractSMTestChildNode { @Test
@InvalidTest
public void testToConstraint() {
- testToManageNode(UMLElementTypes.Constraint_668, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Region_3000, false);
+ testToManageNode(UMLElementTypes.Constraint_Shape, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Region_Shape, false);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestTransitionLinks.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestTransitionLinks.java index 1866d3e7a1c..7079cf1bccd 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestTransitionLinks.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/canonical/TestTransitionLinks.java @@ -42,12 +42,12 @@ public class TestTransitionLinks extends TestStateMachineLink { @Test public void testEntryPointTransitionLink() { - testChildPseudostateTransitionLink(UMLElementTypes.Pseudostate_16000); + testChildPseudostateTransitionLink(UMLElementTypes.Pseudostate_EntryPointShape); } @Test public void testExitPointTransitionLink() { - testChildPseudostateTransitionLink(UMLElementTypes.Pseudostate_17000); + testChildPseudostateTransitionLink(UMLElementTypes.Pseudostate_ExitPointShape); } private void testChildPseudostateTransitionLink(IElementType elementType) { @@ -83,7 +83,7 @@ public class TestTransitionLinks extends TestStateMachineLink { */ @Test public void testTransitionLinkCannotBeStarted() { - ckeckCannotStartConnectionCommand(UMLElementTypes.Transition_7000, CommentEditPart.VISUAL_ID, ConstraintEditPart.VISUAL_ID); + ckeckCannotStartConnectionCommand(UMLElementTypes.Transition_Edge, CommentEditPart.VISUAL_ID, ConstraintEditPart.VISUAL_ID); } @Test @@ -106,7 +106,7 @@ public class TestTransitionLinks extends TestStateMachineLink { } private TransitionEditPart checkTransitionLink(IGraphicalEditPart source, IGraphicalEditPart target, int expectedConnections) { - Command endCommand = createLinkCommand(source, target, UMLElementTypes.Transition_7000); + Command endCommand = createLinkCommand(source, target, UMLElementTypes.Transition_Edge); Assert.assertNotNull(endCommand); Assert.assertTrue(endCommand.canExecute()); executeOnUIThread(endCommand); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/generation/CustomSynchronizationTestTemplate.xtend b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/generation/CustomSynchronizationTestTemplate.xtend index 8199f52e7ac..6b2fc2de719 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/generation/CustomSynchronizationTestTemplate.xtend +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/src/org/eclipse/papyrus/uml/diagram/statemachine/tests/generation/CustomSynchronizationTestTemplate.xtend @@ -28,7 +28,7 @@ class CustomSynchronizationTestTemplate extends SynchronizationTestTemplate { def customCreateSemanticElement(Class class_) ''' @Override protected «'org.eclipse.emf.ecore.EObject'.imported» createSemanticElement(«'org.eclipse.gmf.runtime.emf.type.core.IElementType'.imported» elementType, EObject container) { - if (elementType.equals(«class_.umlElementTypes».StateMachine_2000)) { + if (elementType.equals(«class_.umlElementTypes».StateMachine_Shape)) { // Return the already existing state machine return container; } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotype.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotype.java index 867d220f311..e532a68f7bf 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotype.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotype.java @@ -1,368 +1,368 @@ -/*****************************************************************************
- * Copyright (c) 2012, 2014 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- * Christian W. Damus (CEA) - bug 434594
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.stereotypeproperty;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.junit.framework.classification.InvalidTest;
-import org.eclipse.papyrus.junit.utils.DisplayUtils;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeCompartmentFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AutomaticCompartmentLayoutManager;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayCommandExecution;
-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
-import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Profile;
-import org.eclipse.uml2.uml.Stereotype;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * the purpose of this class is to test the layout
- *
- */
-public class TestLayoutWithStereotype extends AbstractPapyrusTestCase {
-
- protected static final String ST_LEFT = String.valueOf("\u00AB");
-
- protected static final String ST_RIGHT = String.valueOf("\u00BB");
-
- private static final String TEST_PROFILE_STEREOTYPE3 = "testProfile::Stereotype3";
-
- @InvalidTest("Works on Windows, Fails on Linux")
- @Test
- public void testLayoutOnClass() {
- testToCreateANodeWithoutStereotype(UMLElementTypes.Class_2008);
- }
-
- @InvalidTest("Works on Windows, Fails on Linux")
- @Test
- public void testLayoutStereotypeApplicationOnClass() {
- testToCreateANodeWithStereotype(UMLElementTypes.Class_2008);
- }
-
- /**
- * Test to create a node without Stereotype
- *
- * @param type
- * the type
- */
-
- public void testToCreateANodeWithoutStereotype(IElementType type) {
-
- org.eclipse.uml2.uml.Class class1;
- View notationClass1;
- ClassifierFigure class1figure;
- GraphicalEditPart classEditPart;
- createTheClass(type);
-
-
- // ******************************************** Test of the class without stereotype********************************************
- // get the created Class
- class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");
- assertNotNull("created class must be not null", class1);
- // look for the editpart that the class
- classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);
- // test if stereotype can be applied
- assertTrue("Stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null);
-
-
- // look for the applied stereotype compartment
- notationClass1 = classEditPart.getNotationView();
- {// execution of the command
- SetBoundsCommand resizeCommand = new SetBoundsCommand(diagramEditor.getEditingDomain(), "resize", new EObjectAdapter(notationClass1), new Rectangle(0, 0, 200, 200));
-
- assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, resizeCommand.canExecute() == true);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(new ICommandProxy(resizeCommand));
- }
- {// test about the layout
- org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);
- // now verify position of each subfigure
- class1figure = ((ClassifierFigure) nodePlate.getChildren().get(0));
- class1figure.setBounds(new Rectangle(0, 0, 200, 200));
- assertEquals("The figure of class1 is not an automaticCompartmentLayoutManager", AutomaticCompartmentLayoutManager.class, class1figure.getLayoutManager().getClass());
- class1figure.getLayoutManager().layout(class1figure);
- assertDimension("The figure of the Class ", 0, 0, 200, 200, class1figure);
-
- // At this moment the class figure must contain 4 sub-figures 1label+ 3compartments
- assertEquals("The number of figure children must be equal to 4", 4, class1figure.getChildren().size());
-
- // wrappinglabel for name
- assertEquals("The sub figure [0] is not a wrapping label", PapyrusWrappingLabel.class, class1figure.getChildren().get(0).getClass());
- WrappingLabel labelClass = (WrappingLabel) class1figure.getChildren().get(0);
- assertDimension("The figure of the Class ", 0, 3, 200, 16, labelClass);
- assertEquals("The label of the Class does not display Class1", "Class1", labelClass.getText());
-
- // compartment for attribute
- assertEquals("The sub figure [1] is not a RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(1).getClass());
- RectangleFigure propertiesClass = (RectangleFigure) class1figure.getChildren().get(1);
- assertEquals("The sub figure [1] is not the attribute compartment is not a ResizableCompartmentFigure", ResizableCompartmentFigure.class, propertiesClass.getChildren().get(0).getClass());
- assertDimension("The dimension of the properties compartment is not good ", 0, 20, 200, 59, propertiesClass);
-
-
- // compartment for operation
- assertEquals("The sub figure [2] of class1 is not an RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(2).getClass());
- RectangleFigure operationsClass = (RectangleFigure) class1figure.getChildren().get(2);
- assertTrue("The sub figure [2] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure);
- assertDimension("The sub figure [2] has not the good dimension", 0, 80, 200, 59, operationsClass);
-
-
- // compartment for nested classifier
- assertEquals("The sub figure [3] of class1 is not an automaticCompartmentLayoutManager", RectangleFigure.class, class1figure.getChildren().get(3).getClass());
- RectangleFigure innerclassifiersClass = (RectangleFigure) class1figure.getChildren().get(3);
- assertTrue("The sub figure [3] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure);
- assertDimension("The sub figure [3] has not the good dimension", 0, 140, 200, 59, innerclassifiersClass);
-
- }
- }
-
-
-
- /**
- * Test to create a node without Stereotype
- *
- * @param type
- * the type
- */
-
- public void testToCreateANodeWithStereotype(IElementType type) {
- org.eclipse.uml2.uml.Class class1;
- View notationClass1;
- ClassifierFigure class1figure;
- GraphicalEditPart classEditPart;
- createTheClass(type);
-
-
- // get the created Class
- class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");
- assertNotNull("created class must be not null", class1);
- // look for the editpart that the class
- classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);
- // test if stereotype can be applied
- assertTrue("Stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null);
-
-
- // look for the applied stereotype compartment
- notationClass1 = classEditPart.getNotationView();
- {// execution of the application of the stereotype
- ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();
- stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3));
- ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());
- diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);
- assertNotEquals("No applied stereotype found on the element ", 0, class1.getAppliedStereotypes().size());
- }
-
-
- View appliedStereotypeCompartmentNotation = StereoUtil.getViewAppliedStereotypeCompartmentNotation2(notationClass1);
- View shapeCompartmentView = StereoUtil.getViewShapeCompartment2(notationClass1);
-
- // the mechanism of stereotype display is running.
- // the thread is synchronous
- assertNotEquals("No stereotype Compartment found in the notation", null, appliedStereotypeCompartmentNotation);
- assertNotEquals("No stereotype shape Compartment found in the notation", null, shapeCompartmentView);
-
-
- // ******************************************** Test of the class with stereotype Stereotype3********************************************
- // now display stereotypes
-
- {// display Stereotype3
- StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), appliedStereotypeCompartmentNotation, true, true);
-
- org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);
- DisplayUtils.flushEventLoop();
-
- // get the label
- PapyrusWrappingLabel stereotypeLabel = ((ClassifierFigure) nodePlate.getChildren().get(0)).getStereotypesLabel();
- assertNotEquals("stereotype label must be not null", null, stereotypeLabel);
- assertEquals("text of stereotype label be equals to " + ST_LEFT + "Stereotype3" + ST_RIGHT, stereotypeLabel.getText(), ST_LEFT + "Stereotype3" + ST_RIGHT);
- }
-
- {// test about the layout
- org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);
- // now verify position of each subfigure
- class1figure = ((ClassifierFigure) nodePlate.getChildren().get(0));
- class1figure.setBounds(new Rectangle(0, 0, 200, 500));
- assertEquals("The figure of class1 is not an automaticCompartmentLayoutManager", AutomaticCompartmentLayoutManager.class, class1figure.getLayoutManager().getClass());
- class1figure.getLayoutManager().layout(class1figure);
- assertDimension("The figure of the «Stereotype3»Class1", 0, 0, 200, 500, class1figure);
-
- // At this moment the class figure must contain 7 sub-figures: 1 label for stereotype+ 1label for name+ 1Compartment for properties+ 3compartments+1 figure that are nothing
- assertEquals("The number of children «Stereotype3»Class1 is not equals to 7", 7, class1figure.getChildren().size());
-
-
- // wrappingLabel for stereotype
- assertTrue("The sub figure [0] of «Stereotype3»Class1 is not a label", class1figure.getChildren().get(0) instanceof PapyrusWrappingLabel);
- PapyrusWrappingLabel stereotypelabelClass = (PapyrusWrappingLabel) class1figure.getChildren().get(0);
- assertDimension("The label of stereotype for the Class is not good", 0, 3, 200, 15, stereotypelabelClass);
- assertEquals("The label of the Class does not display " + ST_LEFT + "Stereotype3" + ST_RIGHT, ST_LEFT + "Stereotype3" + ST_RIGHT, stereotypelabelClass.getText());
-
-
- // wrappingLabel for name
- assertTrue("The name of the Class1, sub figure [1], is not a wrapping label", class1figure.getChildren().get(1) instanceof PapyrusWrappingLabel);
- PapyrusWrappingLabel labelClass = (PapyrusWrappingLabel) class1figure.getChildren().get(1);
- assertDimension("The name of the Class1, sub figure [1],is not good", 0, 19, 200, 16, labelClass);
-
- assertEquals("The label of the Class does not display Class1", labelClass.getText(), "Class1");
-
- // compartment for property of stereotype
- assertTrue("The sub figure [2] of compartment of stereotype properties «Stereotype3»Class1 is not a compartment", class1figure.getChildren().get(2) instanceof RectangleFigure);
- RectangleFigure stereotypePropertiesClass = (RectangleFigure) class1figure.getChildren().get(2);
- assertTrue("The sub figure [2] is not the attribute compartment is not a ResizableCompartmentFigure", stereotypePropertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure);
- assertDimension("The sub figure [2],is not good", 0, 36, 200, 321, stereotypePropertiesClass);
-
- // test containment of stereotype properties
- assertTrue("The sub figure [2] is not the attribute compartment is not a ResizableCompartmentFigure", stereotypePropertiesClass.getChildren().get(0) instanceof AppliedStereotypeCompartmentFigure);
- AppliedStereotypeCompartmentFigure appliedStereotypeCompartmentFigure = (AppliedStereotypeCompartmentFigure) stereotypePropertiesClass.getChildren().get(0);
- IFigure content = appliedStereotypeCompartmentFigure.getContentPane();
- assertEquals("The number of properties of stereotype to displaye equals to 18", 18, content.getChildren().size());
- assertDimension("The dimension of the stereotype property 0 is not good ", 5, 51, 241, 15, (Figure) content.getChildren().get(0));
- assertDimension("The dimension of the stereotype property 1 is not good ", 5, 66, 241, 15, (Figure) content.getChildren().get(1));
- assertDimension("The dimension of the stereotype property 2 is not good ", 5, 81, 241, 15, (Figure) content.getChildren().get(2));
- assertDimension("The dimension of the stereotype property 3 is not good ", 5, 96, 241, 15, (Figure) content.getChildren().get(3));
- assertDimension("The dimension of the stereotype property 4 is not good ", 5, 111, 241, 15, (Figure) content.getChildren().get(4));
- assertDimension("The dimension of the stereotype property 5 is not good ", 5, 126, 241, 15, (Figure) content.getChildren().get(5));
- assertDimension("The dimension of the stereotype property 6 is not good ", 5, 141, 241, 15, (Figure) content.getChildren().get(6));
- assertDimension("The dimension of the stereotype property 7 is not good ", 5, 156, 241, 15, (Figure) content.getChildren().get(7));
- assertDimension("The dimension of the stereotype property 8 is not good ", 5, 171, 241, 15, (Figure) content.getChildren().get(8));
- assertDimension("The dimension of the stereotype property 9 is not good ", 5, 186, 241, 15, (Figure) content.getChildren().get(9));
- assertDimension("The dimension of the stereotype property 10 is not good ", 5, 201, 241, 15, (Figure) content.getChildren().get(10));
- assertDimension("The dimension of the stereotype property 11 is not good ", 5, 216, 241, 15, (Figure) content.getChildren().get(11));
- assertDimension("The dimension of the stereotype property 12 is not good ", 5, 231, 241, 15, (Figure) content.getChildren().get(12));
- assertDimension("The dimension of the stereotype property 13 is not good ", 5, 246, 241, 15, (Figure) content.getChildren().get(13));
- assertDimension("The dimension of the stereotype property 14 is not good ", 5, 261, 241, 15, (Figure) content.getChildren().get(14));
- assertDimension("The dimension of the stereotype property 15 is not good ", 5, 276, 241, 15, (Figure) content.getChildren().get(15));
- assertDimension("The dimension of the stereotype property 16 is not good ", 5, 291, 241, 15, (Figure) content.getChildren().get(16));
- assertDimension("The dimension of the stereotype property 17 is not good ", 5, 306, 241, 15, (Figure) content.getChildren().get(17));
-
-
-
-
- // compartment for attribute
- assertEquals("The sub figure [3] is not a RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(3).getClass());
- RectangleFigure propertiesClass = (RectangleFigure) class1figure.getChildren().get(3);
- assertEquals("The sub figure [3] is not the attribute compartment is not a ResizableCompartmentFigure", ResizableCompartmentFigure.class, propertiesClass.getChildren().get(0).getClass());
- assertDimension("The dimension of the properties compartment is not good ", 0, 358, 200, 47, propertiesClass);
-
-
- // compartment for operation
- assertEquals("The sub figure [4] of class1 is not an RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(4).getClass());
- RectangleFigure operationsClass = (RectangleFigure) class1figure.getChildren().get(4);
- assertTrue("The sub figure [4] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure);
- assertDimension("The sub figure [4] has not the good dimension", 0, 406, 200, 47, operationsClass);
-
-
- // compartment for nested classifier
- assertEquals("The sub figure [5] of class1 is not an automaticCompartmentLayoutManager", RectangleFigure.class, class1figure.getChildren().get(5).getClass());
- RectangleFigure innerclassifiersClass = (RectangleFigure) class1figure.getChildren().get(5);
- assertTrue("The sub figure [5] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure);
- assertDimension("The sub figure [5] has not the good dimension", 0, 454, 200, 47, innerclassifiersClass);
-
- // compartment for nested classifier
- Figure notvisbleFigureClass = (Figure) class1figure.getChildren().get(6);
- assertTrue("The sub figure [6] is not the nested Classifier compartment is not a Figure", notvisbleFigureClass instanceof Figure);
- assertDimension("The sub figure [6] has not the good dimension", 0, 0, 0, 0, notvisbleFigureClass);
-
- }
-
- }
-
- /**
- * Test the dimension of the figure
- *
- * @param x
- * @param y
- * @param w
- * @param h
- * @param figure
- */
- private void assertDimension(String msgHeader, int x, int y, int w, int h, Figure figure) {
- assertEquals(msgHeader + " has not the good X coordinate", x, figure.getBounds().x);
- assertEquals(msgHeader + " has not the good Y coordinate", y, figure.getBounds().y);
- assertEquals(msgHeader + " has not the good width coordinate", w, figure.getBounds().width);
- assertEquals(msgHeader + " has not the good height coordinate", h, figure.getBounds().height);
- }
-
- public void createTheClass(IElementType type) {
-
- // CREATION
- assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
-
- assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
- // 1 element element due to the reference to the profile
- assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);
-
-
- {// execution of the command
- CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
- Command command = getDiagramEditPart().getCommand(requestcreation);
- assertNotNull(CREATION + COMMAND_NULL, command);
- assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
- assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
- assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
- }
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- super.setUp();
- IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("TestProfile");
- final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());
- URI modelUri = registeredProfile.getUri();
- final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);
- final Profile profile = (Profile) modelResource.getContents().get(0);
- // PackageUtil.applyProfile(root,profile, false);
- final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());
- AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);
- domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));
-
-
- }
-}
+/***************************************************************************** + * Copyright (c) 2012, 2014 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST - Initial API and implementation + * Christian W. Damus (CEA) - bug 422257 + * Christian W. Damus (CEA) - bug 434594 + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.diagram.stereotypeproperty; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; + +import org.eclipse.draw2d.Figure; +import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.RectangleFigure; +import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.gef.commands.Command; +import org.eclipse.gef.commands.UnexecutableCommand; +import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy; +import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand; +import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart; +import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure; +import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure; +import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest; +import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory; +import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel; +import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter; +import org.eclipse.gmf.runtime.emf.type.core.IElementType; +import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper; +import org.eclipse.papyrus.infra.core.utils.ServiceUtils; +import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.junit.framework.classification.InvalidTest; +import org.eclipse.papyrus.junit.utils.DisplayUtils; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart; +import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; +import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeCompartmentFigure; +import org.eclipse.papyrus.uml.diagram.common.figure.node.AutomaticCompartmentLayoutManager; +import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure; +import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayCommandExecution; +import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile; +import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile; +import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand; +import org.eclipse.uml2.uml.Element; +import org.eclipse.uml2.uml.Model; +import org.eclipse.uml2.uml.Profile; +import org.eclipse.uml2.uml.Stereotype; +import org.junit.Before; +import org.junit.Test; + +/** + * the purpose of this class is to test the layout + * + */ +public class TestLayoutWithStereotype extends AbstractPapyrusTestCase { + + protected static final String ST_LEFT = String.valueOf("\u00AB"); + + protected static final String ST_RIGHT = String.valueOf("\u00BB"); + + private static final String TEST_PROFILE_STEREOTYPE3 = "testProfile::Stereotype3"; + + @InvalidTest("Works on Windows, Fails on Linux") + @Test + public void testLayoutOnClass() { + testToCreateANodeWithoutStereotype(UMLElementTypes.Class_Shape); + } + + @InvalidTest("Works on Windows, Fails on Linux") + @Test + public void testLayoutStereotypeApplicationOnClass() { + testToCreateANodeWithStereotype(UMLElementTypes.Class_Shape); + } + + /** + * Test to create a node without Stereotype + * + * @param type + * the type + */ + + public void testToCreateANodeWithoutStereotype(IElementType type) { + + org.eclipse.uml2.uml.Class class1; + View notationClass1; + ClassifierFigure class1figure; + GraphicalEditPart classEditPart; + createTheClass(type); + + + // ******************************************** Test of the class without stereotype******************************************** + // get the created Class + class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1"); + assertNotNull("created class must be not null", class1); + // look for the editpart that the class + classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0); + // test if stereotype can be applied + assertTrue("Stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null); + + + // look for the applied stereotype compartment + notationClass1 = classEditPart.getNotationView(); + {// execution of the command + SetBoundsCommand resizeCommand = new SetBoundsCommand(diagramEditor.getEditingDomain(), "resize", new EObjectAdapter(notationClass1), new Rectangle(0, 0, 200, 200)); + + assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, resizeCommand.canExecute() == true); + diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(new ICommandProxy(resizeCommand)); + } + {// test about the layout + org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0); + // now verify position of each subfigure + class1figure = ((ClassifierFigure) nodePlate.getChildren().get(0)); + class1figure.setBounds(new Rectangle(0, 0, 200, 200)); + assertEquals("The figure of class1 is not an automaticCompartmentLayoutManager", AutomaticCompartmentLayoutManager.class, class1figure.getLayoutManager().getClass()); + class1figure.getLayoutManager().layout(class1figure); + assertDimension("The figure of the Class ", 0, 0, 200, 200, class1figure); + + // At this moment the class figure must contain 4 sub-figures 1label+ 3compartments + assertEquals("The number of figure children must be equal to 4", 4, class1figure.getChildren().size()); + + // wrappinglabel for name + assertEquals("The sub figure [0] is not a wrapping label", PapyrusWrappingLabel.class, class1figure.getChildren().get(0).getClass()); + WrappingLabel labelClass = (WrappingLabel) class1figure.getChildren().get(0); + assertDimension("The figure of the Class ", 0, 3, 200, 16, labelClass); + assertEquals("The label of the Class does not display Class1", "Class1", labelClass.getText()); + + // compartment for attribute + assertEquals("The sub figure [1] is not a RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(1).getClass()); + RectangleFigure propertiesClass = (RectangleFigure) class1figure.getChildren().get(1); + assertEquals("The sub figure [1] is not the attribute compartment is not a ResizableCompartmentFigure", ResizableCompartmentFigure.class, propertiesClass.getChildren().get(0).getClass()); + assertDimension("The dimension of the properties compartment is not good ", 0, 20, 200, 59, propertiesClass); + + + // compartment for operation + assertEquals("The sub figure [2] of class1 is not an RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(2).getClass()); + RectangleFigure operationsClass = (RectangleFigure) class1figure.getChildren().get(2); + assertTrue("The sub figure [2] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure); + assertDimension("The sub figure [2] has not the good dimension", 0, 80, 200, 59, operationsClass); + + + // compartment for nested classifier + assertEquals("The sub figure [3] of class1 is not an automaticCompartmentLayoutManager", RectangleFigure.class, class1figure.getChildren().get(3).getClass()); + RectangleFigure innerclassifiersClass = (RectangleFigure) class1figure.getChildren().get(3); + assertTrue("The sub figure [3] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure); + assertDimension("The sub figure [3] has not the good dimension", 0, 140, 200, 59, innerclassifiersClass); + + } + } + + + + /** + * Test to create a node without Stereotype + * + * @param type + * the type + */ + + public void testToCreateANodeWithStereotype(IElementType type) { + org.eclipse.uml2.uml.Class class1; + View notationClass1; + ClassifierFigure class1figure; + GraphicalEditPart classEditPart; + createTheClass(type); + + + // get the created Class + class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1"); + assertNotNull("created class must be not null", class1); + // look for the editpart that the class + classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0); + // test if stereotype can be applied + assertTrue("Stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null); + + + // look for the applied stereotype compartment + notationClass1 = classEditPart.getNotationView(); + {// execution of the application of the stereotype + ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>(); + stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3)); + ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain()); + diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand); + assertNotEquals("No applied stereotype found on the element ", 0, class1.getAppliedStereotypes().size()); + } + + + View appliedStereotypeCompartmentNotation = StereoUtil.getViewAppliedStereotypeCompartmentNotation2(notationClass1); + View shapeCompartmentView = StereoUtil.getViewShapeCompartment2(notationClass1); + + // the mechanism of stereotype display is running. + // the thread is synchronous + assertNotEquals("No stereotype Compartment found in the notation", null, appliedStereotypeCompartmentNotation); + assertNotEquals("No stereotype shape Compartment found in the notation", null, shapeCompartmentView); + + + // ******************************************** Test of the class with stereotype Stereotype3******************************************** + // now display stereotypes + + {// display Stereotype3 + StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), appliedStereotypeCompartmentNotation, true, true); + + org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0); + DisplayUtils.flushEventLoop(); + + // get the label + PapyrusWrappingLabel stereotypeLabel = ((ClassifierFigure) nodePlate.getChildren().get(0)).getStereotypesLabel(); + assertNotEquals("stereotype label must be not null", null, stereotypeLabel); + assertEquals("text of stereotype label be equals to " + ST_LEFT + "Stereotype3" + ST_RIGHT, stereotypeLabel.getText(), ST_LEFT + "Stereotype3" + ST_RIGHT); + } + + {// test about the layout + org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0); + // now verify position of each subfigure + class1figure = ((ClassifierFigure) nodePlate.getChildren().get(0)); + class1figure.setBounds(new Rectangle(0, 0, 200, 500)); + assertEquals("The figure of class1 is not an automaticCompartmentLayoutManager", AutomaticCompartmentLayoutManager.class, class1figure.getLayoutManager().getClass()); + class1figure.getLayoutManager().layout(class1figure); + assertDimension("The figure of the «Stereotype3»Class1", 0, 0, 200, 500, class1figure); + + // At this moment the class figure must contain 7 sub-figures: 1 label for stereotype+ 1label for name+ 1Compartment for properties+ 3compartments+1 figure that are nothing + assertEquals("The number of children «Stereotype3»Class1 is not equals to 7", 7, class1figure.getChildren().size()); + + + // wrappingLabel for stereotype + assertTrue("The sub figure [0] of «Stereotype3»Class1 is not a label", class1figure.getChildren().get(0) instanceof PapyrusWrappingLabel); + PapyrusWrappingLabel stereotypelabelClass = (PapyrusWrappingLabel) class1figure.getChildren().get(0); + assertDimension("The label of stereotype for the Class is not good", 0, 3, 200, 15, stereotypelabelClass); + assertEquals("The label of the Class does not display " + ST_LEFT + "Stereotype3" + ST_RIGHT, ST_LEFT + "Stereotype3" + ST_RIGHT, stereotypelabelClass.getText()); + + + // wrappingLabel for name + assertTrue("The name of the Class1, sub figure [1], is not a wrapping label", class1figure.getChildren().get(1) instanceof PapyrusWrappingLabel); + PapyrusWrappingLabel labelClass = (PapyrusWrappingLabel) class1figure.getChildren().get(1); + assertDimension("The name of the Class1, sub figure [1],is not good", 0, 19, 200, 16, labelClass); + + assertEquals("The label of the Class does not display Class1", labelClass.getText(), "Class1"); + + // compartment for property of stereotype + assertTrue("The sub figure [2] of compartment of stereotype properties «Stereotype3»Class1 is not a compartment", class1figure.getChildren().get(2) instanceof RectangleFigure); + RectangleFigure stereotypePropertiesClass = (RectangleFigure) class1figure.getChildren().get(2); + assertTrue("The sub figure [2] is not the attribute compartment is not a ResizableCompartmentFigure", stereotypePropertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure); + assertDimension("The sub figure [2],is not good", 0, 36, 200, 321, stereotypePropertiesClass); + + // test containment of stereotype properties + assertTrue("The sub figure [2] is not the attribute compartment is not a ResizableCompartmentFigure", stereotypePropertiesClass.getChildren().get(0) instanceof AppliedStereotypeCompartmentFigure); + AppliedStereotypeCompartmentFigure appliedStereotypeCompartmentFigure = (AppliedStereotypeCompartmentFigure) stereotypePropertiesClass.getChildren().get(0); + IFigure content = appliedStereotypeCompartmentFigure.getContentPane(); + assertEquals("The number of properties of stereotype to displaye equals to 18", 18, content.getChildren().size()); + assertDimension("The dimension of the stereotype property 0 is not good ", 5, 51, 241, 15, (Figure) content.getChildren().get(0)); + assertDimension("The dimension of the stereotype property 1 is not good ", 5, 66, 241, 15, (Figure) content.getChildren().get(1)); + assertDimension("The dimension of the stereotype property 2 is not good ", 5, 81, 241, 15, (Figure) content.getChildren().get(2)); + assertDimension("The dimension of the stereotype property 3 is not good ", 5, 96, 241, 15, (Figure) content.getChildren().get(3)); + assertDimension("The dimension of the stereotype property 4 is not good ", 5, 111, 241, 15, (Figure) content.getChildren().get(4)); + assertDimension("The dimension of the stereotype property 5 is not good ", 5, 126, 241, 15, (Figure) content.getChildren().get(5)); + assertDimension("The dimension of the stereotype property 6 is not good ", 5, 141, 241, 15, (Figure) content.getChildren().get(6)); + assertDimension("The dimension of the stereotype property 7 is not good ", 5, 156, 241, 15, (Figure) content.getChildren().get(7)); + assertDimension("The dimension of the stereotype property 8 is not good ", 5, 171, 241, 15, (Figure) content.getChildren().get(8)); + assertDimension("The dimension of the stereotype property 9 is not good ", 5, 186, 241, 15, (Figure) content.getChildren().get(9)); + assertDimension("The dimension of the stereotype property 10 is not good ", 5, 201, 241, 15, (Figure) content.getChildren().get(10)); + assertDimension("The dimension of the stereotype property 11 is not good ", 5, 216, 241, 15, (Figure) content.getChildren().get(11)); + assertDimension("The dimension of the stereotype property 12 is not good ", 5, 231, 241, 15, (Figure) content.getChildren().get(12)); + assertDimension("The dimension of the stereotype property 13 is not good ", 5, 246, 241, 15, (Figure) content.getChildren().get(13)); + assertDimension("The dimension of the stereotype property 14 is not good ", 5, 261, 241, 15, (Figure) content.getChildren().get(14)); + assertDimension("The dimension of the stereotype property 15 is not good ", 5, 276, 241, 15, (Figure) content.getChildren().get(15)); + assertDimension("The dimension of the stereotype property 16 is not good ", 5, 291, 241, 15, (Figure) content.getChildren().get(16)); + assertDimension("The dimension of the stereotype property 17 is not good ", 5, 306, 241, 15, (Figure) content.getChildren().get(17)); + + + + + // compartment for attribute + assertEquals("The sub figure [3] is not a RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(3).getClass()); + RectangleFigure propertiesClass = (RectangleFigure) class1figure.getChildren().get(3); + assertEquals("The sub figure [3] is not the attribute compartment is not a ResizableCompartmentFigure", ResizableCompartmentFigure.class, propertiesClass.getChildren().get(0).getClass()); + assertDimension("The dimension of the properties compartment is not good ", 0, 358, 200, 47, propertiesClass); + + + // compartment for operation + assertEquals("The sub figure [4] of class1 is not an RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(4).getClass()); + RectangleFigure operationsClass = (RectangleFigure) class1figure.getChildren().get(4); + assertTrue("The sub figure [4] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure); + assertDimension("The sub figure [4] has not the good dimension", 0, 406, 200, 47, operationsClass); + + + // compartment for nested classifier + assertEquals("The sub figure [5] of class1 is not an automaticCompartmentLayoutManager", RectangleFigure.class, class1figure.getChildren().get(5).getClass()); + RectangleFigure innerclassifiersClass = (RectangleFigure) class1figure.getChildren().get(5); + assertTrue("The sub figure [5] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure); + assertDimension("The sub figure [5] has not the good dimension", 0, 454, 200, 47, innerclassifiersClass); + + // compartment for nested classifier + Figure notvisbleFigureClass = (Figure) class1figure.getChildren().get(6); + assertTrue("The sub figure [6] is not the nested Classifier compartment is not a Figure", notvisbleFigureClass instanceof Figure); + assertDimension("The sub figure [6] has not the good dimension", 0, 0, 0, 0, notvisbleFigureClass); + + } + + } + + /** + * Test the dimension of the figure + * + * @param x + * @param y + * @param w + * @param h + * @param figure + */ + private void assertDimension(String msgHeader, int x, int y, int w, int h, Figure figure) { + assertEquals(msgHeader + " has not the good X coordinate", x, figure.getBounds().x); + assertEquals(msgHeader + " has not the good Y coordinate", y, figure.getBounds().y); + assertEquals(msgHeader + " has not the good width coordinate", w, figure.getBounds().width); + assertEquals(msgHeader + " has not the good height coordinate", h, figure.getBounds().height); + } + + public void createTheClass(IElementType type) { + + // CREATION + assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0); + + assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1); + // 1 element element due to the reference to the profile + assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1); + + + {// execution of the command + CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint()); + Command command = getDiagramEditPart().getCommand(requestcreation); + assertNotNull(CREATION + COMMAND_NULL, command); + assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE); + assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); + diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command); + assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1); + } + } + + @Before + @Override + public void setUp() throws Exception { + super.setUp(); + IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("TestProfile"); + final Model root = ((Model) getDiagramEditPart().resolveSemanticElement()); + URI modelUri = registeredProfile.getUri(); + final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true); + final Profile profile = (Profile) modelResource.getContents().get(0); + // PackageUtil.applyProfile(root,profile, false); + final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry()); + AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile); + domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand)); + + + } +} diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotypeOnEclipseHIPPInstance.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotypeOnEclipseHIPPInstance.java index f09e431621a..8484d4ae561 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotypeOnEclipseHIPPInstance.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotypeOnEclipseHIPPInstance.java @@ -1,368 +1,368 @@ -/*****************************************************************************
- * Copyright (c) 2012, 2014 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- * Christian W. Damus (CEA) - bug 434594
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.stereotypeproperty;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
-import org.eclipse.papyrus.junit.utils.DisplayUtils;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;
-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeCompartmentFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AutomaticCompartmentLayoutManager;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
-import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayCommandExecution;
-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;
-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
-import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Profile;
-import org.eclipse.uml2.uml.Stereotype;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * the purpose of this class is to test the layout on the Eclipse HIPP Hudson instance.
- *
- * FIXME : these tests will probably failed due to a difference on layout between Windows/Linux font definition
- * all modifications about the code must be done on {@link TestLayoutWithStereotypeOnEclipseHIPPInstance} here only dimension must change
- * "Works on Linux, Fails on Windows"
- **/
-public class TestLayoutWithStereotypeOnEclipseHIPPInstance extends AbstractPapyrusTestCase {
-
- protected static final String ST_LEFT = String.valueOf("\u00AB");
-
- protected static final String ST_RIGHT = String.valueOf("\u00BB");
-
- private static final String TEST_PROFILE_STEREOTYPE3 = "testProfile::Stereotype3";
-
- @Test
- public void testLayoutOnClass() {
- testToCreateANodeWithoutStereotype(UMLElementTypes.Class_2008);
- }
-
- @Test
- public void testLayoutStereotypeApplicationOnClass() {
- testToCreateANodeWithStereotype(UMLElementTypes.Class_2008);
- }
-
- /**
- * Test to create a node without Stereotype
- *
- * @param type
- * the type
- */
-
- public void testToCreateANodeWithoutStereotype(IElementType type) {
-
- org.eclipse.uml2.uml.Class class1;
- View notationClass1;
- ClassifierFigure class1figure;
- GraphicalEditPart classEditPart;
- createTheClass(type);
-
-
- // ******************************************** Test of the class without stereotype********************************************
- // get the created Class
- class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");
- assertNotNull("created class must be not null", class1);
- // look for the editpart that the class
- classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);
- // test if stereotype can be applied
- assertTrue("Stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null);
-
-
- // look for the applied stereotype compartment
- notationClass1 = classEditPart.getNotationView();
- {// execution of the command
- SetBoundsCommand resizeCommand = new SetBoundsCommand(diagramEditor.getEditingDomain(), "resize", new EObjectAdapter(notationClass1), new Rectangle(0, 0, 200, 200));
-
- assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, resizeCommand.canExecute() == true);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(new ICommandProxy(resizeCommand));
- }
- {// test about the layout
- org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);
- // now verify position of each subfigure
- class1figure = ((ClassifierFigure) nodePlate.getChildren().get(0));
- class1figure.setBounds(new Rectangle(0, 0, 200, 200));
- assertEquals("The figure of class1 is not an automaticCompartmentLayoutManager", AutomaticCompartmentLayoutManager.class, class1figure.getLayoutManager().getClass());
- class1figure.getLayoutManager().layout(class1figure);
- assertDimension("The figure of the Class ", 0, 0, 200, 200, class1figure);
-
- // At this moment the class figure must contain 4 sub-figures 1label+ 3compartments
- assertEquals("The number of figure children must be equal to 4", 4, class1figure.getChildren().size());
-
- // wrappinglabel for name
- assertEquals("The sub figure [0] is not a wrapping label", PapyrusWrappingLabel.class, class1figure.getChildren().get(0).getClass());
- WrappingLabel labelClass = (WrappingLabel) class1figure.getChildren().get(0);
- assertDimension("The figure of the Class ", 0, 3, 200, 16, labelClass);
- assertEquals("The label of the Class does not display Class1", "Class1", labelClass.getText());
-
- // compartment for attribute
- assertEquals("The sub figure [1] is not a RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(1).getClass());
- RectangleFigure propertiesClass = (RectangleFigure) class1figure.getChildren().get(1);
- assertEquals("The sub figure [1] is not the attribute compartment is not a ResizableCompartmentFigure", ResizableCompartmentFigure.class, propertiesClass.getChildren().get(0).getClass());
- assertDimension("The dimension of the properties compartment is not good ", 0, 20, 200, 59, propertiesClass);
-
-
- // compartment for operation
- assertEquals("The sub figure [2] of class1 is not an RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(2).getClass());
- RectangleFigure operationsClass = (RectangleFigure) class1figure.getChildren().get(2);
- assertTrue("The sub figure [2] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure);
- assertDimension("The sub figure [2] has not the good dimension", 0, 80, 200, 59, operationsClass);
-
-
- // compartment for nested classifier
- assertEquals("The sub figure [3] of class1 is not an automaticCompartmentLayoutManager", RectangleFigure.class, class1figure.getChildren().get(3).getClass());
- RectangleFigure innerclassifiersClass = (RectangleFigure) class1figure.getChildren().get(3);
- assertTrue("The sub figure [3] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure);
- assertDimension("The sub figure [3] has not the good dimension", 0, 140, 200, 59, innerclassifiersClass);
-
- }
- }
-
-
-
- /**
- * Test to create a node without Stereotype
- *
- * @param type
- * the type
- */
-
- public void testToCreateANodeWithStereotype(IElementType type) {
- org.eclipse.uml2.uml.Class class1;
- View notationClass1;
- ClassifierFigure class1figure;
- GraphicalEditPart classEditPart;
- createTheClass(type);
-
-
- // get the created Class
- class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1");
- assertNotNull("created class must be not null", class1);
- // look for the editpart that the class
- classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0);
- // test if stereotype can be applied
- assertTrue("Stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null);
-
-
- // look for the applied stereotype compartment
- notationClass1 = classEditPart.getNotationView();
- {// execution of the application of the stereotype
- ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();
- stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3));
- ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());
- diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);
- assertNotEquals("No applied stereotype found on the element ", 0, class1.getAppliedStereotypes().size());
- }
-
-
- View appliedStereotypeCompartmentNotation = StereoUtil.getViewAppliedStereotypeCompartmentNotation2(notationClass1);
- View shapeCompartmentView = StereoUtil.getViewShapeCompartment2(notationClass1);
-
- // the mechanism of stereotype display is running.
- // the thread is synchronous
- assertNotEquals("No stereotype Compartment found in the notation", null, appliedStereotypeCompartmentNotation);
- assertNotEquals("No stereotype shape Compartment found in the notation", null, shapeCompartmentView);
-
-
- // ******************************************** Test of the class with stereotype Stereotype3********************************************
- // now display stereotypes
-
- {// display Stereotype3
- StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), appliedStereotypeCompartmentNotation, true, true);
-
- org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);
- DisplayUtils.flushEventLoop();
-
- // get the label
- PapyrusWrappingLabel stereotypeLabel = ((ClassifierFigure) nodePlate.getChildren().get(0)).getStereotypesLabel();
- assertNotEquals("stereotype label must be not null", null, stereotypeLabel);
- assertEquals("text of stereotype label be equals to " + ST_LEFT + "Stereotype3" + ST_RIGHT, stereotypeLabel.getText(), ST_LEFT + "Stereotype3" + ST_RIGHT);
- }
-
- {// test about the layout
- org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0);
- // now verify position of each subfigure
- class1figure = ((ClassifierFigure) nodePlate.getChildren().get(0));
- class1figure.setBounds(new Rectangle(0, 0, 200, 500));
- assertEquals("The figure of class1 is not an automaticCompartmentLayoutManager", AutomaticCompartmentLayoutManager.class, class1figure.getLayoutManager().getClass());
- class1figure.getLayoutManager().layout(class1figure);
- assertDimension("The figure of the «Stereotype3»Class1", 0, 0, 200, 500, class1figure);
-
- // At this moment the class figure must contain 7 sub-figures: 1 label for stereotype+ 1label for name+ 1Compartment for properties+ 3compartments+1 figure that are nothing
- assertEquals("The number of children «Stereotype3»Class1 is not equals to 7", 7, class1figure.getChildren().size());
-
-
- // wrappingLabel for stereotype
- assertTrue("The sub figure [0] of «Stereotype3»Class1 is not a label", class1figure.getChildren().get(0) instanceof PapyrusWrappingLabel);
- PapyrusWrappingLabel stereotypelabelClass = (PapyrusWrappingLabel) class1figure.getChildren().get(0);
- assertDimension("The label of stereotype for the Class is not good", 0, 3, 200, 15, stereotypelabelClass);
- assertEquals("The label of the Class does not display " + ST_LEFT + "Stereotype3" + ST_RIGHT, ST_LEFT + "Stereotype3" + ST_RIGHT, stereotypelabelClass.getText());
-
-
- // wrappingLabel for name
- assertTrue("The name of the Class1, sub figure [1], is not a wrapping label", class1figure.getChildren().get(1) instanceof PapyrusWrappingLabel);
- PapyrusWrappingLabel labelClass = (PapyrusWrappingLabel) class1figure.getChildren().get(1);
- assertDimension("The name of the Class1, sub figure [1],is not good", 0, 19, 200, 16, labelClass);
-
- assertEquals("The label of the Class does not display Class1", labelClass.getText(), "Class1");
-
- // compartment for property of stereotype
- assertTrue("The sub figure [2] of compartment of stereotype properties «Stereotype3»Class1 is not a compartment", class1figure.getChildren().get(2) instanceof RectangleFigure);
- RectangleFigure stereotypePropertiesClass = (RectangleFigure) class1figure.getChildren().get(2);
- assertTrue("The sub figure [2] is not the attribute compartment is not a ResizableCompartmentFigure", stereotypePropertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure);
- assertDimension("The sub figure [2],is not good", 0, 36, 200, 321, stereotypePropertiesClass);
-
- // test containment of stereotype properties
- assertTrue("The sub figure [2] is not the attribute compartment is not a ResizableCompartmentFigure", stereotypePropertiesClass.getChildren().get(0) instanceof AppliedStereotypeCompartmentFigure);
- AppliedStereotypeCompartmentFigure appliedStereotypeCompartmentFigure = (AppliedStereotypeCompartmentFigure) stereotypePropertiesClass.getChildren().get(0);
- IFigure content = appliedStereotypeCompartmentFigure.getContentPane();
- assertEquals("The number of properties of stereotype to displaye equals to 18", 18, content.getChildren().size());
- assertDimension("The dimension of the stereotype property 0 is not good ", 5, 51, 241, 15, (Figure) content.getChildren().get(0));
- assertDimension("The dimension of the stereotype property 1 is not good ", 5, 66, 241, 15, (Figure) content.getChildren().get(1));
- assertDimension("The dimension of the stereotype property 2 is not good ", 5, 81, 241, 15, (Figure) content.getChildren().get(2));
- assertDimension("The dimension of the stereotype property 3 is not good ", 5, 96, 241, 15, (Figure) content.getChildren().get(3));
- assertDimension("The dimension of the stereotype property 4 is not good ", 5, 111, 241, 15, (Figure) content.getChildren().get(4));
- assertDimension("The dimension of the stereotype property 5 is not good ", 5, 126, 241, 15, (Figure) content.getChildren().get(5));
- assertDimension("The dimension of the stereotype property 6 is not good ", 5, 141, 241, 15, (Figure) content.getChildren().get(6));
- assertDimension("The dimension of the stereotype property 7 is not good ", 5, 156, 241, 15, (Figure) content.getChildren().get(7));
- assertDimension("The dimension of the stereotype property 8 is not good ", 5, 171, 241, 15, (Figure) content.getChildren().get(8));
- assertDimension("The dimension of the stereotype property 9 is not good ", 5, 186, 241, 15, (Figure) content.getChildren().get(9));
- assertDimension("The dimension of the stereotype property 10 is not good ", 5, 201, 241, 15, (Figure) content.getChildren().get(10));
- assertDimension("The dimension of the stereotype property 11 is not good ", 5, 216, 241, 15, (Figure) content.getChildren().get(11));
- assertDimension("The dimension of the stereotype property 12 is not good ", 5, 231, 241, 15, (Figure) content.getChildren().get(12));
- assertDimension("The dimension of the stereotype property 13 is not good ", 5, 246, 241, 15, (Figure) content.getChildren().get(13));
- assertDimension("The dimension of the stereotype property 14 is not good ", 5, 261, 241, 15, (Figure) content.getChildren().get(14));
- assertDimension("The dimension of the stereotype property 15 is not good ", 5, 276, 241, 15, (Figure) content.getChildren().get(15));
- assertDimension("The dimension of the stereotype property 16 is not good ", 5, 291, 241, 15, (Figure) content.getChildren().get(16));
- assertDimension("The dimension of the stereotype property 17 is not good ", 5, 306, 241, 15, (Figure) content.getChildren().get(17));
-
-
-
-
- // compartment for attribute
- assertEquals("The sub figure [3] is not a RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(3).getClass());
- RectangleFigure propertiesClass = (RectangleFigure) class1figure.getChildren().get(3);
- assertEquals("The sub figure [3] is not the attribute compartment is not a ResizableCompartmentFigure", ResizableCompartmentFigure.class, propertiesClass.getChildren().get(0).getClass());
- assertDimension("The dimension of the properties compartment is not good ", 0, 358, 200, 47, propertiesClass);
-
-
- // compartment for operation
- assertEquals("The sub figure [4] of class1 is not an RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(4).getClass());
- RectangleFigure operationsClass = (RectangleFigure) class1figure.getChildren().get(4);
- assertTrue("The sub figure [4] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure);
- assertDimension("The sub figure [4] has not the good dimension", 0, 406, 200, 47, operationsClass);
-
-
- // compartment for nested classifier
- assertEquals("The sub figure [5] of class1 is not an automaticCompartmentLayoutManager", RectangleFigure.class, class1figure.getChildren().get(5).getClass());
- RectangleFigure innerclassifiersClass = (RectangleFigure) class1figure.getChildren().get(5);
- assertTrue("The sub figure [5] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure);
- assertDimension("The sub figure [5] has not the good dimension", 0, 454, 200, 47, innerclassifiersClass);
-
- // compartment for nested classifier
- Figure notvisbleFigureClass = (Figure) class1figure.getChildren().get(6);
- assertTrue("The sub figure [6] is not the nested Classifier compartment is not a Figure", notvisbleFigureClass instanceof Figure);
- assertDimension("The sub figure [6] has not the good dimension", 0, 0, 0, 0, notvisbleFigureClass);
-
- }
-
- }
-
- /**
- * Test the dimension of the figure
- *
- * @param x
- * @param y
- * @param w
- * @param h
- * @param figure
- */
- private void assertDimension(String msgHeader, int x, int y, int w, int h, Figure figure) {
- assertEquals(msgHeader + " has not the good X coordinate", x, figure.getBounds().x);
- assertEquals(msgHeader + " has not the good Y coordinate", y, figure.getBounds().y);
- assertEquals(msgHeader + " has not the good width coordinate", w, figure.getBounds().width);
- assertEquals(msgHeader + " has not the good height coordinate", h, figure.getBounds().height);
- }
-
- public void createTheClass(IElementType type) {
-
- // CREATION
- assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);
-
- assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);
- // 1 element element due to the reference to the profile
- assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1);
-
-
- {// execution of the command
- CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());
- Command command = getDiagramEditPart().getCommand(requestcreation);
- assertNotNull(CREATION + COMMAND_NULL, command);
- assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
- assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
- assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);
- }
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- super.setUp();
- IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("TestProfile");
- final Model root = ((Model) getDiagramEditPart().resolveSemanticElement());
- URI modelUri = registeredProfile.getUri();
- final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);
- final Profile profile = (Profile) modelResource.getContents().get(0);
- // PackageUtil.applyProfile(root,profile, false);
- final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());
- AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);
- domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));
-
-
- }
-}
+/***************************************************************************** + * Copyright (c) 2012, 2014 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * CEA LIST - Initial API and implementation + * Christian W. Damus (CEA) - bug 422257 + * Christian W. Damus (CEA) - bug 434594 + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.diagram.stereotypeproperty; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; + +import org.eclipse.draw2d.Figure; +import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.RectangleFigure; +import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.gef.commands.Command; +import org.eclipse.gef.commands.UnexecutableCommand; +import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy; +import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand; +import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart; +import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure; +import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure; +import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest; +import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory; +import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel; +import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter; +import org.eclipse.gmf.runtime.emf.type.core.IElementType; +import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper; +import org.eclipse.papyrus.infra.core.utils.ServiceUtils; +import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.junit.utils.DisplayUtils; +import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart; +import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; +import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeCompartmentFigure; +import org.eclipse.papyrus.uml.diagram.common.figure.node.AutomaticCompartmentLayoutManager; +import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure; +import org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper.StereotypeDisplayCommandExecution; +import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile; +import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile; +import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand; +import org.eclipse.uml2.uml.Element; +import org.eclipse.uml2.uml.Model; +import org.eclipse.uml2.uml.Profile; +import org.eclipse.uml2.uml.Stereotype; +import org.junit.Before; +import org.junit.Test; + +/** + * the purpose of this class is to test the layout on the Eclipse HIPP Hudson instance. + * + * FIXME : these tests will probably failed due to a difference on layout between Windows/Linux font definition + * all modifications about the code must be done on {@link TestLayoutWithStereotypeOnEclipseHIPPInstance} here only dimension must change + * "Works on Linux, Fails on Windows" + **/ +public class TestLayoutWithStereotypeOnEclipseHIPPInstance extends AbstractPapyrusTestCase { + + protected static final String ST_LEFT = String.valueOf("\u00AB"); + + protected static final String ST_RIGHT = String.valueOf("\u00BB"); + + private static final String TEST_PROFILE_STEREOTYPE3 = "testProfile::Stereotype3"; + + @Test + public void testLayoutOnClass() { + testToCreateANodeWithoutStereotype(UMLElementTypes.Class_Shape); + } + + @Test + public void testLayoutStereotypeApplicationOnClass() { + testToCreateANodeWithStereotype(UMLElementTypes.Class_Shape); + } + + /** + * Test to create a node without Stereotype + * + * @param type + * the type + */ + + public void testToCreateANodeWithoutStereotype(IElementType type) { + + org.eclipse.uml2.uml.Class class1; + View notationClass1; + ClassifierFigure class1figure; + GraphicalEditPart classEditPart; + createTheClass(type); + + + // ******************************************** Test of the class without stereotype******************************************** + // get the created Class + class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1"); + assertNotNull("created class must be not null", class1); + // look for the editpart that the class + classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0); + // test if stereotype can be applied + assertTrue("Stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null); + + + // look for the applied stereotype compartment + notationClass1 = classEditPart.getNotationView(); + {// execution of the command + SetBoundsCommand resizeCommand = new SetBoundsCommand(diagramEditor.getEditingDomain(), "resize", new EObjectAdapter(notationClass1), new Rectangle(0, 0, 200, 200)); + + assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, resizeCommand.canExecute() == true); + diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(new ICommandProxy(resizeCommand)); + } + {// test about the layout + org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0); + // now verify position of each subfigure + class1figure = ((ClassifierFigure) nodePlate.getChildren().get(0)); + class1figure.setBounds(new Rectangle(0, 0, 200, 200)); + assertEquals("The figure of class1 is not an automaticCompartmentLayoutManager", AutomaticCompartmentLayoutManager.class, class1figure.getLayoutManager().getClass()); + class1figure.getLayoutManager().layout(class1figure); + assertDimension("The figure of the Class ", 0, 0, 200, 200, class1figure); + + // At this moment the class figure must contain 4 sub-figures 1label+ 3compartments + assertEquals("The number of figure children must be equal to 4", 4, class1figure.getChildren().size()); + + // wrappinglabel for name + assertEquals("The sub figure [0] is not a wrapping label", PapyrusWrappingLabel.class, class1figure.getChildren().get(0).getClass()); + WrappingLabel labelClass = (WrappingLabel) class1figure.getChildren().get(0); + assertDimension("The figure of the Class ", 0, 3, 200, 16, labelClass); + assertEquals("The label of the Class does not display Class1", "Class1", labelClass.getText()); + + // compartment for attribute + assertEquals("The sub figure [1] is not a RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(1).getClass()); + RectangleFigure propertiesClass = (RectangleFigure) class1figure.getChildren().get(1); + assertEquals("The sub figure [1] is not the attribute compartment is not a ResizableCompartmentFigure", ResizableCompartmentFigure.class, propertiesClass.getChildren().get(0).getClass()); + assertDimension("The dimension of the properties compartment is not good ", 0, 20, 200, 59, propertiesClass); + + + // compartment for operation + assertEquals("The sub figure [2] of class1 is not an RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(2).getClass()); + RectangleFigure operationsClass = (RectangleFigure) class1figure.getChildren().get(2); + assertTrue("The sub figure [2] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure); + assertDimension("The sub figure [2] has not the good dimension", 0, 80, 200, 59, operationsClass); + + + // compartment for nested classifier + assertEquals("The sub figure [3] of class1 is not an automaticCompartmentLayoutManager", RectangleFigure.class, class1figure.getChildren().get(3).getClass()); + RectangleFigure innerclassifiersClass = (RectangleFigure) class1figure.getChildren().get(3); + assertTrue("The sub figure [3] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure); + assertDimension("The sub figure [3] has not the good dimension", 0, 140, 200, 59, innerclassifiersClass); + + } + } + + + + /** + * Test to create a node without Stereotype + * + * @param type + * the type + */ + + public void testToCreateANodeWithStereotype(IElementType type) { + org.eclipse.uml2.uml.Class class1; + View notationClass1; + ClassifierFigure class1figure; + GraphicalEditPart classEditPart; + createTheClass(type); + + + // get the created Class + class1 = (org.eclipse.uml2.uml.Class) ((org.eclipse.uml2.uml.Package) getRootSemanticModel()).getPackagedElement("Class1"); + assertNotNull("created class must be not null", class1); + // look for the editpart that the class + classEditPart = (ClassEditPart) getDiagramEditPart().getChildren().get(0); + // test if stereotype can be applied + assertTrue("Stereotype3 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3) != null); + + + // look for the applied stereotype compartment + notationClass1 = classEditPart.getNotationView(); + {// execution of the application of the stereotype + ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>(); + stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE3)); + ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element) classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain()); + diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand); + assertNotEquals("No applied stereotype found on the element ", 0, class1.getAppliedStereotypes().size()); + } + + + View appliedStereotypeCompartmentNotation = StereoUtil.getViewAppliedStereotypeCompartmentNotation2(notationClass1); + View shapeCompartmentView = StereoUtil.getViewShapeCompartment2(notationClass1); + + // the mechanism of stereotype display is running. + // the thread is synchronous + assertNotEquals("No stereotype Compartment found in the notation", null, appliedStereotypeCompartmentNotation); + assertNotEquals("No stereotype shape Compartment found in the notation", null, shapeCompartmentView); + + + // ******************************************** Test of the class with stereotype Stereotype3******************************************** + // now display stereotypes + + {// display Stereotype3 + StereotypeDisplayCommandExecution.getInstance().setVisibility(diagramEditor.getEditingDomain(), appliedStereotypeCompartmentNotation, true, true); + + org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0); + DisplayUtils.flushEventLoop(); + + // get the label + PapyrusWrappingLabel stereotypeLabel = ((ClassifierFigure) nodePlate.getChildren().get(0)).getStereotypesLabel(); + assertNotEquals("stereotype label must be not null", null, stereotypeLabel); + assertEquals("text of stereotype label be equals to " + ST_LEFT + "Stereotype3" + ST_RIGHT, stereotypeLabel.getText(), ST_LEFT + "Stereotype3" + ST_RIGHT); + } + + {// test about the layout + org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0); + // now verify position of each subfigure + class1figure = ((ClassifierFigure) nodePlate.getChildren().get(0)); + class1figure.setBounds(new Rectangle(0, 0, 200, 500)); + assertEquals("The figure of class1 is not an automaticCompartmentLayoutManager", AutomaticCompartmentLayoutManager.class, class1figure.getLayoutManager().getClass()); + class1figure.getLayoutManager().layout(class1figure); + assertDimension("The figure of the «Stereotype3»Class1", 0, 0, 200, 500, class1figure); + + // At this moment the class figure must contain 7 sub-figures: 1 label for stereotype+ 1label for name+ 1Compartment for properties+ 3compartments+1 figure that are nothing + assertEquals("The number of children «Stereotype3»Class1 is not equals to 7", 7, class1figure.getChildren().size()); + + + // wrappingLabel for stereotype + assertTrue("The sub figure [0] of «Stereotype3»Class1 is not a label", class1figure.getChildren().get(0) instanceof PapyrusWrappingLabel); + PapyrusWrappingLabel stereotypelabelClass = (PapyrusWrappingLabel) class1figure.getChildren().get(0); + assertDimension("The label of stereotype for the Class is not good", 0, 3, 200, 15, stereotypelabelClass); + assertEquals("The label of the Class does not display " + ST_LEFT + "Stereotype3" + ST_RIGHT, ST_LEFT + "Stereotype3" + ST_RIGHT, stereotypelabelClass.getText()); + + + // wrappingLabel for name + assertTrue("The name of the Class1, sub figure [1], is not a wrapping label", class1figure.getChildren().get(1) instanceof PapyrusWrappingLabel); + PapyrusWrappingLabel labelClass = (PapyrusWrappingLabel) class1figure.getChildren().get(1); + assertDimension("The name of the Class1, sub figure [1],is not good", 0, 19, 200, 16, labelClass); + + assertEquals("The label of the Class does not display Class1", labelClass.getText(), "Class1"); + + // compartment for property of stereotype + assertTrue("The sub figure [2] of compartment of stereotype properties «Stereotype3»Class1 is not a compartment", class1figure.getChildren().get(2) instanceof RectangleFigure); + RectangleFigure stereotypePropertiesClass = (RectangleFigure) class1figure.getChildren().get(2); + assertTrue("The sub figure [2] is not the attribute compartment is not a ResizableCompartmentFigure", stereotypePropertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure); + assertDimension("The sub figure [2],is not good", 0, 36, 200, 321, stereotypePropertiesClass); + + // test containment of stereotype properties + assertTrue("The sub figure [2] is not the attribute compartment is not a ResizableCompartmentFigure", stereotypePropertiesClass.getChildren().get(0) instanceof AppliedStereotypeCompartmentFigure); + AppliedStereotypeCompartmentFigure appliedStereotypeCompartmentFigure = (AppliedStereotypeCompartmentFigure) stereotypePropertiesClass.getChildren().get(0); + IFigure content = appliedStereotypeCompartmentFigure.getContentPane(); + assertEquals("The number of properties of stereotype to displaye equals to 18", 18, content.getChildren().size()); + assertDimension("The dimension of the stereotype property 0 is not good ", 5, 51, 241, 15, (Figure) content.getChildren().get(0)); + assertDimension("The dimension of the stereotype property 1 is not good ", 5, 66, 241, 15, (Figure) content.getChildren().get(1)); + assertDimension("The dimension of the stereotype property 2 is not good ", 5, 81, 241, 15, (Figure) content.getChildren().get(2)); + assertDimension("The dimension of the stereotype property 3 is not good ", 5, 96, 241, 15, (Figure) content.getChildren().get(3)); + assertDimension("The dimension of the stereotype property 4 is not good ", 5, 111, 241, 15, (Figure) content.getChildren().get(4)); + assertDimension("The dimension of the stereotype property 5 is not good ", 5, 126, 241, 15, (Figure) content.getChildren().get(5)); + assertDimension("The dimension of the stereotype property 6 is not good ", 5, 141, 241, 15, (Figure) content.getChildren().get(6)); + assertDimension("The dimension of the stereotype property 7 is not good ", 5, 156, 241, 15, (Figure) content.getChildren().get(7)); + assertDimension("The dimension of the stereotype property 8 is not good ", 5, 171, 241, 15, (Figure) content.getChildren().get(8)); + assertDimension("The dimension of the stereotype property 9 is not good ", 5, 186, 241, 15, (Figure) content.getChildren().get(9)); + assertDimension("The dimension of the stereotype property 10 is not good ", 5, 201, 241, 15, (Figure) content.getChildren().get(10)); + assertDimension("The dimension of the stereotype property 11 is not good ", 5, 216, 241, 15, (Figure) content.getChildren().get(11)); + assertDimension("The dimension of the stereotype property 12 is not good ", 5, 231, 241, 15, (Figure) content.getChildren().get(12)); + assertDimension("The dimension of the stereotype property 13 is not good ", 5, 246, 241, 15, (Figure) content.getChildren().get(13)); + assertDimension("The dimension of the stereotype property 14 is not good ", 5, 261, 241, 15, (Figure) content.getChildren().get(14)); + assertDimension("The dimension of the stereotype property 15 is not good ", 5, 276, 241, 15, (Figure) content.getChildren().get(15)); + assertDimension("The dimension of the stereotype property 16 is not good ", 5, 291, 241, 15, (Figure) content.getChildren().get(16)); + assertDimension("The dimension of the stereotype property 17 is not good ", 5, 306, 241, 15, (Figure) content.getChildren().get(17)); + + + + + // compartment for attribute + assertEquals("The sub figure [3] is not a RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(3).getClass()); + RectangleFigure propertiesClass = (RectangleFigure) class1figure.getChildren().get(3); + assertEquals("The sub figure [3] is not the attribute compartment is not a ResizableCompartmentFigure", ResizableCompartmentFigure.class, propertiesClass.getChildren().get(0).getClass()); + assertDimension("The dimension of the properties compartment is not good ", 0, 358, 200, 47, propertiesClass); + + + // compartment for operation + assertEquals("The sub figure [4] of class1 is not an RectangleFigure", RectangleFigure.class, class1figure.getChildren().get(4).getClass()); + RectangleFigure operationsClass = (RectangleFigure) class1figure.getChildren().get(4); + assertTrue("The sub figure [4] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure); + assertDimension("The sub figure [4] has not the good dimension", 0, 406, 200, 47, operationsClass); + + + // compartment for nested classifier + assertEquals("The sub figure [5] of class1 is not an automaticCompartmentLayoutManager", RectangleFigure.class, class1figure.getChildren().get(5).getClass()); + RectangleFigure innerclassifiersClass = (RectangleFigure) class1figure.getChildren().get(5); + assertTrue("The sub figure [5] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure); + assertDimension("The sub figure [5] has not the good dimension", 0, 454, 200, 47, innerclassifiersClass); + + // compartment for nested classifier + Figure notvisbleFigureClass = (Figure) class1figure.getChildren().get(6); + assertTrue("The sub figure [6] is not the nested Classifier compartment is not a Figure", notvisbleFigureClass instanceof Figure); + assertDimension("The sub figure [6] has not the good dimension", 0, 0, 0, 0, notvisbleFigureClass); + + } + + } + + /** + * Test the dimension of the figure + * + * @param x + * @param y + * @param w + * @param h + * @param figure + */ + private void assertDimension(String msgHeader, int x, int y, int w, int h, Figure figure) { + assertEquals(msgHeader + " has not the good X coordinate", x, figure.getBounds().x); + assertEquals(msgHeader + " has not the good Y coordinate", y, figure.getBounds().y); + assertEquals(msgHeader + " has not the good width coordinate", w, figure.getBounds().width); + assertEquals(msgHeader + " has not the good height coordinate", h, figure.getBounds().height); + } + + public void createTheClass(IElementType type) { + + // CREATION + assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0); + + assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1); + // 1 element element due to the reference to the profile + assertTrue(CREATION + INITIALIZATION_TEST, ((Model) getRootSemanticModel()).getAllAppliedProfiles().size() == 1); + + + {// execution of the command + CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint()); + Command command = getDiagramEditPart().getCommand(requestcreation); + assertNotNull(CREATION + COMMAND_NULL, command); + assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE); + assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true); + diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command); + assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1); + } + } + + @Before + @Override + public void setUp() throws Exception { + super.setUp(); + IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("TestProfile"); + final Model root = ((Model) getDiagramEditPart().resolveSemanticElement()); + URI modelUri = registeredProfile.getUri(); + final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true); + final Profile profile = (Profile) modelResource.getContents().get(0); + // PackageUtil.applyProfile(root,profile, false); + final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry()); + AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile); + domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand)); + + + } +} diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestStereotypeApplication.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestStereotypeApplication.java index 24d4f4d7670..31c9c23ebc5 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestStereotypeApplication.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestStereotypeApplication.java @@ -69,13 +69,13 @@ public class TestStereotypeApplication extends AbstractPapyrusTestCase { @Test
public void testStereotypeApplicationOnClass() {
- testToCreateANode(UMLElementTypes.Class_2008);
+ testToCreateANode(UMLElementTypes.Class_Shape);
}
@Test
public void testStereotypeApplicationOnPackage() {
- testToCreateAPackage(UMLElementTypes.Package_2007);
+ testToCreateAPackage(UMLElementTypes.Package_Shape);
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java index 78773eb7ef8..5d49c3ba394 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java @@ -108,9 +108,9 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { /** Creates 3 state definitions in the default Lifeline */
protected void createThreeStateDefinitionsInDefaultFullLifeline() {
- createView(UMLElementTypes.Node_9, this.stateDefinitionCompartment);
- createView(UMLElementTypes.Node_9, this.stateDefinitionCompartment);
- createView(UMLElementTypes.Node_9, this.stateDefinitionCompartment);
+ createView(UMLElementTypes.Node_StateDefinitionShape, this.stateDefinitionCompartment);
+ createView(UMLElementTypes.Node_StateDefinitionShape, this.stateDefinitionCompartment);
+ createView(UMLElementTypes.Node_StateDefinitionShape, this.stateDefinitionCompartment);
}
/**
@@ -129,7 +129,7 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { */
protected StateDefinitionEditPart createStateDefinition(final FullLifelineEditPartCN parentLifelineEditPart) {
final FullLifelineStateDefinitionCompartmentEditPartCN compartment = (FullLifelineStateDefinitionCompartmentEditPartCN)EditPartUtils.findFirstChildEditPartWithId(parentLifelineEditPart, FullLifelineStateDefinitionCompartmentEditPartCN.VISUAL_ID);
- final View stateDefinitionView = createView(UMLElementTypes.Node_9, compartment);
+ final View stateDefinitionView = createView(UMLElementTypes.Node_StateDefinitionShape, compartment);
assertNotNull("The StateDefinition View should be created", stateDefinitionView);
return (StateDefinitionEditPart)findChildEditPartAssociatedToView(compartment, stateDefinitionView);
}
@@ -151,7 +151,7 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { protected FullLifelineEditPartCN createFullLifeline(final InteractionEditPartTN parentInteractionEditPart) {
final EditPart compartment = EditPartUtils.findFirstChildEditPartWithId(parentInteractionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID);
assertNotNull("The compartment must not be null", compartment);
- final View view = createView(UMLElementTypes.Lifeline_19, compartment);
+ final View view = createView(UMLElementTypes.Lifeline_FullShape, compartment);
assertNotNull("The FullLifeline View should be created", view);
return (FullLifelineEditPartCN)findChildEditPartAssociatedToView(compartment, view);
}
@@ -173,7 +173,7 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { protected CompactLifelineEditPartCN createCompactLifeline(final InteractionEditPartTN parentInteractionEditPart) {
final EditPart compartment = EditPartUtils.findFirstChildEditPartWithId(parentInteractionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID);
assertNotNull("The compartment must not be null", compartment);
- final View view = createView(UMLElementTypes.Lifeline_20, compartment);
+ final View view = createView(UMLElementTypes.Lifeline_CompactShape, compartment);
assertNotNull("The CompactLifeline View should be created", view);
return (CompactLifelineEditPartCN)findChildEditPartAssociatedToView(compartment, view);
}
@@ -188,7 +188,7 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { * @return the created Interaction's EditPart
*/
protected InteractionEditPartTN createInteraction(final Point location, final Dimension dimension) {
- createView(UMLElementTypes.Interaction_2, location, dimension, getDiagramEditPart());
+ createView(UMLElementTypes.Interaction_Shape, location, dimension, getDiagramEditPart());
final InteractionEditPartTN interactionEditPart = (InteractionEditPartTN)EditPartUtils.findFirstChildEditPartWithId(getDiagramEditPart(), InteractionEditPartTN.VISUAL_ID);
assertNotNull("The interaction EditPart was not found under the diagram EditPart", interactionEditPart);
final InteractionCompartmentEditPartTN interactionCompartment = (InteractionCompartmentEditPartTN)EditPartUtils.findFirstChildEditPartWithId(interactionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactLifeline.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactLifeline.java index b5800704b50..ad09f2b1bbc 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactLifeline.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactLifeline.java @@ -86,9 +86,9 @@ public class TestTimingDiagramCompactLifeline extends AbstractTimingDiagramTestC public void create3LifelinesTest() {
final EditPart interactionCompartment = getDefaultInteractionCompartment();
assertNotNull("The interaction compartment was not found", interactionCompartment);
- createView(UMLElementTypes.Lifeline_20, interactionCompartment);
- createView(UMLElementTypes.Lifeline_20, interactionCompartment);
- createView(UMLElementTypes.Lifeline_20, interactionCompartment);
+ createView(UMLElementTypes.Lifeline_CompactShape, interactionCompartment);
+ createView(UMLElementTypes.Lifeline_CompactShape, interactionCompartment);
+ createView(UMLElementTypes.Lifeline_CompactShape, interactionCompartment);
assertEquals("The interaction compartment should only contain the 3 lifelines", 3, interactionCompartment.getChildren().size());
final List<? extends EditPart> editParts = EditPartUtils.findChildEditPartsWithId(interactionCompartment, CompactLifelineEditPartCN.VISUAL_ID);
assertEquals("The interaction compartment should contain 3 lifelines", 3, editParts.size());
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifeline.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifeline.java index a516f697d98..a6b38b006fb 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifeline.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifeline.java @@ -86,9 +86,9 @@ public class TestTimingDiagramFullLifeline extends AbstractTimingDiagramTestCase public void create3LifelinesTest() {
final EditPart interactionCompartment = getDefaultInteractionCompartment();
assertNotNull("The interaction compartment was not found", interactionCompartment);
- createView(UMLElementTypes.Lifeline_19, interactionCompartment);
- createView(UMLElementTypes.Lifeline_19, interactionCompartment);
- createView(UMLElementTypes.Lifeline_19, interactionCompartment);
+ createView(UMLElementTypes.Lifeline_FullShape, interactionCompartment);
+ createView(UMLElementTypes.Lifeline_FullShape, interactionCompartment);
+ createView(UMLElementTypes.Lifeline_FullShape, interactionCompartment);
assertEquals("The interaction compartment should only contain the 3 lifelines", 3, interactionCompartment.getChildren().size());
final List<? extends EditPart> editParts = EditPartUtils.findChildEditPartsWithId(interactionCompartment, FullLifelineEditPartCN.VISUAL_ID);
assertEquals("The interaction compartment should contain 3 lifelines", 3, editParts.size());
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForClassSubject.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForClassSubject.java index 8c9eab89042..a090339d5de 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForClassSubject.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForClassSubject.java @@ -44,12 +44,12 @@ public class TestUseCaseChildNodeForClassSubject extends TestChildNode { @Override protected CreateViewRequest createViewRequestShapeContainer() { - final CreateElementRequest semanticRequest = new CreateElementRequest(UMLElementTypes.Classifier_2015); + final CreateElementRequest semanticRequest = new CreateElementRequest(UMLElementTypes.Classifier_SubjectShape); semanticRequest.setParameter(CreateEditBasedElementCommand.ECLASS_HINT, UMLPackage.eINSTANCE.getClass_()); final ViewAndElementDescriptor viewDescriptor = new ViewAndElementDescriptor( new CreateElementRequestAdapter(semanticRequest), - Node.class, ((IHintedType) UMLElementTypes.Classifier_2015).getSemanticHint(), getDiagramEditPart().getDiagramPreferencesHint()); + Node.class, ((IHintedType) UMLElementTypes.Classifier_SubjectShape).getSemanticHint(), getDiagramEditPart().getDiagramPreferencesHint()); final CreateViewRequest requestcreation = new CreateViewAndElementRequest(viewDescriptor); return requestcreation; } @@ -79,19 +79,19 @@ public class TestUseCaseChildNodeForClassSubject extends TestChildNode { @Test @InteractiveTest public void testToManageUseCaseForClassSubject() { - testToManageNode(UMLElementTypes.UseCase_3009, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Classifier_2015, false); + testToManageNode(UMLElementTypes.UseCase_Shape_CCN, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Classifier_SubjectShape, false); } @Test @InteractiveTest public void testToManageUseCaseForComponentSubject() { - testToManageNode(UMLElementTypes.UseCase_3009, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Classifier_2015, false); + testToManageNode(UMLElementTypes.UseCase_Shape_CCN, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Classifier_SubjectShape, false); } @Test @InteractiveTest public void testToManageUseCaseForInterfaceSubject() { - testToManageNode(UMLElementTypes.UseCase_3009, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Classifier_2015, false); + testToManageNode(UMLElementTypes.UseCase_Shape_CCN, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Classifier_SubjectShape, false); } @Override diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForPackage.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForPackage.java index 776fb92b5a0..e1e038b3486 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForPackage.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseChildNodeForPackage.java @@ -38,7 +38,7 @@ public class TestUseCaseChildNodeForPackage extends TestChildNode { @Override protected CreateViewRequest createViewRequestShapeContainer() { - return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_2016, getDiagramEditPart().getDiagramPreferencesHint()); + return CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Package_Shape, getDiagramEditPart().getDiagramPreferencesHint()); } @Override @@ -56,7 +56,7 @@ public class TestUseCaseChildNodeForPackage extends TestChildNode { */ @Test public void testToManagePackage() { - testToManageNode(UMLElementTypes.Package_3014, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_3014, true); + testToManageNode(UMLElementTypes.Package_Shape_CN, UMLPackage.eINSTANCE.getPackage(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -64,7 +64,7 @@ public class TestUseCaseChildNodeForPackage extends TestChildNode { */ @Test public void testToManageActor() { - testToManageNode(UMLElementTypes.Actor_3011, UMLPackage.eINSTANCE.getActor(), UMLElementTypes.Package_3014, true); + testToManageNode(UMLElementTypes.Actor_Shape_CN, UMLPackage.eINSTANCE.getActor(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -72,7 +72,7 @@ public class TestUseCaseChildNodeForPackage extends TestChildNode { */ @Test public void testToManageComment() { - testToManageNode(UMLElementTypes.Comment_3015, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_3014, true); + testToManageNode(UMLElementTypes.Comment_Shape_CN, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Package_Shape_CN, true); } /** @@ -80,17 +80,17 @@ public class TestUseCaseChildNodeForPackage extends TestChildNode { */ @Test public void testToManageConstraint() { - testToManageNode(UMLElementTypes.Constraint_3010, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_3014, true); + testToManageNode(UMLElementTypes.Constraint_Shape_CN, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Package_Shape_CN, true); } @Test public void testToManageComponent() { - testToManageNode(UMLElementTypes.Component_3013, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Package_3014, true); + testToManageNode(UMLElementTypes.Component_Shape_CN, UMLPackage.eINSTANCE.getComponent(), UMLElementTypes.Package_Shape_CN, true); } @Test public void testToManageUseCase() { - testToManageNode(UMLElementTypes.UseCase_3012, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Package_3014, true); + testToManageNode(UMLElementTypes.UseCase_Shape_CN, UMLPackage.eINSTANCE.getUseCase(), UMLElementTypes.Package_Shape_CN, true); } @Override diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLink.java index 0a0a4e498eb..17c17b50b57 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLink.java @@ -40,7 +40,7 @@ public class TestUseCaseLink extends TestLink { */
@Test
public void testToManageDependency() {
- testToManageLink(UMLElementTypes.UseCase_2013,UMLElementTypes.UseCase_2013,UMLElementTypes.Dependency_4013,UMLElementTypes.Package_2016,true);
+ testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLElementTypes.Dependency_Edge,UMLElementTypes.Package_Shape,true);
}
@Override
@@ -58,28 +58,28 @@ public class TestUseCaseLink extends TestLink { */
@Test
public void testToManageDependencyUseCase_Actor() {
- testToManageLink(UMLElementTypes.UseCase_2013,UMLElementTypes.Actor_2011,UMLElementTypes.Dependency_4013,UMLElementTypes.Package_2016,true);
+ testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.Actor_Shape,UMLElementTypes.Dependency_Edge,UMLElementTypes.Package_Shape,true);
}
@Test
public void testToManageAssociationUseCase_UseCase() {
- testToManageLink(UMLElementTypes.UseCase_2013,UMLElementTypes.UseCase_2013,UMLElementTypes.Association_4011,UMLElementTypes.Package_2016,true);
+ testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLElementTypes.Association_Edge,UMLElementTypes.Package_Shape,true);
}
@Test
public void testToManageAssociationUseCase_Actor() {
- testToManageLink(UMLElementTypes.UseCase_2013,UMLElementTypes.Actor_2011,UMLElementTypes.Association_4011,UMLElementTypes.Package_2016,true);
+ testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.Actor_Shape,UMLElementTypes.Association_Edge,UMLElementTypes.Package_Shape,true);
}
@Test
public void testToManageAbstraction() {
- testToManageLink(UMLElementTypes.UseCase_2013,UMLElementTypes.UseCase_2013,UMLElementTypes.Abstraction_4015,UMLElementTypes.Package_2016,true);
+ testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLElementTypes.Abstraction_Edge,UMLElementTypes.Package_Shape,true);
}
@Test
public void testToManageUsage() {
- testToManageLink(UMLElementTypes.UseCase_2013,UMLElementTypes.UseCase_2013,UMLElementTypes.Usage_4016,UMLElementTypes.Package_2016,true);
+ testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLElementTypes.Usage_Edge,UMLElementTypes.Package_Shape,true);
}
@Test
public void testToManageRealization() {
- testToManageLink(UMLElementTypes.UseCase_2013,UMLElementTypes.UseCase_2013,UMLElementTypes.Realization_4017,UMLElementTypes.Package_2016,true);
+ testToManageLink(UMLElementTypes.UseCase_Shape,UMLElementTypes.UseCase_Shape,UMLElementTypes.Realization_Edge,UMLElementTypes.Package_Shape,true);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLinkOwnedBySource.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLinkOwnedBySource.java index 9ad5d74e50e..6a8827cbf63 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLinkOwnedBySource.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseLinkOwnedBySource.java @@ -50,27 +50,27 @@ public class TestUseCaseLinkOwnedBySource extends TestLinkOwnedBySource { @Test
public void testToManageGeneralization() {
- testToManageLink(UMLElementTypes.Actor_2011, UMLElementTypes.Actor_2011, UMLElementTypes.Generalization_4010, UMLElementTypes.Package_2016, false);
+ testToManageLink(UMLElementTypes.Actor_Shape, UMLElementTypes.Actor_Shape, UMLElementTypes.Generalization_Edge, UMLElementTypes.Package_Shape, false);
}
@Test
public void testToManagePackageMerge() {
- testToManageLink(UMLElementTypes.Package_2016, UMLElementTypes.Package_2016, UMLElementTypes.PackageMerge_4018, UMLElementTypes.Package_2016, true);
+ testToManageLink(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.PackageMerge_Edge, UMLElementTypes.Package_Shape, true);
}
@Test
public void testToManagePackageImport() {
- testToManageLink(UMLElementTypes.Package_2016, UMLElementTypes.Package_2016, UMLElementTypes.PackageImport_4019, UMLElementTypes.Package_2016, true);
+ testToManageLink(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape, UMLElementTypes.PackageImport_Edge, UMLElementTypes.Package_Shape, true);
}
@Test
public void testToManageExtend() {
- testToManageLink(UMLElementTypes.UseCase_2013, UMLElementTypes.UseCase_2013, UMLElementTypes.Extend_4009, UMLElementTypes.Package_2016, false);
+ testToManageLink(UMLElementTypes.UseCase_Shape, UMLElementTypes.UseCase_Shape, UMLElementTypes.Extend_Edge, UMLElementTypes.Package_Shape, false);
}
@Test
public void testToManageInclude() {
- testToManageLink(UMLElementTypes.UseCase_2013, UMLElementTypes.UseCase_2013, UMLElementTypes.Include_4008, UMLElementTypes.Package_2016, false);
+ testToManageLink(UMLElementTypes.UseCase_Shape, UMLElementTypes.UseCase_Shape, UMLElementTypes.Include_Edge, UMLElementTypes.Package_Shape, false);
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseTopNode.java index fda2a004fb4..b0a7e99059a 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseTopNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestUseCaseTopNode.java @@ -48,7 +48,7 @@ public class TestUseCaseTopNode extends TestSpecificTopNode { @Test
public void testToManagePackage() {
- testToManageTopNode(UMLElementTypes.Package_2016, UMLElementTypes.Package_2016);
+ testToManageTopNode(UMLElementTypes.Package_Shape, UMLElementTypes.Package_Shape);
}
/**
@@ -56,7 +56,7 @@ public class TestUseCaseTopNode extends TestSpecificTopNode { */
@Test
public void testToManageActor() {
- testToManageTopNode(UMLElementTypes.Actor_2011, UMLElementTypes.Package_2016);
+ testToManageTopNode(UMLElementTypes.Actor_Shape, UMLElementTypes.Package_Shape);
}
/**
@@ -64,7 +64,7 @@ public class TestUseCaseTopNode extends TestSpecificTopNode { */
@Test
public void testToManageComment() {
- testToManageTopNode(UMLElementTypes.Comment_2018, UMLElementTypes.Package_2016);
+ testToManageTopNode(UMLElementTypes.Comment_Shape, UMLElementTypes.Package_Shape);
}
@@ -73,7 +73,7 @@ public class TestUseCaseTopNode extends TestSpecificTopNode { */
@Test
public void testToManageConstraint() {
- testToManageTopNode(UMLElementTypes.Constraint_2017, UMLElementTypes.Package_2016);
+ testToManageTopNode(UMLElementTypes.Constraint_Shape, UMLElementTypes.Package_Shape);
}
/**
@@ -81,144 +81,144 @@ public class TestUseCaseTopNode extends TestSpecificTopNode { */
@Test
public void testToManageSubjectActivity() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getActivity());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getActivity());
}
@Test
public void testToManageSubjectActor() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getActor());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getActor());
}
@Test
public void testToManageSubjectArtifact() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getArtifact());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getArtifact());
}
// @Test
// public void testToManageSubjectAssociation() {
- // testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getAssociation());
+ // testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getAssociation());
// }
// @Test
// public void testToManageSubjectAssociationClass() {
- // testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getAssociationClass());
+ // testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getAssociationClass());
// }
@Test
public void testToManageSubjectClass() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getClass_());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getClass_());
}
@Test
public void testToManageSubjectCollaboration() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getCollaboration());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getCollaboration());
}
// @Test
// public void testToManageSubjectCommunicationPath() {
- // testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getCommunicationPath());
+ // testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getCommunicationPath());
// }
@Test
public void testToManageSubjectComponent() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getComponent());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getComponent());
}
@Test
public void testToManageSubjectDatatype() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getDataType());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getDataType());
}
@Test
public void testToManageSubjectDeployementSpecification() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getDeploymentSpecification());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getDeploymentSpecification());
}
@Test
public void testToManageSubjectDevice() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getDevice());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getDevice());
}
@Test
public void testToManageSubjectEnumeration() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getEnumeration());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getEnumeration());
}
@Test
public void testToManageSubjectExecutionEnvironment() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getExecutionEnvironment());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getExecutionEnvironment());
}
// @Test
// public void testToManageSubjectExtension() {
- // testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getExtension());
+ // testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getExtension());
// }
@Test
public void testToManageSubjectFunctionBehavior() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getFunctionBehavior());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getFunctionBehavior());
}
@Test
public void testToManageSubjectInformationItem() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getInformationItem());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getInformationItem());
}
@Test
public void testToManageSubjectInteraction() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getInteraction());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getInteraction());
}
@Test
public void testToManageSubjectInterface() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getInterface());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getInterface());
}
@Test
public void testToManageSubjectNode() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getNode());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getNode());
}
@Test
public void testToManageSubjectOpaqueBehavior() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getOpaqueBehavior());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getOpaqueBehavior());
}
@Test
public void testToManageSubjectPrimitiveType() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getPrimitiveType());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getPrimitiveType());
}
@Test
public void testToManageSubjectProtocolStateMachine() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getProtocolStateMachine());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getProtocolStateMachine());
}
@Test
public void testToManageSubjectSignal() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getSignal());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getSignal());
}
@Test
public void testToManageSubjectStateMachine() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getStateMachine());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getStateMachine());
}
@Test
public void testToManageSubjectStereotype() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getStereotype());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getStereotype());
}
@Test
public void testToManageSubjectUsecase() {
- testToManageSpecificTopNode(UMLElementTypes.Classifier_2015, UMLElementTypes.Package_2016, UMLPackage.eINSTANCE.getUseCase());
+ testToManageSpecificTopNode(UMLElementTypes.Classifier_SubjectShape, UMLElementTypes.Package_Shape, UMLPackage.eINSTANCE.getUseCase());
}
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/test/resources/models/modelUsecaseToSubjectInUsecaseDiagram.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/test/resources/models/modelUsecaseToSubjectInUsecaseDiagram.notation index 05d378120ac..fe2e8c50803 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/test/resources/models/modelUsecaseToSubjectInUsecaseDiagram.notation +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/test/resources/models/modelUsecaseToSubjectInUsecaseDiagram.notation @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"> <notation:Diagram xmi:id="_OQZEMP3-EeSV0evdLn_prw" type="UseCase" name="UseCase Diagram" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_RbjYoP3-EeSV0evdLn_prw" type="2015"> - <children xmi:type="notation:DecorationNode" xmi:id="_RbkmwP3-EeSV0evdLn_prw" type="5019"/> - <children xmi:type="notation:DecorationNode" xmi:id="_Rbkmwf3-EeSV0evdLn_prw" type="6047"> + <children xmi:type="notation:Shape" xmi:id="_RbjYoP3-EeSV0evdLn_prw" type="Classifier_SubjectShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_RbkmwP3-EeSV0evdLn_prw" type="Classifier_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_Rbkmwf3-EeSV0evdLn_prw" type="Classifier_FloatingNameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Rbkmwv3-EeSV0evdLn_prw" y="5"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_Rbkmw_3-EeSV0evdLn_prw" type="7011"> + <children xmi:type="notation:DecorationNode" xmi:id="_Rbkmw_3-EeSV0evdLn_prw" type="Classifier_UseCaseCompartment"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_u_ZKkP66EeSyDbXNqBLb-A" source="PapyrusCSSForceValue"> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_u_ZxoP66EeSyDbXNqBLb-A" key="canonical" value="true"/> </eAnnotations> - <children xmi:type="notation:Shape" xmi:id="_R6vPAP3-EeSV0evdLn_prw" type="3009"> - <children xmi:type="notation:DecorationNode" xmi:id="_R6vPAv3-EeSV0evdLn_prw" type="5018"/> - <children xmi:type="notation:DecorationNode" xmi:id="_R6vPA_3-EeSV0evdLn_prw" type="6045"> + <children xmi:type="notation:Shape" xmi:id="_R6vPAP3-EeSV0evdLn_prw" type="UseCase_Shape_CCN"> + <children xmi:type="notation:DecorationNode" xmi:id="_R6vPAv3-EeSV0evdLn_prw" type="UseCase_NameLabel_CCN"/> + <children xmi:type="notation:DecorationNode" xmi:id="_R6vPA_3-EeSV0evdLn_prw" type="UseCase_FloatingNameLabel_CCN"> <layoutConstraint xmi:type="notation:Location" xmi:id="_R6vPBP3-EeSV0evdLn_prw" y="5"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_R6vPBf3-EeSV0evdLn_prw" type="7012"> + <children xmi:type="notation:DecorationNode" xmi:id="_R6vPBf3-EeSV0evdLn_prw" type="UseCase_ExtensionPointCompartment_CCN"> <styles xmi:type="notation:SortingStyle" xmi:id="_R6vPBv3-EeSV0evdLn_prw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_R6vPB_3-EeSV0evdLn_prw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R6vPCP3-EeSV0evdLn_prw"/> @@ -29,7 +29,7 @@ <element xmi:type="uml:Class" href="modelUsecaseToSubjectInUsecaseDiagram.uml#_RbV9QP3-EeSV0evdLn_prw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RbjYof3-EeSV0evdLn_prw" x="443" y="152"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_OQZEMf3-EeSV0evdLn_prw" name="diagram_compatibility_version" stringValue="1.1.0"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_OQZEMf3-EeSV0evdLn_prw" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_OQZEMv3-EeSV0evdLn_prw"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_OQZEM_3-EeSV0evdLn_prw"> <owner xmi:type="uml:Model" href="modelUsecaseToSubjectInUsecaseDiagram.uml#_OQHXYP3-EeSV0evdLn_prw"/> @@ -37,18 +37,18 @@ <element xmi:type="uml:Model" href="modelUsecaseToSubjectInUsecaseDiagram.uml#_OQHXYP3-EeSV0evdLn_prw"/> </notation:Diagram> <notation:Diagram xmi:id="_cbvzwP67EeSyDbXNqBLb-A" type="UseCase" name="UseCaseDiagram2" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_dhsIIP67EeSyDbXNqBLb-A" type="2015"> - <children xmi:type="notation:DecorationNode" xmi:id="_dhukYP67EeSyDbXNqBLb-A" type="5019"/> - <children xmi:type="notation:DecorationNode" xmi:id="_dhukYf67EeSyDbXNqBLb-A" type="6047"> + <children xmi:type="notation:Shape" xmi:id="_dhsIIP67EeSyDbXNqBLb-A" type="Classifier_SubjectShape"> + <children xmi:type="notation:DecorationNode" xmi:id="_dhukYP67EeSyDbXNqBLb-A" type="Classifier_NameLabel"/> + <children xmi:type="notation:DecorationNode" xmi:id="_dhukYf67EeSyDbXNqBLb-A" type="Classifier_FloatingNameLabel"> <layoutConstraint xmi:type="notation:Location" xmi:id="_dhukYv67EeSyDbXNqBLb-A" y="5"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_dhukY_67EeSyDbXNqBLb-A" type="7011"> - <children xmi:type="notation:Shape" xmi:id="_epgEwP67EeSyDbXNqBLb-A" type="3009"> - <children xmi:type="notation:DecorationNode" xmi:id="_epgr0P67EeSyDbXNqBLb-A" type="5018"/> - <children xmi:type="notation:DecorationNode" xmi:id="_epgr0f67EeSyDbXNqBLb-A" type="6045"> + <children xmi:type="notation:DecorationNode" xmi:id="_dhukY_67EeSyDbXNqBLb-A" type="Classifier_UseCaseCompartment"> + <children xmi:type="notation:Shape" xmi:id="_epgEwP67EeSyDbXNqBLb-A" type="UseCase_Shape_CCN"> + <children xmi:type="notation:DecorationNode" xmi:id="_epgr0P67EeSyDbXNqBLb-A" type="UseCase_NameLabel_CCN"/> + <children xmi:type="notation:DecorationNode" xmi:id="_epgr0f67EeSyDbXNqBLb-A" type="UseCase_FloatingNameLabel_CCN"> <layoutConstraint xmi:type="notation:Location" xmi:id="_epgr0v67EeSyDbXNqBLb-A" y="5"/> </children> - <children xmi:type="notation:DecorationNode" xmi:id="_epgr0_67EeSyDbXNqBLb-A" type="7012"> + <children xmi:type="notation:DecorationNode" xmi:id="_epgr0_67EeSyDbXNqBLb-A" type="UseCase_ExtensionPointCompartment_CCN"> <styles xmi:type="notation:SortingStyle" xmi:id="_epgr1P67EeSyDbXNqBLb-A"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_epgr1f67EeSyDbXNqBLb-A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_epgr1v67EeSyDbXNqBLb-A"/> @@ -61,7 +61,7 @@ <element xmi:type="uml:Class" href="modelUsecaseToSubjectInUsecaseDiagram.uml#_dhhwEP67EeSyDbXNqBLb-A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dhsIIf67EeSyDbXNqBLb-A" x="306" y="111" width="410"/> </children> - <styles xmi:type="notation:StringValueStyle" xmi:id="_cbvzwf67EeSyDbXNqBLb-A" name="diagram_compatibility_version" stringValue="1.1.0"/> + <styles xmi:type="notation:StringValueStyle" xmi:id="_cbvzwf67EeSyDbXNqBLb-A" name="diagram_compatibility_version" stringValue="1.2.0"/> <styles xmi:type="notation:DiagramStyle" xmi:id="_cbvzwv67EeSyDbXNqBLb-A"/> <styles xmi:type="style:PapyrusViewStyle" xmi:id="_cbvzw_67EeSyDbXNqBLb-A"> <owner xmi:type="uml:Model" href="modelUsecaseToSubjectInUsecaseDiagram.uml#_OQHXYP3-EeSV0evdLn_prw"/> diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/org.eclipse.papyrus.uml.tools.tests.launch b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/org.eclipse.papyrus.uml.tools.tests.launch index 55ec3a2a614..dbeb06cc93e 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/org.eclipse.papyrus.uml.tools.tests.launch +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/org.eclipse.papyrus.uml.tools.tests.launch @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> <booleanAttribute key="append.args" value="true"/> -<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> <booleanAttribute key="askclear" value="false"/> <booleanAttribute key="automaticAdd" value="true"/> <booleanAttribute key="automaticValidate" value="false"/> @@ -37,7 +36,7 @@ <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms120m -Xmx512m -XX:PermSize=256M -XX:MaxPermSize=512M"/> <stringAttribute key="pde.version" value="3.3"/> -<stringAttribute key="product" value="org.eclipse.sdk.ide"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> @@ -45,5 +44,5 @@ <booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="false"/> -<booleanAttribute key="useProduct" value="false"/> +<booleanAttribute key="useProduct" value="true"/> </launchConfiguration> |