Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-10-18 12:14:37 -0400
committerHenrik Rentz-Reichert2012-10-18 12:14:37 -0400
commit6a8513d65f6b9f5121d1238cc76c8561faf23e18 (patch)
tree20829401ac301cf3e71bb5393ccc5f859062be4c
parente613ea025dd336e90a8f6c2b0809461f97b0cfcf (diff)
downloadorg.eclipse.etrice-6a8513d65f6b9f5121d1238cc76c8561faf23e18.tar.gz
org.eclipse.etrice-6a8513d65f6b9f5121d1238cc76c8561faf23e18.tar.xz
org.eclipse.etrice-6a8513d65f6b9f5121d1238cc76c8561faf23e18.zip
[integration.tests] removed project superseded by new generator.*.tests
-rw-r--r--tests/org.eclipse.etrice.integration.tests/.classpath11
-rw-r--r--tests/org.eclipse.etrice.integration.tests/.gitignore2
-rw-r--r--tests/org.eclipse.etrice.integration.tests/.settings/org.eclipse.jdt.core.prefs81
-rw-r--r--tests/org.eclipse.etrice.integration.tests/about.html28
-rw-r--r--tests/org.eclipse.etrice.integration.tests/buckminster.cspec12
-rw-r--r--tests/org.eclipse.etrice.integration.tests/build.properties4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/gen_org.eclipse.etrice.integration.tests.launch14
-rw-r--r--tests/org.eclipse.etrice.integration.tests/generate.xml49
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPTest_Top.structure88
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPTester.behavior87
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPTester.structure35
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPUser.behavior610
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPUser.structure35
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.SubSystem_CPTest.structure37
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerTest_Top.structure89
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerUser.behavior826
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerUser.structure36
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.SubSystem_HandlerTest.structure38
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.Tester.structure36
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.SendingDataByValueTest.MrPing.behavior459
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ChoicePointTest.room263
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.config101
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.room259
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.HandlerTest.room369
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTest.room161
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room132
-rw-r--r--tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.SendingDataByValueTest.room306
-rw-r--r--tests/org.eclipse.etrice.integration.tests/org.eclipse.etrice.integration.tests.launch19
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTest_Top.java77
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java212
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java465
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/SubSystem_CPTest.java127
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/SubSystem_CPTestRunner.java24
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/TestProtocol.java225
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/AC1_ac.java197
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/ConfigText_Top_ac.java77
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/DynTestee_ac.java363
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Dyn_DC1.java69
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Dyn_DC2.java54
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/PortProtocol.java296
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTest.java195
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestRunner.java24
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java204
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/TestCommProtocol.java186
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Testee_ac.java482
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerTest_Top.java77
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java793
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTest.java127
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTestRunner.java24
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/TestProtocol.java238
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java224
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java303
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java210
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java217
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongProtocol.java186
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongTop.java77
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPong.java222
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPongRunner.java24
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java291
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java210
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongProtocol.java186
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongTop.java77
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPort.java214
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPortRunner.java24
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java553
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java243
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongData.java127
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongDataDeep.java108
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongProtocol.java218
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SendingDataTop.java77
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SubSys_SendingData.java127
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SubSys_SendingDataRunner.java24
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/readme.txt4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java55
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestConfigTest.java56
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java55
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java53
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThreadReplPort.java53
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java53
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/base/IntegrationTestBase.java26
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/helpers/CRC16Generator.java39
-rw-r--r--tests/org.eclipse.etrice.integration.tests/tmp/log/.gitignore2
-rw-r--r--tests/org.eclipse.etrice.integration.tests/tmp/subSystemConfigTest13
83 files changed, 0 insertions, 13074 deletions
diff --git a/tests/org.eclipse.etrice.integration.tests/.classpath b/tests/org.eclipse.etrice.integration.tests/.classpath
deleted file mode 100644
index 4b8228201..000000000
--- a/tests/org.eclipse.etrice.integration.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.runtime.java"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.etrice.modellib.java"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.etrice.integration.tests/.gitignore b/tests/org.eclipse.etrice.integration.tests/.gitignore
deleted file mode 100644
index fb250f6fe..000000000
--- a/tests/org.eclipse.etrice.integration.tests/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-tmp/*.etu
diff --git a/tests/org.eclipse.etrice.integration.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.etrice.integration.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 271c85e31..000000000
--- a/tests/org.eclipse.etrice.integration.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,81 +0,0 @@
-#Mon Sep 19 09:34:24 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/org.eclipse.etrice.integration.tests/about.html b/tests/org.eclipse.etrice.integration.tests/about.html
deleted file mode 100644
index f47dbddbb..000000000
--- a/tests/org.eclipse.etrice.integration.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.integration.tests/buckminster.cspec b/tests/org.eclipse.etrice.integration.tests/buckminster.cspec
deleted file mode 100644
index ccd4a5fb7..000000000
--- a/tests/org.eclipse.etrice.integration.tests/buckminster.cspec
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.integration.tests" componentType="buckminster" version="1.0.0">
- <cs:actions>
- <cs:public name="generate" actor="ant">
- <cs:actorProperties>
- <cs:property key="buildFile" value="generate.xml"/>
- <cs:property key="target.platform" value="${WORKSPACE}/buildroot/target.platform"/>
- <cs:property key="targets" value="generate"/>
- </cs:actorProperties>
- </cs:public>
- </cs:actions>
-</cs:cspec>
diff --git a/tests/org.eclipse.etrice.integration.tests/build.properties b/tests/org.eclipse.etrice.integration.tests/build.properties
deleted file mode 100644
index 2d6ac57da..000000000
--- a/tests/org.eclipse.etrice.integration.tests/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/,\
- src-gen/
-bin.includes = META-INF/,\
- .
diff --git a/tests/org.eclipse.etrice.integration.tests/gen_org.eclipse.etrice.integration.tests.launch b/tests/org.eclipse.etrice.integration.tests/gen_org.eclipse.etrice.integration.tests.launch
deleted file mode 100644
index c703f8ae9..000000000
--- a/tests/org.eclipse.etrice.integration.tests/gen_org.eclipse.etrice.integration.tests.launch
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/Main.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.etrice.generator.java.Main"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="${workspace_loc:org.eclipse.etrice.integration.tests}\model\org.eclipse.etrice.integration.ChoicePointTest.room&#13;&#10;${workspace_loc:org.eclipse.etrice.integration.tests}\model\org.eclipse.etrice.integration.ConfigTest.room&#13;&#10;${workspace_loc:org.eclipse.etrice.integration.tests}\model\org.eclipse.etrice.integration.ConfigTest.config&#13;&#10;${workspace_loc:org.eclipse.etrice.integration.tests}\model\org.eclipse.etrice.integration.HandlerTest.room&#13;&#10;${workspace_loc:org.eclipse.etrice.integration.tests}\model\org.eclipse.etrice.integration.PingPongThreadTest.room&#13;&#10;${workspace_loc:org.eclipse.etrice.integration.tests}\model\org.eclipse.etrice.integration.PingPongThreadTestReplPort.room&#13;&#10;${workspace_loc:org.eclipse.etrice.integration.tests}\model\org.eclipse.etrice.integration.SendingDataByValueTest.room&#13;&#10;${workspace_loc:org.eclipse.etrice.modellib.java}\models\TimingService.room"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.generator.java"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:org.eclipse.etrice.integration.tests}"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.etrice.integration.tests/generate.xml b/tests/org.eclipse.etrice.integration.tests/generate.xml
deleted file mode 100644
index 19ede9f33..000000000
--- a/tests/org.eclipse.etrice.integration.tests/generate.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<project name="project">
-
- <target name="set_tp" unless="target.platform">
- <echo>using local target platform</echo>
- <property name="target.platform" value="C:\Users\hrentz\Downloads\eclipse\Juno\eclipse-modeling-juno-win32\eclipse"/>
- <property name="integration.model.path" value="./model"/>
- </target>
-
- <target name="generate" depends="set_tp">
- <path id="clspath">
- <pathelement location="../../plugins/org.eclipse.etrice.generator.java/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.generator.doc/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.generator/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.core.genmodel/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.core.room/bin"/>
- <pathelement location="../../plugins/org.eclipse.etrice.core.config/bin"/>
- <fileset dir="${target.platform}/plugins/">
- <include name="org.eclipse.emf.ecore_2.8*.jar" />
- <include name="org.eclipse.emf.common_2.8*.jar" />
- <include name="org.eclipse.emf.ecore.xmi_2.8*.jar" />
- <include name="org.eclipse.xtext_2.*.jar" />
- <include name="com.google.inject_*.jar" />
- <include name="com.google.guava_10.*.jar" />
- <include name="org.eclipse.equinox.common_3.6.*.jar" />
- <include name="org.eclipse.xtext.util_2.*.jar" />
- <include name="org.eclipse.xtend.lib_2.*.jar" />
- <include name="org.eclipse.xtext.xbase.lib_2.*.jar" />
- <include name="org.apache.log4j_1.2*.jar" />
- <include name="org.antlr.runtime_3.2*.jar" />
- <include name="javax.inject_1.0*.jar" />
- </fileset>
- </path>
-
- <java output="generator_output.txt" classname="org.eclipse.etrice.generator.java.Main">
- <arg value="${integration.model.path}/org.eclipse.etrice.integration.ChoicePointTest.room"/>
- <arg value="${integration.model.path}/org.eclipse.etrice.integration.HandlerTest.room"/>
- <arg value="${integration.model.path}/org.eclipse.etrice.integration.PingPongThreadTest.room"/>
- <arg value="${integration.model.path}/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room"/>
- <arg value="${integration.model.path}/org.eclipse.etrice.integration.SendingDataByValueTest.room"/>
- <arg value="${integration.model.path}/org.eclipse.etrice.integration.ConfigTest.room"/>
- <arg value="${integration.model.path}/org.eclipse.etrice.integration.ConfigTest.config"/>
- <arg value="${integration.model.path}/org.eclipse.etrice.integration.tests.room"/>
- <arg value="-noexit"/>
- <classpath refid="clspath"/>
- </java>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPTest_Top.structure b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPTest_Top.structure
deleted file mode 100644
index af8ba9cfa..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPTest_Top.structure
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.structure" name="Structure of CPTest_Top" snapToGrid="true" showGuides="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.0/@children.1/@link //@children.0/@children.1/@link //@children.0/@children.1/@children.1/@link //@connections.0/@link" version="0.9.0">
- <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ActorClass:CPTest_Top"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="cls"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="820" height="320" x="40" y="40">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.0" width="740" height="240" x="40" y="40"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ActorClass:CPTest_Top"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="ref"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="220" height="120" x="120" y="90">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="180" height="80" x="20" y="20">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="20" height="10" x="150" y="50"/>
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="20" height="10" x="145" y="65"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ActorRef:CPTest_Top$cp_tester"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" referencedGraphicsAlgorithm="//@children.0/@children.0/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="180" height="80" x="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="cp_tester&#xA;(CPTester)"/>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="port"/>
- <properties key="item-kind" value="C"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="40" height="40" x="180" y="40">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="20" height="20" x="10" y="10"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#Port:CPTester$TestPort1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0" referencedGraphicsAlgorithm="//@children.0/@children.0/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="40" height="10" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_RIGHT" value="TestPort1"/>
- </children>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="ref"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="220" height="120" x="460" y="90">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="180" height="80" x="20" y="20">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="20" height="10" x="150" y="50"/>
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="20" height="10" x="145" y="65"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ActorRef:CPTest_Top$cp_user"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" referencedGraphicsAlgorithm="//@children.0/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="180" height="80" x="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="cp_user&#xA;(CPUser)"/>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="port"/>
- <properties key="item-kind" value=""/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="40" height="40" y="40">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="20" height="20" x="10" y="10"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#Port:CPUser$TestPort1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0" referencedGraphicsAlgorithm="//@children.0/@children.1/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="40" height="10" y="30" font="//@fonts.0" value="TestPort1"/>
- </children>
- </children>
- </children>
- </children>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.0/@children.1/@anchors.0" end="//@children.0/@children.1/@children.1/@anchors.0">
- <properties key="obj-type" value="bind"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#Binding:CPTest_Top$TestPort1!cp_tester-TestPort1!cp_user"/>
- </link>
- </connections>
- <colors red="227" green="238" blue="249"/>
- <colors red="255" green="255" blue="255"/>
- <colors/>
- <colors red="200" green="200" blue="200"/>
- <fonts name="Arial" size="8"/>
-</pi:Diagram>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPTester.behavior b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPTester.behavior
deleted file mode 100644
index c90f49cf9..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPTester.behavior
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.behavior" name="Behavior of CPTester" pictogramLinks="//@link //@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@connections.0/@link" verticalGridUnit="10" version="0.9.0">
- <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ActorClass:CPTester"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="sg"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#StateGraph:CPTester$sg"/>
- </link>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="800" height="80" y="40" font="//@fonts.1" horizontalAlignment="ALIGNMENT_RIGHT" verticalAlignment="ALIGNMENT_TOP" value="/"/>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="40" height="40" x="100" y="100">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="10" y="10"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#StateGraph:CPTester$sg"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0" referencedGraphicsAlgorithm="//@children.0/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="40" height="20" y="10" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="I"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="340" y="120">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#SimpleState:CPTester$state0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0" referencedGraphicsAlgorithm="//@children.0/@children.2/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state0"/>
- </children>
- </children>
- </children>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.1/@anchors.0" end="//@children.0/@children.2/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#InitialTransition:CPTester$initial"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="init"/>
- </connectionDecorators>
- </connections>
- <colors red="227" green="238" blue="249"/>
- <colors red="255" green="255" blue="255"/>
- <colors/>
- <colors red="200" green="200" blue="200"/>
- <fonts name="Arial" size="8"/>
- <fonts name="Arial" size="9" bold="true"/>
-</pi:Diagram>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPTester.structure b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPTester.structure
deleted file mode 100644
index 036968b8a..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPTester.structure
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.structure" name="Structure of CPTester" snapToGrid="true" showGuides="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link">
- <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ActorClass:CPTester"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="cls"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="621" height="400" x="40" y="60">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.0" width="541" height="320" x="40" y="40"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ActorClass:CPTester"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="port"/>
- <properties key="item-kind" value="C"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="270">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="40" height="40" x="20" y="20"/>
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.2" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#Port:CPTester$TestPort1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" referencedGraphicsAlgorithm="//@children.0/@children.0/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="80" height="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="TestPort1"/>
- </children>
- </children>
- </children>
- <colors red="227" green="238" blue="249"/>
- <colors red="255" green="255" blue="255"/>
- <colors/>
- <fonts name="Arial" size="8"/>
-</pi:Diagram>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPUser.behavior b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPUser.behavior
deleted file mode 100644
index 390dcfcb5..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPUser.behavior
+++ /dev/null
@@ -1,610 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.behavior" name="Behavior of CPUser" pictogramLinks="//@link //@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.3/@link //@children.0/@children.4/@link //@children.0/@children.5/@link //@children.0/@children.6/@link //@children.0/@children.7/@link //@children.0/@children.8/@link //@children.0/@children.9/@link //@children.1/@link //@children.1/@children.1/@link //@children.1/@children.2/@link //@children.0/@children.4/@children.1/@link //@children.1/@children.3/@link //@children.1/@children.4/@link //@connections.0/@link //@connections.1/@link //@connections.2/@link //@connections.3/@link //@connections.4/@link //@connections.5/@link //@connections.6/@link //@connections.7/@link //@connections.8/@link //@connections.9/@link //@connections.10/@link //@connections.11/@link //@connections.12/@link //@connections.13/@link //@connections.14/@link //@connections.15/@link" verticalGridUnit="10" version="0.9.0">
- <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ActorClass:CPUser"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="sg"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#StateGraph:CPUser$sg"/>
- </link>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="800" height="80" y="40" font="//@fonts.1" horizontalAlignment="ALIGNMENT_RIGHT" verticalAlignment="ALIGNMENT_TOP" value="/"/>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="40" height="40" x="100" y="100">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="10" y="10"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#StateGraph:CPUser$sg"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4" referencedGraphicsAlgorithm="//@children.0/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="40" height="20" y="10" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="I"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <properties key="item-kind" value="htp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="318">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#TransitionPoint:CPUser$tp0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.15" incomingConnections="//@connections.15"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp0"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="233" y="216">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#SimpleState:CPUser$state0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.7" incomingConnections="//@connections.5 //@connections.6 //@connections.8 //@connections.14" referencedGraphicsAlgorithm="//@children.0/@children.3/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state0"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="321" height="139" x="286" y="381">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="261" height="79" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" width="15" height="8" x="236" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="130" y="73">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="130" y="73">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="130" y="73">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#SimpleState:CPUser$state1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.10 //@connections.14" incomingConnections="//@connections.13" referencedGraphicsAlgorithm="//@children.0/@children.4/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="261" height="79" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state1"/>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <properties key="item-kind" value="entp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="60" height="60" x="117">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="11" height="11" x="25" y="25"/>
- <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0">
- <points x="27" y="33"/>
- <points x="33" y="27"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0">
- <points x="27" y="27"/>
- <points x="33" y="33"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#EntryPoint:CPUser$state1$tp0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.9" referencedGraphicsAlgorithm="//@children.0/@children.4/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="22" font="//@fonts.0" verticalAlignment="ALIGNMENT_BOTTOM" value="tp0"/>
- </children>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="464" y="63">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#SimpleState:CPUser$testOk"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.12" referencedGraphicsAlgorithm="//@children.0/@children.5/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="testOk"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="124" height="90" x="648" y="63">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="64" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="39" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="32" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="32" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="32" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#SimpleState:CPUser$testFalse"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.11" referencedGraphicsAlgorithm="//@children.0/@children.6/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="64" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="testFalse"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="50" height="50" x="187" y="110">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="25" height="25" x="12" y="12"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ChoicePoint:CPUser$cp0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.5 //@connections.6" incomingConnections="//@connections.4"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="50" height="25" y="12" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="C"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="50" height="50" x="375" y="265">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="25" height="25" x="12" y="12"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ChoicePoint:CPUser$cp1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.8 //@connections.9 //@connections.13" incomingConnections="//@connections.7"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="50" height="25" y="12" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="C"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="50" height="50" x="575" y="265">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="25" height="25" x="12" y="12"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ChoicePoint:CPUser$cp2"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.11 //@connections.12" incomingConnections="//@connections.10"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="50" height="25" y="12" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="C"/>
- </children>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="sg"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#StateGraph:CPUser$state1$sg"/>
- </link>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="800" height="80" y="40" font="//@fonts.1" horizontalAlignment="ALIGNMENT_RIGHT" verticalAlignment="ALIGNMENT_TOP" value="/state1"/>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="40" height="40" x="100" y="100">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="10" y="10"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#StateGraph:CPUser$state1$sg"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3" referencedGraphicsAlgorithm="//@children.1/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="40" height="20" y="10" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="I"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="trp"/>
- <properties key="item-kind" value="entp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="360">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
- <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="2" filled="false" transparency="0.0">
- <points x="33" y="47"/>
- <points x="47" y="33"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="2" filled="false" transparency="0.0">
- <points x="33" y="33"/>
- <points x="47" y="47"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#EntryPoint:CPUser$state1$tp0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp0"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="240" y="290">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#SimpleState:CPUser$state1$state0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1 //@connections.2 //@connections.3" referencedGraphicsAlgorithm="//@children.1/@children.3/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state0"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="50" height="50" x="375" y="265">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="25" height="25" x="12" y="12"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ChoicePoint:CPUser$state1$cp0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1 //@connections.2" incomingConnections="//@connections.0"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="50" height="25" y="12" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="C"/>
- </children>
- </children>
- </children>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.2/@anchors.0" end="//@children.1/@children.4/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ContinuationTransition:CPUser$state1$tr1"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr1: "/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.4/@anchors.0" end="//@children.1/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ContinuationTransition:CPUser$state1$tr2"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr2: [else]"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.4/@anchors.0" end="//@children.1/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#CPBranchTransition:CPUser$state1$tr0"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr0: [counter == 4]"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.1/@anchors.0" end="//@children.1/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#InitialTransition:CPUser$state1$initial"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="init"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.1/@anchors.0" end="//@children.0/@children.7/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#InitialTransition:CPUser$initial"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="init"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.7/@anchors.0" end="//@children.0/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ContinuationTransition:CPUser$tr4"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr4: [else]"/>
- </connectionDecorators>
- <bendpoints x="329" y="221"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.7/@anchors.0" end="//@children.0/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#CPBranchTransition:CPUser$LastCheck"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="LastCheck: [counter ..."/>
- </connectionDecorators>
- <bendpoints x="206" y="245"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.3/@anchors.0" end="//@children.0/@children.8/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#TriggeredTransition:CPUser$tr1"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr1: &lt;msg1:TestPort1..."/>
- </connectionDecorators>
- <bendpoints x="350" y="327"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.8/@anchors.0" end="//@children.0/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ContinuationTransition:CPUser$tr2"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr2: [else]"/>
- </connectionDecorators>
- <bendpoints x="413" y="267"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.8/@anchors.0" end="//@children.0/@children.4/@children.1/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#CPBranchTransition:CPUser$tr3"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr3: [counter == 4]"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.4/@anchors.0" end="//@children.0/@children.9/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#TriggeredTransition:CPUser$tr5"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr5: &lt;msg1:TestPort1..."/>
- </connectionDecorators>
- <bendpoints x="657" y="421"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.9/@anchors.0" end="//@children.0/@children.6/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ContinuationTransition:CPUser$tr0"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr0: [else]"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.9/@anchors.0" end="//@children.0/@children.5/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#CPBranchTransition:CPUser$tr6"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr6: [crcGen.getCrc(..."/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.8/@anchors.0" end="//@children.0/@children.4/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#CPBranchTransition:CPUser$tr11"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr11: [counter == 3]"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.4/@anchors.0" end="//@children.0/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#TriggeredTransition:CPUser$tr7"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr7: &lt;msg1:TestPort1..."/>
- </connectionDecorators>
- <bendpoints x="275" y="374"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.2/@anchors.0" end="//@children.0/@children.2/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#TriggeredTransition:CPUser$tr8"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr8: &lt;msg1:TestPort1..."/>
- </connectionDecorators>
- <bendpoints x="368" y="170"/>
- <bendpoints x="417" y="170"/>
- </connections>
- <colors red="227" green="238" blue="249"/>
- <colors red="255" green="255" blue="255"/>
- <colors/>
- <colors red="200" green="200" blue="200"/>
- <fonts name="Arial" size="8"/>
- <fonts name="Arial" size="9" bold="true"/>
-</pi:Diagram>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPUser.structure b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPUser.structure
deleted file mode 100644
index 814d1ebcf..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.CPUser.structure
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.structure" name="Structure of CPUser" snapToGrid="true" showGuides="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link">
- <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ActorClass:CPUser"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="cls"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="451" height="331" x="40" y="20">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.0" width="371" height="251" x="40" y="40"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ActorClass:CPUser"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="port"/>
- <properties key="item-kind" value=""/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="185">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.2" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="40" height="40" x="20" y="20"/>
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.1" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#Port:CPUser$TestPort1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" referencedGraphicsAlgorithm="//@children.0/@children.0/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="80" height="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="TestPort1"/>
- </children>
- </children>
- </children>
- <colors red="227" green="238" blue="249"/>
- <colors red="255" green="255" blue="255"/>
- <colors/>
- <fonts name="Arial" size="8"/>
-</pi:Diagram>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.SubSystem_CPTest.structure b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.SubSystem_CPTest.structure
deleted file mode 100644
index 020defe8e..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.ChoicePointTest.SubSystem_CPTest.structure
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.structure" name="Structure of SubSystem_CPTest" snapToGrid="true" showGuides="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link" version="0.9.0">
- <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#SubSystemClass:SubSystem_CPTest"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="cls"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="511" height="341" x="160" y="20">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.0" width="431" height="261" x="40" y="40"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#SubSystemClass:SubSystem_CPTest"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="ref"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="220" height="120" x="130" y="90">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="180" height="80" x="20" y="20">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="20" height="10" x="150" y="50"/>
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="20" height="10" x="145" y="65"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.ChoicePointTest.room#ActorRef:SubSystem_CPTest$HandlerTest_Top"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" referencedGraphicsAlgorithm="//@children.0/@children.0/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="180" height="80" x="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="HandlerTest_Top&#xA;(CPTest_Top)"/>
- </children>
- </children>
- </children>
- <colors red="227" green="238" blue="249"/>
- <colors red="255" green="255" blue="255"/>
- <colors/>
- <colors red="200" green="200" blue="200"/>
- <fonts name="Arial" size="8"/>
-</pi:Diagram>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerTest_Top.structure b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerTest_Top.structure
deleted file mode 100644
index 5b3b95c9d..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerTest_Top.structure
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.structure" name="Structure of HandlerTest_Top" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.0/@children.1/@link //@children.0/@children.1/@link //@children.0/@children.1/@children.1/@link //@connections.0/@link" verticalGridUnit="10" version="0.9.0">
- <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ActorClass:HandlerTest_Top"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="cls"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40"/>
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ActorClass:HandlerTest_Top"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="ref"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="240" height="140" x="156" y="170">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="180" height="80" x="30" y="30">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="20" height="10" x="150" y="50"/>
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="20" height="10" x="145" y="65"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ActorRef:HandlerTest_Top$tester"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" referencedGraphicsAlgorithm="//@children.0/@children.0/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="180" height="80" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="tester&#xA;(Tester)"/>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="port"/>
- <properties key="item-kind" value="C"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="60" height="60" x="90">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="18" height="18" x="21" y="21"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#Port:Tester$TestPort1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0" referencedGraphicsAlgorithm="//@children.0/@children.0/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="15" y="6" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="TestPort1"/>
- </children>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="ref"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="240" height="140" x="482" y="170">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="180" height="80" x="30" y="30">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="20" height="10" x="150" y="50"/>
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="20" height="10" x="145" y="65"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ActorRef:HandlerTest_Top$handlerUser"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" referencedGraphicsAlgorithm="//@children.0/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="180" height="80" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="handlerUser&#xA;(HandlerUser)"/>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="port"/>
- <properties key="item-kind" value=""/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="60" height="60" x="90">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="18" height="18" x="21" y="21"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#Port:HandlerUser$TestPort1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0" referencedGraphicsAlgorithm="//@children.0/@children.1/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="15" y="6" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="TestPort1"/>
- </children>
- </children>
- </children>
- </children>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.0/@children.1/@anchors.0" end="//@children.0/@children.1/@children.1/@anchors.0">
- <properties key="obj-type" value="bind"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#Binding:HandlerTest_Top$TestPort1!tester-TestPort1!handlerUser"/>
- </link>
- </connections>
- <colors red="227" green="238" blue="249"/>
- <colors red="255" green="255" blue="255"/>
- <colors/>
- <colors red="200" green="200" blue="200"/>
- <fonts name="Arial" size="8"/>
-</pi:Diagram>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerUser.behavior b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerUser.behavior
deleted file mode 100644
index 24112ef38..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerUser.behavior
+++ /dev/null
@@ -1,826 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.behavior" name="Behavior of HandlerUser" pictogramLinks="//@link //@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.3/@link //@children.0/@children.4/@link //@children.0/@children.5/@link //@children.0/@children.6/@link //@children.0/@children.7/@link //@children.1/@link //@children.1/@children.1/@link //@children.1/@children.2/@link //@children.1/@children.3/@link //@children.1/@children.4/@link //@children.0/@children.4/@children.1/@link //@children.1/@children.5/@link //@children.1/@children.6/@link //@children.2/@link //@children.2/@children.1/@link //@children.2/@children.2/@link //@children.1/@children.5/@children.1/@link //@children.2/@children.3/@link //@connections.0/@link //@connections.1/@link //@connections.2/@link //@connections.3/@link //@connections.4/@link //@connections.5/@link //@connections.6/@link //@connections.7/@link //@connections.8/@link //@connections.9/@link //@connections.10/@link //@connections.11/@link //@connections.12/@link //@connections.13/@link //@connections.14/@link //@connections.15/@link //@connections.16/@link //@connections.17/@link //@connections.18/@link //@connections.19/@link //@connections.20/@link //@connections.21/@link" verticalGridUnit="10" version="0.9.0">
- <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ActorClass:HandlerUser"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="sg"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#StateGraph:HandlerUser$sg"/>
- </link>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="800" height="80" y="40" font="//@fonts.1" horizontalAlignment="ALIGNMENT_RIGHT" verticalAlignment="ALIGNMENT_TOP" value="/"/>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="40" height="40" x="100" y="100">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="10" y="10"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#StateGraph:HandlerUser$sg"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.14" referencedGraphicsAlgorithm="//@children.0/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="40" height="20" y="10" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="I"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <properties key="item-kind" value="htp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="226">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TransitionPoint:HandlerUser$tp0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.12 //@connections.17 //@connections.18" incomingConnections="//@connections.12 //@connections.18"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp0"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <properties key="item-kind" value="tp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="492">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.2" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TransitionPoint:HandlerUser$tp1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.13 //@connections.16 //@connections.21" incomingConnections="//@connections.13 //@connections.16"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp1"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="100" y="120">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SimpleState:HandlerUser$state0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.15" incomingConnections="//@connections.17 //@connections.20" referencedGraphicsAlgorithm="//@children.0/@children.4/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state0"/>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <properties key="item-kind" value="entp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="60" height="60" x="42">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="11" height="11" x="25" y="25"/>
- <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0">
- <points x="27" y="33"/>
- <points x="33" y="27"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0">
- <points x="27" y="27"/>
- <points x="33" y="33"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#EntryPoint:HandlerUser$state0$tp2"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.14" referencedGraphicsAlgorithm="//@children.0/@children.4/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="22" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp2"/>
- </children>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="366" y="366">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SimpleState:HandlerUser$testOk"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.21"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="testOk"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="561" y="349">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SimpleState:HandlerUser$state1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.19" referencedGraphicsAlgorithm="//@children.0/@children.6/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state1"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="50" height="50" x="507" y="265">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="25" height="25" x="12" y="12"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ChoicePoint:HandlerUser$cp1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.19 //@connections.20" incomingConnections="//@connections.15"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="50" height="25" y="12" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="C"/>
- </children>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="sg"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#StateGraph:HandlerUser$state0$sg"/>
- </link>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="800" height="80" y="40" font="//@fonts.1" horizontalAlignment="ALIGNMENT_RIGHT" verticalAlignment="ALIGNMENT_TOP" value="/state0"/>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="40" height="40" x="100" y="100">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="10" y="10"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#StateGraph:HandlerUser$state0$sg"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.8" referencedGraphicsAlgorithm="//@children.1/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="40" height="20" y="10" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="I"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="trp"/>
- <properties key="item-kind" value="htp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="160">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TransitionPoint:HandlerUser$state0$tp0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3 //@connections.7" incomingConnections="//@connections.3 //@connections.7"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp0"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="trp"/>
- <properties key="item-kind" value="tp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="360">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.2" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TransitionPoint:HandlerUser$state0$tp1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4 //@connections.10 //@connections.11" incomingConnections="//@connections.4"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp1"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="trp"/>
- <properties key="item-kind" value="entp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="560">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
- <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="2" filled="false" transparency="0.0">
- <points x="33" y="47"/>
- <points x="47" y="33"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="2" filled="false" transparency="0.0">
- <points x="33" y="33"/>
- <points x="47" y="47"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#EntryPoint:HandlerUser$state0$tp2"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.6"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp2"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="206" y="120">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SimpleState:HandlerUser$state0$state1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2 //@connections.9" incomingConnections="//@connections.9 //@connections.10" referencedGraphicsAlgorithm="//@children.1/@children.5/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state1"/>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="trp"/>
- <properties key="item-kind" value="entp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="60" height="60" x="27">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="11" height="11" x="25" y="25"/>
- <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0">
- <points x="27" y="33"/>
- <points x="33" y="27"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0">
- <points x="27" y="27"/>
- <points x="33" y="33"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#EntryPoint:HandlerUser$state0$state1$tp0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.6" referencedGraphicsAlgorithm="//@children.1/@children.5/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="22" font="//@fonts.0" verticalAlignment="ALIGNMENT_BOTTOM" value="tp0"/>
- </children>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="472" y="120">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SimpleState:HandlerUser$state0$state2"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.5" incomingConnections="//@connections.2 //@connections.5 //@connections.8 //@connections.11" referencedGraphicsAlgorithm="//@children.1/@children.6/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state2"/>
- </children>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="sg"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#StateGraph:HandlerUser$state0$state1$sg"/>
- </link>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="800" height="80" y="40" font="//@fonts.1" horizontalAlignment="ALIGNMENT_RIGHT" verticalAlignment="ALIGNMENT_TOP" value="/state0/state1"/>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="40" height="40" x="100" y="100">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="10" y="10"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#StateGraph:HandlerUser$state0$state1$sg"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1" referencedGraphicsAlgorithm="//@children.2/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="40" height="20" y="10" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="I"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="trp"/>
- <properties key="item-kind" value="entp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="360">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
- <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="2" filled="false" transparency="0.0">
- <points x="33" y="47"/>
- <points x="47" y="33"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="2" filled="false" transparency="0.0">
- <points x="33" y="33"/>
- <points x="47" y="47"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#EntryPoint:HandlerUser$state0$state1$tp0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp0"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="340" y="120">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="true" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SimpleState:HandlerUser$state0$state1$state7"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0 //@connections.1" referencedGraphicsAlgorithm="//@children.2/@children.3/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children>
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state7"/>
- </children>
- </children>
- </children>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.2/@children.2/@anchors.0" end="//@children.2/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ContinuationTransition:HandlerUser$state0$state1$tr0"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr0: "/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.2/@children.1/@anchors.0" end="//@children.2/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#InitialTransition:HandlerUser$state0$state1$initial"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="init"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.5/@anchors.0" end="//@children.1/@children.6/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr0"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.1" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr0: &lt;msg5:TestPort1..."/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.2/@anchors.0" end="//@children.1/@children.2/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr1"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr1: &lt;msg3:TestPort1..."/>
- </connectionDecorators>
- <bendpoints x="240" y="200"/>
- <bendpoints x="240" y="200"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.3/@anchors.0" end="//@children.1/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr2"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr2: &lt;msg4:TestPort1..."/>
- </connectionDecorators>
- <bendpoints x="440" y="200"/>
- <bendpoints x="440" y="200"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.6/@anchors.0" end="//@children.1/@children.6/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr3"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr3: &lt;msg1:TestPort1..."/>
- </connectionDecorators>
- <bendpoints x="572" y="325"/>
- <bendpoints x="572" y="325"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.4/@anchors.0" end="//@children.1/@children.5/@children.1/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ContinuationTransition:HandlerUser$state0$tr4"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr4: "/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.2/@anchors.0" end="//@children.1/@children.2/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr5"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr5: &lt;msg1:TestPort1..."/>
- </connectionDecorators>
- <bendpoints x="240" y="200"/>
- <bendpoints x="240" y="200"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.1/@anchors.0" end="//@children.1/@children.6/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#InitialTransition:HandlerUser$state0$initial"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="init"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.5/@anchors.0" end="//@children.1/@children.5/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr6"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr6: &lt;msg1:TestPort1..."/>
- </connectionDecorators>
- <bendpoints x="306" y="325"/>
- <bendpoints x="306" y="325"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.3/@anchors.0" end="//@children.1/@children.5/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr7"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr7: &lt;msg2:TestPort1..."/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" active="true" start="//@children.1/@children.3/@anchors.0" end="//@children.1/@children.6/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$state0$tr8"/>
- </link>
- <connectionDecorators locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr8: &lt;msg2:TestPort1..."/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.2/@anchors.0" end="//@children.0/@children.2/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr0"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr0: &lt;msg1:TestPort1..."/>
- </connectionDecorators>
- <bendpoints x="306" y="200"/>
- <bendpoints x="306" y="200"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.3/@anchors.0" end="//@children.0/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr1"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr1: &lt;msg1:TestPort1..."/>
- </connectionDecorators>
- <bendpoints x="572" y="200"/>
- <bendpoints x="572" y="200"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.1/@anchors.0" end="//@children.0/@children.4/@children.1/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#InitialTransition:HandlerUser$initial"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="init"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.4/@anchors.0" end="//@children.0/@children.7/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr9"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr9: &lt;msg1:TestPort1..."/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.3/@anchors.0" end="//@children.0/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr5"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr5: &lt;msg2:TestPort1..."/>
- </connectionDecorators>
- <bendpoints x="572" y="200"/>
- <bendpoints x="572" y="200"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.2/@anchors.0" end="//@children.0/@children.4/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr7"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr7: &lt;msg1:TestPort1..."/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.2/@anchors.0" end="//@children.0/@children.2/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr6"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr6: &lt;msg1:TestPort1..."/>
- </connectionDecorators>
- <bendpoints x="306" y="200"/>
- <bendpoints x="306" y="200"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.7/@anchors.0" end="//@children.0/@children.6/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ContinuationTransition:HandlerUser$tr8"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr8: [else]"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.7/@anchors.0" end="//@children.0/@children.4/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#CPBranchTransition:HandlerUser$tr10"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr10: [p1!=4]"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.3/@anchors.0" end="//@children.0/@children.5/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#TriggeredTransition:HandlerUser$tr4"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="true" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" x="10" font="//@fonts.0" value="tr4: &lt;msg6:TestPort1..."/>
- </connectionDecorators>
- </connections>
- <colors red="227" green="238" blue="249"/>
- <colors red="255" green="255" blue="255"/>
- <colors/>
- <colors red="200" green="200" blue="200"/>
- <fonts name="Arial" size="8"/>
- <fonts name="Arial" size="9" bold="true"/>
-</pi:Diagram>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerUser.structure b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerUser.structure
deleted file mode 100644
index 66ed0cff8..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.HandlerUser.structure
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.structure" name="Structure of HandlerUser" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link" verticalGridUnit="10" version="0.9.0">
- <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ActorClass:HandlerUser"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="cls"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40"/>
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ActorClass:HandlerUser"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="port"/>
- <properties key="item-kind" value=""/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="400">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.2" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="40" height="40" x="20" y="20"/>
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.1" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#Port:HandlerUser$TestPort1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" referencedGraphicsAlgorithm="//@children.0/@children.0/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="TestPort1"/>
- </children>
- </children>
- </children>
- <colors red="227" green="238" blue="249"/>
- <colors red="255" green="255" blue="255"/>
- <colors/>
- <fonts name="Arial" size="8"/>
-</pi:Diagram>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.SubSystem_HandlerTest.structure b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.SubSystem_HandlerTest.structure
deleted file mode 100644
index dcfdbebfc..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.SubSystem_HandlerTest.structure
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.structure" name="Structure of SubSystem_HandlerTest" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link" verticalGridUnit="10" version="0.9.0">
- <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SubSystemClass:SubSystem_HandlerTest"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="cls"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40"/>
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#SubSystemClass:SubSystem_HandlerTest"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="ref"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="240" height="140" x="320" y="170">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="180" height="80" x="30" y="30">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="20" height="10" x="150" y="50"/>
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="20" height="10" x="145" y="65"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ActorRef:SubSystem_HandlerTest$HandlerTest_Top"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" referencedGraphicsAlgorithm="//@children.0/@children.0/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="180" height="80" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="HandlerTest_Top&#xA;(HandlerTest_Top)"/>
- </children>
- </children>
- </children>
- <colors red="227" green="238" blue="249"/>
- <colors red="255" green="255" blue="255"/>
- <colors/>
- <colors red="200" green="200" blue="200"/>
- <fonts name="Arial" size="8"/>
-</pi:Diagram>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.Tester.structure b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.Tester.structure
deleted file mode 100644
index 740d5130e..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.HandlerTest.Tester.structure
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="room.structure" name="Structure of Tester" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link" verticalGridUnit="10" version="0.9.0">
- <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ActorClass:Tester"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="cls"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40"/>
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#ActorClass:Tester"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="port"/>
- <properties key="item-kind" value="C"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="400">
- <graphicsAlgorithmChildren xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="40" height="40" x="20" y="20"/>
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.2" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.HandlerTest.room#Port:Tester$TestPort1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" referencedGraphicsAlgorithm="//@children.0/@children.0/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0" width="80" height="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="TestPort1"/>
- </children>
- </children>
- </children>
- <colors red="227" green="238" blue="249"/>
- <colors red="255" green="255" blue="255"/>
- <colors/>
- <fonts name="Arial" size="8"/>
-</pi:Diagram>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.SendingDataByValueTest.MrPing.behavior b/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.SendingDataByValueTest.MrPing.behavior
deleted file mode 100644
index 890e527cf..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/diagrams/org.eclipse.etrice.integration.SendingDataByValueTest.MrPing.behavior
+++ /dev/null
@@ -1,459 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" diagramTypeId="room.behavior" name="Behavior of MrPing" showGuides="true" pictogramLinks="//@link //@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.3/@link //@children.0/@children.4/@link //@children.0/@children.5/@link //@children.0/@children.6/@link //@children.0/@children.7/@link //@children.0/@children.8/@link //@children.0/@children.9/@link //@children.0/@children.10/@link //@connections.0/@link //@connections.1/@link //@connections.2/@link //@connections.3/@link //@connections.4/@link //@connections.5/@link //@connections.6/@link //@connections.7/@link //@connections.8/@link //@connections.9/@link //@connections.10/@link" verticalGridUnit="0">
- <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#ActorClass:MrPing"/>
- </link>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="sg"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="880" height="580" x="40" y="40">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.1" foreground="//@colors.2" lineWidth="4" transparency="0.5" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="4" filled="false" transparency="0.0" width="800" height="500" x="40" y="40" cornerHeight="20" cornerWidth="20"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#StateGraph:MrPing$sg"/>
- </link>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="800" height="80" y="40" font="//@fonts.1" horizontalAlignment="ALIGNMENT_RIGHT" verticalAlignment="ALIGNMENT_TOP" value="/"/>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="40" height="40" x="100" y="100">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="10" y="10"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#StateGraph:MrPing$sg"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0" referencedGraphicsAlgorithm="//@children.0/@children.1/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="40" height="20" y="10" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="I"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <properties key="item-kind" value="tp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="390">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.2" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="20" height="20" x="30" y="30"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#TransitionPoint:MrPing$tp0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1 //@connections.2" incomingConnections="//@connections.1 //@connections.2" referencedGraphicsAlgorithm="//@children.0/@children.2/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="80" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" verticalAlignment="ALIGNMENT_BOTTOM" value="tp0"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="142" height="90" x="49" y="146">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="82" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="57" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="41" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="41" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="41" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#BaseState:MrPing$waitForPong"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3" incomingConnections="//@connections.0 //@connections.4" referencedGraphicsAlgorithm="//@children.0/@children.3/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="82" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="waitForPong"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="71" y="269">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#BaseState:MrPing$state0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.6" incomingConnections="//@connections.5" referencedGraphicsAlgorithm="//@children.0/@children.4/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state0"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="71" y="346">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#BaseState:MrPing$state1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.7" incomingConnections="//@connections.6" referencedGraphicsAlgorithm="//@children.0/@children.5/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state1"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="246" y="346">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#BaseState:MrPing$state2"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.8" incomingConnections="//@connections.7" referencedGraphicsAlgorithm="//@children.0/@children.6/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="state2"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="127" height="90" x="589" y="239">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="67" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="42" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="33" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="33" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="33" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#BaseState:MrPing$TestFalse"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.9" referencedGraphicsAlgorithm="//@children.0/@children.7/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="67" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="TestFalse"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="state"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="120" height="90" x="618" y="375">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" background="//@colors.3" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" cornerHeight="20" cornerWidth="20">
- <graphicsAlgorithmChildren xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="15" height="8" x="35" y="3" cornerHeight="5" cornerWidth="5"/>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-3" y="-3"/>
- <points x="-3" y="3"/>
- <points x="-11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="3" y="-3"/>
- <points x="3" y="3"/>
- <points x="11" y="3"/>
- </graphicsAlgorithmChildren>
- <graphicsAlgorithmChildren xsi:type="al:Polygon" foreground="//@colors.2" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" x="30" y="24">
- <points x="-2" y="-3"/>
- <points x="-2" y="3"/>
- <points x="2" y="3"/>
- <points x="2" y="-3"/>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithmChildren>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#BaseState:MrPing$TestOk"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.10" referencedGraphicsAlgorithm="//@children.0/@children.8/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="60" height="30" x="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="TestOk"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="266" y="210">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="40" height="40" x="20" y="20"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#ChoicePoint:MrPing$cp0"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4 //@connections.5" incomingConnections="//@connections.3" referencedGraphicsAlgorithm="//@children.0/@children.9/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="80" height="40" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="C"/>
- </children>
- </children>
- <children xsi:type="pi:ContainerShape" visible="true" active="true">
- <properties key="obj-type" value="trp"/>
- <graphicsAlgorithm xsi:type="al:Rectangle" lineWidth="1" filled="false" lineVisible="false" transparency="0.0" width="80" height="80" x="413" y="351">
- <graphicsAlgorithmChildren xsi:type="al:Ellipse" background="//@colors.1" foreground="//@colors.2" lineWidth="2" transparency="0.0" width="40" height="40" x="20" y="20"/>
- </graphicsAlgorithm>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#ChoicePoint:MrPing$cp1"/>
- </link>
- <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.9 //@connections.10" incomingConnections="//@connections.8" referencedGraphicsAlgorithm="//@children.0/@children.10/@graphicsAlgorithm/@graphicsAlgorithmChildren.0"/>
- <children visible="true">
- <graphicsAlgorithm xsi:type="al:Text" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0" width="80" height="40" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="C"/>
- </children>
- </children>
- </children>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.1/@anchors.0" end="//@children.0/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#InitialTransition:MrPing$initial"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" transparency="0.0" x="10" font="//@fonts.0" value="init"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.2/@anchors.0" end="//@children.0/@children.2/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#TriggeredTransition:MrPing$tr0"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" transparency="0.0" x="-129" y="-16" font="//@fonts.0" value="tr0: &lt;pong:PingPongP..."/>
- </connectionDecorators>
- <bendpoints x="469" y="146"/>
- <bendpoints x="436" y="138"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.2/@anchors.0" end="//@children.0/@children.2/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#TriggeredTransition:MrPing$tr1"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" transparency="0.0" x="10" font="//@fonts.0" value="tr1: &lt;pongSimple:Pin..."/>
- </connectionDecorators>
- <bendpoints x="568" y="107"/>
- <bendpoints x="509" y="107"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.3/@anchors.0" end="//@children.0/@children.9/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#TriggeredTransition:MrPing$tr10"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" transparency="0.0" x="10" font="//@fonts.0" value="tr10: &lt;pong:PingPong..."/>
- </connectionDecorators>
- <bendpoints x="263" y="231"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.9/@anchors.0" end="//@children.0/@children.3/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#ContinuationTransition:MrPing$tr4"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" transparency="0.0" x="10" font="//@fonts.0" value="tr4: [else]"/>
- </connectionDecorators>
- <bendpoints x="239" y="289"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.9/@anchors.0" end="//@children.0/@children.4/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#CPBranchTransition:MrPing$tr3"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" transparency="0.0" x="10" font="//@fonts.0" value="tr3: [(p.i32Val==2) ..."/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.4/@anchors.0" end="//@children.0/@children.5/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#TriggeredTransition:MrPing$tr5"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" transparency="0.0" x="10" font="//@fonts.0" value="tr5: &lt;pong:PingPongP..."/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.5/@anchors.0" end="//@children.0/@children.6/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#TriggeredTransition:MrPing$tr6"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" transparency="0.0" x="-64" y="11" font="//@fonts.0" value="tr6: &lt;pongSimple:Pin..."/>
- </connectionDecorators>
- <bendpoints x="254" y="464"/>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.6/@anchors.0" end="//@children.0/@children.10/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#TriggeredTransition:MrPing$tr7"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" transparency="0.0" x="-15" y="21" font="//@fonts.0" value="tr7: &lt;pongSimple:Pin..."/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.10/@anchors.0" end="//@children.0/@children.7/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#ContinuationTransition:MrPing$tr8"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" transparency="0.0" x="-37" y="-31" font="//@fonts.0" value="tr8: [else]"/>
- </connectionDecorators>
- </connections>
- <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.10/@anchors.0" end="//@children.0/@children.8/@anchors.0">
- <properties key="obj-type" value="trans"/>
- <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.2" lineWidth="1" filled="false" transparency="0.0"/>
- <link>
- <businessObjects href="../org.eclipse.etrice.integration.SendingDataByValueTest.room#CPBranchTransition:MrPing$tr9"/>
- </link>
- <connectionDecorators visible="true" locationRelative="true" location="1.0">
- <graphicsAlgorithm xsi:type="al:Polygon" background="//@colors.2" foreground="//@colors.2" lineWidth="1" transparency="0.0">
- <points x="-15" y="5"/>
- <points/>
- <points x="-15" y="-5"/>
- </graphicsAlgorithm>
- </connectionDecorators>
- <connectionDecorators visible="true" active="true" locationRelative="true" location="0.5">
- <graphicsAlgorithm xsi:type="al:Text" foreground="//@colors.2" lineWidth="1" transparency="0.0" x="13" y="-21" font="//@fonts.0" value="tr9: [(p==28) &amp;&amp; (cr..."/>
- </connectionDecorators>
- </connections>
- <colors red="227" green="238" blue="249"/>
- <colors red="255" green="255" blue="255"/>
- <colors/>
- <colors red="200" green="200" blue="200"/>
- <fonts name="Arial" size="8"/>
- <fonts name="Arial" size="9" bold="true"/>
-</pi:Diagram>
diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ChoicePointTest.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ChoicePointTest.room
deleted file mode 100644
index aefd3388c..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ChoicePointTest.room
+++ /dev/null
@@ -1,263 +0,0 @@
-RoomModel org.eclipse.etrice.integration.ChoicePointTest {
-
- import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"
-
- LogicalSystem System_HandlerTest {
- SubSystemRef SubSystem_CPTest: SubSystem_CPTest
- }
-
- SubSystemClass SubSystem_CPTest {
- ActorRef HandlerTest_Top: CPTest_Top
- }
-
- ActorClass CPTest_Top {
- Structure {
- ActorRef cp_tester: CPTester
- ActorRef cp_user: CPUser
- Binding cp_tester.TestPort1 and cp_user.TestPort1
- }
- Behavior { }
- }
-
- ActorClass CPUser {
- Interface {
- Port TestPort1: TestProtocol
- }
- Structure {
- usercode1{
- "import org.eclipse.etrice.integration.tests.helpers.*;"
- "import org.eclipse.etrice.runtime.java.messaging.RTServices;"
- }
- usercode2 {
- "private CRC16Generator crcGen = new CRC16Generator();"
- }
- external Port TestPort1
- Attribute counter: int32
- }
- Behavior {
- StateMachine {
- Transition init: initial -> cp cp0 {
- action {
- "System.out.println(\"Top Level init transition\");"
- "crcGen.update(10);"
- "counter = 0;"
- }
- }
- Transition tr4: cp cp0 -> state0 {
- action {
- "System.out.println(\"choice0: else code\");"
- "crcGen.update(17);"
- }
- }
- Transition LastCheck: cp cp0 -> state0 {
- cond {
- "counter == 0"
- }
- action {
- "System.out.println(\"choice0: true code\");"
- "crcGen.update(15);"
- }
- }
- Transition tr1: state0 -> cp cp1 {
- triggers {
- <msg1: TestPort1>
- }
- action {
- "System.out.println(\"state0: msg1: transition code\");"
- "crcGen.update(18);"
- }
- }
- Transition tr2: cp cp1 -> state0 {
- action {
- "System.out.println(\"choice1: else code\");"
- "crcGen.update(10);"
- "counter=3;"
- }
- }
- Transition tr3: cp cp1 -> tp0 of state1 {
- cond {
- "counter == 4"
- }
- action {
- "System.out.println(\"choice1: to entry state1 code\");"
- "crcGen.update(30);"
- }
- }
- Transition tr5: state1 -> cp cp2 {
- triggers {
- <msg1: TestPort1 guard {
- "counter==2"
- }>
- }
- action {
- "System.out.println(\"state1: msg1: transition code\");"
- "crcGen.update(30);"
- "System.out.printf(\"CRC: %d \\n\", crcGen.getCrc());"
- }
- }
- Transition tr0: cp cp2 -> testFalse {
- action {
- "System.out.println(\"Test false\");"
- "RTServices.getInstance().getSubSystem().testFinished(1);"
- }
- }
- Transition tr6: cp cp2 -> testOk {
- cond {
- "crcGen.getCrc()==26639"
- }
- action {
- "System.out.println(\"Test ok\");"
- "RTServices.getInstance().getSubSystem().testFinished(0);"
- }
- }
- Transition tr11: cp cp1 -> state1 {
- cond {
- "counter == 3"
- }
- action {
- "System.out.println(\"choice1: history to State1 transition code\");"
- "crcGen.update(25);"
- "counter = 1;"
- }
- }
- Transition tr7: state1 -> state0 {
- triggers {
- <msg1: TestPort1 guard {
- "counter==1"
- }>
- }
- action {
- "System.out.println(\"state1: msg1: transition code to state0\");"
- "crcGen.update(51);"
- "counter=4;"
- }
- }
- Transition tr8: my tp0 -> my tp0 {
- triggers {
- <msg1: TestPort1>
- }
- action {
- "System.out.println(\"Handler: msg1 received \");"
- "crcGen.update(115);"
- "counter = 2;"
- }
- }
- ChoicePoint cp0
- ChoicePoint cp1
- ChoicePoint cp2
- handler TransitionPoint tp0
- State state0 {
- entry {
- "System.out.println(\"state0: entry code\");"
- "crcGen.update(12);"
- }
- exit {
- "System.out.println(\"state0: exit code\");"
- "crcGen.update(13);"
- }
- }
- State state1 {
- entry {
- "System.out.println(\"state1: entry code\");"
- "crcGen.update(20);"
- }
- exit {
- "System.out.println(\"state1: exit code\");"
- "crcGen.update(21);"
- }
- subgraph {
- Transition tr1: my tp0 -> cp cp0 {
- action {
- "System.out.println(\"state1: tp0: transition code\");"
- "crcGen.update(25);"
- }
- }
- Transition tr2: cp cp0 -> state0 {
- action {
- "System.out.println(\"state1: choice false code\");"
- "crcGen.update(57);"
- }
- }
- Transition tr0: cp cp0 -> state0 {
- cond {
- "counter == 4"
- }
- action {
- "System.out.println(\"state1 choice: true code\");"
- "crcGen.update(56);"
- }
- }
- Transition init: initial -> state0 {
- action {
- "System.out.println(\"state1 initial transition code\");"
- "crcGen.update(53);"
- }
- }
- ChoicePoint cp0
- EntryPoint tp0
- State state0 {
- entry {
- "System.out.println(\"state1\\\\0: entry code\");"
- "System.out.printf(\"counter => %d\\n\",counter);"
- "crcGen.update(22);"
- }
- exit {
- "System.out.println(\"state1\\\\0: exit code\");"
- "crcGen.update(23);"
- }
- }
- }
- }
- State testOk
- State testFalse
- }
- }
- }
-
- ActorClass CPTester {
- Interface {
- conjugated Port TestPort1: TestProtocol
- }
- Structure {
- external Port TestPort1
- }
- Behavior {
- StateMachine {
- Transition init: initial -> state0 {
- action {
- "TestPort1.msg1();"
- "System.out.println(\"msg1 sent \");"
- ""
- "TestPort1.msg1();"
- "System.out.println(\"msg1 sent \");"
- ""
- "TestPort1.msg1();"
- "System.out.println(\"msg1 sent \");"
- ""
- "TestPort1.msg1();"
- "System.out.println(\"msg1 sent \");"
- ""
- "TestPort1.msg1();"
- "System.out.println(\"msg1 sent \");"
- ""
- "TestPort1.msg1();"
- "System.out.println(\"msg1 sent \");"
- }
- }
- State state0
- }
- }
- }
-
- ProtocolClass TestProtocol {
- incoming {
- Message msg1()
- Message msg2()
- Message msg3()
- Message msg4()
- Message msg5()
- }
- outgoing{}
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.config b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.config
deleted file mode 100644
index 90b900edc..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.config
+++ /dev/null
@@ -1,101 +0,0 @@
-import org.eclipse.etrice.integration.ConfigTest.* from "org.eclipse.etrice.integration.ConfigTest.room"
-
-SubSystemConfig SubSystemConfigTest {
- dynamic configuration {
- file path "tmp/subSystemConfigTest"
- //user import "import org.eclipse.etrice.runtime.java.config.ConfigSourceFile"
- //user constructor "new ConfigSourceFile(\"test\")"
- polling timer [ms] 4000
- }
-}
-
-/*
- * Class Config
- */ // Actors
-ActorClassConfig Testee_ac {
- Attr bool_c = false
- Attr int_c = 210
- Attr float_c = 16777215
- Attr char_c = "A"
- Attr charArray_c = "ROOM-Coon"
- Attr string_c = ":-)"
- Attr string_i = ":-]"
- Attr bool_i = false
- Attr int_i = 310
- Attr float_i = 0.0
- Attr char_i = "B"
- Attr charArray_i = "ROOM Gloom"
- Attr array1_c = 99
- Attr array1_i = 99
- Attr array2_c = false, false
- Attr array2_i = false, false
-} // Protocols
-ProtocolClassConfig PortProtocol {
- regular Port {
- Attr float_c = 3
- Attr float_i = 9
- }
- conjugate Port {
- Attr array1_c = 1
- Attr array1_i = 2
- Attr array2_c = 16, 32
- Attr array2_i = 16, 32
- }
-}
-
-/*
- * Instance Config
- */ ActorInstanceConfig SubSystemConfigTest / top / testee {
- Attr bool_i = true
- Attr int_i = 301
- Attr float_i = 1.0E-5
- Attr char_i = "C"
- Attr charArray_i = "ROOM 2 Moon"
- Attr string_i = ":^]"
- Attr array1_i = 4
- Attr array2_i = false, true
- InterfaceItem Reg_port {
- Attr float_i = 25
- }
-}
-
-ActorInstanceConfig SubSystemConfigTest / top / testee / AR1 {
- InterfaceItem Conj_port {
- Attr array1_i = 256
- Attr array2_i = 1, 2
- }
-}
-
-ActorInstanceConfig SubSystemConfigTest / top / testee2 {
- Attr int_i = 301 {
- dynamic configuration read
- }
- Attr dc_i {
- dynamic configuration read Attr int_i = 302
- Attr long_array_i = 303
- Attr dc_i {
- Attr char_i = "instance3"
- Attr double_i = 0.304
- }
- }
- Attr blockMe = 0 {
- dynamic configuration read
- }
- Attr blocker = false {
- dynamic configuration read
- }
- Attr dc_dump{
- dynamic configuration write
- Attr dc_i {
- Attr char_i = "dummy"
- Attr double_i = 0.0e-100
- }
- Attr long_array_i = 1000
- Attr int_i = 123
- }
- Attr int_dump = 3 {
- dynamic configuration write
- }
-}
-
-
diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.room
deleted file mode 100644
index eae26c548..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.room
+++ /dev/null
@@ -1,259 +0,0 @@
-RoomModel org.eclipse.etrice.integration.ConfigTest {
-
- import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"
-
- SubSystemClass SubSystemConfigTest {
- ActorRef top: ConfigText_Top_ac
- }
-
- ActorClass ConfigText_Top_ac {
- Structure {
- ActorRef testee: Testee_ac
- ActorRef testee2: DynTestee_ac
- Binding testee2.Conj_DynConfigPort and testee.Reg_dynConfigPort
- }
- Behavior { }
- }
-
- ActorClass DynTestee_ac {
- Interface {
- conjugated Port Conj_DynConfigPort: TestCommProtocol
- }
- Structure {
- usercode1 {
- "import org.eclipse.etrice.runtime.java.messaging.RTServices;"
- }
- external Port Conj_DynConfigPort
- Attribute int_i : int32
- Attribute dc_i : Dyn_DC1
- // manual test
- Attribute blockMe : int32
- Attribute blocker : boolean
- // not explicit test
- Attribute dc_dump : Dyn_DC1
- Attribute int_dump : int32
- }
- Behavior {
- StateMachine {
- Transition init: initial -> First { }
- Transition tr0: First -> Done {
- triggers {
- <test : Conj_DynConfigPort>
- }
- action {
- // write without test
- "Dyn_DC1 tmp = new Dyn_DC1(123, new long[]{1000}, new Dyn_DC2(0.0e-100, \"dummy out\".toCharArray()));"
- "setAndWriteDc_dump(tmp);"
- "setAndWriteInt_dump(888);"
- // read test
- "if(blocker)getBlockMeLock().forbidUpdate(); else getBlockMeLock().allowUpdate();"
- "int testValue = 0;"
- "if(int_i != 401 || getDc_i().getLong_array_i()[0] != 403)"
- "\ttestValue = 30;"
- "if(getDc_i().getDc_i().getDouble_i() != 0.404)"
- "\ttestValue = 31;"
- "if(!String.valueOf(getDc_i().getDc_i().getChar_i()).equals(\"instance4\"))"
- "\ttestValue = 32;"
- "System.out.println(\"blockMe: \"+getBlockMe()+\", blocker: \"+getBlocker());"
- "if(testValue != 0)"
- "\tRTServices.getInstance().getSubSystem().testFinished(testValue);"
- "else"
- "\tConj_DynConfigPort.ok();"
- }
- }
- State First {}
- State Done{}
- }
- }
- }
-
- DataClass Dyn_DC1 {
- Attribute int_i: int32
- Attribute long_array_i[1]: int64 = "0"
- Attribute dc_i : Dyn_DC2
- }
-
- DataClass Dyn_DC2 {
- Attribute double_i: float64
- Attribute char_i[10] : char
- }
-
- ActorClass AC1_ac {
- Interface {
- conjugated Port Conj_port: PortProtocol
- }
- Structure {
- external Port Conj_port
- }
- Behavior {
- StateMachine {
- Transition init: initial -> Done { }
- State Done {
- entry{
- "if(Conj_port.varCheck())"
- "\tConj_port.portTestSucc();"
- }
- }
- }
- }
- }
-
- ActorClass Testee_ac {
- Interface{
- Port Reg_dynConfigPort: TestCommProtocol
- }
- Structure {
- usercode1 {
- "import org.eclipse.etrice.runtime.java.messaging.RTServices;"
- }
- external Port Reg_dynConfigPort
- Port Reg_port: PortProtocol
- Attribute bool_r: boolean = "true"
- Attribute bool_c: boolean = "true"
- Attribute bool_i: boolean = "true"
- Attribute int_r: int32 = "100"
- Attribute int_c: int32 = "200"
- Attribute int_i: int32 = "300"
- Attribute float_r: float64 = "11.11"
- Attribute float_c: float64 = "22.22"
- Attribute float_i: float64 = "33.33"
-
- Attribute char_r: char = "'R'"
- Attribute char_c: char = "'C'"
- Attribute char_i: char = "'I'"
-
- Attribute charArray_r[20] : char = "\"ROOM will bloom\".toCharArray()"
- Attribute charArray_c [ 20 ]: char = "ROOM Zoom"
- Attribute charArray_i [ 20 ]: char = "ROOM Boom"
- Attribute string_r : string = "\":/\""
- Attribute string_c : string = "\":)\""
- Attribute string_i : string = "\":]\""
- Attribute array1_r [ 1 ]: int32 = "0"
- Attribute array1_c [ 1 ]: int32 = "0"
- Attribute array1_i [ 1 ]: int32 = "0"
- Attribute array2_r [ 2 ]: boolean = "{true, true}"
- Attribute array2_c [ 2 ]: boolean = "{true, false}"
- Attribute array2_i [ 2 ]: boolean = "{true, false}"
-
- ActorRef AR1: AC1_ac
- Binding Reg_port and AR1.Conj_port
- }
- Behavior {
- StateMachine {
- Transition init: initial -> Testing1 { }
- Transition tr1: Testing1 -> Testing2{
- triggers{
- <portTestSucc : Reg_port>
- }
- }
- Transition tr2: Testing2 -> Done{
- triggers{
- <ok : Reg_dynConfigPort>
- }
- }
-
- State Testing1 {
- entry {
- "if(Reg_port.varCheck())"
- "\tReg_port.conjCheck();"
- }
- }
- State Testing2{
- entry{
- "Reg_dynConfigPort.test();"
- }
- }
- State Done {
- entry {
- "if (bool_r != true || bool_c != false || bool_i != true )"
- "\tRTServices.getInstance().getSubSystem().testFinished(1);"
- "else if (int_r != 100 || int_c != 210 || int_i != 301)"
- "\tRTServices.getInstance().getSubSystem().testFinished(2);"
- "else if (float_r != 11.11 || float_c !=0xFFFFFF || float_i != 0.00001)"
- "\tRTServices.getInstance().getSubSystem().testFinished(3);"
- "else if (char_r != \'R\' || char_c != \'A\' || char_i != \'C\')"
- "\tRTServices.getInstance().getSubSystem().testFinished(4);"
- "// string_r.equals(\"ROOM will bloom\")"
- "else if (charArray_r.equals(\"ROOM will bloom\") || charArray_c.equals(\"ROOM-Coon\") || charArray_i.equals(\"ROOM 2 Moon\"))"
- "\tRTServices.getInstance().getSubSystem().testFinished(5);"
- "else if (!string_r.equals(\":/\") || !string_c.equals(\":-)\") || !string_i.equals(\":^]\"))"
- "\tRTServices.getInstance().getSubSystem().testFinished(5);"
- "if(array1_r[0] != 0 || array1_c[0] != 99 || array1_i[0] != 4)"
- "\tRTServices.getInstance().getSubSystem().testFinished(6);"
- "if(array2_r[0] != true || array2_r[1] != true)"
- "\tRTServices.getInstance().getSubSystem().testFinished(7);"
- "if(array2_c[0] != false || array2_c[1] != false)"
- "\tRTServices.getInstance().getSubSystem().testFinished(8);"
- "if(array2_i[0] != false || array2_i[1] != true)"
- "\tRTServices.getInstance().getSubSystem().testFinished(9);"
- "else"
- "\tRTServices.getInstance().getSubSystem().testFinished(0);"
- }
- }
- }
- }
- }
-
- ProtocolClass PortProtocol {
- usercode1 {
- "import org.eclipse.etrice.runtime.java.messaging.RTServices;"
- }
- incoming {
- Message portTestSucc()
- }
- outgoing {
- Message conjCheck()
- }
- regular PortClass
- {
- Attribute float_r: float32 = "4"
- Attribute float_c: float32 = "16"
- Attribute float_i: float32 = "256"
- Operation varCheck():boolean {
- "int testValue = 0;"
- "if(float_r != 4 || float_c != 3 || float_i != 25)"
- "\ttestValue = 20;"
- "if(testValue != 0)"
- "\tRTServices.getInstance().getSubSystem().testFinished(testValue);"
- "return testValue == 0;"
- }
- }
- conjugate PortClass
- {
- Attribute array1_r [ 1 ]: float32 = "1000"
- Attribute array1_c [ 1 ]: float32 = "1001"
- Attribute array1_i [ 1 ]: float32 = "1002"
- Attribute array2_r [ 2 ]: int64 = "{11,22}"
- Attribute array2_c [ 2 ]: int64 = "{0,0}"
- Attribute array2_i [ 2 ]: int64 = "{0,0}"
- Operation varCheck():boolean {
- "int testValue = 0;"
- "if(array1_r[0] != 1000 || array1_c[0] != 1 || array1_i[0] != 256)"
- "\ttestValue = 10;"
- "if(array2_r[0] != 11 || array2_r[1] != 22)"
- "\ttestValue = 11;"
- "if(array2_c[0] != 16 || array2_c[1] != 32)"
- "\ttestValue = 12;"
- "if(array2_i[0] != 1 || array2_i[1] != 2)"
- "\ttestValue = 13;"
- "if(testValue != 0)"
- "\tRTServices.getInstance().getSubSystem().testFinished(testValue);"
- "return testValue == 0;"
- }
- }
- }
-
-
-
- ProtocolClass TestCommProtocol {
- incoming {
- Message ok()
-
- }
- outgoing {
- Message test()
- }
- }
-
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.HandlerTest.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.HandlerTest.room
deleted file mode 100644
index 00625ff8e..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.HandlerTest.room
+++ /dev/null
@@ -1,369 +0,0 @@
-RoomModel org.eclipse.etrice.integration.HandlerTest {
-
- import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"
-
- LogicalSystem System_HandlerTest {
- SubSystemRef SubSystem_HandlerTest: SubSystem_HandlerTest
- }
-
- SubSystemClass SubSystem_HandlerTest {
- ActorRef HandlerTest_Top: HandlerTest_Top
-// LogicalThread t1 prio=5 {HandlerTest_Top.tester}
-// LogicalThread t2 prio=5 {HandlerTest_Top.handlerUser}
- }
-
- ActorClass HandlerTest_Top {
- Structure {
- ActorRef tester: Tester
- ActorRef handlerUser: HandlerUser
-
- Binding tester.TestPort1 and handlerUser.TestPort1
- }
- Behavior { }
- }
-
- ActorClass HandlerUser {
- Interface {
- Port TestPort1: TestProtocol
- }
- Structure {
- usercode1{
- "import org.eclipse.etrice.runtime.java.messaging.RTServices;"
- }
- external Port TestPort1
- Attribute counter: int32
- Attribute caseId: int32
- }
- Behavior {
- Operation HandlerUser() {
- "caseId = etUnit_openAll(\"tmp\", \"HandlerTest.etu\", \"HandlerTest_suite\", \"HandlerTest_case\");"
- }
- Operation ~HandlerUser() {
- "etUnit_closeAll(caseId);"
- }
- StateMachine {
- Transition tr0: my tp0 -> my tp0 {
- triggers {
- <msg1: TestPort1>
- }
- action {
- "System.out.println(\"top level handler action no guard \");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 11);"
- }
- }
- Transition tr1: my tp1 -> my tp1 {
- triggers {
- <msg1: TestPort1 guard {
- "p1==3"
- }>
- }
- action {
- "System.out.println(\"top level self transition action P1=>3\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 12);"
- }
- }
- Transition init: initial -> tp2 of state0 {
- action {
- "System.out.println(\"top level initial transition\");"
- "short list[] = {13,15,16,22,23,11,24,17,14,12,13,16,23,70,24,17,14,114,113,111,11,70,24,17,120,16,23,24,17,121,18,19,25,18,20,19,21,18,19,25,18,19,14,117};"
- "EXPECT_ORDER_START(caseId, list, list.length);"
- }
- }
- Transition tr9: state0 -> cp cp1 {
- triggers {
- <msg1: TestPort1 guard {
- "p1==4"
- }>
- }
- action {
- "System.out.println(\"tr9 transition action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 114);"
- }
- }
- Transition tr5: my tp1 -> my tp1 {
- triggers {
- <msg2: TestPort1 guard {
- "p1==4"
- }>
- }
- action {
- "System.out.println(\"top level self transition action P1=>4\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 50);"
- }
- }
- Transition tr7: my tp0 -> state0 {
- triggers {
- <msg1: TestPort1 guard {
- "p1==7"
- }>
- }
- action {
- "System.out.println(\"top level handler action p1=>7 \");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 70);"
- }
- }
- Transition tr6: my tp0 -> my tp0 {
- triggers {
- <msg1: TestPort1 guard {
- "p1==12"
- }>
- }
- action {
- "System.out.println(\"top level handler action p1=>12 \");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 110);"
- }
- }
- Transition tr8: cp cp1 -> state1 {
- action {
- "System.out.println(\"tr8 transition action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 113);"
- }
- }
- Transition tr10: cp cp1 -> state0 {
- cond {
- "p1!=4"
- }
- action {
- "System.out.println(\"tr4 transition action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 115);"
- }
- }
- Transition tr4: my tp1 -> testOk {
- triggers {
- <msg6: TestPort1>
- }
- action {
- "System.out.println(\"tp1 transition to choice action\");"
- "EXPECT_ORDER_END(caseId, \"<|MODEL_LOCATION|>\", 117);"
- }
- }
- ChoicePoint cp1
- handler TransitionPoint tp0
- TransitionPoint tp1
- State state0 {
- entry {
- "System.out.println(\"state 0 entry action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 13);"
- }
- exit {
- "System.out.println(\"state 0 exit action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 14);"
- }
- subgraph {
- Transition tr0: state1 -> state2 {
- triggers {
- <msg5: TestPort1>
- }
- }
- Transition tr1: my tp0 -> my tp0 {
- triggers {
- <msg3: TestPort1>
- }
- action {
- "System.out.println(\"state 0 handler action no guard\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 20);"
- }
- }
- Transition tr2: my tp1 -> my tp1 {
- triggers {
- <msg4: TestPort1>
- }
- action {
- "System.out.println(\"state 0 tp1 self transition action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 21);"
- }
- }
- Transition tr3: state2 -> state2 {
- triggers {
- <msg1: TestPort1>
- }
- action {
- "System.out.println(\"state 0/2 self transition action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 25);"
- }
- }
- Transition tr4: my tp2 -> tp0 of state1 {
- action {
- "System.out.println(\"state 0 tp2 transition action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 15);"
- }
- }
- Transition tr5: my tp0 -> my tp0 {
- triggers {
- <msg1: TestPort1 guard {
- "p1==5"
- }>
- }
- action {
- "System.out.println(\"state 0 handler action P1 => 5\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 52);"
- }
- }
- Transition init: initial -> state2 {
- action {
- "System.out.println(\"state 0 initial transition\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 53);"
- }
- }
- Transition tr6: state1 -> state1 {
- triggers {
- <msg1: TestPort1 guard {
- "p1==8"
- }>
- }
- action {
- "System.out.println(\"state 0/1 self transition\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 54);"
- }
- }
- Transition tr7: my tp1 -> state1 {
- triggers {
- <msg2: TestPort1 guard {
- "p1==5"
- }>
- }
- action {
- "System.out.println(\"state 0 tp1 p1=>5\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 120);"
- }
- }
- Transition tr8: my tp1 -> state2 {
- triggers {
- <msg2: TestPort1 guard {
- "p1==6"
- }>
- }
- action {
- "System.out.println(\"state 0 tp1 action P1 => 6\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 121);"
- }
- }
- handler TransitionPoint tp0
- TransitionPoint tp1
- EntryPoint tp2
- State state1 {
- entry {
- "System.out.println(\"state 0/1 entry action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 16);"
- }
- exit {
- "System.out.println(\"state 0/1 exit action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 17);"
- }
- subgraph {
- Transition tr0: my tp0 -> state7 {
- action {
- "System.out.println(\"state 0/1 transition entry action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 22);"
- }
- }
- Transition init: initial -> state7 {
- action {
- "System.out.println(\"state 0/1 initial transition\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 121);"
- }
- }
- EntryPoint tp0
- State state7 {
- entry {
- "System.out.println(\"state 0/1/7 entry action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 23);"
- }
- exit {
- "System.out.println(\"state 0/1/7 exit action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 24);"
- }
- }
- }
- }
- State state2 {
- entry {
- "System.out.println(\"state 0/2 entry action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 18);"
- }
- exit {
- "System.out.println(\"state 0/2 exit action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 19);"
- }
- }
- }
- }
- State testOk {
- entry {
- "System.out.println(\"Test ok\");"
- "RTServices.getInstance().getSubSystem().testFinished(etUnit_isSuccess(caseId)?0:1);"
- }
- }
- State state1 {
- entry {
- "System.out.println(\"state 1 entry action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 111);"
- }
- exit {
- "System.out.println(\"state 1 exit action\");"
- "EXPECT_ORDER(caseId, \"<|MODEL_LOCATION|>\", 112);"
- }
- }
- }
- }
- }
-
- ActorClass Tester {
- Interface {
- conjugated Port TestPort1: TestProtocol
- }
- Structure {
- external Port TestPort1
- }
- Behavior {
- StateMachine {
- Transition init: initial -> state0 {
- action {
- "TestPort1.msg1(2);"
- "System.out.println(\"msg1(2) sent \");"
- "TestPort1.msg1(3);"
- "System.out.println(\"msg1(3) sent \");"
- "TestPort1.msg1(7);"
- "System.out.println(\"msg1(7) sent \");"
- "TestPort1.msg1(4);"
- "System.out.println(\"msg1(4) sent \");"
- "TestPort1.msg1(5);"
- "System.out.println(\"msg1(5) sent \");"
- "TestPort1.msg1(7);"
- "System.out.println(\"msg1(7) sent \");"
- "TestPort1.msg2(5);"
- "System.out.println(\"msg2(5) sent \");"
- "TestPort1.msg2(6);"
- "System.out.println(\"msg2(6) sent \");"
- ""
- ""
- ""
- "TestPort1.msg1(5);"
- "System.out.println(\"msg1(5) sent \");"
- "TestPort1.msg3();"
- "System.out.println(\"msg3() sent \");"
- "TestPort1.msg4();"
- "System.out.println(\"msg4() sent \");"
- "TestPort1.msg1(8);"
- "System.out.println(\"msg1(8) sent \");"
- "TestPort1.msg6(12);"
- "System.out.println(\"msg6(12) sent \");"
- }
- }
- State state0
- }
- }
- }
-
- ProtocolClass TestProtocol {
- incoming {
- Message msg1(p1:int32)
- Message msg2(p1:int32)
- Message msg3()
- Message msg4()
- Message msg5(p1:int32)
- Message msg6(p1:int32)
- }
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTest.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTest.room
deleted file mode 100644
index f0e6d990c..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTest.room
+++ /dev/null
@@ -1,161 +0,0 @@
-RoomModel org.eclipse.etrice.integration.PingPongThreadTest {
-
- import room.basic.service.timing.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/TimingService.room"
- import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"
-
- LogicalSystem System_PingPong {
- SubSystemRef subsystem: SubSystem_PingPong
- }
-
- SubSystemClass SubSystem_PingPong {
- ActorRef application: PingPongTop
- ActorRef services: ATimingService
- LayerConnection ref application satisfied_by services.timer
- LogicalThread mrPingThread prio=5 {application.MrPing}
- LogicalThread mrPong1Thread prio=5 {application.MrPong1}
- LogicalThread mrPong2Thread prio=5 {application.MrPong2}
- LogicalThread mrPong3Thread prio=5 {application.MrPong3}
- }
-
- ActorClass PingPongTop {
- Structure {
- ActorRef MrPing: MrPingActor
- ActorRef MrPong1: MrPongActor1
- ActorRef MrPong2: MrPongActor1
- ActorRef MrPong3: MrPongActor2
- Binding MrPing.PingPongPort and MrPong1.PingPongPort
- Binding MrPing.PingPongPort2 and MrPong2.PingPongPort
- Binding MrPing.PingPongPort3 and MrPong3.PingPongPort
- }
- }
-
- ActorClass MrPingActor {
- Interface {
- conjugated Port PingPongPort : PingPongProtocol
- conjugated Port PingPongPort2 : PingPongProtocol
- conjugated Port PingPongPort3 : PingPongProtocol
- }
- Structure {
- usercode1 {
- "import org.eclipse.etrice.runtime.java.messaging.RTServices;"
- }
-
- external Port PingPongPort
- external Port PingPongPort2
- external Port PingPongPort3
- SAP timer: PTimer
- Attribute count : int32
- Attribute pongCount : int32
- }
- Behavior {
- StateMachine {
- Transition tr0: initial -> waitForTimer {
- action {
- "count = 0;"
- "timer.startTimeout(10);"
- }
- }
- Transition tr1: waitForTimer -> waitForPong {
- triggers {
- <timeout: timer>
- }
- action {
- "PingPongPort.ping();"
- "PingPongPort2.ping();"
- "pongCount = 0;"
- }
- }
- Transition tr3: waitForPong -> cp cp0 {
- triggers {
- <pong: PingPongPort2>
- or
- <pong: PingPongPort>
- }
- action {
- "pongCount++;"
- }
- }
- Transition tr5: cp cp0 -> waitForTimer {
- action {
- "if (count++ > 100) {"
- "RTServices.getInstance().getSubSystem().testFinished(0);"
- "} else {"
- "System.out.println(count);"
- "timer.startTimeout(5);}"
- }
- }
- Transition tr6: cp cp0 -> waitForPong {
- cond {
- "pongCount < 2"
- }
- }
- ChoicePoint cp0
- State waitForTimer { }
- State waitForPong { }
- }
- }
- }
-
- ActorClass MrPongActor1 {
- Interface {
- Port PingPongPort: PingPongProtocol
- }
- Structure {
- external Port PingPongPort
- }
- Behavior {
- StateMachine {
- Transition tr0: initial -> waitForPing { }
- Transition myTrigger: waitForPing -> waitForPing {
- triggers {
- <ping: PingPongPort>
- }
- action {
- "PingPongPort.pong();"
- }
- }
- State waitForPing { }
- }
- }
- }
-
- ActorClass MrPongActor2 {
- Interface {
- Port PingPongPort: PingPongProtocol
- }
- Structure {
- external Port PingPongPort
- }
- Behavior {
- StateMachine {
- Transition tr0: initial -> waitForPing {
- action {
- "// simulate blocking call e.g. Queue"
- "try{"
- "Thread.sleep(5000);"
- "}catch (InterruptedException e){}"
- }
- }
- Transition myTrigger: waitForPing -> waitForPing {
- triggers {
- <ping: PingPongPort>
- }
- action {
- "PingPongPort.pong();"
- }
- }
- State waitForPing { }
- }
- }
- }
-
- ProtocolClass PingPongProtocol {
- incoming {
- Message ping()
- }
- outgoing {
- Message pong()
- }
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room
deleted file mode 100644
index e92e600a8..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room
+++ /dev/null
@@ -1,132 +0,0 @@
-RoomModel org.eclipse.etrice.integration.PingPongThreadTestReplPort {
-
- import room.basic.service.timing.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/TimingService.room"
- import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"
-
- LogicalSystem System_PingPongReplPort {
- SubSystemRef subsystem: SubSystem_PingPongReplPort
- }
-
- SubSystemClass SubSystem_PingPongReplPort {
- ActorRef application: PingPongTop
- ActorRef services: ATimingService
- LayerConnection ref application satisfied_by services.timer
- LogicalThread mrPingThread prio=5 {application.MrPing}
- LogicalThread mrPong1Thread prio=5 {application.MrPong1}
- LogicalThread mrPong2Thread prio=5 {application.MrPong2}
- LogicalThread mrPong3Thread prio=5 {application.MrPong3}
- }
-
- ActorClass PingPongTop {
- Structure {
- ActorRef MrPing: MrPingActor
- ActorRef MrPong1: MrPongActor1
- ActorRef MrPong2: MrPongActor1
- ActorRef MrPong3: MrPongActor1
- Binding MrPing.PingPongPort and MrPong1.PingPongPort
- Binding MrPing.PingPongPort and MrPong2.PingPongPort
- Binding MrPing.PingPongPort and MrPong3.PingPongPort
- }
- Behavior { }
- }
-
- ActorClass MrPingActor {
- Interface {
- conjugated Port PingPongPort [3] : PingPongProtocol
- }
- Structure {
- usercode1 {
- "import org.eclipse.etrice.runtime.java.messaging.RTServices;"
- }
- external Port PingPongPort
- SAP timer: PTimer
- Attribute count : int32
- Attribute pongCount : int32
- }
- Behavior {
- StateMachine {
- Transition tr0: initial -> waitForTimer {
- action {
- "count = 0;"
- "timer.startTimeout(1000);"
- }
- }
- Transition tr1: waitForTimer -> waitForPong {
- triggers {
- <timeout: timer>
- }
- action {
- "PingPongPort.get(0).ping();"
- "PingPongPort.get(1).ping();"
- "PingPongPort.get(2).ping();"
- "pongCount = 0;"
- }
- }
- Transition tr3: waitForPong -> cp cp0 {
- triggers {
- <pong: PingPongPort>
- }
- action {
- "pongCount++;"
- }
- }
- Transition tr4: cp cp0 -> waitForTimer {
- action {
- "if (count++ > 1000) {"
- "RTServices.getInstance().getSubSystem().testFinished(0);"
- "} else {"
- "//PingPongPort.get(0).ping();"
- "//PingPongPort.get(1).ping();"
- "//PingPongPort.get(2).ping();"
- "System.out.println(pongCount);"
- "System.out.println(count);"
- "pongCount = 0;"
- "timer.startTimeout(10);"
- "}"
- }
- }
- Transition tr6: cp cp0 -> waitForPong {
- cond {
- "pongCount < 3"
- }
- }
- ChoicePoint cp0
- State waitForTimer
- State waitForPong
- }
- }
- }
-
- ActorClass MrPongActor1 {
- Interface {
- Port PingPongPort: PingPongProtocol
- }
- Structure {
- external Port PingPongPort
- }
- Behavior {
- StateMachine {
- Transition tr0: initial -> waitForPing { }
- Transition myTrigger: waitForPing -> waitForPing {
- triggers {
- <ping: PingPongPort>
- }
- action {
- "PingPongPort.pong();"
- }
- }
- State waitForPing
- }
- }
- }
-
- ProtocolClass PingPongProtocol {
- incoming {
- Message ping()
- }
- outgoing {
- Message pong()
- }
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.SendingDataByValueTest.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.SendingDataByValueTest.room
deleted file mode 100644
index 4cb136360..000000000
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.SendingDataByValueTest.room
+++ /dev/null
@@ -1,306 +0,0 @@
-RoomModel org.eclipse.etrice.integration.SendingDataByValueTest {
-
- import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"
-
- LogicalSystem LogSys_SendingData {
- SubSystemRef application: SubSys_SendingData
- }
-
- SubSystemClass SubSys_SendingData {
- ActorRef top: SendingDataTop
- }
-
- ActorClass SendingDataTop {
- Structure {
- ActorRef mrPing: MrPing
- ActorRef mrPong: MrPong
- Binding mrPing.PingPongPort and mrPong.PingPongPort
- }
- Behavior { }
- }
-
- ActorClass MrPong {
- Interface {
- Port PingPongPort: PingPongProtocol
- }
- Structure {
- external Port PingPongPort
- }
- Behavior {
- Operation printData(d: PingPongData) {
- "System.out.printf(\"\\n\");"
- "System.out.printf(\"i8Val: %d \\n\",d.getI8Val());"
- "System.out.printf(\"i16Val: %d \\n\",d.getI16Val());"
- "System.out.printf(\"i32Val: %d \\n\",d.getI32Val());"
- "System.out.printf(\"charVal: %c \\n\",d.getCharVal());"
- "System.out.printf(\"f32Val: %f \\n\",d.getF32Val());"
- "System.out.printf(\"f64Val: %f \\n\",d.getF64Val());"
- "System.out.printf(\"stringVal: %s \\n\",d.getStringVal());"
- "System.out.printf(\"i32Array: %d %d %d %d %d\\n\",d.getArrayFromInt32()[0],d.getArrayFromInt32()[1],d.getArrayFromInt32()[2],d.getArrayFromInt32()[3],d.getArrayFromInt32()[4] );"
- "System.out.printf(\"\\n\");"
- }
- StateMachine {
- Transition tr0: reply -> reply {
- triggers {
- <ping: PingPongPort>
- }
- action {
- "p.setI8Val((byte)(p.getI8Val()+1));"
- ""
- ""
- "PingPongPort.pong(p);"
- }
- }
- Transition tr1: reply -> reply {
- triggers {
- <pingSimple: PingPongPort>
- }
- action {
- "PingPongPort.pongSimple(++p);"
- }
- }
- Transition init: initial -> reply { }
- State reply
- }
- }
- }
-
- ActorClass MrPing {
- Interface {
- conjugated Port PingPongPort: PingPongProtocol
- }
- Structure {
- usercode1{
- "import org.eclipse.etrice.integration.tests.helpers.*;"
- "import org.eclipse.etrice.runtime.java.messaging.RTServices;"
- }
- usercode2 {
- "private CRC16Generator crcGen = new CRC16Generator();"
- }
- external Port PingPongPort
- Attribute i32Array[10] : int32
- Attribute data : PingPongData
- }
- Behavior {
- Operation printData(d: PingPongData) {
- "System.out.printf(\"MrPing:\\n\");"
- "System.out.printf(\"i8Val: %d \\n\",d.getI8Val());"
- "System.out.printf(\"i16Val: %d \\n\",d.getI16Val());"
- "System.out.printf(\"i32Val: %d \\n\",d.getI32Val());"
- "System.out.printf(\"charVal: %c \\n\",d.getCharVal());"
- "System.out.printf(\"f32Val: %f \\n\",d.getF32Val());"
- "System.out.printf(\"f64Val: %f \\n\",d.getF64Val());"
- "System.out.printf(\"stringVal: %s \\n\",d.getStringVal());"
- "System.out.printf(\"i32Array: %d %d %d %d %d\\n\",d.getArrayFromInt32()[0],d.getArrayFromInt32()[1],d.getArrayFromInt32()[2],d.getArrayFromInt32()[3],d.getArrayFromInt32()[4] );"
- "System.out.printf(\"\\n\");"
- }
- StateMachine {
- Transition init: initial -> waitForPong {
- action {
- "int i;"
- "int[] intArray;"
- "this.data=new PingPongData();"
- ""
- "// send default data"
- "PingPongData d = new PingPongData();"
- "PingPongPort.ping(d);"
- ""
- "d.setI8Val((byte) 45);"
- "d.setI16Val((short) 34);"
- "d.setI32Val(2);"
- "d.setF32Val((float)3.14);"
- "d.setF64Val(7.12345);"
- "d.setStringVal(\"Hase !\");"
- ""
- "d.getOwnType().setI8Val((byte)10);"
- "d.getOwnType().setI16Val((short)17);"
- "d.getOwnType().setI32Val(4711);"
- "d.getOwnType().setF32Val((float)3.0815);"
- "d.getOwnType().setF64Val(123.45678);"
- "d.getOwnType().setStringVal(\"Deep Hase !\");"
- "intArray = d.getOwnType().getArrayFromInt32();"
- "for (i=0;i<intArray.length;i++) {intArray[i] = 10+i;}"
- "d.getOwnType().setArrayFromInt32(intArray);"
- ""
- "PingPongPort.ping(d);"
- ""
- "d.setI8Val((byte) 55);"
- "d.setI16Val((short) 44);"
- "d.setI32Val(3);"
- "d.setF32Val((float)24.4563458);"
- "d.setF64Val(2347.2342312345);"
- "d.setStringVal(\"Mein Hase !\");"
- ""
- "d.getOwnType().setI8Val((byte)15);"
- "d.getOwnType().setI16Val((short)23);"
- "d.getOwnType().setI32Val(4812);"
- "d.getOwnType().setF32Val((float)2453.30815);"
- "d.getOwnType().setF64Val(125332.42342);"
- "d.getOwnType().setStringVal(\"Mein Deep Hase !\");"
- "intArray = d.getOwnType().getArrayFromInt32();"
- "for (i=0;i<intArray.length;i++) {intArray[i] = 30+i;}"
- "d.getOwnType().setArrayFromInt32(intArray);"
- ""
- "PingPongPort.ping(d);"
- "PingPongPort.ping(data);"
- ""
- "data.setI8Val((byte) 67);"
- "data.setI16Val((short) 97);"
- "data.setI32Val(70);"
- "data.setF32Val((float)233.14);"
- "data.setF64Val(723434.12345);"
- "data.setStringVal(\"Falscher Hase !\");"
- ""
- "crcGen.update(10);"
- }
- }
- Transition tr0: my tp0 -> my tp0 {
- triggers {
- <pong: PingPongPort>
- }
- action {
- "System.out.printf(\"Top Level : \\n\");"
- "printData(p);"
- "crcGen.update(20);"
- }
- }
- Transition tr1: my tp0 -> my tp0 {
- triggers {
- <pongSimple: PingPongPort>
- }
- action {
- "System.out.printf(\"Top Level Simple: \\n\");"
- "crcGen.update(35);"
- }
- }
- Transition tr10: waitForPong -> cp cp0 {
- triggers {
- <pong: PingPongPort>
- }
- action {
- "printData(p);"
- "crcGen.update(11);"
- }
- }
- Transition tr4: cp cp0 -> waitForPong {
- action {
- "crcGen.update(12);"
- }
- }
- Transition tr3: cp cp0 -> state0 {
- cond {
- "(p.i32Val==2) && (p.i8Val==46)"
- }
- action {
- "// send default values"
- "PingPongPort.ping(data);"
- ""
- "data.getOwnType().setI8Val((byte)10);"
- "data.getOwnType().setI16Val((short)17);"
- "data.getOwnType().setI32Val(4711);"
- "data.getOwnType().setF32Val((float)3.0815);"
- "data.getOwnType().setF64Val(123.45678);"
- "data.getOwnType().setStringVal(\"Deep Hase !\");"
- "int[] intArray = data.getOwnType().getArrayFromInt32();"
- "for (int i=0;i<intArray.length;i++) {intArray[i] = 10+i;}"
- "data.getOwnType().setArrayFromInt32(intArray);"
- "int[] intArrayShort=data.getArrayFromInt32();"
- "for (int j=0;j<intArrayShort.length;j++) {intArray[j] = 10+j;}"
- ""
- "// use convenient function"
- "PingPongPort.ping((byte)45,(short)34,80,\'c\',(float)3.14,7.12345,\"Hase !\",intArrayShort,data.getOwnType());"
- ""
- "crcGen.update(13);"
- }
- }
- Transition tr5: state0 -> state1 {
- triggers {
- <pong: PingPongPort guard {
- "p.getI32Val()==3"
- }>
- }
- action {
- "printData(p);"
- "PingPongPort.pingSimple(12);"
- "PingPongPort.pingSimple(27);"
- "crcGen.update(14);"
- }
- }
- Transition tr6: state1 -> state2 {
- triggers {
- <pongSimple: PingPongPort>
- }
- action {
- "crcGen.update(15);"
- }
- }
- Transition tr7: state2 -> cp cp1 {
- triggers {
- <pongSimple: PingPongPort>
- }
- action {
- "crcGen.update(16);"
- "System.out.printf(\"CRC: %d \\n\", crcGen.getCrc());"
- }
- }
- Transition tr8: cp cp1 -> TestFalse {
- action {
- "RTServices.getInstance().getSubSystem().testFinished(1);"
- }
- }
- Transition tr9: cp cp1 -> TestOk {
- cond {
- "(p==28) && (crcGen.getCrc()==1187)"
- }
- action {
- "RTServices.getInstance().getSubSystem().testFinished(0);"
- }
- }
- ChoicePoint cp0
- ChoicePoint cp1
- TransitionPoint tp0
- State waitForPong
- State state0
- State state1
- State state2
- State TestFalse
- State TestOk
- }
- }
- }
-
- ProtocolClass PingPongProtocol {
- incoming {
- Message ping(p: PingPongData)
- Message pingSimple(p: int32)
- }
- outgoing {
- Message pong(p: PingPongData)
- Message pongSimple(p: int32)
- }
- }
-
- DataClass PingPongData {
- Attribute i8Val: int8 = "34"
- Attribute i16Val: int16 = "24"
- Attribute i32Val: int32 = "12"
- Attribute charVal: char = "'c'"
- Attribute f32Val: float32 = "4711.0815f"
- Attribute f64Val: float64 = "47114711.08150815"
- Attribute stringVal: string = "\"Du alter Depp !\""
- Attribute arrayFromInt32[5]: int32 = "{1,2,3,4,5}"
- Attribute ownType: PingPongDataDeep
- }
-
- DataClass PingPongDataDeep {
- Attribute i8Val: int8
- Attribute i16Val: int16
- Attribute i32Val: int32
- Attribute charVal: char
- Attribute f32Val: float32
- Attribute f64Val: float64
- Attribute stringVal: string
- Attribute arrayFromInt32[10]: int32
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.integration.tests/org.eclipse.etrice.integration.tests.launch b/tests/org.eclipse.etrice.integration.tests/org.eclipse.etrice.integration.tests.launch
deleted file mode 100644
index acfe54a25..000000000
--- a/tests/org.eclipse.etrice.integration.tests/org.eclipse.etrice.integration.tests.launch
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.etrice.integration.tests"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.etrice.integration.tests"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.integration.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTest_Top.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTest_Top.java
deleted file mode 100644
index 677369e2e..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTest_Top.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.etrice.integration.ChoicePointTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-
-
-
-public class CPTest_Top extends ActorClassBase {
-
-
-
- //--------------------- ports
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
-
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public CPTest_Top(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("CPTest_Top");
-
- // initialize attributes
-
- // own ports
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
-
-
- //--------------------- port getters
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
- //--------------------- no state machine
- @Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data) {
- handleSystemEvent(ifitem, evt, data);
- }
-
- @Override
- public void executeInitTransition(){
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java
deleted file mode 100644
index 715af7dfb..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package org.eclipse.etrice.integration.ChoicePointTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-import org.eclipse.etrice.integration.ChoicePointTest.TestProtocol.*;
-
-
-
-public class CPTester extends ActorClassBase {
-
-
-
- //--------------------- ports
- protected TestProtocolConjPort TestPort1 = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_TestPort1 = 1;
-
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public CPTester(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("CPTester");
-
- // initialize attributes
-
- // own ports
- TestPort1 = new TestProtocolConjPort(this, "TestPort1", IFITEM_TestPort1, 0, port_addr[IFITEM_TestPort1][0], peer_addr[IFITEM_TestPort1][0]);
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
-
-
- //--------------------- port getters
- public TestProtocolConjPort getTestPort1 (){
- return this.TestPort1;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
-
- /* state IDs */
- public static final int STATE_state0 = 2;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__state0 = 1;
-
- /* triggers */
- public static final int POLLING = 0;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","state0"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
-
- /* Action Codes */
- protected void action_TRANS_INITIAL_TO__state0() {
- TestPort1.msg1();
- System.out.println("msg1 sent ");
-
- TestPort1.msg1();
- System.out.println("msg1 sent ");
-
- TestPort1.msg1();
- System.out.println("msg1 sent ");
-
- TestPort1.msg1();
- System.out.println("msg1 sent ");
-
- TestPort1.msg1();
- System.out.println("msg1 sent ");
-
- TestPort1.msg1();
- System.out.println("msg1 sent ");
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_state0:
- this.history[STATE_TOP] = STATE_state0;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_INITIAL_TO__state0:
- {
- action_TRANS_INITIAL_TO__state0();
- return STATE_state0;
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_state0:
- // in leaf state: return state id
- return STATE_state0;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__state0;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_state0:
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java
deleted file mode 100644
index fda4a4259..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java
+++ /dev/null
@@ -1,465 +0,0 @@
-package org.eclipse.etrice.integration.ChoicePointTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-import org.eclipse.etrice.integration.ChoicePointTest.TestProtocol.*;
-
-/*--------------------- begin user code ---------------------*/
-import org.eclipse.etrice.integration.tests.helpers.*;
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-/*--------------------- end user code ---------------------*/
-
-
-public class CPUser extends ActorClassBase {
-
- /*--------------------- begin user code ---------------------*/
- private CRC16Generator crcGen = new CRC16Generator();
- /*--------------------- end user code ---------------------*/
-
-
- //--------------------- ports
- protected TestProtocolPort TestPort1 = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_TestPort1 = 1;
-
-
- /*--------------------- attributes ---------------------*/
- int counter;
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public CPUser(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("CPUser");
-
- // initialize attributes
- counter = 0;
-
- // own ports
- TestPort1 = new TestProtocolPort(this, "TestPort1", IFITEM_TestPort1, 0, port_addr[IFITEM_TestPort1][0], peer_addr[IFITEM_TestPort1][0]);
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
- public void setCounter (int counter) {
- this.counter = counter;
- }
- public int getCounter () {
- return this.counter;
- }
-
-
- //--------------------- port getters
- public TestProtocolPort getTestPort1 (){
- return this.TestPort1;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
-
- /* state IDs */
- public static final int STATE_state1 = 2;
- public static final int STATE_state0 = 3;
- public static final int STATE_state1_state0 = 4;
- public static final int STATE_testOk = 5;
- public static final int STATE_testFalse = 6;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__cp0 = 1;
- public static final int CHAIN_TRANS_tr1_FROM_state0_TO_cp1_BY_msg1TestPort1 = 2;
- public static final int CHAIN_TRANS_tr5_FROM_state1_TO_cp2_BY_msg1TestPort1 = 3;
- public static final int CHAIN_TRANS_tr7_FROM_state1_TO_state0_BY_msg1TestPort1 = 4;
- public static final int CHAIN_TRANS_tr8_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr8 = 5;
- public static final int CHAIN_state1_TRANS_INITIAL_TO__state0 = 6;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_TestPort1__msg1 = IFITEM_TestPort1 + EVT_SHIFT*TestProtocol.IN_msg1;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","state1",
- "state0",
- "state1_state0",
- "testOk",
- "testFalse"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
- protected void entry_state0() {
- System.out.println("state0: entry code");
- crcGen.update(12);
- }
- protected void exit_state0() {
- System.out.println("state0: exit code");
- crcGen.update(13);
- }
- protected void entry_state1() {
- System.out.println("state1: entry code");
- crcGen.update(20);
- }
- protected void exit_state1() {
- System.out.println("state1: exit code");
- crcGen.update(21);
- }
- protected void entry_state1_state0() {
- System.out.println("state1\\0: entry code");
- System.out.printf("counter => %d\n",counter);
- crcGen.update(22);
- }
- protected void exit_state1_state0() {
- System.out.println("state1\\0: exit code");
- crcGen.update(23);
- }
-
- /* Action Codes */
- protected void action_TRANS_INITIAL_TO__cp0() {
- System.out.println("Top Level init transition");
- crcGen.update(10);
- counter = 0;
- }
- protected void action_TRANS_tr4_FROM_cp0_TO_state0() {
- System.out.println("choice0: else code");
- crcGen.update(17);
- }
- protected void action_TRANS_LastCheck_FROM_cp0_TO_state0_COND_LastCheck() {
- System.out.println("choice0: true code");
- crcGen.update(15);
- }
- protected void action_TRANS_tr1_FROM_state0_TO_cp1_BY_msg1TestPort1(InterfaceItemBase ifitem) {
- System.out.println("state0: msg1: transition code");
- crcGen.update(18);
- }
- protected void action_TRANS_tr2_FROM_cp1_TO_state0(InterfaceItemBase ifitem) {
- System.out.println("choice1: else code");
- crcGen.update(10);
- counter=3;
- }
- protected void action_TRANS_tr3_FROM_cp1_TO_state1_tp0_COND_tr3(InterfaceItemBase ifitem) {
- System.out.println("choice1: to entry state1 code");
- crcGen.update(30);
- }
- protected void action_TRANS_tr5_FROM_state1_TO_cp2_BY_msg1TestPort1(InterfaceItemBase ifitem) {
- System.out.println("state1: msg1: transition code");
- crcGen.update(30);
- System.out.printf("CRC: %d \n", crcGen.getCrc());
- }
- protected void action_TRANS_tr0_FROM_cp2_TO_testFalse(InterfaceItemBase ifitem) {
- System.out.println("Test false");
- RTServices.getInstance().getSubSystem().testFinished(1);
- }
- protected void action_TRANS_tr6_FROM_cp2_TO_testOk_COND_tr6(InterfaceItemBase ifitem) {
- System.out.println("Test ok");
- RTServices.getInstance().getSubSystem().testFinished(0);
- }
- protected void action_TRANS_tr11_FROM_cp1_TO_state1_COND_tr11(InterfaceItemBase ifitem) {
- System.out.println("choice1: history to State1 transition code");
- crcGen.update(25);
- counter = 1;
- }
- protected void action_TRANS_tr7_FROM_state1_TO_state0_BY_msg1TestPort1(InterfaceItemBase ifitem) {
- System.out.println("state1: msg1: transition code to state0");
- crcGen.update(51);
- counter=4;
- }
- protected void action_TRANS_tr8_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr8(InterfaceItemBase ifitem) {
- System.out.println("Handler: msg1 received ");
- crcGen.update(115);
- counter = 2;
- }
- protected void action_state1_TRANS_tr1_FROM_tp0_TO_cp0(InterfaceItemBase ifitem) {
- System.out.println("state1: tp0: transition code");
- crcGen.update(25);
- }
- protected void action_state1_TRANS_tr2_FROM_cp0_TO_state0(InterfaceItemBase ifitem) {
- System.out.println("state1: choice false code");
- crcGen.update(57);
- }
- protected void action_state1_TRANS_tr0_FROM_cp0_TO_state0_COND_tr0(InterfaceItemBase ifitem) {
- System.out.println("state1 choice: true code");
- crcGen.update(56);
- }
- protected void action_state1_TRANS_INITIAL_TO__state0() {
- System.out.println("state1 initial transition code");
- crcGen.update(53);
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_state0:
- if (!handler) exit_state0();
- this.history[STATE_TOP] = STATE_state0;
- current = STATE_TOP;
- break;
- case STATE_state1:
- if (!handler) exit_state1();
- this.history[STATE_TOP] = STATE_state1;
- current = STATE_TOP;
- break;
- case STATE_state1_state0:
- if (!handler) exit_state1_state0();
- this.history[STATE_state1] = STATE_state1_state0;
- current = STATE_state1;
- break;
- case STATE_testOk:
- this.history[STATE_TOP] = STATE_testOk;
- current = STATE_TOP;
- break;
- case STATE_testFalse:
- this.history[STATE_TOP] = STATE_testFalse;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_INITIAL_TO__cp0:
- {
- action_TRANS_INITIAL_TO__cp0();
- if (counter == 0) {
- action_TRANS_LastCheck_FROM_cp0_TO_state0_COND_LastCheck();
- return STATE_state0;}
- else {
- action_TRANS_tr4_FROM_cp0_TO_state0();
- return STATE_state0;}
- }
- case CHAIN_TRANS_tr1_FROM_state0_TO_cp1_BY_msg1TestPort1:
- {
- action_TRANS_tr1_FROM_state0_TO_cp1_BY_msg1TestPort1(ifitem);
- if (counter == 4) {
- action_TRANS_tr3_FROM_cp1_TO_state1_tp0_COND_tr3(ifitem);
- entry_state1();
- action_state1_TRANS_tr1_FROM_tp0_TO_cp0(ifitem);
- if (counter == 4) {
- action_state1_TRANS_tr0_FROM_cp0_TO_state0_COND_tr0(ifitem);
- return STATE_state1_state0;}
- else {
- action_state1_TRANS_tr2_FROM_cp0_TO_state0(ifitem);
- return STATE_state1_state0;}
- }
- else if (counter == 3) {
- action_TRANS_tr11_FROM_cp1_TO_state1_COND_tr11(ifitem);
- return STATE_state1;}
- else {
- action_TRANS_tr2_FROM_cp1_TO_state0(ifitem);
- return STATE_state0;}
- }
- case CHAIN_TRANS_tr5_FROM_state1_TO_cp2_BY_msg1TestPort1:
- {
- action_TRANS_tr5_FROM_state1_TO_cp2_BY_msg1TestPort1(ifitem);
- if (crcGen.getCrc()==26639) {
- action_TRANS_tr6_FROM_cp2_TO_testOk_COND_tr6(ifitem);
- return STATE_testOk;}
- else {
- action_TRANS_tr0_FROM_cp2_TO_testFalse(ifitem);
- return STATE_testFalse;}
- }
- case CHAIN_TRANS_tr7_FROM_state1_TO_state0_BY_msg1TestPort1:
- {
- action_TRANS_tr7_FROM_state1_TO_state0_BY_msg1TestPort1(ifitem);
- return STATE_state0;
- }
- case CHAIN_TRANS_tr8_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr8:
- {
- action_TRANS_tr8_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr8(ifitem);
- return STATE_TOP;
- }
- case CHAIN_state1_TRANS_INITIAL_TO__state0:
- {
- action_state1_TRANS_INITIAL_TO__state0();
- return STATE_state1_state0;
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_state0:
- if (!(skip_entry || handler)) entry_state0();
- // in leaf state: return state id
- return STATE_state0;
- case STATE_state1:
- if (!(skip_entry || handler)) entry_state1();
- // state has a sub graph
- // with init transition
- if (this.history[STATE_state1]==NO_STATE) {
- state = executeTransitionChain(CHAIN_state1_TRANS_INITIAL_TO__state0, null, null);
- }
- else {
- state = this.history[STATE_state1];
- }
- break;
- case STATE_state1_state0:
- if (!(skip_entry || handler)) entry_state1_state0();
- // in leaf state: return state id
- return STATE_state1_state0;
- case STATE_testOk:
- // in leaf state: return state id
- return STATE_testOk;
- case STATE_testFalse:
- // in leaf state: return state id
- return STATE_testFalse;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__cp0;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_state0:
- switch(trigger) {
- case TRIG_TestPort1__msg1:
- {
- chain = CHAIN_TRANS_tr1_FROM_state0_TO_cp1_BY_msg1TestPort1;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- case STATE_state1_state0:
- switch(trigger) {
- case TRIG_TestPort1__msg1:
- {
- if (counter==2)
- {
- chain = CHAIN_TRANS_tr5_FROM_state1_TO_cp2_BY_msg1TestPort1;
- catching_state = STATE_TOP;
- } else
- if (counter==1)
- {
- chain = CHAIN_TRANS_tr7_FROM_state1_TO_state0_BY_msg1TestPort1;
- catching_state = STATE_TOP;
- } else
- {
- chain = CHAIN_TRANS_tr8_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr8;
- catching_state = STATE_TOP;
- is_handler = true;
- skip_entry = true;
- }
- }
- break;
- }
- break;
- case STATE_testOk:
- switch(trigger) {
- case TRIG_TestPort1__msg1:
- {
- chain = CHAIN_TRANS_tr8_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr8;
- catching_state = STATE_TOP;
- is_handler = true;
- skip_entry = true;
- }
- break;
- }
- break;
- case STATE_testFalse:
- switch(trigger) {
- case TRIG_TestPort1__msg1:
- {
- chain = CHAIN_TRANS_tr8_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr8;
- catching_state = STATE_TOP;
- is_handler = true;
- skip_entry = true;
- }
- break;
- }
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/SubSystem_CPTest.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/SubSystem_CPTest.java
deleted file mode 100644
index 70a8dd253..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/SubSystem_CPTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.eclipse.etrice.integration.ChoicePointTest;
-
-import org.eclipse.etrice.runtime.java.messaging.MessageService;
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.RTSystemServicesProtocol.*;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-
-
-
-
-public class SubSystem_CPTest extends SubSystemClassBase{
-
-
- public SubSystem_CPTest(String name) {
- super(name);
- }
-
- @Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data){
- }
-
- @Override
- public void instantiateMessageServices(){
-
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 0, 0),"MessageService_Main"));
- }
-
- @Override
- public void instantiateActors(){
-
- // all addresses
- // Addresses for the Subsystem Systemport
- Address addr_item_SystemPort_0 = new Address(0,0,106);
- Address addr_item_SystemPort_1 = new Address(0,0,107);
- Address addr_item_SystemPort_2 = new Address(0,0,108);
-
- // actor instance /SubSystem_CPTest/HandlerTest_Top itself => Systemport Address
- Address addr_item__SubSystem_CPTest_HandlerTest_Top = new Address(0,0,101);
- // interface items of /SubSystem_CPTest/HandlerTest_Top
- // actor instance /SubSystem_CPTest/HandlerTest_Top/cp_tester itself => Systemport Address
- Address addr_item__SubSystem_CPTest_HandlerTest_Top_cp_tester = new Address(0,0,102);
- // interface items of /SubSystem_CPTest/HandlerTest_Top/cp_tester
- Address addr_item__SubSystem_CPTest_HandlerTest_Top_cp_tester_TestPort1 = new Address(0,0,103);
- // actor instance /SubSystem_CPTest/HandlerTest_Top/cp_user itself => Systemport Address
- Address addr_item__SubSystem_CPTest_HandlerTest_Top_cp_user = new Address(0,0,104);
- // interface items of /SubSystem_CPTest/HandlerTest_Top/cp_user
- Address addr_item__SubSystem_CPTest_HandlerTest_Top_cp_user_TestPort1 = new Address(0,0,105);
-
- // instantiate all actor instances
- instances = new ActorClassBase[3];
- instances[0] = new CPTest_Top(
- this,
- "HandlerTest_Top",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_CPTest_HandlerTest_Top}
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_0}
- }
- );
- instances[1] = new CPTester(
- instances[0],
- "cp_tester",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_CPTest_HandlerTest_Top_cp_tester},
- {
- addr_item__SubSystem_CPTest_HandlerTest_Top_cp_tester_TestPort1
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_1},
- {
- addr_item__SubSystem_CPTest_HandlerTest_Top_cp_user_TestPort1
- }
- }
- );
- instances[2] = new CPUser(
- instances[0],
- "cp_user",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_CPTest_HandlerTest_Top_cp_user},
- {
- addr_item__SubSystem_CPTest_HandlerTest_Top_cp_user_TestPort1
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_2},
- {
- addr_item__SubSystem_CPTest_HandlerTest_Top_cp_tester_TestPort1
- }
- }
- );
-
- // apply instance attribute configurations
-
- // create the subsystem system port
- RTSystemPort = new RTSystemServicesProtocolConjPortRepl(this, "RTSystemPort",
- 0, //local ID
- // own addresses
- new Address[]{
- addr_item_SystemPort_0,
- addr_item_SystemPort_1,
- addr_item_SystemPort_2
- },
- // peer addresses
- new Address[]{
- addr_item__SubSystem_CPTest_HandlerTest_Top,
- addr_item__SubSystem_CPTest_HandlerTest_Top_cp_tester,
- addr_item__SubSystem_CPTest_HandlerTest_Top_cp_user
- });
- }
-
-
- @Override
- public void init(){
- super.init();
- }
-
- @Override
- public void stop(){
- super.stop();
- }
-
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/SubSystem_CPTestRunner.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/SubSystem_CPTestRunner.java
deleted file mode 100644
index ac612a848..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/SubSystem_CPTestRunner.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author generated by eTrice
- *
- * this class contains the main function running component SubSystem_CPTest
- * it instantiates SubSystem_CPTest and starts and ends the lifecycle
- */
-
-package org.eclipse.etrice.integration.ChoicePointTest;
-
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemRunnerBase;
-
-class SubSystem_CPTestRunner extends SubSystemRunnerBase {
-
- /**
- * main function
- * creates the main component and starts and stops the lifecycle
- */
- public static void main(String[] args) {
- // instantiate the main component
- SubSystem_CPTest main_component = new SubSystem_CPTest("SubSystem_CPTest");
-
- run(main_component, args);
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/TestProtocol.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/TestProtocol.java
deleted file mode 100644
index 5bdab73a2..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/TestProtocol.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package org.eclipse.etrice.integration.ChoicePointTest;
-
-import java.util.ArrayList;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.Message;
-import org.eclipse.etrice.runtime.java.modelbase.*;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-
-
-
-public class TestProtocol {
- // message IDs
- public static final int MSG_MIN = 0;
- public static final int IN_msg1 = 1;
- public static final int IN_msg2 = 2;
- public static final int IN_msg3 = 3;
- public static final int IN_msg4 = 4;
- public static final int IN_msg5 = 5;
- public static final int MSG_MAX = 6;
-
-
- private static String messageStrings[] = {"MIN", "msg1","msg2","msg3","msg4","msg5","MAX"};
-
- public String getMessageString(int msg_id) {
- if (msg_id<MSG_MIN || msg_id>MSG_MAX+1){
- // id out of range
- return "Message ID out of range";
- }
- else{
- return messageStrings[msg_id];
- }
- }
-
-
- // port class
- static public class TestProtocolPort extends PortBase {
- // constructors
- public TestProtocolPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public TestProtocolPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- }
-
- // replicated port class
- static public class TestProtocolReplPort {
- private ArrayList<TestProtocolPort> ports;
- private int replication;
-
- public TestProtocolReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<TestProtocol.TestProtocolPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new TestProtocolPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public TestProtocolPort get(int i) {
- return ports.get(i);
- }
-
- // outgoing messages
- }
-
-
- // port class
- static public class TestProtocolConjPort extends PortBase {
- // constructors
- public TestProtocolConjPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public TestProtocolConjPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void msg1() {
- if (messageStrings[ IN_msg1] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_msg1]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), IN_msg1));
- }
- public void msg2() {
- if (messageStrings[ IN_msg2] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_msg2]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), IN_msg2));
- }
- public void msg3() {
- if (messageStrings[ IN_msg3] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_msg3]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), IN_msg3));
- }
- public void msg4() {
- if (messageStrings[ IN_msg4] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_msg4]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), IN_msg4));
- }
- public void msg5() {
- if (messageStrings[ IN_msg5] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_msg5]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), IN_msg5));
- }
- }
-
- // replicated port class
- static public class TestProtocolConjReplPort {
- private ArrayList<TestProtocolConjPort> ports;
- private int replication;
-
- public TestProtocolConjReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<TestProtocol.TestProtocolConjPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new TestProtocolConjPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public TestProtocolConjPort get(int i) {
- return ports.get(i);
- }
-
- // incoming messages
- public void msg1(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).msg1();
- }
- }
- public void msg2(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).msg2();
- }
- }
- public void msg3(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).msg3();
- }
- }
- public void msg4(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).msg4();
- }
- }
- public void msg5(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).msg5();
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/AC1_ac.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/AC1_ac.java
deleted file mode 100644
index 55d4a71cb..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/AC1_ac.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package org.eclipse.etrice.integration.ConfigTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-import org.eclipse.etrice.integration.ConfigTest.PortProtocol.*;
-
-
-
-public class AC1_ac extends ActorClassBase {
-
-
-
- //--------------------- ports
- protected PortProtocolConjPort Conj_port = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_Conj_port = 1;
-
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public AC1_ac(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("AC1_ac");
-
- // initialize attributes
-
- // own ports
- Conj_port = new PortProtocolConjPort(this, "Conj_port", IFITEM_Conj_port, 0, port_addr[IFITEM_Conj_port][0], peer_addr[IFITEM_Conj_port][0]);
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
-
-
- //--------------------- port getters
- public PortProtocolConjPort getConj_port (){
- return this.Conj_port;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
-
- /* state IDs */
- public static final int STATE_Done = 2;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__Done = 1;
-
- /* triggers */
- public static final int POLLING = 0;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","Done"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
- protected void entry_Done() {
- if(Conj_port.varCheck())
- Conj_port.portTestSucc();
- }
-
- /* Action Codes */
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_Done:
- this.history[STATE_TOP] = STATE_Done;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_INITIAL_TO__Done:
- {
- return STATE_Done;
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_Done:
- if (!(skip_entry || handler)) entry_Done();
- // in leaf state: return state id
- return STATE_Done;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__Done;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_Done:
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/ConfigText_Top_ac.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/ConfigText_Top_ac.java
deleted file mode 100644
index 16626d83d..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/ConfigText_Top_ac.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.etrice.integration.ConfigTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-
-
-
-public class ConfigText_Top_ac extends ActorClassBase {
-
-
-
- //--------------------- ports
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
-
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public ConfigText_Top_ac(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("ConfigText_Top_ac");
-
- // initialize attributes
-
- // own ports
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
-
-
- //--------------------- port getters
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
- //--------------------- no state machine
- @Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data) {
- handleSystemEvent(ifitem, evt, data);
- }
-
- @Override
- public void executeInitTransition(){
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/DynTestee_ac.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/DynTestee_ac.java
deleted file mode 100644
index 6eb067733..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/DynTestee_ac.java
+++ /dev/null
@@ -1,363 +0,0 @@
-package org.eclipse.etrice.integration.ConfigTest;
-
-import org.eclipse.etrice.runtime.java.config.DynConfigLock;
-import org.eclipse.etrice.runtime.java.config.VariableService;
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-import org.eclipse.etrice.integration.ConfigTest.TestCommProtocol.*;
-
-/*--------------------- begin user code ---------------------*/
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-/*--------------------- end user code ---------------------*/
-
-
-public class DynTestee_ac extends ActorClassBase {
-
-
- private VariableService variableService;
-
- //--------------------- ports
- protected TestCommProtocolConjPort Conj_DynConfigPort = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_Conj_DynConfigPort = 1;
-
-
- /*--------------------- attributes ---------------------*/
- int int_i;
- Dyn_DC1 dc_i;
- int blockMe;
- boolean blocker;
- Dyn_DC1 dc_dump;
- int int_dump;
- private DynConfigLock lock_blockMe;
- private DynConfigLock lock_dc_i;
- private DynConfigLock lock_int_i;
- private DynConfigLock lock_blocker;
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public DynTestee_ac(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("DynTestee_ac");
-
- // initialize attributes
- int_i = 0;
- dc_i = new Dyn_DC1();
- blockMe = 0;
- blocker = false;
- dc_dump = new Dyn_DC1();
- int_dump = 0;
-
- // own ports
- Conj_DynConfigPort = new TestCommProtocolConjPort(this, "Conj_DynConfigPort", IFITEM_Conj_DynConfigPort, 0, port_addr[IFITEM_Conj_DynConfigPort][0], peer_addr[IFITEM_Conj_DynConfigPort][0]);
-
- // own saps
-
- // own service implementations
- }
-
- public DynTestee_ac(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr, VariableService variableService){
- this(parent, name, port_addr, peer_addr);
-
- this.variableService = variableService;
- lock_blockMe = new DynConfigLock();
- lock_dc_i = new DynConfigLock();
- lock_int_i = new DynConfigLock();
- lock_blocker = new DynConfigLock();
- }
-
- //--------------------- attribute setters and getters
- public void setDc_dump (Dyn_DC1 dc_dump) {
- this.dc_dump = dc_dump;
- }
- public Dyn_DC1 getDc_dump () {
- return this.dc_dump;
- }
- public void setInt_dump (int int_dump) {
- this.int_dump = int_dump;
- }
- public int getInt_dump () {
- return this.int_dump;
- }
-
- public int getBlockMe(){
- if(lock_blockMe == null)
- return blockMe;
- else
- synchronized(lock_blockMe){
- return blockMe;
- }
- }
- public void setBlockMe(int blockMe){
- if(lock_blockMe == null)
- this.blockMe = blockMe;
- else
- synchronized(lock_blockMe){
- this.blockMe = blockMe;
- }
- }
- public DynConfigLock getBlockMeLock(){
- return lock_blockMe;
- }
- public Dyn_DC1 getDc_i(){
- if(lock_dc_i == null)
- return dc_i;
- else
- synchronized(lock_dc_i){
- return dc_i;
- }
- }
- public void setDc_i(Dyn_DC1 dc_i){
- if(lock_dc_i == null)
- this.dc_i = dc_i;
- else
- synchronized(lock_dc_i){
- this.dc_i = dc_i;
- }
- }
- public DynConfigLock getDc_iLock(){
- return lock_dc_i;
- }
- public int getInt_i(){
- if(lock_int_i == null)
- return int_i;
- else
- synchronized(lock_int_i){
- return int_i;
- }
- }
- public void setInt_i(int int_i){
- if(lock_int_i == null)
- this.int_i = int_i;
- else
- synchronized(lock_int_i){
- this.int_i = int_i;
- }
- }
- public DynConfigLock getInt_iLock(){
- return lock_int_i;
- }
- public boolean getBlocker(){
- if(lock_blocker == null)
- return blocker;
- else
- synchronized(lock_blocker){
- return blocker;
- }
- }
- public void setBlocker(boolean blocker){
- if(lock_blocker == null)
- this.blocker = blocker;
- else
- synchronized(lock_blocker){
- this.blocker = blocker;
- }
- }
- public DynConfigLock getBlockerLock(){
- return lock_blocker;
- }
- public void setAndWriteDc_dump(Dyn_DC1 dc_dump){
- setDc_dump(dc_dump);
- variableService.write(this.getInstancePath()+"/dc_dump", dc_dump);
- }
- public void setAndWriteInt_dump(int int_dump){
- setInt_dump(int_dump);
- variableService.write(this.getInstancePath()+"/int_dump", int_dump);
- }
-
- //--------------------- port getters
- public TestCommProtocolConjPort getConj_DynConfigPort (){
- return this.Conj_DynConfigPort;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
-
- /* state IDs */
- public static final int STATE_First = 2;
- public static final int STATE_Done = 3;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__First = 1;
- public static final int CHAIN_TRANS_tr0_FROM_First_TO_Done_BY_testConj_DynConfigPort = 2;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_Conj_DynConfigPort__test = IFITEM_Conj_DynConfigPort + EVT_SHIFT*TestCommProtocol.OUT_test;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","First",
- "Done"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
-
- /* Action Codes */
- protected void action_TRANS_tr0_FROM_First_TO_Done_BY_testConj_DynConfigPort(InterfaceItemBase ifitem) {
- Dyn_DC1 tmp = new Dyn_DC1(123, new long[]{1000}, new Dyn_DC2(0.0e-100, "dummy out".toCharArray()));
- setAndWriteDc_dump(tmp);
- setAndWriteInt_dump(888);
- if(blocker)getBlockMeLock().forbidUpdate(); else getBlockMeLock().allowUpdate();
- int testValue = 0;
- if(int_i != 401 || getDc_i().getLong_array_i()[0] != 403)
- testValue = 30;
- if(getDc_i().getDc_i().getDouble_i() != 0.404)
- testValue = 31;
- if(!String.valueOf(getDc_i().getDc_i().getChar_i()).equals("instance4"))
- testValue = 32;
- System.out.println("blockMe: "+getBlockMe()+", blocker: "+getBlocker());
- if(testValue != 0)
- RTServices.getInstance().getSubSystem().testFinished(testValue);
- else
- Conj_DynConfigPort.ok();
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_First:
- this.history[STATE_TOP] = STATE_First;
- current = STATE_TOP;
- break;
- case STATE_Done:
- this.history[STATE_TOP] = STATE_Done;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_INITIAL_TO__First:
- {
- return STATE_First;
- }
- case CHAIN_TRANS_tr0_FROM_First_TO_Done_BY_testConj_DynConfigPort:
- {
- action_TRANS_tr0_FROM_First_TO_Done_BY_testConj_DynConfigPort(ifitem);
- return STATE_Done;
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_First:
- // in leaf state: return state id
- return STATE_First;
- case STATE_Done:
- // in leaf state: return state id
- return STATE_Done;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__First;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_First:
- switch(trigger) {
- case TRIG_Conj_DynConfigPort__test:
- {
- chain = CHAIN_TRANS_tr0_FROM_First_TO_Done_BY_testConj_DynConfigPort;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- case STATE_Done:
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Dyn_DC1.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Dyn_DC1.java
deleted file mode 100644
index cd23e9f9a..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Dyn_DC1.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.etrice.integration.ConfigTest;
-
-
-
-
-public class Dyn_DC1 {
-
-
- /*--------------------- attributes ---------------------*/
- int int_i;
- long long_array_i[];
- Dyn_DC2 dc_i;
-
- //--------------------- attribute setters and getters
- public void setInt_i (int int_i) {
- this.int_i = int_i;
- }
- public int getInt_i () {
- return this.int_i;
- }
- public void setLong_array_i (long[] long_array_i) {
- this.long_array_i = long_array_i;
- }
- public long[] getLong_array_i () {
- return this.long_array_i;
- }
- public void setDc_i (Dyn_DC2 dc_i) {
- this.dc_i = dc_i;
- }
- public Dyn_DC2 getDc_i () {
- return this.dc_i;
- }
-
- /*--------------------- operations ---------------------*/
-
- // default constructor
- public Dyn_DC1() {
- super();
-
- // initialize attributes
- long_array_i = new long[1];
- for (int i=0;i<1;i++){
- long_array_i[i] = 0;
- }
- dc_i = new Dyn_DC2();
- }
-
- // constructor using fields
- public Dyn_DC1(int int_i, long[] long_array_i, Dyn_DC2 dc_i) {
- super();
-
- this.int_i = int_i;
- this.long_array_i = long_array_i;
- this.dc_i = dc_i;
- }
-
- // deep copy
- public Dyn_DC1 deepCopy() {
- Dyn_DC1 copy = new Dyn_DC1();
- copy.int_i = int_i;
- for (int i=0;i<long_array_i.length;i++){
- copy.long_array_i[i] = long_array_i[i];
- }
- if (dc_i!=null) {
- copy.dc_i = dc_i.deepCopy();
- }
- return copy;
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Dyn_DC2.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Dyn_DC2.java
deleted file mode 100644
index bee8022ac..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Dyn_DC2.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.etrice.integration.ConfigTest;
-
-
-
-
-public class Dyn_DC2 {
-
-
- /*--------------------- attributes ---------------------*/
- double double_i;
- char char_i[];
-
- //--------------------- attribute setters and getters
- public void setDouble_i (double double_i) {
- this.double_i = double_i;
- }
- public double getDouble_i () {
- return this.double_i;
- }
- public void setChar_i (char[] char_i) {
- this.char_i = char_i;
- }
- public char[] getChar_i () {
- return this.char_i;
- }
-
- /*--------------------- operations ---------------------*/
-
- // default constructor
- public Dyn_DC2() {
- super();
-
- // initialize attributes
- char_i = new char[10];
- }
-
- // constructor using fields
- public Dyn_DC2(double double_i, char[] char_i) {
- super();
-
- this.double_i = double_i;
- this.char_i = char_i;
- }
-
- // deep copy
- public Dyn_DC2 deepCopy() {
- Dyn_DC2 copy = new Dyn_DC2();
- copy.double_i = double_i;
- for (int i=0;i<char_i.length;i++){
- copy.char_i[i] = char_i[i];
- }
- return copy;
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/PortProtocol.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/PortProtocol.java
deleted file mode 100644
index 88af725a4..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/PortProtocol.java
+++ /dev/null
@@ -1,296 +0,0 @@
-package org.eclipse.etrice.integration.ConfigTest;
-
-import java.util.ArrayList;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.Message;
-import org.eclipse.etrice.runtime.java.modelbase.*;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-
-/*--------------------- begin user code ---------------------*/
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-/*--------------------- end user code ---------------------*/
-
-
-public class PortProtocol {
- // message IDs
- public static final int MSG_MIN = 0;
- public static final int OUT_conjCheck = 1;
- public static final int IN_portTestSucc = 2;
- public static final int MSG_MAX = 3;
-
-
- private static String messageStrings[] = {"MIN", "conjCheck", "portTestSucc","MAX"};
-
- public String getMessageString(int msg_id) {
- if (msg_id<MSG_MIN || msg_id>MSG_MAX+1){
- // id out of range
- return "Message ID out of range";
- }
- else{
- return messageStrings[msg_id];
- }
- }
-
-
- // port class
- static public class PortProtocolPort extends PortBase {
- // constructors
- public PortProtocolPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public PortProtocolPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- // initialize attributes
- float_r = 4;
- float_c = 3f;
- float_i = 9f;
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
- /*--------------------- attributes ---------------------*/
- float float_r;
- float float_c;
- float float_i;
- // TODO JH: Avoid collision attr getters/setter <-> user operations
- //--------------------- attribute setters and getters
- public void setFloat_r (float float_r) {
- this.float_r = float_r;
- }
- public float getFloat_r () {
- return this.float_r;
- }
- public void setFloat_c (float float_c) {
- this.float_c = float_c;
- }
- public float getFloat_c () {
- return this.float_c;
- }
- public void setFloat_i (float float_i) {
- this.float_i = float_i;
- }
- public float getFloat_i () {
- return this.float_i;
- }
- /*--------------------- operations ---------------------*/
- public boolean varCheck() {
- int testValue = 0;
- if(float_r != 4 || float_c != 3 || float_i != 25)
- testValue = 20;
- if(testValue != 0)
- RTServices.getInstance().getSubSystem().testFinished(testValue);
- return testValue == 0;
- }
-
- // sent messages
- public void conjCheck() {
- if (messageStrings[ OUT_conjCheck] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[OUT_conjCheck]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), OUT_conjCheck));
- }
- }
-
- // replicated port class
- static public class PortProtocolReplPort {
- private ArrayList<PortProtocolPort> ports;
- private int replication;
-
- public PortProtocolReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<PortProtocol.PortProtocolPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new PortProtocolPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PortProtocolPort get(int i) {
- return ports.get(i);
- }
-
- // outgoing messages
- public void conjCheck(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).conjCheck();
- }
- }
- }
-
-
- // port class
- static public class PortProtocolConjPort extends PortBase {
- // constructors
- public PortProtocolConjPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public PortProtocolConjPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- // initialize attributes
- array1_r = new float[1];
- for (int i=0;i<1;i++){
- array1_r[i] = 1000;
- }
- array1_c = new float[] {1f};
- array1_i = new float[] {2f};
- array2_r = new long[] {11,22};
- array2_c = new long[] {16L, 32L};
- array2_i = new long[] {16L, 32L};
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
- /*--------------------- attributes ---------------------*/
- float array1_r[];
- float array1_c[];
- float array1_i[];
- long array2_r[];
- long array2_c[];
- long array2_i[];
- // TODO JH: Avoid collision attr getters/setter <-> user operations
- //--------------------- attribute setters and getters
- public void setArray1_r (float[] array1_r) {
- this.array1_r = array1_r;
- }
- public float[] getArray1_r () {
- return this.array1_r;
- }
- public void setArray1_c (float[] array1_c) {
- this.array1_c = array1_c;
- }
- public float[] getArray1_c () {
- return this.array1_c;
- }
- public void setArray1_i (float[] array1_i) {
- this.array1_i = array1_i;
- }
- public float[] getArray1_i () {
- return this.array1_i;
- }
- public void setArray2_r (long[] array2_r) {
- this.array2_r = array2_r;
- }
- public long[] getArray2_r () {
- return this.array2_r;
- }
- public void setArray2_c (long[] array2_c) {
- this.array2_c = array2_c;
- }
- public long[] getArray2_c () {
- return this.array2_c;
- }
- public void setArray2_i (long[] array2_i) {
- this.array2_i = array2_i;
- }
- public long[] getArray2_i () {
- return this.array2_i;
- }
- /*--------------------- operations ---------------------*/
- public boolean varCheck() {
- int testValue = 0;
- if(array1_r[0] != 1000 || array1_c[0] != 1 || array1_i[0] != 256)
- testValue = 10;
- if(array2_r[0] != 11 || array2_r[1] != 22)
- testValue = 11;
- if(array2_c[0] != 16 || array2_c[1] != 32)
- testValue = 12;
- if(array2_i[0] != 1 || array2_i[1] != 2)
- testValue = 13;
- if(testValue != 0)
- RTServices.getInstance().getSubSystem().testFinished(testValue);
- return testValue == 0;
- }
-
- // sent messages
- public void portTestSucc() {
- if (messageStrings[ IN_portTestSucc] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_portTestSucc]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), IN_portTestSucc));
- }
- }
-
- // replicated port class
- static public class PortProtocolConjReplPort {
- private ArrayList<PortProtocolConjPort> ports;
- private int replication;
-
- public PortProtocolConjReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<PortProtocol.PortProtocolConjPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new PortProtocolConjPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PortProtocolConjPort get(int i) {
- return ports.get(i);
- }
-
- // incoming messages
- public void portTestSucc(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).portTestSucc();
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTest.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTest.java
deleted file mode 100644
index 2b3c8a995..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTest.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package org.eclipse.etrice.integration.ConfigTest;
-
-import org.eclipse.etrice.runtime.java.config.VariableService;
-import org.eclipse.etrice.runtime.java.messaging.MessageService;
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.RTSystemServicesProtocol.*;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-
-
-
-
-public class SubSystemConfigTest extends SubSystemClassBase{
-
-
- public SubSystemConfigTest(String name) {
- super(name);
- }
-
- @Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data){
- }
-
- @Override
- public void instantiateMessageServices(){
-
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 0, 0),"MessageService_Main"));
- }
-
- @Override
- public void instantiateActors(){
-
- // all addresses
- // Addresses for the Subsystem Systemport
- Address addr_item_SystemPort_0 = new Address(0,0,109);
- Address addr_item_SystemPort_1 = new Address(0,0,110);
- Address addr_item_SystemPort_2 = new Address(0,0,111);
- Address addr_item_SystemPort_3 = new Address(0,0,112);
-
- // actor instance /SubSystemConfigTest/top itself => Systemport Address
- Address addr_item__SubSystemConfigTest_top = new Address(0,0,101);
- // interface items of /SubSystemConfigTest/top
- // actor instance /SubSystemConfigTest/top/testee itself => Systemport Address
- Address addr_item__SubSystemConfigTest_top_testee = new Address(0,0,102);
- // interface items of /SubSystemConfigTest/top/testee
- Address addr_item__SubSystemConfigTest_top_testee_Reg_dynConfigPort = new Address(0,0,103);
- Address addr_item__SubSystemConfigTest_top_testee_Reg_port = new Address(0,0,104);
- // actor instance /SubSystemConfigTest/top/testee/AR1 itself => Systemport Address
- Address addr_item__SubSystemConfigTest_top_testee_AR1 = new Address(0,0,105);
- // interface items of /SubSystemConfigTest/top/testee/AR1
- Address addr_item__SubSystemConfigTest_top_testee_AR1_Conj_port = new Address(0,0,106);
- // actor instance /SubSystemConfigTest/top/testee2 itself => Systemport Address
- Address addr_item__SubSystemConfigTest_top_testee2 = new Address(0,0,107);
- // interface items of /SubSystemConfigTest/top/testee2
- Address addr_item__SubSystemConfigTest_top_testee2_Conj_DynConfigPort = new Address(0,0,108);
-
- // instantiate all actor instances
- instances = new ActorClassBase[4];
- instances[0] = new ConfigText_Top_ac(
- this,
- "top",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystemConfigTest_top}
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_0}
- }
- );
- instances[1] = new Testee_ac(
- instances[0],
- "testee",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystemConfigTest_top_testee},
- {
- addr_item__SubSystemConfigTest_top_testee_Reg_dynConfigPort
- },
- {
- addr_item__SubSystemConfigTest_top_testee_Reg_port
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_1},
- {
- addr_item__SubSystemConfigTest_top_testee2_Conj_DynConfigPort
- },
- {
- addr_item__SubSystemConfigTest_top_testee_AR1_Conj_port
- }
- }
- );
- instances[2] = new AC1_ac(
- instances[1],
- "AR1",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystemConfigTest_top_testee_AR1},
- {
- addr_item__SubSystemConfigTest_top_testee_AR1_Conj_port
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_2},
- {
- addr_item__SubSystemConfigTest_top_testee_Reg_port
- }
- }
- );
- instances[3] = new DynTestee_ac(
- instances[0],
- "testee2",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystemConfigTest_top_testee2},
- {
- addr_item__SubSystemConfigTest_top_testee2_Conj_DynConfigPort
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_3},
- {
- addr_item__SubSystemConfigTest_top_testee_Reg_dynConfigPort
- }
- }
- , variableService
- );
-
- // apply instance attribute configurations
- {
- Testee_ac inst = (Testee_ac) instances[1];
- inst.setBool_i(true);
- inst.setInt_i(301);
- inst.setFloat_i(1.0E-5d);
- inst.setChar_i('C');
- inst.setCharArray_i("ROOM 2 Moon".toCharArray());
- inst.setString_i(":^]");
- inst.setArray1_i(new int[]{4});
- inst.setArray2_i(new boolean[]{false, true});
- inst.getReg_port().setFloat_i(25f);
- }
- {
- AC1_ac inst = (AC1_ac) instances[2];
- inst.getConj_port().setArray1_i(new float[]{256f});
- inst.getConj_port().setArray2_i(new long[]{1L, 2L});
- }
- {
- DynTestee_ac inst = (DynTestee_ac) instances[3];
- inst.setInt_i(301);
- inst.getDc_i().setInt_i(302);
- inst.getDc_i().setLong_array_i(new long[]{303L});
- inst.getDc_i().getDc_i().setChar_i("instance3".toCharArray());
- inst.getDc_i().getDc_i().setDouble_i(0.304d);
- inst.setBlockMe(0);
- inst.setBlocker(false);
- inst.getDc_dump().getDc_i().setChar_i("dummy".toCharArray());
- inst.getDc_dump().getDc_i().setDouble_i(0.0d);
- inst.getDc_dump().setLong_array_i(new long[]{1000L});
- inst.getDc_dump().setInt_i(123);
- inst.setInt_dump(3);
- }
-
- // create the subsystem system port
- RTSystemPort = new RTSystemServicesProtocolConjPortRepl(this, "RTSystemPort",
- 0, //local ID
- // own addresses
- new Address[]{
- addr_item_SystemPort_0,
- addr_item_SystemPort_1,
- addr_item_SystemPort_2,
- addr_item_SystemPort_3
- },
- // peer addresses
- new Address[]{
- addr_item__SubSystemConfigTest_top,
- addr_item__SubSystemConfigTest_top_testee,
- addr_item__SubSystemConfigTest_top_testee_AR1,
- addr_item__SubSystemConfigTest_top_testee2
- });
- }
-
- private VariableService variableService;
-
- @Override
- public void init(){
- variableService = new SubSystemConfigTestVariableService(this);
- super.init();
- variableService.init();
- }
-
- @Override
- public void stop(){
- super.stop();
- variableService.stop();
- }
-
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestRunner.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestRunner.java
deleted file mode 100644
index d1d7dd0e6..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestRunner.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author generated by eTrice
- *
- * this class contains the main function running component SubSystemConfigTest
- * it instantiates SubSystemConfigTest and starts and ends the lifecycle
- */
-
-package org.eclipse.etrice.integration.ConfigTest;
-
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemRunnerBase;
-
-class SubSystemConfigTestRunner extends SubSystemRunnerBase {
-
- /**
- * main function
- * creates the main component and starts and stops the lifecycle
- */
- public static void main(String[] args) {
- // instantiate the main component
- SubSystemConfigTest main_component = new SubSystemConfigTest("SubSystemConfigTest");
-
- run(main_component, args);
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java
deleted file mode 100644
index 59ec36514..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java
+++ /dev/null
@@ -1,204 +0,0 @@
-
-package org.eclipse.etrice.integration.ConfigTest;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.etrice.runtime.java.config.VariableService;
-import org.eclipse.etrice.runtime.java.config.ConfigSourceFile;
-import org.eclipse.etrice.integration.ConfigTest.*;
-
-
-public class SubSystemConfigTestVariableService extends VariableService{
-
- private SubSystemConfigTest subSystem;
-
- // Actor instances
- private DynTestee_ac _top_testee2;
-
- public SubSystemConfigTestVariableService(SubSystemConfigTest subSystem) {
- super(new ConfigSourceFile("tmp/subSystemConfigTest"));
- this.subSystem = subSystem;
- }
-
- @Override
- protected void initInstances(){
- _top_testee2 = (DynTestee_ac)subSystem.getInstance("/SubSystemConfigTest/top/testee2");
- }
-
-
- @Override
- protected void setAttributeValues(Map<String, Object> values) {
- Object object;
- String id = null;
- try{
- boolean changed = false;
- id = "/SubSystemConfigTest/top/testee2/int_i";
- Integer _int_i = null;
- object = values.get(id);
- if(object != null){
- _int_i = ensureInt(object);
- if(!_int_i.equals((Integer)getDiffMap().get(id)))
- changed = true;
- } else
- warning(id, "is missing");
- if(changed)
- synchronized(_top_testee2.getInt_iLock()){
- if(_top_testee2.getInt_iLock().isUpdate()){
- if(_int_i != null){
- _top_testee2.setInt_i(_int_i);
- getDiffMap().put("/SubSystemConfigTest/top/testee2/int_i", _int_i);
- }
- }
- }
- }catch(IllegalArgumentException e){
- error(id, e);
- }
- try{
- boolean changed = false;
- id = "/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i";
- Double _double_i = null;
- object = values.get(id);
- if(object != null){
- _double_i = ensureDouble(object);
- if(!_double_i.equals((Double)getDiffMap().get(id)))
- changed = true;
- } else
- warning(id, "is missing");
- id = "/SubSystemConfigTest/top/testee2/dc_i/long_array_i";
- long[] _long_array_i = null;
- object = values.get(id);
- if(object != null){
- _long_array_i = ensureLongArray(object, 1);
- if(!Arrays.equals(_long_array_i, (long[])getDiffMap().get(id)))
- changed = true;
- } else
- warning(id, "is missing");
- id = "/SubSystemConfigTest/top/testee2/dc_i/int_i";
- Integer _int_i = null;
- object = values.get(id);
- if(object != null){
- _int_i = ensureInt(object);
- if(!_int_i.equals((Integer)getDiffMap().get(id)))
- changed = true;
- } else
- warning(id, "is missing");
- id = "/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i";
- char[] _char_i = null;
- object = values.get(id);
- if(object != null){
- _char_i = ensureCharArray(object, 10);
- if(!Arrays.equals(_char_i, (char[])getDiffMap().get(id)))
- changed = true;
- } else
- warning(id, "is missing");
- if(changed)
- synchronized(_top_testee2.getDc_iLock()){
- if(_top_testee2.getDc_iLock().isUpdate()){
- if(_double_i != null){
- _top_testee2.getDc_i().getDc_i().setDouble_i(_double_i);
- getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i", _double_i);
- }
- if(_long_array_i != null){
- _top_testee2.getDc_i().setLong_array_i(_long_array_i);
- getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/long_array_i", _long_array_i);
- }
- if(_int_i != null){
- _top_testee2.getDc_i().setInt_i(_int_i);
- getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/int_i", _int_i);
- }
- if(_char_i != null){
- _top_testee2.getDc_i().getDc_i().setChar_i(_char_i);
- getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i", _char_i);
- }
- }
- }
- }catch(IllegalArgumentException e){
- error(id, e);
- }
- try{
- boolean changed = false;
- id = "/SubSystemConfigTest/top/testee2/blockMe";
- Integer _blockMe = null;
- object = values.get(id);
- if(object != null){
- _blockMe = ensureInt(object);
- if(!_blockMe.equals((Integer)getDiffMap().get(id)))
- changed = true;
- } else
- warning(id, "is missing");
- if(changed)
- synchronized(_top_testee2.getBlockMeLock()){
- if(_top_testee2.getBlockMeLock().isUpdate()){
- if(_blockMe != null){
- _top_testee2.setBlockMe(_blockMe);
- getDiffMap().put("/SubSystemConfigTest/top/testee2/blockMe", _blockMe);
- }
- }
- }
- }catch(IllegalArgumentException e){
- error(id, e);
- }
- try{
- boolean changed = false;
- id = "/SubSystemConfigTest/top/testee2/blocker";
- Boolean _blocker = null;
- object = values.get(id);
- if(object != null){
- _blocker = ensureBoolean(object);
- if(!_blocker.equals((Boolean)getDiffMap().get(id)))
- changed = true;
- } else
- warning(id, "is missing");
- if(changed)
- synchronized(_top_testee2.getBlockerLock()){
- if(_top_testee2.getBlockerLock().isUpdate()){
- if(_blocker != null){
- _top_testee2.setBlocker(_blocker);
- getDiffMap().put("/SubSystemConfigTest/top/testee2/blocker", _blocker);
- }
- }
- }
- }catch(IllegalArgumentException e){
- error(id, e);
- }
- }
-
- @Override
- protected Map<String, Object> getAttributeValues(){
- Map<String, Object> values = new HashMap<String, Object>();
- values.put("/SubSystemConfigTest/top/testee2/int_i", _top_testee2.getInt_i());
- values.put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i", _top_testee2.getDc_i().getDc_i().getDouble_i());
- values.put("/SubSystemConfigTest/top/testee2/dc_i/long_array_i", toObjectArray(_top_testee2.getDc_i().getLong_array_i()));
- values.put("/SubSystemConfigTest/top/testee2/dc_i/int_i", _top_testee2.getDc_i().getInt_i());
- values.put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i", toObjectArray(_top_testee2.getDc_i().getDc_i().getChar_i()));
- values.put("/SubSystemConfigTest/top/testee2/blockMe", _top_testee2.getBlockMe());
- values.put("/SubSystemConfigTest/top/testee2/blocker", _top_testee2.getBlocker());
-
- return values;
- }
-
- @Override
- public void writeDataClass(String id, Object dcObject, Map<String, Object> writeMap) {
- if(dcObject.getClass().equals(Dyn_DC1.class))
- writeDataClass(id, (Dyn_DC1) dcObject, writeTasks);
- }
-
- // DataClasses write operations
-
- private void writeDataClass(String id, Dyn_DC1 object, Map<String, Object> map){
- map.put(id+"/int_i", object.getInt_i());
- map.put(id+"/long_array_i", toObjectArray(object.getLong_array_i()));
- writeDataClass(id+"/dc_i", object.getDc_i(), map);
- }
- private void writeDataClass(String id, Dyn_DC2 object, Map<String, Object> map){
- map.put(id+"/double_i", object.getDouble_i());
- map.put(id+"/char_i", toObjectArray(object.getChar_i()));
- }
-
- @Override
- protected int getPollingTimerUser(){
- return 4000;
- }
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/TestCommProtocol.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/TestCommProtocol.java
deleted file mode 100644
index e07eef229..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/TestCommProtocol.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package org.eclipse.etrice.integration.ConfigTest;
-
-import java.util.ArrayList;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.Message;
-import org.eclipse.etrice.runtime.java.modelbase.*;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-
-
-
-public class TestCommProtocol {
- // message IDs
- public static final int MSG_MIN = 0;
- public static final int OUT_test = 1;
- public static final int IN_ok = 2;
- public static final int MSG_MAX = 3;
-
-
- private static String messageStrings[] = {"MIN", "test", "ok","MAX"};
-
- public String getMessageString(int msg_id) {
- if (msg_id<MSG_MIN || msg_id>MSG_MAX+1){
- // id out of range
- return "Message ID out of range";
- }
- else{
- return messageStrings[msg_id];
- }
- }
-
-
- // port class
- static public class TestCommProtocolPort extends PortBase {
- // constructors
- public TestCommProtocolPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public TestCommProtocolPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void test() {
- if (messageStrings[ OUT_test] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[OUT_test]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), OUT_test));
- }
- }
-
- // replicated port class
- static public class TestCommProtocolReplPort {
- private ArrayList<TestCommProtocolPort> ports;
- private int replication;
-
- public TestCommProtocolReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<TestCommProtocol.TestCommProtocolPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new TestCommProtocolPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public TestCommProtocolPort get(int i) {
- return ports.get(i);
- }
-
- // outgoing messages
- public void test(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).test();
- }
- }
- }
-
-
- // port class
- static public class TestCommProtocolConjPort extends PortBase {
- // constructors
- public TestCommProtocolConjPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public TestCommProtocolConjPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void ok() {
- if (messageStrings[ IN_ok] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_ok]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), IN_ok));
- }
- }
-
- // replicated port class
- static public class TestCommProtocolConjReplPort {
- private ArrayList<TestCommProtocolConjPort> ports;
- private int replication;
-
- public TestCommProtocolConjReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<TestCommProtocol.TestCommProtocolConjPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new TestCommProtocolConjPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public TestCommProtocolConjPort get(int i) {
- return ports.get(i);
- }
-
- // incoming messages
- public void ok(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).ok();
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Testee_ac.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Testee_ac.java
deleted file mode 100644
index 6afdb1474..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Testee_ac.java
+++ /dev/null
@@ -1,482 +0,0 @@
-package org.eclipse.etrice.integration.ConfigTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-import org.eclipse.etrice.integration.ConfigTest.PortProtocol.*;
-import org.eclipse.etrice.integration.ConfigTest.TestCommProtocol.*;
-
-/*--------------------- begin user code ---------------------*/
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-/*--------------------- end user code ---------------------*/
-
-
-public class Testee_ac extends ActorClassBase {
-
-
-
- //--------------------- ports
- protected TestCommProtocolPort Reg_dynConfigPort = null;
- protected PortProtocolPort Reg_port = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_Reg_dynConfigPort = 1;
- public static final int IFITEM_Reg_port = 2;
-
-
- /*--------------------- attributes ---------------------*/
- boolean bool_r;
- boolean bool_c;
- boolean bool_i;
- int int_r;
- int int_c;
- int int_i;
- double float_r;
- double float_c;
- double float_i;
- char char_r;
- char char_c;
- char char_i;
- char charArray_r[];
- char charArray_c[];
- char charArray_i[];
- String string_r;
- String string_c;
- String string_i;
- int array1_r[];
- int array1_c[];
- int array1_i[];
- boolean array2_r[];
- boolean array2_c[];
- boolean array2_i[];
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public Testee_ac(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("Testee_ac");
-
- // initialize attributes
- bool_r = true;
- bool_c = false;
- bool_i = false;
- int_r = 100;
- int_c = 210;
- int_i = 310;
- float_r = 11.11;
- float_c = 16777215d;
- float_i = 0.0d;
- char_r = 'R';
- char_c = 'A';
- char_i = 'B';
- charArray_r = "ROOM will bloom".toCharArray();
- charArray_c = "ROOM-Coon".toCharArray();
- charArray_i = "ROOM Gloom".toCharArray();
- string_r = ":/";
- string_c = ":-)";
- string_i = ":-]";
- array1_r = new int[1];
- for (int i=0;i<1;i++){
- array1_r[i] = 0;
- }
- array1_c = new int[] {99};
- array1_i = new int[] {99};
- array2_r = new boolean[] {true, true};
- array2_c = new boolean[] {false, false};
- array2_i = new boolean[] {false, false};
-
- // own ports
- Reg_dynConfigPort = new TestCommProtocolPort(this, "Reg_dynConfigPort", IFITEM_Reg_dynConfigPort, 0, port_addr[IFITEM_Reg_dynConfigPort][0], peer_addr[IFITEM_Reg_dynConfigPort][0]);
- Reg_port = new PortProtocolPort(this, "Reg_port", IFITEM_Reg_port, 0, port_addr[IFITEM_Reg_port][0], peer_addr[IFITEM_Reg_port][0]);
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
- public void setBool_r (boolean bool_r) {
- this.bool_r = bool_r;
- }
- public boolean getBool_r () {
- return this.bool_r;
- }
- public void setBool_c (boolean bool_c) {
- this.bool_c = bool_c;
- }
- public boolean getBool_c () {
- return this.bool_c;
- }
- public void setBool_i (boolean bool_i) {
- this.bool_i = bool_i;
- }
- public boolean getBool_i () {
- return this.bool_i;
- }
- public void setInt_r (int int_r) {
- this.int_r = int_r;
- }
- public int getInt_r () {
- return this.int_r;
- }
- public void setInt_c (int int_c) {
- this.int_c = int_c;
- }
- public int getInt_c () {
- return this.int_c;
- }
- public void setInt_i (int int_i) {
- this.int_i = int_i;
- }
- public int getInt_i () {
- return this.int_i;
- }
- public void setFloat_r (double float_r) {
- this.float_r = float_r;
- }
- public double getFloat_r () {
- return this.float_r;
- }
- public void setFloat_c (double float_c) {
- this.float_c = float_c;
- }
- public double getFloat_c () {
- return this.float_c;
- }
- public void setFloat_i (double float_i) {
- this.float_i = float_i;
- }
- public double getFloat_i () {
- return this.float_i;
- }
- public void setChar_r (char char_r) {
- this.char_r = char_r;
- }
- public char getChar_r () {
- return this.char_r;
- }
- public void setChar_c (char char_c) {
- this.char_c = char_c;
- }
- public char getChar_c () {
- return this.char_c;
- }
- public void setChar_i (char char_i) {
- this.char_i = char_i;
- }
- public char getChar_i () {
- return this.char_i;
- }
- public void setCharArray_r (char[] charArray_r) {
- this.charArray_r = charArray_r;
- }
- public char[] getCharArray_r () {
- return this.charArray_r;
- }
- public void setCharArray_c (char[] charArray_c) {
- this.charArray_c = charArray_c;
- }
- public char[] getCharArray_c () {
- return this.charArray_c;
- }
- public void setCharArray_i (char[] charArray_i) {
- this.charArray_i = charArray_i;
- }
- public char[] getCharArray_i () {
- return this.charArray_i;
- }
- public void setString_r (String string_r) {
- this.string_r = string_r;
- }
- public String getString_r () {
- return this.string_r;
- }
- public void setString_c (String string_c) {
- this.string_c = string_c;
- }
- public String getString_c () {
- return this.string_c;
- }
- public void setString_i (String string_i) {
- this.string_i = string_i;
- }
- public String getString_i () {
- return this.string_i;
- }
- public void setArray1_r (int[] array1_r) {
- this.array1_r = array1_r;
- }
- public int[] getArray1_r () {
- return this.array1_r;
- }
- public void setArray1_c (int[] array1_c) {
- this.array1_c = array1_c;
- }
- public int[] getArray1_c () {
- return this.array1_c;
- }
- public void setArray1_i (int[] array1_i) {
- this.array1_i = array1_i;
- }
- public int[] getArray1_i () {
- return this.array1_i;
- }
- public void setArray2_r (boolean[] array2_r) {
- this.array2_r = array2_r;
- }
- public boolean[] getArray2_r () {
- return this.array2_r;
- }
- public void setArray2_c (boolean[] array2_c) {
- this.array2_c = array2_c;
- }
- public boolean[] getArray2_c () {
- return this.array2_c;
- }
- public void setArray2_i (boolean[] array2_i) {
- this.array2_i = array2_i;
- }
- public boolean[] getArray2_i () {
- return this.array2_i;
- }
-
-
- //--------------------- port getters
- public TestCommProtocolPort getReg_dynConfigPort (){
- return this.Reg_dynConfigPort;
- }
- public PortProtocolPort getReg_port (){
- return this.Reg_port;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
-
- /* state IDs */
- public static final int STATE_Testing1 = 2;
- public static final int STATE_Testing2 = 3;
- public static final int STATE_Done = 4;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__Testing1 = 1;
- public static final int CHAIN_TRANS_tr1_FROM_Testing1_TO_Testing2_BY_portTestSuccReg_port = 2;
- public static final int CHAIN_TRANS_tr2_FROM_Testing2_TO_Done_BY_okReg_dynConfigPort = 3;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_Reg_dynConfigPort__ok = IFITEM_Reg_dynConfigPort + EVT_SHIFT*TestCommProtocol.IN_ok;
- public static final int TRIG_Reg_port__portTestSucc = IFITEM_Reg_port + EVT_SHIFT*PortProtocol.IN_portTestSucc;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","Testing1",
- "Testing2",
- "Done"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
- protected void entry_Testing1() {
- if(Reg_port.varCheck())
- Reg_port.conjCheck();
- }
- protected void entry_Testing2() {
- Reg_dynConfigPort.test();
- }
- protected void entry_Done() {
- if (bool_r != true || bool_c != false || bool_i != true )
- RTServices.getInstance().getSubSystem().testFinished(1);
- else if (int_r != 100 || int_c != 210 || int_i != 301)
- RTServices.getInstance().getSubSystem().testFinished(2);
- else if (float_r != 11.11 || float_c !=0xFFFFFF || float_i != 0.00001)
- RTServices.getInstance().getSubSystem().testFinished(3);
- else if (char_r != 'R' || char_c != 'A' || char_i != 'C')
- RTServices.getInstance().getSubSystem().testFinished(4);
- // string_r.equals("ROOM will bloom")
- else if (charArray_r.equals("ROOM will bloom") || charArray_c.equals("ROOM-Coon") || charArray_i.equals("ROOM 2 Moon"))
- RTServices.getInstance().getSubSystem().testFinished(5);
- else if (!string_r.equals(":/") || !string_c.equals(":-)") || !string_i.equals(":^]"))
- RTServices.getInstance().getSubSystem().testFinished(5);
- if(array1_r[0] != 0 || array1_c[0] != 99 || array1_i[0] != 4)
- RTServices.getInstance().getSubSystem().testFinished(6);
- if(array2_r[0] != true || array2_r[1] != true)
- RTServices.getInstance().getSubSystem().testFinished(7);
- if(array2_c[0] != false || array2_c[1] != false)
- RTServices.getInstance().getSubSystem().testFinished(8);
- if(array2_i[0] != false || array2_i[1] != true)
- RTServices.getInstance().getSubSystem().testFinished(9);
- else
- RTServices.getInstance().getSubSystem().testFinished(0);
- }
-
- /* Action Codes */
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_Testing1:
- this.history[STATE_TOP] = STATE_Testing1;
- current = STATE_TOP;
- break;
- case STATE_Testing2:
- this.history[STATE_TOP] = STATE_Testing2;
- current = STATE_TOP;
- break;
- case STATE_Done:
- this.history[STATE_TOP] = STATE_Done;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_INITIAL_TO__Testing1:
- {
- return STATE_Testing1;
- }
- case CHAIN_TRANS_tr1_FROM_Testing1_TO_Testing2_BY_portTestSuccReg_port:
- {
- return STATE_Testing2;
- }
- case CHAIN_TRANS_tr2_FROM_Testing2_TO_Done_BY_okReg_dynConfigPort:
- {
- return STATE_Done;
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_Testing1:
- if (!(skip_entry || handler)) entry_Testing1();
- // in leaf state: return state id
- return STATE_Testing1;
- case STATE_Testing2:
- if (!(skip_entry || handler)) entry_Testing2();
- // in leaf state: return state id
- return STATE_Testing2;
- case STATE_Done:
- if (!(skip_entry || handler)) entry_Done();
- // in leaf state: return state id
- return STATE_Done;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__Testing1;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_Testing1:
- switch(trigger) {
- case TRIG_Reg_port__portTestSucc:
- {
- chain = CHAIN_TRANS_tr1_FROM_Testing1_TO_Testing2_BY_portTestSuccReg_port;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- case STATE_Testing2:
- switch(trigger) {
- case TRIG_Reg_dynConfigPort__ok:
- {
- chain = CHAIN_TRANS_tr2_FROM_Testing2_TO_Done_BY_okReg_dynConfigPort;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- case STATE_Done:
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerTest_Top.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerTest_Top.java
deleted file mode 100644
index f7c2db9fe..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerTest_Top.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.etrice.integration.HandlerTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-
-
-
-public class HandlerTest_Top extends ActorClassBase {
-
-
-
- //--------------------- ports
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
-
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public HandlerTest_Top(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("HandlerTest_Top");
-
- // initialize attributes
-
- // own ports
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
-
-
- //--------------------- port getters
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
- //--------------------- no state machine
- @Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data) {
- handleSystemEvent(ifitem, evt, data);
- }
-
- @Override
- public void executeInitTransition(){
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java
deleted file mode 100644
index f80727269..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java
+++ /dev/null
@@ -1,793 +0,0 @@
-package org.eclipse.etrice.integration.HandlerTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-import org.eclipse.etrice.integration.HandlerTest.TestProtocol.*;
-
-/*--------------------- begin user code ---------------------*/
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-/*--------------------- end user code ---------------------*/
-
-
-public class HandlerUser extends ActorClassBase {
-
-
-
- //--------------------- ports
- protected TestProtocolPort TestPort1 = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_TestPort1 = 1;
-
-
- /*--------------------- attributes ---------------------*/
- int counter;
- int caseId;
- /*--------------------- operations ---------------------*/
- public void HandlerUser_dtor() {
- etUnit_closeAll(caseId);
- }
-
- //--------------------- construction
- public HandlerUser(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("HandlerUser");
-
- // initialize attributes
- counter = 0;
- caseId = 0;
-
- // own ports
- TestPort1 = new TestProtocolPort(this, "TestPort1", IFITEM_TestPort1, 0, port_addr[IFITEM_TestPort1][0], peer_addr[IFITEM_TestPort1][0]);
-
- // own saps
-
- // own service implementations
-
- {
- // user defined constructor body
- caseId = etUnit_openAll("tmp", "HandlerTest.etu", "HandlerTest_suite", "HandlerTest_case");
- }
- }
-
-
- //--------------------- attribute setters and getters
- public void setCounter (int counter) {
- this.counter = counter;
- }
- public int getCounter () {
- return this.counter;
- }
- public void setCaseId (int caseId) {
- this.caseId = caseId;
- }
- public int getCaseId () {
- return this.caseId;
- }
-
-
- //--------------------- port getters
- public TestProtocolPort getTestPort1 (){
- return this.TestPort1;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- HandlerUser_dtor();
- }
-
-
- /* state IDs */
- public static final int STATE_state0 = 2;
- public static final int STATE_state0_state1 = 3;
- public static final int STATE_state0_state1_state7 = 4;
- public static final int STATE_state0_state2 = 5;
- public static final int STATE_testOk = 6;
- public static final int STATE_state1 = 7;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__state0_tp2 = 1;
- public static final int CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr0 = 2;
- public static final int CHAIN_TRANS_tr1_FROM_tp1_TO_tp1_BY_msg1TestPort1_tr1 = 3;
- public static final int CHAIN_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1 = 4;
- public static final int CHAIN_TRANS_tr5_FROM_tp1_TO_tp1_BY_msg2TestPort1_tr5 = 5;
- public static final int CHAIN_TRANS_tr6_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr6 = 6;
- public static final int CHAIN_TRANS_tr7_FROM_tp0_TO_state0_BY_msg1TestPort1 = 7;
- public static final int CHAIN_TRANS_tr9_FROM_state0_TO_cp1_BY_msg1TestPort1 = 8;
- public static final int CHAIN_state0_TRANS_INITIAL_TO__state2 = 9;
- public static final int CHAIN_state0_TRANS_tr0_FROM_state1_TO_state2_BY_msg5TestPort1 = 10;
- public static final int CHAIN_state0_TRANS_tr1_FROM_tp0_TO_tp0_BY_msg3TestPort1_tr1 = 11;
- public static final int CHAIN_state0_TRANS_tr2_FROM_tp1_TO_tp1_BY_msg4TestPort1_tr2 = 12;
- public static final int CHAIN_state0_TRANS_tr3_FROM_state2_TO_state2_BY_msg1TestPort1_tr3 = 13;
- public static final int CHAIN_state0_TRANS_tr5_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr5 = 14;
- public static final int CHAIN_state0_TRANS_tr6_FROM_state1_TO_state1_BY_msg1TestPort1_tr6 = 15;
- public static final int CHAIN_state0_TRANS_tr7_FROM_tp1_TO_state1_BY_msg2TestPort1 = 16;
- public static final int CHAIN_state0_TRANS_tr8_FROM_tp1_TO_state2_BY_msg2TestPort1 = 17;
- public static final int CHAIN_state0_state1_TRANS_INITIAL_TO__state7 = 18;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_TestPort1__msg1 = IFITEM_TestPort1 + EVT_SHIFT*TestProtocol.IN_msg1;
- public static final int TRIG_TestPort1__msg2 = IFITEM_TestPort1 + EVT_SHIFT*TestProtocol.IN_msg2;
- public static final int TRIG_TestPort1__msg3 = IFITEM_TestPort1 + EVT_SHIFT*TestProtocol.IN_msg3;
- public static final int TRIG_TestPort1__msg4 = IFITEM_TestPort1 + EVT_SHIFT*TestProtocol.IN_msg4;
- public static final int TRIG_TestPort1__msg5 = IFITEM_TestPort1 + EVT_SHIFT*TestProtocol.IN_msg5;
- public static final int TRIG_TestPort1__msg6 = IFITEM_TestPort1 + EVT_SHIFT*TestProtocol.IN_msg6;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","state0",
- "state0_state1",
- "state0_state1_state7",
- "state0_state2",
- "testOk",
- "state1"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
- protected void entry_state0() {
- System.out.println("state 0 entry action");
- EXPECT_ORDER(caseId, "state state0 entry code", 13);
- }
- protected void exit_state0() {
- System.out.println("state 0 exit action");
- EXPECT_ORDER(caseId, "state state0 exit code", 14);
- }
- protected void entry_state0_state1() {
- System.out.println("state 0/1 entry action");
- EXPECT_ORDER(caseId, "state state0_state1 entry code", 16);
- }
- protected void exit_state0_state1() {
- System.out.println("state 0/1 exit action");
- EXPECT_ORDER(caseId, "state state0_state1 exit code", 17);
- }
- protected void entry_state0_state1_state7() {
- System.out.println("state 0/1/7 entry action");
- EXPECT_ORDER(caseId, "state state0_state1_state7 entry code", 23);
- }
- protected void exit_state0_state1_state7() {
- System.out.println("state 0/1/7 exit action");
- EXPECT_ORDER(caseId, "state state0_state1_state7 exit code", 24);
- }
- protected void entry_state0_state2() {
- System.out.println("state 0/2 entry action");
- EXPECT_ORDER(caseId, "state state0_state2 entry code", 18);
- }
- protected void exit_state0_state2() {
- System.out.println("state 0/2 exit action");
- EXPECT_ORDER(caseId, "state state0_state2 exit code", 19);
- }
- protected void entry_testOk() {
- System.out.println("Test ok");
- RTServices.getInstance().getSubSystem().testFinished(etUnit_isSuccess(caseId)?0:1);
- }
- protected void entry_state1() {
- System.out.println("state 1 entry action");
- EXPECT_ORDER(caseId, "state state1 entry code", 111);
- }
- protected void exit_state1() {
- System.out.println("state 1 exit action");
- EXPECT_ORDER(caseId, "state state1 exit code", 112);
- }
-
- /* Action Codes */
- protected void action_TRANS_tr0_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr0(InterfaceItemBase ifitem, int p1) {
- System.out.println("top level handler action no guard ");
- EXPECT_ORDER(caseId, "transition tr0: TRANS_tr0_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr0 action code", 11);
- }
- protected void action_TRANS_tr1_FROM_tp1_TO_tp1_BY_msg1TestPort1_tr1(InterfaceItemBase ifitem, int p1) {
- System.out.println("top level self transition action P1=>3");
- EXPECT_ORDER(caseId, "transition tr1: TRANS_tr1_FROM_tp1_TO_tp1_BY_msg1TestPort1_tr1 action code", 12);
- }
- protected void action_TRANS_INITIAL_TO__state0_tp2() {
- System.out.println("top level initial transition");
- short list[] = {13,15,16,22,23,11,24,17,14,12,13,16,23,70,24,17,14,114,113,111,11,70,24,17,120,16,23,24,17,121,18,19,25,18,20,19,21,18,19,25,18,19,14,117};
- EXPECT_ORDER_START(caseId, list, list.length);
- }
- protected void action_TRANS_tr9_FROM_state0_TO_cp1_BY_msg1TestPort1(InterfaceItemBase ifitem, int p1) {
- System.out.println("tr9 transition action");
- EXPECT_ORDER(caseId, "transition tr9: TRANS_tr9_FROM_state0_TO_cp1_BY_msg1TestPort1 action code", 114);
- }
- protected void action_TRANS_tr5_FROM_tp1_TO_tp1_BY_msg2TestPort1_tr5(InterfaceItemBase ifitem, int p1) {
- System.out.println("top level self transition action P1=>4");
- EXPECT_ORDER(caseId, "transition tr5: TRANS_tr5_FROM_tp1_TO_tp1_BY_msg2TestPort1_tr5 action code", 50);
- }
- protected void action_TRANS_tr7_FROM_tp0_TO_state0_BY_msg1TestPort1(InterfaceItemBase ifitem, int p1) {
- System.out.println("top level handler action p1=>7 ");
- EXPECT_ORDER(caseId, "transition tr7: TRANS_tr7_FROM_tp0_TO_state0_BY_msg1TestPort1 action code", 70);
- }
- protected void action_TRANS_tr6_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr6(InterfaceItemBase ifitem, int p1) {
- System.out.println("top level handler action p1=>12 ");
- EXPECT_ORDER(caseId, "transition tr6: TRANS_tr6_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr6 action code", 110);
- }
- protected void action_TRANS_tr8_FROM_cp1_TO_state1(InterfaceItemBase ifitem, int p1) {
- System.out.println("tr8 transition action");
- EXPECT_ORDER(caseId, "transition tr8: TRANS_tr8_FROM_cp1_TO_state1 action code", 113);
- }
- protected void action_TRANS_tr10_FROM_cp1_TO_state0_COND_tr10(InterfaceItemBase ifitem, int p1) {
- System.out.println("tr4 transition action");
- EXPECT_ORDER(caseId, "transition tr10: TRANS_tr10_FROM_cp1_TO_state0_COND_tr10 action code", 115);
- }
- protected void action_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1(InterfaceItemBase ifitem, int p1) {
- System.out.println("tp1 transition to choice action");
- EXPECT_ORDER_END(caseId, "transition tr4: TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1 action code", 117);
- }
- protected void action_state0_TRANS_tr1_FROM_tp0_TO_tp0_BY_msg3TestPort1_tr1(InterfaceItemBase ifitem) {
- System.out.println("state 0 handler action no guard");
- EXPECT_ORDER(caseId, "transition tr1: TRANS_tr1_FROM_tp0_TO_tp0_BY_msg3TestPort1_tr1 action code", 20);
- }
- protected void action_state0_TRANS_tr2_FROM_tp1_TO_tp1_BY_msg4TestPort1_tr2(InterfaceItemBase ifitem) {
- System.out.println("state 0 tp1 self transition action");
- EXPECT_ORDER(caseId, "transition tr2: TRANS_tr2_FROM_tp1_TO_tp1_BY_msg4TestPort1_tr2 action code", 21);
- }
- protected void action_state0_TRANS_tr3_FROM_state2_TO_state2_BY_msg1TestPort1_tr3(InterfaceItemBase ifitem, int p1) {
- System.out.println("state 0/2 self transition action");
- EXPECT_ORDER(caseId, "transition tr3: TRANS_tr3_FROM_state2_TO_state2_BY_msg1TestPort1_tr3 action code", 25);
- }
- protected void action_state0_TRANS_tr4_FROM_tp2_TO_state0_state1_tp0() {
- System.out.println("state 0 tp2 transition action");
- EXPECT_ORDER(caseId, "transition tr4: TRANS_tr4_FROM_tp2_TO_state0_state1_tp0 action code", 15);
- }
- protected void action_state0_TRANS_tr5_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr5(InterfaceItemBase ifitem, int p1) {
- System.out.println("state 0 handler action P1 => 5");
- EXPECT_ORDER(caseId, "transition tr5: TRANS_tr5_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr5 action code", 52);
- }
- protected void action_state0_TRANS_INITIAL_TO__state2() {
- System.out.println("state 0 initial transition");
- EXPECT_ORDER(caseId, "transition init: TRANS_INITIAL_TO__state2 action code", 53);
- }
- protected void action_state0_TRANS_tr6_FROM_state1_TO_state1_BY_msg1TestPort1_tr6(InterfaceItemBase ifitem, int p1) {
- System.out.println("state 0/1 self transition");
- EXPECT_ORDER(caseId, "transition tr6: TRANS_tr6_FROM_state1_TO_state1_BY_msg1TestPort1_tr6 action code", 54);
- }
- protected void action_state0_TRANS_tr7_FROM_tp1_TO_state1_BY_msg2TestPort1(InterfaceItemBase ifitem, int p1) {
- System.out.println("state 0 tp1 p1=>5");
- EXPECT_ORDER(caseId, "transition tr7: TRANS_tr7_FROM_tp1_TO_state1_BY_msg2TestPort1 action code", 120);
- }
- protected void action_state0_TRANS_tr8_FROM_tp1_TO_state2_BY_msg2TestPort1(InterfaceItemBase ifitem, int p1) {
- System.out.println("state 0 tp1 action P1 => 6");
- EXPECT_ORDER(caseId, "transition tr8: TRANS_tr8_FROM_tp1_TO_state2_BY_msg2TestPort1 action code", 121);
- }
- protected void action_state0_state1_TRANS_tr0_FROM_tp0_TO_state7() {
- System.out.println("state 0/1 transition entry action");
- EXPECT_ORDER(caseId, "transition tr0: TRANS_tr0_FROM_tp0_TO_state7 action code", 22);
- }
- protected void action_state0_state1_TRANS_INITIAL_TO__state7() {
- System.out.println("state 0/1 initial transition");
- EXPECT_ORDER(caseId, "transition init: TRANS_INITIAL_TO__state7 action code", 121);
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_state0:
- if (!handler) exit_state0();
- this.history[STATE_TOP] = STATE_state0;
- current = STATE_TOP;
- break;
- case STATE_state0_state1:
- if (!handler) exit_state0_state1();
- this.history[STATE_state0] = STATE_state0_state1;
- current = STATE_state0;
- break;
- case STATE_state0_state1_state7:
- if (!handler) exit_state0_state1_state7();
- this.history[STATE_state0_state1] = STATE_state0_state1_state7;
- current = STATE_state0_state1;
- break;
- case STATE_state0_state2:
- if (!handler) exit_state0_state2();
- this.history[STATE_state0] = STATE_state0_state2;
- current = STATE_state0;
- break;
- case STATE_testOk:
- this.history[STATE_TOP] = STATE_testOk;
- current = STATE_TOP;
- break;
- case STATE_state1:
- if (!handler) exit_state1();
- this.history[STATE_TOP] = STATE_state1;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr0:
- {
- int p1 = (Integer) generic_data;
- action_TRANS_tr0_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr0(ifitem, p1);
- return STATE_TOP;
- }
- case CHAIN_TRANS_tr1_FROM_tp1_TO_tp1_BY_msg1TestPort1_tr1:
- {
- int p1 = (Integer) generic_data;
- action_TRANS_tr1_FROM_tp1_TO_tp1_BY_msg1TestPort1_tr1(ifitem, p1);
- return STATE_TOP;
- }
- case CHAIN_TRANS_INITIAL_TO__state0_tp2:
- {
- action_TRANS_INITIAL_TO__state0_tp2();
- entry_state0();
- action_state0_TRANS_tr4_FROM_tp2_TO_state0_state1_tp0();
- entry_state0_state1();
- action_state0_state1_TRANS_tr0_FROM_tp0_TO_state7();
- return STATE_state0_state1_state7;
- }
- case CHAIN_TRANS_tr9_FROM_state0_TO_cp1_BY_msg1TestPort1:
- {
- int p1 = (Integer) generic_data;
- action_TRANS_tr9_FROM_state0_TO_cp1_BY_msg1TestPort1(ifitem, p1);
- if (p1!=4) {
- action_TRANS_tr10_FROM_cp1_TO_state0_COND_tr10(ifitem, p1);
- return STATE_state0;}
- else {
- action_TRANS_tr8_FROM_cp1_TO_state1(ifitem, p1);
- return STATE_state1;}
- }
- case CHAIN_TRANS_tr5_FROM_tp1_TO_tp1_BY_msg2TestPort1_tr5:
- {
- int p1 = (Integer) generic_data;
- action_TRANS_tr5_FROM_tp1_TO_tp1_BY_msg2TestPort1_tr5(ifitem, p1);
- return STATE_TOP;
- }
- case CHAIN_TRANS_tr7_FROM_tp0_TO_state0_BY_msg1TestPort1:
- {
- int p1 = (Integer) generic_data;
- action_TRANS_tr7_FROM_tp0_TO_state0_BY_msg1TestPort1(ifitem, p1);
- return STATE_state0;
- }
- case CHAIN_TRANS_tr6_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr6:
- {
- int p1 = (Integer) generic_data;
- action_TRANS_tr6_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr6(ifitem, p1);
- return STATE_TOP;
- }
- case CHAIN_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1:
- {
- int p1 = (Integer) generic_data;
- action_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1(ifitem, p1);
- return STATE_testOk;
- }
- case CHAIN_state0_TRANS_tr0_FROM_state1_TO_state2_BY_msg5TestPort1:
- {
- int p1 = (Integer) generic_data;
- return STATE_state0_state2;
- }
- case CHAIN_state0_TRANS_tr1_FROM_tp0_TO_tp0_BY_msg3TestPort1_tr1:
- {
- action_state0_TRANS_tr1_FROM_tp0_TO_tp0_BY_msg3TestPort1_tr1(ifitem);
- return STATE_state0;
- }
- case CHAIN_state0_TRANS_tr2_FROM_tp1_TO_tp1_BY_msg4TestPort1_tr2:
- {
- action_state0_TRANS_tr2_FROM_tp1_TO_tp1_BY_msg4TestPort1_tr2(ifitem);
- return STATE_state0;
- }
- case CHAIN_state0_TRANS_tr3_FROM_state2_TO_state2_BY_msg1TestPort1_tr3:
- {
- int p1 = (Integer) generic_data;
- action_state0_TRANS_tr3_FROM_state2_TO_state2_BY_msg1TestPort1_tr3(ifitem, p1);
- return STATE_state0_state2;
- }
- case CHAIN_state0_TRANS_tr5_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr5:
- {
- int p1 = (Integer) generic_data;
- action_state0_TRANS_tr5_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr5(ifitem, p1);
- return STATE_state0;
- }
- case CHAIN_state0_TRANS_INITIAL_TO__state2:
- {
- action_state0_TRANS_INITIAL_TO__state2();
- return STATE_state0_state2;
- }
- case CHAIN_state0_TRANS_tr6_FROM_state1_TO_state1_BY_msg1TestPort1_tr6:
- {
- int p1 = (Integer) generic_data;
- action_state0_TRANS_tr6_FROM_state1_TO_state1_BY_msg1TestPort1_tr6(ifitem, p1);
- return STATE_state0_state1;
- }
- case CHAIN_state0_TRANS_tr7_FROM_tp1_TO_state1_BY_msg2TestPort1:
- {
- int p1 = (Integer) generic_data;
- action_state0_TRANS_tr7_FROM_tp1_TO_state1_BY_msg2TestPort1(ifitem, p1);
- return STATE_state0_state1;
- }
- case CHAIN_state0_TRANS_tr8_FROM_tp1_TO_state2_BY_msg2TestPort1:
- {
- int p1 = (Integer) generic_data;
- action_state0_TRANS_tr8_FROM_tp1_TO_state2_BY_msg2TestPort1(ifitem, p1);
- return STATE_state0_state2;
- }
- case CHAIN_state0_state1_TRANS_INITIAL_TO__state7:
- {
- action_state0_state1_TRANS_INITIAL_TO__state7();
- return STATE_state0_state1_state7;
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_state0:
- if (!(skip_entry || handler)) entry_state0();
- // state has a sub graph
- // with init transition
- if (this.history[STATE_state0]==NO_STATE) {
- state = executeTransitionChain(CHAIN_state0_TRANS_INITIAL_TO__state2, null, null);
- }
- else {
- state = this.history[STATE_state0];
- }
- break;
- case STATE_state0_state1:
- if (!(skip_entry || handler)) entry_state0_state1();
- // state has a sub graph
- // with init transition
- if (this.history[STATE_state0_state1]==NO_STATE) {
- state = executeTransitionChain(CHAIN_state0_state1_TRANS_INITIAL_TO__state7, null, null);
- }
- else {
- state = this.history[STATE_state0_state1];
- }
- break;
- case STATE_state0_state1_state7:
- if (!(skip_entry || handler)) entry_state0_state1_state7();
- // in leaf state: return state id
- return STATE_state0_state1_state7;
- case STATE_state0_state2:
- if (!(skip_entry || handler)) entry_state0_state2();
- // in leaf state: return state id
- return STATE_state0_state2;
- case STATE_testOk:
- if (!(skip_entry || handler)) entry_testOk();
- // in leaf state: return state id
- return STATE_testOk;
- case STATE_state1:
- if (!(skip_entry || handler)) entry_state1();
- // in leaf state: return state id
- return STATE_state1;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__state0_tp2;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_state0_state1_state7:
- switch(trigger) {
- case TRIG_TestPort1__msg5:
- {
- chain = CHAIN_state0_TRANS_tr0_FROM_state1_TO_state2_BY_msg5TestPort1;
- catching_state = STATE_state0;
- }
- break;
- case TRIG_TestPort1__msg1:
- { int p1 = (Integer) generic_data;
- if (p1==8)
- {
- chain = CHAIN_state0_TRANS_tr6_FROM_state1_TO_state1_BY_msg1TestPort1_tr6;
- catching_state = STATE_state0;
- } else
- if (p1==5)
- {
- chain = CHAIN_state0_TRANS_tr5_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr5;
- catching_state = STATE_state0;
- is_handler = true;
- skip_entry = true;
- } else
- if (p1==4)
- {
- chain = CHAIN_TRANS_tr9_FROM_state0_TO_cp1_BY_msg1TestPort1;
- catching_state = STATE_TOP;
- } else
- if (p1==7)
- {
- chain = CHAIN_TRANS_tr7_FROM_tp0_TO_state0_BY_msg1TestPort1;
- catching_state = STATE_TOP;
- is_handler = true;
- } else
- if (p1==12)
- {
- chain = CHAIN_TRANS_tr6_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr6;
- catching_state = STATE_TOP;
- is_handler = true;
- skip_entry = true;
- } else
- if (p1==3)
- {
- chain = CHAIN_TRANS_tr1_FROM_tp1_TO_tp1_BY_msg1TestPort1_tr1;
- catching_state = STATE_TOP;
- skip_entry = true;
- } else
- {
- chain = CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr0;
- catching_state = STATE_TOP;
- is_handler = true;
- skip_entry = true;
- }
- }
- break;
- case TRIG_TestPort1__msg3:
- {
- chain = CHAIN_state0_TRANS_tr1_FROM_tp0_TO_tp0_BY_msg3TestPort1_tr1;
- catching_state = STATE_state0;
- is_handler = true;
- skip_entry = true;
- }
- break;
- case TRIG_TestPort1__msg4:
- {
- chain = CHAIN_state0_TRANS_tr2_FROM_tp1_TO_tp1_BY_msg4TestPort1_tr2;
- catching_state = STATE_state0;
- skip_entry = true;
- }
- break;
- case TRIG_TestPort1__msg2:
- { int p1 = (Integer) generic_data;
- if (p1==5)
- {
- chain = CHAIN_state0_TRANS_tr7_FROM_tp1_TO_state1_BY_msg2TestPort1;
- catching_state = STATE_state0;
- } else
- if (p1==6)
- {
- chain = CHAIN_state0_TRANS_tr8_FROM_tp1_TO_state2_BY_msg2TestPort1;
- catching_state = STATE_state0;
- } else
- if (p1==4)
- {
- chain = CHAIN_TRANS_tr5_FROM_tp1_TO_tp1_BY_msg2TestPort1_tr5;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- }
- break;
- case TRIG_TestPort1__msg6:
- {
- chain = CHAIN_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- case STATE_state0_state2:
- switch(trigger) {
- case TRIG_TestPort1__msg1:
- {
- chain = CHAIN_state0_TRANS_tr3_FROM_state2_TO_state2_BY_msg1TestPort1_tr3;
- catching_state = STATE_state0;
- }
- break;
- case TRIG_TestPort1__msg3:
- {
- chain = CHAIN_state0_TRANS_tr1_FROM_tp0_TO_tp0_BY_msg3TestPort1_tr1;
- catching_state = STATE_state0;
- is_handler = true;
- skip_entry = true;
- }
- break;
- case TRIG_TestPort1__msg4:
- {
- chain = CHAIN_state0_TRANS_tr2_FROM_tp1_TO_tp1_BY_msg4TestPort1_tr2;
- catching_state = STATE_state0;
- skip_entry = true;
- }
- break;
- case TRIG_TestPort1__msg2:
- { int p1 = (Integer) generic_data;
- if (p1==5)
- {
- chain = CHAIN_state0_TRANS_tr7_FROM_tp1_TO_state1_BY_msg2TestPort1;
- catching_state = STATE_state0;
- } else
- if (p1==6)
- {
- chain = CHAIN_state0_TRANS_tr8_FROM_tp1_TO_state2_BY_msg2TestPort1;
- catching_state = STATE_state0;
- } else
- if (p1==4)
- {
- chain = CHAIN_TRANS_tr5_FROM_tp1_TO_tp1_BY_msg2TestPort1_tr5;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- }
- break;
- case TRIG_TestPort1__msg6:
- {
- chain = CHAIN_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- case STATE_testOk:
- switch(trigger) {
- case TRIG_TestPort1__msg1:
- { int p1 = (Integer) generic_data;
- if (p1==7)
- {
- chain = CHAIN_TRANS_tr7_FROM_tp0_TO_state0_BY_msg1TestPort1;
- catching_state = STATE_TOP;
- is_handler = true;
- } else
- if (p1==12)
- {
- chain = CHAIN_TRANS_tr6_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr6;
- catching_state = STATE_TOP;
- is_handler = true;
- skip_entry = true;
- } else
- if (p1==3)
- {
- chain = CHAIN_TRANS_tr1_FROM_tp1_TO_tp1_BY_msg1TestPort1_tr1;
- catching_state = STATE_TOP;
- skip_entry = true;
- } else
- {
- chain = CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr0;
- catching_state = STATE_TOP;
- is_handler = true;
- skip_entry = true;
- }
- }
- break;
- case TRIG_TestPort1__msg2:
- { int p1 = (Integer) generic_data;
- if (p1==4)
- {
- chain = CHAIN_TRANS_tr5_FROM_tp1_TO_tp1_BY_msg2TestPort1_tr5;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- }
- break;
- case TRIG_TestPort1__msg6:
- {
- chain = CHAIN_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- case STATE_state1:
- switch(trigger) {
- case TRIG_TestPort1__msg1:
- { int p1 = (Integer) generic_data;
- if (p1==7)
- {
- chain = CHAIN_TRANS_tr7_FROM_tp0_TO_state0_BY_msg1TestPort1;
- catching_state = STATE_TOP;
- is_handler = true;
- } else
- if (p1==12)
- {
- chain = CHAIN_TRANS_tr6_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr6;
- catching_state = STATE_TOP;
- is_handler = true;
- skip_entry = true;
- } else
- if (p1==3)
- {
- chain = CHAIN_TRANS_tr1_FROM_tp1_TO_tp1_BY_msg1TestPort1_tr1;
- catching_state = STATE_TOP;
- skip_entry = true;
- } else
- {
- chain = CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_msg1TestPort1_tr0;
- catching_state = STATE_TOP;
- is_handler = true;
- skip_entry = true;
- }
- }
- break;
- case TRIG_TestPort1__msg2:
- { int p1 = (Integer) generic_data;
- if (p1==4)
- {
- chain = CHAIN_TRANS_tr5_FROM_tp1_TO_tp1_BY_msg2TestPort1_tr5;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- }
- break;
- case TRIG_TestPort1__msg6:
- {
- chain = CHAIN_TRANS_tr4_FROM_tp1_TO_testOk_BY_msg6TestPort1;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTest.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTest.java
deleted file mode 100644
index a2306b877..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.eclipse.etrice.integration.HandlerTest;
-
-import org.eclipse.etrice.runtime.java.messaging.MessageService;
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.RTSystemServicesProtocol.*;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-
-
-
-
-public class SubSystem_HandlerTest extends SubSystemClassBase{
-
-
- public SubSystem_HandlerTest(String name) {
- super(name);
- }
-
- @Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data){
- }
-
- @Override
- public void instantiateMessageServices(){
-
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 0, 0),"MessageService_Main"));
- }
-
- @Override
- public void instantiateActors(){
-
- // all addresses
- // Addresses for the Subsystem Systemport
- Address addr_item_SystemPort_0 = new Address(0,0,106);
- Address addr_item_SystemPort_1 = new Address(0,0,107);
- Address addr_item_SystemPort_2 = new Address(0,0,108);
-
- // actor instance /SubSystem_HandlerTest/HandlerTest_Top itself => Systemport Address
- Address addr_item__SubSystem_HandlerTest_HandlerTest_Top = new Address(0,0,101);
- // interface items of /SubSystem_HandlerTest/HandlerTest_Top
- // actor instance /SubSystem_HandlerTest/HandlerTest_Top/tester itself => Systemport Address
- Address addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester = new Address(0,0,102);
- // interface items of /SubSystem_HandlerTest/HandlerTest_Top/tester
- Address addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester_TestPort1 = new Address(0,0,103);
- // actor instance /SubSystem_HandlerTest/HandlerTest_Top/handlerUser itself => Systemport Address
- Address addr_item__SubSystem_HandlerTest_HandlerTest_Top_handlerUser = new Address(0,0,104);
- // interface items of /SubSystem_HandlerTest/HandlerTest_Top/handlerUser
- Address addr_item__SubSystem_HandlerTest_HandlerTest_Top_handlerUser_TestPort1 = new Address(0,0,105);
-
- // instantiate all actor instances
- instances = new ActorClassBase[3];
- instances[0] = new HandlerTest_Top(
- this,
- "HandlerTest_Top",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_HandlerTest_HandlerTest_Top}
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_0}
- }
- );
- instances[1] = new Tester(
- instances[0],
- "tester",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester},
- {
- addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester_TestPort1
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_1},
- {
- addr_item__SubSystem_HandlerTest_HandlerTest_Top_handlerUser_TestPort1
- }
- }
- );
- instances[2] = new HandlerUser(
- instances[0],
- "handlerUser",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_HandlerTest_HandlerTest_Top_handlerUser},
- {
- addr_item__SubSystem_HandlerTest_HandlerTest_Top_handlerUser_TestPort1
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_2},
- {
- addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester_TestPort1
- }
- }
- );
-
- // apply instance attribute configurations
-
- // create the subsystem system port
- RTSystemPort = new RTSystemServicesProtocolConjPortRepl(this, "RTSystemPort",
- 0, //local ID
- // own addresses
- new Address[]{
- addr_item_SystemPort_0,
- addr_item_SystemPort_1,
- addr_item_SystemPort_2
- },
- // peer addresses
- new Address[]{
- addr_item__SubSystem_HandlerTest_HandlerTest_Top,
- addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester,
- addr_item__SubSystem_HandlerTest_HandlerTest_Top_handlerUser
- });
- }
-
-
- @Override
- public void init(){
- super.init();
- }
-
- @Override
- public void stop(){
- super.stop();
- }
-
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTestRunner.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTestRunner.java
deleted file mode 100644
index aae766fec..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTestRunner.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author generated by eTrice
- *
- * this class contains the main function running component SubSystem_HandlerTest
- * it instantiates SubSystem_HandlerTest and starts and ends the lifecycle
- */
-
-package org.eclipse.etrice.integration.HandlerTest;
-
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemRunnerBase;
-
-class SubSystem_HandlerTestRunner extends SubSystemRunnerBase {
-
- /**
- * main function
- * creates the main component and starts and stops the lifecycle
- */
- public static void main(String[] args) {
- // instantiate the main component
- SubSystem_HandlerTest main_component = new SubSystem_HandlerTest("SubSystem_HandlerTest");
-
- run(main_component, args);
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/TestProtocol.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/TestProtocol.java
deleted file mode 100644
index 99c68738d..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/TestProtocol.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package org.eclipse.etrice.integration.HandlerTest;
-
-import java.util.ArrayList;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.Message;
-import org.eclipse.etrice.runtime.java.modelbase.*;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-
-
-
-public class TestProtocol {
- // message IDs
- public static final int MSG_MIN = 0;
- public static final int IN_msg1 = 1;
- public static final int IN_msg2 = 2;
- public static final int IN_msg3 = 3;
- public static final int IN_msg4 = 4;
- public static final int IN_msg5 = 5;
- public static final int IN_msg6 = 6;
- public static final int MSG_MAX = 7;
-
-
- private static String messageStrings[] = {"MIN", "msg1","msg2","msg3","msg4","msg5","msg6","MAX"};
-
- public String getMessageString(int msg_id) {
- if (msg_id<MSG_MIN || msg_id>MSG_MAX+1){
- // id out of range
- return "Message ID out of range";
- }
- else{
- return messageStrings[msg_id];
- }
- }
-
-
- // port class
- static public class TestProtocolPort extends PortBase {
- // constructors
- public TestProtocolPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public TestProtocolPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- }
-
- // replicated port class
- static public class TestProtocolReplPort {
- private ArrayList<TestProtocolPort> ports;
- private int replication;
-
- public TestProtocolReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<TestProtocol.TestProtocolPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new TestProtocolPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public TestProtocolPort get(int i) {
- return ports.get(i);
- }
-
- // outgoing messages
- }
-
-
- // port class
- static public class TestProtocolConjPort extends PortBase {
- // constructors
- public TestProtocolConjPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public TestProtocolConjPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void msg1(int p1) {
- if (messageStrings[ IN_msg1] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_msg1]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_msg1, p1));
- }
- public void msg2(int p1) {
- if (messageStrings[ IN_msg2] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_msg2]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_msg2, p1));
- }
- public void msg3() {
- if (messageStrings[ IN_msg3] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_msg3]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), IN_msg3));
- }
- public void msg4() {
- if (messageStrings[ IN_msg4] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_msg4]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), IN_msg4));
- }
- public void msg5(int p1) {
- if (messageStrings[ IN_msg5] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_msg5]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_msg5, p1));
- }
- public void msg6(int p1) {
- if (messageStrings[ IN_msg6] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_msg6]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_msg6, p1));
- }
- }
-
- // replicated port class
- static public class TestProtocolConjReplPort {
- private ArrayList<TestProtocolConjPort> ports;
- private int replication;
-
- public TestProtocolConjReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<TestProtocol.TestProtocolConjPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new TestProtocolConjPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public TestProtocolConjPort get(int i) {
- return ports.get(i);
- }
-
- // incoming messages
- public void msg1(int p1){
- for (int i=0; i<replication; ++i) {
- ports.get(i).msg1( p1);
- }
- }
- public void msg2(int p1){
- for (int i=0; i<replication; ++i) {
- ports.get(i).msg2( p1);
- }
- }
- public void msg3(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).msg3();
- }
- }
- public void msg4(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).msg4();
- }
- }
- public void msg5(int p1){
- for (int i=0; i<replication; ++i) {
- ports.get(i).msg5( p1);
- }
- }
- public void msg6(int p1){
- for (int i=0; i<replication; ++i) {
- ports.get(i).msg6( p1);
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java
deleted file mode 100644
index 5a1ca9acf..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.eclipse.etrice.integration.HandlerTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-import org.eclipse.etrice.integration.HandlerTest.TestProtocol.*;
-
-
-
-public class Tester extends ActorClassBase {
-
-
-
- //--------------------- ports
- protected TestProtocolConjPort TestPort1 = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_TestPort1 = 1;
-
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public Tester(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("Tester");
-
- // initialize attributes
-
- // own ports
- TestPort1 = new TestProtocolConjPort(this, "TestPort1", IFITEM_TestPort1, 0, port_addr[IFITEM_TestPort1][0], peer_addr[IFITEM_TestPort1][0]);
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
-
-
- //--------------------- port getters
- public TestProtocolConjPort getTestPort1 (){
- return this.TestPort1;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
-
- /* state IDs */
- public static final int STATE_state0 = 2;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__state0 = 1;
-
- /* triggers */
- public static final int POLLING = 0;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","state0"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
-
- /* Action Codes */
- protected void action_TRANS_INITIAL_TO__state0() {
- TestPort1.msg1(2);
- System.out.println("msg1(2) sent ");
- TestPort1.msg1(3);
- System.out.println("msg1(3) sent ");
- TestPort1.msg1(7);
- System.out.println("msg1(7) sent ");
- TestPort1.msg1(4);
- System.out.println("msg1(4) sent ");
- TestPort1.msg1(5);
- System.out.println("msg1(5) sent ");
- TestPort1.msg1(7);
- System.out.println("msg1(7) sent ");
- TestPort1.msg2(5);
- System.out.println("msg2(5) sent ");
- TestPort1.msg2(6);
- System.out.println("msg2(6) sent ");
-
-
-
- TestPort1.msg1(5);
- System.out.println("msg1(5) sent ");
- TestPort1.msg3();
- System.out.println("msg3() sent ");
- TestPort1.msg4();
- System.out.println("msg4() sent ");
- TestPort1.msg1(8);
- System.out.println("msg1(8) sent ");
- TestPort1.msg6(12);
- System.out.println("msg6(12) sent ");
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_state0:
- this.history[STATE_TOP] = STATE_state0;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_INITIAL_TO__state0:
- {
- action_TRANS_INITIAL_TO__state0();
- return STATE_state0;
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_state0:
- // in leaf state: return state id
- return STATE_state0;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__state0;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_state0:
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java
deleted file mode 100644
index 32dbaa627..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package org.eclipse.etrice.integration.PingPongThreadTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-import room.basic.service.timing.*;
-
-import room.basic.service.timing.PTimer.*;
-import org.eclipse.etrice.integration.PingPongThreadTest.PingPongProtocol.*;
-
-/*--------------------- begin user code ---------------------*/
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-/*--------------------- end user code ---------------------*/
-
-
-public class MrPingActor extends ActorClassBase {
-
-
-
- //--------------------- ports
- protected PingPongProtocolConjPort PingPongPort = null;
- protected PingPongProtocolConjPort PingPongPort2 = null;
- protected PingPongProtocolConjPort PingPongPort3 = null;
-
- //--------------------- saps
- protected PTimerConjPort timer = null;
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_PingPongPort = 1;
- public static final int IFITEM_PingPongPort2 = 2;
- public static final int IFITEM_PingPongPort3 = 3;
- public static final int IFITEM_timer = 4;
-
-
- /*--------------------- attributes ---------------------*/
- int count;
- int pongCount;
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public MrPingActor(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("MrPingActor");
-
- // initialize attributes
- count = 0;
- pongCount = 0;
-
- // own ports
- PingPongPort = new PingPongProtocolConjPort(this, "PingPongPort", IFITEM_PingPongPort, 0, port_addr[IFITEM_PingPongPort][0], peer_addr[IFITEM_PingPongPort][0]);
- PingPongPort2 = new PingPongProtocolConjPort(this, "PingPongPort2", IFITEM_PingPongPort2, 0, port_addr[IFITEM_PingPongPort2][0], peer_addr[IFITEM_PingPongPort2][0]);
- PingPongPort3 = new PingPongProtocolConjPort(this, "PingPongPort3", IFITEM_PingPongPort3, 0, port_addr[IFITEM_PingPongPort3][0], peer_addr[IFITEM_PingPongPort3][0]);
-
- // own saps
- timer = new PTimerConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
- public void setCount (int count) {
- this.count = count;
- }
- public int getCount () {
- return this.count;
- }
- public void setPongCount (int pongCount) {
- this.pongCount = pongCount;
- }
- public int getPongCount () {
- return this.pongCount;
- }
-
-
- //--------------------- port getters
- public PingPongProtocolConjPort getPingPongPort (){
- return this.PingPongPort;
- }
- public PingPongProtocolConjPort getPingPongPort2 (){
- return this.PingPongPort2;
- }
- public PingPongProtocolConjPort getPingPongPort3 (){
- return this.PingPongPort3;
- }
- public PTimerConjPort getTimer (){
- return this.timer;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
-
- /* state IDs */
- public static final int STATE_waitForTimer = 2;
- public static final int STATE_waitForPong = 3;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__waitForTimer = 1;
- public static final int CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer = 2;
- public static final int CHAIN_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort2pongPingPongPort = 3;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_PingPongPort2__pong = IFITEM_PingPongPort2 + EVT_SHIFT*PingPongProtocol.OUT_pong;
- public static final int TRIG_PingPongPort__pong = IFITEM_PingPongPort + EVT_SHIFT*PingPongProtocol.OUT_pong;
- public static final int TRIG_timer__timeout = IFITEM_timer + EVT_SHIFT*PTimer.OUT_timeout;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","waitForTimer",
- "waitForPong"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
-
- /* Action Codes */
- protected void action_TRANS_INITIAL_TO__waitForTimer() {
- count = 0;
- timer.startTimeout(10);
- }
- protected void action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer(InterfaceItemBase ifitem) {
- PingPongPort.ping();
- PingPongPort2.ping();
- pongCount = 0;
- }
- protected void action_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort2pongPingPongPort(InterfaceItemBase ifitem) {
- pongCount++;
- }
- protected void action_TRANS_tr5_FROM_cp0_TO_waitForTimer(InterfaceItemBase ifitem) {
- if (count++ > 100) {
- RTServices.getInstance().getSubSystem().testFinished(0);
- } else {
- System.out.println(count);
- timer.startTimeout(5);}
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_waitForTimer:
- this.history[STATE_TOP] = STATE_waitForTimer;
- current = STATE_TOP;
- break;
- case STATE_waitForPong:
- this.history[STATE_TOP] = STATE_waitForPong;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_INITIAL_TO__waitForTimer:
- {
- action_TRANS_INITIAL_TO__waitForTimer();
- return STATE_waitForTimer;
- }
- case CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer:
- {
- action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer(ifitem);
- return STATE_waitForPong;
- }
- case CHAIN_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort2pongPingPongPort:
- {
- action_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort2pongPingPongPort(ifitem);
- if (pongCount < 2) {
- return STATE_waitForPong;}
- else {
- action_TRANS_tr5_FROM_cp0_TO_waitForTimer(ifitem);
- return STATE_waitForTimer;}
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_waitForTimer:
- // in leaf state: return state id
- return STATE_waitForTimer;
- case STATE_waitForPong:
- // in leaf state: return state id
- return STATE_waitForPong;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__waitForTimer;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_waitForTimer:
- switch(trigger) {
- case TRIG_timer__timeout:
- {
- chain = CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- case STATE_waitForPong:
- switch(trigger) {
- case TRIG_PingPongPort2__pong:
- {
- chain = CHAIN_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort2pongPingPongPort;
- catching_state = STATE_TOP;
- }
- break;
- case TRIG_PingPongPort__pong:
- {
- chain = CHAIN_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort2pongPingPongPort;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java
deleted file mode 100644
index 247cb5a5a..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package org.eclipse.etrice.integration.PingPongThreadTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-import org.eclipse.etrice.integration.PingPongThreadTest.PingPongProtocol.*;
-
-
-
-public class MrPongActor1 extends ActorClassBase {
-
-
-
- //--------------------- ports
- protected PingPongProtocolPort PingPongPort = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_PingPongPort = 1;
-
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public MrPongActor1(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("MrPongActor1");
-
- // initialize attributes
-
- // own ports
- PingPongPort = new PingPongProtocolPort(this, "PingPongPort", IFITEM_PingPongPort, 0, port_addr[IFITEM_PingPongPort][0], peer_addr[IFITEM_PingPongPort][0]);
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
-
-
- //--------------------- port getters
- public PingPongProtocolPort getPingPongPort (){
- return this.PingPongPort;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
-
- /* state IDs */
- public static final int STATE_waitForPing = 2;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__waitForPing = 1;
- public static final int CHAIN_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger = 2;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_PingPongPort__ping = IFITEM_PingPongPort + EVT_SHIFT*PingPongProtocol.IN_ping;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","waitForPing"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
-
- /* Action Codes */
- protected void action_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger(InterfaceItemBase ifitem) {
- PingPongPort.pong();
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_waitForPing:
- this.history[STATE_TOP] = STATE_waitForPing;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_INITIAL_TO__waitForPing:
- {
- return STATE_waitForPing;
- }
- case CHAIN_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger:
- {
- action_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger(ifitem);
- return STATE_waitForPing;
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_waitForPing:
- // in leaf state: return state id
- return STATE_waitForPing;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__waitForPing;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_waitForPing:
- switch(trigger) {
- case TRIG_PingPongPort__ping:
- {
- chain = CHAIN_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java
deleted file mode 100644
index 169377f16..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package org.eclipse.etrice.integration.PingPongThreadTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-import org.eclipse.etrice.integration.PingPongThreadTest.PingPongProtocol.*;
-
-
-
-public class MrPongActor2 extends ActorClassBase {
-
-
-
- //--------------------- ports
- protected PingPongProtocolPort PingPongPort = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_PingPongPort = 1;
-
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public MrPongActor2(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("MrPongActor2");
-
- // initialize attributes
-
- // own ports
- PingPongPort = new PingPongProtocolPort(this, "PingPongPort", IFITEM_PingPongPort, 0, port_addr[IFITEM_PingPongPort][0], peer_addr[IFITEM_PingPongPort][0]);
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
-
-
- //--------------------- port getters
- public PingPongProtocolPort getPingPongPort (){
- return this.PingPongPort;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
-
- /* state IDs */
- public static final int STATE_waitForPing = 2;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__waitForPing = 1;
- public static final int CHAIN_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger = 2;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_PingPongPort__ping = IFITEM_PingPongPort + EVT_SHIFT*PingPongProtocol.IN_ping;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","waitForPing"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
-
- /* Action Codes */
- protected void action_TRANS_INITIAL_TO__waitForPing() {
- // simulate blocking call e.g. Queue
- try{
- Thread.sleep(5000);
- }catch (InterruptedException e){}
- }
- protected void action_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger(InterfaceItemBase ifitem) {
- PingPongPort.pong();
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_waitForPing:
- this.history[STATE_TOP] = STATE_waitForPing;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_INITIAL_TO__waitForPing:
- {
- action_TRANS_INITIAL_TO__waitForPing();
- return STATE_waitForPing;
- }
- case CHAIN_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger:
- {
- action_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger(ifitem);
- return STATE_waitForPing;
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_waitForPing:
- // in leaf state: return state id
- return STATE_waitForPing;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__waitForPing;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_waitForPing:
- switch(trigger) {
- case TRIG_PingPongPort__ping:
- {
- chain = CHAIN_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongProtocol.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongProtocol.java
deleted file mode 100644
index d3979beda..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongProtocol.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package org.eclipse.etrice.integration.PingPongThreadTest;
-
-import java.util.ArrayList;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.Message;
-import org.eclipse.etrice.runtime.java.modelbase.*;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-
-
-
-public class PingPongProtocol {
- // message IDs
- public static final int MSG_MIN = 0;
- public static final int OUT_pong = 1;
- public static final int IN_ping = 2;
- public static final int MSG_MAX = 3;
-
-
- private static String messageStrings[] = {"MIN", "pong", "ping","MAX"};
-
- public String getMessageString(int msg_id) {
- if (msg_id<MSG_MIN || msg_id>MSG_MAX+1){
- // id out of range
- return "Message ID out of range";
- }
- else{
- return messageStrings[msg_id];
- }
- }
-
-
- // port class
- static public class PingPongProtocolPort extends PortBase {
- // constructors
- public PingPongProtocolPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public PingPongProtocolPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void pong() {
- if (messageStrings[ OUT_pong] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[OUT_pong]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), OUT_pong));
- }
- }
-
- // replicated port class
- static public class PingPongProtocolReplPort {
- private ArrayList<PingPongProtocolPort> ports;
- private int replication;
-
- public PingPongProtocolReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<PingPongProtocol.PingPongProtocolPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new PingPongProtocolPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PingPongProtocolPort get(int i) {
- return ports.get(i);
- }
-
- // outgoing messages
- public void pong(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).pong();
- }
- }
- }
-
-
- // port class
- static public class PingPongProtocolConjPort extends PortBase {
- // constructors
- public PingPongProtocolConjPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public PingPongProtocolConjPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void ping() {
- if (messageStrings[ IN_ping] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_ping]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), IN_ping));
- }
- }
-
- // replicated port class
- static public class PingPongProtocolConjReplPort {
- private ArrayList<PingPongProtocolConjPort> ports;
- private int replication;
-
- public PingPongProtocolConjReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<PingPongProtocol.PingPongProtocolConjPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new PingPongProtocolConjPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PingPongProtocolConjPort get(int i) {
- return ports.get(i);
- }
-
- // incoming messages
- public void ping(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).ping();
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongTop.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongTop.java
deleted file mode 100644
index 7f335babb..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongTop.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.etrice.integration.PingPongThreadTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-
-
-
-public class PingPongTop extends ActorClassBase {
-
-
-
- //--------------------- ports
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
-
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public PingPongTop(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("PingPongTop");
-
- // initialize attributes
-
- // own ports
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
-
-
- //--------------------- port getters
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
- //--------------------- no state machine
- @Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data) {
- handleSystemEvent(ifitem, evt, data);
- }
-
- @Override
- public void executeInitTransition(){
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPong.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPong.java
deleted file mode 100644
index b062e724f..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPong.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.etrice.integration.PingPongThreadTest;
-
-import org.eclipse.etrice.runtime.java.messaging.MessageService;
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.RTSystemServicesProtocol.*;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-
-import room.basic.service.timing.*;
-
-
-
-public class SubSystem_PingPong extends SubSystemClassBase{
-
-
- public SubSystem_PingPong(String name) {
- super(name);
- }
-
- @Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data){
- }
-
- @Override
- public void instantiateMessageServices(){
-
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 0, 0),"MessageService_Main"));
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 1, 0),"MessageService_mrPingThread", 5));
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 2, 0),"MessageService_mrPong1Thread", 5));
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 3, 0),"MessageService_mrPong2Thread", 5));
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 4, 0),"MessageService_mrPong3Thread", 5));
- }
-
- @Override
- public void instantiateActors(){
-
- // all addresses
- // Addresses for the Subsystem Systemport
- Address addr_item_SystemPort_0 = new Address(0,0,115);
- Address addr_item_SystemPort_1 = new Address(0,0,116);
- Address addr_item_SystemPort_2 = new Address(0,0,117);
- Address addr_item_SystemPort_3 = new Address(0,0,118);
- Address addr_item_SystemPort_4 = new Address(0,0,119);
- Address addr_item_SystemPort_5 = new Address(0,0,120);
-
- // actor instance /SubSystem_PingPong/application itself => Systemport Address
- Address addr_item__SubSystem_PingPong_application = new Address(0,0,101);
- // interface items of /SubSystem_PingPong/application
- // actor instance /SubSystem_PingPong/application/MrPing itself => Systemport Address
- Address addr_item__SubSystem_PingPong_application_MrPing = new Address(0,1,102);
- // interface items of /SubSystem_PingPong/application/MrPing
- Address addr_item__SubSystem_PingPong_application_MrPing_PingPongPort = new Address(0,1,103);
- Address addr_item__SubSystem_PingPong_application_MrPing_PingPongPort2 = new Address(0,1,104);
- Address addr_item__SubSystem_PingPong_application_MrPing_PingPongPort3 = new Address(0,1,105);
- Address addr_item__SubSystem_PingPong_application_MrPing_timer = new Address(0,1,106);
- // actor instance /SubSystem_PingPong/application/MrPong1 itself => Systemport Address
- Address addr_item__SubSystem_PingPong_application_MrPong1 = new Address(0,2,107);
- // interface items of /SubSystem_PingPong/application/MrPong1
- Address addr_item__SubSystem_PingPong_application_MrPong1_PingPongPort = new Address(0,2,108);
- // actor instance /SubSystem_PingPong/application/MrPong2 itself => Systemport Address
- Address addr_item__SubSystem_PingPong_application_MrPong2 = new Address(0,3,109);
- // interface items of /SubSystem_PingPong/application/MrPong2
- Address addr_item__SubSystem_PingPong_application_MrPong2_PingPongPort = new Address(0,3,110);
- // actor instance /SubSystem_PingPong/application/MrPong3 itself => Systemport Address
- Address addr_item__SubSystem_PingPong_application_MrPong3 = new Address(0,4,111);
- // interface items of /SubSystem_PingPong/application/MrPong3
- Address addr_item__SubSystem_PingPong_application_MrPong3_PingPongPort = new Address(0,4,112);
- // actor instance /SubSystem_PingPong/services itself => Systemport Address
- Address addr_item__SubSystem_PingPong_services = new Address(0,0,113);
- // interface items of /SubSystem_PingPong/services
- Address addr_item__SubSystem_PingPong_services_timer_0 = new Address(0,0,114);
-
- // instantiate all actor instances
- instances = new ActorClassBase[6];
- instances[0] = new PingPongTop(
- this,
- "application",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_PingPong_application}
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_0}
- }
- );
- instances[1] = new MrPingActor(
- instances[0],
- "MrPing",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_PingPong_application_MrPing},
- {
- addr_item__SubSystem_PingPong_application_MrPing_PingPongPort
- },
- {
- addr_item__SubSystem_PingPong_application_MrPing_PingPongPort2
- },
- {
- addr_item__SubSystem_PingPong_application_MrPing_PingPongPort3
- },
- {
- addr_item__SubSystem_PingPong_application_MrPing_timer
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_1},
- {
- addr_item__SubSystem_PingPong_application_MrPong1_PingPongPort
- },
- {
- addr_item__SubSystem_PingPong_application_MrPong2_PingPongPort
- },
- {
- addr_item__SubSystem_PingPong_application_MrPong3_PingPongPort
- },
- {
- addr_item__SubSystem_PingPong_services_timer_0
- }
- }
- );
- instances[2] = new MrPongActor1(
- instances[0],
- "MrPong1",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_PingPong_application_MrPong1},
- {
- addr_item__SubSystem_PingPong_application_MrPong1_PingPongPort
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_2},
- {
- addr_item__SubSystem_PingPong_application_MrPing_PingPongPort
- }
- }
- );
- instances[3] = new MrPongActor1(
- instances[0],
- "MrPong2",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_PingPong_application_MrPong2},
- {
- addr_item__SubSystem_PingPong_application_MrPong2_PingPongPort
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_3},
- {
- addr_item__SubSystem_PingPong_application_MrPing_PingPongPort2
- }
- }
- );
- instances[4] = new MrPongActor2(
- instances[0],
- "MrPong3",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_PingPong_application_MrPong3},
- {
- addr_item__SubSystem_PingPong_application_MrPong3_PingPongPort
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_4},
- {
- addr_item__SubSystem_PingPong_application_MrPing_PingPongPort3
- }
- }
- );
- instances[5] = new ATimingService(
- this,
- "services",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_PingPong_services},
- {
- addr_item__SubSystem_PingPong_services_timer_0
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_5},
- {
- addr_item__SubSystem_PingPong_application_MrPing_timer
- }
- }
- );
-
- // apply instance attribute configurations
-
- // create the subsystem system port
- RTSystemPort = new RTSystemServicesProtocolConjPortRepl(this, "RTSystemPort",
- 0, //local ID
- // own addresses
- new Address[]{
- addr_item_SystemPort_0,
- addr_item_SystemPort_1,
- addr_item_SystemPort_2,
- addr_item_SystemPort_3,
- addr_item_SystemPort_4,
- addr_item_SystemPort_5
- },
- // peer addresses
- new Address[]{
- addr_item__SubSystem_PingPong_application,
- addr_item__SubSystem_PingPong_application_MrPing,
- addr_item__SubSystem_PingPong_application_MrPong1,
- addr_item__SubSystem_PingPong_application_MrPong2,
- addr_item__SubSystem_PingPong_application_MrPong3,
- addr_item__SubSystem_PingPong_services
- });
- }
-
-
- @Override
- public void init(){
- super.init();
- }
-
- @Override
- public void stop(){
- super.stop();
- }
-
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPongRunner.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPongRunner.java
deleted file mode 100644
index 406588a1d..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPongRunner.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author generated by eTrice
- *
- * this class contains the main function running component SubSystem_PingPong
- * it instantiates SubSystem_PingPong and starts and ends the lifecycle
- */
-
-package org.eclipse.etrice.integration.PingPongThreadTest;
-
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemRunnerBase;
-
-class SubSystem_PingPongRunner extends SubSystemRunnerBase {
-
- /**
- * main function
- * creates the main component and starts and stops the lifecycle
- */
- public static void main(String[] args) {
- // instantiate the main component
- SubSystem_PingPong main_component = new SubSystem_PingPong("SubSystem_PingPong");
-
- run(main_component, args);
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java
deleted file mode 100644
index 735ceb889..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package org.eclipse.etrice.integration.PingPongThreadTestReplPort;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-import room.basic.service.timing.*;
-
-import room.basic.service.timing.PTimer.*;
-import org.eclipse.etrice.integration.PingPongThreadTestReplPort.PingPongProtocol.*;
-
-/*--------------------- begin user code ---------------------*/
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-/*--------------------- end user code ---------------------*/
-
-
-public class MrPingActor extends ActorClassBase {
-
-
-
- //--------------------- ports
- protected PingPongProtocolConjReplPort PingPongPort = null;
-
- //--------------------- saps
- protected PTimerConjPort timer = null;
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_PingPongPort = 1;
- public static final int IFITEM_timer = 2;
-
-
- /*--------------------- attributes ---------------------*/
- int count;
- int pongCount;
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public MrPingActor(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("MrPingActor");
-
- // initialize attributes
- count = 0;
- pongCount = 0;
-
- // own ports
- PingPongPort = new PingPongProtocolConjReplPort(this, "PingPongPort", IFITEM_PingPongPort, port_addr[IFITEM_PingPongPort], peer_addr[IFITEM_PingPongPort]);
-
- // own saps
- timer = new PTimerConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
- public void setCount (int count) {
- this.count = count;
- }
- public int getCount () {
- return this.count;
- }
- public void setPongCount (int pongCount) {
- this.pongCount = pongCount;
- }
- public int getPongCount () {
- return this.pongCount;
- }
-
-
- //--------------------- port getters
- public PingPongProtocolConjReplPort getPingPongPort (){
- return this.PingPongPort;
- }
- public PTimerConjPort getTimer (){
- return this.timer;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
-
- /* state IDs */
- public static final int STATE_waitForTimer = 2;
- public static final int STATE_waitForPong = 3;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__waitForTimer = 1;
- public static final int CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer = 2;
- public static final int CHAIN_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort = 3;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_PingPongPort__pong = IFITEM_PingPongPort + EVT_SHIFT*PingPongProtocol.OUT_pong;
- public static final int TRIG_timer__timeout = IFITEM_timer + EVT_SHIFT*PTimer.OUT_timeout;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","waitForTimer",
- "waitForPong"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
-
- /* Action Codes */
- protected void action_TRANS_INITIAL_TO__waitForTimer() {
- count = 0;
- timer.startTimeout(1000);
- }
- protected void action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer(InterfaceItemBase ifitem) {
- PingPongPort.get(0).ping();
- PingPongPort.get(1).ping();
- PingPongPort.get(2).ping();
- pongCount = 0;
- }
- protected void action_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort(InterfaceItemBase ifitem) {
- pongCount++;
- }
- protected void action_TRANS_tr4_FROM_cp0_TO_waitForTimer(InterfaceItemBase ifitem) {
- if (count++ > 1000) {
- RTServices.getInstance().getSubSystem().testFinished(0);
- } else {
- //PingPongPort.get(0).ping();
- //PingPongPort.get(1).ping();
- //PingPongPort.get(2).ping();
- System.out.println(pongCount);
- System.out.println(count);
- pongCount = 0;
- timer.startTimeout(10);
- }
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_waitForTimer:
- this.history[STATE_TOP] = STATE_waitForTimer;
- current = STATE_TOP;
- break;
- case STATE_waitForPong:
- this.history[STATE_TOP] = STATE_waitForPong;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_INITIAL_TO__waitForTimer:
- {
- action_TRANS_INITIAL_TO__waitForTimer();
- return STATE_waitForTimer;
- }
- case CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer:
- {
- action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer(ifitem);
- return STATE_waitForPong;
- }
- case CHAIN_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort:
- {
- action_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort(ifitem);
- if (pongCount < 3) {
- return STATE_waitForPong;}
- else {
- action_TRANS_tr4_FROM_cp0_TO_waitForTimer(ifitem);
- return STATE_waitForTimer;}
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_waitForTimer:
- // in leaf state: return state id
- return STATE_waitForTimer;
- case STATE_waitForPong:
- // in leaf state: return state id
- return STATE_waitForPong;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__waitForTimer;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_waitForTimer:
- switch(trigger) {
- case TRIG_timer__timeout:
- {
- chain = CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- case STATE_waitForPong:
- switch(trigger) {
- case TRIG_PingPongPort__pong:
- {
- chain = CHAIN_TRANS_tr3_FROM_waitForPong_TO_cp0_BY_pongPingPongPort;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java
deleted file mode 100644
index 48606f894..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package org.eclipse.etrice.integration.PingPongThreadTestReplPort;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-import org.eclipse.etrice.integration.PingPongThreadTestReplPort.PingPongProtocol.*;
-
-
-
-public class MrPongActor1 extends ActorClassBase {
-
-
-
- //--------------------- ports
- protected PingPongProtocolPort PingPongPort = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_PingPongPort = 1;
-
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public MrPongActor1(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("MrPongActor1");
-
- // initialize attributes
-
- // own ports
- PingPongPort = new PingPongProtocolPort(this, "PingPongPort", IFITEM_PingPongPort, 0, port_addr[IFITEM_PingPongPort][0], peer_addr[IFITEM_PingPongPort][0]);
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
-
-
- //--------------------- port getters
- public PingPongProtocolPort getPingPongPort (){
- return this.PingPongPort;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
-
- /* state IDs */
- public static final int STATE_waitForPing = 2;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__waitForPing = 1;
- public static final int CHAIN_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger = 2;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_PingPongPort__ping = IFITEM_PingPongPort + EVT_SHIFT*PingPongProtocol.IN_ping;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","waitForPing"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
-
- /* Action Codes */
- protected void action_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger(InterfaceItemBase ifitem) {
- PingPongPort.pong();
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_waitForPing:
- this.history[STATE_TOP] = STATE_waitForPing;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_INITIAL_TO__waitForPing:
- {
- return STATE_waitForPing;
- }
- case CHAIN_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger:
- {
- action_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger(ifitem);
- return STATE_waitForPing;
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_waitForPing:
- // in leaf state: return state id
- return STATE_waitForPing;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__waitForPing;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_waitForPing:
- switch(trigger) {
- case TRIG_PingPongPort__ping:
- {
- chain = CHAIN_TRANS_myTrigger_FROM_waitForPing_TO_waitForPing_BY_pingPingPongPort_myTrigger;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongProtocol.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongProtocol.java
deleted file mode 100644
index fa7386762..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongProtocol.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package org.eclipse.etrice.integration.PingPongThreadTestReplPort;
-
-import java.util.ArrayList;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.Message;
-import org.eclipse.etrice.runtime.java.modelbase.*;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-
-
-
-public class PingPongProtocol {
- // message IDs
- public static final int MSG_MIN = 0;
- public static final int OUT_pong = 1;
- public static final int IN_ping = 2;
- public static final int MSG_MAX = 3;
-
-
- private static String messageStrings[] = {"MIN", "pong", "ping","MAX"};
-
- public String getMessageString(int msg_id) {
- if (msg_id<MSG_MIN || msg_id>MSG_MAX+1){
- // id out of range
- return "Message ID out of range";
- }
- else{
- return messageStrings[msg_id];
- }
- }
-
-
- // port class
- static public class PingPongProtocolPort extends PortBase {
- // constructors
- public PingPongProtocolPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public PingPongProtocolPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void pong() {
- if (messageStrings[ OUT_pong] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[OUT_pong]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), OUT_pong));
- }
- }
-
- // replicated port class
- static public class PingPongProtocolReplPort {
- private ArrayList<PingPongProtocolPort> ports;
- private int replication;
-
- public PingPongProtocolReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<PingPongProtocol.PingPongProtocolPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new PingPongProtocolPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PingPongProtocolPort get(int i) {
- return ports.get(i);
- }
-
- // outgoing messages
- public void pong(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).pong();
- }
- }
- }
-
-
- // port class
- static public class PingPongProtocolConjPort extends PortBase {
- // constructors
- public PingPongProtocolConjPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public PingPongProtocolConjPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void ping() {
- if (messageStrings[ IN_ping] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_ping]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), IN_ping));
- }
- }
-
- // replicated port class
- static public class PingPongProtocolConjReplPort {
- private ArrayList<PingPongProtocolConjPort> ports;
- private int replication;
-
- public PingPongProtocolConjReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<PingPongProtocol.PingPongProtocolConjPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new PingPongProtocolConjPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PingPongProtocolConjPort get(int i) {
- return ports.get(i);
- }
-
- // incoming messages
- public void ping(){
- for (int i=0; i<replication; ++i) {
- ports.get(i).ping();
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongTop.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongTop.java
deleted file mode 100644
index 6bf2d70cf..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongTop.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.etrice.integration.PingPongThreadTestReplPort;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-
-
-
-public class PingPongTop extends ActorClassBase {
-
-
-
- //--------------------- ports
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
-
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public PingPongTop(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("PingPongTop");
-
- // initialize attributes
-
- // own ports
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
-
-
- //--------------------- port getters
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
- //--------------------- no state machine
- @Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data) {
- handleSystemEvent(ifitem, evt, data);
- }
-
- @Override
- public void executeInitTransition(){
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPort.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPort.java
deleted file mode 100644
index 2e2242e5a..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPort.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package org.eclipse.etrice.integration.PingPongThreadTestReplPort;
-
-import org.eclipse.etrice.runtime.java.messaging.MessageService;
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.RTSystemServicesProtocol.*;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-
-import room.basic.service.timing.*;
-
-
-
-public class SubSystem_PingPongReplPort extends SubSystemClassBase{
-
-
- public SubSystem_PingPongReplPort(String name) {
- super(name);
- }
-
- @Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data){
- }
-
- @Override
- public void instantiateMessageServices(){
-
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 0, 0),"MessageService_Main"));
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 1, 0),"MessageService_mrPingThread", 5));
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 2, 0),"MessageService_mrPong1Thread", 5));
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 3, 0),"MessageService_mrPong2Thread", 5));
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 4, 0),"MessageService_mrPong3Thread", 5));
- }
-
- @Override
- public void instantiateActors(){
-
- // all addresses
- // Addresses for the Subsystem Systemport
- Address addr_item_SystemPort_0 = new Address(0,0,115);
- Address addr_item_SystemPort_1 = new Address(0,0,116);
- Address addr_item_SystemPort_2 = new Address(0,0,117);
- Address addr_item_SystemPort_3 = new Address(0,0,118);
- Address addr_item_SystemPort_4 = new Address(0,0,119);
- Address addr_item_SystemPort_5 = new Address(0,0,120);
-
- // actor instance /SubSystem_PingPongReplPort/application itself => Systemport Address
- Address addr_item__SubSystem_PingPongReplPort_application = new Address(0,0,101);
- // interface items of /SubSystem_PingPongReplPort/application
- // actor instance /SubSystem_PingPongReplPort/application/MrPing itself => Systemport Address
- Address addr_item__SubSystem_PingPongReplPort_application_MrPing = new Address(0,1,102);
- // interface items of /SubSystem_PingPongReplPort/application/MrPing
- Address addr_item__SubSystem_PingPongReplPort_application_MrPing_PingPongPort_0 = new Address(0,0,103);
- Address addr_item__SubSystem_PingPongReplPort_application_MrPing_PingPongPort_1 = new Address(0,0,104);
- Address addr_item__SubSystem_PingPongReplPort_application_MrPing_PingPongPort_2 = new Address(0,0,105);
- Address addr_item__SubSystem_PingPongReplPort_application_MrPing_timer = new Address(0,1,106);
- // actor instance /SubSystem_PingPongReplPort/application/MrPong1 itself => Systemport Address
- Address addr_item__SubSystem_PingPongReplPort_application_MrPong1 = new Address(0,2,107);
- // interface items of /SubSystem_PingPongReplPort/application/MrPong1
- Address addr_item__SubSystem_PingPongReplPort_application_MrPong1_PingPongPort = new Address(0,2,108);
- // actor instance /SubSystem_PingPongReplPort/application/MrPong2 itself => Systemport Address
- Address addr_item__SubSystem_PingPongReplPort_application_MrPong2 = new Address(0,3,109);
- // interface items of /SubSystem_PingPongReplPort/application/MrPong2
- Address addr_item__SubSystem_PingPongReplPort_application_MrPong2_PingPongPort = new Address(0,3,110);
- // actor instance /SubSystem_PingPongReplPort/application/MrPong3 itself => Systemport Address
- Address addr_item__SubSystem_PingPongReplPort_application_MrPong3 = new Address(0,4,111);
- // interface items of /SubSystem_PingPongReplPort/application/MrPong3
- Address addr_item__SubSystem_PingPongReplPort_application_MrPong3_PingPongPort = new Address(0,4,112);
- // actor instance /SubSystem_PingPongReplPort/services itself => Systemport Address
- Address addr_item__SubSystem_PingPongReplPort_services = new Address(0,0,113);
- // interface items of /SubSystem_PingPongReplPort/services
- Address addr_item__SubSystem_PingPongReplPort_services_timer_0 = new Address(0,0,114);
-
- // instantiate all actor instances
- instances = new ActorClassBase[6];
- instances[0] = new PingPongTop(
- this,
- "application",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_PingPongReplPort_application}
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_0}
- }
- );
- instances[1] = new MrPingActor(
- instances[0],
- "MrPing",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_PingPongReplPort_application_MrPing},
- {
- addr_item__SubSystem_PingPongReplPort_application_MrPing_PingPongPort_0,
- addr_item__SubSystem_PingPongReplPort_application_MrPing_PingPongPort_1,
- addr_item__SubSystem_PingPongReplPort_application_MrPing_PingPongPort_2
- },
- {
- addr_item__SubSystem_PingPongReplPort_application_MrPing_timer
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_1},
- {
- addr_item__SubSystem_PingPongReplPort_application_MrPong1_PingPongPort,
- addr_item__SubSystem_PingPongReplPort_application_MrPong2_PingPongPort,
- addr_item__SubSystem_PingPongReplPort_application_MrPong3_PingPongPort
- },
- {
- addr_item__SubSystem_PingPongReplPort_services_timer_0
- }
- }
- );
- instances[2] = new MrPongActor1(
- instances[0],
- "MrPong1",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_PingPongReplPort_application_MrPong1},
- {
- addr_item__SubSystem_PingPongReplPort_application_MrPong1_PingPongPort
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_2},
- {
- addr_item__SubSystem_PingPongReplPort_application_MrPing_PingPongPort_0
- }
- }
- );
- instances[3] = new MrPongActor1(
- instances[0],
- "MrPong2",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_PingPongReplPort_application_MrPong2},
- {
- addr_item__SubSystem_PingPongReplPort_application_MrPong2_PingPongPort
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_3},
- {
- addr_item__SubSystem_PingPongReplPort_application_MrPing_PingPongPort_1
- }
- }
- );
- instances[4] = new MrPongActor1(
- instances[0],
- "MrPong3",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_PingPongReplPort_application_MrPong3},
- {
- addr_item__SubSystem_PingPongReplPort_application_MrPong3_PingPongPort
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_4},
- {
- addr_item__SubSystem_PingPongReplPort_application_MrPing_PingPongPort_2
- }
- }
- );
- instances[5] = new ATimingService(
- this,
- "services",
- // own interface item addresses
- new Address[][] {{addr_item__SubSystem_PingPongReplPort_services},
- {
- addr_item__SubSystem_PingPongReplPort_services_timer_0
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_5},
- {
- addr_item__SubSystem_PingPongReplPort_application_MrPing_timer
- }
- }
- );
-
- // apply instance attribute configurations
-
- // create the subsystem system port
- RTSystemPort = new RTSystemServicesProtocolConjPortRepl(this, "RTSystemPort",
- 0, //local ID
- // own addresses
- new Address[]{
- addr_item_SystemPort_0,
- addr_item_SystemPort_1,
- addr_item_SystemPort_2,
- addr_item_SystemPort_3,
- addr_item_SystemPort_4,
- addr_item_SystemPort_5
- },
- // peer addresses
- new Address[]{
- addr_item__SubSystem_PingPongReplPort_application,
- addr_item__SubSystem_PingPongReplPort_application_MrPing,
- addr_item__SubSystem_PingPongReplPort_application_MrPong1,
- addr_item__SubSystem_PingPongReplPort_application_MrPong2,
- addr_item__SubSystem_PingPongReplPort_application_MrPong3,
- addr_item__SubSystem_PingPongReplPort_services
- });
- }
-
-
- @Override
- public void init(){
- super.init();
- }
-
- @Override
- public void stop(){
- super.stop();
- }
-
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPortRunner.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPortRunner.java
deleted file mode 100644
index cdf516fe5..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPortRunner.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author generated by eTrice
- *
- * this class contains the main function running component SubSystem_PingPongReplPort
- * it instantiates SubSystem_PingPongReplPort and starts and ends the lifecycle
- */
-
-package org.eclipse.etrice.integration.PingPongThreadTestReplPort;
-
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemRunnerBase;
-
-class SubSystem_PingPongReplPortRunner extends SubSystemRunnerBase {
-
- /**
- * main function
- * creates the main component and starts and stops the lifecycle
- */
- public static void main(String[] args) {
- // instantiate the main component
- SubSystem_PingPongReplPort main_component = new SubSystem_PingPongReplPort("SubSystem_PingPongReplPort");
-
- run(main_component, args);
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java
deleted file mode 100644
index 120327bac..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java
+++ /dev/null
@@ -1,553 +0,0 @@
-package org.eclipse.etrice.integration.SendingDataByValueTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-import org.eclipse.etrice.integration.SendingDataByValueTest.PingPongProtocol.*;
-
-/*--------------------- begin user code ---------------------*/
-import org.eclipse.etrice.integration.tests.helpers.*;
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-/*--------------------- end user code ---------------------*/
-
-
-public class MrPing extends ActorClassBase {
-
- /*--------------------- begin user code ---------------------*/
- private CRC16Generator crcGen = new CRC16Generator();
- /*--------------------- end user code ---------------------*/
-
-
- //--------------------- ports
- protected PingPongProtocolConjPort PingPongPort = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_PingPongPort = 1;
-
-
- /*--------------------- attributes ---------------------*/
- int i32Array[];
- PingPongData data;
- /*--------------------- operations ---------------------*/
- public void printData(PingPongData d) {
- System.out.printf("MrPing:\n");
- System.out.printf("i8Val: %d \n",d.getI8Val());
- System.out.printf("i16Val: %d \n",d.getI16Val());
- System.out.printf("i32Val: %d \n",d.getI32Val());
- System.out.printf("charVal: %c \n",d.getCharVal());
- System.out.printf("f32Val: %f \n",d.getF32Val());
- System.out.printf("f64Val: %f \n",d.getF64Val());
- System.out.printf("stringVal: %s \n",d.getStringVal());
- System.out.printf("i32Array: %d %d %d %d %d\n",d.getArrayFromInt32()[0],d.getArrayFromInt32()[1],d.getArrayFromInt32()[2],d.getArrayFromInt32()[3],d.getArrayFromInt32()[4] );
- System.out.printf("\n");
- }
-
- //--------------------- construction
- public MrPing(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("MrPing");
-
- // initialize attributes
- i32Array = new int[10];
- for (int i=0;i<10;i++){
- i32Array[i] = 0;
- }
- data = new PingPongData();
-
- // own ports
- PingPongPort = new PingPongProtocolConjPort(this, "PingPongPort", IFITEM_PingPongPort, 0, port_addr[IFITEM_PingPongPort][0], peer_addr[IFITEM_PingPongPort][0]);
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
- public void setI32Array (int[] i32Array) {
- this.i32Array = i32Array;
- }
- public int[] getI32Array () {
- return this.i32Array;
- }
- public void setData (PingPongData data) {
- this.data = data;
- }
- public PingPongData getData () {
- return this.data;
- }
-
-
- //--------------------- port getters
- public PingPongProtocolConjPort getPingPongPort (){
- return this.PingPongPort;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
-
- /* state IDs */
- public static final int STATE_waitForPong = 2;
- public static final int STATE_state0 = 3;
- public static final int STATE_state1 = 4;
- public static final int STATE_state2 = 5;
- public static final int STATE_TestFalse = 6;
- public static final int STATE_TestOk = 7;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__waitForPong = 1;
- public static final int CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_pongPingPongPort_tr0 = 2;
- public static final int CHAIN_TRANS_tr10_FROM_waitForPong_TO_cp0_BY_pongPingPongPort = 3;
- public static final int CHAIN_TRANS_tr1_FROM_tp0_TO_tp0_BY_pongSimplePingPongPort_tr1 = 4;
- public static final int CHAIN_TRANS_tr5_FROM_state0_TO_state1_BY_pongPingPongPort = 5;
- public static final int CHAIN_TRANS_tr6_FROM_state1_TO_state2_BY_pongSimplePingPongPort = 6;
- public static final int CHAIN_TRANS_tr7_FROM_state2_TO_cp1_BY_pongSimplePingPongPort = 7;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_PingPongPort__pong = IFITEM_PingPongPort + EVT_SHIFT*PingPongProtocol.OUT_pong;
- public static final int TRIG_PingPongPort__pongSimple = IFITEM_PingPongPort + EVT_SHIFT*PingPongProtocol.OUT_pongSimple;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","waitForPong",
- "state0",
- "state1",
- "state2",
- "TestFalse",
- "TestOk"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
-
- /* Action Codes */
- protected void action_TRANS_INITIAL_TO__waitForPong() {
- int i;
- int[] intArray;
- this.data=new PingPongData();
-
- // send default data
- PingPongData d = new PingPongData();
- PingPongPort.ping(d);
-
- d.setI8Val((byte) 45);
- d.setI16Val((short) 34);
- d.setI32Val(2);
- d.setF32Val((float)3.14);
- d.setF64Val(7.12345);
- d.setStringVal("Hase !");
-
- d.getOwnType().setI8Val((byte)10);
- d.getOwnType().setI16Val((short)17);
- d.getOwnType().setI32Val(4711);
- d.getOwnType().setF32Val((float)3.0815);
- d.getOwnType().setF64Val(123.45678);
- d.getOwnType().setStringVal("Deep Hase !");
- intArray = d.getOwnType().getArrayFromInt32();
- for (i=0;i<intArray.length;i++) {intArray[i] = 10+i;}
- d.getOwnType().setArrayFromInt32(intArray);
-
- PingPongPort.ping(d);
-
- d.setI8Val((byte) 55);
- d.setI16Val((short) 44);
- d.setI32Val(3);
- d.setF32Val((float)24.4563458);
- d.setF64Val(2347.2342312345);
- d.setStringVal("Mein Hase !");
-
- d.getOwnType().setI8Val((byte)15);
- d.getOwnType().setI16Val((short)23);
- d.getOwnType().setI32Val(4812);
- d.getOwnType().setF32Val((float)2453.30815);
- d.getOwnType().setF64Val(125332.42342);
- d.getOwnType().setStringVal("Mein Deep Hase !");
- intArray = d.getOwnType().getArrayFromInt32();
- for (i=0;i<intArray.length;i++) {intArray[i] = 30+i;}
- d.getOwnType().setArrayFromInt32(intArray);
-
- PingPongPort.ping(d);
- PingPongPort.ping(data);
-
- data.setI8Val((byte) 67);
- data.setI16Val((short) 97);
- data.setI32Val(70);
- data.setF32Val((float)233.14);
- data.setF64Val(723434.12345);
- data.setStringVal("Falscher Hase !");
-
- crcGen.update(10);
- }
- protected void action_TRANS_tr0_FROM_tp0_TO_tp0_BY_pongPingPongPort_tr0(InterfaceItemBase ifitem, PingPongData p) {
- System.out.printf("Top Level : \n");
- printData(p);
- crcGen.update(20);
- }
- protected void action_TRANS_tr1_FROM_tp0_TO_tp0_BY_pongSimplePingPongPort_tr1(InterfaceItemBase ifitem, int p) {
- System.out.printf("Top Level Simple: \n");
- crcGen.update(35);
- }
- protected void action_TRANS_tr10_FROM_waitForPong_TO_cp0_BY_pongPingPongPort(InterfaceItemBase ifitem, PingPongData p) {
- printData(p);
- crcGen.update(11);
- }
- protected void action_TRANS_tr4_FROM_cp0_TO_waitForPong(InterfaceItemBase ifitem, PingPongData p) {
- crcGen.update(12);
- }
- protected void action_TRANS_tr3_FROM_cp0_TO_state0_COND_tr3(InterfaceItemBase ifitem, PingPongData p) {
- // send default values
- PingPongPort.ping(data);
-
- data.getOwnType().setI8Val((byte)10);
- data.getOwnType().setI16Val((short)17);
- data.getOwnType().setI32Val(4711);
- data.getOwnType().setF32Val((float)3.0815);
- data.getOwnType().setF64Val(123.45678);
- data.getOwnType().setStringVal("Deep Hase !");
- int[] intArray = data.getOwnType().getArrayFromInt32();
- for (int i=0;i<intArray.length;i++) {intArray[i] = 10+i;}
- data.getOwnType().setArrayFromInt32(intArray);
- int[] intArrayShort=data.getArrayFromInt32();
- for (int j=0;j<intArrayShort.length;j++) {intArray[j] = 10+j;}
-
- // use convenient function
- PingPongPort.ping((byte)45,(short)34,80,'c',(float)3.14,7.12345,"Hase !",intArrayShort,data.getOwnType());
-
- crcGen.update(13);
- }
- protected void action_TRANS_tr5_FROM_state0_TO_state1_BY_pongPingPongPort(InterfaceItemBase ifitem, PingPongData p) {
- printData(p);
- PingPongPort.pingSimple(12);
- PingPongPort.pingSimple(27);
- crcGen.update(14);
- }
- protected void action_TRANS_tr6_FROM_state1_TO_state2_BY_pongSimplePingPongPort(InterfaceItemBase ifitem, int p) {
- crcGen.update(15);
- }
- protected void action_TRANS_tr7_FROM_state2_TO_cp1_BY_pongSimplePingPongPort(InterfaceItemBase ifitem, int p) {
- crcGen.update(16);
- System.out.printf("CRC: %d \n", crcGen.getCrc());
- }
- protected void action_TRANS_tr8_FROM_cp1_TO_TestFalse(InterfaceItemBase ifitem, int p) {
- RTServices.getInstance().getSubSystem().testFinished(1);
- }
- protected void action_TRANS_tr9_FROM_cp1_TO_TestOk_COND_tr9(InterfaceItemBase ifitem, int p) {
- RTServices.getInstance().getSubSystem().testFinished(0);
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_waitForPong:
- this.history[STATE_TOP] = STATE_waitForPong;
- current = STATE_TOP;
- break;
- case STATE_state0:
- this.history[STATE_TOP] = STATE_state0;
- current = STATE_TOP;
- break;
- case STATE_state1:
- this.history[STATE_TOP] = STATE_state1;
- current = STATE_TOP;
- break;
- case STATE_state2:
- this.history[STATE_TOP] = STATE_state2;
- current = STATE_TOP;
- break;
- case STATE_TestFalse:
- this.history[STATE_TOP] = STATE_TestFalse;
- current = STATE_TOP;
- break;
- case STATE_TestOk:
- this.history[STATE_TOP] = STATE_TestOk;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_INITIAL_TO__waitForPong:
- {
- action_TRANS_INITIAL_TO__waitForPong();
- return STATE_waitForPong;
- }
- case CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_pongPingPongPort_tr0:
- {
- PingPongData p = (PingPongData) generic_data;
- action_TRANS_tr0_FROM_tp0_TO_tp0_BY_pongPingPongPort_tr0(ifitem, p);
- return STATE_TOP;
- }
- case CHAIN_TRANS_tr1_FROM_tp0_TO_tp0_BY_pongSimplePingPongPort_tr1:
- {
- int p = (Integer) generic_data;
- action_TRANS_tr1_FROM_tp0_TO_tp0_BY_pongSimplePingPongPort_tr1(ifitem, p);
- return STATE_TOP;
- }
- case CHAIN_TRANS_tr10_FROM_waitForPong_TO_cp0_BY_pongPingPongPort:
- {
- PingPongData p = (PingPongData) generic_data;
- action_TRANS_tr10_FROM_waitForPong_TO_cp0_BY_pongPingPongPort(ifitem, p);
- if ((p.i32Val==2) && (p.i8Val==46)) {
- action_TRANS_tr3_FROM_cp0_TO_state0_COND_tr3(ifitem, p);
- return STATE_state0;}
- else {
- action_TRANS_tr4_FROM_cp0_TO_waitForPong(ifitem, p);
- return STATE_waitForPong;}
- }
- case CHAIN_TRANS_tr5_FROM_state0_TO_state1_BY_pongPingPongPort:
- {
- PingPongData p = (PingPongData) generic_data;
- action_TRANS_tr5_FROM_state0_TO_state1_BY_pongPingPongPort(ifitem, p);
- return STATE_state1;
- }
- case CHAIN_TRANS_tr6_FROM_state1_TO_state2_BY_pongSimplePingPongPort:
- {
- int p = (Integer) generic_data;
- action_TRANS_tr6_FROM_state1_TO_state2_BY_pongSimplePingPongPort(ifitem, p);
- return STATE_state2;
- }
- case CHAIN_TRANS_tr7_FROM_state2_TO_cp1_BY_pongSimplePingPongPort:
- {
- int p = (Integer) generic_data;
- action_TRANS_tr7_FROM_state2_TO_cp1_BY_pongSimplePingPongPort(ifitem, p);
- if ((p==28) && (crcGen.getCrc()==1187)) {
- action_TRANS_tr9_FROM_cp1_TO_TestOk_COND_tr9(ifitem, p);
- return STATE_TestOk;}
- else {
- action_TRANS_tr8_FROM_cp1_TO_TestFalse(ifitem, p);
- return STATE_TestFalse;}
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_waitForPong:
- // in leaf state: return state id
- return STATE_waitForPong;
- case STATE_state0:
- // in leaf state: return state id
- return STATE_state0;
- case STATE_state1:
- // in leaf state: return state id
- return STATE_state1;
- case STATE_state2:
- // in leaf state: return state id
- return STATE_state2;
- case STATE_TestFalse:
- // in leaf state: return state id
- return STATE_TestFalse;
- case STATE_TestOk:
- // in leaf state: return state id
- return STATE_TestOk;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__waitForPong;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_waitForPong:
- switch(trigger) {
- case TRIG_PingPongPort__pong:
- {
- chain = CHAIN_TRANS_tr10_FROM_waitForPong_TO_cp0_BY_pongPingPongPort;
- catching_state = STATE_TOP;
- }
- break;
- case TRIG_PingPongPort__pongSimple:
- {
- chain = CHAIN_TRANS_tr1_FROM_tp0_TO_tp0_BY_pongSimplePingPongPort_tr1;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- break;
- }
- break;
- case STATE_state0:
- switch(trigger) {
- case TRIG_PingPongPort__pong:
- { PingPongData p = (PingPongData) generic_data;
- if (p.getI32Val()==3)
- {
- chain = CHAIN_TRANS_tr5_FROM_state0_TO_state1_BY_pongPingPongPort;
- catching_state = STATE_TOP;
- } else
- {
- chain = CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_pongPingPongPort_tr0;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- }
- break;
- case TRIG_PingPongPort__pongSimple:
- {
- chain = CHAIN_TRANS_tr1_FROM_tp0_TO_tp0_BY_pongSimplePingPongPort_tr1;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- break;
- }
- break;
- case STATE_state1:
- switch(trigger) {
- case TRIG_PingPongPort__pongSimple:
- {
- chain = CHAIN_TRANS_tr6_FROM_state1_TO_state2_BY_pongSimplePingPongPort;
- catching_state = STATE_TOP;
- }
- break;
- case TRIG_PingPongPort__pong:
- {
- chain = CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_pongPingPongPort_tr0;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- break;
- }
- break;
- case STATE_state2:
- switch(trigger) {
- case TRIG_PingPongPort__pongSimple:
- {
- chain = CHAIN_TRANS_tr7_FROM_state2_TO_cp1_BY_pongSimplePingPongPort;
- catching_state = STATE_TOP;
- }
- break;
- case TRIG_PingPongPort__pong:
- {
- chain = CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_pongPingPongPort_tr0;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- break;
- }
- break;
- case STATE_TestFalse:
- switch(trigger) {
- case TRIG_PingPongPort__pong:
- {
- chain = CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_pongPingPongPort_tr0;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- break;
- case TRIG_PingPongPort__pongSimple:
- {
- chain = CHAIN_TRANS_tr1_FROM_tp0_TO_tp0_BY_pongSimplePingPongPort_tr1;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- break;
- }
- break;
- case STATE_TestOk:
- switch(trigger) {
- case TRIG_PingPongPort__pong:
- {
- chain = CHAIN_TRANS_tr0_FROM_tp0_TO_tp0_BY_pongPingPongPort_tr0;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- break;
- case TRIG_PingPongPort__pongSimple:
- {
- chain = CHAIN_TRANS_tr1_FROM_tp0_TO_tp0_BY_pongSimplePingPongPort_tr1;
- catching_state = STATE_TOP;
- skip_entry = true;
- }
- break;
- }
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java
deleted file mode 100644
index e00d3ceb4..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package org.eclipse.etrice.integration.SendingDataByValueTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-import org.eclipse.etrice.integration.SendingDataByValueTest.PingPongProtocol.*;
-
-
-
-public class MrPong extends ActorClassBase {
-
-
-
- //--------------------- ports
- protected PingPongProtocolPort PingPongPort = null;
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
- public static final int IFITEM_PingPongPort = 1;
-
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
- public void printData(PingPongData d) {
- System.out.printf("\n");
- System.out.printf("i8Val: %d \n",d.getI8Val());
- System.out.printf("i16Val: %d \n",d.getI16Val());
- System.out.printf("i32Val: %d \n",d.getI32Val());
- System.out.printf("charVal: %c \n",d.getCharVal());
- System.out.printf("f32Val: %f \n",d.getF32Val());
- System.out.printf("f64Val: %f \n",d.getF64Val());
- System.out.printf("stringVal: %s \n",d.getStringVal());
- System.out.printf("i32Array: %d %d %d %d %d\n",d.getArrayFromInt32()[0],d.getArrayFromInt32()[1],d.getArrayFromInt32()[2],d.getArrayFromInt32()[3],d.getArrayFromInt32()[4] );
- System.out.printf("\n");
- }
-
- //--------------------- construction
- public MrPong(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("MrPong");
-
- // initialize attributes
-
- // own ports
- PingPongPort = new PingPongProtocolPort(this, "PingPongPort", IFITEM_PingPongPort, 0, port_addr[IFITEM_PingPongPort][0], peer_addr[IFITEM_PingPongPort][0]);
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
-
-
- //--------------------- port getters
- public PingPongProtocolPort getPingPongPort (){
- return this.PingPongPort;
- }
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
-
- /* state IDs */
- public static final int STATE_reply = 2;
-
- /* transition chains */
- public static final int CHAIN_TRANS_INITIAL_TO__reply = 1;
- public static final int CHAIN_TRANS_tr0_FROM_reply_TO_reply_BY_pingPingPongPort_tr0 = 2;
- public static final int CHAIN_TRANS_tr1_FROM_reply_TO_reply_BY_pingSimplePingPongPort_tr1 = 3;
-
- /* triggers */
- public static final int POLLING = 0;
- public static final int TRIG_PingPongPort__ping = IFITEM_PingPongPort + EVT_SHIFT*PingPongProtocol.IN_ping;
- public static final int TRIG_PingPongPort__pingSimple = IFITEM_PingPongPort + EVT_SHIFT*PingPongProtocol.IN_pingSimple;
-
- // state names
- protected static final String stateStrings[] = {"<no state>","<top>","reply"
- };
-
- // history
- protected int history[] = {NO_STATE,NO_STATE,NO_STATE};
-
- private void setState(int new_state) {
- DebuggingService.getInstance().addActorState(this,stateStrings[new_state]);
- if (stateStrings[new_state]!="Idle") {
- System.out.println(getInstancePath() + " -> " + stateStrings[new_state]);
- }
- this.state = new_state;
- }
-
- /* Entry and Exit Codes */
-
- /* Action Codes */
- protected void action_TRANS_tr0_FROM_reply_TO_reply_BY_pingPingPongPort_tr0(InterfaceItemBase ifitem, PingPongData p) {
- p.setI8Val((byte)(p.getI8Val()+1));
-
-
- PingPongPort.pong(p);
- }
- protected void action_TRANS_tr1_FROM_reply_TO_reply_BY_pingSimplePingPongPort_tr1(InterfaceItemBase ifitem, int p) {
- PingPongPort.pongSimple(++p);
- }
-
- /**
- * calls exit codes while exiting from the current state to one of its
- * parent states while remembering the history
- * @param current - the current state
- * @param to - the final parent state
- * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
- */
- private void exitTo(int current, int to, boolean handler) {
- while (current!=to) {
- switch (current) {
- case STATE_reply:
- this.history[STATE_TOP] = STATE_reply;
- current = STATE_TOP;
- break;
- }
- }
- }
-
- /**
- * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
- * matching the trigger of this chain. The ID of the final state is returned
- * @param chain - the chain ID
- * @param generic_data - the generic data pointer
- * @return the ID of the final state
- */
- private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
- switch (chain) {
- case CHAIN_TRANS_tr0_FROM_reply_TO_reply_BY_pingPingPongPort_tr0:
- {
- PingPongData p = (PingPongData) generic_data;
- action_TRANS_tr0_FROM_reply_TO_reply_BY_pingPingPongPort_tr0(ifitem, p);
- return STATE_reply;
- }
- case CHAIN_TRANS_tr1_FROM_reply_TO_reply_BY_pingSimplePingPongPort_tr1:
- {
- int p = (Integer) generic_data;
- action_TRANS_tr1_FROM_reply_TO_reply_BY_pingSimplePingPongPort_tr1(ifitem, p);
- return STATE_reply;
- }
- case CHAIN_TRANS_INITIAL_TO__reply:
- {
- return STATE_reply;
- }
- }
- return NO_STATE;
- }
-
- /**
- * calls entry codes while entering a state's history. The ID of the final leaf state is returned
- * @param state - the state which is entered
- * @param handler - entry code is executed if not handler
- * @return - the ID of the final leaf state
- */
- private int enterHistory(int state, boolean handler, boolean skip_entry) {
- while (true) {
- switch (state) {
- case STATE_reply:
- // in leaf state: return state id
- return STATE_reply;
- case STATE_TOP:
- state = this.history[STATE_TOP];
- break;
- }
- skip_entry = false;
- }
- //return NO_STATE; // required by CDT but detected as unreachable by JDT because of while (true)
- }
-
- public void executeInitTransition() {
- int chain = CHAIN_TRANS_INITIAL_TO__reply;
- int next = executeTransitionChain(chain, null, null);
- next = enterHistory(next, false, false);
- setState(next);
- }
-
- /* receiveEvent contains the main implementation of the FSM */
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object generic_data) {
- int trigger = ifitem.getLocalId() + EVT_SHIFT*evt;
- int chain = NOT_CAUGHT;
- int catching_state = NO_STATE;
- boolean is_handler = false;
- boolean skip_entry = false;
-
- if (!handleSystemEvent(ifitem, evt, generic_data)) {
- switch (this.state) {
- case STATE_reply:
- switch(trigger) {
- case TRIG_PingPongPort__ping:
- {
- chain = CHAIN_TRANS_tr0_FROM_reply_TO_reply_BY_pingPingPongPort_tr0;
- catching_state = STATE_TOP;
- }
- break;
- case TRIG_PingPongPort__pingSimple:
- {
- chain = CHAIN_TRANS_tr1_FROM_reply_TO_reply_BY_pingSimplePingPongPort_tr1;
- catching_state = STATE_TOP;
- }
- break;
- }
- break;
- }
- }
- if (chain != NOT_CAUGHT) {
- exitTo(this.state, catching_state, is_handler);
- int next = executeTransitionChain(chain, ifitem, generic_data);
- next = enterHistory(next, is_handler, skip_entry);
- setState(next);
- }
- }
-
- //******************************************
- // END of generated code for FSM
- //******************************************
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongData.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongData.java
deleted file mode 100644
index b3956d14b..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongData.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.eclipse.etrice.integration.SendingDataByValueTest;
-
-
-
-
-public class PingPongData {
-
-
- /*--------------------- attributes ---------------------*/
- byte i8Val;
- short i16Val;
- int i32Val;
- char charVal;
- float f32Val;
- double f64Val;
- String stringVal;
- int arrayFromInt32[];
- PingPongDataDeep ownType;
-
- //--------------------- attribute setters and getters
- public void setI8Val (byte i8Val) {
- this.i8Val = i8Val;
- }
- public byte getI8Val () {
- return this.i8Val;
- }
- public void setI16Val (short i16Val) {
- this.i16Val = i16Val;
- }
- public short getI16Val () {
- return this.i16Val;
- }
- public void setI32Val (int i32Val) {
- this.i32Val = i32Val;
- }
- public int getI32Val () {
- return this.i32Val;
- }
- public void setCharVal (char charVal) {
- this.charVal = charVal;
- }
- public char getCharVal () {
- return this.charVal;
- }
- public void setF32Val (float f32Val) {
- this.f32Val = f32Val;
- }
- public float getF32Val () {
- return this.f32Val;
- }
- public void setF64Val (double f64Val) {
- this.f64Val = f64Val;
- }
- public double getF64Val () {
- return this.f64Val;
- }
- public void setStringVal (String stringVal) {
- this.stringVal = stringVal;
- }
- public String getStringVal () {
- return this.stringVal;
- }
- public void setArrayFromInt32 (int[] arrayFromInt32) {
- this.arrayFromInt32 = arrayFromInt32;
- }
- public int[] getArrayFromInt32 () {
- return this.arrayFromInt32;
- }
- public void setOwnType (PingPongDataDeep ownType) {
- this.ownType = ownType;
- }
- public PingPongDataDeep getOwnType () {
- return this.ownType;
- }
-
- /*--------------------- operations ---------------------*/
-
- // default constructor
- public PingPongData() {
- super();
-
- // initialize attributes
- i8Val = 34;
- i16Val = 24;
- i32Val = 12;
- charVal = 'c';
- f32Val = 4711.0815f;
- f64Val = 47114711.08150815;
- stringVal = "Du alter Depp !";
- arrayFromInt32 = new int[] {1,2,3,4,5};
- ownType = new PingPongDataDeep();
- }
-
- // constructor using fields
- public PingPongData(byte i8Val, short i16Val, int i32Val, char charVal, float f32Val, double f64Val, String stringVal, int[] arrayFromInt32, PingPongDataDeep ownType) {
- super();
-
- this.i8Val = i8Val;
- this.i16Val = i16Val;
- this.i32Val = i32Val;
- this.charVal = charVal;
- this.f32Val = f32Val;
- this.f64Val = f64Val;
- this.stringVal = stringVal;
- this.arrayFromInt32 = arrayFromInt32;
- this.ownType = ownType;
- }
-
- // deep copy
- public PingPongData deepCopy() {
- PingPongData copy = new PingPongData();
- copy.i8Val = i8Val;
- copy.i16Val = i16Val;
- copy.i32Val = i32Val;
- copy.charVal = charVal;
- copy.f32Val = f32Val;
- copy.f64Val = f64Val;
- copy.stringVal = stringVal;
- for (int i=0;i<arrayFromInt32.length;i++){
- copy.arrayFromInt32[i] = arrayFromInt32[i];
- }
- if (ownType!=null) {
- copy.ownType = ownType.deepCopy();
- }
- return copy;
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongDataDeep.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongDataDeep.java
deleted file mode 100644
index 5936010e4..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongDataDeep.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.eclipse.etrice.integration.SendingDataByValueTest;
-
-
-
-
-public class PingPongDataDeep {
-
-
- /*--------------------- attributes ---------------------*/
- byte i8Val;
- short i16Val;
- int i32Val;
- char charVal;
- float f32Val;
- double f64Val;
- String stringVal;
- int arrayFromInt32[];
-
- //--------------------- attribute setters and getters
- public void setI8Val (byte i8Val) {
- this.i8Val = i8Val;
- }
- public byte getI8Val () {
- return this.i8Val;
- }
- public void setI16Val (short i16Val) {
- this.i16Val = i16Val;
- }
- public short getI16Val () {
- return this.i16Val;
- }
- public void setI32Val (int i32Val) {
- this.i32Val = i32Val;
- }
- public int getI32Val () {
- return this.i32Val;
- }
- public void setCharVal (char charVal) {
- this.charVal = charVal;
- }
- public char getCharVal () {
- return this.charVal;
- }
- public void setF32Val (float f32Val) {
- this.f32Val = f32Val;
- }
- public float getF32Val () {
- return this.f32Val;
- }
- public void setF64Val (double f64Val) {
- this.f64Val = f64Val;
- }
- public double getF64Val () {
- return this.f64Val;
- }
- public void setStringVal (String stringVal) {
- this.stringVal = stringVal;
- }
- public String getStringVal () {
- return this.stringVal;
- }
- public void setArrayFromInt32 (int[] arrayFromInt32) {
- this.arrayFromInt32 = arrayFromInt32;
- }
- public int[] getArrayFromInt32 () {
- return this.arrayFromInt32;
- }
-
- /*--------------------- operations ---------------------*/
-
- // default constructor
- public PingPongDataDeep() {
- super();
-
- // initialize attributes
- arrayFromInt32 = new int[10];
- }
-
- // constructor using fields
- public PingPongDataDeep(byte i8Val, short i16Val, int i32Val, char charVal, float f32Val, double f64Val, String stringVal, int[] arrayFromInt32) {
- super();
-
- this.i8Val = i8Val;
- this.i16Val = i16Val;
- this.i32Val = i32Val;
- this.charVal = charVal;
- this.f32Val = f32Val;
- this.f64Val = f64Val;
- this.stringVal = stringVal;
- this.arrayFromInt32 = arrayFromInt32;
- }
-
- // deep copy
- public PingPongDataDeep deepCopy() {
- PingPongDataDeep copy = new PingPongDataDeep();
- copy.i8Val = i8Val;
- copy.i16Val = i16Val;
- copy.i32Val = i32Val;
- copy.charVal = charVal;
- copy.f32Val = f32Val;
- copy.f64Val = f64Val;
- copy.stringVal = stringVal;
- for (int i=0;i<arrayFromInt32.length;i++){
- copy.arrayFromInt32[i] = arrayFromInt32[i];
- }
- return copy;
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongProtocol.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongProtocol.java
deleted file mode 100644
index aa4610294..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/PingPongProtocol.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package org.eclipse.etrice.integration.SendingDataByValueTest;
-
-import java.util.ArrayList;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.Message;
-import org.eclipse.etrice.runtime.java.modelbase.*;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-
-
-
-public class PingPongProtocol {
- // message IDs
- public static final int MSG_MIN = 0;
- public static final int OUT_pong = 1;
- public static final int OUT_pongSimple = 2;
- public static final int IN_ping = 3;
- public static final int IN_pingSimple = 4;
- public static final int MSG_MAX = 5;
-
-
- private static String messageStrings[] = {"MIN", "pong","pongSimple", "ping","pingSimple","MAX"};
-
- public String getMessageString(int msg_id) {
- if (msg_id<MSG_MIN || msg_id>MSG_MAX+1){
- // id out of range
- return "Message ID out of range";
- }
- else{
- return messageStrings[msg_id];
- }
- }
-
-
- // port class
- static public class PingPongProtocolPort extends PortBase {
- // constructors
- public PingPongProtocolPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public PingPongProtocolPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void pong(PingPongData p) {
- if (messageStrings[ OUT_pong] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[OUT_pong]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), OUT_pong, p.deepCopy()));
- }
- public void pong(byte i8Val, short i16Val, int i32Val, char charVal, float f32Val, double f64Val, String stringVal, int[] arrayFromInt32, PingPongDataDeep ownType) {
- pong(new PingPongData(i8Val, i16Val, i32Val, charVal, f32Val, f64Val, stringVal, arrayFromInt32, ownType));
- }
- public void pongSimple(int p) {
- if (messageStrings[ OUT_pongSimple] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[OUT_pongSimple]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), OUT_pongSimple, p));
- }
- }
-
- // replicated port class
- static public class PingPongProtocolReplPort {
- private ArrayList<PingPongProtocolPort> ports;
- private int replication;
-
- public PingPongProtocolReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<PingPongProtocol.PingPongProtocolPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new PingPongProtocolPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PingPongProtocolPort get(int i) {
- return ports.get(i);
- }
-
- // outgoing messages
- public void pong(PingPongData p){
- for (int i=0; i<replication; ++i) {
- ports.get(i).pong( p);
- }
- }
- public void pongSimple(int p){
- for (int i=0; i<replication; ++i) {
- ports.get(i).pongSimple( p);
- }
- }
- }
-
-
- // port class
- static public class PingPongProtocolConjPort extends PortBase {
- // constructors
- public PingPongProtocolConjPort(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {
- this(actor, name, localId, 0, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
- public PingPongProtocolConjPort(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {
- super(actor, name, localId, idx, addr, peerAddress);
- DebuggingService.getInstance().addPortInstance(this);
- }
-
- @Override
- public void receive(Message m) {
- if (!(m instanceof EventMessage))
- return;
- EventMessage msg = (EventMessage) m;
- if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)
- System.out.println("unknown");
- else {
- if (messageStrings[msg.getEvtId()] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);
- }
- if (msg instanceof EventWithDataMessage)
- getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
- else
- getActor().receiveEvent(this, msg.getEvtId(), null);
- }
- }
-
-
- // sent messages
- public void ping(PingPongData p) {
- if (messageStrings[ IN_ping] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_ping]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_ping, p.deepCopy()));
- }
- public void ping(byte i8Val, short i16Val, int i32Val, char charVal, float f32Val, double f64Val, String stringVal, int[] arrayFromInt32, PingPongDataDeep ownType) {
- ping(new PingPongData(i8Val, i16Val, i32Val, charVal, f32Val, f64Val, stringVal, arrayFromInt32, ownType));
- }
- public void pingSimple(int p) {
- if (messageStrings[ IN_pingSimple] != "timerTick"){
- DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[IN_pingSimple]);
- }
- if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_pingSimple, p));
- }
- }
-
- // replicated port class
- static public class PingPongProtocolConjReplPort {
- private ArrayList<PingPongProtocolConjPort> ports;
- private int replication;
-
- public PingPongProtocolConjReplPort(IEventReceiver actor, String name, int localId, Address[] addr,
- Address[] peerAddress) {
- replication = addr==null? 0:addr.length;
- ports = new ArrayList<PingPongProtocol.PingPongProtocolConjPort>(replication);
- for (int i=0; i<replication; ++i) {
- ports.add(new PingPongProtocolConjPort(
- actor, name+i, localId, i, addr[i], peerAddress[i]));
- }
- }
-
- public int getReplication() {
- return replication;
- }
-
- public int getIndexOf(InterfaceItemBase ifitem){
- return ifitem.getIdx();
- }
-
- public PingPongProtocolConjPort get(int i) {
- return ports.get(i);
- }
-
- // incoming messages
- public void ping(PingPongData p){
- for (int i=0; i<replication; ++i) {
- ports.get(i).ping( p);
- }
- }
- public void pingSimple(int p){
- for (int i=0; i<replication; ++i) {
- ports.get(i).pingSimple( p);
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SendingDataTop.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SendingDataTop.java
deleted file mode 100644
index 4369f3d50..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SendingDataTop.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.etrice.integration.SendingDataByValueTest;
-
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.IRTObject;
-import org.eclipse.etrice.runtime.java.messaging.IMessageReceiver;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-import org.eclipse.etrice.runtime.java.debugging.DebuggingService;
-import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*;
-
-
-
-
-
-public class SendingDataTop extends ActorClassBase {
-
-
-
- //--------------------- ports
-
- //--------------------- saps
-
- //--------------------- services
-
- //--------------------- interface item IDs
-
-
- /*--------------------- attributes ---------------------*/
- /*--------------------- operations ---------------------*/
-
- //--------------------- construction
- public SendingDataTop(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr){
- super(parent, name, port_addr[0][0], peer_addr[0][0]);
- setClassName("SendingDataTop");
-
- // initialize attributes
-
- // own ports
-
- // own saps
-
- // own service implementations
- }
-
-
- //--------------------- attribute setters and getters
-
-
- //--------------------- port getters
-
- //--------------------- lifecycle functions
- public void init(){
- initUser();
- }
-
- public void start(){
- startUser();
- }
-
- public void stop(){
- stopUser();
- }
-
- public void destroy(){
- }
-
- //--------------------- no state machine
- @Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data) {
- handleSystemEvent(ifitem, evt, data);
- }
-
- @Override
- public void executeInitTransition(){
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SubSys_SendingData.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SubSys_SendingData.java
deleted file mode 100644
index 3247d3a99..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SubSys_SendingData.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.eclipse.etrice.integration.SendingDataByValueTest;
-
-import org.eclipse.etrice.runtime.java.messaging.MessageService;
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-import org.eclipse.etrice.runtime.java.messaging.Address;
-import org.eclipse.etrice.runtime.java.messaging.RTSystemServicesProtocol.*;
-import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
-import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
-
-
-
-
-public class SubSys_SendingData extends SubSystemClassBase{
-
-
- public SubSys_SendingData(String name) {
- super(name);
- }
-
- @Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data){
- }
-
- @Override
- public void instantiateMessageServices(){
-
- RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, new Address(0, 0, 0),"MessageService_Main"));
- }
-
- @Override
- public void instantiateActors(){
-
- // all addresses
- // Addresses for the Subsystem Systemport
- Address addr_item_SystemPort_0 = new Address(0,0,106);
- Address addr_item_SystemPort_1 = new Address(0,0,107);
- Address addr_item_SystemPort_2 = new Address(0,0,108);
-
- // actor instance /SubSys_SendingData/top itself => Systemport Address
- Address addr_item__SubSys_SendingData_top = new Address(0,0,101);
- // interface items of /SubSys_SendingData/top
- // actor instance /SubSys_SendingData/top/mrPing itself => Systemport Address
- Address addr_item__SubSys_SendingData_top_mrPing = new Address(0,0,102);
- // interface items of /SubSys_SendingData/top/mrPing
- Address addr_item__SubSys_SendingData_top_mrPing_PingPongPort = new Address(0,0,103);
- // actor instance /SubSys_SendingData/top/mrPong itself => Systemport Address
- Address addr_item__SubSys_SendingData_top_mrPong = new Address(0,0,104);
- // interface items of /SubSys_SendingData/top/mrPong
- Address addr_item__SubSys_SendingData_top_mrPong_PingPongPort = new Address(0,0,105);
-
- // instantiate all actor instances
- instances = new ActorClassBase[3];
- instances[0] = new SendingDataTop(
- this,
- "top",
- // own interface item addresses
- new Address[][] {{addr_item__SubSys_SendingData_top}
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_0}
- }
- );
- instances[1] = new MrPing(
- instances[0],
- "mrPing",
- // own interface item addresses
- new Address[][] {{addr_item__SubSys_SendingData_top_mrPing},
- {
- addr_item__SubSys_SendingData_top_mrPing_PingPongPort
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_1},
- {
- addr_item__SubSys_SendingData_top_mrPong_PingPongPort
- }
- }
- );
- instances[2] = new MrPong(
- instances[0],
- "mrPong",
- // own interface item addresses
- new Address[][] {{addr_item__SubSys_SendingData_top_mrPong},
- {
- addr_item__SubSys_SendingData_top_mrPong_PingPongPort
- }
- },
- // peer interface item addresses
- new Address[][] {{addr_item_SystemPort_2},
- {
- addr_item__SubSys_SendingData_top_mrPing_PingPongPort
- }
- }
- );
-
- // apply instance attribute configurations
-
- // create the subsystem system port
- RTSystemPort = new RTSystemServicesProtocolConjPortRepl(this, "RTSystemPort",
- 0, //local ID
- // own addresses
- new Address[]{
- addr_item_SystemPort_0,
- addr_item_SystemPort_1,
- addr_item_SystemPort_2
- },
- // peer addresses
- new Address[]{
- addr_item__SubSys_SendingData_top,
- addr_item__SubSys_SendingData_top_mrPing,
- addr_item__SubSys_SendingData_top_mrPong
- });
- }
-
-
- @Override
- public void init(){
- super.init();
- }
-
- @Override
- public void stop(){
- super.stop();
- }
-
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SubSys_SendingDataRunner.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SubSys_SendingDataRunner.java
deleted file mode 100644
index 952a338f9..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SubSys_SendingDataRunner.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @author generated by eTrice
- *
- * this class contains the main function running component SubSys_SendingData
- * it instantiates SubSys_SendingData and starts and ends the lifecycle
- */
-
-package org.eclipse.etrice.integration.SendingDataByValueTest;
-
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemRunnerBase;
-
-class SubSys_SendingDataRunner extends SubSystemRunnerBase {
-
- /**
- * main function
- * creates the main component and starts and stops the lifecycle
- */
- public static void main(String[] args) {
- // instantiate the main component
- SubSys_SendingData main_component = new SubSys_SendingData("SubSys_SendingData");
-
- run(main_component, args);
- }
-};
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/readme.txt b/tests/org.eclipse.etrice.integration.tests/src-gen/readme.txt
deleted file mode 100644
index c3b99d458..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory is an eTrice code generation target.
-It will be erased every time the generator is executed.
-
-DO NOT PLACE OTHER FILES HERE!
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java
deleted file mode 100644
index 76de9eef6..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Tieto Deutschland Gmbh (http://www.tieto.com).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * CONTRIBUTORS:
- * Thomas Jung
- *
- *******************************************************************************/
-
-package org.eclipse.etrice.integration.tests;
-
-
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.etrice.integration.ChoicePointTest.SubSystem_CPTest;
-import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-
-public class IntegrationTestChoicePoint extends IntegrationTestBase {
- private SubSystem_CPTest main_component = null;
-
- @Before
- public void setUp() throws Exception {
- main_component = new SubSystem_CPTest("MainComponent");
-
- // hand over the semaphore to the subsystem
- main_component.setTestSemaphore(this.testSem);
- }
-
- @Test (timeout=5000)
- public void testChoicePoint(){
- main_component.init(); // lifecycle init
- main_component.start(); // lifecycle start
-
- waitForTestcase();
-
- assertEquals(0,main_component.getTestErrorCode());
- }
-
- @After
- public void tearDown() throws Exception {
- // end the lifecycle
- main_component.stop(); // lifecycle stop
- main_component.destroy(); // lifecycle destroy
- }
-
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestConfigTest.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestConfigTest.java
deleted file mode 100644
index 20086662d..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestConfigTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Tieto Deutschland Gmbh (http://www.tieto.com).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * CONTRIBUTORS:
- * Thomas Jung
- * Thomas Schuetz
- *
- *******************************************************************************/
-
-package org.eclipse.etrice.integration.tests;
-
-
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.etrice.integration.ConfigTest.SubSystemConfigTest;
-import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-
-public class IntegrationTestConfigTest extends IntegrationTestBase {
- private SubSystemConfigTest main_component = null;
-
- @Before
- public void setUp() throws Exception {
- main_component = new SubSystemConfigTest("SubSystemConfigTest");
-
- // hand over the semaphore to the subsystem
- main_component.setTestSemaphore(this.testSem);
- }
-
- @Test (timeout=5000)
- public void testActorClassAndInstanceConfiguration(){
- main_component.init(); // lifecycle init
- main_component.start(); // lifecycle start
-
- waitForTestcase();
-
- assertEquals(0,main_component.getTestErrorCode());
- }
-
- @After
- public void tearDown() throws Exception {
- // end the lifecycle
- main_component.stop(); // lifecycle stop
- main_component.destroy(); // lifecycle destroy
- }
-
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java
deleted file mode 100644
index e934b95f9..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Tieto Deutschland Gmbh (http://www.tieto.com).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Autor:
- * Thomas Jung
- *
- *******************************************************************************/
-
-package org.eclipse.etrice.integration.tests;
-
-
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.etrice.integration.HandlerTest.SubSystem_HandlerTest;
-import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-
-public class IntegrationTestHandler extends IntegrationTestBase {
- private SubSystem_HandlerTest main_component;
-
- @Before
- public void setUp() throws Exception {
- main_component = new SubSystem_HandlerTest("MainComponent");
-
- // hand over the semaphore to the subsystem
- main_component.setTestSemaphore(this.testSem);
- }
-
- @Test (timeout=5000)
- public void testHandler(){
- main_component.init(); // lifecycle init
- main_component.start(); // lifecycle start
-
- waitForTestcase();
-
- assertEquals(0,main_component.getTestErrorCode());
- }
-
- @After
- public void tearDown() throws Exception {
- // end the lifecycle
- main_component.stop(); // lifecycle stop
- main_component.destroy(); // lifecycle destroy
- }
-
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java
deleted file mode 100644
index 55b335373..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 protos software gmbh (http://www.protos.de).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * CONTRIBUTORS:
- * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
- *
- *******************************************************************************/
-
-package org.eclipse.etrice.integration.tests;
-
-
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.etrice.integration.PingPongThreadTest.SubSystem_PingPong;
-import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IntegrationTestPingPongThread extends IntegrationTestBase {
- private SubSystem_PingPong main_component = null;
-
- @Before
- public void setUp() throws Exception {
- main_component = new SubSystem_PingPong("MainComponent");
-
- // hand over the semaphore to the subsystem
- main_component.setTestSemaphore(this.testSem);
- }
-
- @Test (timeout=10000)
- public void testHFSM(){
- main_component.init(); // lifecycle init
- main_component.start(); // lifecycle start
-
- waitForTestcase();
-
- assertEquals(0,main_component.getTestErrorCode());
- }
-
- @After
- public void tearDown() throws Exception {
- // end the lifecycle
- main_component.stop(); // lifecycle stop
- main_component.destroy(); // lifecycle destroy
- }
-
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThreadReplPort.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThreadReplPort.java
deleted file mode 100644
index 1b71ac187..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThreadReplPort.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 protos software gmbh (http://www.protos.de).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * CONTRIBUTORS:
- * Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
- *
- *******************************************************************************/
-
-package org.eclipse.etrice.integration.tests;
-
-
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.etrice.integration.PingPongThreadTestReplPort.SubSystem_PingPongReplPort;
-import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IntegrationTestPingPongThreadReplPort extends IntegrationTestBase {
-// private SubSystem_PingPongReplPort main_component = null;
-
- @Before
- public void setUp() throws Exception {
-// main_component = new SubSystem_PingPongReplPort(null,"MainComponent");
-//
-// // hand over the semaphore to the subsystem
-// main_component.setTestSemaphore(this.testSem);
- }
-
- @Test (timeout=10000)
- public void testPingPongThreadTestReplPort (){
-// main_component.init(); // lifecycle init
-// main_component.start(); // lifecycle start
-//
-// waitForTestcase();
-//
-// assertEquals(0,main_component.getTestErrorCode());
- }
-
- @After
- public void tearDown() throws Exception {
-// // end the lifecycle
-// main_component.stop(); // lifecycle stop
-// main_component.destroy(); // lifecycle destroy
- }
-
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java
deleted file mode 100644
index fd20f448f..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Tieto Deutschland Gmbh (http://www.tieto.com).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * CONTRIBUTORS:
- * Thomas Jung
- *
- *******************************************************************************/
-
-package org.eclipse.etrice.integration.tests;
-
-
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.etrice.integration.SendingDataByValueTest.SubSys_SendingData;
-import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IntegrationTestSendingDataByValue extends IntegrationTestBase {
- private SubSys_SendingData main_component = null;
-
- @Before
- public void setUp() throws Exception {
- main_component = new SubSys_SendingData("MainComponent");
-
- // hand over the semaphore to the subsystem
- main_component.setTestSemaphore(this.testSem);
- }
-
- @Test (timeout=5000)
- public void testSendingDataByValue(){
- main_component.init(); // lifecycle init
- main_component.start(); // lifecycle start
-
- waitForTestcase();
-
- assertEquals(0,main_component.getTestErrorCode());
- }
-
- @After
- public void tearDown() throws Exception {
- // end the lifecycle
- main_component.stop(); // lifecycle stop
- main_component.destroy(); // lifecycle destroy
- }
-
-
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/base/IntegrationTestBase.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/base/IntegrationTestBase.java
deleted file mode 100644
index 8ec2f1437..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/base/IntegrationTestBase.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.etrice.integration.tests.base;
-
-import java.util.concurrent.Semaphore;
-
-import org.eclipse.etrice.runtime.java.modelbase.TestSemaphore;
-
-public class IntegrationTestBase {
-
- protected TestSemaphore testSem = new TestSemaphore(0);
-
- public IntegrationTestBase() {
- super();
- }
-
- // TODO: is this the right place here? -> the functionality is scattered between IntegrationTestBase and SubSystemClassBase
- protected void waitForTestcase() {
- try{
- System.out.println("=== waitForTestcase: before acq. semaphore, thread "+Thread.currentThread().getName());
- this.testSem.acquire(1);
- System.out.println("=== waitForTestcase: after acq. semaphore, thread "+Thread.currentThread().getName());
- }catch(InterruptedException e){
- System.out.println("Semaphore fault !");
- }
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/helpers/CRC16Generator.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/helpers/CRC16Generator.java
deleted file mode 100644
index 13147fcce..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/helpers/CRC16Generator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 tieto deutschland gmbh (http://www.tieto.com).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * CONTRIBUTORS:
- * Thomas Jung (initial contribution)
- *
- *******************************************************************************/
-
-package org.eclipse.etrice.integration.tests.helpers;
-
-public class CRC16Generator {
-
- private int crc;
-
- public CRC16Generator(){
- crc = 0;
- }
-
- public int getCrc(){
- return crc;
- }
-
- public void update(int val) {
- /* calculates 16-bit CRC of given data */
- /* based on the polynomial x^16+x^15+x^2+1 */
- int c,i;
-
- c=val;
- for(i=0;i<16;i++) {
- if(((crc ^ c) & 1)==1) crc=(crc>>1)^0xA001;
- else crc>>=1;
- c>>=1;
- }
- }
-}
diff --git a/tests/org.eclipse.etrice.integration.tests/tmp/log/.gitignore b/tests/org.eclipse.etrice.integration.tests/tmp/log/.gitignore
deleted file mode 100644
index 005717ead..000000000
--- a/tests/org.eclipse.etrice.integration.tests/tmp/log/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/tests/org.eclipse.etrice.integration.tests/tmp/subSystemConfigTest b/tests/org.eclipse.etrice.integration.tests/tmp/subSystemConfigTest
deleted file mode 100644
index 060e2151e..000000000
--- a/tests/org.eclipse.etrice.integration.tests/tmp/subSystemConfigTest
+++ /dev/null
@@ -1,13 +0,0 @@
-/SubSystemConfigTest/top/testee2/blockMe=0
-/SubSystemConfigTest/top/testee2/blocker=false
-/SubSystemConfigTest/top/testee2/dc_dump/dc_i/char_i="dummy out"
-/SubSystemConfigTest/top/testee2/dc_dump/dc_i/double_i=0.0
-/SubSystemConfigTest/top/testee2/dc_dump/int_i=123
-/SubSystemConfigTest/top/testee2/dc_dump/long_array_i={ 1000 }
-/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i="instance4"
-/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i=0.404
-/SubSystemConfigTest/top/testee2/dc_i/int_i=402
-/SubSystemConfigTest/top/testee2/dc_i/long_array_i={ 403 }
-/SubSystemConfigTest/top/testee2/int_dump=888
-/SubSystemConfigTest/top/testee2/int_i=401
-polling_timer[ms]=4000

Back to the top