minor changes

8 files changed, 30 insertions, 35 deletions

diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
index abdefa9bc..448b69c6c 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.xtend
@@ -389,11 +389,11 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
 		'''
 	}
 
-	def private sendMessageCall(boolean hasData, String self, String msg, String typeName, String data) {
+	def private sendMessageCall(boolean hasData, String selfPtr, String msg, String typeName, String data) {
 		if (hasData)
-			"etPort_sendMessage("+self+", "+msg+", sizeof("+typeName+"), "+data+");"
+			"etPort_sendMessage("+selfPtr+", "+msg+", sizeof("+typeName+"), "+data+");"
 		else
-			"etPort_sendMessage("+self+", "+msg+", 0, NULL);"
+			"etPort_sendMessage("+selfPtr+", "+msg+", 0, NULL);"
 	}
 	
 	def private messageSignature(String className, String messageName, String methodSuffix, String data) {
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
index db4797f52..a4f12d792 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
@@ -1485,10 +1485,10 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
     return _xblockexpression;
   }
   
-  private String sendMessageCall(final boolean hasData, final String self, final String msg, final String typeName, final String data) {
+  private String sendMessageCall(final boolean hasData, final String selfPtr, final String msg, final String typeName, final String data) {
     String _xifexpression = null;
     if (hasData) {
-      String _plus = ("etPort_sendMessage(" + self);
+      String _plus = ("etPort_sendMessage(" + selfPtr);
       String _plus_1 = (_plus + ", ");
       String _plus_2 = (_plus_1 + msg);
       String _plus_3 = (_plus_2 + ", sizeof(");
@@ -1498,7 +1498,7 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
       String _plus_7 = (_plus_6 + ");");
       _xifexpression = _plus_7;
     } else {
-      String _plus_8 = ("etPort_sendMessage(" + self);
+      String _plus_8 = ("etPort_sendMessage(" + selfPtr);
       String _plus_9 = (_plus_8 + ", ");
       String _plus_10 = (_plus_9 + msg);
       String _plus_11 = (_plus_10 + ", 0, NULL);");
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/NodeGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/NodeGen.xtend
index c8408c8e9..50deb5209 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/NodeGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/NodeGen.xtend
@@ -156,9 +156,9 @@ class NodeGen {
 				IMessageService msgService;
 				«FOR thread: threads»
 					«IF thread.execmode==ExecMode::POLLED || thread.execmode==ExecMode::MIXED»
-						msgService = new MessageService(this, MessageService.ExecMode.«thread.execmode.name», «thread.time», 0, «thread.threadId», "MessageService_«thread.name»" /*, thread_prio */);
+						msgService = new MessageService(this, MessageService.ExecMode.«thread.execmode.getName», «thread.time», 0, «thread.threadId», "MessageService_«thread.name»" /*, thread_prio */);
 					«ELSE»
-						msgService = new MessageService(this, MessageService.ExecMode.«thread.execmode.name», 0, «thread.threadId», "MessageService_«thread.name»" /*, thread_prio */);
+						msgService = new MessageService(this, MessageService.ExecMode.«thread.execmode.getName», 0, «thread.threadId», "MessageService_«thread.name»" /*, thread_prio */);
 					«ENDIF»
 					RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(msgService);
 				«ENDFOR»
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java
index bdfb75471..7b0482bb1 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/NodeGen.java
@@ -379,7 +379,7 @@ public class NodeGen {
               _builder.append("\t\t");
               _builder.append("msgService = new MessageService(this, MessageService.ExecMode.");
               ExecMode _execmode_2 = thread_1.getExecmode();
-              String _name_1 = _execmode_2.name();
+              String _name_1 = _execmode_2.getName();
               _builder.append(_name_1, "		");
               _builder.append(", ");
               int _time = thread_1.getTime();
@@ -396,7 +396,7 @@ public class NodeGen {
               _builder.append("\t\t");
               _builder.append("msgService = new MessageService(this, MessageService.ExecMode.");
               ExecMode _execmode_3 = thread_1.getExecmode();
-              String _name_3 = _execmode_3.name();
+              String _name_3 = _execmode_3.getName();
               _builder.append(_name_3, "		");
               _builder.append(", 0, ");
               String _threadId_2 = this.getThreadId(thread_1);
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend
index 6041dd81b..1c7a4b725 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.xtend
@@ -155,7 +155,7 @@ class GenericStateMachineGenerator {
 			else
 				langExt.accessLevelPrivate
 		val privAccess = langExt.accessLevelPrivate
-		val self = langExt.selfPointer(ac.name, true)
+		val selfPtr = langExt.selfPointer(ac.name, true)
 		val selfOnly = langExt.selfPointer(ac.name, false)
 		val getLocalId = 	if (langExt.usesInheritance) {
 								if (langExt.usesPointers)
@@ -213,7 +213,7 @@ class GenericStateMachineGenerator {
 		 * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
 		 «ENDIF»
 		 */
-		«privAccess»void «opScopePriv»exitTo(«self»«stateType» current, «stateType» to«IF usesHdlr», «boolType» handler«ENDIF») {
+		«privAccess»void «opScopePriv»exitTo(«selfPtr»«stateType» current, «stateType» to«IF usesHdlr», «boolType» handler«ENDIF») {
 			while (current!=to) {
 				switch (current) {
 					«FOR state : xpac.stateMachine.getBaseStateList()»
@@ -237,7 +237,7 @@ class GenericStateMachineGenerator {
 		 * @param generic_data - the generic data pointer
 		 * @return the +/- ID of the final state either with a positive sign, that indicates to execute the state's entry code, or a negative sign vice versa
 		 */
-		«privAccess»«stateType» «opScopePriv»executeTransitionChain(«self»int chain«IF handleEvents», «constIfItemPtr» ifitem, «langExt.voidPointer» generic_data«ENDIF») {
+		«privAccess»«stateType» «opScopePriv»executeTransitionChain(«selfPtr»int chain«IF handleEvents», «constIfItemPtr» ifitem, «langExt.voidPointer» generic_data«ENDIF») {
 			switch (chain) {
 				«var allchains = xpac.getTransitionChains()»
 				«FOR tc : allchains»
@@ -261,7 +261,7 @@ class GenericStateMachineGenerator {
 		 «ENDIF»
 		 * @return - the ID of the final leaf state
 		 */
-		«privAccess»«stateType» «opScopePriv»enterHistory(«self»«stateType» state«IF usesHdlr», «boolType» handler«ENDIF») {
+		«privAccess»«stateType» «opScopePriv»enterHistory(«selfPtr»«stateType» state«IF usesHdlr», «boolType» handler«ENDIF») {
 			«boolType» skip_entry = «langExt.booleanConstant(false)»;
 			if (state >= STATE_MAX) {
 				state = «IF !langExt.usesInheritance»(«stateType»)«ENDIF» (state - STATE_MAX);
@@ -678,7 +678,7 @@ class GenericStateMachineGenerator {
 		val async = ac.commType==ActorCommunicationType::ASYNCHRONOUS
 		val eventDriven = ac.commType==ActorCommunicationType::EVENT_DRIVEN
 		val handleEvents = async || eventDriven
-		val self = langExt.selfPointer(ac.name, true)
+		val selfPtr = langExt.selfPointer(ac.name, true)
 		val usesHdlr = usesHandlerTrPoints(xpac)
 		
 	'''
@@ -720,7 +720,7 @@ class GenericStateMachineGenerator {
 			 * @param handler - entry and exit codes are called only if not handler (for handler TransitionPoints)
 			 «ENDIF»
 			 */
-			void exitTo(«self»int current, int to«IF usesHdlr», «boolType» handler«ENDIF»);
+			void exitTo(«selfPtr»int current, int to«IF usesHdlr», «boolType» handler«ENDIF»);
 			
 			/**
 			 * calls action, entry and exit codes along a transition chain. The generic data are cast to typed data
@@ -729,7 +729,7 @@ class GenericStateMachineGenerator {
 			 * @param generic_data - the generic data pointer
 			 * @return the ID of the final state
 			 */
-			int executeTransitionChain(«self»int chain«IF handleEvents», «constPointer("etRuntime::InterfaceItemBase")» ifitem, «langExt.voidPointer» generic_data«ENDIF»);
+			int executeTransitionChain(«selfPtr»int chain«IF handleEvents», «constPointer("etRuntime::InterfaceItemBase")» ifitem, «langExt.voidPointer» generic_data«ENDIF»);
 			
 			/**
 			 * calls entry codes while entering a state's history. The ID of the final leaf state is returned
@@ -739,7 +739,7 @@ class GenericStateMachineGenerator {
 			 «ENDIF»
 			 * @return - the ID of the final leaf state
 			 */
-			int enterHistory(«self»int state«IF usesHdlr», «boolType» handler«ENDIF»);
+			int enterHistory(«selfPtr»int state«IF usesHdlr», «boolType» handler«ENDIF»);
 		
 		public:
 
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TypeHelpers.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TypeHelpers.xtend
index f2e0e90ad..081787bde 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TypeHelpers.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TypeHelpers.xtend
@@ -54,10 +54,10 @@ class TypeHelpers {
 		else
 			return type.name
 	}
-	
-	def String getTypeName(DataType t) {
-		typeName(t)
-	}
+//	
+//	def String getTypeName(DataType t) {
+//		typeName(t)
+//	}
 	
 	def String getTypeName(RefableType t) {
 		typeName(t.getType())
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
index 8a490ed40..0dd67fbe0 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericStateMachineGenerator.java
@@ -269,7 +269,7 @@ public class GenericStateMachineGenerator {
       final String publicIf = _xifexpression_1;
       final String privAccess = this.langExt.accessLevelPrivate();
       String _name_1 = ac.getName();
-      final String self = this.langExt.selfPointer(_name_1, true);
+      final String selfPtr = this.langExt.selfPointer(_name_1, true);
       String _name_2 = ac.getName();
       final String selfOnly = this.langExt.selfPointer(_name_2, false);
       String _xifexpression_2 = null;
@@ -453,7 +453,7 @@ public class GenericStateMachineGenerator {
       _builder.append("void ");
       _builder.append(opScopePriv, "");
       _builder.append("exitTo(");
-      _builder.append(self, "");
+      _builder.append(selfPtr, "");
       String _stateType = this.stateType();
       _builder.append(_stateType, "");
       _builder.append(" current, ");
@@ -570,7 +570,7 @@ public class GenericStateMachineGenerator {
       _builder.append(" ");
       _builder.append(opScopePriv, "");
       _builder.append("executeTransitionChain(");
-      _builder.append(self, "");
+      _builder.append(selfPtr, "");
       _builder.append("int chain");
       {
         if (handleEvents) {
@@ -656,7 +656,7 @@ public class GenericStateMachineGenerator {
       _builder.append(" ");
       _builder.append(opScopePriv, "");
       _builder.append("enterHistory(");
-      _builder.append(self, "");
+      _builder.append(selfPtr, "");
       String _stateType_4 = this.stateType();
       _builder.append(_stateType_4, "");
       _builder.append(" state");
@@ -1843,7 +1843,7 @@ public class GenericStateMachineGenerator {
       }
       final boolean handleEvents = _or;
       String _name = ac.getName();
-      final String self = this.langExt.selfPointer(_name, true);
+      final String selfPtr = this.langExt.selfPointer(_name, true);
       final boolean usesHdlr = this.usesHandlerTrPoints(xpac);
       StringConcatenation _builder = new StringConcatenation();
       _builder.newLine();
@@ -1985,7 +1985,7 @@ public class GenericStateMachineGenerator {
       _builder.newLine();
       _builder.append("\t");
       _builder.append("void exitTo(");
-      _builder.append(self, "	");
+      _builder.append(selfPtr, "	");
       _builder.append("int current, int to");
       {
         if (usesHdlr) {
@@ -2022,7 +2022,7 @@ public class GenericStateMachineGenerator {
       _builder.newLine();
       _builder.append("\t");
       _builder.append("int executeTransitionChain(");
-      _builder.append(self, "	");
+      _builder.append(selfPtr, "	");
       _builder.append("int chain");
       {
         if (handleEvents) {
@@ -2063,7 +2063,7 @@ public class GenericStateMachineGenerator {
       _builder.newLine();
       _builder.append("\t");
       _builder.append("int enterHistory(");
-      _builder.append(self, "	");
+      _builder.append(selfPtr, "	");
       _builder.append("int state");
       {
         if (usesHdlr) {
diff --git a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java
index 3353da99b..ab3606d9c 100644
--- a/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java
+++ b/plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/TypeHelpers.java
@@ -59,11 +59,6 @@ public class TypeHelpers {
     }
   }
   
-  public String getTypeName(final DataType t) {
-    String _typeName = this.typeName(t);
-    return _typeName;
-  }
-  
   public String getTypeName(final RefableType t) {
     DataType _type = t.getType();
     String _typeName = this.typeName(_type);