Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2015-04-20 02:32:41 -0400
committerHenrik Rentz-Reichert2015-04-20 02:32:41 -0400
commitcacf5e93820a0c9b4f9c4e4ace85d0ca2b31c98c (patch)
treea08aecfa4aced3963830b45a46bef662e6f830ce /plugins/org.eclipse.etrice.generator.java/src/org
parentecbf1d90f5016c4a6424bb5bd4393a13255972a0 (diff)
downloadorg.eclipse.etrice-cacf5e93820a0c9b4f9c4e4ace85d0ca2b31c98c.tar.gz
org.eclipse.etrice-cacf5e93820a0c9b4f9c4e4ace85d0ca2b31c98c.tar.xz
org.eclipse.etrice-cacf5e93820a0c9b4f9c4e4ace85d0ca2b31c98c.zip
[generator.java] removed duplicate method generation in case of async or
data driven with FSM Change-Id: I18aa4971f03f40b87a89747c2e1c3909394d197c
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.xtend17
1 files changed, 5 insertions, 12 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 c9e19c138..3ac56c6c7 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
@@ -303,7 +303,11 @@ class ActorClassGen extends GenericActorClassGenerator {
«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»);
+ «IF ac.commType == ComponentCommunicationType::ASYNCHRONOUS»
+ receiveEvent(null, -1, null);
+ «ELSE»
+ receiveEventInternal();
+ «ENDIF»
}
«ENDIF»
«ELSEIF xpac.stateMachine.empty»
@@ -317,17 +321,6 @@ class ActorClassGen extends GenericActorClassGenerator {
«ENDIF»
«ENDIF»
- «IF ac.commType == ComponentCommunicationType::ASYNCHRONOUS || ac.commType == ComponentCommunicationType::DATA_DRIVEN»
- @Override
- public void receive(Message msg) {
- «IF ac.commType == ComponentCommunicationType::ASYNCHRONOUS»
- receiveEvent(null, -1, null);
- «ELSE»
- receiveEventInternal();
- «ENDIF»
- }
- «ENDIF»
-
«IF Main::settings.generatePersistenceInterface»
@Override

Back to the top