Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2015-04-17 12:36:33 -0400
committerHenrik Rentz-Reichert2015-04-17 12:36:33 -0400
commit508778956cd23335e13ad1b92905429acf04e568 (patch)
tree40d6f712628d6417b71412bbb6ae87636f70de0a /plugins/org.eclipse.etrice.generator.java/src/org
parent282fda14fa3ac209365aeeef604899c6e941b83b (diff)
parent609d4add5461f70f9e532d9f7e8c2d893c405bd1 (diff)
downloadorg.eclipse.etrice-508778956cd23335e13ad1b92905429acf04e568.tar.gz
org.eclipse.etrice-508778956cd23335e13ad1b92905429acf04e568.tar.xz
org.eclipse.etrice-508778956cd23335e13ad1b92905429acf04e568.zip
Merge branch 'change/45854/1'
Conflicts: plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend Change-Id: Ib10b40319496d576d6693020540d65d27d09291e
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.java/src/org')
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend6
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
index cb5ee8dc6..c9e19c138 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
@@ -300,6 +300,12 @@ class ActorClassGen extends GenericActorClassGenerator {
handleSystemEvent(ifitem, evt, generic_data);
}
«ENDIF»
+ «IF ac.commType == ComponentCommunicationType::ASYNCHRONOUS || ac.commType == ComponentCommunicationType::DATA_DRIVEN»
+ @Override
+ public void receive(Message msg) {
+ receiveEvent(«IF ac.commType == ComponentCommunicationType::ASYNCHRONOUS»null, -1, null«ENDIF»);
+ }
+ «ENDIF»
«ELSEIF xpac.stateMachine.empty»
««« no state machine in the super classes
//--------------------- no state machine

Back to the top