diff options
| author | Henrik Rentz-Reichert | 2011-07-08 06:29:06 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2011-07-08 06:29:06 +0000 |
| commit | 6399bb64e65757508b7cd6a22acc7f7004e8d223 (patch) | |
| tree | 5c18b2311653797b7de86d5b5dd0f31977a405ee /plugins/org.eclipse.etrice.generator.java/src/templates | |
| parent | 599354faadebd8707895930077fbd9cd8f95cdf6 (diff) | |
| download | org.eclipse.etrice-6399bb64e65757508b7cd6a22acc7f7004e8d223.tar.gz org.eclipse.etrice-6399bb64e65757508b7cd6a22acc7f7004e8d223.tar.xz org.eclipse.etrice-6399bb64e65757508b7cd6a22acc7f7004e8d223.zip | |
[core.room, generator, runtime, modellib] protocol messages can have zero or one data objects (primitive or data class)
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.java/src/templates')
4 files changed, 10 insertions, 10 deletions
diff --git a/plugins/org.eclipse.etrice.generator.java/src/templates/ActorClass.xpt b/plugins/org.eclipse.etrice.generator.java/src/templates/ActorClass.xpt index a35851f86..28e8caf20 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/templates/ActorClass.xpt +++ b/plugins/org.eclipse.etrice.generator.java/src/templates/ActorClass.xpt @@ -119,7 +119,7 @@ public «IF ac.abstract»abstract «ENDIF»class «ac.name» extends «IF ac.base!=null «ELSEIF !xpac.hasStateMachine()»
//--------------------- no state machine
@Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object... data) {
+ public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data) {
handleSystemEvent(ifitem, evt, data);
}
@@ -135,5 +135,5 @@ public «IF ac.abstract»abstract «ENDIF»class «ac.name» extends «IF ac.base!=null «ENDDEFINE»
«DEFINE msgArgs FOR Message»
-«FOREACH this.arguments AS a SEPARATOR ", "»«a.defaultValue()»«ENDFOREACH»
+«IF this.data!=null»«this.data.defaultValue()»«ENDIF»
«ENDDEFINE»
diff --git a/plugins/org.eclipse.etrice.generator.java/src/templates/ProtocolClass.xpt b/plugins/org.eclipse.etrice.generator.java/src/templates/ProtocolClass.xpt index 3e186f8a9..fef645f4a 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/templates/ProtocolClass.xpt +++ b/plugins/org.eclipse.etrice.generator.java/src/templates/ProtocolClass.xpt @@ -121,7 +121,7 @@ static public class «name» extends PortBase { if (msg instanceof EventWithDataMessage)
getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());
else
- getActor().receiveEvent(this, msg.getEvtId());
+ getActor().receiveEvent(this, msg.getEvtId(), null);
«IF this.handlesReceive(conj)»
}«ENDIF»
}
@@ -199,8 +199,8 @@ public interface I«name»{ «ENDLET»
«ENDDEFINE»
-«DEFINE messageSignature FOR Message»public void «this.name» («FOREACH this.arguments AS a SEPARATOR "," »«a.type.typeName()» «a.name»«ENDFOREACH»)«ENDDEFINE»
-«DEFINE messageCall FOR Message»«this.name»(«FOREACH this.arguments AS a SEPARATOR ","» «a.name»«ENDFOREACH»)«ENDDEFINE»
+«DEFINE messageSignature FOR Message»public void «this.name» («IF this.data!=null»«this.data.type.typeName()» «this.data.name»«ENDIF»)«ENDDEFINE»
+«DEFINE messageCall FOR Message»«this.name»(«IF this.data!=null» «this.data.name»«ENDIF»)«ENDDEFINE»
«DEFINE sendMessage(boolean conj) FOR Message-»
«LET conj?"IN":"OUT" AS dir-»
«LET this.getSendHandler(conj) AS hdlr-»
@@ -214,8 +214,8 @@ public interface I«name»{ DebuggingService.getInstance().addMessageAsyncOut(getAddress(), getPeerAddress(), messageStrings[«dir»_«this.name»]);
}
if (getPeerAddress()!=null)
- «IF this.arguments.isEmpty»getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), «dir»_«this.name»));
- «ELSE» getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), «dir»_«this.name», new Object[]{«FOREACH this.arguments AS a SEPARATOR ","» «a.name»«ENDFOREACH»}));
+ «IF this.data==null»getPeerMsgReceiver().receive(new EventMessage(getPeerAddress(), «dir»_«this.name»));
+ «ELSE» getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), «dir»_«this.name», «this.data.name»));
«ENDIF-»
«ENDIF-»
}
diff --git a/plugins/org.eclipse.etrice.generator.java/src/templates/StateMachine.xpt b/plugins/org.eclipse.etrice.generator.java/src/templates/StateMachine.xpt index ceefafeef..15f712e5e 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/templates/StateMachine.xpt +++ b/plugins/org.eclipse.etrice.generator.java/src/templates/StateMachine.xpt @@ -52,7 +52,7 @@ protected int history[] = {NO_STATE,NO_STATE«FOREACH ac.getAllBaseStates() AS st // receiveEvent contains the main implementation of the FSM
@Override
-public void receiveEvent(InterfaceItemBase ifitem, int evt, Object... generic_data) {
+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;
@@ -145,7 +145,7 @@ private void exitTo(int current, int to, boolean handler) { * @param generic_data - the generic data pointer
* @return the ID of the final state
*/
-private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object[] generic_data) {
+private int executeTransitionChain(int chain, InterfaceItemBase ifitem, Object generic_data) {
switch (chain) {
«LET this.getTransitionChains() AS chains-»
«FOREACH chains AS tc-»
diff --git a/plugins/org.eclipse.etrice.generator.java/src/templates/SubSystemClass.xpt b/plugins/org.eclipse.etrice.generator.java/src/templates/SubSystemClass.xpt index 9880adb49..edb2b9466 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/templates/SubSystemClass.xpt +++ b/plugins/org.eclipse.etrice.generator.java/src/templates/SubSystemClass.xpt @@ -52,7 +52,7 @@ public class «comp.name» extends SubSystemClassBase{ }
@Override
- public void receiveEvent(InterfaceItemBase ifitem, int evt, Object... data){
+ public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data){
}
@Override
|