diff options
author | aradermache | 2013-05-02 09:50:51 +0000 |
---|---|---|
committer | aradermache | 2013-05-02 09:50:51 +0000 |
commit | 0d087549a375c1aa8e3f9fcc3e2d05c1363daeec (patch) | |
tree | 7ffca6df7d085a77ef5c327621dae3423ec76f7d /extraplugins/qompass-designer/tracing | |
parent | e6db544a6cf05a3a6568f93c786e2bce183a72cf (diff) | |
download | org.eclipse.papyrus-0d087549a375c1aa8e3f9fcc3e2d05c1363daeec.tar.gz org.eclipse.papyrus-0d087549a375c1aa8e3f9fcc3e2d05c1363daeec.tar.xz org.eclipse.papyrus-0d087549a375c1aa8e3f9fcc3e2d05c1363daeec.zip |
Naming convention: prefix source packages in FCM and CPP profile with org.eclipse.papyrus.
Diffstat (limited to 'extraplugins/qompass-designer/tracing')
14 files changed, 647 insertions, 174 deletions
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF index 0cc9135bb00..049872a24fc 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF @@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
org.eclipse.papyrus.infra.emf;bundle-version="0.10.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0"
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="0.10.0"
Export-Package: org.eclipse.papyrus.infra.services.tracepoints,
org.eclipse.papyrus.infra.services.tracepoints.commands,
org.eclipse.papyrus.infra.services.tracepoints.dialogs,
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java index e18394590f3..eb9b2fc2a82 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java @@ -19,6 +19,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.papyrus.infra.services.decoration.IDecorationSpecificFunctions; import org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition; import org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration; +import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker; public class TraceFunctions implements IDecorationSpecificFunctions { @@ -42,7 +43,7 @@ public class TraceFunctions implements IDecorationSpecificFunctions { /** * Return the image descriptor associated with a trace or breakpoint marker */ - public ImageDescriptor getImageDescriptorForGE(IMarker marker) { + public ImageDescriptor getImageDescriptorForGE(IPapyrusMarker marker) { org.eclipse.papyrus.infra.widgets.Activator widgetsActivator = @@ -67,7 +68,7 @@ public class TraceFunctions implements IDecorationSpecificFunctions { /** * Return the image descriptor associated with a trace or breakpoint marker */ - public ImageDescriptor getImageDescriptorForME(IMarker marker) { + public ImageDescriptor getImageDescriptorForME(IPapyrusMarker marker) { org.eclipse.papyrus.infra.widgets.Activator widgetsActivator = org.eclipse.papyrus.infra.widgets.Activator.getDefault(); ImageDescriptor overlay = null; @@ -87,11 +88,11 @@ public class TraceFunctions implements IDecorationSpecificFunctions { return overlay; } - public PreferedPosition getPreferedPosition(IMarker marker) { + public PreferedPosition getPreferedPosition(IPapyrusMarker marker) { return PreferedPosition.SOUTH_EAST; } - public String getMessage(IMarker marker) { + public String getMessage(IPapyrusMarker marker) { boolean isActive = marker.getAttribute(TracepointConstants.isActive, false); boolean isTracepoint = marker.getAttribute(TracepointConstants.isTracepoint, false); return (isActive ? "active" : "inactive") + " " + @@ -109,4 +110,10 @@ public class TraceFunctions implements IDecorationSpecificFunctions { public MarkChildren supportsMarkerPropagation() { return MarkChildren.NO; } + + @Override + public int getPriority(IPapyrusMarker marker) { + // TODO Auto-generated method stub + return 0; + } } diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo index 3961490c01c..315255ec8c3 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo @@ -18,7 +18,7 @@ <acceleoCompiler sourceFolder="${target.folder}" outputFolder="${target.folder}" - dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.qompass.modellibs.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.infra.services.tracepoints;" + dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core;${target.folder}/../../org.eclipse.gef;${target.folder}/../../org.eclipse.ui.workbench;${target.folder}/../../org.eclipse.papyrus.uml.diagram.common;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;${target.folder}/../../org.eclipse.papyrus.infra.gmfdiag.common;${target.folder}/../../org.eclipse.papyrus.uml.tools;${target.folder}/../../org.eclipse.emf.facet.infra.browser.uicore;${target.folder}/../../org.eclipse.papyrus.infra.services.validation;${target.folder}/../../org.eclipse.papyrus.infra.services.decoration;${target.folder}/../../org.eclipse.papyrus.infra.services.markerlistener;${target.folder}/../../org.eclipse.papyrus.infra.gmfdiag.navigation;${target.folder}/../../org.eclipse.papyrus.infra.services.resourceloading;${target.folder}/../../org.eclipse.papyrus.qompass.modellibs.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.uml.properties;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.infra.services.tracepoints;" binaryResource="false" packagesToRegister=""> </acceleoCompiler> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.di b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.di index 3e57bb9a61b..de6e71c6b4a 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.di +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.di @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ASCII"?> +<?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:history="http://www.eclipse.org/papyrus/0.7.0/controlmode"> <di:SashWindowsMngr> <pageList> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.notation b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.notation index 50b938b975e..554ce289e82 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.notation +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.notation @@ -88,10 +88,16 @@ <children xmi:type="notation:DecorationNode" xmi:id="_ktd1VjW2EeKyT6LlKoWJIA" type="5035"/> <children xmi:type="notation:BasicCompartment" xmi:id="_ktd1VzW2EeKyT6LlKoWJIA" type="7020"> <children xmi:type="notation:Shape" xmi:id="_m0rZcDW2EeKyT6LlKoWJIA" type="3018" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QleJQJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QrfRsJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> <element xmi:type="uml:Property" href="ClientServerTraceTest.uml#_m0WCQDW2EeKyT6LlKoWJIA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_m0rZcTW2EeKyT6LlKoWJIA"/> </children> <children xmi:type="notation:Shape" xmi:id="_yJR6MDW2EeKyT6LlKoWJIA" type="3018" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QlfXYJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qrf4wJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> <element xmi:type="uml:Property" href="ClientServerTraceTest.uml#_yJIJMDW2EeKyT6LlKoWJIA"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_yJR6MTW2EeKyT6LlKoWJIA"/> </children> @@ -157,6 +163,9 @@ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rUXKNDrWEeGMCcwsbpLuFA" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_ozsqhTeEEeGPyrZ5I3hMlA" type="5125"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ScyQMJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Sk4cQJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> <layoutConstraint xmi:type="notation:Location" xmi:id="_ozsqhjeEEeGPyrZ5I3hMlA" x="25" y="3"/> </children> <children xmi:type="notation:DecorationNode" xmi:id="_ozsqhzeEEeGPyrZ5I3hMlA" type="6029"> @@ -183,6 +192,9 @@ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5Z2NcUwJEeGN3tuNIuGSAw" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_2HDnBEwJEeGN3tuNIuGSAw" type="5125"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_S88-AJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TEskwJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> <layoutConstraint xmi:type="notation:Location" xmi:id="_2HDnBUwJEeGN3tuNIuGSAw" x="25" y="3"/> </children> <children xmi:type="notation:DecorationNode" xmi:id="_2HDnBkwJEeGN3tuNIuGSAw" type="6029"> @@ -226,6 +238,9 @@ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_m2HdQTrWEeGMCcwsbpLuFA" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_lu9HJjeEEeGPyrZ5I3hMlA" type="5125"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R-qJwJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SD7EQJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> <layoutConstraint xmi:type="notation:Location" xmi:id="_lu9HJzeEEeGPyrZ5I3hMlA" x="25" y="3"/> </children> <children xmi:type="notation:DecorationNode" xmi:id="_lu9uMDeEEeGPyrZ5I3hMlA" type="6029"> @@ -307,6 +322,9 @@ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0TObRDrZEeGgAdAmWw4pyQ" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_FzUd4GfbEd-T-rJ3Ep9Y5Q" type="5125"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TrlloJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TydpsJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> <layoutConstraint xmi:type="notation:Location" xmi:id="_FzUd4WfbEd-T-rJ3Ep9Y5Q" x="25" y="3"/> </children> <children xmi:type="notation:DecorationNode" xmi:id="_FzUd4mfbEd-T-rJ3Ep9Y5Q" type="6029"> @@ -342,7 +360,11 @@ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fGdKUF38Ed-UvNEDwY5GNg" source="QualifiedName"> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fGdKUV38Ed-UvNEDwY5GNg" key="QualifiedNameDepth" value="4"/> </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_uegu4l37Ed-UvNEDwY5GNg" type="5126"/> + <children xmi:type="notation:DecorationNode" xmi:id="_uegu4l37Ed-UvNEDwY5GNg" type="5126"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VcC2oJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VkiEQJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> + </children> <children xmi:type="notation:BasicCompartment" xmi:id="_uehV8F37Ed-UvNEDwY5GNg" type="7077"> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uehV8V37Ed-UvNEDwY5GNg"/> </children> @@ -364,6 +386,9 @@ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1sVjRDrZEeGgAdAmWw4pyQ" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_TLJ7ggcCEeGnrLqQ0OQeAg" type="5125"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UypUUJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_U4NJwJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> <layoutConstraint xmi:type="notation:Location" xmi:id="_TLJ7gwcCEeGnrLqQ0OQeAg" x="25" y="-6"/> </children> <children xmi:type="notation:DecorationNode" xmi:id="_TLKikAcCEeGnrLqQ0OQeAg" type="6029"> @@ -390,6 +415,9 @@ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UWsF0DrcEeGgAdAmWw4pyQ" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_RUpRJjrcEeGgAdAmWw4pyQ" type="5125"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XSc-oJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XakY0J0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> <layoutConstraint xmi:type="notation:Location" xmi:id="_RUpRJzrcEeGgAdAmWw4pyQ" x="-111" y="16"/> </children> <children xmi:type="notation:DecorationNode" xmi:id="_RUpRKDrcEeGgAdAmWw4pyQ" type="6029"> @@ -405,7 +433,11 @@ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_haY70F38Ed-UvNEDwY5GNg" source="QualifiedName"> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_haY70V38Ed-UvNEDwY5GNg" key="QualifiedNameDepth" value="4"/> </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_vHCHcl37Ed-UvNEDwY5GNg" type="5126"/> + <children xmi:type="notation:DecorationNode" xmi:id="_vHCHcl37Ed-UvNEDwY5GNg" type="5126"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WH8TUJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WOCUQJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> + </children> <children xmi:type="notation:BasicCompartment" xmi:id="_vHCHc137Ed-UvNEDwY5GNg" type="7077"> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vHCHdF37Ed-UvNEDwY5GNg"/> </children> @@ -427,6 +459,9 @@ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VsgpQDrcEeGgAdAmWw4pyQ" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_SZh1ljrcEeGgAdAmWw4pyQ" type="5125"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WwhWQJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_W5_bUJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> <layoutConstraint xmi:type="notation:Location" xmi:id="_SZh1lzrcEeGgAdAmWw4pyQ" x="25" y="3"/> </children> <children xmi:type="notation:DecorationNode" xmi:id="_SZh1mDrcEeGgAdAmWw4pyQ" type="6029"> @@ -700,7 +735,11 @@ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RbiPdMniEeCMCo5Ox2CNmg" source="QualifiedName"> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Rbi2gMniEeCMCo5Ox2CNmg" key="QualifiedNameDepth" value="1000"/> </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_Rbi2gcniEeCMCo5Ox2CNmg" type="5126"/> + <children xmi:type="notation:DecorationNode" xmi:id="_Rbi2gcniEeCMCo5Ox2CNmg" type="5126"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y9vbwJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZFdNUJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> + </children> <children xmi:type="notation:BasicCompartment" xmi:id="_Rbi2gsniEeCMCo5Ox2CNmg" type="7077"> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rbi2g8niEeCMCo5Ox2CNmg"/> </children> @@ -717,7 +756,11 @@ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5TJhMniEeCMCo5Ox2CNmg" source="QualifiedName"> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5TJhcniEeCMCo5Ox2CNmg" key="QualifiedNameDepth" value="1000"/> </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_R5TJhsniEeCMCo5Ox2CNmg" type="5126"/> + <children xmi:type="notation:DecorationNode" xmi:id="_R5TJhsniEeCMCo5Ox2CNmg" type="5126"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZuuMwJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Z3u-0J0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> + </children> <children xmi:type="notation:BasicCompartment" xmi:id="_R5TJh8niEeCMCo5Ox2CNmg" type="7077"> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R5TJiMniEeCMCo5Ox2CNmg"/> </children> @@ -758,7 +801,11 @@ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Qgb5IsniEeCMCo5Ox2CNmg" source="QualifiedName"> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qgb5I8niEeCMCo5Ox2CNmg" key="QualifiedNameDepth" value="1000"/> </eAnnotations> - <children xmi:type="notation:DecorationNode" xmi:id="_Qgb5JMniEeCMCo5Ox2CNmg" type="5126"/> + <children xmi:type="notation:DecorationNode" xmi:id="_Qgb5JMniEeCMCo5Ox2CNmg" type="5126"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aZnj4J0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ahY_0J0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> + </children> <children xmi:type="notation:BasicCompartment" xmi:id="_Qgb5JcniEeCMCo5Ox2CNmg" type="7077"> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qgb5JsniEeCMCo5Ox2CNmg"/> </children> @@ -995,7 +1042,7 @@ </children> <children xmi:type="notation:BasicCompartment" xmi:id="_zc5oaTeFEeGPyrZ5I3hMlA" type="7007"> <children xmi:type="notation:Shape" xmi:id="_7omegDeFEeGPyrZ5I3hMlA" type="3007" fontName="Sans Serif" lineColor="0"> - <element xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> + <element xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_7omegTeFEeGPyrZ5I3hMlA"/> </children> <styles xmi:type="notation:TitleStyle" xmi:id="_zc5oajeFEeGPyrZ5I3hMlA"/> @@ -1009,7 +1056,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_zc5ocTeFEeGPyrZ5I3hMlA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zc5ocjeFEeGPyrZ5I3hMlA"/> </children> - <element xmi:type="uml:Interface" href="pathmap://QML_CORE/SystemInterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> + <element xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zc4aQTeFEeGPyrZ5I3hMlA" x="387" y="117" height="73"/> </children> <children xmi:type="notation:Shape" xmi:id="_-jKLIDeFEeGPyrZ5I3hMlA" type="2004" fontName="Sans Serif" fillColor="8905185" gradient="16777215, 16777215, 0" lineColor="0"> @@ -1031,7 +1078,7 @@ </children> <children xmi:type="notation:BasicCompartment" xmi:id="_-jKyOjeFEeGPyrZ5I3hMlA" type="7007"> <children xmi:type="notation:Shape" xmi:id="_A4890DeGEeGPyrZ5I3hMlA" type="3007" fontName="Sans Serif" lineColor="0"> - <element xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> + <element xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_A4890TeGEeGPyrZ5I3hMlA"/> </children> <styles xmi:type="notation:TitleStyle" xmi:id="_-jKyOzeFEeGPyrZ5I3hMlA"/> @@ -1045,7 +1092,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_-jKyQjeFEeGPyrZ5I3hMlA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-jKyQzeFEeGPyrZ5I3hMlA"/> </children> - <element xmi:type="uml:Interface" href="pathmap://QML_CORE/SystemInterfaces.uml#_BHFPQJsqEd61Eo3nmu3JhQ"/> + <element xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_BHFPQJsqEd61Eo3nmu3JhQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-jKLITeFEeGPyrZ5I3hMlA" x="387" y="18" height="64"/> </children> <children xmi:type="notation:Shape" xmi:id="_H2qW0DeGEeGPyrZ5I3hMlA" type="2012" fontName="Sans Serif" lineColor="0"> @@ -1115,7 +1162,7 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_-kKQsTeFEeGPyrZ5I3hMlA" y="40"/> </children> <styles xmi:type="notation:FontStyle" xmi:id="_-kJpoTeFEeGPyrZ5I3hMlA" fontName="Sans Serif"/> - <element xmi:type="uml:Generalization" href="pathmap://QML_CORE/SystemInterfaces.uml#_XpdjECS-Ed-A_I32T0fkaA"/> + <element xmi:type="uml:Generalization" href="pathmap://QML_CORE/sysinterfaces.uml#_XpdjECS-Ed-A_I32T0fkaA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-kJpojeFEeGPyrZ5I3hMlA" points="[-50, -11, 387, 88]$[-437, -99, 0, 0]"/> </edges> <edges xmi:type="notation:Connector" xmi:id="_eBCHQDeGEeGPyrZ5I3hMlA" type="4013" source="_H2qW0DeGEeGPyrZ5I3hMlA" target="_zdznUDeFEeGPyrZ5I3hMlA" lineColor="0"> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.uml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.uml index d18b4fe9680..dad9d54ae44 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.uml +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.uml @@ -1,29 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:Cpp="http://papyrus/CppProfile/1" xmlns:FCM="http://papyrus/FCMProfile/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc"> +<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc"> <uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="ClientServerTraceTest"> - <packageImport xmi:id="_O6TiITLUEd26WNosUASSSw"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_O6TiITLUEd26WNosUASSSw"> <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> </packageImport> - <packageImport xmi:id="_Bc1WIFW4Ed63BrxiKsw-0Q"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_Bc1WIFW4Ed63BrxiKsw-0Q"> <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/> </packageImport> - <packageImport xmi:id="_rwBsMP7AEd6Zw96O-tCw7A"> - <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/CORBA.uml#_DtQEwDLdEd2_U4efLnjQIw"/> + <packageImport xmi:type="uml:PackageImport" xmi:id="_rwBsMP7AEd6Zw96O-tCw7A"> + <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/> </packageImport> - <packageImport xmi:id="_7K0UkACUEd-PD8FdFs7bpA"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_7K0UkACUEd-PD8FdFs7bpA"> <importedPackage xmi:type="uml:Model" href="pathmap://QML_DISTRIBUTION/distribution.uml#_O6TiIDLUEd26WNosUASSSw"/> </packageImport> - <packageImport xmi:id="_Bb08YGpQEd-C-tMBtf3Npw"> - <importedPackage xmi:type="uml:Model" href="pathmap://QML_MARTE/marte.uml#_O6TiIDLUEd26WNosUASSSw"/> - </packageImport> - <packageImport xmi:id="__D5MwE2WEeGzNbfAXPgNLA"> + <packageImport xmi:type="uml:PackageImport" xmi:id="__D5MwE2WEeGzNbfAXPgNLA"> <importedPackage xmi:type="uml:Model" href="pathmap://QML_TRACE/tracing.uml#_H-ZqYDKeEd-WprEKTCaiMA"/> </packageImport> <packagedElement xmi:type="uml:Package" xmi:id="_LOqIEDLaEd2qeKRLMdIx_A" name="components"> <packagedElement xmi:type="uml:Package" xmi:id="_OGM88DLaEd2qeKRLMdIx_A" name="Server"> <packagedElement xmi:type="uml:Class" xmi:id="_oqZNUDLaEd2qeKRLMdIx_A" clientDependency="_YQqH0JYlEd6G9q9hwr11bw" name="CServer_impl" classifierBehavior="_5Vd9UDclEeKAhIrFXfR8zQ"> <ownedAttribute xmi:type="uml:Port" xmi:id="_4KiE8DLbEd2qeKRLMdIx_A" name="p" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"/> - <interfaceRealization xmi:id="_YQqH0JYlEd6G9q9hwr11bw" name="derived realization of ICompute" client="_oqZNUDLaEd2qeKRLMdIx_A" supplier="_cn-H0DLbEd2qeKRLMdIx_A" contract="_cn-H0DLbEd2qeKRLMdIx_A"/> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_YQqH0JYlEd6G9q9hwr11bw" name="derived realization of ICompute" client="_oqZNUDLaEd2qeKRLMdIx_A" supplier="_cn-H0DLbEd2qeKRLMdIx_A" contract="_cn-H0DLbEd2qeKRLMdIx_A"/> <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_ML-4AKI5Ed6FqJCjEUrkqQ" name="add" specification="_TbIjUJYlEd6G9q9hwr11bw"> <language>C/C++</language> <body>cout << "a=" << a << " b=" << b << " a+b=" << a+b << endl; @@ -35,55 +32,55 @@ return a+b;</body> return a*b;</body> </ownedBehavior> <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_5Vd9UDclEeKAhIrFXfR8zQ" name="ServerStateMachine"> - <region xmi:id="_57WRkDclEeKAhIrFXfR8zQ" name="Region1"> - <transition xmi:id="_8ZB08DclEeKAhIrFXfR8zQ" name="Transition0" source="_66D8kDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/> - <transition xmi:id="_-v4XkDclEeKAhIrFXfR8zQ" name="Transition1" source="_9f6kgDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/> + <region xmi:type="uml:Region" xmi:id="_57WRkDclEeKAhIrFXfR8zQ" name="Region1"> + <transition xmi:type="uml:Transition" xmi:id="_8ZB08DclEeKAhIrFXfR8zQ" name="Transition0" source="_66D8kDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/> + <transition xmi:type="uml:Transition" xmi:id="_-v4XkDclEeKAhIrFXfR8zQ" name="Transition1" source="_9f6kgDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/> <subvertex xmi:type="uml:State" xmi:id="_66D8kDclEeKAhIrFXfR8zQ" name="State0"/> <subvertex xmi:type="uml:Pseudostate" xmi:id="_9f6kgDclEeKAhIrFXfR8zQ" name="Initial0"/> </region> </ownedBehavior> - <ownedOperation xmi:id="_4ZEZwHecEd6r18stFZxmFQ" name="mult" method="_I1R3YAcDEeGnrLqQ0OQeAg"> - <ownedParameter xmi:id="_nvpKUDVdEeKoYLVLZgpRiw" name="a"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_qgMSAB6SEd6ITtm_FH3jRw"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_4ZEZwHecEd6r18stFZxmFQ" name="mult" method="_I1R3YAcDEeGnrLqQ0OQeAg"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_nvpKUDVdEeKoYLVLZgpRiw" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nvup4DVdEeKoYLVLZgpRiw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nvvQ8DVdEeKoYLVLZgpRiw" value="1"/> </ownedParameter> - <ownedParameter xmi:id="_nvwfEDVdEeKoYLVLZgpRiw" name="b"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_wbw4kB6SEd6ITtm_FH3jRw"/> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_nvwfEDVdEeKoYLVLZgpRiw" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nvy7UDVdEeKoYLVLZgpRiw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nvziYDVdEeKoYLVLZgpRiw" value="1"/> </ownedParameter> - <ownedParameter xmi:id="_nv1XkDVdEeKoYLVLZgpRiw" name="res" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_nv1XkDVdEeKoYLVLZgpRiw" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nv3z0DVdEeKoYLVLZgpRiw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nv4a4DVdEeKoYLVLZgpRiw" value="1"/> </ownedParameter> </ownedOperation> - <ownedOperation xmi:id="_TbIjUJYlEd6G9q9hwr11bw" name="add" method="_ML-4AKI5Ed6FqJCjEUrkqQ"> - <ownedParameter xmi:id="_TbZCAJYlEd6G9q9hwr11bw" name="a"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_TbIjUJYlEd6G9q9hwr11bw" name="add" method="_ML-4AKI5Ed6FqJCjEUrkqQ"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_TbZCAJYlEd6G9q9hwr11bw" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> </ownedParameter> - <ownedParameter xmi:id="_TbdTcJYlEd6G9q9hwr11bw" name="b"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_TbdTcJYlEd6G9q9hwr11bw" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> </ownedParameter> - <ownedParameter xmi:id="_TbkoMJYlEd6G9q9hwr11bw" name="res" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_TbkoMJYlEd6G9q9hwr11bw" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> </ownedParameter> </ownedOperation> - <ownedOperation xmi:id="_rrf74DVdEeKoYLVLZgpRiw" name="check"> - <ownedParameter xmi:id="_4UNv4DVdEeKoYLVLZgpRiw" name="write"> + <ownedOperation xmi:type="uml:Operation" xmi:id="_rrf74DVdEeKoYLVLZgpRiw" name="check"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_4UNv4DVdEeKoYLVLZgpRiw" name="write"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4UO-ADVdEeKoYLVLZgpRiw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4UPlEDVdEeKoYLVLZgpRiw" value="1"/> </ownedParameter> </ownedOperation> - <ownedOperation xmi:id="_9OJPEDVkEeKoYLVLZgpRiw" name="testOp"> - <ownedParameter xmi:id="_Br-FQDVlEeKoYLVLZgpRiw" name="testPar"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_9XvcQB6REd6ITtm_FH3jRw"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_9OJPEDVkEeKoYLVLZgpRiw" name="testOp"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_Br-FQDVlEeKoYLVLZgpRiw" name="testPar"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/> </ownedParameter> </ownedOperation> - <ownedOperation xmi:id="_6ERa0DW2EeKyT6LlKoWJIA" name="length"> - <ownedParameter xmi:id="_FfLX4DW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA"> + <ownedOperation xmi:type="uml:Operation" xmi:id="_6ERa0DW2EeKyT6LlKoWJIA" name="length"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_FfLX4DW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FfN0IDW3EeKyT6LlKoWJIA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FfObMDW3EeKyT6LlKoWJIA" value="1"/> </ownedParameter> @@ -91,29 +88,29 @@ return a*b;</body> </packagedElement> </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_Tp4n8DLaEd2qeKRLMdIx_A" name="Interfaces"> - <ownedComment xmi:id="_TDDBoDeEEeGPyrZ5I3hMlA" annotatedElement="_cn-H0DLbEd2qeKRLMdIx_A"> + <ownedComment xmi:type="uml:Comment" xmi:id="_TDDBoDeEEeGPyrZ5I3hMlA" annotatedElement="_cn-H0DLbEd2qeKRLMdIx_A"> <body>This interface contains services that are used by the client and provided by the server component</body> </ownedComment> <packagedElement xmi:type="uml:Interface" xmi:id="_cn-H0DLbEd2qeKRLMdIx_A" name="ICompute"> - <ownedOperation xmi:id="_DGs6wDLgEd28fJKJJnUaeQ" name="add"> - <ownedParameter xmi:id="_DGs6wTLgEd28fJKJJnUaeQ" name="a"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_DGs6wDLgEd28fJKJJnUaeQ" name="add"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6wTLgEd28fJKJJnUaeQ" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6wzLgEd28fJKJJnUaeQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6wjLgEd28fJKJJnUaeQ" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6xDLgEd28fJKJJnUaeQ"> <value xsi:nil="true"/> </defaultValue> </ownedParameter> - <ownedParameter xmi:id="_DGs6xTLgEd28fJKJJnUaeQ" name="b"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6xTLgEd28fJKJJnUaeQ" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6xzLgEd28fJKJJnUaeQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6xjLgEd28fJKJJnUaeQ" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6yDLgEd28fJKJJnUaeQ"> <value xsi:nil="true"/> </defaultValue> </ownedParameter> - <ownedParameter xmi:id="_DGs6yTLgEd28fJKJJnUaeQ" name="res" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6yTLgEd28fJKJJnUaeQ" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6yzLgEd28fJKJJnUaeQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6yjLgEd28fJKJJnUaeQ" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6zDLgEd28fJKJJnUaeQ"> @@ -121,25 +118,25 @@ return a*b;</body> </defaultValue> </ownedParameter> </ownedOperation> - <ownedOperation xmi:id="_L8EY8DLgEd28fJKJJnUaeQ" name="mult" isAbstract="true"> - <ownedParameter xmi:id="_L8EY8TLgEd28fJKJJnUaeQ" name="a"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_qgMSAB6SEd6ITtm_FH3jRw"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_L8EY8DLgEd28fJKJJnUaeQ" name="mult" isAbstract="true"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY8TLgEd28fJKJJnUaeQ" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY8zLgEd28fJKJJnUaeQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY8jLgEd28fJKJJnUaeQ" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY9DLgEd28fJKJJnUaeQ"> <value xsi:nil="true"/> </defaultValue> </ownedParameter> - <ownedParameter xmi:id="_L8EY9TLgEd28fJKJJnUaeQ" name="b"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_wbw4kB6SEd6ITtm_FH3jRw"/> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY9TLgEd28fJKJJnUaeQ" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY9zLgEd28fJKJJnUaeQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY9jLgEd28fJKJJnUaeQ" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY-DLgEd28fJKJJnUaeQ"> <value xsi:nil="true"/> </defaultValue> </ownedParameter> - <ownedParameter xmi:id="_L8EY-TLgEd28fJKJJnUaeQ" name="res" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY-TLgEd28fJKJJnUaeQ" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY-zLgEd28fJKJJnUaeQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY-jLgEd28fJKJJnUaeQ" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY_DLgEd28fJKJJnUaeQ"> @@ -147,26 +144,26 @@ return a*b;</body> </defaultValue> </ownedParameter> </ownedOperation> - <ownedOperation xmi:id="_rrbqcDVdEeKoYLVLZgpRiw" name="check" isAbstract="true"> - <ownedParameter xmi:id="_0xTp0DVdEeKoYLVLZgpRiw" name="write"> + <ownedOperation xmi:type="uml:Operation" xmi:id="_rrbqcDVdEeKoYLVLZgpRiw" name="check" isAbstract="true"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_0xTp0DVdEeKoYLVLZgpRiw" name="write"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/> </ownedParameter> </ownedOperation> - <ownedOperation xmi:id="_6DewoDW2EeKyT6LlKoWJIA" name="length"> - <ownedParameter xmi:id="_AP4BcDW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_6DewoDW2EeKyT6LlKoWJIA" name="length"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_AP4BcDW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA"/> </ownedOperation> </packagedElement> <packagedElement xmi:type="uml:DataType" xmi:id="_krMkcDW2EeKyT6LlKoWJIA" name="Point"> - <ownedAttribute xmi:id="_m0WCQDW2EeKyT6LlKoWJIA" name="x" visibility="public"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_-5FTMB6REd6ITtm_FH3jRw"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_m0WCQDW2EeKyT6LlKoWJIA" name="x" visibility="public"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_-5FTMB6REd6ITtm_FH3jRw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pOAoUDW2EeKyT6LlKoWJIA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pOB2cDW2EeKyT6LlKoWJIA" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_pOESsDW2EeKyT6LlKoWJIA"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_yJIJMDW2EeKyT6LlKoWJIA" name="y" visibility="public"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_-5FTMB6REd6ITtm_FH3jRw"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_yJIJMDW2EeKyT6LlKoWJIA" name="y" visibility="public"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_-5FTMB6REd6ITtm_FH3jRw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yd44QDW2EeKyT6LlKoWJIA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yd6GYDW2EeKyT6LlKoWJIA" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_yd77kDW2EeKyT6LlKoWJIA"> @@ -176,28 +173,28 @@ return a*b;</body> </packagedElement> </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_etOZkDLaEd2qeKRLMdIx_A" name="Client"> - <ownedComment xmi:id="_b5cakDeEEeGPyrZ5I3hMlA" annotatedElement="_34FjAPx3Ed6O2oOTPfeAMA"> + <ownedComment xmi:type="uml:Comment" xmi:id="_b5cakDeEEeGPyrZ5I3hMlA" annotatedElement="_34FjAPx3Ed6O2oOTPfeAMA"> <body>The client component inherits a specific port from the Cstart componen type: the port "start" which provides interface IRunnable containing a single operation "run". By implementing this operation, the client gets initial control, comparable to a function "main" in classificla programming languages. </body> </ownedComment> - <ownedComment xmi:id="_H2U_oDeGEeGPyrZ5I3hMlA"> + <ownedComment xmi:type="uml:Comment" xmi:id="_H2U_oDeGEeGPyrZ5I3hMlA"> <body>This realization relationship has been added automatically by Qompass, it is derived from the fact that class CClient_impl implements the port "start" which provides the interface "IStart"</body> </ownedComment> - <ownedComment xmi:id="_fBRcQDeGEeGPyrZ5I3hMlA" annotatedElement="_IfjoETLbEd2qeKRLMdIx_A"> + <ownedComment xmi:type="uml:Comment" xmi:id="_fBRcQDeGEeGPyrZ5I3hMlA" annotatedElement="_IfjoETLbEd2qeKRLMdIx_A"> <body>The operation "run" (not the associated behavior) has been added automatically by Qompass in order to implement the operations of interfaces provided by ports, in this case of the operations of the "IStart" interface. It would be tedious to manually copy operations from an interface, as it would imply copying the complete signature with all parameters. The component developper has to provide a suitable behavior. A validation rule verifies if operations without behavior exist.</body> </ownedComment> - <ownedComment xmi:id="_kStEMDeHEeGPyrZ5I3hMlA"> - <annotatedElement xmi:type="uml:Interface" href="pathmap://QML_CORE/SystemInterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> - <annotatedElement xmi:type="uml:Interface" href="pathmap://QML_CORE/SystemInterfaces.uml#_BHFPQJsqEd61Eo3nmu3JhQ"/> + <ownedComment xmi:type="uml:Comment" xmi:id="_kStEMDeHEeGPyrZ5I3hMlA"> + <annotatedElement xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> + <annotatedElement xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_BHFPQJsqEd61Eo3nmu3JhQ"/> <body>These two interface are part of the "BasicCalls" Qompass model library. The IStart interface is "special", since the Qompass model transformations check for it existance in order to pass the "main" control to this component. A validation rule checks, if exactly one component instance provides this interface via the "start" port.</body> </ownedComment> <packagedElement xmi:type="uml:Class" xmi:id="_IfjoETLbEd2qeKRLMdIx_A" clientDependency="_ZmdDkEdDEeGxo4rn9hBAOQ" name="CClient_impl"> - <generalization xmi:id="_34FjAPx3Ed6O2oOTPfeAMA"> + <generalization xmi:type="uml:Generalization" xmi:id="_34FjAPx3Ed6O2oOTPfeAMA"> <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/> </generalization> <ownedAttribute xmi:type="uml:Port" xmi:id="_DtWn4DLcEd2qeKRLMdIx_A" name="q" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"/> - <interfaceRealization xmi:id="_ZmdDkEdDEeGxo4rn9hBAOQ" name="derived realization of IStart" client="_IfjoETLbEd2qeKRLMdIx_A"> - <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/SystemInterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> - <contract href="pathmap://QML_CORE/SystemInterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_ZmdDkEdDEeGxo4rn9hBAOQ" name="derived realization of IStart" client="_IfjoETLbEd2qeKRLMdIx_A"> + <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> + <contract xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> </interfaceRealization> <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yXNVoKF4Ed6FqJCjEUrkqQ" name="run" specification="_ZnGj0EdDEeGxo4rn9hBAOQ"> <language>C/C++</language> @@ -215,31 +212,31 @@ for (int i=0; i<20; i++) { <language>C/C++</language> <body>cout << "This is a test operation" << endl;</body> </ownedBehavior> - <ownedOperation xmi:id="_ZnGj0EdDEeGxo4rn9hBAOQ" name="run" method="_yXNVoKF4Ed6FqJCjEUrkqQ"/> - <ownedOperation xmi:id="_Qzp7gDclEeKAhIrFXfR8zQ" name="testOp" method="_yVALQDclEeKAhIrFXfR8zQ"> - <ownedParameter xmi:id="_rXu4UDc_EeKPle9CbXIcpQ" name="j"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/CORBA.uml#_9XvcQB6REd6ITtm_FH3jRw"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_ZnGj0EdDEeGxo4rn9hBAOQ" name="run" method="_yXNVoKF4Ed6FqJCjEUrkqQ"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_Qzp7gDclEeKAhIrFXfR8zQ" name="testOp" method="_yVALQDclEeKAhIrFXfR8zQ"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_rXu4UDc_EeKPle9CbXIcpQ" name="j"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/> </ownedParameter> </ownedOperation> </packagedElement> </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_XLQjUDLiEd2RVeNawwNNzg" name="System"> - <ownedComment xmi:id="_s5iFMDeJEeGPyrZ5I3hMlA" annotatedElement="_bYJagDLiEd2RVeNawwNNzg"> + <ownedComment xmi:type="uml:Comment" xmi:id="_s5iFMDeJEeGPyrZ5I3hMlA" annotatedElement="_bYJagDLiEd2RVeNawwNNzg"> <body>A composite class in which two attributes represent the component instances client and server, respectively. The assembly between ports is done on this level. A single class represents the complete application, typically called "System" or "System_impl". Such a class provides the information to calculate a tree of instance specifications, a so-called deployment plan. Check out the context menu. can be generated from the </body> </ownedComment> - <ownedComment xmi:id="_Vcf9kDeKEeGPyrZ5I3hMlA" annotatedElement="_QO2s0E2rEeGl8qrc8BM7vA"> + <ownedComment xmi:type="uml:Comment" xmi:id="_Vcf9kDeKEeGPyrZ5I3hMlA" annotatedElement="_QO2s0E2rEeGl8qrc8BM7vA"> <body>This connection between ports is stereotyped. The "connector" provides information which specific interaction component is responsible for realising this connection. The interaction component is part of an Qompass model library. Select the connection and check out the Qompass pop "Show/choose connector type or implementation". In this case an group of implementations has been chosen, which contains a socket connection in case of distribution and a direct connection, if co-localized</body> </ownedComment> <packagedElement xmi:type="uml:Class" xmi:id="_bYJagDLiEd2RVeNawwNNzg" name="System_impl"> - <ownedAttribute xmi:id="_gV1cgDLiEd2RVeNawwNNzg" name="server" type="_oqZNUDLaEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/> - <ownedAttribute xmi:id="_i-I7gDLiEd2RVeNawwNNzg" name="client" type="_IfjoETLbEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/> - <ownedConnector xmi:id="_QO2s0E2rEeGl8qrc8BM7vA" name="qp_connector"> - <end xmi:id="_QO3T4E2rEeGl8qrc8BM7vA" partWithPort="_i-I7gDLiEd2RVeNawwNNzg" role="_DtWn4DLcEd2qeKRLMdIx_A"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_gV1cgDLiEd2RVeNawwNNzg" name="server" type="_oqZNUDLaEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/> + <ownedAttribute xmi:type="uml:Property" xmi:id="_i-I7gDLiEd2RVeNawwNNzg" name="client" type="_IfjoETLbEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/> + <ownedConnector xmi:type="uml:Connector" xmi:id="_QO2s0E2rEeGl8qrc8BM7vA" name="qp_connector"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_QO3T4E2rEeGl8qrc8BM7vA" partWithPort="_i-I7gDLiEd2RVeNawwNNzg" role="_DtWn4DLcEd2qeKRLMdIx_A"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QO3T4k2rEeGl8qrc8BM7vA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QO3T4U2rEeGl8qrc8BM7vA" value="1"/> </end> - <end xmi:id="_QO5wIE2rEeGl8qrc8BM7vA" partWithPort="_gV1cgDLiEd2RVeNawwNNzg" role="_4KiE8DLbEd2qeKRLMdIx_A"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_QO5wIE2rEeGl8qrc8BM7vA" partWithPort="_gV1cgDLiEd2RVeNawwNNzg" role="_4KiE8DLbEd2qeKRLMdIx_A"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QO5wIk2rEeGl8qrc8BM7vA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QO5wIU2rEeGl8qrc8BM7vA" value="1"/> </end> @@ -248,37 +245,37 @@ A single class represents the complete application, typically called "Syste </packagedElement> </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_v3fMgDLiEd2RVeNawwNNzg" name="platform"> - <ownedComment xmi:id="_ZWJ6QDeLEeGPyrZ5I3hMlA" annotatedElement="__1PHIMnhEeCMCo5Ox2CNmg"> + <ownedComment xmi:type="uml:Comment" xmi:id="_ZWJ6QDeLEeGPyrZ5I3hMlA" annotatedElement="__1PHIMnhEeCMCo5Ox2CNmg"> <body>The hardware architecture is also defined by means of a composite class (comparable to the software architecture). The types (NodeA and NodeB) can be stereotyped with information about the used target platform (FCM stereotype target). As for software architecture, instances specification for nodes are derived from this class. Use "Qompass: create platform definition" in the context menu.</body> </ownedComment> - <ownedComment xmi:id="_2vkEQDeLEeGPyrZ5I3hMlA" annotatedElement="_eFh10MniEeCMCo5Ox2CNmg"> + <ownedComment xmi:type="uml:Comment" xmi:id="_2vkEQDeLEeGPyrZ5I3hMlA" annotatedElement="_eFh10MniEeCMCo5Ox2CNmg"> <body>The physical connection between two nodes is represented by a UML connector. Currently, this information is not evaluated by Qompass, but it is planned to analyze for instance whether the throughput (specified by means of MARTE) is sufficient with requirements of the software</body> </ownedComment> <packagedElement xmi:type="uml:Node" xmi:id="_zY9vMDLiEd2RVeNawwNNzg" name="MonoNode"/> <packagedElement xmi:type="uml:Node" xmi:id="_MxayMP_BEd6628OhKk_dpg" name="NodeA"/> <packagedElement xmi:type="uml:Node" xmi:id="_NF3YMP_BEd6628OhKk_dpg" name="NodeB"/> <packagedElement xmi:type="uml:Class" xmi:id="__1PHIMnhEeCMCo5Ox2CNmg" name="HWArchitectureDist"> - <ownedAttribute xmi:id="_RbUNAMniEeCMCo5Ox2CNmg" name="nodeA" visibility="public" type="_MxayMP_BEd6628OhKk_dpg" aggregation="composite"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_RbUNAMniEeCMCo5Ox2CNmg" name="nodeA" visibility="public" type="_MxayMP_BEd6628OhKk_dpg" aggregation="composite"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UjRccMniEeCMCo5Ox2CNmg" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UkfkcMniEeCMCo5Ox2CNmg" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_Ul-LIMniEeCMCo5Ox2CNmg"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_R5FuIMniEeCMCo5Ox2CNmg" name="nodeB" visibility="public" type="_NF3YMP_BEd6628OhKk_dpg" aggregation="composite"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_R5FuIMniEeCMCo5Ox2CNmg" name="nodeB" visibility="public" type="_NF3YMP_BEd6628OhKk_dpg" aggregation="composite"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VzfHIMniEeCMCo5Ox2CNmg" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V1Is8MniEeCMCo5Ox2CNmg" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_V3LUUMniEeCMCo5Ox2CNmg"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedConnector xmi:id="_eFh10MniEeCMCo5Ox2CNmg" name="Connector0"> - <end xmi:id="_eFic4MniEeCMCo5Ox2CNmg" role="_RbUNAMniEeCMCo5Ox2CNmg"/> - <end xmi:id="_eFjD8MniEeCMCo5Ox2CNmg" role="_R5FuIMniEeCMCo5Ox2CNmg"/> + <ownedConnector xmi:type="uml:Connector" xmi:id="_eFh10MniEeCMCo5Ox2CNmg" name="Connector0"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_eFic4MniEeCMCo5Ox2CNmg" role="_RbUNAMniEeCMCo5Ox2CNmg"/> + <end xmi:type="uml:ConnectorEnd" xmi:id="_eFjD8MniEeCMCo5Ox2CNmg" role="_R5FuIMniEeCMCo5Ox2CNmg"/> </ownedConnector> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_M1a_8MniEeCMCo5Ox2CNmg" name="HWArchitectureMonolithic"> - <ownedAttribute xmi:id="_QgKzYMniEeCMCo5Ox2CNmg" name="monoNode" visibility="public" type="_zY9vMDLiEd2RVeNawwNNzg" aggregation="composite"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_QgKzYMniEeCMCo5Ox2CNmg" name="monoNode" visibility="public" type="_zY9vMDLiEd2RVeNawwNNzg" aggregation="composite"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XijRAMniEeCMCo5Ox2CNmg" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XkfxwMniEeCMCo5Ox2CNmg" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_XlIq8MniEeCMCo5Ox2CNmg"> @@ -295,22 +292,22 @@ A single class represents the complete application, typically called "Syste </packagedElement> </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_234GEDLiEd2RVeNawwNNzg" name="deployment"> - <ownedComment xmi:id="_ToVjMDeIEeGPyrZ5I3hMlA" annotatedElement="_QT6okKDjEd-rLNbSWf1QuA"> + <ownedComment xmi:type="uml:Comment" xmi:id="_ToVjMDeIEeGPyrZ5I3hMlA" annotatedElement="_QT6okKDjEd-rLNbSWf1QuA"> <body>A deployment configuration that activates the tracing container rule which will provide OTF tracing. The deployment configuration is linked with the "monolithic" deployment plan</body> </ownedComment> - <ownedComment xmi:id="_f3lHQDeIEeGPyrZ5I3hMlA" annotatedElement="_5Z7MEDLiEd2RVeNawwNNzg"> + <ownedComment xmi:type="uml:Comment" xmi:id="_f3lHQDeIEeGPyrZ5I3hMlA" annotatedElement="_5Z7MEDLiEd2RVeNawwNNzg"> <body> deployment plan (= set of instances along with their configuration and allocation) "monolithic". All instances are allocated to node instance "monoNode". Check out the node allocation with the pop-up "Qompass: allocate to node". Initiate the deployment and code generation with the pop-up "Qompass: generate deployment model and code from plan".</body> </ownedComment> - <ownedComment xmi:id="_L01VMDeJEeGPyrZ5I3hMlA" annotatedElement="_bBSxQP_BEd6628OhKk_dpg"> + <ownedComment xmi:type="uml:Comment" xmi:id="_L01VMDeJEeGPyrZ5I3hMlA" annotatedElement="_bBSxQP_BEd6628OhKk_dpg"> <body> In this case, the deployment plan forsees allocating the client to nodeA and the server to nodeB. Note that the deployment transformations will automatically detect that a distributed connector is required, in this case a socket (see composite diagram System)</body> </ownedComment> <packagedElement xmi:type="uml:Package" xmi:id="_5Z7MEDLiEd2RVeNawwNNzg" name="monolithic"> <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_L9xhwDLjEd2RVeNawwNNzg" clientDependency="_1Lv7AE0qEeGl_syZE5iOXA" name="mySystem" classifier="_bYJagDLiEd2RVeNawwNNzg"> - <slot xmi:id="_TdCvsDLjEd2RVeNawwNNzg" definingFeature="_gV1cgDLiEd2RVeNawwNNzg"> + <slot xmi:type="uml:Slot" xmi:id="_TdCvsDLjEd2RVeNawwNNzg" definingFeature="_gV1cgDLiEd2RVeNawwNNzg"> <value xmi:type="uml:InstanceValue" xmi:id="_fw8xUDLjEd2RVeNawwNNzg" name="" instance="_MyQ5wDLjEd2RVeNawwNNzg"/> </slot> - <slot xmi:id="_YhikUDLjEd2RVeNawwNNzg" definingFeature="_i-I7gDLiEd2RVeNawwNNzg"> + <slot xmi:type="uml:Slot" xmi:id="_YhikUDLjEd2RVeNawwNNzg" definingFeature="_i-I7gDLiEd2RVeNawwNNzg"> <value xmi:type="uml:InstanceValue" xmi:id="_lAoiQDLjEd2RVeNawwNNzg" instance="_P3ovQDLjEd2RVeNawwNNzg"/> </slot> </packagedElement> @@ -320,10 +317,10 @@ Initiate the deployment and code generation with the pop-up "Qompass: gener </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_bBSxQP_BEd6628OhKk_dpg" name="distributed"> <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_bBdwYP_BEd6628OhKk_dpg" name="mainInstance" classifier="_bYJagDLiEd2RVeNawwNNzg"> - <slot xmi:id="_bBpWkP_BEd6628OhKk_dpg" definingFeature="_gV1cgDLiEd2RVeNawwNNzg"> + <slot xmi:type="uml:Slot" xmi:id="_bBpWkP_BEd6628OhKk_dpg" definingFeature="_gV1cgDLiEd2RVeNawwNNzg"> <value xmi:type="uml:InstanceValue" xmi:id="_bBqksP_BEd6628OhKk_dpg" instance="_bBnhYP_BEd6628OhKk_dpg"/> </slot> - <slot xmi:id="_bBuPEP_BEd6628OhKk_dpg" definingFeature="_i-I7gDLiEd2RVeNawwNNzg"> + <slot xmi:type="uml:Slot" xmi:id="_bBuPEP_BEd6628OhKk_dpg" definingFeature="_i-I7gDLiEd2RVeNawwNNzg"> <value xmi:type="uml:InstanceValue" xmi:id="_bBxSYP_BEd6628OhKk_dpg" instance="_bBry0P_BEd6628OhKk_dpg"/> </slot> </packagedElement> @@ -334,95 +331,95 @@ Initiate the deployment and code generation with the pop-up "Qompass: gener </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_QT6okKDjEd-rLNbSWf1QuA" name="ConfigTraceMono"/> </packagedElement> - <profileApplication xmi:id="_O6TiIjLUEd26WNosUASSSw"> - <eAnnotations xmi:id="_O6TiIzLUEd26WNosUASSSw" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_O6TiIjLUEd26WNosUASSSw"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O6TiIzLUEd26WNosUASSSw" source="http://www.eclipse.org/uml2/2.0.0/UML"> <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/> </eAnnotations> - <appliedProfile href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/> + <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/> </profileApplication> - <profileApplication xmi:id="_GcC0cAHtEd6HSdiss9GQ0A"> - <eAnnotations xmi:id="_Gd1kMAHtEd6HSdiss9GQ0A" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://papyrus/CppProfile/1#/"/> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_GcC0cAHtEd6HSdiss9GQ0A"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Gd1kMAHtEd6HSdiss9GQ0A" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> </eAnnotations> - <appliedProfile href="pathmap://PapyrusCpp_PROFILES/PapyrusCpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> + <appliedProfile xmi:type="uml:Profile" href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> </profileApplication> - <profileApplication xmi:id="_z1TwgFW3Ed63BrxiKsw-0Q"> - <eAnnotations xmi:id="_z2GasFW3Ed63BrxiKsw-0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://papyrus/FCMProfile/1#/"/> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_z1TwgFW3Ed63BrxiKsw-0Q"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z2GasFW3Ed63BrxiKsw-0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/> </eAnnotations> - <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> + <appliedProfile xmi:type="uml:Profile" href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> </profileApplication> - <profileApplication xmi:id="_1GtD8E0fEeG_H4ME7SR4KA"> - <eAnnotations xmi:id="_1RA2gE0fEeG_H4ME7SR4KA" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_1GtD8E0fEeG_H4ME7SR4KA"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1RA2gE0fEeG_H4ME7SR4KA" source="http://www.eclipse.org/uml2/2.0.0/UML"> <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/> </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/> + <appliedProfile xmi:type="uml:Profile" href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/> </profileApplication> </uml:Model> <FCM:DerivedElement xmi:id="_B9o7sP6yEd6Ie_kieu_3CQ"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> + <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> </FCM:DerivedElement> <FCM:DerivedElement xmi:id="_DWb6oP6yEd6Ie_kieu_3CQ" base_Element="_TbIjUJYlEd6G9q9hwr11bw" source="_DGs6wDLgEd28fJKJJnUaeQ"/> <FCM:DerivedElement xmi:id="_DXK6cP6yEd6Ie_kieu_3CQ" base_Element="_4ZEZwHecEd6r18stFZxmFQ" source="_L8EY8DLgEd28fJKJJnUaeQ"/> <FCM:RuleApplication xmi:id="_DWIYoP6yEd6Ie_kieu_3CQ" base_Class="_oqZNUDLaEd2qeKRLMdIx_A"> - <containerRule href="pathmap://QML_TRACE/tracing.uml#_RWQC8PwkEeGWn-a9PUOYcA"/> - <containerRule href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/> + <containerRule xmi:type="FCM:ContainerRule" href="pathmap://QML_TRACE/tracing.uml#_RWQC8PwkEeGWn-a9PUOYcA"/> + <containerRule xmi:type="FCM:ContainerRule" href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/> <propagateRule>false</propagateRule> <interceptor href="pathmap://QML_TRACE/tracing.uml#_35od4DKrEd-z5o2wSoJ16A"/> </FCM:RuleApplication> <FCM:Port xmi:id="_GofhQP6yEd6Ie_kieu_3CQ" base_Port="_4KiE8DLbEd2qeKRLMdIx_A"> - <kind href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/> + <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/> </FCM:Port> <FCM:Connector xmi:id="_K2_iAP6yEd6Ie_kieu_3CQ"/> <FCM:DeploymentPlan xmi:id="_6dGQgP6zEd6Ie_kieu_3CQ" mainInstance="_L9xhwDLjEd2RVeNawwNNzg" base_Package="_5Z7MEDLiEd2RVeNawwNNzg"/> <FCM:DerivedElement xmi:id="_RwGb8P6_Ed6Zw96O-tCw7A" source="_DGs6wDLgEd28fJKJJnUaeQ"/> <FCM:DerivedElement xmi:id="_RxVyEP6_Ed6Zw96O-tCw7A" source="_L8EY8DLgEd28fJKJJnUaeQ"/> - <Cpp:CppInclude xmi:id="_7SAnAP76Ed6Zw96O-tCw7A" body="#include <unistd.h>
#include <iostream>
using namespace std;" base_class="_IfjoETLbEd2qeKRLMdIx_A"/> - <Cpp:CppInclude xmi:id="_Sa4nEP77Ed6Zw96O-tCw7A" body="#include <iostream>
using namespace std;" base_class="_oqZNUDLaEd2qeKRLMdIx_A"/> + <C_Cpp:Include xmi:id="_7SAnAP76Ed6Zw96O-tCw7A" body="#include <unistd.h>
#include <iostream>
using namespace std;" base_class="_IfjoETLbEd2qeKRLMdIx_A"/> + <C_Cpp:Include xmi:id="_Sa4nEP77Ed6Zw96O-tCw7A" body="#include <iostream>
using namespace std;" base_class="_oqZNUDLaEd2qeKRLMdIx_A"/> <FCM:DeploymentPlan xmi:id="_bBdJUP_BEd6628OhKk_dpg" mainInstance="_bBdwYP_BEd6628OhKk_dpg" base_Package="_bBSxQP_BEd6628OhKk_dpg"/> <FCM:Connector xmi:id="_Tm9v0ACUEd-PD8FdFs7bpA"/> <FCM:DeploymentPlan xmi:id="_lEueYGLEEd-seu3qyZgHfg"/> <FCM:DeploymentPlan xmi:id="_u_ACgGSuEd-dQdK1-7wIFg"/> <FCM:DeploymentPlan xmi:id="_YK67AGTgEd-rCOWJcspHOA"/> <FCM:Port xmi:id="_IWQqoP6yEd6Ie_kieu_3CQ" base_Port="_DtWn4DLcEd2qeKRLMdIx_A"> - <kind href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/> + <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/> </FCM:Port> <FCM:ContainerRule xmi:id="_lNrDwH4HEd-rD-b0gnx-AQ"/> <FCM:Configuration xmi:id="_RM9kQH8UEd-7Bsdl4VhuEw" deploymentPlan="_6dGQgP6zEd6Ie_kieu_3CQ" base_Package="_BJc50H8TEd-7Bsdl4VhuEw"> - <configOptions href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/> + <configOptions xmi:type="FCM:ConfigOption" href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/> </FCM:Configuration> <FCM:Configuration xmi:id="_Y10_QKDjEd-rLNbSWf1QuA" base_Class="_QT6okKDjEd-rLNbSWf1QuA" deploymentPlan="_6dGQgP6zEd6Ie_kieu_3CQ"> - <configOptions href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/> + <configOptions xmi:type="FCM:ConfigOption" href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/> </FCM:Configuration> <FCM:DerivedElement xmi:id="_1E0nUKFhEd-AoOVE_odazw"/> <FCM:Target xmi:id="_Et5N4LqQEd-BObGGoBbehA" base_Node="_MxayMP_BEd6628OhKk_dpg"> - <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/> - <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/> + <targetArch xmi:type="FCM:TargetArchitecture" href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/> + <usedOS xmi:type="FCM:OperatingSystem" href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/> </FCM:Target> <FCM:Target xmi:id="_HvbFMLqQEd-BObGGoBbehA" base_Node="_zY9vMDLiEd2RVeNawwNNzg"> - <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/> - <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/> + <targetArch xmi:type="FCM:TargetArchitecture" href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/> + <usedOS xmi:type="FCM:OperatingSystem" href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/> </FCM:Target> <FCM:Target xmi:id="_J6gcsLqQEd-BObGGoBbehA" base_Node="_NF3YMP_BEd6628OhKk_dpg"> - <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/> - <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/> + <targetArch xmi:type="FCM:TargetArchitecture" href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/> + <usedOS xmi:type="FCM:OperatingSystem" href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/> </FCM:Target> <FCM:Connector xmi:id="_cAkqIMKnEd-LE5cHpAvxBg"> <connector xmi:type="FCM:ConnectorImplGroup" href="pathmap://QML_DISTRIBUTION/distribution.uml#_DBP7QMKmEd-hj59jYY3RZQ"/> </FCM:Connector> <FCM:DerivedElement xmi:id="_ZnZewEdDEeGxo4rn9hBAOQ" base_Element="_ZnGj0EdDEeGxo4rn9hBAOQ"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> + <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> </FCM:DerivedElement> <Alloc:Allocate xmi:id="_hgh4IE0rEeGl_syZE5iOXA" base_Abstraction="_1Lv7AE0qEeGl_syZE5iOXA"/> <Alloc:Allocate xmi:id="_iwbZwE0rEeGl_syZE5iOXA" base_Abstraction="_zMKZgDeMEeGPyrZ5I3hMlA"/> <Alloc:Allocate xmi:id="_juiAwE0rEeGl_syZE5iOXA" base_Abstraction="_zjuk8DeMEeGPyrZ5I3hMlA"/> <FCM:Connector xmi:id="_UKqbEE2rEeGl8qrc8BM7vA" base_Connector="_QO2s0E2rEeGl8qrc8BM7vA"> - <ic href="pathmap://QML_DISTRIBUTION/distribution.uml#_lpYxME2qEeGl8qrc8BM7vA"/> + <ic xmi:type="FCM:InteractionComponent" href="pathmap://QML_DISTRIBUTION/distribution.uml#_lpYxME2qEeGl8qrc8BM7vA"/> </FCM:Connector> <FCM:DerivedElement xmi:id="_rrmpkDVdEeKoYLVLZgpRiw" base_Element="_rrf74DVdEeKoYLVLZgpRiw" source="_rrbqcDVdEeKoYLVLZgpRiw"/> <FCM:DerivedElement xmi:id="_6EbL0DW2EeKyT6LlKoWJIA" base_Element="_6ERa0DW2EeKyT6LlKoWJIA" source="_6DewoDW2EeKyT6LlKoWJIA"/> <FCM:RuleApplication xmi:id="__bC_ADcmEeKAhIrFXfR8zQ" base_Class="_IfjoETLbEd2qeKRLMdIx_A"> - <containerRule href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/> + <containerRule xmi:type="FCM:ContainerRule" href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/> <propagateRule>false</propagateRule> </FCM:RuleApplication> </xmi:XMI> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.notation b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.notation index afa79ec196e..8d26d0ae915 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.notation +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.notation @@ -1,5 +1,5 @@ <?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:Cpp="http://papyrus/CppProfile/1" xmlns:FCM="http://papyrus/FCMProfile/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> <notation:Diagram xmi:id="_UstOsM__Ed-TP80eVS-2Rg" type="CompositeStructure" name="PushConsumer" measurementUnit="Pixel"> <children xmi:type="notation:Shape" xmi:id="_VT2HMM__Ed-TP80eVS-2Rg" type="2073" fontName="" fontHeight="10" fillColor="8905185" lineColor="0"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VT2HMs__Ed-TP80eVS-2Rg" source="ShadowFigure"> @@ -177,7 +177,7 @@ </children> <children xmi:type="notation:BasicCompartment" xmi:id="_JxylQFZ0EeK5f41mmHszag" visible="false" type="AppliedStereotypeCompartement"> <styles xmi:type="notation:TitleStyle" xmi:id="_JxylQVZ0EeK5f41mmHszag" showTitle="true"/> - <element xmi:type="Cpp:CppInclude" href="ProducerConsumer.uml#_11OtwPcaEd-KM6l7lmIPkw"/> + <element xmi:type="C_Cpp:Include" href="ProducerConsumer.uml#_11OtwPcaEd-KM6l7lmIPkw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JxylQlZ0EeK5f41mmHszag"/> </children> <children xmi:type="notation:BasicCompartment" xmi:id="_JxzMUFZ0EeK5f41mmHszag" visible="false" type="AppliedStereotypeCompartement"> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.uml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.uml index 08f377275a1..706945e6195 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.uml +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ProducerConsumer.uml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:Cpp="http://papyrus/CppProfile/1" xmlns:FCM="http://papyrus/FCMProfile/1" xmlns:GCM="http://www.eclipse.org/papyrus/GCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc http://www.eclipse.org/papyrus/GCM/1 http://www.eclipse.org/papyrus/MARTE/1#//GCM"> +<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:GCM="http://www.eclipse.org/papyrus/GCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc http://www.eclipse.org/papyrus/GCM/1 http://www.eclipse.org/papyrus/MARTE/1#//GCM"> <uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="ProducerConsumer"> <packageImport xmi:id="_O6TiITLUEd26WNosUASSSw"> <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> @@ -303,11 +303,11 @@ Use the context menu on a selected connector to specify the interaction componen <eAnnotations xmi:id="_Gd1kMAHtEd6HSdiss9GQ0A" source="http://www.eclipse.org/uml2/2.0.0/UML"> <references xmi:type="ecore:EPackage" href="http://papyrus/CppProfile/1#/"/> </eAnnotations> - <appliedProfile href="pathmap://PapyrusCpp_PROFILES/PapyrusCpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> + <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> </profileApplication> <profileApplication xmi:id="_z1TwgFW3Ed63BrxiKsw-0Q"> <eAnnotations xmi:id="_z2GasFW3Ed63BrxiKsw-0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://papyrus/FCMProfile/1#/"/> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/> </eAnnotations> <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> </profileApplication> @@ -371,8 +371,8 @@ Use the context menu on a selected connector to specify the interaction componen </FCM:Port> <FCM:DerivedElement xmi:id="_RwGb8P6_Ed6Zw96O-tCw7A"/> <FCM:DerivedElement xmi:id="_RxVyEP6_Ed6Zw96O-tCw7A"/> - <Cpp:CppInclude xmi:id="_7SAnAP76Ed6Zw96O-tCw7A" body="#include <unistd.h>
#include <iostream>
using namespace std;" base_class="_IfjoETLbEd2qeKRLMdIx_A"/> - <Cpp:CppInclude xmi:id="_Sa4nEP77Ed6Zw96O-tCw7A" body="#include <iostream>
using namespace std;" base_class="_oqZNUDLaEd2qeKRLMdIx_A"/> + <C_Cpp:Include xmi:id="_7SAnAP76Ed6Zw96O-tCw7A" body="#include <unistd.h>
#include <iostream>
using namespace std;" base_class="_IfjoETLbEd2qeKRLMdIx_A"/> + <C_Cpp:Include xmi:id="_Sa4nEP77Ed6Zw96O-tCw7A" body="#include <iostream>
using namespace std;" base_class="_oqZNUDLaEd2qeKRLMdIx_A"/> <FCM:DerivedElement xmi:id="_RoIMoP94Ed6628OhKk_dpg"/> <FCM:DerivedElement xmi:id="_IFlIEARJEd--t-uhRn9OBA"/> <FCM:ContainerRule xmi:id="_b-TmAARJEd--t-uhRn9OBA"> @@ -401,7 +401,7 @@ Use the context menu on a selected connector to specify the interaction componen <FCM:DerivedElement xmi:id="_uOz7gD15Ed-qiK1VZWszhA" base_Element="_uOtN0D15Ed-qiK1VZWszhA"> <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/> </FCM:DerivedElement> - <Cpp:CppVisibility xmi:id="_0VnhsD15Ed-qiK1VZWszhA" value="public" base_generalization="_NItbAP94Ed6628OhKk_dpg"/> + <C_Cpp:Visibility xmi:id="_0VnhsD15Ed-qiK1VZWszhA" value="public" base_generalization="_NItbAP94Ed6628OhKk_dpg"/> <FCM:DerivedElement xmi:id="_a4LokD16Ed-qiK1VZWszhA"> <source xmi:type="uml:Operation" href="pathmap://QML_CORE//sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> </FCM:DerivedElement> @@ -417,7 +417,7 @@ Use the context menu on a selected connector to specify the interaction componen <FCM:DerivedElement xmi:id="_igVhMNAAEd-TP80eVS-2Rg" base_Element="_tyjRzM__Ed-TP80eVS-2Rg"> <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/> </FCM:DerivedElement> - <Cpp:CppInclude xmi:id="_11OtwPcaEd-KM6l7lmIPkw" body="#include <unistd.h>
#include <iostream>
using namespace std;" base_class="_tyiqsc__Ed-TP80eVS-2Rg"/> + <C_Cpp:Include xmi:id="_11OtwPcaEd-KM6l7lmIPkw" body="#include <unistd.h>
#include <iostream>
using namespace std;" base_class="_tyiqsc__Ed-TP80eVS-2Rg"/> <FCM:Configuration xmi:id="_qQdP8CgjEeC5Ga5kAgjl0g" base_Class="_qP52UCgjEeC5Ga5kAgjl0g" deploymentPlan="_xB2CEDOFEeCldqx_51Yicg"> <configOptions href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/> </FCM:Configuration> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation index bea3f251dce..20f539ea806 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation @@ -1,5 +1,5 @@ <?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:FCM="http://papyrus/FCMProfile/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> <notation:Diagram xmi:id="_U-SDoIKfEd-xPu-WdpUyIQ" type="CompositeStructure" name="OTF composition" measurementUnit="Pixel"> <children xmi:type="notation:Shape" xmi:id="_jKzMsIKfEd-xPu-WdpUyIQ" type="2073" fontName="Sans Serif" fontHeight="10" lineColor="0"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jKzzwIKfEd-xPu-WdpUyIQ" source="ShadowFigure"> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml index 79c61f1b245..ae9ecae6f55 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Cpp="http://papyrus/CppProfile/1" xmlns:FCM="http://papyrus/FCMProfile/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> +<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> <uml:Model xmi:id="_H-ZqYDKeEd-WprEKTCaiMA" name="Tracing"> <packageImport xmi:id="_H-ZqYTKeEd-WprEKTCaiMA"> <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> @@ -640,7 +640,7 @@ return processID;</body> </profileApplication> <profileApplication xmi:id="_-DLL0DKnEd-WprEKTCaiMA"> <eAnnotations xmi:id="_-DXZEDKnEd-WprEKTCaiMA" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://papyrus/FCMProfile/1#/"/> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/> </eAnnotations> <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> </profileApplication> @@ -648,7 +648,7 @@ return processID;</body> <eAnnotations xmi:id="_N6vH4DguEd-9wq2wHPy3lw" source="http://www.eclipse.org/uml2/2.0.0/UML"> <references xmi:type="ecore:EPackage" href="http://papyrus/CppProfile/1#/"/> </eAnnotations> - <appliedProfile href="pathmap://PapyrusCpp_PROFILES/PapyrusCpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> + <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> </profileApplication> </uml:Model> <l2:ModelLibrary xmi:id="_ICaAoDKeEd-WprEKTCaiMA" base_Package="_H-ZqYDKeEd-WprEKTCaiMA"/> @@ -660,17 +660,17 @@ return processID;</body> <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> </FCM:DerivedElement> <FCM:Singleton xmi:id="_AdBwIDgvEd-9wq2wHPy3lw" base_Class="_apuYoDNwEd-1k-POY2IaLg"/> - <Cpp:CppInclude xmi:id="_ZWEQwDj0Ed-nsvkE2JvSTg" body="#include <otflib/otf.h>" base_class="_aF1w4DKeEd-WprEKTCaiMA"/> - <Cpp:CppExternClass xmi:id="_ZVArYDj1Ed-nsvkE2JvSTg" name="otflib/OTF_Writer.h" base_class="_W0t44Dj1Ed-nsvkE2JvSTg"/> - <Cpp:CppPtr xmi:id="_9n7OYDj2Ed-nsvkE2JvSTg" base_parameter="_v6J20Dj2Ed-nsvkE2JvSTg"/> + <C_Cpp:Include xmi:id="_ZWEQwDj0Ed-nsvkE2JvSTg" body="#include <otflib/otf.h>" base_class="_aF1w4DKeEd-WprEKTCaiMA"/> + <C_Cpp:ExternClass xmi:id="_ZVArYDj1Ed-nsvkE2JvSTg" name="otflib/OTF_Writer.h" base_class="_W0t44Dj1Ed-nsvkE2JvSTg"/> + <C_Cpp:Ptr xmi:id="_9n7OYDj2Ed-nsvkE2JvSTg" base_parameter="_v6J20Dj2Ed-nsvkE2JvSTg"/> <FCM:DerivedElement xmi:id="_UdG9MD1nEd-Bk-AHd6yyoA" base_Element="_Ucl_0D1nEd-Bk-AHd6yyoA"> <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/> </FCM:DerivedElement> <FCM:DerivedElement xmi:id="_UeZ9sD1nEd-Bk-AHd6yyoA" base_Element="_UdpIsD1nEd-Bk-AHd6yyoA"> <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/> </FCM:DerivedElement> - <Cpp:CppVirtual xmi:id="___fNAD1nEd-Bk-AHd6yyoA" base_operation="_UdpIsD1nEd-Bk-AHd6yyoA"/> - <Cpp:CppVirtual xmi:id="_AHNwMD1pEd-Bk-AHd6yyoA" base_operation="_Ucl_0D1nEd-Bk-AHd6yyoA"/> + <C_Cpp:Virtual xmi:id="___fNAD1nEd-Bk-AHd6yyoA" base_operation="_UdpIsD1nEd-Bk-AHd6yyoA"/> + <C_Cpp:Virtual xmi:id="_AHNwMD1pEd-Bk-AHd6yyoA" base_operation="_Ucl_0D1nEd-Bk-AHd6yyoA"/> <FCM:DerivedElement xmi:id="_Q44J0EI7Ed-BYfDlJlYJUQ" base_Element="_Ucl_0D1nEd-Bk-AHd6yyoA"> <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/> </FCM:DerivedElement> @@ -722,8 +722,8 @@ return processID;</body> <FCM:ContainerRule xmi:id="_ISo6gLdwEd-CtfrGQre34Q" base_Class="_GVZxwLdwEd-CtfrGQre34Q" extensionKind="InterceptAllPorts" interceptor="_35od4DKrEd-z5o2wSoJ16A"> <forConfig href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/> </FCM:ContainerRule> - <Cpp:CppExternClass xmi:id="_AGg3EPT8Ed-jjdbo8hMhwA" name="otflib/OTF_FileManager.h" base_class="_LjsBkDwLEd-CbfVdCYNz6Q"/> - <Cpp:CppInclude xmi:id="_mk_ccD5sEeC-VMxjm_qUAg" body="#include <OS_AL/Sets/SetOf.h>
OS_AL::Sets::SetOf <int> processSet;" base_class="_apuYoDNwEd-1k-POY2IaLg"/> + <C_Cpp:ExternClass xmi:id="_AGg3EPT8Ed-jjdbo8hMhwA" name="otflib/OTF_FileManager.h" base_class="_LjsBkDwLEd-CbfVdCYNz6Q"/> + <C_Cpp:Include xmi:id="_mk_ccD5sEeC-VMxjm_qUAg" body="#include <OS_AL/Sets/SetOf.h>
OS_AL::Sets::SetOf <int> processSet;" base_class="_apuYoDNwEd-1k-POY2IaLg"/> <FCM:ContainerRule xmi:id="_6FqQoKAdEeCF0uoVQbVQRg" base_Class="_wHuA0KAdEeCF0uoVQbVQRg" extensionKind="InterceptAllPorts" interceptor="_JvP0oKAeEeCF0uoVQbVQRg" propagate="true"> <forConfig href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/> </FCM:ContainerRule> @@ -740,13 +740,13 @@ return processID;</body> <forConfig href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/> </FCM:ContainerRule> <FCM:InterceptionRule xmi:id="_m-L0sPwkEeGWn-a9PUOYcA" interceptionKind="InterceptAll" base_Property="_d7If0PwkEeGWn-a9PUOYcA"/> - <Cpp:CppInclude xmi:id="__rP4oPxWEeGOK9t90vpALA" header="[import org::eclipse::papyrus::qompass::modellibs::tracing::acceleo::traceLTTng/]

[template public LTTngTP(clazz : Class)]
[clazz.declareTP()/]
[/template]" base_class="_rGPjgPxWEeGOK9t90vpALA" preBody="#define TRACEPOINT_CREATE_PROBES
#define TRACEPOINT_DEFINE"/> + <C_Cpp:Include xmi:id="__rP4oPxWEeGOK9t90vpALA" header="[import org::eclipse::papyrus::qompass::modellibs::tracing::acceleo::traceLTTng/]

[template public LTTngTP(clazz : Class)]
[clazz.declareTP()/]
[/template]" base_class="_rGPjgPxWEeGOK9t90vpALA" preBody="#define TRACEPOINT_CREATE_PROBES
#define TRACEPOINT_DEFINE"/> <FCM:Template xmi:id="_bKW5IPxXEeGOK9t90vpALA" base_Element="_YU5H4PxXEeGOK9t90vpALA" kind="LoopOperations"/> <FCM:CppLibrary xmi:id="_t_sHUPzOEeGKDvxFM1SZ_g" base_Package="_nAkZEPzOEeGKDvxFM1SZ_g"> <libs>lttng-ust</libs> <libs>dl</libs> </FCM:CppLibrary> - <Cpp:CppExternClass xmi:id="_1PAQ4PzSEeGKDvxFM1SZ_g" name="lttng/tracepoint.h" base_class="_v-VBcPzSEeGKDvxFM1SZ_g"/> + <C_Cpp:ExternClass xmi:id="_1PAQ4PzSEeGKDvxFM1SZ_g" name="lttng/tracepoint.h" base_class="_v-VBcPzSEeGKDvxFM1SZ_g"/> <FCM:Template xmi:id="_flfM8PzhEeGe5LUTfvP5hQ" base_Element="_rGPjgPxWEeGOK9t90vpALA"/> <FCM:InteractionComponent xmi:id="__yL98PzhEeGe5LUTfvP5hQ" base_Class="_pwl_MPxWEeGOK9t90vpALA"/> <Cpp:ManualGeneration xmi:id="_KSTlgCdaEeKGdt7FoegMYA" extensionBody="c" base_Class="_rGPjgPxWEeGOK9t90vpALA"/> @@ -762,10 +762,10 @@ return processID;</body> <FCM:UseInstanceConfigurator xmi:id="_5FYwcC8CEeKwPrQVP28AQw" base_Class="_I2OioPwkEeGWn-a9PUOYcA" configurator="_nTMOYKbnEeC0_qP7CUZIiQ"/> <FCM:UseInstanceConfigurator xmi:id="_gH1RQC8DEeKwPrQVP28AQw" base_Class="_If04ACqLEeKGrchWittz_g" configurator="_nTMOYKbnEeC0_qP7CUZIiQ"/> <FCM:InstanceConfigurator xmi:id="_nUB1YC8HEeKwPrQVP28AQw" base_Class="_nUAnQC8HEeKwPrQVP28AQw"/> - <Cpp:CppInclude xmi:id="_gvf4IDHKEeKt1a2SZnJmwg" header="[import org::eclipse::papyrus::qompass::modellibs::tracing::acceleo::traceLTTng/]

[template public LTTngTP(intf : Interface)]
[intf.declareTP()/]
[/template]" base_class="_gveqADHKEeKt1a2SZnJmwg" preBody="#define TRACEPOINT_CREATE_PROBES
#define TRACEPOINT_DEFINE"/> + <C_Cpp:Include xmi:id="_gvf4IDHKEeKt1a2SZnJmwg" header="[import org::eclipse::papyrus::qompass::modellibs::tracing::acceleo::traceLTTng/]

[template public LTTngTP(intf : Interface)]
[intf.declareTP()/]
[/template]" base_class="_gveqADHKEeKt1a2SZnJmwg" preBody="#define TRACEPOINT_CREATE_PROBES
#define TRACEPOINT_DEFINE"/> <FCM:Template xmi:id="_gvnM4DHKEeKt1a2SZnJmwg" base_Element="_gveqADHKEeKt1a2SZnJmwg"/> <Cpp:ManualGeneration xmi:id="_gvnz8DHKEeKt1a2SZnJmwg" extensionBody="c" base_Class="_gveqADHKEeKt1a2SZnJmwg"/> <Cpp:ManualGeneration xmi:id="_WUbVADV7EeKGAYOVxzQeAg" extensionBody="c" base_Class="_C4FREDV7EeKGAYOVxzQeAg"/> - <Cpp:CppInclude xmi:id="_ZdHkQDV7EeKGAYOVxzQeAg" header="[import org::eclipse::papyrus::qompass::designer::core::acceleo::UMLTool/]
[import org::eclipse::papyrus::qompass::designer::core::acceleo::TransformationContext/]

[template public LTTngTP(cl : Classifier)]
#include <lttng/tracepoint.h>

TRACEPOINT_MODEL_EMF_URI(UMLmodel, starting, "[getSourceRoot().getURI()/]")
[/template]
" base_class="_C4FREDV7EeKGAYOVxzQeAg" preBody=""/> + <C_Cpp:Include xmi:id="_ZdHkQDV7EeKGAYOVxzQeAg" header="[import org::eclipse::papyrus::qompass::designer::core::acceleo::UMLTool/]
[import org::eclipse::papyrus::qompass::designer::core::acceleo::TransformationContext/]

[template public LTTngTP(cl : Classifier)]
#include <lttng/tracepoint.h>

TRACEPOINT_MODEL_EMF_URI(UMLmodel, starting, "[getSourceRoot().getURI()/]")
[/template]
" base_class="_C4FREDV7EeKGAYOVxzQeAg" preBody=""/> <FCM:Template xmi:id="_HOvQ0DWSEeKGAYOVxzQeAg" base_Element="_C4FREDV7EeKGAYOVxzQeAg" kind="PassClassifier"/> </xmi:XMI> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java index 0f0979541f7..9fd96bb8ad0 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java @@ -10,6 +10,9 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.papyrus.FCM.ConfigOption; +import org.eclipse.papyrus.FCM.ContainerRule; +import org.eclipse.papyrus.FCM.RuleApplication; import org.eclipse.papyrus.infra.core.resource.ModelSet; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers; @@ -27,10 +30,6 @@ import org.eclipse.uml2.uml.Operation; import org.eclipse.uml2.uml.Package; import org.eclipse.uml2.uml.Property; -import FCM.ConfigOption; -import FCM.ContainerRule; -import FCM.RuleApplication; - public class QompassTraceMechanism implements ITraceMechanism { public static final String EC3M_TRACING_URI = "pathmap://QML_TRACE/tracing.uml"; diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/tmpModel/ClientServerTraceTestTmp.uml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/tmpModel/ClientServerTraceTestTmp.uml new file mode 100644 index 00000000000..b888cf0b88c --- /dev/null +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/tmpModel/ClientServerTraceTestTmp.uml @@ -0,0 +1,419 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc"> + <uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="ClientServerTraceTest"> + <packageImport xmi:id="_9_R7cJ47EeKx_dvqpam_eQ"> + <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> + </packageImport> + <packageImport xmi:id="_9_R7cZ47EeKx_dvqpam_eQ"> + <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/> + </packageImport> + <packageImport xmi:id="_9_SigJ47EeKx_dvqpam_eQ"> + <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/> + </packageImport> + <packageImport xmi:id="_9_SigZ47EeKx_dvqpam_eQ"> + <importedPackage xmi:type="uml:Model" href="pathmap://QML_DISTRIBUTION/distribution.uml#_O6TiIDLUEd26WNosUASSSw"/> + </packageImport> + <packageImport xmi:id="_9_TJkJ47EeKx_dvqpam_eQ"> + <importedPackage xmi:type="uml:Model" href="pathmap://QML_TRACE/tracing.uml#_H-ZqYDKeEd-WprEKTCaiMA"/> + </packageImport> + <packagedElement xmi:type="uml:Package" xmi:id="_9_UXsJ47EeKx_dvqpam_eQ" name="globalenums"/> + <packagedElement xmi:type="uml:Package" xmi:id="_9_YpIJ47EeKx_dvqpam_eQ" name="deployment"> + <packagedElement xmi:type="uml:Package" xmi:id="_9_YpIZ47EeKx_dvqpam_eQ" name="monolithic"> + <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_9_Z3QJ47EeKx_dvqpam_eQ" clientDependency="_-GqV0J47EeKx_dvqpam_eQ" name="mySystem" classifier="_bYJagDLiEd2RVeNawwNNzg"> + <slot xmi:id="_-G18AJ47EeKx_dvqpam_eQ" definingFeature="_gV1cgDLiEd2RVeNawwNNzg"> + <value xmi:type="uml:InstanceValue" xmi:id="_-G2jEJ47EeKx_dvqpam_eQ" instance="_-GzfwJ47EeKx_dvqpam_eQ"/> + </slot> + <slot xmi:id="_-G4YQJ47EeKx_dvqpam_eQ" definingFeature="_i-I7gDLiEd2RVeNawwNNzg"> + <value xmi:type="uml:InstanceValue" xmi:id="_-G4YQZ47EeKx_dvqpam_eQ" instance="_-G3KIJ47EeKx_dvqpam_eQ"/> + </slot> + <slot xmi:id="_-XSLwJ47EeKx_dvqpam_eQ" definingFeature="p_QO2s0E2rEeGl8qrc8BM7vA"> + <value xmi:type="uml:InstanceValue" xmi:id="_-XSLwZ47EeKx_dvqpam_eQ" instance="_-XQ9oJ47EeKx_dvqpam_eQ"/> + </slot> + </packagedElement> + <packagedElement xmi:type="uml:Abstraction" xmi:id="_-GqV0J47EeKx_dvqpam_eQ" name="allocate mySystem to monoNode" client="_9_Z3QJ47EeKx_dvqpam_eQ" supplier="_gFXHwDeMEeGPyrZ5I3hMlA"/> + <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_-GzfwJ47EeKx_dvqpam_eQ" name="mySystem.server" classifier="_oqZNUDLaEd2qeKRLMdIx_A"/> + <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_-G3KIJ47EeKx_dvqpam_eQ" name="mySystem.client" classifier="_IfjoETLbEd2qeKRLMdIx_A"/> + <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_-XQ9oJ47EeKx_dvqpam_eQ" name="mySystem.qp_connector" classifier="_jOU60A1jEd6tvthBDl600Q"/> + </packagedElement> + </packagedElement> + <packagedElement xmi:type="uml:Package" xmi:id="_9_aeUJ47EeKx_dvqpam_eQ" name="components"> + <packagedElement xmi:type="uml:Package" xmi:id="_9_aeUZ47EeKx_dvqpam_eQ" name="System"> + <packagedElement xmi:type="uml:Class" xmi:id="_bYJagDLiEd2RVeNawwNNzg" name="System_impl"> + <ownedAttribute xmi:id="_gV1cgDLiEd2RVeNawwNNzg" name="server" type="_oqZNUDLaEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/> + <ownedAttribute xmi:id="_i-I7gDLiEd2RVeNawwNNzg" name="client" type="_IfjoETLbEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/> + <ownedAttribute xmi:id="p_QO2s0E2rEeGl8qrc8BM7vA" name="qp_connector" type="_jOU60A1jEd6tvthBDl600Q" aggregation="composite"/> + <ownedConnector xmi:id="_QO2s0E2rEeGl8qrc8BM7vA0" name="c qp_connector 0"> + <end xmi:id="_-XPIcZ47EeKx_dvqpam_eQ" partWithPort="_i-I7gDLiEd2RVeNawwNNzg" role="_DtWn4DLcEd2qeKRLMdIx_A"/> + <end xmi:id="_-XPIcp47EeKx_dvqpam_eQ" partWithPort="p_QO2s0E2rEeGl8qrc8BM7vA" role="_P4xVsNtuEd2eM5kqcby5ZA"/> + </ownedConnector> + <ownedConnector xmi:id="_QO2s0E2rEeGl8qrc8BM7vA1" name="c qp_connector 1"> + <end xmi:id="_-XPvgZ47EeKx_dvqpam_eQ" partWithPort="_gV1cgDLiEd2RVeNawwNNzg" role="_4KiE8DLbEd2qeKRLMdIx_A"/> + <end xmi:id="_-XPvgp47EeKx_dvqpam_eQ" partWithPort="p_QO2s0E2rEeGl8qrc8BM7vA" role="_Qk0jYNtuEd2eM5kqcby5ZA"/> + </ownedConnector> + </packagedElement> + </packagedElement> + <packagedElement xmi:type="uml:Package" xmi:id="_9_bscJ47EeKx_dvqpam_eQ" name="Server"> + <packagedElement xmi:type="uml:Class" xmi:id="_oqZNUDLaEd2qeKRLMdIx_A" clientDependency="_YQqH0JYlEd6G9q9hwr11bw" name="CServer_impl" classifierBehavior="_5Vd9UDclEeKAhIrFXfR8zQ"> + <ownedAttribute xmi:type="uml:Port" xmi:id="_4KiE8DLbEd2qeKRLMdIx_A" name="p" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"/> + <interfaceRealization xmi:id="_YQqH0JYlEd6G9q9hwr11bw" name="derived realization of ICompute" client="_oqZNUDLaEd2qeKRLMdIx_A" supplier="_cn-H0DLbEd2qeKRLMdIx_A" contract="_cn-H0DLbEd2qeKRLMdIx_A"/> + <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_5Vd9UDclEeKAhIrFXfR8zQ" name="ServerStateMachine"> + <region xmi:id="_57WRkDclEeKAhIrFXfR8zQ" name="Region1"> + <transition xmi:id="_8ZB08DclEeKAhIrFXfR8zQ" name="Transition0" source="_66D8kDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/> + <transition xmi:id="_-v4XkDclEeKAhIrFXfR8zQ" name="Transition1" source="_9f6kgDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/> + <subvertex xmi:type="uml:State" xmi:id="_66D8kDclEeKAhIrFXfR8zQ" name="State0"/> + <subvertex xmi:type="uml:Pseudostate" xmi:id="_9f6kgDclEeKAhIrFXfR8zQ" name="Initial0"/> + </region> + </ownedBehavior> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_ML-4AKI5Ed6FqJCjEUrkqQ" name="add" specification="_TbIjUJYlEd6G9q9hwr11bw"> + <language>C/C++</language> + <body>cout << "a=" << a << " b=" << b << " a+b=" << a+b << endl; +return a+b;</body> + </ownedBehavior> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_I1R3YAcDEeGnrLqQ0OQeAg" name="mult" specification="_4ZEZwHecEd6r18stFZxmFQ"> + <language>C/C++</language> + <body>cout << "a*b=" << a*b; +return a*b;</body> + </ownedBehavior> + <ownedOperation xmi:id="_TbIjUJYlEd6G9q9hwr11bw" name="add" method="_ML-4AKI5Ed6FqJCjEUrkqQ"> + <ownedParameter xmi:id="_TbZCAJYlEd6G9q9hwr11bw" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + </ownedParameter> + <ownedParameter xmi:id="_TbdTcJYlEd6G9q9hwr11bw" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + </ownedParameter> + <ownedParameter xmi:id="_TbkoMJYlEd6G9q9hwr11bw" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:id="_4ZEZwHecEd6r18stFZxmFQ" name="mult" method="_I1R3YAcDEeGnrLqQ0OQeAg"> + <ownedParameter xmi:id="_nvpKUDVdEeKoYLVLZgpRiw" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nvup4DVdEeKoYLVLZgpRiw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nvvQ8DVdEeKoYLVLZgpRiw" value="1"/> + </ownedParameter> + <ownedParameter xmi:id="_nvwfEDVdEeKoYLVLZgpRiw" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nvy7UDVdEeKoYLVLZgpRiw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nvziYDVdEeKoYLVLZgpRiw" value="1"/> + </ownedParameter> + <ownedParameter xmi:id="_nv1XkDVdEeKoYLVLZgpRiw" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nv3z0DVdEeKoYLVLZgpRiw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nv4a4DVdEeKoYLVLZgpRiw" value="1"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:id="_rrf74DVdEeKoYLVLZgpRiw" name="check"> + <ownedParameter xmi:id="_4UNv4DVdEeKoYLVLZgpRiw" name="write"> + <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4UO-ADVdEeKoYLVLZgpRiw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4UPlEDVdEeKoYLVLZgpRiw" value="1"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:id="_9OJPEDVkEeKoYLVLZgpRiw" name="testOp"> + <ownedParameter xmi:id="_Br-FQDVlEeKoYLVLZgpRiw" name="testPar"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:id="_6ERa0DW2EeKyT6LlKoWJIA" name="length"> + <ownedParameter xmi:id="_FfLX4DW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FfN0IDW3EeKyT6LlKoWJIA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FfObMDW3EeKyT6LlKoWJIA" value="1"/> + </ownedParameter> + </ownedOperation> + </packagedElement> + </packagedElement> + <packagedElement xmi:type="uml:Package" xmi:id="_9_uAUJ47EeKx_dvqpam_eQ" name="Interfaces"> + <packagedElement xmi:type="uml:Interface" xmi:id="_cn-H0DLbEd2qeKRLMdIx_A" name="ICompute"> + <ownedOperation xmi:id="_DGs6wDLgEd28fJKJJnUaeQ" name="add"> + <ownedParameter xmi:id="_DGs6wTLgEd28fJKJJnUaeQ" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6wzLgEd28fJKJJnUaeQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6wjLgEd28fJKJJnUaeQ" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6xDLgEd28fJKJJnUaeQ"> + <value xsi:nil="true"/> + </defaultValue> + </ownedParameter> + <ownedParameter xmi:id="_DGs6xTLgEd28fJKJJnUaeQ" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6xzLgEd28fJKJJnUaeQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6xjLgEd28fJKJJnUaeQ" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6yDLgEd28fJKJJnUaeQ"> + <value xsi:nil="true"/> + </defaultValue> + </ownedParameter> + <ownedParameter xmi:id="_DGs6yTLgEd28fJKJJnUaeQ" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6yzLgEd28fJKJJnUaeQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6yjLgEd28fJKJJnUaeQ" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6zDLgEd28fJKJJnUaeQ"> + <value xsi:nil="true"/> + </defaultValue> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:id="_L8EY8DLgEd28fJKJJnUaeQ" name="mult" isAbstract="true"> + <ownedParameter xmi:id="_L8EY8TLgEd28fJKJJnUaeQ" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY8zLgEd28fJKJJnUaeQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY8jLgEd28fJKJJnUaeQ" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY9DLgEd28fJKJJnUaeQ"> + <value xsi:nil="true"/> + </defaultValue> + </ownedParameter> + <ownedParameter xmi:id="_L8EY9TLgEd28fJKJJnUaeQ" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY9zLgEd28fJKJJnUaeQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY9jLgEd28fJKJJnUaeQ" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY-DLgEd28fJKJJnUaeQ"> + <value xsi:nil="true"/> + </defaultValue> + </ownedParameter> + <ownedParameter xmi:id="_L8EY-TLgEd28fJKJJnUaeQ" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY-zLgEd28fJKJJnUaeQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY-jLgEd28fJKJJnUaeQ" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY_DLgEd28fJKJJnUaeQ"> + <value xsi:nil="true"/> + </defaultValue> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:id="_rrbqcDVdEeKoYLVLZgpRiw" name="check" isAbstract="true"> + <ownedParameter xmi:id="_0xTp0DVdEeKoYLVLZgpRiw" name="write"> + <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:id="_6DewoDW2EeKyT6LlKoWJIA" name="length"> + <ownedParameter xmi:id="_AP4BcDW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA"/> + </ownedOperation> + </packagedElement> + <packagedElement xmi:type="uml:DataType" xmi:id="_krMkcDW2EeKyT6LlKoWJIA" name="Point"> + <ownedAttribute xmi:id="_m0WCQDW2EeKyT6LlKoWJIA" name="x" visibility="public"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_-5FTMB6REd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pOAoUDW2EeKyT6LlKoWJIA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pOB2cDW2EeKyT6LlKoWJIA" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_pOESsDW2EeKyT6LlKoWJIA"> + <value xsi:nil="true"/> + </defaultValue> + </ownedAttribute> + <ownedAttribute xmi:id="_yJIJMDW2EeKyT6LlKoWJIA" name="y" visibility="public"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_-5FTMB6REd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yd44QDW2EeKyT6LlKoWJIA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yd6GYDW2EeKyT6LlKoWJIA" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_yd77kDW2EeKyT6LlKoWJIA"> + <value xsi:nil="true"/> + </defaultValue> + </ownedAttribute> + </packagedElement> + </packagedElement> + <packagedElement xmi:type="uml:Package" xmi:id="_-C1lwJ47EeKx_dvqpam_eQ" name="Client"> + <packagedElement xmi:type="uml:Class" xmi:id="_IfjoETLbEd2qeKRLMdIx_A" clientDependency="_ZmdDkEdDEeGxo4rn9hBAOQ" name="CClient_impl"> + <generalization xmi:id="_34FjAPx3Ed6O2oOTPfeAMA"> + <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/> + </generalization> + <ownedAttribute xmi:type="uml:Port" xmi:id="_DtWn4DLcEd2qeKRLMdIx_A" name="q" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"/> + <interfaceRealization xmi:id="_ZmdDkEdDEeGxo4rn9hBAOQ" name="derived realization of IStart" client="_IfjoETLbEd2qeKRLMdIx_A"> + <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> + <contract href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> + </interfaceRealization> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yXNVoKF4Ed6FqJCjEUrkqQ" name="run" specification="_ZnGj0EdDEeGxo4rn9hBAOQ"> + <language>C/C++</language> + <body>cout << "call via port q: add (2, 3);" << endl; +for (int i=0; i<20; i++) { + cout << "result: " << q->add (2, (i+3)) << endl; + usleep((i+10)*5*1000); + cout << "result: " << q->mult (3.0, 7.0) << endl; + usleep(20*1000); + testOp(i*2); + usleep(30*1000); +}</body> + </ownedBehavior> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yVALQDclEeKAhIrFXfR8zQ" name="testOp" specification="_Qzp7gDclEeKAhIrFXfR8zQ"> + <language>C/C++</language> + <body>cout << "This is a test operation" << endl;</body> + </ownedBehavior> + <ownedOperation xmi:id="_ZnGj0EdDEeGxo4rn9hBAOQ" name="run" method="_yXNVoKF4Ed6FqJCjEUrkqQ"/> + <ownedOperation xmi:id="_Qzp7gDclEeKAhIrFXfR8zQ" name="testOp" method="_yVALQDclEeKAhIrFXfR8zQ"> + <ownedParameter xmi:id="_rXu4UDc_EeKPle9CbXIcpQ" name="j"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/> + </ownedParameter> + </ownedOperation> + </packagedElement> + </packagedElement> + </packagedElement> + <packagedElement xmi:type="uml:Package" xmi:id="_-GTJcJ47EeKx_dvqpam_eQ" name="platform"> + <packagedElement xmi:type="uml:Package" xmi:id="_-GTJcZ47EeKx_dvqpam_eQ" name="HWArchitectureMonolithicPlatform"> + <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_gFXHwDeMEeGPyrZ5I3hMlA" name="monoNode" classifier="_zY9vMDLiEd2RVeNawwNNzg"/> + </packagedElement> + <packagedElement xmi:type="uml:Node" xmi:id="_zY9vMDLiEd2RVeNawwNNzg" name="MonoNode"/> + </packagedElement> + <packagedElement xmi:type="uml:Package" xmi:id="_-HFMkJ47EeKx_dvqpam_eQ" name="methodCall_ICompute"> + <templateBinding xmi:id="_-HFMkZ47EeKx_dvqpam_eQ"> + <parameterSubstitution xmi:id="_-HFMkp47EeKx_dvqpam_eQ" actual="_cn-H0DLbEd2qeKRLMdIx_A"> + <formal xmi:type="uml:ClassifierTemplateParameter" href="pathmap://QML_CORE/core.uml#_WzWVUPfBEd2TbIfwytOyPA"/> + </parameterSubstitution> + <signature href="pathmap://QML_CORE/core.uml#_V0b2APfBEd2TbIfwytOyPA"/> + </templateBinding> + <packagedElement xmi:type="uml:Package" xmi:id="_-HIP4J47EeKx_dvqpam_eQ" name="SyncCall"> + <packagedElement xmi:type="uml:Class" xmi:id="_jOU60A1jEd6tvthBDl600Q" clientDependency="_1tfFAJyCEd6WR4pSVO_UYw" name="DirectCall_impl"> + <generalization xmi:id="_lm4GkA1jEd6tvthBDl600Q" general="_Zx2ZUA1jEd6tvthBDl600Q"/> + <interfaceRealization xmi:id="_1tfFAJyCEd6WR4pSVO_UYw" name="derived realization of ICompute" client="_jOU60A1jEd6tvthBDl600Q" supplier="_cn-H0DLbEd2qeKRLMdIx_A" contract="_cn-H0DLbEd2qeKRLMdIx_A"/> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_GSdesJ09Ed6l5bTPBsl00Q" name="add" specification="__y0hwJ08Ed6l5bTPBsl00Q"> + <language>C/C++</language> + <body>// put pre-interceptors here +return rconn->add(a, b); +// put post-interceptors here</body> + </ownedBehavior> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_GSdesJ09Ed6l5bTPBsl00Q0" name="mult" specification="__y0hwJ08Ed6l5bTPBsl00Q0"> + <language>C/C++</language> + <body>// put pre-interceptors here +return rconn->mult(a, b); +// put post-interceptors here</body> + </ownedBehavior> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_GSdesJ09Ed6l5bTPBsl00Q1" name="check" specification="__y0hwJ08Ed6l5bTPBsl00Q1"> + <language>C/C++</language> + <body>// put pre-interceptors here +rconn->check(write); +// put post-interceptors here</body> + </ownedBehavior> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_GSdesJ09Ed6l5bTPBsl00Q2" name="length" specification="__y0hwJ08Ed6l5bTPBsl00Q2"> + <language>C/C++</language> + <body>// put pre-interceptors here +rconn->length(p1); +// put post-interceptors here</body> + </ownedBehavior> + <ownedOperation xmi:id="__y0hwJ08Ed6l5bTPBsl00Q" name="add" method="_GSdesJ09Ed6l5bTPBsl00Q"> + <ownedParameter xmi:id="_-Ifh0J47EeKx_dvqpam_eQ" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-Ifh0Z47EeKx_dvqpam_eQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-Ifh0p47EeKx_dvqpam_eQ" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_-Ifh0547EeKx_dvqpam_eQ"> + <value xsi:nil="true"/> + </defaultValue> + </ownedParameter> + <ownedParameter xmi:id="_-IgI4J47EeKx_dvqpam_eQ" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-IgI4Z47EeKx_dvqpam_eQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-IgI4p47EeKx_dvqpam_eQ" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_-IgI4547EeKx_dvqpam_eQ"> + <value xsi:nil="true"/> + </defaultValue> + </ownedParameter> + <ownedParameter xmi:id="_-Igv8J47EeKx_dvqpam_eQ" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-Igv8Z47EeKx_dvqpam_eQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-Igv8p47EeKx_dvqpam_eQ" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_-Igv8547EeKx_dvqpam_eQ"> + <value xsi:nil="true"/> + </defaultValue> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:id="__y0hwJ08Ed6l5bTPBsl00Q0" name="mult" method="_GSdesJ09Ed6l5bTPBsl00Q0"> + <ownedParameter xmi:id="_-UeIUJ47EeKx_dvqpam_eQ" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-UeIUZ47EeKx_dvqpam_eQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-UeIUp47EeKx_dvqpam_eQ" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_-UeIU547EeKx_dvqpam_eQ"> + <value xsi:nil="true"/> + </defaultValue> + </ownedParameter> + <ownedParameter xmi:id="_-UeIVJ47EeKx_dvqpam_eQ" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-UeIVZ47EeKx_dvqpam_eQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-UeIVp47EeKx_dvqpam_eQ" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_-UeIV547EeKx_dvqpam_eQ"> + <value xsi:nil="true"/> + </defaultValue> + </ownedParameter> + <ownedParameter xmi:id="_-UevYJ47EeKx_dvqpam_eQ" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-UevYZ47EeKx_dvqpam_eQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-UevYp47EeKx_dvqpam_eQ" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_-UevY547EeKx_dvqpam_eQ"> + <value xsi:nil="true"/> + </defaultValue> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:id="__y0hwJ08Ed6l5bTPBsl00Q1" name="check" method="_GSdesJ09Ed6l5bTPBsl00Q1"> + <ownedParameter xmi:id="_-VjtcJ47EeKx_dvqpam_eQ" name="write"> + <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:id="__y0hwJ08Ed6l5bTPBsl00Q2" name="length" method="_GSdesJ09Ed6l5bTPBsl00Q2"> + <ownedParameter xmi:id="_-WeTcJ47EeKx_dvqpam_eQ" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA"/> + </ownedOperation> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_Zx2ZUA1jEd6tvthBDl600Q" name="SyncCall" isAbstract="true"> + <generalization xmi:id="_STdvYDBFEd6V16eboHV1gw" general="_j29X4NttEd2eM5kqcby5ZA"/> + <generalization xmi:id="_T1zr4DBFEd6V16eboHV1gw" general="_mIpj8Ns8Ed2eM5kqcby5ZA"/> + </packagedElement> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_j29X4NttEd2eM5kqcby5ZA" name="OPC_useI" isAbstract="true"> + <ownedAttribute xmi:type="uml:Port" xmi:id="_P4xVsNtuEd2eM5kqcby5ZA" name="fconn" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"/> + </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_mIpj8Ns8Ed2eM5kqcby5ZA" name="OPC_provideI" isAbstract="true"> + <ownedAttribute xmi:type="uml:Port" xmi:id="_Qk0jYNtuEd2eM5kqcby5ZA" name="rconn" visibility="public" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rftH8ENwEeGoAtSeIK7WLg" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rfxZYENwEeGoAtSeIK7WLg" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_rf3gAENwEeGoAtSeIK7WLg"> + <value xsi:nil="true"/> + </defaultValue> + </ownedAttribute> + </packagedElement> + </packagedElement> + <profileApplication xmi:id="_99LpsJ47EeKx_dvqpam_eQ"> + <eAnnotations xmi:id="_99PUEJ47EeKx_dvqpam_eQ" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/> + </eAnnotations> + <appliedProfile href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/> + </profileApplication> + <profileApplication xmi:id="_99bhUJ47EeKx_dvqpam_eQ"> + <eAnnotations xmi:id="_99bhUZ47EeKx_dvqpam_eQ" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> + </eAnnotations> + <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> + </profileApplication> + <profileApplication xmi:id="_99l5YJ47EeKx_dvqpam_eQ"> + <eAnnotations xmi:id="_99mgcJ47EeKx_dvqpam_eQ" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/> + </eAnnotations> + <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> + </profileApplication> + <profileApplication xmi:id="_9_RUYJ47EeKx_dvqpam_eQ"> + <eAnnotations xmi:id="_9_RUYZ47EeKx_dvqpam_eQ" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/> + </eAnnotations> + <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/> + </profileApplication> + </uml:Model> + <FCM:RuleApplication xmi:id="_9_kPUJ47EeKx_dvqpam_eQ" base_Class="_oqZNUDLaEd2qeKRLMdIx_A"> + <containerRule href="pathmap://QML_TRACE/tracing.uml#_RWQC8PwkEeGWn-a9PUOYcA"/> + <containerRule href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/> + </FCM:RuleApplication> + <C_Cpp:Include xmi:id="_9_q9AJ47EeKx_dvqpam_eQ" body="#include <iostream>
using namespace std;" base_class="_oqZNUDLaEd2qeKRLMdIx_A"/> + <FCM:Port xmi:id="_-ARZ8J47EeKx_dvqpam_eQ" base_Port="_4KiE8DLbEd2qeKRLMdIx_A"> + <kind href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/> + </FCM:Port> + <C_Cpp:Include xmi:id="_-C86gJ47EeKx_dvqpam_eQ" body="#include <unistd.h>
#include <iostream>
using namespace std;" base_class="_IfjoETLbEd2qeKRLMdIx_A"/> + <FCM:RuleApplication xmi:id="_-DIgsJ47EeKx_dvqpam_eQ" base_Class="_IfjoETLbEd2qeKRLMdIx_A"> + <containerRule href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/> + </FCM:RuleApplication> + <FCM:Port xmi:id="_-EGxEJ47EeKx_dvqpam_eQ" base_Port="_DtWn4DLcEd2qeKRLMdIx_A"> + <kind href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/> + </FCM:Port> + <FCM:Target xmi:id="_-GevoJ47EeKx_dvqpam_eQ" base_Node="_zY9vMDLiEd2RVeNawwNNzg"> + <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/> + <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/> + </FCM:Target> + <Alloc:Allocate xmi:id="_-GxqkJ47EeKx_dvqpam_eQ" base_Abstraction="_-GqV0J47EeKx_dvqpam_eQ"/> + <FCM:InteractionComponent xmi:id="_-HNIYJ47EeKx_dvqpam_eQ" base_Class="_jOU60A1jEd6tvthBDl600Q"/> + <FCM:InteractionComponent xmi:id="_-HYukJ47EeKx_dvqpam_eQ" base_Class="_Zx2ZUA1jEd6tvthBDl600Q"/> + <FCM:Port xmi:id="_-HhRcJ47EeKx_dvqpam_eQ" base_Port="_P4xVsNtuEd2eM5kqcby5ZA" conjugated="true"> + <kind href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/> + </FCM:Port> + <FCM:Port xmi:id="_-HxJEJ47EeKx_dvqpam_eQ" base_Port="_Qk0jYNtuEd2eM5kqcby5ZA" conjugated="true"> + <kind href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/> + </FCM:Port> + <FCM:Template xmi:id="_-IcegJ47EeKx_dvqpam_eQ" base_Element="__y0hwJ08Ed6l5bTPBsl00Q" kind="LoopOperations"/> + <FCM:Template xmi:id="_-UbsEJ47EeKx_dvqpam_eQ" base_Element="__y0hwJ08Ed6l5bTPBsl00Q0" kind="LoopOperations"/> + <FCM:Template xmi:id="_-VifUJ47EeKx_dvqpam_eQ" base_Element="__y0hwJ08Ed6l5bTPBsl00Q1" kind="LoopOperations"/> + <FCM:Template xmi:id="_-WdFUJ47EeKx_dvqpam_eQ" base_Element="__y0hwJ08Ed6l5bTPBsl00Q2" kind="LoopOperations"/> +</xmi:XMI> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF index 12d7c11bafb..b8345d31eea 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF @@ -16,7 +16,9 @@ Require-Bundle: org.eclipse.ui, org.eclipse.emf.transaction;bundle-version="1.4.0", org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1", org.eclipse.gmf.runtime.common.ui;bundle-version="1.5.0", - org.eclipse.ui.ide;bundle-version="3.8.100" + org.eclipse.ui.ide;bundle-version="3.8.100", + org.eclipse.papyrus.infra.services.markerlistener;bundle-version="0.10.0", + org.eclipse.papyrus.infra.services.decoration;bundle-version="0.10.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %pluginProvider diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TracepointView.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TracepointView.java index ace3d79213b..2582901b04c 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TracepointView.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TracepointView.java @@ -52,6 +52,7 @@ import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; +import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker; import org.eclipse.papyrus.infra.services.tracepoints.MarkerUtils; import org.eclipse.papyrus.infra.services.tracepoints.TraceFunctions; import org.eclipse.papyrus.infra.services.tracepoints.TraceState; @@ -173,8 +174,8 @@ public class TracepointView extends ViewPart implements ISelectionListener { if(TraceState.skipAllTracepoints) { return TraceViewImages.getSkipAllImage(); } - if(obj instanceof IMarker) { - IMarker marker = (IMarker)obj; + if(obj instanceof IPapyrusMarker) { + IPapyrusMarker marker = (IPapyrusMarker)obj; ImageDescriptor id = traceImage.getImageDescriptorForGE(marker); if(id != null) { // TODO: leaks! |