Bug 487380: Setup Neon build https://bugs.eclipse.org/bugs/show_bug.cgi?id=487380 Update the build for selection of stable or bleeding-edge dependencies according to a new NIGHTLY_DEPS Hudson configuration variable. Update the build for the latest stable RCPTT Runner Maven Plug-in for Eclipse Neon . Updates for final API changes in Papyrus Neon M6 in the refactoring of UI-dependent APIs and the replacement of integer visual IDs in the generated diagrams with meaningful shared IDs. Add the Papyrus C++ Library bundle to the codegen test bundle's dependencies because it is required in the target platform to resolve references from test models to the AnsiCLibrary.uml. (master branch - java 8_64 required) Change-Id: Ic73c458c4822813516d8e8eed552e3656bbfc5e4 Co-authored-by: Remi Schnekenburger <remi.schnekenburger@cea.fr> Signed-off-by: Remi Schnekenburger <remi.schnekenburger@cea.fr> Signed-off-by: Christian W. Damus <give.a.damus@gmail.com> Signed-off-by: Céline Janssens <Celine.Janssens@all4tec.net>
diff --git a/features/org.eclipse.papyrusrt.feature/feature.xml b/features/org.eclipse.papyrusrt.feature/feature.xml index f63c88c..bab7241 100644 --- a/features/org.eclipse.papyrusrt.feature/feature.xml +++ b/features/org.eclipse.papyrusrt.feature/feature.xml
@@ -30,8 +30,4 @@ id="org.eclipse.papyrusrt.umlrt.tooling.feature" version="0.0.0"/> - <includes - id="org.eclipse.papyrusrt.umlrt.core.cpp.feature" - version="0.0.0"/> - </feature>
diff --git a/models/tests/PingPong/PingPong.uml b/models/tests/PingPong/PingPong.uml index deac1e7..92451b8 100755 --- a/models/tests/PingPong/PingPong.uml +++ b/models/tests/PingPong/PingPong.uml
@@ -27,7 +27,7 @@ <packagedElement xmi:type="uml:Class" xmi:id="__EW3UCSSEeS0XNKzoL660g" name="Pinger" classifierBehavior="_aKvpECb0EeSBQ4h-CZj2Uw" isActive="true"> <ownedAttribute xmi:type="uml:Port" xmi:id="_PQ_kMCbnEeSBQ4h-CZj2Uw" name="PingPort" visibility="public" type="_bEbXYCS1EeS0XNKzoL660g" aggregation="composite" isBehavior="true"/> <ownedAttribute xmi:type="uml:Port" xmi:id="_cV5-wGxxEeSWy5Y1YWzXfQ" name="timerPort" visibility="protected" aggregation="composite" isBehavior="true"> - <type xmi:type="uml:Collaboration" href="platform:/plugin/org.eclipse.papyrusrt.rts/libraries/UMLRT-RTS.uml#_MxQZgGXsEeS_4daqvwyFrg"/> + <type xmi:type="uml:Collaboration" href="pathmap://UMLRTRTSLIB/UMLRT-RTS.uml#_MxQZgGXsEeS_4daqvwyFrg"/> </ownedAttribute> <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_aKvpECb0EeSBQ4h-CZj2Uw" name="Pinger_SM" isReentrant="false"> <region xmi:type="uml:Region" xmi:id="_ibsLkCb0EeSBQ4h-CZj2Uw" name="Region1"> @@ -57,7 +57,7 @@ </body> </effect> <trigger xmi:type="uml:Trigger" xmi:id="_B9aZUGx3EeSqHojLEIPEZQ" port="_cV5-wGxxEeSWy5Y1YWzXfQ"> - <event xmi:type="uml:CallEvent" href="platform:/plugin/org.eclipse.papyrusrt.rts/libraries/UMLRT-RTS.uml#_IaEO8HDxEeSwWKwNKw1iAA"/> + <event xmi:type="uml:CallEvent" href="pathmap://UMLRTRTSLIB/UMLRT-RTS.uml#_IaEO8HDxEeSwWKwNKw1iAA"/> </trigger> </transition> <subvertex xmi:type="uml:Pseudostate" xmi:id="_XswHMCb1EeSBQ4h-CZj2Uw" name="Initial"/>
diff --git a/plugins/umlrt/codegen/org.eclipse.papyrusrt.codegen.papyrus/plugin.xml b/plugins/umlrt/codegen/org.eclipse.papyrusrt.codegen.papyrus/plugin.xml index 6fe3bcc..ad673a6 100644 --- a/plugins/umlrt/codegen/org.eclipse.papyrusrt.codegen.papyrus/plugin.xml +++ b/plugins/umlrt/codegen/org.eclipse.papyrusrt.codegen.papyrus/plugin.xml
@@ -142,7 +142,7 @@ priority="1" startKind="startup"> <dependsOn - serviceKeyRef="org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor"> + serviceKeyRef="org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor"> </dependsOn> </service> </extension>
diff --git a/plugins/umlrt/codegen/org.eclipse.papyrusrt.codegen.papyrus/src/org/eclipse/papyrusrt/codegen/papyrus/internal/ModelCloseService.java b/plugins/umlrt/codegen/org.eclipse.papyrusrt.codegen.papyrus/src/org/eclipse/papyrusrt/codegen/papyrus/internal/ModelCloseService.java index b5586e5..163ffca 100644 --- a/plugins/umlrt/codegen/org.eclipse.papyrusrt.codegen.papyrus/src/org/eclipse/papyrusrt/codegen/papyrus/internal/ModelCloseService.java +++ b/plugins/umlrt/codegen/org.eclipse.papyrusrt.codegen.papyrus/src/org/eclipse/papyrusrt/codegen/papyrus/internal/ModelCloseService.java
@@ -9,13 +9,13 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor; import org.eclipse.papyrus.infra.core.resource.ModelSet; -import org.eclipse.papyrus.infra.core.services.EditorLifecycleEventListener; -import org.eclipse.papyrus.infra.core.services.EditorLifecycleManager; import org.eclipse.papyrus.infra.core.services.IService; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.core.services.ServicesRegistry; +import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; +import org.eclipse.papyrus.infra.ui.services.EditorLifecycleEventListener; +import org.eclipse.papyrus.infra.ui.services.EditorLifecycleManager; import org.eclipse.papyrusrt.codegen.cpp.ChangeTracker; import org.eclipse.papyrusrt.codegen.cpp.UML2ChangeTracker;
diff --git a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp/META-INF/MANIFEST.MF b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp/META-INF/MANIFEST.MF index 28b4a20..d532d94 100644 --- a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp/META-INF/MANIFEST.MF +++ b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp/META-INF/MANIFEST.MF
@@ -6,13 +6,13 @@ Bundle-Activator: org.eclipse.papyrusrt.umlrt.core.cpp.internal.Activator Bundle-Vendor: Eclipse Modeling Project Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.1", - org.eclipse.papyrus.infra.core.log;bundle-version="1.1.3", - org.eclipse.papyrus.infra.core;bundle-version="1.1.3", + org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core;bundle-version="1.2.0", org.eclipse.emf.common;bundle-version="2.11.0", org.eclipse.papyrusrt.umlrt.core;bundle-version="0.7.2", - org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.3", + org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0", org.eclipse.uml2.uml;bundle-version="5.1.0", - org.eclipse.papyrus.cpp.profile;bundle-version="1.1.3" + org.eclipse.papyrus.cpp.library;bundle-version="1.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrusrt.umlrt.core.cpp.defaultlanguage,
diff --git a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.sync/META-INF/MANIFEST.MF b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.sync/META-INF/MANIFEST.MF index 85a03a1..f37dbba 100644 --- a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.sync/META-INF/MANIFEST.MF +++ b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.sync/META-INF/MANIFEST.MF
@@ -7,16 +7,16 @@ Bundle-Vendor: Eclipse Modeling Project Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;bundle-version="2.11.0", - org.eclipse.papyrus.infra.sync;bundle-version="1.1.1", + org.eclipse.papyrus.infra.sync;bundle-version="1.2.0", org.eclipse.uml2.uml;bundle-version="5.1.0", com.google.guava;bundle-version="11.0.0", org.eclipse.emf.transaction;bundle-version="1.9.0", - org.eclipse.papyrus.infra.core;bundle-version="1.1.1", - org.eclipse.papyrus.infra.core.log;bundle-version="1.1.1", - org.eclipse.papyrus.uml.tools;bundle-version="1.1.1", + org.eclipse.papyrus.infra.core;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", + org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.2", org.eclipse.papyrusrt.umlrt.core;bundle-version="0.7.2", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.1" + org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrusrt.umlrt.core.sync;
diff --git a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation/META-INF/MANIFEST.MF b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation/META-INF/MANIFEST.MF index d4b860b..13389ad 100644 --- a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation/META-INF/MANIFEST.MF +++ b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ org.eclipse.core.runtime, org.eclipse.emf.validation;bundle-version="1.8.0", org.eclipse.uml2.uml;bundle-version="5.1.0", - org.eclipse.papyrus.uml.service.validation;bundle-version="1.1.1", - org.eclipse.papyrus.infra.core.log;bundle-version="1.1.1" + org.eclipse.papyrus.uml.service.validation;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrusrt.umlrt.core.validation,
diff --git a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation/plugin.xml b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation/plugin.xml index c7669f7..0f13362 100644 --- a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation/plugin.xml +++ b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation/plugin.xml
@@ -19,7 +19,7 @@ <constraint id="UMLRealTime.Capsule.All attributes of a capsule class can have at most one type" isEnabledByDefault="true" lang="OCLpivot" mode="Batch" name="All attributes of a capsule class can have at most one type" severity="ERROR" statusCode="1"> <message>All attributes of a capsule class can have at most one type</message><![CDATA[base_Class.ownedAttribute->forAll(at | at.type->size() <= 1)]]></constraint> <constraint id="UMLRealTime.Capsule.All operations of a capsule are guarded" isEnabledByDefault="true" lang="OCLpivot" mode="Batch" name="All operations of a capsule are guarded" severity="ERROR" statusCode="1"> - <message>All operations of a capsule are guarded</message><![CDATA[base_Class.ownedOperation->notEmpty() implies + <message>All operations of a capsule are guarded</message><![CDATA[base_Class.ownedOperation->notEmpty() implies (base_Class.ownedOperation->forAll(op | op.concurrency = UML::CallConcurrencyKind::guarded))]]></constraint> <constraint id="UMLRealTime.CapsulePart.Fixed capsule parts cannot have variable multiplicity" isEnabledByDefault="true" lang="OCLpivot" mode="Batch" name="Fixed capsule parts cannot have variable multiplicity" severity="ERROR" statusCode="1"> <message>Fixed capsule parts cannot have variable multiplicity</message><![CDATA[(base_Property.aggregation = UML::AggregationKind::composite and base_Property.lower > 0) implies (base_Property.upper = base_Property.lower)]]></constraint> @@ -32,10 +32,10 @@ <constraint id="UMLRealTime.RTPort.Only SPPs can publish their name" isEnabledByDefault="true" lang="OCLpivot" mode="Batch" name="Only SPPs can publish their name" severity="ERROR" statusCode="1"> <message>Only SPPs can publish their name</message><![CDATA[isPublish = (base_Port.isService and not isWired)]]></constraint> <constraint id="UMLRealTime.RTPort.All service ports must have public visibility and protected otherwise" isEnabledByDefault="true" lang="OCLpivot" mode="Batch" name="All service ports must have public visibility and protected otherwise" severity="ERROR" statusCode="1"> - <message>All service ports must have public visibility and protected otherwise</message><![CDATA[if (base_Port.isService) then - (base_Port.visibility = UML::VisibilityKind::public) -else - (base_Port.visibility = UML::VisibilityKind::protected) + <message>All service ports must have public visibility and protected otherwise</message><![CDATA[if (base_Port.isService) then + (base_Port.visibility = UML::VisibilityKind::public) +else + (base_Port.visibility = UML::VisibilityKind::protected) endif]]></constraint> <constraint id="UMLRealTime.RTPort.All unwired ports (SAPs and SPPs) must be behavior ports" isEnabledByDefault="true" lang="OCLpivot" mode="Batch" name="All unwired ports (SAPs and SPPs) must be behavior ports" severity="ERROR" statusCode="1"> <message>All unwired ports (SAPs and SPPs) must be behavior ports</message><![CDATA[(not isWired) implies (base_Port.isBehavior)]]></constraint> @@ -44,14 +44,14 @@ <constraint id="UMLRealTime.RTConnector.Only binary connectors are allowed" isEnabledByDefault="true" lang="OCLpivot" mode="Batch" name="Only binary connectors are allowed" severity="ERROR" statusCode="1"> <message>Only binary connectors are allowed</message><![CDATA[base_Connector.end->size() = 2]]></constraint> <constraint id="UMLRealTime.RTRedefinedElement.Exclusion can only be applied to some UML-RT model elements" isEnabledByDefault="true" lang="OCLpivot" mode="Batch" name="Exclusion can only be applied to some UML-RT model elements" severity="ERROR" statusCode="1"> - <message>Exclusion can only be applied to some UML-RT model elements</message><![CDATA[let el = base_RedefinableElement in -(el.oclIsKindOf(UML::Port) or - el.oclIsKindOf(UML::Property) or - el.oclIsKindOf(UML::Operation) or - el.oclIsKindOf(UML::Behavior) or - el.oclIsKindOf(UML::Region) or - el.oclIsKindOf(UML::State) or - el.oclIsKindOf(UML::StateMachine) or + <message>Exclusion can only be applied to some UML-RT model elements</message><![CDATA[let el = base_RedefinableElement in +(el.oclIsKindOf(UML::Port) or + el.oclIsKindOf(UML::Property) or + el.oclIsKindOf(UML::Operation) or + el.oclIsKindOf(UML::Behavior) or + el.oclIsKindOf(UML::Region) or + el.oclIsKindOf(UML::State) or + el.oclIsKindOf(UML::StateMachine) or el.oclIsKindOf(UML::Transition))]]></constraint> </constraints> </constraintProvider>
diff --git a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/.classpath b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/.classpath index 098194c..4f83b23 100644 --- a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/.classpath +++ b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/.classpath
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="output" path="bin"/> </classpath>
diff --git a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/.settings/org.eclipse.jdt.core.prefs b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/.settings/org.eclipse.jdt.core.prefs index f42de36..0c68a61 100644 --- a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/META-INF/MANIFEST.MF b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/META-INF/MANIFEST.MF index 3eb6968..a04a12a 100644 --- a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/META-INF/MANIFEST.MF +++ b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/META-INF/MANIFEST.MF
@@ -9,26 +9,24 @@ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", org.eclipse.uml2.uml;bundle-version="5.1.0", org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.2", - org.eclipse.papyrus.infra.tools;bundle-version="1.1.2", - org.eclipse.papyrus.infra.core.log;bundle-version="1.1.2", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.2", - org.eclipse.papyrus.uml.service.types;bundle-version="1.1.2", + org.eclipse.papyrus.infra.tools;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", + org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0", org.eclipse.core.expressions;bundle-version="3.5.0", - org.eclipse.papyrus.infra.core;bundle-version="1.1.2", + org.eclipse.papyrus.infra.core;bundle-version="1.2.0", com.google.guava;bundle-version="11.0.0", - org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.1.2", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.2", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.2", - org.eclipse.papyrus.infra.emf;bundle-version="1.1.2", - org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.2", - org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes;bundle-version="1.1.2", - org.eclipse.papyrus.uml.tools.elementtypesconfigurations;bundle-version="1.1.2", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.2", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.2", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.2", - org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="1.1.3", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.3" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 + org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", + org.eclipse.papyrus.infra.types;bundle-version="2.0.0", + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0", + org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", + org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0" +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrusrt.umlrt.core, org.eclipse.papyrusrt.umlrt.core.defaultlanguage,
diff --git a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/elementtypes/uml-rt.elementtypesconfigurations b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/elementtypes/uml-rt.elementtypesconfigurations index e4e5641..6d6d529 100644 --- a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/elementtypes/uml-rt.elementtypesconfigurations +++ b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/elementtypes/uml-rt.elementtypesconfigurations
@@ -1,884 +1,272 @@ <?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:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.0" - xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" - xmlns:invariantcontainerruleconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.0" - xmlns:invariantstereotyperuleconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invariantstereotyperule/1.0" - xmlns:invarianttypeconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.0" - xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" - name="UMLRealTime" - identifier="org.eclipse.papyrusrt.umlrt.core.elementTypeSet" - metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <elementTypeConfigurations - xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration" - xmi:id="_PlJqoCjSEeWnbt9JeO78zA" - name="Capsule" - identifier="org.eclipse.papyrusrt.umlrt.core.Capsule"> - <iconEntry - xmi:id="_ZoA2sCjSEeWnbt9JeO78zA" - iconPath="/icons/capsule.png" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> +<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:invariantcontainerrule="http://www.eclipse.org/papyrus/emf/types/invariantcontainerrule/1.1" xmlns:invariantstereotyperule="http://www.eclipse.org/papyrus/uml/types/invariantstereotyperule/1.1" xmlns:rulebased="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.elementTypeSet" name="UMLRealTime" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML"> + <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="_PlJqoCjSEeWnbt9JeO78zA" identifier="org.eclipse.papyrusrt.umlrt.core.Capsule" name="Capsule"> + <iconEntry xmi:id="_ZoA2sCjSEeWnbt9JeO78zA" iconPath="/icons/capsule.png" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_aFigMCjSEeWnbt9JeO78zA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.CapsuleEditHelperAdvice" - description="Advice for Capsule" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.CapsuleEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.CapsuleEditHelperAdvice" - inheritance="all"/> - <invariantRuleConfiguration - xsi:type="invarianttypeconfiguration:AndInvariantRuleConfiguration" - xmi:id="_Nrf-gCncEeWft4RSJ1SvrQ"> - <composedRules - xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration" - xmi:id="_TNaKwCjSEeWnbt9JeO78zA" - stereotypeQualifiedName="UMLRealTime::Capsule" - requiredProfile="UMLRealTime"/> - <composedRules - xsi:type="invariantcontainerruleconfiguration:InvariantContainerRuleConfiguration" - xmi:id="_OzdsICncEeWft4RSJ1SvrQ"> - <permissions - xmi:id="_PyBmICncEeWft4RSJ1SvrQ" - containerType="org.eclipse.papyrus.uml.Classsifier"/> - <permissions - xmi:id="_zqkr4CneEeWft4RSJ1SvrQ" - containerType="org.eclipse.papyrus.uml.Package" - permitted="true"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_aFigMCjSEeWnbt9JeO78zA" description="Advice for Capsule" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.CapsuleEditHelperAdvice"/> + <ruleConfiguration xsi:type="rulebased:AndRuleConfiguration" xmi:id="_Nrf-gCncEeWft4RSJ1SvrQ"> + <composedRules xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_TNaKwCjSEeWnbt9JeO78zA" stereotypeQualifiedName="UMLRealTime::Capsule" requiredProfile="UMLRealTime"/> + <composedRules xsi:type="invariantcontainerrule:InvariantContainerRuleConfiguration" xmi:id="_OzdsICncEeWft4RSJ1SvrQ"> + <permissions xmi:id="_PyBmICncEeWft4RSJ1SvrQ" containerType="org.eclipse.papyrus.uml.Classsifier"/> + <permissions xmi:id="_zqkr4CneEeWft4RSJ1SvrQ" containerType="org.eclipse.papyrus.uml.Package" permitted="true"/> </composedRules> - </invariantRuleConfiguration> + </ruleConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration" - xmi:id="_ubJctKeUEeSUR5jX0TaAcA" - name="CapsulePart" - identifier="org.eclipse.papyrusrt.umlrt.core.CapsulePart"> - <iconEntry - xmi:id="_ubJctaeUEeSUR5jX0TaAcA" - iconPath="/icons/capsule_part.png" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="_ubJctKeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.CapsulePart" name="CapsulePart"> + <iconEntry xmi:id="_ubJctaeUEeSUR5jX0TaAcA" iconPath="/icons/capsule_part.png" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_rNMNMDmzEeWtl4GYVYxVqw" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.CapsulePartEditHelperAdvice" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.CapsulePartEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.CapsulePartEditHelperAdvice" - inheritance="all"/> - <invariantRuleConfiguration - xsi:type="invarianttypeconfiguration:AndInvariantRuleConfiguration" - xmi:id="_AfRUIHCxEeWXnK1tKtvjWg"> - <composedRules - xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration" - xmi:id="_ubJctqeUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::CapsulePart" - requiredProfile="UMLRealTime"/> - <composedRules - xsi:type="invariantcontainerruleconfiguration:InvariantContainerRuleConfiguration" - xmi:id="_DVhIgHCxEeWXnK1tKtvjWg"> - <permissions - xmi:id="_DVhIgnCxEeWXnK1tKtvjWg" - containerType="org.eclipse.papyrusrt.umlrt.core.Capsule" - permitted="true" - strict="true"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_rNMNMDmzEeWtl4GYVYxVqw" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.CapsulePartEditHelperAdvice"/> + <ruleConfiguration xsi:type="rulebased:AndRuleConfiguration" xmi:id="_AfRUIHCxEeWXnK1tKtvjWg"> + <composedRules xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_ubJctqeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::CapsulePart" requiredProfile="UMLRealTime"/> + <composedRules xsi:type="invariantcontainerrule:InvariantContainerRuleConfiguration" xmi:id="_DVhIgHCxEeWXnK1tKtvjWg"> + <permissions xmi:id="_DVhIgnCxEeWXnK1tKtvjWg" containerType="org.eclipse.papyrusrt.umlrt.core.Capsule" permitted="true" strict="true"/> </composedRules> - </invariantRuleConfiguration> + </ruleConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration" - xmi:id="_ubJct6eUEeSUR5jX0TaAcA" - name="Protocol" - identifier="org.eclipse.papyrusrt.umlrt.core.Protocol"> - <iconEntry - xmi:id="_ubJcuKeUEeSUR5jX0TaAcA" - iconPath="/icons/protocol.png" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="_ubJct6eUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.Protocol" name="Protocol"> + <iconEntry xmi:id="_ubJcuKeUEeSUR5jX0TaAcA" iconPath="/icons/protocol.png" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_Z9YkQM2BEeSdoOwgSyouYw" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.ProtocolEditHelperAdvice" - description="Advice for Protocol" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.ProtocolEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.ProtocolEditHelperAdvice" - inheritance="all"/> - <invariantRuleConfiguration - xsi:type="invarianttypeconfiguration:AndInvariantRuleConfiguration" - xmi:id="_CxBRIHCtEeWTJ8Tk7IfaIw"> - <composedRules - xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration" - xmi:id="_HBJCgHCtEeWTJ8Tk7IfaIw" - stereotypeQualifiedName="UMLRealTime::Protocol" - requiredProfile="UMLRealTime"/> - <composedRules - xsi:type="invariantcontainerruleconfiguration:InvariantContainerRuleConfiguration" - xmi:id="_MfmPQHCtEeWTJ8Tk7IfaIw"> - <permissions - xmi:id="_MfmPQXCtEeWTJ8Tk7IfaIw" - containerType="org.eclipse.papyrus.uml.Classsifier"/> - <permissions - xmi:id="_MfmPQnCtEeWTJ8Tk7IfaIw" - containerType="org.eclipse.papyrus.uml.Package" - permitted="true"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Z9YkQM2BEeSdoOwgSyouYw" description="Advice for Protocol" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.ProtocolEditHelperAdvice"/> + <ruleConfiguration xsi:type="rulebased:AndRuleConfiguration" xmi:id="_CxBRIHCtEeWTJ8Tk7IfaIw"> + <composedRules xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_HBJCgHCtEeWTJ8Tk7IfaIw" stereotypeQualifiedName="UMLRealTime::Protocol" requiredProfile="UMLRealTime"/> + <composedRules xsi:type="invariantcontainerrule:InvariantContainerRuleConfiguration" xmi:id="_MfmPQHCtEeWTJ8Tk7IfaIw"> + <permissions xmi:id="_MfmPQXCtEeWTJ8Tk7IfaIw" containerType="org.eclipse.papyrus.uml.Classsifier"/> + <permissions xmi:id="_MfmPQnCtEeWTJ8Tk7IfaIw" containerType="org.eclipse.papyrus.uml.Package" permitted="true"/> </composedRules> - </invariantRuleConfiguration> + </ruleConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration" - xmi:id="_ubJcuqeUEeSUR5jX0TaAcA" - name="RTPort" - identifier="org.eclipse.papyrusrt.umlrt.core.RTPort"> - <iconEntry - xmi:id="_ubJcu6eUEeSUR5jX0TaAcA" - iconPath="/icons/rt_port.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="_ubJcuqeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.RTPort" name="RTPort"> + <iconEntry xmi:id="_ubJcu6eUEeSUR5jX0TaAcA" iconPath="/icons/rt_port.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_eO0v8DdbEeWK7ZUbpAMB-g" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPortEditHelperAdvice" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPortEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPortEditHelperAdvice" - inheritance="all"/> - <invariantRuleConfiguration - xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration" - xmi:id="_ubJcvKeUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::RTPort" - requiredProfile="UMLRealTime"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_eO0v8DdbEeWK7ZUbpAMB-g" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPortEditHelperAdvice"/> + <ruleConfiguration xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_ubJcvKeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTPort" requiredProfile="UMLRealTime"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_Tw98sBAZEeWc8PaHufXjyA" - name="ExternalBehaviorPort" - identifier="org.eclipse.papyrusrt.umlrt.core.ExternalBehaviorPort"> - <iconEntry - xmi:id="_Tw98sRAZEeWc8PaHufXjyA" - iconPath="/icons/full/obj16/Port.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Tw98sBAZEeWc8PaHufXjyA" identifier="org.eclipse.papyrusrt.umlrt.core.ExternalBehaviorPort" name="ExternalBehaviorPort"> + <iconEntry xmi:id="_Tw98sRAZEeWc8PaHufXjyA" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPort</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_Tw98shAZEeWc8PaHufXjyA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.ExternalBehaviorPortEditHelperAdvice" - description="Advice for ExternalBehaviorPort" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.ExternalBehaviorPortEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.ExternalBehaviorPortEditHelperAdvice" - inheritance="all"/> - <matcherConfiguration - xmi:id="_Tw98sxAZEeWc8PaHufXjyA" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.ExternalBehaviorPortMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Tw98shAZEeWc8PaHufXjyA" description="Advice for ExternalBehaviorPort" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.ExternalBehaviorPortEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_Tw98sxAZEeWc8PaHufXjyA" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.ExternalBehaviorPortMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_g1WZABAZEeWc8PaHufXjyA" - name="InternalBehaviorPort" - identifier="org.eclipse.papyrusrt.umlrt.core.InternalBehaviorPort"> - <iconEntry - xmi:id="_g1WZARAZEeWc8PaHufXjyA" - iconPath="/icons/full/obj16/Port.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_g1WZABAZEeWc8PaHufXjyA" identifier="org.eclipse.papyrusrt.umlrt.core.InternalBehaviorPort" name="InternalBehaviorPort"> + <iconEntry xmi:id="_g1WZARAZEeWc8PaHufXjyA" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPort</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_g1WZAhAZEeWc8PaHufXjyA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.InternalBehaviorPortEditHelperAdvice" - description="Advice for InternalBehaviorPort" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.InternalBehaviorPortEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.InternalBehaviorPortEditHelperAdvice" - inheritance="all"/> - <matcherConfiguration - xmi:id="_g1WZAxAZEeWc8PaHufXjyA" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.InternalBehaviorPortMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_g1WZAhAZEeWc8PaHufXjyA" description="Advice for InternalBehaviorPort" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.InternalBehaviorPortEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_g1WZAxAZEeWc8PaHufXjyA" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.InternalBehaviorPortMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_iDtW4Ag0EeWeYfBUTX0Hjg" - name="RelayPort" - identifier="org.eclipse.papyrusrt.umlrt.core.RelayPort"> - <iconEntry - xmi:id="_iDtW4Qg0EeWeYfBUTX0Hjg" - iconPath="/icons/full/obj16/Port.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_iDtW4Ag0EeWeYfBUTX0Hjg" identifier="org.eclipse.papyrusrt.umlrt.core.RelayPort" name="RelayPort"> + <iconEntry xmi:id="_iDtW4Qg0EeWeYfBUTX0Hjg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPort</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_QfX2QAhcEeWeYfBUTX0Hjg" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RelayPortEditHelperAdvice" - description="Advice for RelayPort" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RelayPortEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RelayPortEditHelperAdvice" - inheritance="all"/> - <matcherConfiguration - xmi:id="_WMxw4AhPEeWeYfBUTX0Hjg" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RelayPortMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_QfX2QAhcEeWeYfBUTX0Hjg" description="Advice for RelayPort" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RelayPortEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_WMxw4AhPEeWeYfBUTX0Hjg" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RelayPortMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_8YJUAAg0EeWeYfBUTX0Hjg" - name="ServiceAccessPoint" - identifier="org.eclipse.papyrusrt.umlrt.core.ServiceAccessPoint"> - <iconEntry - xmi:id="_8YJUAQg0EeWeYfBUTX0Hjg" - iconPath="/icons/full/obj16/Port.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_8YJUAAg0EeWeYfBUTX0Hjg" identifier="org.eclipse.papyrusrt.umlrt.core.ServiceAccessPoint" name="ServiceAccessPoint"> + <iconEntry xmi:id="_8YJUAQg0EeWeYfBUTX0Hjg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPort</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_uIrj0AhkEeWeYfBUTX0Hjg" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.ServiceAccessPointEditHelperAdvice" - description="Advice for ServiceAccessPoint" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.ServiceAccessPointEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.ServiceAccessPointEditHelperAdvice" - inheritance="all"/> - <matcherConfiguration - xmi:id="_ZKAXAAhPEeWeYfBUTX0Hjg" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.ServiceAccessPointMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_uIrj0AhkEeWeYfBUTX0Hjg" description="Advice for ServiceAccessPoint" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.ServiceAccessPointEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_ZKAXAAhPEeWeYfBUTX0Hjg" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.ServiceAccessPointMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_2sbuYAg0EeWeYfBUTX0Hjg" - name="ServiceProvisionPoint" - identifier="org.eclipse.papyrusrt.umlrt.core.ServiceProvisionPoint"> - <iconEntry - xmi:id="_2sbuYQg0EeWeYfBUTX0Hjg" - iconPath="/icons/full/obj16/Port.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_2sbuYAg0EeWeYfBUTX0Hjg" identifier="org.eclipse.papyrusrt.umlrt.core.ServiceProvisionPoint" name="ServiceProvisionPoint"> + <iconEntry xmi:id="_2sbuYQg0EeWeYfBUTX0Hjg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPort</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_fvQxwAhlEeWeYfBUTX0Hjg" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.ServiceProvisionPointEditHelperAdvice" - description="Advice for ServiceProvisionPoint" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.ServiceProvisionPointEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.ServiceProvisionPointEditHelperAdvice" - inheritance="all"/> - <matcherConfiguration - xmi:id="_c2EZEAhPEeWeYfBUTX0Hjg" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.ServiceProvisionPointMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_fvQxwAhlEeWeYfBUTX0Hjg" description="Advice for ServiceProvisionPoint" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.ServiceProvisionPointEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_c2EZEAhPEeWeYfBUTX0Hjg" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.ServiceProvisionPointMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration" - xmi:id="_ubJcvaeUEeSUR5jX0TaAcA" - name="RTConnector" - identifier="org.eclipse.papyrusrt.umlrt.core.RTConnector"> - <iconEntry - xmi:id="_ubJcvqeUEeSUR5jX0TaAcA" - iconPath="/icons/full/obj16/Connector.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="_ubJcvaeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.RTConnector" name="RTConnector"> + <iconEntry xmi:id="_ubJcvqeUEeSUR5jX0TaAcA" iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/> <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_ZN8u0DrDEeW4rtSdzI2euA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTConnectorEditHelperAdvice" - description="" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTConnectorEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTConnectorEditHelperAdvice" - inheritance="all"/> - <invariantRuleConfiguration - xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration" - xmi:id="_ubJcv6eUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::RTConnector" - requiredProfile="UMLRealTime"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_ZN8u0DrDEeW4rtSdzI2euA" description="" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTConnectorEditHelperAdvice"/> + <ruleConfiguration xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_ubJcv6eUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTConnector" requiredProfile="UMLRealTime"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration" - xmi:id="_ubJcwKeUEeSUR5jX0TaAcA" - name="ProtocolContainer" - identifier="org.eclipse.papyrusrt.umlrt.core.ProtocolContainer"> - <iconEntry - xmi:id="_ubJcwaeUEeSUR5jX0TaAcA" - iconPath="/icons/protocol_container.png" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="_ubJcwKeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.ProtocolContainer" name="ProtocolContainer"> + <iconEntry xmi:id="_ubJcwaeUEeSUR5jX0TaAcA" iconPath="/icons/protocol_container.png" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_5m7RcOc2EeSW0_lDigZ13g" - name="Protocol Container Advice" - identifier="org.eclipse.papyrusrt.umlrt.core.ProcotolContainerAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.ProtocolContainerEditHelperAdvice" - inheritance="all"/> - <invariantRuleConfiguration - xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration" - xmi:id="_ubJcwqeUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::ProtocolContainer" - requiredProfile="UMLRealTime"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_5m7RcOc2EeSW0_lDigZ13g" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.ProtocolContainerEditHelperAdvice"/> + <ruleConfiguration xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_ubJcwqeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::ProtocolContainer" requiredProfile="UMLRealTime"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration" - xmi:id="_ubJcw6eUEeSUR5jX0TaAcA" - name="RTRExcludedElement" - identifier="org.eclipse.papyrusrt.umlrt.core.RTRExcludedElement"> - <iconEntry - xmi:id="_ubJcxKeUEeSUR5jX0TaAcA" - iconPath="/icons/rt_excludedElement.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="_ubJcw6eUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.RTRExcludedElement" name="RTRExcludedElement"> + <iconEntry xmi:id="_ubJcxKeUEeSUR5jX0TaAcA" iconPath="/icons/rt_excludedElement.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrus.uml.RedefinableElement</specializedTypesID> - <invariantRuleConfiguration - xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration" - xmi:id="_ubJcxaeUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::RTRExcludedElement" - requiredProfile="UMLRealTime"/> + <ruleConfiguration xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_ubJcxaeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTRExcludedElement" requiredProfile="UMLRealTime"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration" - xmi:id="_ubJcxqeUEeSUR5jX0TaAcA" - name="RTMessageSet" - identifier="org.eclipse.papyrusrt.umlrt.core.RTMessageSet"> - <iconEntry - xmi:id="_ubJcx6eUEeSUR5jX0TaAcA" - iconPath="/icons/rt_messageset_undefined.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="_ubJcxqeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.RTMessageSet" name="RTMessageSet"> + <iconEntry xmi:id="_ubJcx6eUEeSUR5jX0TaAcA" iconPath="/icons/rt_messageset_undefined.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_1caKcOUVEeSW0_lDigZ13g" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.MessageSetEditHelperAdvice" - description="Edit helper advice on " - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.MessageSetEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.MessageSetEditHelperAdvice"/> - <invariantRuleConfiguration - xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration" - xmi:id="_ubJcyKeUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::RTMessageSet" - requiredProfile="UMLRealTime"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_1caKcOUVEeSW0_lDigZ13g" description="Edit helper advice on " editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.MessageSetEditHelperAdvice"/> + <ruleConfiguration xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_ubJcyKeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTMessageSet" requiredProfile="UMLRealTime"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_At0JAONwEeSMDu6IBsn9eg" - name="ProtocolMessage" - identifier="org.eclipse.papyrusrt.umlrt.core.ProtocolMessage"> - <iconEntry - xmi:id="_At0JAeNwEeSMDu6IBsn9eg" - iconPath="/icons/protocolmessage_undefined.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_At0JAONwEeSMDu6IBsn9eg" identifier="org.eclipse.papyrusrt.umlrt.core.ProtocolMessage" name="ProtocolMessage"> + <iconEntry xmi:id="_At0JAeNwEeSMDu6IBsn9eg" iconPath="/icons/protocolmessage_undefined.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_At0JAuNwEeSMDu6IBsn9eg" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageEditHelperAdvice" - description="advice for Operation" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageEditHelperAdvice" - inheritance="all"/> - <matcherConfiguration - xmi:id="_OPE2wOqQEeS-F5lSZrhlvg" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTMessageMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_At0JAuNwEeSMDu6IBsn9eg" description="advice for Operation" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_OPE2wOqQEeS-F5lSZrhlvg" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTMessageMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_1puuMOToEeSW0_lDigZ13g" - name="ProtocolMessageIN" - identifier="org.eclipse.papyrusrt.umlrt.core.ProtocolMessageIn"> - <iconEntry - xmi:id="_7aYeMOToEeSW0_lDigZ13g" - iconPath="/icons/protocolmessage_in.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_1puuMOToEeSW0_lDigZ13g" identifier="org.eclipse.papyrusrt.umlrt.core.ProtocolMessageIn" name="ProtocolMessageIN"> + <iconEntry xmi:id="_7aYeMOToEeSW0_lDigZ13g" iconPath="/icons/protocolmessage_in.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessage</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_7aZFQOToEeSW0_lDigZ13g" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageInEditHelperAdvice" - description="advice for Operation as Message IN" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageInEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageInEditHelperAdvice" - inheritance="all"/> - <matcherConfiguration - xmi:id="_PLPkEOqQEeS-F5lSZrhlvg" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTMessageInMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_7aZFQOToEeSW0_lDigZ13g" description="advice for Operation as Message IN" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageInEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_PLPkEOqQEeS-F5lSZrhlvg" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTMessageInMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_Vv9-gOzDEeSbg9FMiG2BVg" - name="ProtocolMessageOUT" - identifier="org.eclipse.papyrusrt.umlrt.core.ProtocolMessageOut"> - <iconEntry - xmi:id="_Vv9-gezDEeSbg9FMiG2BVg" - iconPath="/icons/protocolmessage_out.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Vv9-gOzDEeSbg9FMiG2BVg" identifier="org.eclipse.papyrusrt.umlrt.core.ProtocolMessageOut" name="ProtocolMessageOUT"> + <iconEntry xmi:id="_Vv9-gezDEeSbg9FMiG2BVg" iconPath="/icons/protocolmessage_out.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessage</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_Vv9-guzDEeSbg9FMiG2BVg" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageOutEditHelperAdvice" - description="advice for Operation as RTMessage OUT" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageOutEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageOutEditHelperAdvice" - inheritance="all"/> - <matcherConfiguration - xmi:id="_Vv9-g-zDEeSbg9FMiG2BVg" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTMessageOutMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Vv9-guzDEeSbg9FMiG2BVg" description="advice for Operation as RTMessage OUT" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageOutEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_Vv9-g-zDEeSbg9FMiG2BVg" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTMessageOutMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_WBNfgOzDEeSbg9FMiG2BVg" - name="ProtocolMessageINOUT" - identifier="org.eclipse.papyrusrt.umlrt.core.ProtocolMessageInOut"> - <iconEntry - xmi:id="_WBNfgezDEeSbg9FMiG2BVg" - iconPath="/icons/protocolmessage_inout.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_WBNfgOzDEeSbg9FMiG2BVg" identifier="org.eclipse.papyrusrt.umlrt.core.ProtocolMessageInOut" name="ProtocolMessageINOUT"> + <iconEntry xmi:id="_WBNfgezDEeSbg9FMiG2BVg" iconPath="/icons/protocolmessage_inout.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessage</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_WBNfguzDEeSbg9FMiG2BVg" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageInOutEditHelperAdvice" - description="advice for Operation as Message INOUT" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageInOutEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageInOutEditHelperAdvice" - inheritance="all"/> - <matcherConfiguration - xmi:id="_WBNfg-zDEeSbg9FMiG2BVg" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTMessageInOutMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_WBNfguzDEeSbg9FMiG2BVg" description="advice for Operation as Message INOUT" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationAsMessageInOutEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_WBNfg-zDEeSbg9FMiG2BVg" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTMessageInOutMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration" - xmi:id="_FBp9oIOeEeWzpNA4uyLyjA" - name="RTStateMachine" - identifier="org.eclipse.papyrusrt.umlrt.core.RTStateMachine"> - <iconEntry - xmi:id="_QTF1oIOeEeWzpNA4uyLyjA" - iconPath="/icons/rt_statemachine.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="_FBp9oIOeEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTStateMachine" name="RTStateMachine"> + <iconEntry xmi:id="_QTF1oIOeEeWzpNA4uyLyjA" iconPath="/icons/rt_statemachine.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrus.uml.StateMachine</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_ktjmUIOsEeWzpNA4uyLyjA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTStateMachineEditHelperAdvice" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTStateMachineEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTStateMachineEditHelperAdvice" - inheritance="all"/> - <invariantRuleConfiguration - xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration" - xmi:id="_Rq2-MIO8EeWzpNA4uyLyjA" - stereotypeQualifiedName="UMLRealTimeStateMach::RTStateMachine" - requiredProfile="UMLRealTimeStateMach"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_ktjmUIOsEeWzpNA4uyLyjA" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTStateMachineEditHelperAdvice"/> + <ruleConfiguration xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_Rq2-MIO8EeWzpNA4uyLyjA" stereotypeQualifiedName="UMLRealTimeStateMach::RTStateMachine" requiredProfile="UMLRealTimeStateMach"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration" - xmi:id="_bJ2Q4IOrEeWzpNA4uyLyjA" - name="RTRegion" - identifier="org.eclipse.papyrusrt.umlrt.core.RTRegion"> - <iconEntry - xmi:id="_bJ2Q4YOrEeWzpNA4uyLyjA" - iconPath="/icons/rt_region.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="_bJ2Q4IOrEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTRegion" name="RTRegion"> + <iconEntry xmi:id="_bJ2Q4YOrEeWzpNA4uyLyjA" iconPath="/icons/rt_region.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrus.uml.Region</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_39KZUIOtEeWzpNA4uyLyjA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTRegionEditHelperAdvice" - description="" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTRegionEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTRegionEditHelperAdvice" - inheritance="all"/> - <invariantRuleConfiguration - xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration" - xmi:id="_JxuewIO8EeWzpNA4uyLyjA" - stereotypeQualifiedName="UMLRealTimeStateMach::RTRegion" - requiredProfile="UMLRealTimeStateMach"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_39KZUIOtEeWzpNA4uyLyjA" description="" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTRegionEditHelperAdvice"/> + <ruleConfiguration xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_JxuewIO8EeWzpNA4uyLyjA" stereotypeQualifiedName="UMLRealTimeStateMach::RTRegion" requiredProfile="UMLRealTimeStateMach"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration" - xmi:id="_uSaQsIVtEeWzpNA4uyLyjA" - name="RTState" - identifier="org.eclipse.papyrusrt.umlrt.core.RTState"> - <iconEntry - xmi:id="_uSaQsYVtEeWzpNA4uyLyjA" - iconPath="/icons/rt_state.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="_uSaQsIVtEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTState" name="RTState"> + <iconEntry xmi:id="_uSaQsYVtEeWzpNA4uyLyjA" iconPath="/icons/rt_state.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrus.uml.State</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_uSaQsoVtEeWzpNA4uyLyjA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTStateEditHelperAdvice" - description="" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTStateEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTStateEditHelperAdvice" - inheritance="all"/> - <invariantRuleConfiguration - xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration" - xmi:id="_uSaQs4VtEeWzpNA4uyLyjA" - stereotypeQualifiedName="UMLRealTimeStateMach::RTState" - requiredProfile="UMLRealTimeStateMach"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_uSaQsoVtEeWzpNA4uyLyjA" description="" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTStateEditHelperAdvice"/> + <ruleConfiguration xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_uSaQs4VtEeWzpNA4uyLyjA" stereotypeQualifiedName="UMLRealTimeStateMach::RTState" requiredProfile="UMLRealTimeStateMach"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration" - xmi:id="_ghKR4IVuEeWzpNA4uyLyjA" - name="RTPseudoState" - identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState"> - <iconEntry - xmi:id="_ghKR4YVuEeWzpNA4uyLyjA" - iconPath="/icons/rt_pseudostate.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="rulebased:RuleBasedTypeConfiguration" xmi:id="_ghKR4IVuEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState" name="RTPseudoState"> + <iconEntry xmi:id="_ghKR4YVuEeWzpNA4uyLyjA" iconPath="/icons/rt_pseudostate.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrus.uml.Pseudostate</specializedTypesID> - <invariantRuleConfiguration - xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration" - xmi:id="_ghKR44VuEeWzpNA4uyLyjA" - stereotypeQualifiedName="UMLRealTimeStateMach::RTPseudostate" - requiredProfile="UMLRealTimeStateMach"/> + <ruleConfiguration xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration" xmi:id="_ghKR44VuEeWzpNA4uyLyjA" stereotypeQualifiedName="UMLRealTimeStateMach::RTPseudostate" requiredProfile="UMLRealTimeStateMach"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_Nio88IVvEeWzpNA4uyLyjA" - name="RTPseudoState (Choice)" - identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Choice"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Nio88IVvEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Choice" name="RTPseudoState (Choice)"> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_SRwskIVxEeWzpNA4uyLyjA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateChoiceEditHelperAdvice" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateChoiceEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateChoiceEditHelperAdvice"/> - <matcherConfiguration - xmi:id="_QqeQkIVvEeWzpNA4uyLyjA" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateChoiceMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_SRwskIVxEeWzpNA4uyLyjA" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateChoiceEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_QqeQkIVvEeWzpNA4uyLyjA" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateChoiceMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_VviJEIVzEeWzpNA4uyLyjA" - name="RTPseudoState (DeepHistory)" - identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_DeepHistory"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_VviJEIVzEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_DeepHistory" name="RTPseudoState (DeepHistory)"> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_VviJEYVzEeWzpNA4uyLyjA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateDeepHistoryEditHelperAdvice" - description="" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateDeepHistoryEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateDeepHistoryEditHelperAdvice"/> - <matcherConfiguration - xmi:id="_VviJEoVzEeWzpNA4uyLyjA" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateDeepHistoryMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_VviJEYVzEeWzpNA4uyLyjA" description="" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateDeepHistoryEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_VviJEoVzEeWzpNA4uyLyjA" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateDeepHistoryMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_1nai0IWCEeWzpNA4uyLyjA" - name="RTPseudoState (EntryPoint)" - identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_EntryPoint"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_1nai0IWCEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_EntryPoint" name="RTPseudoState (EntryPoint)"> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_1nai0YWCEeWzpNA4uyLyjA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateEntryPointEditHelperAdvice" - description="" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateEntryPointEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateEntryPointEditHelperAdvice"/> - <matcherConfiguration - xmi:id="_1nai0oWCEeWzpNA4uyLyjA" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateEntryPointMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_1nai0YWCEeWzpNA4uyLyjA" description="" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateEntryPointEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_1nai0oWCEeWzpNA4uyLyjA" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateEntryPointMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_27lgcIWCEeWzpNA4uyLyjA" - name="RTPseudoState (ExitPoint)" - identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_ExitPoint"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_27lgcIWCEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_ExitPoint" name="RTPseudoState (ExitPoint)"> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_27lgcYWCEeWzpNA4uyLyjA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateExitPointEditHelperAdvice" - description="" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateExitPointEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateExitPointEditHelperAdvice"/> - <matcherConfiguration - xmi:id="_27lgcoWCEeWzpNA4uyLyjA" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateExitPointMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_27lgcYWCEeWzpNA4uyLyjA" description="" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateExitPointEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_27lgcoWCEeWzpNA4uyLyjA" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateExitPointMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_27lgc4WCEeWzpNA4uyLyjA" - name="RTPseudoState (Fork)" - identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Fork"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_27lgc4WCEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Fork" name="RTPseudoState (Fork)"> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_27lgdIWCEeWzpNA4uyLyjA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateForkEditHelperAdvice" - description="" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateForkEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateForkEditHelperAdvice"/> - <matcherConfiguration - xmi:id="_27lgdYWCEeWzpNA4uyLyjA" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateForkMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_27lgdIWCEeWzpNA4uyLyjA" description="" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateForkEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_27lgdYWCEeWzpNA4uyLyjA" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateForkMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_3KEBUIWCEeWzpNA4uyLyjA" - name="RTPseudoState (Initial)" - identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Initial"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_3KEBUIWCEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Initial" name="RTPseudoState (Initial)"> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_3KEBUYWCEeWzpNA4uyLyjA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateInitialEditHelperAdvice" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateInitialEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateInitialEditHelperAdvice"/> - <matcherConfiguration - xmi:id="_3KEBUoWCEeWzpNA4uyLyjA" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateInitialMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_3KEBUYWCEeWzpNA4uyLyjA" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateInitialEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_3KEBUoWCEeWzpNA4uyLyjA" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateInitialMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_27lgdoWCEeWzpNA4uyLyjA" - name="RTPseudoState (Join)" - identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Join"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_27lgdoWCEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Join" name="RTPseudoState (Join)"> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_27lgd4WCEeWzpNA4uyLyjA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateJoinEditHelperAdvice" - description="" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateJoinEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateJoinEditHelperAdvice"/> - <matcherConfiguration - xmi:id="_27lgeIWCEeWzpNA4uyLyjA" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateJoinMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_27lgd4WCEeWzpNA4uyLyjA" description="" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateJoinEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_27lgeIWCEeWzpNA4uyLyjA" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateJoinMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_3KEBU4WCEeWzpNA4uyLyjA" - name="RTPseudoState (Junction)" - identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Junction"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_3KEBU4WCEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Junction" name="RTPseudoState (Junction)"> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_3KEBVIWCEeWzpNA4uyLyjA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateJunctionEditHelperAdvice" - description="" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateJunctionEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateJunctionEditHelperAdvice"/> - <matcherConfiguration - xmi:id="_3KEBVYWCEeWzpNA4uyLyjA" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateJunctionMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_3KEBVIWCEeWzpNA4uyLyjA" description="" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateJunctionEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_3KEBVYWCEeWzpNA4uyLyjA" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateJunctionMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_3KEBVoWCEeWzpNA4uyLyjA" - name="RTPseudoState (ShallowHistory)" - identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_ShallowHistory"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_3KEBVoWCEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_ShallowHistory" name="RTPseudoState (ShallowHistory)"> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_3KEBV4WCEeWzpNA4uyLyjA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateShallowHistoryEditHelperAdvice" - description="" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateShallowHistoryEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateShallowHistoryEditHelperAdvice"/> - <matcherConfiguration - xmi:id="_3KEBWIWCEeWzpNA4uyLyjA" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateShallowHistoryMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_3KEBV4WCEeWzpNA4uyLyjA" description="" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateShallowHistoryEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_3KEBWIWCEeWzpNA4uyLyjA" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateShallowHistoryMatcher"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_3q42cIWCEeWzpNA4uyLyjA" - name="RTPseudoState (Terminate)" - identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Terminate"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_3q42cIWCEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Terminate" name="RTPseudoState (Terminate)"> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState</specializedTypesID> - <editHelperAdviceConfiguration - xmi:id="_3q42cYWCEeWzpNA4uyLyjA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateTerminateEditHelperAdvice" - description="" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateTerminateEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateTerminateEditHelperAdvice"/> - <matcherConfiguration - xmi:id="_3q42coWCEeWzpNA4uyLyjA" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateTerminateMatcher"/> + <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_3q42cYWCEeWzpNA4uyLyjA" description="" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPseudoStateTerminateEditHelperAdvice"/> + <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_3q42coWCEeWzpNA4uyLyjA" matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.RTPseudoStateTerminateMatcher"/> </elementTypeConfigurations> - <adviceBindingsConfigurations - xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" - xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" - name="Apply Capsule" - identifier="org.eclipse.papyrusrt.umlrt.core.capsule" - target="_PlJqoCjSEeWnbt9JeO78zA"> - <stereotypesToApply - xmi:id="_ubJcyqeUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::Capsule" - updateName="true"> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.capsule" target="_PlJqoCjSEeWnbt9JeO78zA"> + <stereotypesToApply xmi:id="_ubJcyqeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::Capsule" updateName="true"> <requiredProfiles>UMLRealTime</requiredProfiles> </stereotypesToApply> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" - xmi:id="_ubJcy6eUEeSUR5jX0TaAcA" - name="Apply CapsulePart" - identifier="org.eclipse.papyrusrt.umlrt.core.capsulePart" - target="_ubJctKeUEeSUR5jX0TaAcA"> - <stereotypesToApply - xmi:id="_ubJczKeUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::CapsulePart" - updateName="true"> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcy6eUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.capsulePart" target="_ubJctKeUEeSUR5jX0TaAcA"> + <stereotypesToApply xmi:id="_ubJczKeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::CapsulePart" updateName="true"> <requiredProfiles>UMLRealTime</requiredProfiles> </stereotypesToApply> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" - xmi:id="_ubJczaeUEeSUR5jX0TaAcA" - name="Apply Protocol" - identifier="org.eclipse.papyrusrt.umlrt.core.protocol" - target="_ubJct6eUEeSUR5jX0TaAcA"> - <stereotypesToApply - xmi:id="_ubJczqeUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::Protocol"> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJczaeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.protocol" target="_ubJct6eUEeSUR5jX0TaAcA"> + <stereotypesToApply xmi:id="_ubJczqeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::Protocol"> <requiredProfiles>UMLRealTime</requiredProfiles> </stereotypesToApply> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" - xmi:id="_ubJcz6eUEeSUR5jX0TaAcA" - name="Apply RTPort" - identifier="org.eclipse.papyrusrt.umlrt.core.rTPort" - target="_ubJcuqeUEeSUR5jX0TaAcA"> - <stereotypesToApply - xmi:id="_ubJc0KeUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::RTPort" - updateName="true"> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJcz6eUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.rTPort" target="_ubJcuqeUEeSUR5jX0TaAcA"> + <stereotypesToApply xmi:id="_ubJc0KeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTPort" updateName="true"> <requiredProfiles>UMLRealTime</requiredProfiles> </stereotypesToApply> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" - xmi:id="_ubJc0aeUEeSUR5jX0TaAcA" - name="Apply RTConnector" - identifier="org.eclipse.papyrusrt.umlrt.core.rTConnector" - target="_ubJcvaeUEeSUR5jX0TaAcA"> - <stereotypesToApply - xmi:id="_ubJc0qeUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::RTConnector" - updateName="true"> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJc0aeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.rTConnector" target="_ubJcvaeUEeSUR5jX0TaAcA"> + <stereotypesToApply xmi:id="_ubJc0qeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTConnector" updateName="true"> <requiredProfiles>UMLRealTime</requiredProfiles> </stereotypesToApply> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" - xmi:id="_ubJc06eUEeSUR5jX0TaAcA" - name="Apply ProtocolContainer" - identifier="org.eclipse.papyrusrt.umlrt.core.protocolContainer" - target="_ubJcwKeUEeSUR5jX0TaAcA"> - <stereotypesToApply - xmi:id="_ubJc1KeUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::ProtocolContainer"> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJc06eUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.protocolContainer" target="_ubJcwKeUEeSUR5jX0TaAcA"> + <stereotypesToApply xmi:id="_ubJc1KeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::ProtocolContainer"> <requiredProfiles>UMLRealTime</requiredProfiles> </stereotypesToApply> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" - xmi:id="_ubJc1aeUEeSUR5jX0TaAcA" - name="Apply RTRExcludedElement" - identifier="org.eclipse.papyrusrt.umlrt.core.rTRExcludedElement" - target="_ubJcw6eUEeSUR5jX0TaAcA"> - <stereotypesToApply - xmi:id="_ubJc1qeUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::RTRExcludedElement" - updateName="true"> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJc1aeUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.rTRExcludedElement" target="_ubJcw6eUEeSUR5jX0TaAcA"> + <stereotypesToApply xmi:id="_ubJc1qeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTRExcludedElement" updateName="true"> <requiredProfiles>UMLRealTime</requiredProfiles> </stereotypesToApply> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" - xmi:id="_ubJc16eUEeSUR5jX0TaAcA" - name="Apply RTMessageSet" - identifier="org.eclipse.papyrusrt.umlrt.core.rTMessageSet" - target="_ubJcxqeUEeSUR5jX0TaAcA"> - <stereotypesToApply - xmi:id="_ubJc2KeUEeSUR5jX0TaAcA" - stereotypeQualifiedName="UMLRealTime::RTMessageSet"> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ubJc16eUEeSUR5jX0TaAcA" identifier="org.eclipse.papyrusrt.umlrt.core.rTMessageSet" target="_ubJcxqeUEeSUR5jX0TaAcA"> + <stereotypesToApply xmi:id="_ubJc2KeUEeSUR5jX0TaAcA" stereotypeQualifiedName="UMLRealTime::RTMessageSet"> <requiredProfiles>UMLRealTime</requiredProfiles> </stereotypesToApply> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" - xmi:id="_DP3acIOfEeWzpNA4uyLyjA" - name="Apply RTStateMachine" - identifier="org.eclipse.papyrusrt.umlrt.core.apply.statemachine" - target="_FBp9oIOeEeWzpNA4uyLyjA"> - <stereotypesToApply - xmi:id="_DP3acYOfEeWzpNA4uyLyjA" - stereotypeQualifiedName="UMLRealTimeStateMach::RTStateMachine"> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_DP3acIOfEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.apply.statemachine" target="_FBp9oIOeEeWzpNA4uyLyjA"> + <stereotypesToApply xmi:id="_DP3acYOfEeWzpNA4uyLyjA" stereotypeQualifiedName="UMLRealTimeStateMach::RTStateMachine"> <requiredProfiles>UMLRealTimeStateMach</requiredProfiles> </stereotypesToApply> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" - xmi:id="_7TJvoIOrEeWzpNA4uyLyjA" - name="Apply RTRegion" - identifier="org.eclipse.papyrusrt.umlrt.core.apply.rtregion" - target="_bJ2Q4IOrEeWzpNA4uyLyjA"> - <stereotypesToApply - xmi:id="_7TJvoYOrEeWzpNA4uyLyjA" - stereotypeQualifiedName="UMLRealTimeStateMach::RTRegion"> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_7TJvoIOrEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.apply.rtregion" target="_bJ2Q4IOrEeWzpNA4uyLyjA"> + <stereotypesToApply xmi:id="_7TJvoYOrEeWzpNA4uyLyjA" stereotypeQualifiedName="UMLRealTimeStateMach::RTRegion"> <requiredProfiles>UMLRealTimeStateMach</requiredProfiles> </stereotypesToApply> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" - xmi:id="_E1omAIVuEeWzpNA4uyLyjA" - name="Apply RTState" - identifier="org.eclipse.papyrusrt.umlrt.core.apply.rtstate" - target="_uSaQsIVtEeWzpNA4uyLyjA"> - <stereotypesToApply - xmi:id="_E1omAYVuEeWzpNA4uyLyjA" - stereotypeQualifiedName="UMLRealTimeStateMach::RTState"> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_E1omAIVuEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.apply.rtstate" target="_uSaQsIVtEeWzpNA4uyLyjA"> + <stereotypesToApply xmi:id="_E1omAYVuEeWzpNA4uyLyjA" stereotypeQualifiedName="UMLRealTimeStateMach::RTState"> <requiredProfiles>UMLRealTimeStateMach</requiredProfiles> </stereotypesToApply> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" - xmi:id="_ogJhsIVuEeWzpNA4uyLyjA" - name="Apply RTPseudoState" - identifier="org.eclipse.papyrusrt.umlrt.core.apply.rtpseudostate" - inheritance="all" - target="_ghKR4IVuEeWzpNA4uyLyjA"> - <stereotypesToApply - xmi:id="_ogJhsYVuEeWzpNA4uyLyjA" - stereotypeQualifiedName="UMLRealTimeStateMach::RTPseudostate"> + <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_ogJhsIVuEeWzpNA4uyLyjA" identifier="org.eclipse.papyrusrt.umlrt.core.apply.rtpseudostate" target="_ghKR4IVuEeWzpNA4uyLyjA" inheritance="all"> + <stereotypesToApply xmi:id="_ogJhsYVuEeWzpNA4uyLyjA" stereotypeQualifiedName="UMLRealTimeStateMach::RTPseudostate"> <requiredProfiles>UMLRealTimeStateMach</requiredProfiles> </stereotypesToApply> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xmi:id="_Mb9lIOc0EeSW0_lDigZ13g" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.BehavioredClassifierEditHelperAdvice" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.BehavioredClassifierEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.BehavioredClassifierEditHelperAdvice" - inheritance="all"> - <target - xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" - href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNtlYCEeS0WsAAtVmToA"/> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Mb9lIOc0EeSW0_lDigZ13g" identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.BehavioredClassifierEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.BehavioredClassifierEditHelperAdvice"> + <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNtlYCEeS0WsAAtVmToA"/> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xmi:id="_72t-8AXkEeW5T4E9mdKXVA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationEditHelperAdvice" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationEditHelperAdvice" - inheritance="all"> - <target - xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" - href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc8ZVFYCEeS0WsAAtVmToA"/> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_72t-8AXkEeW5T4E9mdKXVA" identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.OperationEditHelperAdvice"> + <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc8ZVFYCEeS0WsAAtVmToA"/> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xmi:id="_r5JYoCFnEeWBfIZwqJOHYw" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.PackageEditHelperAdvice" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.PackageEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.PackageEditHelperAdvice" - inheritance="all"> - <target - xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" - href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9nZVYCEeS0WsAAtVmToA"/> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_r5JYoCFnEeWBfIZwqJOHYw" identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.PackageEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.PackageEditHelperAdvice"> + <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9nZVYCEeS0WsAAtVmToA"/> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xmi:id="_ea-osCjNEeWnbt9JeO78zA" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.UMLRTElementOwnerAdvice" - description="Advice to check UML-RT elements can be created or moved to UML-RT models" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.UMLRTElementOwnerAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.UMLRTElementOwnerAdvice" - inheritance="all"> - <target - xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" - href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA"/> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jUBfIFYbEeW5U97f0qNNMQ" identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.ClassEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.ClassEditHelperAdvice"> + <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA"/> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xmi:id="_jUBfIFYbEeW5U97f0qNNMQ" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.ClassEditHelperAdvice" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.ClassEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.ClassEditHelperAdvice" - inheritance="all"> - <target - xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" - href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA"/> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_B4-ngFYiEeW5U97f0qNNMQ" identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.EnumerationEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.EnumerationEditHelperAdvice"> + <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUVlYCEeS0WsAAtVmToA"/> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xmi:id="_B4-ngFYiEeW5U97f0qNNMQ" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.EnumerationEditHelperAdvice" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.EnumerationEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.EnumerationEditHelperAdvice" - inheritance="all"> - <target - xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" - href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUVlYCEeS0WsAAtVmToA"/> - </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xmi:id="_jAsoYF1LEeWhkeBZ-5J_3Q" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.CallEventEditHelperAdvice" - description="Advice for Call Event in Papyrus RT" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.CallEventEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.CallEventEditHelperAdvice" - inheritance="all"> - <target - xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" - href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNylYCEeS0WsAAtVmToA"/> + <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jAsoYF1LEeWhkeBZ-5J_3Q" description="Advice for Call Event in Papyrus RT" identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.CallEventEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.CallEventEditHelperAdvice"> + <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNylYCEeS0WsAAtVmToA"/> </adviceBindingsConfigurations> </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/elementtypes/uml-rt.stereotypeapplications.elementtypesconfigurations b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/elementtypes/uml-rt.stereotypeapplications.elementtypesconfigurations index 946f3af..fd9fcb5 100644 --- a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/elementtypes/uml-rt.stereotypeapplications.elementtypesconfigurations +++ b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/elementtypes/uml-rt.stereotypeapplications.elementtypesconfigurations
@@ -1,35 +1,7 @@ -<?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:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" - xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" - name="UMLRealTimeStereotypeApplication" - description="Element types for the StereotypeApplications based on UMLRT metamodel" - identifier="org.eclipse.papyrusrt.umlrt.core.stereotypeapplication.elementTypeSet" - metamodelNsURI="http://www.eclipse.org/papyrus/umlrt"> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" - xmi:id="_fLC2sJj6EeWZCpgAnl3YPQ" - name="UMLRT::RTPort" - description="Metamodel Type for the RTPort element" - identifier="org.eclipse.papyrusrt.umlrt.core.stereotypeapplication.RTPort" - hint="UMLRT::RTPort" - editHelperClassName="org.eclipse.papyrusrt.umlrt.core.types.helper.RTPortEditHelper"> - <iconEntry - xmi:id="_AfvxkJj7EeWZCpgAnl3YPQ" - iconPath="/icons/rt_port.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> - <eClass - href="../../../plugin/org.eclipse.papyrusrt.umlrt.profile/umlProfile/UMLRealTime.ecore#//RTPort"/> +<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="Element types for the StereotypeApplications based on UMLRT metamodel" identifier="org.eclipse.papyrusrt.umlrt.core.stereotypeapplication.elementTypeSet" metamodelNsURI="http://www.eclipse.org/papyrus/umlrt" name="UMLRealTimeStereotypeApplication" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" xmi:version="2.0"> + <elementTypeConfigurations description="Metamodel Type for the RTPort element" editHelperClassName="org.eclipse.papyrusrt.umlrt.core.types.helper.RTPortEditHelper" hint="UMLRT::RTPort" identifier="org.eclipse.papyrusrt.umlrt.core.stereotypeapplication.RTPort" name="UMLRT::RTPort" xmi:id="_fLC2sJj6EeWZCpgAnl3YPQ" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"> + <iconEntry bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="/icons/rt_port.gif" xmi:id="_AfvxkJj7EeWZCpgAnl3YPQ"/> + <eClass href="../../../plugin/org.eclipse.papyrusrt.umlrt.profile/umlProfile/UMLRealTime.ecore#//RTPort"/> </elementTypeConfigurations> - <adviceBindingsConfigurations - xmi:id="_Y6fpMJj7EeWZCpgAnl3YPQ" - name="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPortStereotypeApplicationEditHelperAdvice" - description="Edit helper advice for RTPort stereotype application" - identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPortStereotypeApplicationEditHelperAdvice" - editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPortStereotypeApplicationEditHelperAdvice" - inheritance="all" - target="_fLC2sJj6EeWZCpgAnl3YPQ"/> -</elementtypesconfigurations:ElementTypeSetConfiguration> + <adviceBindingsConfigurations description="Edit helper advice for RTPort stereotype application" editHelperAdviceClassName="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPortStereotypeApplicationEditHelperAdvice" identifier="org.eclipse.papyrusrt.umlrt.core.types.advice.RTPortStereotypeApplicationEditHelperAdvice" inheritance="all" target="_fLC2sJj6EeWZCpgAnl3YPQ" xmi:id="_Y6fpMJj7EeWZCpgAnl3YPQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/> +</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/plugin.xml b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/plugin.xml index 7131fe3..7e07533 100644 --- a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/plugin.xml +++ b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/plugin.xml
@@ -28,16 +28,16 @@ </propertyTester> </extension> <extension - point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration"> + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> <elementTypeSet - id="org.eclipse.papyrusrt.umlrt.core.elementTypeSet" + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" path="elementtypes/uml-rt.elementtypesconfigurations"> </elementTypeSet> </extension> <extension - point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration"> + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> <elementTypeSet - id="org.eclipse.papyrusrt.umlrt.core.stereotypeapplication.elementTypeSet" + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" path="elementtypes/uml-rt.stereotypeapplications.elementtypesconfigurations"> </elementTypeSet> </extension>
diff --git a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/src/org/eclipse/papyrusrt/umlrt/core/types/advice/MessageSetEditHelperAdvice.java b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/src/org/eclipse/papyrusrt/umlrt/core/types/advice/MessageSetEditHelperAdvice.java index 41d4baf..0cce50d 100644 --- a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/src/org/eclipse/papyrusrt/umlrt/core/types/advice/MessageSetEditHelperAdvice.java +++ b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/src/org/eclipse/papyrusrt/umlrt/core/types/advice/MessageSetEditHelperAdvice.java
@@ -284,7 +284,7 @@ TransactionalEditingDomain domain = ServiceUtilsForEObject.getInstance() .getTransactionalEditingDomain(targetClassifier); CreateElementRequest createElementRequest = new CreateElementRequest(domain, - targetClassifier.eContainer(), UMLElementTypes.CallEvent_2084); + targetClassifier.eContainer(), UMLElementTypes.CallEvent_Shape); // Add the operation as parameter createElementRequest.setParameter(OWNED_OPERATION, operation); IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetClassifier);
diff --git a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/src/org/eclipse/papyrusrt/umlrt/core/types/advice/UMLRTElementOwnerAdvice.java b/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/src/org/eclipse/papyrusrt/umlrt/core/types/advice/UMLRTElementOwnerAdvice.java deleted file mode 100644 index 2e0230b..0000000 --- a/plugins/umlrt/core/org.eclipse.papyrusrt.umlrt.core/src/org/eclipse/papyrusrt/umlrt/core/types/advice/UMLRTElementOwnerAdvice.java +++ /dev/null
@@ -1,276 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2010 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: - * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation - * - *****************************************************************************/ -package org.eclipse.papyrusrt.umlrt.core.types.advice; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EReference; -import org.eclipse.emf.ecore.EStructuralFeature; -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.edithelper.AbstractEditHelperAdvice; -import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest; -import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest; -import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration; -import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType; -import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration; -import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration; -import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration; -import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration; -import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration; -import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration; -import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.IInvariantRule; -import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.InvariantRuleConfigurationTypeRegistry; -import org.eclipse.papyrus.uml.tools.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration; -import org.eclipse.papyrusrt.umlrt.core.Activator; -import org.eclipse.uml2.uml.Element; -import org.eclipse.uml2.uml.Package; -import org.eclipse.uml2.uml.Profile; - -/** - * Advice for potential owners of UMLRT based Element Types. This advice will help to the pre/post validation for the creation of child element which is - * describe by any element type based on UML-RT profile. - */ -public class UMLRTElementOwnerAdvice extends AbstractEditHelperAdvice { - - @Override - public boolean approveRequest(IEditCommandRequest request) { - List<ConfiguredHintedSpecializationElementType> types = getInvariantTypes(request); - - // Must approve from the whole hierarchy - for (ConfiguredHintedSpecializationElementType configuredHintedSpecializationElementType : types) { - if (!approveRequest(configuredHintedSpecializationElementType, request)) { - return false; - } - } - - return true; - } - - /** - * @param request - * - */ - @SuppressWarnings("unchecked") - protected List<ConfiguredHintedSpecializationElementType> getInvariantTypes(IEditCommandRequest request) { - List<ConfiguredHintedSpecializationElementType> result = new ArrayList<ConfiguredHintedSpecializationElementType>(); - if (request instanceof CreateElementRequest) { - IElementType typeToCreate = ((CreateElementRequest) request).getElementType(); - List<ConfiguredHintedSpecializationElementType> superConfiguredTypes = getAllInvariantTypes(typeToCreate); - result.addAll(superConfiguredTypes); - } else if (request instanceof SetRequest) { - // check the feature to set is a containment feature and element to move is an extended element type - EStructuralFeature feature = ((SetRequest) request).getFeature(); - if (feature instanceof EReference) { - if (((EReference) feature).isContainment()) { - - // containment. Check the kind of element to edit - Object value = ((SetRequest) request).getValue(); - List<Object> values = new ArrayList<Object>(); - // value = single object or list ? - if (value instanceof EObject) { - values.add(value); - } else if (value instanceof List<?>) { - values.addAll((List<Object>) value); - } - - for (Object object : values) { - if (object instanceof EObject) { - IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching((EObject) object, request.getClientContext()); - for (IElementType type : types) { - if (type instanceof ConfiguredHintedSpecializationElementType) { - if (((ConfiguredHintedSpecializationElementType) type).getConfiguration() instanceof InvariantTypeConfiguration) { - result.add((ConfiguredHintedSpecializationElementType) type); - - List<ConfiguredHintedSpecializationElementType> superConfiguredTypes = getAllSuperConfiguredTypes((ConfiguredHintedSpecializationElementType) type); - result.addAll(superConfiguredTypes); - } - } - } - } - } - } - } - } else if (request instanceof MoveRequest) { - // check the feature to set is a containment feature and element to move is an extended element type - Map<EObject, EReference> objectsToMove = ((MoveRequest) request).getElementsToMove(); - for (Entry<EObject, EReference> movedElement : objectsToMove.entrySet()) { - // do not compute with reference, this can be null. This could be interesting to check... - IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching(movedElement.getKey(), request.getClientContext()); - for (IElementType type : types) { - if (type instanceof ConfiguredHintedSpecializationElementType) { - if (((ConfiguredHintedSpecializationElementType) type).getConfiguration() instanceof InvariantTypeConfiguration) { - result.add((ConfiguredHintedSpecializationElementType) type); - - List<ConfiguredHintedSpecializationElementType> superConfiguredTypes = getAllSuperConfiguredTypes((ConfiguredHintedSpecializationElementType) type); - result.addAll(superConfiguredTypes); - } - } - } - } - } - - return result; - - } - - /** - * Returns the list of types (this one and supers) that are configuredTypes. - * - * @param type - * the type from which all invariants are retrieved - * @return the list of invariant types in the hierarchy of specified type, including type itself if matching. Returns an empty list if none is matching - */ - protected List<ConfiguredHintedSpecializationElementType> getAllInvariantTypes(IElementType type) { - List<ConfiguredHintedSpecializationElementType> result = new ArrayList<ConfiguredHintedSpecializationElementType>(); - - if (!(type instanceof ConfiguredHintedSpecializationElementType)) { - // no need to take care of metamodel types yet - return result; - } - - if (((ConfiguredHintedSpecializationElementType) type).getConfiguration() instanceof InvariantTypeConfiguration) { - result.add((ConfiguredHintedSpecializationElementType) type); - } - - IElementType[] superTypes = type.getAllSuperTypes(); - if (superTypes.length == 0) { - return result; - } - // get the reverse order - for (int i = superTypes.length - 1; i >= 0; i--) { - if (superTypes[i] instanceof ConfiguredHintedSpecializationElementType) { - if (((ConfiguredHintedSpecializationElementType) superTypes[i]).getConfiguration() instanceof InvariantTypeConfiguration) { - result.add((ConfiguredHintedSpecializationElementType) superTypes[i]); - } - } - } - - return result; - } - - protected List<ConfiguredHintedSpecializationElementType> getAllSuperConfiguredTypes(ConfiguredHintedSpecializationElementType type) { - IElementType[] superTypes = type.getAllSuperTypes(); - if (superTypes.length == 0) { - return Collections.emptyList(); - } - List<ConfiguredHintedSpecializationElementType> superExtendedTypes = new ArrayList<ConfiguredHintedSpecializationElementType>(); - // get the reverse order - for (int i = superTypes.length - 1; i >= 0; i--) { - if (superTypes[i] instanceof ConfiguredHintedSpecializationElementType) { - if (((ConfiguredHintedSpecializationElementType) superTypes[i]).getConfiguration() instanceof InvariantTypeConfiguration) { - superExtendedTypes.add((ConfiguredHintedSpecializationElementType) superTypes[i]); - } - } - } - return superExtendedTypes; - } - - - protected boolean processCompositeRule(CompositeInvariantRuleConfiguration compositeRule, IEditCommandRequest request) { - Iterator<InvariantRuleConfiguration> iterator = compositeRule.getComposedRules().iterator(); - InvariantRuleConfiguration nextComposedRuleConfiguration = iterator.next(); - boolean result = processInvariantRule(nextComposedRuleConfiguration, request); - - while (iterator.hasNext()) { - nextComposedRuleConfiguration = iterator.next(); - - boolean resultNextComposedRuleConfiguration = processInvariantRule(nextComposedRuleConfiguration, request); - - if (compositeRule instanceof OrInvariantRuleConfiguration) { - if (result == false && resultNextComposedRuleConfiguration) { - result = true; - } - } else if (compositeRule instanceof AndInvariantRuleConfiguration) { - if (result == true && !resultNextComposedRuleConfiguration) { - result = false; - } - } - } - - return result; - } - - protected boolean processInvariantRule(InvariantRuleConfiguration invariantRuleConfiguration, IEditCommandRequest request) { - if (invariantRuleConfiguration instanceof CompositeInvariantRuleConfiguration) { - return processCompositeRule((CompositeInvariantRuleConfiguration) invariantRuleConfiguration, request); - } else if (invariantRuleConfiguration instanceof NotInvariantRuleConfiguration) { - InvariantRuleConfiguration composedRule = ((NotInvariantRuleConfiguration) invariantRuleConfiguration).getComposedRule(); - return !processInvariantRule(composedRule, request); - } else { - if (invariantRuleConfiguration instanceof InvariantStereotypeRuleConfiguration) { - return processStereotypeInvariantRuleConfiguration((InvariantStereotypeRuleConfiguration) invariantRuleConfiguration, request); - } - IInvariantRule<? extends InvariantRuleConfiguration> rule = InvariantRuleConfigurationTypeRegistry.getInstance().getInvariantRule(invariantRuleConfiguration); - return rule.approveRequest(request); - } - } - - - /** - * Patch method for invariant stereotype rules, for Papyrus Mars between SR0 and SR1 - * @param rule - * the rule to check for approve status - * @param request - */ - protected boolean processStereotypeInvariantRuleConfiguration(InvariantStereotypeRuleConfiguration ruleConfiguration, IEditCommandRequest req) { - if(req instanceof CreateElementRequest) { - CreateElementRequest request = (CreateElementRequest)req; - String requiredProfileName = ruleConfiguration.getRequiredProfile(); - if (requiredProfileName != null) { - // check target - EObject container = request.getContainer(); - if (!(container instanceof Element)) { - return false; - } - Package nearestPackage = ((Element) container).getNearestPackage(); - if (nearestPackage == null) { - return false; - } - Profile appliedProfile = nearestPackage.getAppliedProfile(requiredProfileName, true); - return appliedProfile != null; - } - - return true; - } else { - IInvariantRule<? extends InvariantRuleConfiguration> rule = InvariantRuleConfigurationTypeRegistry.getInstance().getInvariantRule(ruleConfiguration); - return rule.approveRequest(req); - } - } - - protected boolean approveRequest(ConfiguredHintedSpecializationElementType elementType, IEditCommandRequest request) { - - ElementTypeConfiguration configuration = ((ConfiguredHintedSpecializationElementType) elementType).getConfiguration(); - if (configuration instanceof InvariantTypeConfiguration) { - InvariantRuleConfiguration invariantRuleConfiguration = ((InvariantTypeConfiguration) configuration).getInvariantRuleConfiguration(); - - return processInvariantRule(invariantRuleConfiguration, request); - } else { - Activator.log.warn("Expected InvariantRuleConfiguration as configuration type for : " + elementType); - } - - return true; - } - - - -}
diff --git a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile/.classpath b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile/.classpath index 32258f1..e7a4ca0 100644 --- a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile/.classpath +++ b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile/.classpath
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/>
diff --git a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile/META-INF/MANIFEST.MF b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile/META-INF/MANIFEST.MF index 966db8a..a7aae68 100644 --- a/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile/META-INF/MANIFEST.MF +++ b/plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile/META-INF/MANIFEST.MF
@@ -7,12 +7,12 @@ Bundle-Activator: org.eclipse.papyrusrt.umlrt.profile.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.uml2.types;visibility:=reexport, - org.eclipse.uml2.uml;visibility:=reexport, - org.eclipse.papyrus.dsml.validation;bundle-version="1.1.1";resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0", + org.eclipse.emf.ecore;bundle-version="2.12.0";visibility:=reexport, + org.eclipse.uml2.types;bundle-version="2.0.0";visibility:=reexport, + org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport, + org.eclipse.papyrus.dsml.validation;bundle-version="1.2.0";resolution:=optional +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.papyrusrt.umlrt.profile, org.eclipse.papyrusrt.umlrt.profile.UMLRealTime, org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.impl,
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/META-INF/MANIFEST.MF b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/META-INF/MANIFEST.MF index d297922..94cd050 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/META-INF/MANIFEST.MF +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/META-INF/MANIFEST.MF
@@ -7,44 +7,43 @@ Bundle-Vendor: Eclipse Modeling Project Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.1", - org.eclipse.papyrus.infra.newchild;bundle-version="1.1.1", - org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.1", + org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", + org.eclipse.papyrus.infra.newchild;bundle-version="1.2.0", + org.eclipse.papyrus.infra.types;bundle-version="2.0.0", org.eclipse.emf.ecore, org.eclipse.uml2.uml, - org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.1.1", - org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.1", - org.eclipse.papyrus.uml.tools;bundle-version="1.1.1", - org.eclipse.papyrus.infra.emf;bundle-version="1.1.1", - org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.1", + org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0", + org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0", + org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", + org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0", org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.1.1", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.1", + org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", + org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", org.eclipse.papyrusrt.umlrt.core.sync;bundle-version="0.7.2", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.1", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.1", - org.eclipse.papyrus.infra.widgets;bundle-version="1.1.1", - org.eclipse.papyrus.uml.modelexplorer;bundle-version="1.1.1", - org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.1", + org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", + org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", + org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", + org.eclipse.papyrus.uml.modelexplorer;bundle-version="1.2.0", + org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0", org.eclipse.core.expressions;bundle-version="3.4.600", - org.eclipse.papyrus.infra.sync;bundle-version="1.1.1", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.1", - org.eclipse.papyrus.infra.core;bundle-version="1.1.1", + org.eclipse.papyrus.infra.sync;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core;bundle-version="1.2.0", com.google.guava;bundle-version="11.0.0", org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.2", org.eclipse.papyrusrt.umlrt.core;bundle-version="0.7.2", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.1", - org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.1.1", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.1", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.2.0", + org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", org.eclipse.papyrusrt.umlrt.tooling.wizards;bundle-version="0.7.2", org.eclipse.papyrus.infra.gmfdiag.dnd, - org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.1", + org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", org.eclipse.papyrusrt.umlrt.tooling.ui;bundle-version="0.7.2", org.eclipse.gmf.tooling.runtime;bundle-version="3.3.0", org.eclipse.papyrus.infra.gmfdiag.commands, - org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="1.1.3", - org.eclipse.draw2d, - org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.1.4" + org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="1.2.0", + org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrusrt.umlrt.tooling.diagram.common, @@ -56,8 +55,8 @@ org.eclipse.papyrusrt.umlrt.tooling.diagram.common.editpolicies, org.eclipse.papyrusrt.umlrt.tooling.diagram.common.figures, org.eclipse.papyrusrt.umlrt.tooling.diagram.common.internal.canonical;x-internal:=true, - org.eclipse.papyrusrt.umlrt.tooling.diagram.common.internal.sync, - org.eclipse.papyrusrt.umlrt.tooling.diagram.common.internal.sync.statemachine, + org.eclipse.papyrusrt.umlrt.tooling.diagram.common.internal.sync;x-internal:=true, + org.eclipse.papyrusrt.umlrt.tooling.diagram.common.internal.sync.statemachine;x-internal:=true, org.eclipse.papyrusrt.umlrt.tooling.diagram.common.locator, org.eclipse.papyrusrt.umlrt.tooling.diagram.common.provider, org.eclipse.papyrusrt.umlrt.tooling.diagram.common.query,
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/elementtypes/uml-rt.capsulediagram.elementtypesconfigurations b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/elementtypes/uml-rt.capsulediagram.elementtypesconfigurations index a16a4ba..8a4e987 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/elementtypes/uml-rt.capsulediagram.elementtypesconfigurations +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/elementtypes/uml-rt.capsulediagram.elementtypesconfigurations
@@ -1,100 +1,39 @@ <?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:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" - xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration" - xmi:id="_sHw4IMQMEeS2vZeHP4gaVg" - name="UMLRealTime" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.elementTypes" - metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHw4IcQMEeS2vZeHP4gaVg" - name="Capsule (3085)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.Capsule_3085" - hint="3085"> - <iconEntry - xmi:id="_sHw4IsQMEeS2vZeHP4gaVg" - iconPath="/icons/Capsule.png" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> +<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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="_sHw4IMQMEeS2vZeHP4gaVg" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.elementTypes" name="UMLRealTime" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_sHw4IcQMEeS2vZeHP4gaVg" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.Capsule_Shape_CN" name="Capsule (Class_Shape_CN)" hint="Class_Shape_CN"> + <iconEntry xmi:id="_sHw4IsQMEeS2vZeHP4gaVg" iconPath="/icons/Capsule.png" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.Capsule</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHyGQMQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape_CN</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_sHyGQMQMEeS2vZeHP4gaVg"> <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHyGQcQMEeS2vZeHP4gaVg" - name="Capsule (2073)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.Capsule_2073" - hint="2073"> - <iconEntry - xmi:id="_sHyGQsQMEeS2vZeHP4gaVg" - iconPath="/icons/Capsule.png" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_sHyGQcQMEeS2vZeHP4gaVg" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.Capsule_Shape" name="Capsule (Class_Shape)" hint="Class_Shape"> + <iconEntry xmi:id="_sHyGQsQMEeS2vZeHP4gaVg" iconPath="/icons/Capsule.png" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.Capsule</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHyGQ8QMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID> + <matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_sHyGQ8QMEeS2vZeHP4gaVg"> <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_o-n3gDd8EeWK7ZUbpAMB-g" - name="RTPort 2069" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.RTPort_3069" - hint="3069"> - <iconEntry - xmi:id="_o-n3gTd8EeWK7ZUbpAMB-g" - iconPath="/icons/rt_port.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_o-n3gDd8EeWK7ZUbpAMB-g" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.RTPort_Shape" name="RTPort (Port_Shape)" hint="Port_Shape"> + <iconEntry xmi:id="_o-n3gTd8EeWK7ZUbpAMB-g" iconPath="/icons/rt_port.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.tooling.ui.rtportcreationwithui</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Port_3069</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_P9CaoDnzEeWtl4GYVYxVqw" - name="CapsulePart (3070)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.CapsulePart_3070" - hint="3070"> - <iconEntry - xmi:id="_qFULEDnzEeWtl4GYVYxVqw" - iconPath="/icons/capsule_part.png" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_P9CaoDnzEeWtl4GYVYxVqw" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.CapsulePart_Shape" name="CapsulePart (Property_Shape)" hint="Property_Shape"> + <iconEntry xmi:id="_qFULEDnzEeWtl4GYVYxVqw" iconPath="/icons/capsule_part.png" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.tooling.ui.capsulepartcreationwithui</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape</specializedTypesID> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_tbe1oDnzEeWtl4GYVYxVqw" - name="CapsulePart (3101)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.CapsulePart_3101" - hint="3101"> - <iconEntry - xmi:id="_tbe1oTnzEeWtl4GYVYxVqw" - iconPath="/icons/capsule_part.png" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_tbe1oDnzEeWtl4GYVYxVqw" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.CapsulePart_AttributeLabel" name="CapsulePart (Property_AttributeLabel)" hint="Property_AttributeLabel"> + <iconEntry xmi:id="_tbe1oTnzEeWtl4GYVYxVqw" iconPath="/icons/capsule_part.png" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.tooling.ui.capsulepartcreationwithui</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Property_AttributeLabel</specializedTypesID> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_bA8YcDqtEeWpqOreikVm6Q" - name="Connector (4013)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.Connector_4013" - hint="4013"> - <iconEntry - xmi:id="_lgNMoDqtEeWpqOreikVm6Q" - iconPath="icons/full/obj16/Connector.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_bA8YcDqtEeWpqOreikVm6Q" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.Connector_Edge" name="Connector (Connector_Edge)" hint="Connector_Edge"> + <iconEntry xmi:id="_lgNMoDqtEeWpqOreikVm6Q" iconPath="icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTConnector</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Connector_4013</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Connector_Edge</specializedTypesID> </elementTypeConfigurations> </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations index 8009da5..cab01a9 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations
@@ -1,804 +1,353 @@ -<?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:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" - xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration" - xmi:id="_sHw4IMQMEeS2vZeHP4gaVg" - name="UMLRealTime" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.elementTypes" - metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHw4IcQMEeS2vZeHP4gaVg" - name="Capsule (2008)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Capsule_2008" - hint="2008"> - <iconEntry - xmi:id="_sHw4IsQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Class.gif" - bundleId="org.eclipse.uml2.uml.edit"/> +<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/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.papyrusrt.umlrt.tooling.diagram.common.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="UMLRealTime" xmi:id="_sHw4IMQMEeS2vZeHP4gaVg" xmi:version="2.0"> + <elementTypeConfigurations hint="Class_Shape" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Capsule_Shape" name="Capsule (Class_Shape)" xmi:id="_sHw4IcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_sHw4IsQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.Capsule</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_2008</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHyGQMQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID> + <matcherConfiguration xmi:id="_sHyGQMQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHyGQcQMEeS2vZeHP4gaVg" - name="Capsule (3004)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Capsule_3004" - hint="3004"> - <iconEntry - xmi:id="_sHyGQsQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Class.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Class_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Capsule_ComponentNestedClassifierLabel" name="Capsule (Class_ComponentNestedClassifierLabel)" xmi:id="_sHyGQcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_sHyGQsQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.Capsule</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3004</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHyGQ8QMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Class_ComponentNestedClassifierLabel</specializedTypesID> + <matcherConfiguration xmi:id="_sHyGQ8QMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHyGRMQMEeS2vZeHP4gaVg" - name="Capsule (3008)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Capsule_3008" - hint="3008"> - <iconEntry - xmi:id="_sHyGRcQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Class.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Class_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Capsule_InterfaceNestedClassifierLabel" name="Capsule (Class_InterfaceNestedClassifierLabel)" xmi:id="_sHyGRMQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_sHyGRcQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.Capsule</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3008</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHyGRsQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Class_InterfaceNestedClassifierLabel</specializedTypesID> + <matcherConfiguration xmi:id="_sHyGRsQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHyGR8QMEeS2vZeHP4gaVg" - name="Capsule (3010)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Capsule_3010" - hint="3010"> - <iconEntry - xmi:id="_sHyGSMQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Class.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Class_Shape_CN" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Capsule_Shape_CN" name="Capsule (Class_Shape_CN)" xmi:id="_sHyGR8QMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_sHyGSMQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.Capsule</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3010</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHyGScQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape_CN</specializedTypesID> + <matcherConfiguration xmi:id="_sHyGScQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHyGSsQMEeS2vZeHP4gaVg" - name="Capsule (3014)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Capsule_3014" - hint="3014"> - <iconEntry - xmi:id="_sHyGS8QMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Class.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Class_ClassNestedClassifierLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Capsule_ClassNestedClassifierLabel" name="Capsule (Class_ClassNestedClassifierLabel)" xmi:id="_sHyGSsQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_sHyGS8QMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.Capsule</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3014</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHyGTMQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Class_ClassNestedClassifierLabel</specializedTypesID> + <matcherConfiguration xmi:id="_sHyGTMQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sua4wBAZEeWc8PaHufXjyA" - name="ExternalBehaviorPort (3069)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ExternalBehaviorPort_3069" - hint="3069"> - <iconEntry - xmi:id="_sua4wRAZEeWc8PaHufXjyA" - iconPath="/icons/full/obj16/Port.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Port_Shape" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ExternalBehaviorPort_Shape" name="ExternalBehaviorPort (Port_Shape)" xmi:id="_sua4wBAZEeWc8PaHufXjyA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif" xmi:id="_sua4wRAZEeWc8PaHufXjyA"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ExternalBehaviorPort</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.component.Port_3069</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sua4whAZEeWc8PaHufXjyA"> + <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID> + <matcherConfiguration xmi:id="_sua4whAZEeWc8PaHufXjyA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTPort</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_2rSKgBAZEeWc8PaHufXjyA" - name="InternalBehaviorPort (3069)" - description="" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.InternalBehaviorPort_3069" - hint="3069"> - <iconEntry - xmi:id="_2rSKgRAZEeWc8PaHufXjyA" - iconPath="/icons/full/obj16/Port.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations description="" hint="Port_Shape" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.InternalBehaviorPort_Shape" name="InternalBehaviorPort (Port_Shape)" xmi:id="_2rSKgBAZEeWc8PaHufXjyA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif" xmi:id="_2rSKgRAZEeWc8PaHufXjyA"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.InternalBehaviorPort</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.component.Port_3069</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_2rSKghAZEeWc8PaHufXjyA"> + <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID> + <matcherConfiguration xmi:id="_2rSKghAZEeWc8PaHufXjyA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTPort</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_JDhTEAg4EeWeYfBUTX0Hjg" - name="RelayPort (3069)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.RelayPort_3069" - hint="3069"> - <iconEntry - xmi:id="_Y6pj0Ag4EeWeYfBUTX0Hjg" - iconPath="/icons/full/obj16/Port.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Port_Shape" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.RelayPort_Shape" name="RelayPort (Port_Shape)" xmi:id="_JDhTEAg4EeWeYfBUTX0Hjg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif" xmi:id="_Y6pj0Ag4EeWeYfBUTX0Hjg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RelayPort</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.component.Port_3069</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_jNCZoAg4EeWeYfBUTX0Hjg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID> + <matcherConfiguration xmi:id="_jNCZoAg4EeWeYfBUTX0Hjg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTPort</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_nYssUAg5EeWeYfBUTX0Hjg" - name="ServiceAccessPoint (3069)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ServiceAccessPoint_3069" - hint="3069"> - <iconEntry - xmi:id="_nYssUQg5EeWeYfBUTX0Hjg" - iconPath="/icons/full/obj16/Port.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Port_Shape" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ServiceAccessPoint_Shape" name="ServiceAccessPoint (Port_Shape)" xmi:id="_nYssUAg5EeWeYfBUTX0Hjg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif" xmi:id="_nYssUQg5EeWeYfBUTX0Hjg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ServiceAccessPoint</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.component.Port_3069</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_nYssUgg5EeWeYfBUTX0Hjg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID> + <matcherConfiguration xmi:id="_nYssUgg5EeWeYfBUTX0Hjg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTPort</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_yByK4Ag5EeWeYfBUTX0Hjg" - name="ServiceProvisionPoint (3069)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ServiceProvisionPoint_3069" - hint="3069"> - <iconEntry - xmi:id="_yByx8Ag5EeWeYfBUTX0Hjg" - iconPath="/icons/full/obj16/Port.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Port_Shape" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ServiceProvisionPoint_Shape" name="ServiceProvisionPoint (Port_Shape)" xmi:id="_yByK4Ag5EeWeYfBUTX0Hjg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif" xmi:id="_yByx8Ag5EeWeYfBUTX0Hjg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ServiceProvisionPoint</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.component.Port_3069</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_yByx8Qg5EeWeYfBUTX0Hjg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Port_Shape</specializedTypesID> + <matcherConfiguration xmi:id="_yByx8Qg5EeWeYfBUTX0Hjg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTPort</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHyGTcQMEeS2vZeHP4gaVg" - name="CapsulePart (3002)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.CapsulePart_3002" - hint="3002"> - <iconEntry - xmi:id="_sHyGTsQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Property.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Property_ComponentAttributeLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.CapsulePart_ComponentAttributeLabel" name="CapsulePart (Property_ComponentAttributeLabel)" xmi:id="_sHyGTcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_sHyGTsQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.CapsulePart</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3002</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHyGT8QMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Property_ComponentAttributeLabel</specializedTypesID> + <matcherConfiguration xmi:id="_sHyGT8QMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHyGUMQMEeS2vZeHP4gaVg" - name="CapsulePart (3005)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.CapsulePart_3005" - hint="3005"> - <iconEntry - xmi:id="_sHyGUcQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Property.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Property_SignalAttributeLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.CapsulePart_SignalAttributeLabel" name="CapsulePart (Property_SignalAttributeLabel)" xmi:id="_sHyGUMQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_sHyGUcQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.CapsulePart</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3005</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHyGUsQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Property_SignalAttributeLabel</specializedTypesID> + <matcherConfiguration xmi:id="_sHyGUsQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHyGU8QMEeS2vZeHP4gaVg" - name="CapsulePart (3006)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.CapsulePart_3006" - hint="3006"> - <iconEntry - xmi:id="_sHyGVMQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Property.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Property_InterfaceAttributeLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.CapsulePart_InterfaceAttributeLabel" name="CapsulePart (Property_InterfaceAttributeLabel)" xmi:id="_sHyGU8QMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_sHyGVMQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.CapsulePart</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3006</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHyGVcQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Property_InterfaceAttributeLabel</specializedTypesID> + <matcherConfiguration xmi:id="_sHyGVcQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHyGVsQMEeS2vZeHP4gaVg" - name="CapsulePart (3012)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.CapsulePart_3012" - hint="3012"> - <iconEntry - xmi:id="_sHyGV8QMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Property.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Property_ClassAttributeLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.CapsulePart_ClassAttributeLabel" name="CapsulePart (Property_ClassAttributeLabel)" xmi:id="_sHyGVsQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_sHyGV8QMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.CapsulePart</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3012</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHyGWMQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Property_ClassAttributeLabel</specializedTypesID> + <matcherConfiguration xmi:id="_sHyGWMQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHyGWcQMEeS2vZeHP4gaVg" - name="CapsulePart (3018)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.CapsulePart_3018" - hint="3018"> - <iconEntry - xmi:id="_sHyGWsQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Property.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Property_DataTypeAttributeLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.CapsulePart_DataTypeAttributeLabel" name="CapsulePart (Property_DataTypeAttributeLabel)" xmi:id="_sHyGWcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_sHyGWsQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.CapsulePart</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3018</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHyGW8QMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel</specializedTypesID> + <matcherConfiguration xmi:id="_sHyGW8QMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHyGXMQMEeS2vZeHP4gaVg" - name="CapsulePart (3041)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.CapsulePart_3041" - hint="3041"> - <iconEntry - xmi:id="_sHyGXcQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Property.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Property_PrimitiveTypeAttributeLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.CapsulePart_PrimitiveTypeAttributeLabel" name="CapsulePart (Property_PrimitiveTypeAttributeLabel)" xmi:id="_sHyGXMQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_sHyGXcQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.CapsulePart</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3041</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHyGXsQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Property_PrimitiveTypeAttributeLabel</specializedTypesID> + <matcherConfiguration xmi:id="_sHyGXsQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_emBOIMlhEeSwZ7pccGhSNg" - name="Protocol (2008)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_2008" - hint="2008"> - <iconEntry - xmi:id="_emBOIclhEeSwZ7pccGhSNg" - iconPath="/icons/full/obj16/Class.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Class_Shape" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_Shape" name="Protocol (Class_Shape)" xmi:id="_emBOIMlhEeSwZ7pccGhSNg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_emBOIclhEeSwZ7pccGhSNg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.Protocol</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_2008</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_emBOIslhEeSwZ7pccGhSNg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape</specializedTypesID> + <matcherConfiguration xmi:id="_emBOIslhEeSwZ7pccGhSNg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_emBOI8lhEeSwZ7pccGhSNg" - name="Protocol (3004)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_3004" - hint="3004"> - <iconEntry - xmi:id="_emBOJMlhEeSwZ7pccGhSNg" - iconPath="/icons/full/obj16/Class.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Class_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_ComponentNestedClassifierLabel" name="Protocol (Class_ComponentNestedClassifierLabel)" xmi:id="_emBOI8lhEeSwZ7pccGhSNg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_emBOJMlhEeSwZ7pccGhSNg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.Protocol</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3004</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_emBOJclhEeSwZ7pccGhSNg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Class_ComponentNestedClassifierLabel</specializedTypesID> + <matcherConfiguration xmi:id="_emBOJclhEeSwZ7pccGhSNg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_emBOJslhEeSwZ7pccGhSNg" - name="Protocol (3008)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_3008" - hint="3008"> - <iconEntry - xmi:id="_emBOJ8lhEeSwZ7pccGhSNg" - iconPath="/icons/full/obj16/Class.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Class_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_InterfaceNestedClassifierLabel" name="Protocol (Class_InterfaceNestedClassifierLabel)" xmi:id="_emBOJslhEeSwZ7pccGhSNg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_emBOJ8lhEeSwZ7pccGhSNg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.Protocol</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3008</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_emBOKMlhEeSwZ7pccGhSNg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Class_InterfaceNestedClassifierLabel</specializedTypesID> + <matcherConfiguration xmi:id="_emBOKMlhEeSwZ7pccGhSNg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_emBOKclhEeSwZ7pccGhSNg" - name="Protocol (3010)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_3010" - hint="3010"> - <iconEntry - xmi:id="_emBOKslhEeSwZ7pccGhSNg" - iconPath="/icons/full/obj16/Class.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Class_Shape_CN" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_Shape_CN" name="Protocol (Class_Shape_CN)" xmi:id="_emBOKclhEeSwZ7pccGhSNg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_emBOKslhEeSwZ7pccGhSNg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.Protocol</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3010</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_emBOK8lhEeSwZ7pccGhSNg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Class_Shape_CN</specializedTypesID> + <matcherConfiguration xmi:id="_emBOK8lhEeSwZ7pccGhSNg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_emBOLMlhEeSwZ7pccGhSNg" - name="Protocol (3014)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_3014" - hint="3014"> - <iconEntry - xmi:id="_emBOLclhEeSwZ7pccGhSNg" - iconPath="/icons/full/obj16/Class.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Class_ClassNestedClassifierLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_ClassNestedClassifierLabel" name="Protocol (Class_ClassNestedClassifierLabel)" xmi:id="_emBOLMlhEeSwZ7pccGhSNg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_emBOLclhEeSwZ7pccGhSNg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.Protocol</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3014</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_emBOLslhEeSwZ7pccGhSNg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Class_ClassNestedClassifierLabel</specializedTypesID> + <matcherConfiguration xmi:id="_emBOLslhEeSwZ7pccGhSNg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHytUMQMEeS2vZeHP4gaVg" - name="ProtocolContainer (2007)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolContainer_2007" - hint="2007"> - <iconEntry - xmi:id="_sHytUcQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Package.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Package_Shape" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolContainer_Shape" name="ProtocolContainer (Package_Shape)" xmi:id="_sHytUMQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_sHytUcQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolContainer</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_2007</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHytUsQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape</specializedTypesID> + <matcherConfiguration xmi:id="_sHytUsQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHytU8QMEeS2vZeHP4gaVg" - name="ProtocolContainer (3009)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolContainer_3009" - hint="3009"> - <iconEntry - xmi:id="_sHytVMQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Package.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Package_Shape_CN" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolContainer_Shape_CN" name="ProtocolContainer (Package_Shape_CN)" xmi:id="_sHytU8QMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_sHytVMQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolContainer</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_3009</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHytVcQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Package_Shape_CN</specializedTypesID> + <matcherConfiguration xmi:id="_sHytVcQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHytVsQMEeS2vZeHP4gaVg" - name="ProtocolContainer (PapyrusUMLClassDiagram)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolContainer_PapyrusUMLClassDiagram" - hint="PapyrusUMLClassDiagram"> - <iconEntry - xmi:id="_sHytV8QMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Package.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="PapyrusUMLClassDiagram" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolContainer_PapyrusUMLClassDiagram" name="ProtocolContainer (PapyrusUMLClassDiagram)" xmi:id="_sHytVsQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_sHytV8QMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolContainer</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_1000</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHytWMQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Package_1000</specializedTypesID> + <matcherConfiguration xmi:id="_sHytWMQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHytWcQMEeS2vZeHP4gaVg" - name="RTMessageSet (2004)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.RTMessageSet_2004" - hint="2004"> - <iconEntry - xmi:id="_sHytWsQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Interface.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Interface_Shape" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.RTMessageSet_Shape" name="RTMessageSet (Interface_Shape)" xmi:id="_sHytWcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_sHytWsQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTMessageSet</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_2004</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHytW8QMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Interface_Shape</specializedTypesID> + <matcherConfiguration xmi:id="_sHytW8QMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHytXMQMEeS2vZeHP4gaVg" - name="RTMessageSet (3023)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.RTMessageSet_3023" - hint="3023"> - <iconEntry - xmi:id="_sHytXcQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Interface.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Interface_Shape_CN" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.RTMessageSet_Shape_CN" name="RTMessageSet (Interface_Shape_CN)" xmi:id="_sHytXMQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_sHytXcQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTMessageSet</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3023</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHytXsQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Interface_Shape_CN</specializedTypesID> + <matcherConfiguration xmi:id="_sHytXsQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHytX8QMEeS2vZeHP4gaVg" - name="RTMessageSet (3036)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.RTMessageSet_3036" - hint="3036"> - <iconEntry - xmi:id="_sHytYMQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Interface.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Interface_ClassNestedClassifierLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.RTMessageSet_ClassNestedClassifierLabel" name="RTMessageSet (Interface_ClassNestedClassifierLabel)" xmi:id="_sHytX8QMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_sHytYMQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTMessageSet</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3036</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHytYcQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Interface_ClassNestedClassifierLabel</specializedTypesID> + <matcherConfiguration xmi:id="_sHytYcQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHytYsQMEeS2vZeHP4gaVg" - name="RTMessageSet (3037)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.RTMessageSet_3037" - hint="3037"> - <iconEntry - xmi:id="_sHytY8QMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Interface.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Interface_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.RTMessageSet_ComponentNestedClassifierLabel" name="RTMessageSet (Interface_ComponentNestedClassifierLabel)" xmi:id="_sHytYsQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_sHytY8QMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTMessageSet</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3037</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHytZMQMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Interface_ComponentNestedClassifierLabel</specializedTypesID> + <matcherConfiguration xmi:id="_sHytZMQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHytZcQMEeS2vZeHP4gaVg" - name="RTMessageSet (3038)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.RTMessageSet_3038" - hint="3038"> - <iconEntry - xmi:id="_sHytZsQMEeS2vZeHP4gaVg" - iconPath="/icons/full/obj16/Interface.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Interface_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.RTMessageSet_InterfaceNestedClassifierLabel" name="RTMessageSet (Interface_InterfaceNestedClassifierLabel)" xmi:id="_sHytZcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_sHytZsQMEeS2vZeHP4gaVg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTMessageSet</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3038</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sHytZ8QMEeS2vZeHP4gaVg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Interface_InterfaceNestedClassifierLabel</specializedTypesID> + <matcherConfiguration xmi:id="_sHytZ8QMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_UKFswON2EeSMDu6IBsn9eg" - name="Operation (3003)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_3003" - hint="3003"> - <iconEntry - xmi:id="_UKFsweN2EeSMDu6IBsn9eg" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_ComponentOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_ComponentOperationLabel" name="Operation (Operation_ComponentOperationLabel)" xmi:id="_UKFswON2EeSMDu6IBsn9eg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_UKFsweN2EeSMDu6IBsn9eg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageIn</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3003</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_UKFswuN2EeSMDu6IBsn9eg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_ComponentOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_UKFswuN2EeSMDu6IBsn9eg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_iggYsON2EeSMDu6IBsn9eg" - name="Operation (3007)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_3007" - hint="3007"> - <iconEntry - xmi:id="_iggYseN2EeSMDu6IBsn9eg" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_InterfaceOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_InterfaceOperationLabel" name="Operation (Operation_InterfaceOperationLabel)" xmi:id="_iggYsON2EeSMDu6IBsn9eg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_iggYseN2EeSMDu6IBsn9eg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageIn</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3007</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_iggYsuN2EeSMDu6IBsn9eg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_iggYsuN2EeSMDu6IBsn9eg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_nR6SMON2EeSMDu6IBsn9eg" - name="Operation (3013)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_3013" - hint="3013"> - <iconEntry - xmi:id="_nR6SMeN2EeSMDu6IBsn9eg" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_ClassOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_ClassOperationLabel" name="Operation (Operation_ClassOperationLabel)" xmi:id="_nR6SMON2EeSMDu6IBsn9eg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_nR6SMeN2EeSMDu6IBsn9eg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageIn</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3013</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_nR6SMuN2EeSMDu6IBsn9eg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_ClassOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_nR6SMuN2EeSMDu6IBsn9eg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sqMlgON2EeSMDu6IBsn9eg" - name="Operation (3019)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_3019" - hint="3019"> - <iconEntry - xmi:id="_sqMlgeN2EeSMDu6IBsn9eg" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_DataTypeOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_DataTypeOperationLabel" name="Operation (Operation_DataTypeOperationLabel)" xmi:id="_sqMlgON2EeSMDu6IBsn9eg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_sqMlgeN2EeSMDu6IBsn9eg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageIn</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3019</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_sqMlguN2EeSMDu6IBsn9eg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_sqMlguN2EeSMDu6IBsn9eg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_xQYGcON2EeSMDu6IBsn9eg" - name="Operation (3042)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_3042" - hint="3042"> - <iconEntry - xmi:id="_xQYGceN2EeSMDu6IBsn9eg" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_PrimitiveTypeOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_PrimitiveTypeOperationLabel" name="Operation (Operation_PrimitiveTypeOperationLabel)" xmi:id="_xQYGcON2EeSMDu6IBsn9eg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_xQYGceN2EeSMDu6IBsn9eg"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageIn</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3042</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_xQYGcuN2EeSMDu6IBsn9eg"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_PrimitiveTypeOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_xQYGcuN2EeSMDu6IBsn9eg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_59GfoPlnEeSacPCZ52E8kQ" - name="Operation (3003)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_3003" - hint="3003"> - <iconEntry - xmi:id="_59GfoflnEeSacPCZ52E8kQ" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_ComponentOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_ComponentOperationLabel" name="Operation (Operation_ComponentOperationLabel)" xmi:id="_59GfoPlnEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_59GfoflnEeSacPCZ52E8kQ"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageInOut</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3003</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_59GfovlnEeSacPCZ52E8kQ"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_ComponentOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_59GfovlnEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_59Gfo_lnEeSacPCZ52E8kQ" - name="Operation (3007)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_3007" - hint="3007"> - <iconEntry - xmi:id="_59GfpPlnEeSacPCZ52E8kQ" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_InterfaceOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_InterfaceOperationLabel" name="Operation (Operation_InterfaceOperationLabel)" xmi:id="_59Gfo_lnEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_59GfpPlnEeSacPCZ52E8kQ"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageInOut</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3007</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_59GfpflnEeSacPCZ52E8kQ"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_59GfpflnEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_59GfpvlnEeSacPCZ52E8kQ" - name="Operation (3013)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_3013" - hint="3013"> - <iconEntry - xmi:id="_59Gfp_lnEeSacPCZ52E8kQ" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_ClassOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_ClassOperationLabel" name="Operation (Operation_ClassOperationLabel)" xmi:id="_59GfpvlnEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_59Gfp_lnEeSacPCZ52E8kQ"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageInOut</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3013</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_59GfqPlnEeSacPCZ52E8kQ"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_ClassOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_59GfqPlnEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_59GfqflnEeSacPCZ52E8kQ" - name="Operation (3019)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_3019" - hint="3019"> - <iconEntry - xmi:id="_59GfqvlnEeSacPCZ52E8kQ" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_DataTypeOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_DataTypeOperationLabel" name="Operation (Operation_DataTypeOperationLabel)" xmi:id="_59GfqflnEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_59GfqvlnEeSacPCZ52E8kQ"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageInOut</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3019</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_59Gfq_lnEeSacPCZ52E8kQ"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_59Gfq_lnEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_59GfrPlnEeSacPCZ52E8kQ" - name="Operation (3042)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_3042" - hint="3042"> - <iconEntry - xmi:id="_59GfrflnEeSacPCZ52E8kQ" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_PrimitiveTypeOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_PrimitiveTypeOperationLabel" name="Operation (Operation_PrimitiveTypeOperationLabel)" xmi:id="_59GfrPlnEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_59GfrflnEeSacPCZ52E8kQ"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageInOut</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3042</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_59GfrvlnEeSacPCZ52E8kQ"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_PrimitiveTypeOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_59GfrvlnEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_Kpj14PloEeSacPCZ52E8kQ" - name="Operation (3003)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_3003" - hint="3003"> - <iconEntry - xmi:id="_Kpj14floEeSacPCZ52E8kQ" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_ComponentOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_ComponentOperationLabel" name="Operation (Operation_ComponentOperationLabel)" xmi:id="_Kpj14PloEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_Kpj14floEeSacPCZ52E8kQ"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageOut</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3003</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_Kpj14vloEeSacPCZ52E8kQ"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_ComponentOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_Kpj14vloEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_Kpj14_loEeSacPCZ52E8kQ" - name="Operation (3007)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_3007" - hint="3007"> - <iconEntry - xmi:id="_Kpj15PloEeSacPCZ52E8kQ" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_InterfaceOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_InterfaceOperationLabel" name="Operation (Operation_InterfaceOperationLabel)" xmi:id="_Kpj14_loEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_Kpj15PloEeSacPCZ52E8kQ"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageOut</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3007</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_Kpj15floEeSacPCZ52E8kQ"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_Kpj15floEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_Kpj15vloEeSacPCZ52E8kQ" - name="Operation (3013)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_3013" - hint="3013"> - <iconEntry - xmi:id="_Kpj15_loEeSacPCZ52E8kQ" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_ClassOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_ClassOperationLabel" name="Operation (Operation_ClassOperationLabel)" xmi:id="_Kpj15vloEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_Kpj15_loEeSacPCZ52E8kQ"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageOut</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3013</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_Kpj16PloEeSacPCZ52E8kQ"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_ClassOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_Kpj16PloEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_Kpj16floEeSacPCZ52E8kQ" - name="Operation (3019)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_3019" - hint="3019"> - <iconEntry - xmi:id="_Kpj16vloEeSacPCZ52E8kQ" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_DataTypeOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_DataTypeOperationLabel" name="Operation (Operation_DataTypeOperationLabel)" xmi:id="_Kpj16floEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_Kpj16vloEeSacPCZ52E8kQ"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageOut</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3019</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_Kpj16_loEeSacPCZ52E8kQ"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_Kpj16_loEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_Kpj17PloEeSacPCZ52E8kQ" - name="Operation (3042)" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_3042" - hint="3042"> - <iconEntry - xmi:id="_Kpj17floEeSacPCZ52E8kQ" - iconPath="/icons/full/obj16/Operation.gif" - bundleId="org.eclipse.uml2.uml.edit"/> + <elementTypeConfigurations hint="Operation_PrimitiveTypeOperationLabel" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_PrimitiveTypeOperationLabel" name="Operation (Operation_PrimitiveTypeOperationLabel)" xmi:id="_Kpj17PloEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> + <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_Kpj17floEeSacPCZ52E8kQ"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ProtocolMessageOut</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3042</specializedTypesID> - <matcherConfiguration - xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" - xmi:id="_Kpj17vloEeSacPCZ52E8kQ"> + <specializedTypesID>org.eclipse.papyrus.umldi.Operation_PrimitiveTypeOperationLabel</specializedTypesID> + <matcherConfiguration xmi:id="_Kpj17vloEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration"> <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames> </matcherConfiguration> </elementTypeConfigurations>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/palettes/UML-RT.CapsuleDiagram.paletteconfiguration b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/palettes/UML-RT.CapsuleDiagram.paletteconfiguration index 5dfd332..3dece1e 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/palettes/UML-RT.CapsuleDiagram.paletteconfiguration +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/palettes/UML-RT.CapsuleDiagram.paletteconfiguration
@@ -3,22 +3,22 @@ <drawerConfigurations id="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagrampalette.node" label="Nodes" description="UML-RT Nodes"> <!--<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="capsulediagram.nodes.capsule" label="Capsule" description="Create a Capsule"> <icon pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/capsule.png"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.Capsule_3085"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.Capsule_2073"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.Capsule_Shape_CN"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.Capsule_Shape"/> </ownedConfigurations> --> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="capsulediagram.nodes.port" label="Port" description="Create a Port"> <icon pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/rt_port.gif"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.RTPort_3069"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.RTPort_Shape"/> </ownedConfigurations> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="capsulediagram.nodes.capsulepart" label="Capsule Part" description="Create a Capsule Part"> <icon pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/capsule_part.png"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.CapsulePart_3070"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.CapsulePart_3101"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.CapsulePart_Shape"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.CapsulePart_AttributeLabel"/> </ownedConfigurations> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="capsulediagram.edges.connector" label="Connector" description="Create a new connector" kind="ConnectionTool"> <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Connector.gif"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.Connector_4013"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.Connector_Edge"/> </ownedConfigurations> </drawerConfigurations> <requiredProfiles>UMLRealTime</requiredProfiles>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/palettes/UML-RT.ProtocolDiagram.paletteconfiguration b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/palettes/UML-RT.ProtocolDiagram.paletteconfiguration index 7b8e300..4ce4205 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/palettes/UML-RT.ProtocolDiagram.paletteconfiguration +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/palettes/UML-RT.ProtocolDiagram.paletteconfiguration
@@ -3,35 +3,35 @@ <drawerConfigurations id="UML-RT" label="UML-RT" description="UML-RT"> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrusrt.umlrt.core.Protocol" label="Protocol" description="Create a Protocol"> <icon pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/protocol.png"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_2008"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_3004"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_3008"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_3010"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_3014"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_Shape"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_ComponentNestedClassifierLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_InterfaceNestedClassifierLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_Shape_CN"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.Protocol_ClassNestedClassifierLabel"/> </ownedConfigurations> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrusrt.umlrt.core.ProtocolMessageOut" label="ProtocolMessage OUT" description="Create an Out Protocol Message"> <icon pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/protocolmessage_out.gif"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_3003"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_3007"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_3013"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_3019"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_3042"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_ComponentOperationLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_InterfaceOperationLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_ClassOperationLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_DataTypeOperationLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageOut_PrimitiveTypeOperationLabel"/> </ownedConfigurations> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrusrt.umlrt.core.ProtocolMessageInOut" label="ProtocolMessage INOUT" description="Create an InOout Protocol Message"> <icon pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/protocolmessage_inout.gif"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_3003"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_3007"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_3013"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_3019"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_3042"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_ComponentOperationLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_InterfaceOperationLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_ClassOperationLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_DataTypeOperationLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageInOut_PrimitiveTypeOperationLabel"/> </ownedConfigurations> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrusrt.umlrt.core.ProtocolMessageIn" label="ProtocolMessage IN" description="Create an In Protocol Message"> <icon pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/protocolmessage_in.gif"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_3003"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_3007"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_3013"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_3019"/> - <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_3042"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_ComponentOperationLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_InterfaceOperationLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_ClassOperationLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_DataTypeOperationLabel"/> + <elementDescriptors elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.common.ProtocolMessageIn_PrimitiveTypeOperationLabel"/> </ownedConfigurations> </drawerConfigurations> <requiredProfiles>UMLRealTime</requiredProfiles>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/plugin.xml b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/plugin.xml index 3eeb7c2..2efa453 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/plugin.xml +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/plugin.xml
@@ -30,9 +30,9 @@ </extension> <extension - point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration"> + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> <elementTypeSet - id="org.eclipse.papyrusrt.umlrt.tooling.diagram.capsulediagram.elementTypes" + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" path="elementtypes/uml-rt.capsulediagram.elementtypesconfigurations"> </elementTypeSet> </extension>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/editparts/providers/RTEditPartProvider.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/editparts/providers/RTEditPartProvider.java index 57268b5..5d045c4 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/editparts/providers/RTEditPartProvider.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/editparts/providers/RTEditPartProvider.java
@@ -20,14 +20,11 @@ import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation; import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.CustomPortEditPart; import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeEditPart; import org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartEditPartCN; import org.eclipse.papyrusrt.umlrt.core.utils.CapsulePartUtils; import org.eclipse.papyrusrt.umlrt.core.utils.CapsuleUtils; -import org.eclipse.papyrusrt.umlrt.core.utils.RTPortUtils; import org.eclipse.papyrusrt.umlrt.tooling.diagram.common.editparts.RTClassCompositeEditPart; -import org.eclipse.papyrusrt.umlrt.tooling.diagram.common.editparts.RTPortEditPart; import org.eclipse.papyrusrt.umlrt.tooling.diagram.common.editparts.RTPropertyPartEditPart; import org.eclipse.uml2.uml.Classifier; import org.eclipse.uml2.uml.Property; @@ -55,9 +52,9 @@ super(); // Nodes - nodeMap.put(Integer.toString(ClassCompositeEditPart.VISUAL_ID), RTClassCompositeEditPart.class); - nodeMap.put(Integer.toString(PropertyPartEditPartCN.VISUAL_ID), RTPropertyPartEditPart.class); - nodeMap.put(Integer.toString(CustomPortEditPart.VISUAL_ID), RTPortEditPart.class); + nodeMap.put(ClassCompositeEditPart.VISUAL_ID, RTClassCompositeEditPart.class); + nodeMap.put(PropertyPartEditPartCN.VISUAL_ID, RTPropertyPartEditPart.class); + } /** @@ -94,21 +91,7 @@ currentDiagramType = ((IEditPartOperation) operation).getView().getDiagram().getType(); - if ((null == diagramType) || (!diagramType.equals(currentDiagramType))) { - provide = false; - } else { - provide = super.provides(operation); - } - - - } - - // Test RT Port in Composite Structure Diagram - if ((operation instanceof CreateGraphicEditPartOperation) && (RTPortUtils.isRTPort(referenceElement))) { - - currentDiagramType = ((IEditPartOperation) operation).getView().getDiagram().getType(); - - if ((null == diagramType) || (!diagramType.equals(currentDiagramType))) { + if ((diagramType == null) || (!diagramType.equals(currentDiagramType))) { provide = false; } else { provide = super.provides(operation);
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/editpolicies/CanonicalPortDisplayEditPolicy.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/editpolicies/CanonicalPortDisplayEditPolicy.java index f34d29a..0336d8e 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/editpolicies/CanonicalPortDisplayEditPolicy.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/editpolicies/CanonicalPortDisplayEditPolicy.java
@@ -238,7 +238,7 @@ */ protected CreateViewRequest getCreationViewRequest(Port port) { - String semanticHint = ((IHintedType)UMLElementTypes.Port_3069).getSemanticHint(); + String semanticHint = ((IHintedType)UMLElementTypes.Port_Shape).getSemanticHint(); IAdaptable elementAdapter = new EObjectAdapter(port); ViewDescriptor descriptor = new ViewDescriptor(elementAdapter, Node.class, semanticHint, ViewUtil.APPEND, false, getDiagramPreferencesHint()); CreateViewRequest createViewRequest = new CreateViewRequest(descriptor);
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/editpolicies/RTCustomDiagramDragDropEditPolicy.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/editpolicies/RTCustomDiagramDragDropEditPolicy.java index b4b6430..a1154ec 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/editpolicies/RTCustomDiagramDragDropEditPolicy.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/editpolicies/RTCustomDiagramDragDropEditPolicy.java
@@ -51,7 +51,7 @@ * */ @Override - protected Command dropAffixedNode(DropObjectsRequest dropRequest, Element droppedElement, int nodeVISUALID) { + protected Command dropAffixedNode(DropObjectsRequest dropRequest, Element droppedElement, String nodeVISUALID) { // The dropped element must be a Port or Parameter if (!((droppedElement instanceof Port))) { Activator.log.error(new Exception("Incorrect parameter type (droppedElement should be a Port or Parameter)"));
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/internal/sync/statemachine/CSMDStateMachineRegionsSyncFeature.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/internal/sync/statemachine/CSMDStateMachineRegionsSyncFeature.java index 207bb9e..a01f879 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/internal/sync/statemachine/CSMDStateMachineRegionsSyncFeature.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/internal/sync/statemachine/CSMDStateMachineRegionsSyncFeature.java
@@ -56,24 +56,5 @@ : ECollections.<Region> emptyEList(); } - /** - * Regions fill the entire contents of a state machine or composite state, so new regions must be dropped - * on the shape compartment of some existing region because there is no state machine or state - * area uncovered on which they could be dropped. - */ - @Override - protected EditPart getTargetEditPart(EditPart parentEditPart, DropObjectsRequest dropObjectsRequest) { - EditPart result; - - if (getModelOf(parentEditPart) instanceof StateMachine) { - // Have to dig in through the initial region - parentEditPart = (EditPart) parentEditPart.getChildren().get(0); - result = Iterables.getFirst(Iterables.filter(parentEditPart.getChildren(), ShapeCompartmentEditPart.class), parentEditPart); - } else { - // The state-machine diagram expects to drop on the State, not its compartment - result = parentEditPart.getParent();// super.getTargetEditPart(parentEditPart, dropObjectsRequest); - } - - return result; - } + }
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/internal/sync/statemachine/CSMDStateMachineTransitionsSyncFeature.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/internal/sync/statemachine/CSMDStateMachineTransitionsSyncFeature.java index c69ef59..35c0a72 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/internal/sync/statemachine/CSMDStateMachineTransitionsSyncFeature.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/common/internal/sync/statemachine/CSMDStateMachineTransitionsSyncFeature.java
@@ -21,7 +21,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.gef.EditPart; -import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil; import org.eclipse.papyrus.infra.sync.SyncBucket; @@ -31,7 +30,6 @@ import org.eclipse.uml2.uml.State; import org.eclipse.uml2.uml.StateMachine; import org.eclipse.uml2.uml.Transition; -import org.eclipse.uml2.uml.Vertex; import com.google.common.collect.AbstractIterator; import com.google.common.collect.Iterables; @@ -57,15 +55,6 @@ } @Override - protected EditPart getTargetEditPart(EditPart parentEditPart, DropObjectsRequest dropObjectsRequest) { - // Get the parent edit-part of the source vertex's edit-part - Transition transition = (Transition) dropObjectsRequest.getObjects().get(0); - Vertex source = transition.getSource(); - EditPart sourceEditPart = findEditPart(parentEditPart, source); - return sourceEditPart.getParent(); - } - - @Override protected Iterable<? extends Transition> getModelContents(final StateMachine model) { return new Iterable<Transition>() { @Override @@ -130,4 +119,20 @@ return result; } + + @Override + protected EObject getSourceElement(EObject connectionElement) { + if (connectionElement instanceof Transition) { + return ((Transition) connectionElement).getSource(); + } + return null; + } + + @Override + protected EObject getTargetElement(EObject connectionElement) { + if (connectionElement instanceof Transition) { + return ((Transition) connectionElement).getTarget(); + } + return null; + } }
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/.classpath b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/.classpath index 098194c..16d067f 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/.classpath +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/.classpath
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/META-INF/MANIFEST.MF index eea5f63..6ee4b70 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/META-INF/MANIFEST.MF +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/META-INF/MANIFEST.MF
@@ -8,15 +8,16 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.papyrus.infra.viewpoints.policy, - org.eclipse.papyrus.infra.elementtypesconfigurations, - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.3", - org.eclipse.papyrus.infra.emf;bundle-version="1.1.3", - org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="1.1.3", + org.eclipse.papyrus.infra.types;bundle-version="2.0.0", + org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", + org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="2.0.0", org.eclipse.uml2.uml;bundle-version="5.1.0", org.eclipse.papyrusrt.umlrt.core;bundle-version="0.7.2", - org.eclipse.papyrus.uml.tools;bundle-version="1.1.3", - org.eclipse.papyrus.emf.facet.query.java;bundle-version="1.1.3", - org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.3", - org.eclipse.papyrusrt.umlrt.tooling.diagram.common;bundle-version="0.7.2" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 + org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", + org.eclipse.papyrus.emf.facet.query.java;bundle-version="1.2.0", + org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0", + org.eclipse.papyrusrt.umlrt.tooling.diagram.common;bundle-version="0.7.2", + org.eclipse.papyrus.uml.diagram.common;bundle-version="2.0.0" +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/build.properties b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/build.properties index 8c1a07a..0e76d70 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/build.properties +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/build.properties
@@ -10,3 +10,4 @@ palettes/,\ plugin.xml,\ facet/ +jre.compilation.profile = JavaSE-1.8
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/elementtypes/uml-rt.statemachinediagram.elementtypesconfigurations b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/elementtypes/uml-rt.statemachinediagram.elementtypesconfigurations index 6de4415..e78d943 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/elementtypes/uml-rt.statemachinediagram.elementtypesconfigurations +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/elementtypes/uml-rt.statemachinediagram.elementtypesconfigurations
@@ -1,165 +1,58 @@ <?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:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" - xmi:id="_sHw4IMQMEeS2vZeHP4gaVg" - name="RT State Machine Types" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.elementTypes" - metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_sHw4IcQMEeS2vZeHP4gaVg" - name="RTState (6000)" - description="" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.State_6000" - hint="6000"> - <iconEntry - xmi:id="_sHw4IsQMEeS2vZeHP4gaVg" - iconPath="/icons/rt_state.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> +<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmi:id="_sHw4IMQMEeS2vZeHP4gaVg" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.elementTypes" name="RT State Machine Types" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML"> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_sHw4IcQMEeS2vZeHP4gaVg" description="" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.State_Shape" name="RTState (State_Shape)" hint="State_Shape"> + <iconEntry xmi:id="_sHw4IsQMEeS2vZeHP4gaVg" iconPath="/icons/rt_state.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTState</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.statemachine.State_6000</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.State_Shape</specializedTypesID> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_e6jHIIVzEeWzpNA4uyLyjA" - name="RTPseudoState (Choice, 11000)" - description="" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_Choice_11000" - hint="11000"> - <iconEntry - xmi:id="_e6jHIYVzEeWzpNA4uyLyjA" - iconPath="/icons/rt_pseudostate_choice.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_e6jHIIVzEeWzpNA4uyLyjA" description="" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_ChoiceShape" name="RTPseudoState (Choice, Pseudostate_ChoiceShape)" hint="Pseudostate_ChoiceShape"> + <iconEntry xmi:id="_e6jHIYVzEeWzpNA4uyLyjA" iconPath="/icons/rt_pseudostate_choice.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Choice</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_11000</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Pseudostate_ChoiceShape</specializedTypesID> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_ckKCEIV0EeWzpNA4uyLyjA" - name="RTPseudoState (DeepHistory, 14000)" - description="" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_DeepHistory_14000" - hint="14000"> - <iconEntry - xmi:id="_ckKCEYV0EeWzpNA4uyLyjA" - iconPath="/icons/rt_pseudostate_deephistory.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_ckKCEIV0EeWzpNA4uyLyjA" description="" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_DeepHistoryShape" name="RTPseudoState (DeepHistory, Pseudostate_DeepHistoryShape)" hint="Pseudostate_DeepHistoryShape"> + <iconEntry xmi:id="_ckKCEYV0EeWzpNA4uyLyjA" iconPath="/icons/rt_pseudostate_deephistory.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState_DeepHistory</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_14000</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Pseudostate_DeepHistoryShape</specializedTypesID> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_12ICUIWEEeWzpNA4uyLyjA" - name="RTPseudoState (EntryPoint, 16000)" - description="" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_EntryPoint_16000" - hint="16000"> - <iconEntry - xmi:id="_12ICUYWEEeWzpNA4uyLyjA" - iconPath="/icons/rt_pseudostate_entryPoint.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_12ICUIWEEeWzpNA4uyLyjA" description="" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_EntryPointShape" name="RTPseudoState (EntryPoint, Pseudostate_EntryPointShape)" hint="Pseudostate_EntryPointShape"> + <iconEntry xmi:id="_12ICUYWEEeWzpNA4uyLyjA" iconPath="/icons/rt_pseudostate_entryPoint.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState_EntryPoint</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_16000</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Pseudostate_EntryPointShape</specializedTypesID> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_12ICUoWEEeWzpNA4uyLyjA" - name="RTPseudoState (ExitPoint, 17000)" - description="" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_ExitPoint_17000" - hint="17000"> - <iconEntry - xmi:id="_12ICU4WEEeWzpNA4uyLyjA" - iconPath="/icons/rt_pseudostate_exitPoint.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_12ICUoWEEeWzpNA4uyLyjA" description="" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_ExitPointShape" name="RTPseudoState (ExitPoint, Pseudostate_ExitPointShape)" hint="Pseudostate_ExitPointShape"> + <iconEntry xmi:id="_12ICU4WEEeWzpNA4uyLyjA" iconPath="/icons/rt_pseudostate_exitPoint.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState_ExitPoint</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_17000</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Pseudostate_ExitPointShape</specializedTypesID> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_1_dkgoWEEeWzpNA4uyLyjA" - name="RTPseudoState (Fork, 10000)" - description="" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_Fork_10000" - hint="10000"> - <iconEntry - xmi:id="_1_dkg4WEEeWzpNA4uyLyjA" - iconPath="/icons/rt_pseudostate_fork.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_1_dkgoWEEeWzpNA4uyLyjA" description="" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_ForkShape" name="RTPseudoState (Fork, Pseudostate_ForkShape)" hint="Pseudostate_ForkShape"> + <iconEntry xmi:id="_1_dkg4WEEeWzpNA4uyLyjA" iconPath="/icons/rt_pseudostate_fork.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Fork</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_10000</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Pseudostate_ForkShape</specializedTypesID> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_1_dkgIWEEeWzpNA4uyLyjA" - name="RTPseudoState (Initial, 8000)" - description="" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_Initial_8000" - hint="8000"> - <iconEntry - xmi:id="_1_dkgYWEEeWzpNA4uyLyjA" - iconPath="/icons/rt_pseudostate_initial.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_1_dkgIWEEeWzpNA4uyLyjA" description="" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_InitialShape" name="RTPseudoState (Initial, Pseudostate_InitialShape)" hint="Pseudostate_InitialShape"> + <iconEntry xmi:id="_1_dkgYWEEeWzpNA4uyLyjA" iconPath="/icons/rt_pseudostate_initial.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Initial</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_8000</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Pseudostate_InitialShape</specializedTypesID> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_2NGX4IWEEeWzpNA4uyLyjA" - name="RTPseudoState (Join, 9000)" - description="" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_Join_9000" - hint="9000"> - <iconEntry - xmi:id="_2NGX4YWEEeWzpNA4uyLyjA" - iconPath="/icons/rt_pseudostate_join.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_2NGX4IWEEeWzpNA4uyLyjA" description="" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_JoinShape" name="RTPseudoState (Join, Pseudostate_JoinShape)" hint="Pseudostate_JoinShape"> + <iconEntry xmi:id="_2NGX4YWEEeWzpNA4uyLyjA" iconPath="/icons/rt_pseudostate_join.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Join</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_9000</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Pseudostate_JoinShape</specializedTypesID> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_2NGX4oWEEeWzpNA4uyLyjA" - name="RTPseudoState (Junction, 12000)" - description="" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_Junction_12000" - hint="12000"> - <iconEntry - xmi:id="_2NGX44WEEeWzpNA4uyLyjA" - iconPath="/icons/rt_pseudostate_junction.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_2NGX4oWEEeWzpNA4uyLyjA" description="" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_JunctionShape" name="RTPseudoState (Junction, Pseudostate_JunctionShape)" hint="Pseudostate_JunctionShape"> + <iconEntry xmi:id="_2NGX44WEEeWzpNA4uyLyjA" iconPath="/icons/rt_pseudostate_junction.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Junction</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_12000</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Pseudostate_JunctionShape</specializedTypesID> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_2TIHYIWEEeWzpNA4uyLyjA" - name="RTPseudoState (ShallowHistory, 13000)" - description="" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_ShallowHistory_13000" - hint="13000"> - <iconEntry - xmi:id="_2TIHYYWEEeWzpNA4uyLyjA" - iconPath="/icons/rt_pseudostate_shallowhistory.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_2TIHYIWEEeWzpNA4uyLyjA" description="" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_ShallowHistoryShape" name="RTPseudoState (ShallowHistory, Pseudostate_ShallowHistoryShape)" hint="Pseudostate_ShallowHistoryShape"> + <iconEntry xmi:id="_2TIHYYWEEeWzpNA4uyLyjA" iconPath="/icons/rt_pseudostate_shallowhistory.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState_ShallowHistory</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_13000</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Pseudostate_ShallowHistoryShape</specializedTypesID> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_2TIucIWEEeWzpNA4uyLyjA" - name="RTPseudoState (Terminate, 15000)" - description="" - identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_Terminate_15000" - hint="15000"> - <iconEntry - xmi:id="_2TIucYWEEeWzpNA4uyLyjA" - iconPath="/icons/rt_pseudostate_terminate.gif" - bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> + <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_2TIucIWEEeWzpNA4uyLyjA" description="" identifier="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_TerminateShape" name="RTPseudoState (Terminate, Pseudostate_TerminateShape)" hint="Pseudostate_TerminateShape"> + <iconEntry xmi:id="_2TIucYWEEeWzpNA4uyLyjA" iconPath="/icons/rt_pseudostate_terminate.gif" bundleId="org.eclipse.papyrusrt.umlrt.tooling.ui"/> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.RTPseudoState_Terminate</specializedTypesID> - <specializedTypesID>org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_15000</specializedTypesID> + <specializedTypesID>org.eclipse.papyrus.umldi.Pseudostate_TerminateShape</specializedTypesID> </elementTypeConfigurations> </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/palettes/UML-RT.StateMachine.paletteconfiguration b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/palettes/UML-RT.StateMachine.paletteconfiguration index 8bfa7ba..3038901 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/palettes/UML-RT.StateMachine.paletteconfiguration +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/palettes/UML-RT.StateMachine.paletteconfiguration
@@ -17,7 +17,7 @@ pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/rt_state.gif"/> <elementDescriptors - elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.State_6000"/> + elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.StateShape"/> </ownedConfigurations> <ownedConfigurations xsi:type="paletteconfiguration:SeparatorConfiguration" @@ -31,7 +31,7 @@ pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/rt_pseudostate_choice.gif"/> <elementDescriptors - elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_Choice_11000"/> + elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_ChoiceShape"/> </ownedConfigurations> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" @@ -42,7 +42,7 @@ pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/rt_pseudostate_deepHistory.gif"/> <elementDescriptors - elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_DeepHistory_14000"/> + elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_DeepHistoryShape"/> </ownedConfigurations> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" @@ -53,7 +53,7 @@ pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/rt_pseudostate_entryPoint.gif"/> <elementDescriptors - elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_EntryPoint_16000"/> + elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_EntryPointShape"/> </ownedConfigurations> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" @@ -64,7 +64,7 @@ pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/rt_pseudostate_exitPoint.gif"/> <elementDescriptors - elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_ExitPoint_17000"/> + elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_ExitPointShape"/> </ownedConfigurations> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" @@ -75,7 +75,7 @@ pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/rt_pseudostate_junction.gif"/> <elementDescriptors - elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_Junction_12000"/> + elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_JunctionShape"/> </ownedConfigurations> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" @@ -86,7 +86,7 @@ pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/rt_pseudostate_terminate.gif"/> <elementDescriptors - elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_Terminate_15000"/> + elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_TerminateShape"/> </ownedConfigurations> <!-- No FORK, JOIN and SHALLOW HISTORY in state machines <ownedConfigurations @@ -98,7 +98,7 @@ pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/rt_pseudostate_fork.gif"/> <elementDescriptors - elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_Fork_10000"/> + elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_ForkShape"/> </ownedConfigurations> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" @@ -109,7 +109,7 @@ pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/rt_pseudostate_join.gif"/> <elementDescriptors - elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_Join_9000"/> + elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_JoinShape"/> </ownedConfigurations> <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" @@ -120,7 +120,7 @@ pluginID="org.eclipse.papyrusrt.umlrt.tooling.ui" iconPath="icons/rt_pseudostate_shallowHistory.gif"/> <elementDescriptors - elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_ShallowHistory_13000"/> + elementTypeId="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.RTPseudoState_ShallowHistoryShape"/> </ownedConfigurations> --> </drawerConfigurations>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/plugin.xml b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/plugin.xml index 6e6121f..447ca8c 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/plugin.xml +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/plugin.xml
@@ -9,9 +9,9 @@ </contribution> </extension> <extension - point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration"> + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> <elementTypeSet - id="org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine.elementTypes" + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" path="elementtypes/uml-rt.statemachinediagram.elementtypesconfigurations"> </elementTypeSet> </extension>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/statemachine/provider/RTStateMachineDiagramFilteredLabelProvider.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/statemachine/provider/RTStateMachineDiagramFilteredLabelProvider.java index a494c34..52e72b2 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/statemachine/provider/RTStateMachineDiagramFilteredLabelProvider.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine/src/org/eclipse/papyrusrt/umlrt/tooling/diagram/statemachine/provider/RTStateMachineDiagramFilteredLabelProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider; import org.eclipse.papyrusrt.umlrt.tooling.diagram.common.utils.UMLRTStateMachineDiagramUtils; + /** * Label provider used by the label provider service */
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.filter/META-INF/MANIFEST.MF b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.filter/META-INF/MANIFEST.MF index e5f566e..e302247 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.filter/META-INF/MANIFEST.MF +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.filter/META-INF/MANIFEST.MF
@@ -17,6 +17,6 @@ org.eclipse.papyrus.infra.filters;visibility:=reexport, org.eclipse.uml2.types;visibility:=reexport, org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.3", + org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", org.eclipse.papyrusrt.umlrt.core;bundle-version="0.7.2" Bundle-ActivationPolicy: lazy
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/META-INF/MANIFEST.MF b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/META-INF/MANIFEST.MF index 29761e9..957f1bb 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.modelexplorer/META-INF/MANIFEST.MF
@@ -7,34 +7,35 @@ Bundle-Vendor: Eclipse Modeling Project Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.1", - org.eclipse.papyrus.infra.newchild;bundle-version="1.1.2", - org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.1", + org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", + org.eclipse.papyrus.infra.newchild;bundle-version="1.2.0", + org.eclipse.papyrus.infra.types;bundle-version="2.0.0", org.eclipse.emf.ecore, org.eclipse.uml2.uml, - org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.1.1", - org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.1.1", - org.eclipse.papyrus.uml.tools;bundle-version="1.1.1", - org.eclipse.papyrus.infra.emf;bundle-version="1.1.1", - org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.1", + org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0", + org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0", + org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", + org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.2.0", org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.1.1", - org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.1", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.1", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.1", - org.eclipse.papyrus.infra.widgets;bundle-version="1.1.1", - org.eclipse.papyrus.uml.modelexplorer;bundle-version="1.1.1", - org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.1", + org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", + org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0", + org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", + org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0", + org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", + org.eclipse.papyrus.uml.modelexplorer;bundle-version="1.2.0", + org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0", org.eclipse.core.expressions;bundle-version="3.4.600", - org.eclipse.papyrus.infra.sync;bundle-version="1.1.1", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.1", - org.eclipse.papyrus.infra.core;bundle-version="1.1.1", + org.eclipse.papyrus.infra.sync;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core;bundle-version="1.2.0", com.google.guava;bundle-version="11.0.0", org.eclipse.papyrusrt.umlrt.core;bundle-version="0.7.2", org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.2", org.eclipse.papyrusrt.umlrt.tooling.ui;bundle-version="0.7.2", - org.eclipse.papyrus.uml.filters;bundle-version="1.1.2", - org.eclipse.papyrusrt.umlrt.tooling.filter;bundle-version="0.7.2" + org.eclipse.papyrus.uml.filters;bundle-version="1.2.0", + org.eclipse.papyrusrt.umlrt.tooling.filter;bundle-version="0.7.2", + org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrusrt.umlrt.tooling.modelexplorer,
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/META-INF/MANIFEST.MF b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/META-INF/MANIFEST.MF index 6d60f4f..6382f1d 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/META-INF/MANIFEST.MF +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/META-INF/MANIFEST.MF
@@ -7,15 +7,14 @@ Bundle-Vendor: Eclipse Modeling Project Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.papyrus.views.properties;bundle-version="1.1.1", + org.eclipse.papyrus.views.properties;bundle-version="1.2.0", org.eclipse.core.databinding;bundle-version="1.4.2", - org.eclipse.papyrus.infra.widgets;bundle-version="1.1.1", - org.eclipse.papyrus.views.properties.model;bundle-version="1.1.1", - org.eclipse.papyrus.infra.emf;bundle-version="1.1.1", - org.eclipse.papyrus.uml.tools;bundle-version="1.1.1", - org.eclipse.papyrus.uml.properties;bundle-version="1.1.1", + org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", + org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", + org.eclipse.papyrus.uml.properties;bundle-version="1.2.0", org.eclipse.emf.databinding;bundle-version="1.3.0", - org.eclipse.papyrus.infra.core.log;bundle-version="1.1.1", + org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", org.eclipse.emf.transaction;bundle-version="1.9.0", org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.2", org.eclipse.papyrusrt.umlrt.core;bundle-version="0.7.2", @@ -23,10 +22,10 @@ org.eclipse.ui.views.properties.tabbed, org.eclipse.jface.databinding, org.eclipse.core.databinding.property;bundle-version="1.5.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.1", + org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", org.eclipse.papyrus.infra.gmfdiag.common, - org.eclipse.papyrusrt.umlrt.tooling.ui;bundle-version="0.7.2" + org.eclipse.papyrusrt.umlrt.tooling.ui;bundle-version="0.7.2", + org.eclipse.papyrus.infra.properties;bundle-version="1.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy -Import-Package: org.eclipse.papyrus.uml.tools.utils Export-Package: org.eclipse.papyrusrt.umlrt.tooling.properties
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/plugin.xml b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/plugin.xml index a51873f..cea8749 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/plugin.xml +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/plugin.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?><?eclipse version="3.4"?> <plugin> <extension - point="org.eclipse.papyrus.views.properties.context"> + point="org.eclipse.papyrus.infra.properties.contexts"> <context contextModel="propertyView/UML-RT/uml-rt.ctx" isCustomizable="true"/> </extension>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleCapsule.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleCapsule.xwt index 7b991ea..58a4712 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleCapsule.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleCapsule.xwt
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleCapsulePart.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleCapsulePart.xwt index 7b991ea..58a4712 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleCapsulePart.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleCapsulePart.xwt
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleProtocol.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleProtocol.xwt index 678908c..e0f0c68 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleProtocol.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleProtocol.xwt
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" - xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns:umlrt="clr-namespace:org.eclipse.papyrusrt.umlrt.tooling.ui.widgets" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleProtocolContainer.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleProtocolContainer.xwt index 7b991ea..58a4712 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleProtocolContainer.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleProtocolContainer.xwt
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTConnector.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTConnector.xwt index 7b991ea..58a4712 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTConnector.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTConnector.xwt
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTMessageSet.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTMessageSet.xwt index ce3e4f0..bc97d73 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTMessageSet.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTMessageSet.xwt
@@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" - xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTPort.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTPort.xwt index c2175d3..7068297 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTPort.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTPort.xwt
@@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" - xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTRExcludedElement.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTRExcludedElement.xwt index 7b991ea..58a4712 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTRExcludedElement.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTRExcludedElement.xwt
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTTrigger.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTTrigger.xwt index 7ec8a90..da66cb0 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTTrigger.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/MultipleRTTrigger.xwt
@@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" - xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleCapsule.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleCapsule.xwt index 085c8cd..d97094f 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleCapsule.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleCapsule.xwt
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" xmlns:ppumlrt="clr-namespace:org.eclipse.papyrusrt.umlrt.tooling.ui.widgets" - xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"> + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleCapsulePart.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleCapsulePart.xwt index 8c44edc..2b2b5ba 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleCapsulePart.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleCapsulePart.xwt
@@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets" - xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" + xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns:ppumlrt="clr-namespace:org.eclipse.papyrusrt.umlrt.tooling.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"> <Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleProtocol.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleProtocol.xwt index 678908c..e0f0c68 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleProtocol.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleProtocol.xwt
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" - xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns:umlrt="clr-namespace:org.eclipse.papyrusrt.umlrt.tooling.ui.widgets" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleProtocolContainer.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleProtocolContainer.xwt index 7b991ea..58a4712 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleProtocolContainer.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleProtocolContainer.xwt
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleProtocolMessage.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleProtocolMessage.xwt index 7d527ff..e800b3d 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleProtocolMessage.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleProtocolMessage.xwt
@@ -2,10 +2,10 @@ <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" - xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns:umlrt="clr-namespace:org.eclipse.papyrusrt.umlrt.tooling.ui.widgets" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTConnector.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTConnector.xwt index 7b991ea..58a4712 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTConnector.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTConnector.xwt
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTMessageSet.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTMessageSet.xwt index c5225ef..9d9b6f3 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTMessageSet.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTMessageSet.xwt
@@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" +<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTPort.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTPort.xwt index ba89f44..2cce3bf 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTPort.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTPort.xwt
@@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" - xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" + xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns:ppumlrt="clr-namespace:org.eclipse.papyrusrt.umlrt.tooling.ui.widgets"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTRExcludedElement.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTRExcludedElement.xwt index 7b991ea..58a4712 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTRExcludedElement.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTRExcludedElement.xwt
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"> + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTTrigger.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTTrigger.xwt index af67df8..eb40da8 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTTrigger.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.properties/propertyView/UML-RT/ui/SingleRTTrigger.xwt
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" xmlns:ppumlrt="clr-namespace:org.eclipse.papyrusrt.umlrt.tooling.ui.widgets" - xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"> + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"> <Composite.layout> <ppel:PropertiesLayout></ppel:PropertiesLayout> </Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/.classpath b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/.classpath index 098194c..4f83b23 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/.classpath +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/.classpath
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="output" path="bin"/> </classpath>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/.settings/org.eclipse.jdt.core.prefs index f42de36..0c68a61 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/META-INF/MANIFEST.MF b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/META-INF/MANIFEST.MF index 644715a..74a143f 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/META-INF/MANIFEST.MF +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/META-INF/MANIFEST.MF
@@ -8,28 +8,29 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.2", - org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.1", - org.eclipse.papyrus.infra.widgets;bundle-version="1.1.1", + org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0", + org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0", org.eclipse.core.databinding;bundle-version="1.5.0", org.eclipse.emf.databinding;bundle-version="1.3.0", org.eclipse.emf.transaction;bundle-version="1.9.0", - org.eclipse.papyrus.uml.tools;bundle-version="1.1.1", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.1", - org.eclipse.papyrus.views.properties;bundle-version="1.1.1", - org.eclipse.papyrus.views.properties.model;bundle-version="1.1.1", - org.eclipse.papyrus.infra.emf;bundle-version="1.1.1", - org.eclipse.papyrus.infra.core.log;bundle-version="1.1.1", + org.eclipse.papyrus.uml.tools;bundle-version="1.2.0", + org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", + org.eclipse.papyrus.infra.properties;bundle-version="1.2.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0", org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", - org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.1", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.1", - org.eclipse.papyrus.infra.core;bundle-version="1.1.1", + org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0", + org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core;bundle-version="1.2.0", org.eclipse.papyrusrt.umlrt.core;bundle-version="0.7.2", - org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.1", - org.eclipse.papyrus.infra.elementtypesconfigurations, + org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0", + org.eclipse.papyrus.infra.types, org.eclipse.papyrus.infra.gmfdiag.commands, org.eclipse.papyrus.uml.properties, - org.eclipse.papyrus.uml.diagram.common -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 + org.eclipse.papyrus.uml.diagram.common, + org.eclipse.papyrus.views.properties;bundle-version="1.2.0", + org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0" +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrusrt.umlrt.tooling.ui, org.eclipse.papyrusrt.umlrt.tooling.ui.constraints,
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/build.properties b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/build.properties index df85ad4..03455e6 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/build.properties +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/build.properties
@@ -8,3 +8,4 @@ environment/,\ elementtypes/,\ dialogs/ +jre.compilation.profile = JavaSE-1.8
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/dialogs/ui/SingleCapsulePart.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/dialogs/ui/SingleCapsulePart.xwt index 150f396..c6e0023 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/dialogs/ui/SingleCapsulePart.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/dialogs/ui/SingleCapsulePart.xwt
@@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" - xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns:ppumlrt="clr-namespace:org.eclipse.papyrusrt.umlrt.tooling.ui.widgets" xmlns:j="clr-namespace:java.lang"> <Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/dialogs/ui/SingleRTPort.xwt b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/dialogs/ui/SingleRTPort.xwt index 3bdf524..36e972e 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/dialogs/ui/SingleRTPort.xwt +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/dialogs/ui/SingleRTPort.xwt
@@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" - xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" - xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" + xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" + xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns:ppumlrt="clr-namespace:org.eclipse.papyrusrt.umlrt.tooling.ui.widgets" xmlns:j="clr-namespace:java.lang"> <Composite.layout>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/elementtypes/uml-rt.tooling.ui.elementtypesconfigurations b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/elementtypes/uml-rt.tooling.ui.elementtypesconfigurations index 7796ee7..b853487 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/elementtypes/uml-rt.tooling.ui.elementtypesconfigurations +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/elementtypes/uml-rt.tooling.ui.elementtypesconfigurations
@@ -1,62 +1,20 @@ -<?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:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" - xmlns:runtimevalueseditionadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.0" - xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" - name="UMLRealTime Tooling UI" - identifier="org.eclipse.papyrusrt.umlrt.tooling.ui.elementTypeSet" - metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML"> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_5SPR8DdmEeWK7ZUbpAMB-g" - name="org.eclipse.papyrusrt.umlrt.tooling.ui.rtportcreationwithui" - description="Creation type only for RTPorts from UI, like model explorer" - identifier="org.eclipse.papyrusrt.umlrt.tooling.ui.rtportcreationwithui"> +<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:runtimevaluesadvice="http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrusrt.umlrt.tooling.ui.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="UMLRealTime Tooling UI" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" xmi:version="2.0"> + <elementTypeConfigurations description="Creation type only for RTPorts from UI, like model explorer" identifier="org.eclipse.papyrusrt.umlrt.tooling.ui.rtportcreationwithui" name="org.eclipse.papyrusrt.umlrt.tooling.ui.rtportcreationwithui" xmi:id="_5SPR8DdmEeWK7ZUbpAMB-g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.ExternalBehaviorPort</specializedTypesID> - <matcherConfiguration - xmi:id="_JLWfsDdnEeWK7ZUbpAMB-g" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.NoMatcher"/> + <matcherConfiguration matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.NoMatcher" xmi:id="_JLWfsDdnEeWK7ZUbpAMB-g" xsi:type="elementtypesconfigurations:MatcherConfiguration"/> </elementTypeConfigurations> - <elementTypeConfigurations - xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" - xmi:id="_Myv-ADeEEeWK7ZUbpAMB-g" - name="org.eclipse.papyrusrt.umlrt.tooling.ui.capsulepartcreationwithui" - description="Creation type only for capsuleParts from UI, like model explorer" - identifier="org.eclipse.papyrusrt.umlrt.tooling.ui.capsulepartcreationwithui"> + <elementTypeConfigurations description="Creation type only for capsuleParts from UI, like model explorer" identifier="org.eclipse.papyrusrt.umlrt.tooling.ui.capsulepartcreationwithui" name="org.eclipse.papyrusrt.umlrt.tooling.ui.capsulepartcreationwithui" xmi:id="_Myv-ADeEEeWK7ZUbpAMB-g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"> <specializedTypesID>org.eclipse.papyrusrt.umlrt.core.CapsulePart</specializedTypesID> - <matcherConfiguration - xmi:id="_Myv-ATeEEeWK7ZUbpAMB-g" - matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.NoMatcher"/> + <matcherConfiguration matcherClassName="org.eclipse.papyrusrt.umlrt.core.types.matcher.NoMatcher" xmi:id="_Myv-ATeEEeWK7ZUbpAMB-g" xsi:type="elementtypesconfigurations:MatcherConfiguration"/> </elementTypeConfigurations> - <adviceBindingsConfigurations - xsi:type="runtimevalueseditionadviceconfiguration:RuntimeValuesEditionAdviceConfiguration" - xmi:id="_4UTDADdmEeWK7ZUbpAMB-g" - name="org.eclipse.papyrusrt.umlrt.tooling.ui.rtportcreationwithui.viewconfiguration" - description="UI configuration for the creation advice of a port" - identifier="org.eclipse.papyrusrt.umlrt.tooling.ui.rtportcreationwithui.viewconfiguration" - inheritance="all" - target="_5SPR8DdmEeWK7ZUbpAMB-g"> - <viewsToDisplay - xmi:id="_hWd_4DdnEeWK7ZUbpAMB-g"> - <view - href="../dialogs/CreationDialogs.ctx#_F4P60zdoEeWK7ZUbpAMB-g"/> + <adviceBindingsConfigurations description="UI configuration for the creation advice of a port" identifier="org.eclipse.papyrusrt.umlrt.tooling.ui.rtportcreationwithui.viewconfiguration" inheritance="all" target="_5SPR8DdmEeWK7ZUbpAMB-g" xmi:id="_4UTDADdmEeWK7ZUbpAMB-g" xsi:type="runtimevaluesadvice:RuntimeValuesAdviceConfiguration"> + <viewsToDisplay xmi:id="_hWd_4DdnEeWK7ZUbpAMB-g"> + <view href="../dialogs/CreationDialogs.ctx#_F4P60zdoEeWK7ZUbpAMB-g"/> </viewsToDisplay> </adviceBindingsConfigurations> - <adviceBindingsConfigurations - xsi:type="runtimevalueseditionadviceconfiguration:RuntimeValuesEditionAdviceConfiguration" - xmi:id="_MywlEDeEEeWK7ZUbpAMB-g" - name="org.eclipse.papyrusrt.umlrt.tooling.ui.capsulepartcreationwithui.viewconfiguration" - description="UI configuration for the creation advice of a capsule part" - identifier="org.eclipse.papyrusrt.umlrt.tooling.ui.capsulepartcreationwithui.viewconfiguration" - inheritance="all" - target="_Myv-ADeEEeWK7ZUbpAMB-g"> - <viewsToDisplay - xmi:id="_MywlETeEEeWK7ZUbpAMB-g"> - <view - href="../dialogs/CreationDialogs.ctx#CapsulePartDialogView"/> + <adviceBindingsConfigurations description="UI configuration for the creation advice of a capsule part" identifier="org.eclipse.papyrusrt.umlrt.tooling.ui.capsulepartcreationwithui.viewconfiguration" inheritance="all" target="_Myv-ADeEEeWK7ZUbpAMB-g" xmi:id="_MywlEDeEEeWK7ZUbpAMB-g" xsi:type="runtimevaluesadvice:RuntimeValuesAdviceConfiguration"> + <viewsToDisplay xmi:id="_MywlETeEEeWK7ZUbpAMB-g"> + <view href="../dialogs/CreationDialogs.ctx#CapsulePartDialogView"/> </viewsToDisplay> </adviceBindingsConfigurations> -</elementtypesconfigurations:ElementTypeSetConfiguration> +</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/plugin.xml b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/plugin.xml index e9acb65..e4af0d0 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/plugin.xml +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/plugin.xml
@@ -22,15 +22,15 @@ </profile> </extension> <extension - point="org.eclipse.papyrus.views.properties.environment"> + point="org.eclipse.papyrus.infra.properties.environments"> <environment environmentModel="environment/Environment.xmi"> </environment> </extension> <extension - point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration"> + point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration"> <elementTypeSet - id="org.eclipse.papyrusrt.umlrt.tooling.ui.elementTypeSet" + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" path="elementtypes/uml-rt.tooling.ui.elementtypesconfigurations"> </elementTypeSet> </extension>
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/internal/modelelement/ChangeListenerUtils.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/internal/modelelement/ChangeListenerUtils.java index 5a6866f..e653830 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/internal/modelelement/ChangeListenerUtils.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/internal/modelelement/ChangeListenerUtils.java
@@ -14,7 +14,8 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.eclipse.papyrus.views.properties.modelelement.DataSource; +import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource; + /** * Listener that forces refresh of the model element. Workaround for bug 477033
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/modelelement/RTStereotypeModelElementFactory.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/modelelement/RTStereotypeModelElementFactory.java index 87f20c4..47ebc5e 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/modelelement/RTStereotypeModelElementFactory.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/modelelement/RTStereotypeModelElementFactory.java
@@ -14,10 +14,10 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; +import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement; import org.eclipse.papyrus.uml.properties.modelelement.StereotypeModelElementFactory; import org.eclipse.papyrus.uml.tools.utils.UMLUtil; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; -import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement; import org.eclipse.papyrusrt.umlrt.tooling.ui.Activator; import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.Stereotype;
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/modelelement/UMLRTExtModelElement.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/modelelement/UMLRTExtModelElement.java index 3803913..812d7f9 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/modelelement/UMLRTExtModelElement.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/modelelement/UMLRTExtModelElement.java
@@ -33,10 +33,11 @@ import org.eclipse.emf.transaction.util.TransactionUtil; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.papyrus.infra.emf.providers.EMFGraphicalContentProvider; -import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider; import org.eclipse.papyrus.infra.emf.utils.HistoryUtil; -import org.eclipse.papyrus.infra.emf.utils.ProviderHelper; +import org.eclipse.papyrus.infra.properties.ui.providers.FeatureContentProvider; +import org.eclipse.papyrus.infra.ui.emf.providers.EMFGraphicalContentProvider; +import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider; +import org.eclipse.papyrus.infra.ui.emf.utils.ProviderHelper; import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory; import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider; import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider; @@ -45,7 +46,6 @@ import org.eclipse.papyrus.uml.tools.databinding.ExtendedMultiplicityObservableValue; import org.eclipse.papyrus.uml.tools.providers.UMLContainerContentProvider; import org.eclipse.papyrus.uml.tools.providers.UMLFilteredLabelProvider; -import org.eclipse.papyrus.views.properties.providers.FeatureContentProvider; import org.eclipse.papyrusrt.umlrt.core.utils.IRealTimeConstants; import org.eclipse.papyrusrt.umlrt.core.utils.MessageSetUtils; import org.eclipse.papyrusrt.umlrt.core.utils.RTPortUtils;
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/modelelement/UMLRTExtModelElementFactory.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/modelelement/UMLRTExtModelElementFactory.java index 3ac9acf..e7110ac 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/modelelement/UMLRTExtModelElementFactory.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/modelelement/UMLRTExtModelElementFactory.java
@@ -2,9 +2,9 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.infra.properties.contexts.DataContextElement; import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElement; import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElementFactory; -import org.eclipse.papyrus.views.properties.contexts.DataContextElement; import org.eclipse.papyrusrt.umlrt.core.utils.CapsulePartUtils; import org.eclipse.papyrusrt.umlrt.core.utils.MessageSetUtils; import org.eclipse.papyrusrt.umlrt.core.utils.ProtocolUtils;
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/AbstractElementTypeBasedValueFactory.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/AbstractElementTypeBasedValueFactory.java index ede69fc..6fe7ca8 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/AbstractElementTypeBasedValueFactory.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/AbstractElementTypeBasedValueFactory.java
@@ -25,11 +25,11 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; import org.eclipse.jface.window.Window; import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.properties.ui.creation.CreateInDialog; import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext; import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils; import org.eclipse.papyrus.infra.services.edit.service.IElementEditService; import org.eclipse.papyrus.uml.properties.creation.UMLPropertyEditorFactory; -import org.eclipse.papyrus.views.properties.creation.CreateInDialog; import org.eclipse.papyrusrt.umlrt.tooling.ui.Activator; import org.eclipse.swt.widgets.Control;
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/CapsulePartTypeEditor.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/CapsulePartTypeEditor.java index 55d792a..e142911 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/CapsulePartTypeEditor.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/CapsulePartTypeEditor.java
@@ -11,7 +11,7 @@ *****************************************************************************/ package org.eclipse.papyrusrt.umlrt.tooling.ui.widgets; -import org.eclipse.papyrus.views.properties.widgets.ReferenceDialog; +import org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog; import org.eclipse.swt.widgets.Composite; /** @@ -32,7 +32,7 @@ * The style for the widget * @return the reference dialog. */ - protected org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog createReferenceDialog(Composite parent, int style) { + protected ReferenceDialog createReferenceDialog(Composite parent, int style) { return new CapsulePartTypeDialog(parent, style); } }
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/EventSelectionDialog.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/EventSelectionDialog.java index b362d03..4d0b6b5 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/EventSelectionDialog.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/EventSelectionDialog.java
@@ -23,12 +23,12 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.papyrus.infra.properties.ui.modelelement.ModelElement; +import org.eclipse.papyrus.infra.properties.ui.widgets.ReferenceDialog; import org.eclipse.papyrus.infra.widgets.providers.DelegatingLabelProvider; import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider; import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElement; import org.eclipse.papyrus.uml.tools.utils.PackageUtil; -import org.eclipse.papyrus.views.properties.modelelement.ModelElement; -import org.eclipse.papyrus.views.properties.widgets.ReferenceDialog; import org.eclipse.papyrusrt.umlrt.core.utils.ProtocolUtils; import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.RTMessageKind; import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.RTMessageSet;
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/MessageSetOwnedProtocolMessageValueFactory.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/MessageSetOwnedProtocolMessageValueFactory.java index 0f6d4ef..26577cc 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/MessageSetOwnedProtocolMessageValueFactory.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/MessageSetOwnedProtocolMessageValueFactory.java
@@ -16,10 +16,10 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; +import org.eclipse.papyrus.infra.properties.contexts.Context; +import org.eclipse.papyrus.infra.properties.contexts.View; +import org.eclipse.papyrus.infra.properties.ui.creation.CreationContext; import org.eclipse.papyrus.uml.properties.creation.UMLPropertyEditorFactory; -import org.eclipse.papyrus.views.properties.contexts.Context; -import org.eclipse.papyrus.views.properties.contexts.View; -import org.eclipse.papyrus.views.properties.creation.CreationContext; import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager; import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.RTMessageKind; import org.eclipse.papyrusrt.umlrt.tooling.ui.Messages;
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/PortRTKindPropertyEditor.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/PortRTKindPropertyEditor.java index 12d91b1..f429946 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/PortRTKindPropertyEditor.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/PortRTKindPropertyEditor.java
@@ -12,8 +12,8 @@ package org.eclipse.papyrusrt.umlrt.tooling.ui.widgets; import org.eclipse.emf.common.command.Command; -import org.eclipse.papyrus.views.properties.modelelement.ModelElement; -import org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor; +import org.eclipse.papyrus.infra.properties.ui.modelelement.ModelElement; +import org.eclipse.papyrus.infra.properties.ui.widgets.AbstractPropertyEditor; import org.eclipse.papyrusrt.umlrt.core.utils.RTPortKindEnum; import org.eclipse.papyrusrt.umlrt.core.utils.RTPortUtils; import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.RTPort;
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/PortReference.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/PortReference.java index 35856c5..0aa48c1 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/PortReference.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/PortReference.java
@@ -13,8 +13,8 @@ package org.eclipse.papyrusrt.umlrt.tooling.ui.widgets; +import org.eclipse.papyrus.infra.properties.ui.widgets.MultiReference; import org.eclipse.papyrus.infra.widgets.editors.MultipleReferenceEditor; -import org.eclipse.papyrus.views.properties.widgets.MultiReference; import org.eclipse.papyrusrt.umlrt.tooling.ui.editors.PortSelectionEditor; import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/RTPortTypeEditor.java b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/RTPortTypeEditor.java index 2209d49..1785916 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/RTPortTypeEditor.java +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui/src/org/eclipse/papyrusrt/umlrt/tooling/ui/widgets/RTPortTypeEditor.java
@@ -11,7 +11,7 @@ *****************************************************************************/ package org.eclipse.papyrusrt.umlrt.tooling.ui.widgets; -import org.eclipse.papyrus.views.properties.widgets.ReferenceDialog; +import org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog; import org.eclipse.swt.widgets.Composite; /** @@ -32,7 +32,7 @@ * The style for the widget * @return the reference dialog. */ - protected org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog createReferenceDialog(Composite parent, int style) { + protected ReferenceDialog createReferenceDialog(Composite parent, int style) { return new RTPortTypeDialog(parent, style); } }
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.wizards/META-INF/MANIFEST.MF b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.wizards/META-INF/MANIFEST.MF index 0cc8db2..4ea534d 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.wizards/META-INF/MANIFEST.MF +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.wizards/META-INF/MANIFEST.MF
@@ -6,13 +6,15 @@ Bundle-Activator: org.eclipse.papyrusrt.umlrt.tooling.wizards.Activator Bundle-Vendor: Eclipse Modeling Project Require-Bundle: org.eclipse.ui, - org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.1", + org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0", org.eclipse.uml2.uml;bundle-version="4.1.0", - org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.1", - org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.1", - org.eclipse.papyrus.infra.core;bundle-version="1.1.1", + org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0", + org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core;bundle-version="1.2.0", org.eclipse.ui.ide;bundle-version="3.9.0", org.eclipse.papyrusrt.umlrt.core;bundle-version="0.7.2", - org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.2" + org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.2", + org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0", + org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy
diff --git a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.wizards/plugin.xml b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.wizards/plugin.xml index f5cb856..83ce59f 100644 --- a/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.wizards/plugin.xml +++ b/plugins/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.wizards/plugin.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.4"?> <plugin> - <extension point="org.eclipse.papyrus.infra.core.papyrusDiagram"> + <extension point="org.eclipse.papyrus.infra.ui.papyrusDiagram"> <diagramCategory class="org.eclipse.papyrusrt.umlrt.tooling.wizards.ui.CreateUMLRTModelCommand" description="UML-RT diagrams" @@ -21,15 +21,6 @@ name="An empty UML RealTime model" notation_file="resources/templates/rt-template.notation"> </template> - <template - di_file="resources/templates/rt-templateWithStateMachineProfileApplied.di" - file="resources/templates/rt-templateWithStateMachineProfileApplied.uml" - id="org.eclipse.papyrusrt.umlrt.tooling.wizards.templateWithStateMachine" - isDefault="false" - language="uml" - name="UML RealTime model With Optional StateMachine profile applied" - notation_file="resources/templates/rt-templateWithStateMachineProfileApplied.notation"> - </template> </extension> </plugin>
diff --git a/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.common.model/pom.xml b/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.common.model/pom.xml index fd62665..729cb62 100644 --- a/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.common.model/pom.xml +++ b/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.common.model/pom.xml
@@ -33,8 +33,8 @@ </dependencies> <repositories> <repository> - <id>mars</id> - <url>${mars-repo.url}</url> + <id>simrel</id> + <url>${simrel-repo.url}</url> <layout>p2</layout> </repository> </repositories>
diff --git a/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.statemach.ext.model/pom.xml b/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.statemach.ext.model/pom.xml index 5b9f38a..245732e 100644 --- a/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.statemach.ext.model/pom.xml +++ b/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.statemach.ext.model/pom.xml
@@ -50,8 +50,8 @@ </dependencies> <repositories> <repository> - <id>mars</id> - <url>${mars-repo.url}</url> + <id>simrel</id> + <url>${simrel-repo.url}</url> <layout>p2</layout> </repository> <repository>
diff --git a/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.statemach.model/pom.xml b/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.statemach.model/pom.xml index 19e9311..1052fd9 100644 --- a/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.statemach.model/pom.xml +++ b/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.statemach.model/pom.xml
@@ -33,8 +33,8 @@ </dependencies> <repositories> <repository> - <id>mars</id> - <url>${mars-repo.url}</url> + <id>simrel</id> + <url>${simrel-repo.url}</url> <layout>p2</layout> </repository> </repositories>
diff --git a/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.umlrt.model/pom.xml b/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.umlrt.model/pom.xml index 02c6e68..8ac9a7c 100644 --- a/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.umlrt.model/pom.xml +++ b/plugins/xtumlrt/metamodel/org.eclipse.papyrusrt.xtumlrt.umlrt.model/pom.xml
@@ -50,8 +50,8 @@ </dependencies> <repositories> <repository> - <id>mars</id> - <url>${mars-repo.url}</url> + <id>simrel</id> + <url>${simrel-repo.url}</url> <layout>p2</layout> </repository> <repository>
diff --git a/plugins/xtumlrt/xtext/org.eclipse.papyrusrt.xtumlrt.xtext.trans/src/org/eclipse/papyrusrt/xtumlrt/xtext/trans/umlrt/TextToUMLRTGeneratorUtils.java b/plugins/xtumlrt/xtext/org.eclipse.papyrusrt.xtumlrt.xtext.trans/src/org/eclipse/papyrusrt/xtumlrt/xtext/trans/umlrt/TextToUMLRTGeneratorUtils.java index 35d74a3..10e4c40 100644 --- a/plugins/xtumlrt/xtext/org.eclipse.papyrusrt.xtumlrt.xtext.trans/src/org/eclipse/papyrusrt/xtumlrt/xtext/trans/umlrt/TextToUMLRTGeneratorUtils.java +++ b/plugins/xtumlrt/xtext/org.eclipse.papyrusrt.xtumlrt.xtext.trans/src/org/eclipse/papyrusrt/xtumlrt/xtext/trans/umlrt/TextToUMLRTGeneratorUtils.java
@@ -16,14 +16,14 @@ import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.papyrus.infra.core.editor.BackboneException; -import org.eclipse.papyrus.infra.core.extension.commands.IModelCreationCommand; import org.eclipse.papyrus.infra.core.resource.ModelMultiException; import org.eclipse.papyrus.infra.core.resource.ModelSet; import org.eclipse.papyrus.infra.core.resource.NotFoundException; -import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager; +import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager; import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.core.services.ServicesRegistry; +import org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand; import org.eclipse.papyrus.uml.diagram.wizards.category.DiagramCategoryRegistry; import org.eclipse.papyrus.uml.tools.model.UmlModel; import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
diff --git a/releng/codegen/pom.xml b/releng/codegen/pom.xml index d78c194..e4506de 100644 --- a/releng/codegen/pom.xml +++ b/releng/codegen/pom.xml
@@ -50,20 +50,23 @@ <maven-clean.version>3.0.0</maven-clean.version> <exec-maven.version>1.2.1</exec-maven.version> <papyrus.version></papyrus.version> + <!-- This is a temporary measure until the papyrus.version parameter can be updated in the Gerrit Hudson build config. --> + <papyrus.versionFIXME>2.0</papyrus.versionFIXME> <tycho.version>0.24.0</tycho.version> - <uml.version>5.1</uml.version> - <uml.release>R201509061225</uml.release> + <uml.version>5.2milestones</uml.version> + <uml.release>S201603210821</uml.release> <xtext.version>2.9.1</xtext.version> + <eclipse.stream>neon</eclipse.stream> <ECLIPSE_DOWNLOADS>http://download.eclipse.org</ECLIPSE_DOWNLOADS> <!-- Set to file:/home/data/httpd/download.eclipse.org when building on Eclipse servers to improve performances --> <eclipse.download>${ECLIPSE_DOWNLOADS}</eclipse.download> - <mars-repo.url>${eclipse.download}/releases/mars</mars-repo.url> + <simrel-repo.url>${eclipse.download}/releases/${eclipse.stream}</simrel-repo.url> <orbit-repo.url>${eclipse.download}/tools/orbit/downloads/drops/R20150821153341/repository/</orbit-repo.url> - <papyrus-releases-repo.url>${eclipse.download}/modeling/mdt/papyrus/updates/releases/mars/${papyrus.version}</papyrus-releases-repo.url> - <papyrus-releases-extras-repo.url>${eclipse.download}/modeling/mdt/papyrus/updates/releases/mars/${papyrus.version}/extra</papyrus-releases-extras-repo.url> - <papyrus-nightly-repo.url>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/mars/${papyrus.version}</papyrus-nightly-repo.url> - <papyrus-nightly-extras-repo.url>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/mars/${papyrus.version}/extra</papyrus-nightly-extras-repo.url> - <papyrus-milestones-repo.url>${eclipse.download}/modeling/mdt/papyrus/updates/milestones/1.1</papyrus-milestones-repo.url> - <papyrus-milestones-extras-repo.url>${eclipse.download}/modeling/mdt/papyrus/updates/milestones/1.1/extra</papyrus-milestones-extras-repo.url> + <papyrus-releases-repo.url>${eclipse.download}/modeling/mdt/papyrus/updates/releases/${eclipse.stream}/main</papyrus-releases-repo.url> + <papyrus-releases-extras-repo.url>${eclipse.download}/modeling/mdt/papyrus/updates/releases/${eclipse.stream}/extra</papyrus-releases-extras-repo.url> + <papyrus-nightly-repo.url>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/${eclipse.stream}/main</papyrus-nightly-repo.url> + <papyrus-nightly-extras-repo.url>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/${eclipse.stream}/extra</papyrus-nightly-extras-repo.url> + <papyrus-milestones-repo.url>${eclipse.download}/modeling/mdt/papyrus/updates/milestones/${papyrus.versionFIXME}/main</papyrus-milestones-repo.url> + <papyrus-milestones-extras-repo.url>${eclipse.download}/modeling/mdt/papyrus/updates/milestones/${papyrus.versionFIXME}/extra</papyrus-milestones-extras-repo.url> <papyrus-rt-profile-repo.url>https://hudson.eclipse.org/papyrus-rt/job/Papyrus-RT-Master-All/lastSuccessfulBuild/artifact/repository/</papyrus-rt-profile-repo.url> <uml.url>${eclipse.download}/modeling/mdt/uml2/updates/${uml.version}/${uml.release}/</uml.url> <xtext.url>${eclipse.download}/modeling/tmf/xtext/updates/releases/</xtext.url> @@ -73,8 +76,8 @@ <repositories> <repository> - <id>mars</id> - <url>${mars-repo.url}</url> + <id>simrel</id> + <url>${simrel-repo.url}</url> <layout>p2</layout> </repository> <repository>
diff --git a/releng/org.eclipse.papyrusrt.product/pom.xml b/releng/org.eclipse.papyrusrt.product/pom.xml index 15a7582..ff27bcb 100644 --- a/releng/org.eclipse.papyrusrt.product/pom.xml +++ b/releng/org.eclipse.papyrusrt.product/pom.xml
@@ -16,9 +16,9 @@ <!-- Repository create from tp --> <repository> - <id>repo-papyrus-mars</id> + <id>repo-papyrus</id> <layout>p2</layout> - <url>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/main/</url> + <url>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/neon/main/</url> </repository> </repositories>
diff --git a/releng/org.eclipse.papyrusrt.rcptt/pom.xml b/releng/org.eclipse.papyrusrt.rcptt/pom.xml index bd4a4c2..db2b40f 100644 --- a/releng/org.eclipse.papyrusrt.rcptt/pom.xml +++ b/releng/org.eclipse.papyrusrt.rcptt/pom.xml
@@ -22,7 +22,8 @@ </pluginRepositories> <properties> - <rcptt-runner-version>2.0.2</rcptt-runner-version> + <rcptt-version>2.0.1</rcptt-version> + <rcptt-runner-version>2.1.0-M4b</rcptt-runner-version> </properties> <build> @@ -30,7 +31,7 @@ <plugin> <groupId>org.eclipse.rcptt</groupId> <artifactId>rcptt-maven-plugin</artifactId> - <version>2.0.1</version> + <version>${rcptt-version}</version> <extensions>true</extensions> <configuration> <runner>
diff --git a/releng/pom.xml b/releng/pom.xml index dd2bc5e..e1aab92 100644 --- a/releng/pom.xml +++ b/releng/pom.xml
@@ -16,7 +16,8 @@ <module>site</module> <module>org.eclipse.papyrusrt.rcp</module> <module>org.eclipse.papyrusrt.product</module> - <module>org.eclipse.papyrusrt.rcptt</module> + <!-- FIXME: Disabled until bug 490419 is resolved --> + <!-- <module>org.eclipse.papyrusrt.rcptt</module> --> </modules> <licenses> <license> @@ -43,24 +44,21 @@ - <!-- Papyrus RT Eclipse Nexus --> - <papyrus-main-repo>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/main/</papyrus-main-repo> - <papyrus-extra-repo>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/extra/</papyrus-extra-repo> - <eclipse-release-repo>http://download.eclipse.org/releases/mars</eclipse-release-repo> + <!-- + These are just defaults for test and Gerrit builds. In production + builds, they are superseded by the 'nightly-stable-deps' and + 'nightly-bleeding-edge' profiles (see below) according to the + value of the NIGHTLY_DEPS configuration parameter of the + Hudson build. Thus, these defaults only apply outside + of the Hudson build environment and in Gerrit builds, which + do not have the NIGHTLY_DEPS build parameter. + --> + <papyrus-main-repo>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/neon/main/</papyrus-main-repo> + <papyrus-extra-repo>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/neon/extra/</papyrus-extra-repo> + <eclipse-release-repo>http://download.eclipse.org/releases/neon</eclipse-release-repo> </properties> <repositories> - <!-- FIXME repository to be removed after the Eclipse Release --> - <repository> <!-- Need the new language service from Papyrus RC4, not yet available in releases/mars --> - <id>SWT</id> - <layout>p2</layout> - <url>http://www.eclipse.org/swt/updates/4.4</url> - </repository> - <repository> - <id>papyrus-extra</id> - <layout>p2</layout> - <url>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/mars/1.1.4/extra</url> - </repository> <repository> <id>eclipse-simrel</id> <layout>p2</layout> @@ -70,15 +68,15 @@ <id>eclipse-updates</id> <layout>p2</layout> <!-- updateFrom("Eclipse",0) --> - <url>http://download.eclipse.org/eclipse/updates/4.5</url> + <url>http://download.eclipse.org/eclipse/updates/4.6milestones/</url> </repository> <repository> - <id>repo-papyrus-mars</id> + <id>repo-papyrus-main</id> <layout>p2</layout> <url>${papyrus-main-repo}</url> </repository> <repository> - <id>repo-papyrus-mars-extra</id> + <id>repo-papyrus-extra</id> <layout>p2</layout> <url>${papyrus-extra-repo}</url> </repository> @@ -592,6 +590,80 @@ </property> </activation> </profile> + + <!-- + BEGIN: nightly-build-profiles + Profiles for nightly builds, to determine what kinds + of builds of key dependencies to use. Activated by + presence and value of the boolean NIGHTLY_DEPS + Hudson build parameter. The Gerrit build does not + have this parameter. + --> + <profile> + <!-- + This profile selects the latest stable builds of dependencies + such as Papyrus, in integration and stable builds. + --> + <id>nightly-stable-deps</id> + <activation> + <property> + <name>NIGHTLY_DEPS</name> + <value>false</value> + </property> + </activation> + <properties> + <papyrus-main-repo>http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/2.0/M6/main/</papyrus-main-repo> + <papyrus-extra-repo>http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/2.0/M6/extra/</papyrus-extra-repo> + <eclipse-release-repo>http://download.eclipse.org/releases/neon</eclipse-release-repo> + </properties> + </profile> + <profile> + <!-- + This profile selects the bleeding edge of dependencies such + as Papyrus, in nightly builds only. + --> + <id>nightly-bleeding-edge</id> + <activation> + <property> + <name>NIGHTLY_DEPS</name> + <value>true</value> + </property> + </activation> + <properties> + <papyrus-main-repo>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/neon/main/</papyrus-main-repo> + <papyrus-extra-repo>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/neon/extra/</papyrus-extra-repo> + <eclipse-release-repo>http://download.eclipse.org/releases/neon</eclipse-release-repo> + </properties> + </profile> + <profile> + <!-- A clone of the 'defaultProfile' for the nightlies. --> + <id>nightly-common</id> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <activation> + <property> + <name>NIGHTLY_DEPS</name> + </property> + </activation> + </profile> + <!-- + END: nightly-build-profiles + --> </profiles> - </project>
diff --git a/releng/tests/pom.xml b/releng/tests/pom.xml index 3a1fc45..fb78db3 100644 --- a/releng/tests/pom.xml +++ b/releng/tests/pom.xml
@@ -23,7 +23,7 @@ <repository> <id>papyrus-dev</id> <!-- For Papyrus JUnit Framework. This is not released, so we need to reference the Hudson artifact --> <layout>p2</layout> - <url>https://hudson.eclipse.org/papyrus/job/Papyrus-Mars-Developer/lastSuccessfulBuild/artifact/repository/</url> + <url>https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/</url> </repository> </repositories> <build> @@ -83,13 +83,13 @@ <os>win32</os> <ws>win32</ws> <arch>x86</arch> - </environment>--> + </environment> <environment> <os>win32</os> <ws>win32</ws> <arch>x86_64</arch> - </environment> - <!--<environment> + </environment>--> + <!-- <environment> <os>linux</os> <ws>gtk</ws> <arch>x86</arch> @@ -150,7 +150,7 @@ <useUIHarness>true</useUIHarness> <useUIThread>false</useUIThread> <testFailureIgnore>true</testFailureIgnore> - <argLine>-Xms512m -Xmx2048m -XX:MaxPermSize=512M -XX:SoftRefLRUPolicyMSPerMB=100 -Dorg.eclipse.swt.browser.XULRunnerPath=/usr/lib64/xulrunner-1.9.1</argLine> + <argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100 -Dorg.eclipse.swt.browser.XULRunnerPath=/usr/lib64/xulrunner-1.9.1</argLine> <product>org.eclipse.sdk.ide</product> </configuration> </plugin>
diff --git a/tests/junit/umlrt/codegen/org.eclipse.papyrusrt.codegen.cpp.test/META-INF/MANIFEST.MF b/tests/junit/umlrt/codegen/org.eclipse.papyrusrt.codegen.cpp.test/META-INF/MANIFEST.MF index 42a89e7..c7ab3f8 100644 --- a/tests/junit/umlrt/codegen/org.eclipse.papyrusrt.codegen.cpp.test/META-INF/MANIFEST.MF +++ b/tests/junit/umlrt/codegen/org.eclipse.papyrusrt.codegen.cpp.test/META-INF/MANIFEST.MF
@@ -23,4 +23,5 @@ org.eclipse.papyrusrt.xtumlrt.umlrt.model;bundle-version="0.7.2", org.eclipse.uml2.uml.resources;bundle-version="5.1.0", org.eclipse.xtext.xbase.lib;bundle-version="2.8.4", + org.eclipse.papyrus.cpp.library;bundle-version="1.2.0", org.junit;bundle-version="4.11.0"
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/META-INF/MANIFEST.MF b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/META-INF/MANIFEST.MF index 8e5d49d..b5f1948 100644 --- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/META-INF/MANIFEST.MF +++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ org.eclipse.emf.transaction;bundle-version="1.9.0", org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.1.3", org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.3", - org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.3", + org.eclipse.papyrus.infra.types;bundle-version="2.0.0", org.eclipse.papyrus.uml.tools;bundle-version="1.1.3", org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.3", org.eclipse.swt;bundle-version="3.103.0", @@ -24,6 +24,7 @@ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0", org.eclipse.ui;bundle-version="3.100.0", org.eclipse.ui.editors;bundle-version="3.9.0", - org.eclipse.papyrus.infra.emf;bundle-version="1.1.3" + org.eclipse.papyrus.infra.emf;bundle-version="1.1.3", + org.eclipse.papyrus.infra.ui;bundle-version="1.2.0" Export-Package: org.eclipse.papyrusrt.umlrt.core.cpp.tests, org.eclipse.papyrusrt.umlrt.core.cpp.tests.lifecycle
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/src/org/eclipse/papyrusrt/umlrt/core/cpp/tests/AbstractPapyrusRTCppLibraryTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/src/org/eclipse/papyrusrt/umlrt/core/cpp/tests/AbstractPapyrusRTCppLibraryTest.java index 9c03050..1debbda 100644 --- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/src/org/eclipse/papyrusrt/umlrt/core/cpp/tests/AbstractPapyrusRTCppLibraryTest.java +++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.cpp.tests/src/org/eclipse/papyrusrt/umlrt/core/cpp/tests/AbstractPapyrusRTCppLibraryTest.java
@@ -23,12 +23,12 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor; import org.eclipse.papyrus.infra.core.resource.ModelSet; import org.eclipse.papyrus.infra.core.resource.ModelUtils; import org.eclipse.papyrus.infra.core.resource.NotFoundException; import org.eclipse.papyrus.infra.core.services.ServiceException; -import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry; +import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry; +import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration; import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint; import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/META-INF/MANIFEST.MF b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/META-INF/MANIFEST.MF index b6516f7..54c55da 100644 --- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/META-INF/MANIFEST.MF +++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ org.hamcrest.core;bundle-version="1.3.0", org.junit;bundle-version="4.10.0", org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.1", - org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.1", + org.eclipse.papyrus.infra.types;bundle-version="2.0.0", org.eclipse.core.resources;bundle-version="3.10.0", org.eclipse.core.runtime;bundle-version="3.11.0", org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0", @@ -45,7 +45,10 @@ org.eclipse.papyrusrt.umlrt.tooling.diagram.common;bundle-version="0.7.2", org.eclipse.papyrusrt.umlrt.tooling.diagram.statemachine;bundle-version="0.7.2", org.eclipse.papyrusrt.umlrt.tooling.ui;bundle-version="0.7.2", - org.eclipse.papyrus.infra.core.log;bundle-version="1.1.3" + org.eclipse.papyrus.infra.core.log;bundle-version="1.1.3", + org.eclipse.papyrus.infra.ui;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="1.2.0", + org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrusrt.umlrt.core.tests,
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/AbstractPapyrusRTCoreTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/AbstractPapyrusRTCoreTest.java index aa016fc..cb7a60b 100644 --- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/AbstractPapyrusRTCoreTest.java +++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/AbstractPapyrusRTCoreTest.java
@@ -21,12 +21,12 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Platform; import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor; import org.eclipse.papyrus.infra.core.resource.ModelSet; import org.eclipse.papyrus.infra.core.resource.ModelUtils; import org.eclipse.papyrus.infra.core.resource.NotFoundException; import org.eclipse.papyrus.infra.core.services.ServiceException; -import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry; +import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry; +import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration; import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint; import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker; @@ -106,7 +106,7 @@ // force loading of the state machine plugin, but in UI thread, as the element types require some UI... ElementTypeSetConfigurationRegistry registry = ElementTypeSetConfigurationRegistry.getInstance(); System.err.println(registry.getElementTypeSetConfigurations()); - System.err.println(UMLElementTypes.Region_3000); + System.err.println(UMLElementTypes.Region_Shape); } });
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/creation/CreateConnectorTests.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/creation/CreateConnectorTests.java index b507e9d98..9582fbc 100644 --- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/creation/CreateConnectorTests.java +++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/creation/CreateConnectorTests.java
@@ -32,18 +32,18 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest; import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor; import org.eclipse.papyrus.infra.core.resource.ModelSet; import org.eclipse.papyrus.infra.core.resource.ModelUtils; import org.eclipse.papyrus.infra.core.resource.NotFoundException; -import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager; +import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager; import org.eclipse.papyrus.infra.core.services.ServiceException; -import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry; import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject; import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel; import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils; import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils; import org.eclipse.papyrus.infra.services.edit.service.IElementEditService; +import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry; +import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils; import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/utils/AbstractRTPortTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/utils/AbstractRTPortTest.java index 23c3430..b574ea5 100644 --- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/utils/AbstractRTPortTest.java +++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.tests/src/org/eclipse/papyrusrt/umlrt/core/tests/utils/AbstractRTPortTest.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.fail; import org.eclipse.emf.ecore.EObject; -import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry; +import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry; import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; import org.eclipse.papyrus.junit.utils.rules.ModelSetFixture; import org.eclipse.papyrus.junit.utils.rules.PluginResource;
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartAggregationValidationTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartAggregationValidationTest.java index 50133bb..c7f7252 100644 --- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartAggregationValidationTest.java +++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartAggregationValidationTest.java
@@ -20,9 +20,9 @@ import org.eclipse.emf.transaction.util.TransactionUtil; import org.eclipse.emf.validation.service.ConstraintRegistry; import org.eclipse.emf.validation.service.IConstraintDescriptor; -import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper; +import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper; import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand; -import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician; +import org.eclipse.papyrus.uml.service.validation.internal.UMLDiagnostician; import org.eclipse.papyrusrt.umlrt.core.validation.tests.Activator; import org.eclipse.swt.widgets.Display; import org.eclipse.uml2.uml.Class;
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartMultiplicityValidationTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartMultiplicityValidationTest.java index 1312d5c..235e4b0 100644 --- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartMultiplicityValidationTest.java +++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartMultiplicityValidationTest.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.validation.service.IConstraintDescriptor; import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper; import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand; -import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician; +import org.eclipse.papyrus.uml.service.validation.internal.UMLDiagnostician; import org.eclipse.papyrusrt.umlrt.core.validation.tests.Activator; import org.eclipse.swt.widgets.Display; import org.eclipse.uml2.uml.Class;
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartPluginValidationTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartPluginValidationTest.java index 34f59a2..ef61bba 100644 --- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartPluginValidationTest.java +++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/CapsulePartPluginValidationTest.java
@@ -20,9 +20,9 @@ import org.eclipse.emf.transaction.util.TransactionUtil; import org.eclipse.emf.validation.service.ConstraintRegistry; import org.eclipse.emf.validation.service.IConstraintDescriptor; -import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper; +import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper; import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand; -import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician; +import org.eclipse.papyrus.uml.service.validation.internal.UMLDiagnostician; import org.eclipse.papyrusrt.umlrt.core.validation.tests.Activator; import org.eclipse.swt.widgets.Display; import org.eclipse.uml2.uml.Class;
diff --git a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/IsActiveEntityRuleValidationTest.java b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/IsActiveEntityRuleValidationTest.java index 6cda2f2..778327c 100644 --- a/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/IsActiveEntityRuleValidationTest.java +++ b/tests/junit/umlrt/core/org.eclipse.papyrusrt.umlrt.core.validation.tests/src/org/eclipse/papyrusrt/umlrt/core/validation/tests/rules/IsActiveEntityRuleValidationTest.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.validation.service.IConstraintDescriptor; import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper; import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand; -import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician; +import org.eclipse.papyrus.uml.service.validation.internal.UMLDiagnostician; import org.eclipse.papyrusrt.umlrt.core.validation.tests.Activator; import org.eclipse.swt.widgets.Display; import org.eclipse.uml2.uml.Class;
diff --git a/tests/junit/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile.tests/META-INF/MANIFEST.MF b/tests/junit/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile.tests/META-INF/MANIFEST.MF index f0b78f1..78c184f 100644 --- a/tests/junit/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile.tests/META-INF/MANIFEST.MF +++ b/tests/junit/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile.tests/META-INF/MANIFEST.MF
@@ -8,4 +8,6 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.11.0", org.junit;bundle-version="4.12.0", org.eclipse.uml2.uml;bundle-version="5.1.0", - org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.2" + org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.2", + org.eclipse.swt;bundle-version="3.105.0", + org.eclipse.ui;bundle-version="3.107.0"
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/META-INF/MANIFEST.MF b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/META-INF/MANIFEST.MF index e14d202..623e4bb 100644 --- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/META-INF/MANIFEST.MF +++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ org.eclipse.emf.common;bundle-version="2.11.0", org.eclipse.emf.ecore;bundle-version="2.11.1", org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.2", - org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.2", + org.eclipse.papyrus.infra.types;bundle-version="2.0.0", org.eclipse.papyrusrt.umlrt.tooling.diagram.common;bundle-version="0.7.2", org.eclipse.papyrus.junit.framework;bundle-version="1.1.2", org.eclipse.emf.transaction;bundle-version="1.9.0",
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/resource/capsules/model.notation b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/resource/capsules/model.notation index a533d45..5a6d662 100644 --- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/resource/capsules/model.notation +++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.diagram.common.tests/resource/capsules/model.notation
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" 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="_gq7EoOq1EeW8AN6iCLZekA" type="CompositeStructure" measurementUnit="Pixel" name="Capsule1"> - <children xmi:type="notation:Shape" xmi:id="_grlL8Oq1EeW8AN6iCLZekA" type="2073"> + <children xmi:type="notation:Shape" xmi:id="_grlL8Oq1EeW8AN6iCLZekA" type="Class_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_groPQOq1EeW8AN6iCLZekA" type="5156"/> <children xmi:type="notation:DecorationNode" xmi:id="_groPQeq1EeW8AN6iCLZekA" type="6089"> <layoutConstraint xmi:type="notation:Location" xmi:id="_groPQuq1EeW8AN6iCLZekA" y="5"/> @@ -31,7 +31,7 @@ <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_hcMIwEhNEeO0lv5O1DTHOQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i_HU0-q1EeW8AN6iCLZekA"/> </children> - <children xmi:type="notation:Shape" xmi:id="_tOONIOq1EeW8AN6iCLZekA" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_tOONIOq1EeW8AN6iCLZekA" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_tOONIuq1EeW8AN6iCLZekA" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_tOONI-q1EeW8AN6iCLZekA" x="25" y="3"/> </children> @@ -41,7 +41,7 @@ <element xmi:type="uml:Port" href="model.uml#_sVQk0Oq1EeW8AN6iCLZekA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tOONIeq1EeW8AN6iCLZekA" x="-10" y="96" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_vdW-MOq1EeW8AN6iCLZekA" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_vdW-MOq1EeW8AN6iCLZekA" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_vdXlQOq1EeW8AN6iCLZekA" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_vdXlQeq1EeW8AN6iCLZekA" x="25" y="3"/> </children> @@ -63,13 +63,13 @@ <element xmi:type="uml:Class" href="model.uml#_gmG2EOq1EeW8AN6iCLZekA"/> </notation:Diagram> <notation:Diagram xmi:id="_iR8FwOq1EeW8AN6iCLZekA" type="CompositeStructure" measurementUnit="Pixel" name="Capsule2"> - <children xmi:type="notation:Shape" xmi:id="_iR8s0Oq1EeW8AN6iCLZekA" type="2073"> + <children xmi:type="notation:Shape" xmi:id="_iR8s0Oq1EeW8AN6iCLZekA" type="Class_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_iR8s0uq1EeW8AN6iCLZekA" type="5156"/> <children xmi:type="notation:DecorationNode" xmi:id="_iR8s0-q1EeW8AN6iCLZekA" type="6089"> <layoutConstraint xmi:type="notation:Location" xmi:id="_iR8s1Oq1EeW8AN6iCLZekA" y="5"/> </children> <children xmi:type="notation:BasicCompartment" xmi:id="_iR8s1eq1EeW8AN6iCLZekA" type="7073"> - <children xmi:type="notation:Shape" xmi:id="_774UYOq1EeW8AN6iCLZekA" type="3070"> + <children xmi:type="notation:Shape" xmi:id="_774UYOq1EeW8AN6iCLZekA" type="Property_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_774UYuq1EeW8AN6iCLZekA" type="5126"/> <children xmi:type="notation:DecorationNode" xmi:id="_774UY-q1EeW8AN6iCLZekA" type="6054"> <layoutConstraint xmi:type="notation:Location" xmi:id="_774UZOq1EeW8AN6iCLZekA" y="5"/> @@ -78,7 +78,7 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_774UZuq1EeW8AN6iCLZekA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_774UZ-q1EeW8AN6iCLZekA"/> </children> - <children xmi:type="notation:Shape" xmi:id="_78EhoOq1EeW8AN6iCLZekA" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_78EhoOq1EeW8AN6iCLZekA" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_78FIsOq1EeW8AN6iCLZekA" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_78FIseq1EeW8AN6iCLZekA" x="-86" y="-12"/> </children>
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/META-INF/MANIFEST.MF b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/META-INF/MANIFEST.MF index a36540d..aea7960 100644 --- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/META-INF/MANIFEST.MF +++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ org.eclipse.emf.ecore;bundle-version="2.11.1", org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.2", org.eclipse.papyrus.infra.newchild;bundle-version="1.1.2", - org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.2", + org.eclipse.papyrus.infra.types;bundle-version="2.0.0", org.eclipse.papyrusrt.umlrt.tooling.properties;bundle-version="0.7.2", org.eclipse.papyrusrt.umlrt.tooling.modelexplorer;bundle-version="0.7.2", org.eclipse.papyrusrt.umlrt.tooling.ui;bundle-version="0.7.2",
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/library.notation b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/library.notation index f4416c8..4a35780 100644 --- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/library.notation +++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/library.notation
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" 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="_Od60MJTrEeW50dEfV7kAUw" type="CompositeStructure" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_Od9QcJTrEeW50dEfV7kAUw" type="2073"> + <children xmi:type="notation:Shape" xmi:id="_Od9QcJTrEeW50dEfV7kAUw" type="Class_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_Od9QcpTrEeW50dEfV7kAUw" type="5156"/> <children xmi:type="notation:DecorationNode" xmi:id="_Od9Qc5TrEeW50dEfV7kAUw" type="6089"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Od9QdJTrEeW50dEfV7kAUw" y="5"/> @@ -30,7 +30,7 @@ <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_hcMIwEhNEeO0lv5O1DTHOQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QEIkE5TrEeW50dEfV7kAUw"/> </children> - <children xmi:type="notation:Shape" xmi:id="_TcHMgJTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_TcHMgJTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_TcHMgpTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_TcHMg5TrEeW50dEfV7kAUw" x="25" y="3"/> </children> @@ -40,7 +40,7 @@ <element xmi:type="uml:Port" href="library.uml#_QuskAJTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TcHMgZTrEeW50dEfV7kAUw" x="-10" y="59" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_WUPQMJTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_WUPQMJTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_WUP3QJTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_WUP3QZTrEeW50dEfV7kAUw" x="25" y="3"/> </children> @@ -50,7 +50,7 @@ <element xmi:type="uml:Port" href="library.uml#_VpBwAJTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUPQMZTrEeW50dEfV7kAUw" x="59" y="102" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_XNsAsJTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_XNsAsJTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_XNsnwJTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_XNsnwZTrEeW50dEfV7kAUw" x="25" y="3"/> </children> @@ -60,7 +60,7 @@ <element xmi:type="uml:Port" href="library.uml#_WiMMoJTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XNsAsZTrEeW50dEfV7kAUw" x="-10" y="178" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_X_UR8JTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_X_UR8JTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_X_UR8pTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_X_UR85TrEeW50dEfV7kAUw" x="25" y="3"/> </children> @@ -70,7 +70,7 @@ <element xmi:type="uml:Port" href="library.uml#_XfOcoJTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X_UR8ZTrEeW50dEfV7kAUw" x="490" y="60" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_YyFysJTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_YyFysJTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_YyGZwZTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_YyGZwpTrEeW50dEfV7kAUw" x="25" y="3"/> </children> @@ -80,7 +80,7 @@ <element xmi:type="uml:Port" href="library.uml#_YLa0QJTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YyGZwJTrEeW50dEfV7kAUw" x="264" y="144" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_t1coMJUhEeW98PTE4--NLw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_t1coMJUhEeW98PTE4--NLw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_t1dPQJUhEeW98PTE4--NLw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_t1dPQZUhEeW98PTE4--NLw" x="25" y="3"/> </children> @@ -90,7 +90,7 @@ <element xmi:type="uml:Port" href="library.uml#_tXMl8JUhEeW98PTE4--NLw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t1coMZUhEeW98PTE4--NLw" x="345" y="272" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_wVYOUJUhEeW98PTE4--NLw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_wVYOUJUhEeW98PTE4--NLw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_wVY1YJUhEeW98PTE4--NLw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_wVY1YZUhEeW98PTE4--NLw" x="25" y="3"/> </children>
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/model.notation b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/model.notation index 3d9d3a6..79da29e 100644 --- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/model.notation +++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/resource/modelelement/model.notation
@@ -1,7 +1,7 @@ <?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:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" 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="_2K1DwJTqEeW50dEfV7kAUw" type="CompositeStructure" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_2LYdYJTqEeW50dEfV7kAUw" type="2073"> + <children xmi:type="notation:Shape" xmi:id="_2LYdYJTqEeW50dEfV7kAUw" type="Class_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_2LYdYpTqEeW50dEfV7kAUw" type="5156"/> <children xmi:type="notation:DecorationNode" xmi:id="_2LYdY5TqEeW50dEfV7kAUw" type="6089"> <layoutConstraint xmi:type="notation:Location" xmi:id="_2LYdZJTqEeW50dEfV7kAUw" y="5"/> @@ -31,7 +31,7 @@ <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_hcMIwEhNEeO0lv5O1DTHOQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3W_785TqEeW50dEfV7kAUw"/> </children> - <children xmi:type="notation:Shape" xmi:id="_6K5m8JTqEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_6K5m8JTqEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_6K5m8pTqEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_6K5m85TqEeW50dEfV7kAUw" x="23" y="-14"/> </children> @@ -41,7 +41,7 @@ <element xmi:type="uml:Port" href="model.uml#_4LjlYJTqEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6K5m8ZTqEeW50dEfV7kAUw" y="58" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_7RVDgJTqEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_7RVDgJTqEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_7RVDgpTqEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_7RVqkJTqEeW50dEfV7kAUw" x="25" y="3"/> </children> @@ -51,7 +51,7 @@ <element xmi:type="uml:Port" href="model.uml#_6rNesJTqEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7RVDgZTqEeW50dEfV7kAUw" x="43" y="113" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_8P6ysJTqEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_8P6ysJTqEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_8P8A0JTqEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_8P8A0ZTqEeW50dEfV7kAUw" x="25" y="3"/> </children> @@ -61,7 +61,7 @@ <element xmi:type="uml:Port" href="model.uml#_7rMVAJTqEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8P6ysZTqEeW50dEfV7kAUw" y="178" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_9ELhMJTqEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_9ELhMJTqEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_9ELhMpTqEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_9EMIQJTqEeW50dEfV7kAUw" x="25" y="3"/> </children> @@ -71,7 +71,7 @@ <element xmi:type="uml:Port" href="model.uml#_8bB2gJTqEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ELhMZTqEeW50dEfV7kAUw" x="490" y="199" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_91TcIJTqEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_91TcIJTqEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_91UDMJTqEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_91UDMZTqEeW50dEfV7kAUw" x="25" y="3"/> </children> @@ -81,7 +81,7 @@ <element xmi:type="uml:Port" href="model.uml#_9SfqAJTqEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_91TcIZTqEeW50dEfV7kAUw" x="348" y="83" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_j_Ni4JUhEeW98PTE4--NLw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_j_Ni4JUhEeW98PTE4--NLw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_j_OxAJUhEeW98PTE4--NLw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_j_OxAZUhEeW98PTE4--NLw" x="25" y="3"/> </children> @@ -91,7 +91,7 @@ <element xmi:type="uml:Port" href="model.uml#_jWNpMJUhEeW98PTE4--NLw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j_Ni4ZUhEeW98PTE4--NLw" x="432" y="140" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_no60gJUhEeW98PTE4--NLw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_no60gJUhEeW98PTE4--NLw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_no7bkJUhEeW98PTE4--NLw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_no7bkZUhEeW98PTE4--NLw" x="16" y="22"/> </children> @@ -239,13 +239,13 @@ </edges> </notation:Diagram> <notation:Diagram xmi:id="_uujC9pTrEeW50dEfV7kAUw" type="CompositeStructure" measurementUnit="Pixel"> - <children xmi:type="notation:Shape" xmi:id="_uujC95TrEeW50dEfV7kAUw" type="2073"> + <children xmi:type="notation:Shape" xmi:id="_uujC95TrEeW50dEfV7kAUw" type="Class_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_uujC-JTrEeW50dEfV7kAUw" type="5156"/> <children xmi:type="notation:DecorationNode" xmi:id="_uujC-ZTrEeW50dEfV7kAUw" type="6089"> <layoutConstraint xmi:type="notation:Location" xmi:id="_uujC-pTrEeW50dEfV7kAUw" y="5"/> </children> <children xmi:type="notation:BasicCompartment" xmi:id="_uujC-5TrEeW50dEfV7kAUw" type="7073"> - <children xmi:type="notation:Shape" xmi:id="_x7OaUJTrEeW50dEfV7kAUw" type="3070"> + <children xmi:type="notation:Shape" xmi:id="_x7OaUJTrEeW50dEfV7kAUw" type="Property_Shape"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_x_hEcJTrEeW50dEfV7kAUw" source="PapyrusCSSForceValue"> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_x_hEcZTrEeW50dEfV7kAUw" key="mutable" value="true"/> </eAnnotations> @@ -257,7 +257,7 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_x7OaVpTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x7OaV5TrEeW50dEfV7kAUw"/> </children> - <children xmi:type="notation:Shape" xmi:id="_x7Ug8JTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_x7Ug8JTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_x7Ug8pTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_x7Ug85TrEeW50dEfV7kAUw" x="26" y="-18"/> </children> @@ -267,7 +267,7 @@ <element xmi:type="uml:Port" href="library.uml#_QuskAJTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x7Ug8ZTrEeW50dEfV7kAUw" x="-10" y="-10" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_x7zCEJTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_x7zCEJTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_x7zCEpTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_x7zCE5TrEeW50dEfV7kAUw" x="-242" y="1"/> </children> @@ -277,7 +277,7 @@ <element xmi:type="uml:Port" href="library.uml#_WiMMoJTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x7zCEZTrEeW50dEfV7kAUw" y="43" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_x7zCFpTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_x7zCFpTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_x7zCGJTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_x7zCGZTrEeW50dEfV7kAUw" x="-1" y="-21"/> </children> @@ -308,7 +308,7 @@ <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_EQwT4EhOEeO0lv5O1DTHOQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x8FWD5TrEeW50dEfV7kAUw"/> </children> - <children xmi:type="notation:Shape" xmi:id="_x8LckJTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_x8LckJTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_x8LckpTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_x8Lck5TrEeW50dEfV7kAUw" x="25" y="3"/> </children> @@ -318,7 +318,7 @@ <element xmi:type="uml:Port" href="library.uml#_VpBwAJTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x8LckZTrEeW50dEfV7kAUw" x="194" y="38" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_x8RjMJTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_x8RjMJTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_x8RjMpTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_x8RjM5TrEeW50dEfV7kAUw" x="25" y="3"/> </children> @@ -328,7 +328,7 @@ <element xmi:type="uml:Port" href="library.uml#_YLa0QJTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x8RjMZTrEeW50dEfV7kAUw" x="23" y="86" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_--P8MJUhEeW98PTE4--NLw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_--P8MJUhEeW98PTE4--NLw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_--P8MpUhEeW98PTE4--NLw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_--P8M5UhEeW98PTE4--NLw" x="-33" y="29"/> </children> @@ -338,7 +338,7 @@ <element xmi:type="uml:Port" href="library.uml#_tXMl8JUhEeW98PTE4--NLw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_--P8MZUhEeW98PTE4--NLw" x="39" y="111" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="__Gl_4JUhEeW98PTE4--NLw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="__Gl_4JUhEeW98PTE4--NLw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="__Gl_4pUhEeW98PTE4--NLw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="__Gl_45UhEeW98PTE4--NLw" x="41" y="26"/> </children> @@ -351,7 +351,7 @@ <element xmi:type="uml:Property" href="model.uml#_xFbawJTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x7OaUZTrEeW50dEfV7kAUw" x="222" y="353" width="194" height="111"/> </children> - <children xmi:type="notation:Shape" xmi:id="_-A2nkJy7EeWzdt_55Z9oIQ" type="3070"> + <children xmi:type="notation:Shape" xmi:id="_-A2nkJy7EeWzdt_55Z9oIQ" type="Property_Shape"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-QJn0Jy7EeWzdt_55Z9oIQ" source="PapyrusCSSForceValue"> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-QJn0Zy7EeWzdt_55Z9oIQ" key="mutable" value="true"/> </eAnnotations> @@ -363,7 +363,7 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_-BAYkZy7EeWzdt_55Z9oIQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-BAYkpy7EeWzdt_55Z9oIQ"/> </children> - <children xmi:type="notation:Shape" xmi:id="_-BjyMJy7EeWzdt_55Z9oIQ" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_-BjyMJy7EeWzdt_55Z9oIQ" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_-BkZQJy7EeWzdt_55Z9oIQ" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_-BkZQZy7EeWzdt_55Z9oIQ" y="-29"/> </children> @@ -373,7 +373,7 @@ <element xmi:type="uml:Port" href="model.uml#_4LjlYJTqEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-BjyMZy7EeWzdt_55Z9oIQ" x="167" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_-BpRwJy7EeWzdt_55Z9oIQ" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_-BpRwJy7EeWzdt_55Z9oIQ" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_-BpRwpy7EeWzdt_55Z9oIQ" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_-BpRw5y7EeWzdt_55Z9oIQ" x="-9" y="-43"/> </children> @@ -383,7 +383,7 @@ <element xmi:type="uml:Port" href="model.uml#_7rMVAJTqEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-BpRwZy7EeWzdt_55Z9oIQ" y="17" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_-Bqf4Jy7EeWzdt_55Z9oIQ" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_-Bqf4Jy7EeWzdt_55Z9oIQ" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_-BrG8Jy7EeWzdt_55Z9oIQ" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_-BrG8Zy7EeWzdt_55Z9oIQ" x="-28" y="50"/> </children> @@ -393,7 +393,7 @@ <element xmi:type="uml:Port" href="model.uml#_8bB2gJTqEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-Bqf4Zy7EeWzdt_55Z9oIQ" y="93" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_-Bv_cJy7EeWzdt_55Z9oIQ" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_-Bv_cJy7EeWzdt_55Z9oIQ" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_-BwmgJy7EeWzdt_55Z9oIQ" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_-BwmgZy7EeWzdt_55Z9oIQ" x="25" y="-28"/> </children> @@ -424,7 +424,7 @@ <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_EQwT4EhOEeO0lv5O1DTHOQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-C0Wc5y7EeWzdt_55Z9oIQ"/> </children> - <children xmi:type="notation:Shape" xmi:id="_-DDnAJy7EeWzdt_55Z9oIQ" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_-DDnAJy7EeWzdt_55Z9oIQ" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_-DDnApy7EeWzdt_55Z9oIQ" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_-DE1IJy7EeWzdt_55Z9oIQ" x="17" y="27"/> </children> @@ -434,7 +434,7 @@ <element xmi:type="uml:Port" href="model.uml#_6rNesJTqEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-DDnAZy7EeWzdt_55Z9oIQ" x="57" y="100" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_-DMJ4Jy7EeWzdt_55Z9oIQ" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_-DMJ4Jy7EeWzdt_55Z9oIQ" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_-DMJ4py7EeWzdt_55Z9oIQ" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_-DMJ45y7EeWzdt_55Z9oIQ" x="24" y="-10"/> </children> @@ -444,7 +444,7 @@ <element xmi:type="uml:Port" href="model.uml#_9SfqAJTqEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-DMJ4Zy7EeWzdt_55Z9oIQ" y="44" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_-DNYAJy7EeWzdt_55Z9oIQ" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_-DNYAJy7EeWzdt_55Z9oIQ" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_-DNYApy7EeWzdt_55Z9oIQ" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_-DNYA5y7EeWzdt_55Z9oIQ" x="25" y="3"/> </children> @@ -454,7 +454,7 @@ <element xmi:type="uml:Port" href="model.uml#_jWNpMJUhEeW98PTE4--NLw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-DNYAZy7EeWzdt_55Z9oIQ" x="174" y="100" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_jQbKoJy-EeWzdt_55Z9oIQ" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_jQbKoJy-EeWzdt_55Z9oIQ" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_jQbKopy-EeWzdt_55Z9oIQ" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_jQbKo5y-EeWzdt_55Z9oIQ" x="25" y="3"/> </children> @@ -464,7 +464,7 @@ <element xmi:type="uml:Port" href="model.uml#_ims4MJy-EeWzdt_55Z9oIQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQbKoZy-EeWzdt_55Z9oIQ" x="-10" y="-10" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_l-14sJy-EeWzdt_55Z9oIQ" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_l-14sJy-EeWzdt_55Z9oIQ" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_l-2fwJy-EeWzdt_55Z9oIQ" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_l-2fwZy-EeWzdt_55Z9oIQ" x="25" y="3"/> </children> @@ -501,7 +501,7 @@ <element xmi:type="uml:Stereotype" href="pathmap://UML_RT_PROFILE/uml-rt.profile.uml#_hcMIwEhNEeO0lv5O1DTHOQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uujDC5TrEeW50dEfV7kAUw"/> </children> - <children xmi:type="notation:Shape" xmi:id="_uujDDJTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_uujDDJTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_uujDDZTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_uujDDpTrEeW50dEfV7kAUw" x="23" y="-14"/> </children> @@ -511,7 +511,7 @@ <element xmi:type="uml:Port" href="model.uml#_uujC8ZTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uujDM5TrEeW50dEfV7kAUw" y="58" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_uujDNJTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_uujDNJTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_uujDNZTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_uujDNpTrEeW50dEfV7kAUw" x="16" y="-11"/> </children> @@ -521,7 +521,7 @@ <element xmi:type="uml:Port" href="model.uml#_uujC8pTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uujDW5TrEeW50dEfV7kAUw" x="605" y="344" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_uujDXJTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_uujDXJTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_uujDXZTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_uujDXpTrEeW50dEfV7kAUw" x="25" y="3"/> </children> @@ -531,7 +531,7 @@ <element xmi:type="uml:Port" href="model.uml#_uujC85TrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uujDg5TrEeW50dEfV7kAUw" y="465" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_uujDhJTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_uujDhJTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_uujDhZTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_uujDhpTrEeW50dEfV7kAUw" x="25" y="3"/> </children> @@ -541,7 +541,7 @@ <element xmi:type="uml:Port" href="model.uml#_uujC9JTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uujDq5TrEeW50dEfV7kAUw" x="616" y="490" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_uujDrJTrEeW50dEfV7kAUw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_uujDrJTrEeW50dEfV7kAUw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_uujDrZTrEeW50dEfV7kAUw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_uujDrpTrEeW50dEfV7kAUw" x="3" y="23"/> </children> @@ -551,7 +551,7 @@ <element xmi:type="uml:Port" href="model.uml#_uujC9ZTrEeW50dEfV7kAUw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uujD05TrEeW50dEfV7kAUw" x="372" y="159" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_CceWkJUiEeW98PTE4--NLw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_CceWkJUiEeW98PTE4--NLw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_Cce9oJUiEeW98PTE4--NLw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_Cce9oZUiEeW98PTE4--NLw" x="25" y="3"/> </children> @@ -561,7 +561,7 @@ <element xmi:type="uml:Port" href="model.uml#_B3KqEJUiEeW98PTE4--NLw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CceWkZUiEeW98PTE4--NLw" x="753" y="224" width="20" height="20"/> </children> - <children xmi:type="notation:Shape" xmi:id="_FSStIJUiEeW98PTE4--NLw" type="3069"> + <children xmi:type="notation:Shape" xmi:id="_FSStIJUiEeW98PTE4--NLw" type="Port_Shape"> <children xmi:type="notation:DecorationNode" xmi:id="_FSTUMJUiEeW98PTE4--NLw" type="5125"> <layoutConstraint xmi:type="notation:Location" xmi:id="_FSTUMZUiEeW98PTE4--NLw" x="25" y="3"/> </children> @@ -669,7 +669,7 @@ <configuration xmi:type="configuration:PapyrusDiagram" href="platform:/plugin/org.eclipse.papyrusrt.umlrt.tooling.diagram.common/configuration/UMLRT.configuration#_Z79eQHcZEeSnWeKqQOfW2A"/> </styles> <element xmi:type="uml:Class" href="model.uml#_uujC8JTrEeW50dEfV7kAUw"/> - <edges xmi:type="notation:Connector" xmi:id="_4HyqQJTrEeW50dEfV7kAUw" type="4013" source="_uujDDJTrEeW50dEfV7kAUw" target="_x7Ug8JTrEeW50dEfV7kAUw"> + <edges xmi:type="notation:Connector" xmi:id="_4HyqQJTrEeW50dEfV7kAUw" type="Connector_Edge" source="_uujDDJTrEeW50dEfV7kAUw" target="_x7Ug8JTrEeW50dEfV7kAUw"> <children xmi:type="notation:DecorationNode" xmi:id="_4HyqQ5TrEeW50dEfV7kAUw" type="6025"> <layoutConstraint xmi:type="notation:Location" xmi:id="_4HyqRJTrEeW50dEfV7kAUw" y="60"/> </children> @@ -688,7 +688,7 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JsuwJTrEeW50dEfV7kAUw" id="(0.85,1.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4JsuwZTrEeW50dEfV7kAUw" id="(0.0,0.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_4-iFAJTrEeW50dEfV7kAUw" type="4013" source="_uujDXJTrEeW50dEfV7kAUw" target="_x7zCEJTrEeW50dEfV7kAUw"> + <edges xmi:type="notation:Connector" xmi:id="_4-iFAJTrEeW50dEfV7kAUw" type="Connector_Edge" source="_uujDXJTrEeW50dEfV7kAUw" target="_x7zCEJTrEeW50dEfV7kAUw"> <children xmi:type="notation:DecorationNode" xmi:id="_4-iFA5TrEeW50dEfV7kAUw" type="6025"> <layoutConstraint xmi:type="notation:Location" xmi:id="_4-iFBJTrEeW50dEfV7kAUw" y="60"/> </children> @@ -707,7 +707,7 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4_3hwJTrEeW50dEfV7kAUw" id="(1.0,0.8)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4_3hwZTrEeW50dEfV7kAUw" id="(0.0,0.2)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_50_L4JTrEeW50dEfV7kAUw" type="4013" source="_uujDhJTrEeW50dEfV7kAUw" target="_x7zCFpTrEeW50dEfV7kAUw"> + <edges xmi:type="notation:Connector" xmi:id="_50_L4JTrEeW50dEfV7kAUw" type="Connector_Edge" source="_uujDhJTrEeW50dEfV7kAUw" target="_x7zCFpTrEeW50dEfV7kAUw"> <children xmi:type="notation:DecorationNode" xmi:id="_51FSgJTrEeW50dEfV7kAUw" type="6025"> <layoutConstraint xmi:type="notation:Location" xmi:id="_51FSgZTrEeW50dEfV7kAUw" y="60"/> </children> @@ -726,7 +726,7 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_52m8gJTrEeW50dEfV7kAUw" id="(0.0,0.6)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_52m8gZTrEeW50dEfV7kAUw" id="(1.0,0.4)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_7QxNYJTrEeW50dEfV7kAUw" type="4013" source="_uujDNJTrEeW50dEfV7kAUw" target="_x8LckJTrEeW50dEfV7kAUw"> + <edges xmi:type="notation:Connector" xmi:id="_7QxNYJTrEeW50dEfV7kAUw" type="Connector_Edge" source="_uujDNJTrEeW50dEfV7kAUw" target="_x8LckJTrEeW50dEfV7kAUw"> <children xmi:type="notation:DecorationNode" xmi:id="_7QxNY5TrEeW50dEfV7kAUw" type="6025"> <layoutConstraint xmi:type="notation:Location" xmi:id="_7QxNZJTrEeW50dEfV7kAUw" y="60"/> </children> @@ -745,7 +745,7 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7SY-AJTrEeW50dEfV7kAUw" id="(0.55,1.0)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7SY-AZTrEeW50dEfV7kAUw" id="(1.0,0.5)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_WLwFUJy8EeWzdt_55Z9oIQ" type="4013" source="_-BjyMJy7EeWzdt_55Z9oIQ" target="_uujDDJTrEeW50dEfV7kAUw"> + <edges xmi:type="notation:Connector" xmi:id="_WLwFUJy8EeWzdt_55Z9oIQ" type="Connector_Edge" source="_-BjyMJy7EeWzdt_55Z9oIQ" target="_uujDDJTrEeW50dEfV7kAUw"> <children xmi:type="notation:DecorationNode" xmi:id="_WLwFU5y8EeWzdt_55Z9oIQ" type="6025"> <layoutConstraint xmi:type="notation:Location" xmi:id="_WLwFVJy8EeWzdt_55Z9oIQ" y="60"/> </children> @@ -764,7 +764,7 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WPsKIJy8EeWzdt_55Z9oIQ" id="(0.0,0.3)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WPsKIZy8EeWzdt_55Z9oIQ" id="(1.0,0.55)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_agtTYJy8EeWzdt_55Z9oIQ" type="4013" source="_-BpRwJy7EeWzdt_55Z9oIQ" target="_uujDXJTrEeW50dEfV7kAUw"> + <edges xmi:type="notation:Connector" xmi:id="_agtTYJy8EeWzdt_55Z9oIQ" type="Connector_Edge" source="_-BpRwJy7EeWzdt_55Z9oIQ" target="_uujDXJTrEeW50dEfV7kAUw"> <children xmi:type="notation:DecorationNode" xmi:id="_aguhgJy8EeWzdt_55Z9oIQ" type="6025"> <layoutConstraint xmi:type="notation:Location" xmi:id="_aguhgZy8EeWzdt_55Z9oIQ" y="60"/> </children> @@ -783,7 +783,7 @@ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_akEwcJy8EeWzdt_55Z9oIQ" id="(0.0,0.95)"/> <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_akEwcZy8EeWzdt_55Z9oIQ" id="(0.9,0.0)"/> </edges> - <edges xmi:type="notation:Connector" xmi:id="_d3RmkJy8EeWzdt_55Z9oIQ" type="4013" source="_-DDnAJy7EeWzdt_55Z9oIQ" target="_uujDNJTrEeW50dEfV7kAUw"> + <edges xmi:type="notation:Connector" xmi:id="_d3RmkJy8EeWzdt_55Z9oIQ" type="Connector_Edge" source="_-DDnAJy7EeWzdt_55Z9oIQ" target="_uujDNJTrEeW50dEfV7kAUw"> <children xmi:type="notation:DecorationNode" xmi:id="_d3SNoJy8EeWzdt_55Z9oIQ" type="6025"> <layoutConstraint xmi:type="notation:Location" xmi:id="_d3SNoZy8EeWzdt_55Z9oIQ" y="60"/> </children>
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/AbstractEMFResourceTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/AbstractEMFResourceTest.java new file mode 100644 index 0000000..14be0f9 --- /dev/null +++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/AbstractEMFResourceTest.java
@@ -0,0 +1,60 @@ +/***************************************************************************** + * 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 + * + *****************************************************************************/ + +package org.eclipse.papyrusrt.umlrt.tooling.ui.tests.configuration; + +import java.util.List; + +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.ecore.util.Diagnostician; +import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; +import org.junit.Assert; + +/** + * Abstract test class for all EMF-based configuration models (property view, palettes, etc.) + * + * @deprecated + * @use AbstractEMFResourceTest from o.e.p.junit.utils instead (available in Neon M7) + */ +public abstract class AbstractEMFResourceTest extends AbstractPapyrusTest { + + /** + * URI of the EMF resource to test + * + * @return + */ + public abstract String getFileUri(); + + /** + * do the validation checks on the EMF resource + */ + protected void doValidateResource() { + URI createPlatformPluginURI = URI.createPlatformPluginURI(getFileUri(), true); + Resource resource = new ResourceSetImpl().getResource(createPlatformPluginURI, true); + Diagnostic diagnostic = Diagnostician.INSTANCE.validate(resource.getContents().get(0)); + Assert.assertEquals("The constraint model is not valid: " + printDiagnostic(diagnostic), Diagnostic.OK, diagnostic.getSeverity()); + } + + // FIXME : Something should exist in API to do that + protected String printDiagnostic(Diagnostic diagnostic) { + String message = diagnostic.getMessage(); + List<Diagnostic> children = diagnostic.getChildren(); + for (Diagnostic diagnostic2 : children) { + message += "\n" + diagnostic2.getMessage(); + } + return message; + } +}
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/ConstraintEnvironmentTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/ConstraintEnvironmentTest.java index 476df2d..fd3951e 100644 --- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/ConstraintEnvironmentTest.java +++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/ConstraintEnvironmentTest.java
@@ -13,7 +13,6 @@ package org.eclipse.papyrusrt.umlrt.tooling.ui.tests.configuration; -import org.eclipse.papyrus.junit.utils.tests.AbstractEMFResourceTest; import org.eclipse.papyrusrt.umlrt.tooling.ui.Activator; import org.junit.Test;
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/NewChildMenuTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/NewChildMenuTest.java index 6e34550..2dd92d8 100644 --- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/NewChildMenuTest.java +++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/NewChildMenuTest.java
@@ -22,10 +22,9 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry; import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu; import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils; -import org.eclipse.papyrus.junit.utils.tests.AbstractEMFResourceTest; +import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry; import org.eclipse.papyrusrt.umlrt.tooling.modelexplorer.Activator; import org.eclipse.swt.widgets.Display; import org.junit.Assert;
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/PropertiesTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/PropertiesTest.java index da0bb0e..a0bf019 100644 --- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/PropertiesTest.java +++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/PropertiesTest.java
@@ -14,7 +14,6 @@ package org.eclipse.papyrusrt.umlrt.tooling.ui.tests.configuration; import org.eclipse.papyrus.junit.framework.classification.FailingTest; -import org.eclipse.papyrus.junit.utils.tests.AbstractEMFResourceTest; import org.eclipse.papyrusrt.umlrt.tooling.properties.Activator; import org.junit.Test;
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ChangeListenerUtilsTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ChangeListenerUtilsTest.java index e7fc751..58db263 100644 --- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ChangeListenerUtilsTest.java +++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ChangeListenerUtilsTest.java
@@ -17,8 +17,8 @@ import java.lang.reflect.Method; +import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource; import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; -import org.eclipse.papyrus.views.properties.modelelement.DataSource; import org.junit.Test; public class ChangeListenerUtilsTest extends AbstractPapyrusTest {
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ModelElementTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ModelElementTest.java index 65242e0..4fe0353 100644 --- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ModelElementTest.java +++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ModelElementTest.java
@@ -15,10 +15,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement; import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; import org.eclipse.papyrus.junit.utils.rules.ModelSetFixture; import org.eclipse.papyrus.junit.utils.rules.PluginResource; -import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement; import org.eclipse.papyrusrt.umlrt.core.utils.IRealTimeConstants; import org.eclipse.papyrusrt.umlrt.core.utils.RTPortKindEnum; import org.eclipse.papyrusrt.umlrt.core.utils.RTPortUtils;