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;