Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-03-30 13:24:51 -0400
committerHenrik Rentz-Reichert2012-03-30 13:24:51 -0400
commit213090ec7d3e3f620cf691db3a37aace2a01b860 (patch)
tree4d2364cb063df3429397e8998f147c54cadd34b3
parenta13ef6ab5bd7ac7c768b96aff36ddf36c735a0cd (diff)
downloadorg.eclipse.etrice-213090ec7d3e3f620cf691db3a37aace2a01b860.tar.gz
org.eclipse.etrice-213090ec7d3e3f620cf691db3a37aace2a01b860.tar.xz
org.eclipse.etrice-213090ec7d3e3f620cf691db3a37aace2a01b860.zip
[integration.tests, modellib] re-generated
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/Log.java2
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/SubSystem_HandlerTest.java16
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/SubSystem_PingPong.java20
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/SubSystem_PingPongReplPort.java20
4 files changed, 29 insertions, 29 deletions
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/Log.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/Log.java
index 8d3acad94..1dd7de400 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/Log.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/logging/Log.java
@@ -148,7 +148,7 @@ public class Log {
d.timeStamp=System.currentTimeMillis();
d.sender=getInstancePath();
if (getPeerAddress()!=null)
- getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_internalLog, d));
+ getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_internalLog, d.deepCopy()));
}
}
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
index 1df0ebe73..c1950d36b 100644
--- 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
@@ -34,10 +34,10 @@ public class SubSystem_HandlerTest extends SubSystemClassBase{
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);
+ Address addr_item_SystemPort_0 = new Address(0,0,110);
+ Address addr_item_SystemPort_1 = new Address(0,0,111);
+ Address addr_item_SystemPort_2 = new Address(0,0,112);
+ Address addr_item_SystemPort_3 = new Address(0,0,113);
// actor instance /SubSystem_HandlerTest/HandlerTest_Top itself => Systemport Address
// TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
@@ -115,17 +115,17 @@ public class SubSystem_HandlerTest extends SubSystemClassBase{
"timerService",
// own interface item addresses
new Address[][] {{addr_item__SubSystem_HandlerTest_timerService},
- null,
{
addr_item__SubSystem_HandlerTest_timerService_timeout_0
- }
+ },
+ null
},
// peer interface item addresses
new Address[][] {{addr_item_SystemPort_3},
- null,
{
addr_item__SubSystem_HandlerTest_HandlerTest_Top_tester_timer
- }
+ },
+ null
}
);
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
index 58a4c0811..08374a9f9 100644
--- 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
@@ -38,12 +38,12 @@ public class SubSystem_PingPong extends SubSystemClassBase{
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);
+ Address addr_item_SystemPort_0 = new Address(0,0,116);
+ Address addr_item_SystemPort_1 = new Address(0,0,117);
+ Address addr_item_SystemPort_2 = new Address(0,0,118);
+ Address addr_item_SystemPort_3 = new Address(0,0,119);
+ Address addr_item_SystemPort_4 = new Address(0,0,120);
+ Address addr_item_SystemPort_5 = new Address(0,0,121);
// actor instance /SubSystem_PingPong/application itself => Systemport Address
// TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
@@ -177,17 +177,17 @@ public class SubSystem_PingPong extends SubSystemClassBase{
"services",
// own interface item addresses
new Address[][] {{addr_item__SubSystem_PingPong_services},
- null,
{
addr_item__SubSystem_PingPong_services_timeout_0
- }
+ },
+ null
},
// peer interface item addresses
new Address[][] {{addr_item_SystemPort_5},
- null,
{
addr_item__SubSystem_PingPong_application_MrPing_timer
- }
+ },
+ null
}
);
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
index 5aa1f2ac1..631eade18 100644
--- 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
@@ -38,12 +38,12 @@ public class SubSystem_PingPongReplPort extends SubSystemClassBase{
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);
+ Address addr_item_SystemPort_0 = new Address(0,0,116);
+ Address addr_item_SystemPort_1 = new Address(0,0,117);
+ Address addr_item_SystemPort_2 = new Address(0,0,118);
+ Address addr_item_SystemPort_3 = new Address(0,0,119);
+ Address addr_item_SystemPort_4 = new Address(0,0,120);
+ Address addr_item_SystemPort_5 = new Address(0,0,121);
// actor instance /SubSystem_PingPongReplPort/application itself => Systemport Address
// TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
@@ -169,17 +169,17 @@ public class SubSystem_PingPongReplPort extends SubSystemClassBase{
"services",
// own interface item addresses
new Address[][] {{addr_item__SubSystem_PingPongReplPort_services},
- null,
{
addr_item__SubSystem_PingPongReplPort_services_timeout_0
- }
+ },
+ null
},
// peer interface item addresses
new Address[][] {{addr_item_SystemPort_5},
- null,
{
addr_item__SubSystem_PingPongReplPort_application_MrPing_timer
- }
+ },
+ null
}
);

Back to the top