Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2013-07-23 08:13:10 +0000
committerHenrik Rentz-Reichert2013-07-23 08:14:23 +0000
commit6da86dfabe8cae3f9e764b3b6bf31ba52077da6f (patch)
tree3ff5e4254041d6c1b0f5ed35bf60c795ffc4a842 /plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend
parent61827a255e062f27954b7e50ed6160d052399940 (diff)
downloadorg.eclipse.etrice-6da86dfabe8cae3f9e764b3b6bf31ba52077da6f.tar.gz
org.eclipse.etrice-6da86dfabe8cae3f9e764b3b6bf31ba52077da6f.tar.xz
org.eclipse.etrice-6da86dfabe8cae3f9e764b3b6bf31ba52077da6f.zip
manual revert to the contents of 19.7.2013, commit 70f0f87
this discards the changes introduced with merge 54c56bd
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend')
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend11
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend
index c41240ab2..86e0eec2f 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeRunnerGen.xtend
@@ -17,14 +17,14 @@ import com.google.inject.Inject
import com.google.inject.Singleton
import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance
+import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.core.etmap.util.ETMapUtil
-import org.eclipse.etrice.generator.base.IGeneratorFileIo
@Singleton
class NodeRunnerGen {
- @Inject IGeneratorFileIo fileIO
+ @Inject extension JavaIoFileSystemAccess fileAccess
@Inject extension CExtensions
@Inject extension RoomExtensions
@@ -33,10 +33,9 @@ class NodeRunnerGen {
for (nr : ETMapUtil::getNodeRefs()) {
for (instpath : ETMapUtil::getSubSystemInstancePaths(nr)) {
val ssi = root.getInstance(instpath) as SubSystemInstance
- val file = nr.name+"_"+ssi.name+"_Runner.c"
- val filepath = ssi.subSystemClass.generationTargetPath+ssi.subSystemClass.getPath
- val infopath = ssi.subSystemClass.generationInfoPath+ssi.subSystemClass.getPath
- fileIO.generateFile("generating Node runner", filepath, infopath, file, root.generateSourceFile(ssi, first))
+ val clsname = nr.name+"_"+ssi.name
+ fileAccess.setOutputPath(ssi.subSystemClass.generationTargetPath+ssi.subSystemClass.getPath)
+ fileAccess.generateFile( clsname+"_Runner.c", root.generateSourceFile(ssi, first))
first = false
}
}

Back to the top