Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
	plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
	plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
	plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
	plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip

Change-Id: I98e2df3ab57d6e7e8f27e5b0aee7eaa189bfbc33

1 files changed, 200 insertions, 200 deletions

diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend
index 6104fe4a9..d39a5484e 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend
@@ -1,202 +1,202 @@
-/*******************************************************************************

- * Copyright (c) 2011 protos software gmbh (http://www.protos.de).

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * CONTRIBUTORS:

- * 		Henrik Rentz-Reichert (initial contribution)

- * 

- *******************************************************************************/

-

-package org.eclipse.etrice.generator.java.gen

-

-import com.google.inject.Inject

-import com.google.inject.Singleton

-import java.util.HashSet

-import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance

-import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician

-import org.eclipse.etrice.core.genmodel.etricegen.Root

-import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance

-import org.eclipse.etrice.core.room.CommunicationType

-import org.eclipse.etrice.core.room.LogicalThread

-import org.eclipse.etrice.generator.base.IDataConfiguration

-import org.eclipse.etrice.generator.base.IGeneratorFileIo

-import org.eclipse.etrice.generator.generic.ProcedureHelpers

-import org.eclipse.etrice.generator.generic.RoomExtensions

-

-import static extension org.eclipse.etrice.generator.base.Indexed.*

-

-@Singleton

-class SubSystemClassGen {

+/*******************************************************************************
+ * Copyright (c) 2011 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * CONTRIBUTORS:
+ * 		Henrik Rentz-Reichert (initial contribution)
+ * 
+ *******************************************************************************/
+
+package org.eclipse.etrice.generator.java.gen
+
+import com.google.inject.Inject
+import com.google.inject.Singleton
+import java.util.HashSet
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance
+import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician
+import org.eclipse.etrice.core.genmodel.etricegen.Root
+import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance
+import org.eclipse.etrice.core.room.CommunicationType
+import org.eclipse.etrice.core.room.LogicalThread
+import org.eclipse.etrice.generator.base.IDataConfiguration
+import org.eclipse.etrice.generator.base.IGeneratorFileIo
+import org.eclipse.etrice.generator.generic.ProcedureHelpers
+import org.eclipse.etrice.generator.generic.RoomExtensions
+
+import static extension org.eclipse.etrice.generator.base.Indexed.*
+
+@Singleton
+class SubSystemClassGen {
 	
-	@Inject IGeneratorFileIo fileIO

-	@Inject extension JavaExtensions

-	@Inject extension RoomExtensions

-	@Inject IDataConfiguration dataConfigExt

-	@Inject ConfigGenAddon configGenAddon

-	@Inject extension ProcedureHelpers

-

-	@Inject VariableServiceGen varService

-	@Inject IDiagnostician diagnostician

-	

-	def doGenerate(Root root) {

-		for (ssi: root.subSystemInstances) {

-			val path = ssi.subSystemClass.generationTargetPath+ssi.subSystemClass.getPath

-			val infopath = ssi.subSystemClass.generationInfoPath+ssi.subSystemClass.getPath

-			val file = ssi.subSystemClass.getJavaFileName

-			checkDataPorts(ssi)

-			fileIO.generateFile("generating SubSystemClass implementation", path, infopath, file, root.generate(ssi))

-			if (dataConfigExt.hasVariableService(ssi))

-				varService.doGenerate(root, ssi);

-		}

-	}

-

-	def generate(Root root, SubSystemInstance comp) {

-		val cc = comp.subSystemClass

-		val models = root.getReferencedModels(cc)

-		

-	'''

-		package «cc.getPackage()»;

-		

-		import org.eclipse.etrice.runtime.java.config.IVariableService;

-		import org.eclipse.etrice.runtime.java.messaging.IRTObject;

-		import org.eclipse.etrice.runtime.java.messaging.MessageService;

-		import org.eclipse.etrice.runtime.java.messaging.MessageServiceController;

-		import org.eclipse.etrice.runtime.java.messaging.RTServices;

-		import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;

-		import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;

-		import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;

-		

-		«FOR model : models»

-			import «model.name».*;

-		«ENDFOR»

-		

-		«cc.userCode(1)»

-		

-		public class «cc.name» extends SubSystemClassBase {

-			

-			public final int THREAD__DEFAULT = 0;

-			«FOR thread : cc.threads.indexed»

-				public final int «thread.value.threadId» = «thread.index1»;

-			«ENDFOR»

-		

-			«cc.userCode(2)»

-			

-			public «cc.name»(IRTObject parent, String name) {

-				super(parent, name);

-			}

-			

-			@Override

-			public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data){

-			}

-			

-			@Override	

-			public void instantiateMessageServices() {

-			

-				RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, 0, THREAD__DEFAULT, "MessageService_Main"));

-				«FOR thread : cc.threads»

-					RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, 0, «thread.threadId», "MessageService_«thread.name»" /*, thread_prio */));

-				«ENDFOR»

-			}

-		

-			@Override

-			public void instantiateActors() {

-				

-				MessageServiceController msgSvcCtrl = RTServices.getInstance().getMsgSvcCtrl();

-

-				// thread mappings

-				msgSvcCtrl.addPathToThread("«comp.path»", THREAD__DEFAULT);

-				«FOR ai : comp.allContainedInstances»

-					«IF ai.threadId!=0»

-						msgSvcCtrl.addPathToThread("«ai.path»", «cc.threads.get(ai.threadId-1).threadId»);

-					«ENDIF»

-				«ENDFOR»

-				

-				// port to peer port mappings

-				«FOR ai : comp.allContainedInstances»

-					«FOR pi : ai.orderedIfItemInstances»

-						«IF pi.peers.size>0»

-							msgSvcCtrl.addPathToPeers("«pi.path»", «FOR peer : pi.peers SEPARATOR ","»"«peer.path»"«ENDFOR»);

-						«ENDIF»

-					«ENDFOR»

-				«ENDFOR»

-		

-				// sub actors

-				«FOR sub : cc.actorRefs»

-					«IF sub.size>1»

-						for (int i=0; i<«sub.size»; ++i)

-							new «sub.type.name»(this, "«sub.name»_"+i); 

-					«ELSE»

-						new «sub.type.name»(this, "«sub.name»"); 

-					«ENDIF»

-				«ENDFOR»

-				

-				// apply instance attribute configurations

-				«FOR ai: comp.allContainedInstances»

-					«val cfg = configGenAddon.genActorInstanceConfig(ai, "inst")»

-					«IF cfg.length>0»

-						{

-							«ai.actorClass.name» inst = («ai.actorClass.name») getObject("«ai.path»");

-							if (inst!=null) {

-								«cfg»

-							}

-						}

-					«ENDIF»

-				«ENDFOR»

-			}

-			

-			@Override

-			public void init(){

-				«IF dataConfigExt.hasVariableService(comp)»

-					variableService = new «cc.name»VariableService(this);

-				«ENDIF»

-				super.init();

-				«IF dataConfigExt.hasVariableService(comp)»

-					variableService.init();

-				«ENDIF»

-			}

-				

-			@Override

-			public void stop(){

-				super.stop();

-				«IF dataConfigExt.hasVariableService(comp)»

-					variableService.stop();

-				«ENDIF»

-			}

-				

-		};

-	'''

-	}

-

-	def private getThreadId(LogicalThread thread) {

-		"THREAD_"+thread.name.toUpperCase

-	}

-	

-	def private checkDataPorts(SubSystemInstance comp) {

-		val found = new HashSet<String>()

-		for (ai: comp.allContainedInstances) {

-			val thread = ai.threadId

-			for (pi: ai.orderedIfItemInstances) {

-				if (pi.protocol.commType==CommunicationType::DATA_DRIVEN) {

-					for (peer: pi.peers) {

-						val peer_ai = peer.eContainer as ActorInstance

-						val peer_thread = peer_ai.threadId

-						if (thread!=peer_thread) {

-							val path = pi.path

-							val ppath = peer.path

-							val pair = if (path.compareTo(ppath)<0) path+" and "+ppath

-										else ppath+" and "+path

-							if (!found.contains(pair)) {

-								found.add(pair)

-								diagnostician.error(pair+": data ports placed on different threads (not supported yet)",

-									pi.interfaceItem, pi.interfaceItem.eContainingFeature)

-							}

-						}

-					}

-				}

-			}

-		}

-	}

+	@Inject IGeneratorFileIo fileIO
+	@Inject extension JavaExtensions
+	@Inject extension RoomExtensions
+	@Inject IDataConfiguration dataConfigExt
+	@Inject ConfigGenAddon configGenAddon
+	@Inject extension ProcedureHelpers
+
+	@Inject VariableServiceGen varService
+	@Inject IDiagnostician diagnostician
+	
+	def doGenerate(Root root) {
+		for (ssi: root.subSystemInstances) {
+			val path = ssi.subSystemClass.generationTargetPath+ssi.subSystemClass.getPath
+			val infopath = ssi.subSystemClass.generationInfoPath+ssi.subSystemClass.getPath
+			val file = ssi.subSystemClass.getJavaFileName
+			checkDataPorts(ssi)
+			fileIO.generateFile("generating SubSystemClass implementation", path, infopath, file, root.generate(ssi))
+			if (dataConfigExt.hasVariableService(ssi))
+				varService.doGenerate(root, ssi);
+		}
+	}
+
+	def generate(Root root, SubSystemInstance comp) {
+		val cc = comp.subSystemClass
+		val models = root.getReferencedModels(cc)
+		
+	'''
+		package «cc.getPackage()»;
+		
+		import org.eclipse.etrice.runtime.java.config.IVariableService;
+		import org.eclipse.etrice.runtime.java.messaging.IRTObject;
+		import org.eclipse.etrice.runtime.java.messaging.MessageService;
+		import org.eclipse.etrice.runtime.java.messaging.MessageServiceController;
+		import org.eclipse.etrice.runtime.java.messaging.RTServices;
+		import org.eclipse.etrice.runtime.java.modelbase.ActorClassBase;
+		import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
+		import org.eclipse.etrice.runtime.java.modelbase.InterfaceItemBase;
+		
+		«FOR model : models»
+			import «model.name».*;
+		«ENDFOR»
+		
+		«cc.userCode(1)»
+		
+		public class «cc.name» extends SubSystemClassBase {
+			
+			public final int THREAD__DEFAULT = 0;
+			«FOR thread : cc.threads.indexed»
+				public final int «thread.value.threadId» = «thread.index1»;
+			«ENDFOR»
+		
+			«cc.userCode(2)»
+			
+			public «cc.name»(IRTObject parent, String name) {
+				super(parent, name);
+			}
+			
+			@Override
+			public void receiveEvent(InterfaceItemBase ifitem, int evt, Object data){
+			}
+			
+			@Override	
+			public void instantiateMessageServices() {
+			
+				RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, 0, THREAD__DEFAULT, "MessageService_Main"));
+				«FOR thread : cc.threads»
+					RTServices.getInstance().getMsgSvcCtrl().addMsgSvc(new MessageService(this, 0, «thread.threadId», "MessageService_«thread.name»" /*, thread_prio */));
+				«ENDFOR»
+			}
+		
+			@Override
+			public void instantiateActors() {
+				
+				MessageServiceController msgSvcCtrl = RTServices.getInstance().getMsgSvcCtrl();
+
+				// thread mappings
+				msgSvcCtrl.addPathToThread("«comp.path»", THREAD__DEFAULT);
+				«FOR ai : comp.allContainedInstances»
+					«IF ai.threadId!=0»
+						msgSvcCtrl.addPathToThread("«ai.path»", «cc.threads.get(ai.threadId-1).threadId»);
+					«ENDIF»
+				«ENDFOR»
+				
+				// port to peer port mappings
+				«FOR ai : comp.allContainedInstances»
+					«FOR pi : ai.orderedIfItemInstances»
+						«IF pi.peers.size>0»
+							msgSvcCtrl.addPathToPeers("«pi.path»", «FOR peer : pi.peers SEPARATOR ","»"«peer.path»"«ENDFOR»);
+						«ENDIF»
+					«ENDFOR»
+				«ENDFOR»
+		
+				// sub actors
+				«FOR sub : cc.actorRefs»
+					«IF sub.size>1»
+						for (int i=0; i<«sub.size»; ++i)
+							new «sub.type.name»(this, "«sub.name»_"+i); 
+					«ELSE»
+						new «sub.type.name»(this, "«sub.name»"); 
+					«ENDIF»
+				«ENDFOR»
+				
+				// apply instance attribute configurations
+				«FOR ai: comp.allContainedInstances»
+					«val cfg = configGenAddon.genActorInstanceConfig(ai, "inst")»
+					«IF cfg.length>0»
+						{
+							«ai.actorClass.name» inst = («ai.actorClass.name») getObject("«ai.path»");
+							if (inst!=null) {
+								«cfg»
+							}
+						}
+					«ENDIF»
+				«ENDFOR»
+			}
+			
+			@Override
+			public void init(){
+				«IF dataConfigExt.hasVariableService(comp)»
+					variableService = new «cc.name»VariableService(this);
+				«ENDIF»
+				super.init();
+				«IF dataConfigExt.hasVariableService(comp)»
+					variableService.init();
+				«ENDIF»
+			}
+				
+			@Override
+			public void stop(){
+				super.stop();
+				«IF dataConfigExt.hasVariableService(comp)»
+					variableService.stop();
+				«ENDIF»
+			}
+				
+		};
+	'''
+	}
+
+	def private getThreadId(LogicalThread thread) {
+		"THREAD_"+thread.name.toUpperCase
+	}
+	
+	def private checkDataPorts(SubSystemInstance comp) {
+		val found = new HashSet<String>()
+		for (ai: comp.allContainedInstances) {
+			val thread = ai.threadId
+			for (pi: ai.orderedIfItemInstances) {
+				if (pi.protocol.commType==CommunicationType::DATA_DRIVEN) {
+					for (peer: pi.peers) {
+						val peer_ai = peer.eContainer as ActorInstance
+						val peer_thread = peer_ai.threadId
+						if (thread!=peer_thread) {
+							val path = pi.path
+							val ppath = peer.path
+							val pair = if (path.compareTo(ppath)<0) path+" and "+ppath
+										else ppath+" and "+path
+							if (!found.contains(pair)) {
+								found.add(pair)
+								diagnostician.error(pair+": data ports placed on different threads (not supported yet)",
+									pi.interfaceItem, pi.interfaceItem.eContainingFeature)
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }