From 3e2bf7f6dab3baa0b074ce1a613f1077613b7a13 Mon Sep 17 00:00:00 2001 From: Ansgar Radermacher Date: Tue, 8 Oct 2013 14:31:03 +0200 Subject: Minor modifications --- .../.project | 12 + .../META-INF/MANIFEST.MF | 5 +- .../build.acceleo | 2 +- .../models/examples/ClientServerTraceTest.uml | 48 ++- .../models/library/tracing.uml | 6 +- .../modellibs/tracing/IConfiguratorTrace.java | 6 +- .../modellibs/tracing/QompassTraceMechanism.java | 4 +- .../tmpModel/ClientServerTraceTestTmp.uml | 419 --------------------- 8 files changed, 55 insertions(+), 447 deletions(-) delete mode 100644 extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/tmpModel/ClientServerTraceTestTmp.uml (limited to 'extraplugins') diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.project b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.project index 479dbc2ed05..925f0e2e2e5 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.project +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.project @@ -18,6 +18,18 @@ org.eclipse.acceleo.ide.ui.acceleoBuilder + + compilation.kind + compilation.absolute.path + + + compliance + pragmatic + + + resource.kind + xmi + diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF index c04ff2ced52..430b4df89c8 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Require-Bundle: org.eclipse.papyrus.fcm.profile;bundle-version="0.10.1", org.eclipse.papyrus.infra.services.tracepoints;bundle-version="0.10.1", org.eclipse.papyrus.infra.core;bundle-version="0.10.1", org.eclipse.emf.workspace;bundle-version="1.5.0", - org.eclipse.uml2.uml;bundle-version="4.0.0" + org.eclipse.uml2.uml;bundle-version="4.0.0", + org.eclipse.papyrus.uml.tools.utils;bundle-version="0.10.1" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 0.10.1.qualifier @@ -19,4 +20,6 @@ Bundle-Activator: org.eclipse.papyrus.qompass.modellibs.tracing.Activa Bundle-SymbolicName: org.eclipse.papyrus.qompass.modellibs.tracing;sin gleton:=true Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Export-Package: org.eclipse.papyrus.qompass.modellibs.tracing, + org.eclipse.papyrus.qompass.modellibs.tracing.acceleo 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 97fc11e5ffc..1c1f9fc8242 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 @@ 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 dad9d54ae44..9d6b03fb1c4 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 @@ -22,11 +22,41 @@ + + + + + + + + + + + + + + + C/C++ cout << "a=" << a << " b=" << b << " a+b=" << a+b << endl; return a+b; + + + + + + + + + + + + + + + C/C++ cout << "a*b=" << a*b; return a*b; @@ -97,25 +127,16 @@ return a*b; - - - - - - - - - @@ -123,25 +144,16 @@ return a*b; - - - - - - - - - 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 cb834e5d419..e6a6c6d5982 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 @@ -661,7 +661,7 @@ return processID; - + @@ -722,7 +722,7 @@ return processID; - + @@ -746,7 +746,7 @@ return processID; lttng-ust dl - + diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java index 9e33f4bda66..7c76623710f 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java @@ -9,9 +9,9 @@ import org.eclipse.uml2.uml.Property; public class IConfiguratorTrace implements IInstanceConfigurator { - static final String PROP_PORT_NAME = "portName"; + static final String PROP_PORT_NAME = "portName"; //$NON-NLS-1$ - static final String PROP_INSTANCE_NAME = "instanceName"; + static final String PROP_INSTANCE_NAME = "instanceName"; //$NON-NLS-1$ /** * Configure the passed trace instance @@ -22,7 +22,7 @@ public class IConfiguratorTrace implements IInstanceConfigurator { // The tracing code needs informations about the component instance and port. String instanceName = instance.getName(); - int index = instanceName.lastIndexOf("."); + int index = instanceName.lastIndexOf("."); //$NON-NLS-1$ if(index != -1) { String lastSegment = instanceName.substring(index + 1); if(lastSegment.startsWith(ContainerTrafo.interceptorName)) { 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 c299e89e3de..e9593ba3cd2 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 @@ -23,7 +23,7 @@ import org.eclipse.papyrus.infra.services.tracepoints.TraceActions.TAOperation; import org.eclipse.papyrus.infra.services.tracepoints.TracepointConstants; import org.eclipse.papyrus.qompass.designer.core.Description; import org.eclipse.papyrus.qompass.designer.core.Log; -import org.eclipse.papyrus.qompass.designer.core.StUtils; +import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.papyrus.qompass.designer.core.Utils; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Element; @@ -88,7 +88,7 @@ public class QompassTraceMechanism implements ITraceMechanism { if(traceOption == TAOperation.OnlyCall.ordinal()) { // yes => what do we then (i.e. how is mapping done??) } - RuleApplication ruleApplication = StUtils.applyApp(clazzContext, RuleApplication.class); + RuleApplication ruleApplication = StereotypeUtil.applyApp(clazzContext, RuleApplication.class); if((ruleApplication != null) && !ruleApplication.getContainerRule().contains(containerRule)) { ruleApplication.getContainerRule().add(containerRule); return true; 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 deleted file mode 100644 index b888cf0b88c..00000000000 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/tmpModel/ClientServerTraceTestTmp.uml +++ /dev/null @@ -1,419 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - C/C++ - cout << "a=" << a << " b=" << b << " a+b=" << a+b << endl; -return a+b; - - - C/C++ - cout << "a*b=" << a*b; -return a*b; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - C/C++ - 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); -} - - - C/C++ - cout << "This is a test operation" << endl; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - C/C++ - // put pre-interceptors here -return rconn->add(a, b); -// put post-interceptors here - - - C/C++ - // put pre-interceptors here -return rconn->mult(a, b); -// put post-interceptors here - - - C/C++ - // put pre-interceptors here -rconn->check(write); -// put post-interceptors here - - - C/C++ - // put pre-interceptors here -rconn->length(p1); -// put post-interceptors here - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3