diff options
| author | Henrik Rentz-Reichert | 2017-07-31 10:06:35 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2017-08-01 08:20:39 +0000 |
| commit | 6f110ef9a655989c9839aded0807a854b4f7a79e (patch) | |
| tree | 841c7a6fc111f2991dee6372cc01894aa6b396c9 /runtime/org.eclipse.etrice.modellib.java | |
| parent | a22cc46d84a76e5d025205edce05ac7137704659 (diff) | |
| download | org.eclipse.etrice-6f110ef9a655989c9839aded0807a854b4f7a79e.tar.gz org.eclipse.etrice-6f110ef9a655989c9839aded0807a854b4f7a79e.tar.xz org.eclipse.etrice-6f110ef9a655989c9839aded0807a854b4f7a79e.zip | |
Bug 511330 - [core.genmodel.fsm] introduce simplified generator model for state machines
* org.eclipse.etrice.generator.java.tests passing locally
* org.eclipse.etrice.generator.c.tests passing locally
* org.eclipse.etrice.generator.cpp.tests passing locally
* org.eclipse.etrice.abstractexec.behavior.tests passing locally
Change-Id: Ice31b6004076eb32d91d91289c2f5adca0d60693
Diffstat (limited to 'runtime/org.eclipse.etrice.modellib.java')
| -rw-r--r-- | runtime/org.eclipse.etrice.modellib.java/model/TcpService.room | 8 | ||||
| -rw-r--r-- | runtime/org.eclipse.etrice.modellib.java/model/TimingService.room | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/runtime/org.eclipse.etrice.modellib.java/model/TcpService.room b/runtime/org.eclipse.etrice.modellib.java/model/TcpService.room index 5af3819d6..152035ec0 100644 --- a/runtime/org.eclipse.etrice.modellib.java/model/TcpService.room +++ b/runtime/org.eclipse.etrice.modellib.java/model/TcpService.room @@ -102,7 +102,7 @@ RoomModel room.basic.service.tcp { action { "lastError=0;" "try{" - "socket = new ServerSocket(data.TcpPort);" + "socket = new ServerSocket(transitionData.TcpPort);" "(new ServerAcceptThread(PayloadPort, socket, this)).start();" "}catch(IOException e){" "System.err.println(e.toString());" @@ -148,7 +148,7 @@ RoomModel room.basic.service.tcp { } action { "try{" - "outStreams.get(data.getConnectionId()).write(data.getData(),0,data.length);" + "outStreams.get(transitionData.getConnectionId()).write(transitionData.getData(),0,transitionData.length);" "}catch(IOException e){" "System.err.println(e.toString());" "}" @@ -229,7 +229,7 @@ RoomModel room.basic.service.tcp { action { "lastError=0;" "try{" - "socket = new Socket(data.IPAddr,data.TcpPort);" + "socket = new Socket(transitionData.IPAddr,transitionData.TcpPort);" "(new ClientRxThread(PayloadPort, socket)).start();" "out = socket.getOutputStream();" "}catch(IOException e){" @@ -276,7 +276,7 @@ RoomModel room.basic.service.tcp { } action { "try{" - "\tout.write(data.getData(),0,data.length);" + "\tout.write(transitionData.getData(),0,transitionData.length);" "\t}catch(IOException e){" "\t\tSystem.err.println(e.toString());" "\t}" diff --git a/runtime/org.eclipse.etrice.modellib.java/model/TimingService.room b/runtime/org.eclipse.etrice.modellib.java/model/TimingService.room index ed6dad1ae..588654646 100644 --- a/runtime/org.eclipse.etrice.modellib.java/model/TimingService.room +++ b/runtime/org.eclipse.etrice.modellib.java/model/TimingService.room @@ -37,7 +37,7 @@ RoomModel room.basic.service.timing { "// start timer" "taskCount++;" "if (taskCount>PURGE_LIMIT) timerService.purge();" - "int t = td.getTime();" + "int t = transitionData.getTime();" "timerService.scheduleAtFixedRate(((PTimerPort)ifitem).getTask(),t,t);" } } @@ -49,7 +49,7 @@ RoomModel room.basic.service.timing { "// start timeout" "taskCount++;" "if (taskCount>PURGE_LIMIT) timerService.purge();" - "timerService.schedule(((PTimerPort)ifitem).getTask(), ((TimerData)td).getTime());" + "timerService.schedule(((PTimerPort)ifitem).getTask(), transitionData.getTime());" } } Transition tr4: Operational -> Operational { |