diff options
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.java/src')
11 files changed, 22 insertions, 33 deletions
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.xtend index 3e2762aeb..b8ad9fb1a 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassDataGen.xtend @@ -42,10 +42,9 @@ class ActorClassDataGen { root.wiredInstances.filter(w|w instanceof WiredActorClass).forEach[w|ac2wired.put((w as WiredActorClass).actorClass, w as WiredActorClass)] for (xpac: root.actorClasses.filter[isValidGenerationLocation].map[root.getExpandedActorClass(it)]) { val wired = ac2wired.get(xpac.actorClass) - val path = xpac.actorClass.generationTargetPath+xpac.actorClass.getPath - val infopath = xpac.actorClass.generationInfoPath+xpac.actorClass.getPath + val path = xpac.actorClass.getPath var file = xpac.actorClass.name+"_DataObject.java" - fileIO.generateFile("generating ActorClass implementation", path, infopath, file, root.generate(xpac, wired)) + fileIO.generateFile("generating ActorClass implementation", path + file, root.generate(xpac, wired)) } } 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 c6555a0db..13e19f72e 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 @@ -65,12 +65,11 @@ class ActorClassGen extends GenericActorClassGenerator { for (xpac: root.actorClasses.filter[isValidGenerationLocation].map[root.getExpandedActorClass(it)]) { val wired = ac2wired.get(xpac.actorClass) val manualBehavior = xpac.actorClass.isBehaviorAnnotationPresent("BehaviorManual") - val path = xpac.actorClass.generationTargetPath+xpac.actorClass.getPath - val infopath = xpac.actorClass.generationInfoPath+xpac.actorClass.getPath + val path = xpac.actorClass.getPath var file = xpac.actorClass.getJavaFileName if (manualBehavior) file = "Abstract"+file - fileIO.generateFile("generating ActorClass implementation", path, infopath, file, root.generate(xpac, wired, manualBehavior)) + fileIO.generateFile("generating ActorClass implementation", path + file, root.generate(xpac, wired, manualBehavior)) } } diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend index cce86cbaa..b58c0afb4 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/DataClassGen.xtend @@ -40,10 +40,9 @@ class DataClassGen { def doGenerate(Root root) { for (dc: root.dataClasses.filter(cl|cl.isValidGenerationLocation)) { - var path = dc.generationTargetPath+dc.getPath - var infopath = dc.generationInfoPath+dc.getPath + var path = dc.getPath var file = dc.getJavaFileName - fileIO.generateFile("generating DataClass implementation", path, infopath, file, root.generate(dc)) + fileIO.generateFile("generating DataClass implementation", path + file, root.generate(dc)) } } diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/EnumerationTypeGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/EnumerationTypeGen.xtend index 6ca3186b2..9bdfa987b 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/EnumerationTypeGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/EnumerationTypeGen.xtend @@ -35,10 +35,9 @@ class EnumerationTypeGen { def doGenerate(Root root) { for (et: root.enumClasses.filter(cl|cl.isValidGenerationLocation)) { - var path = et.generationTargetPath+et.getPath - var infopath = et.generationInfoPath+et.getPath + var path = et.getPath var file = et.getJavaFileName - fileIO.generateFile("generating Enumeration implementation", path, infopath, file, root.generate(et)) + fileIO.generateFile("generating Enumeration implementation", path + file, root.generate(et)) } } diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/MainGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/MainGen.xtend index b8a600750..f6c41eaee 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/MainGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/MainGen.xtend @@ -39,8 +39,7 @@ class MainGen { @Inject protected extension GeneratorOptionsHelper def void doGenerate(Resource resource) { - prepFS.prepareCodeTargetPaths(resource) - prepFS.prepareInfoTargetPaths(resource) + prepFS.prepare for (e: resource.contents){ if (e instanceof Root) { doGenerate(e as Root) 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 31814c3d1..7ac34c3d5 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 @@ -70,15 +70,14 @@ class NodeGen { val ssi = root.getInstance(instpath) as SubSystemInstance if (ssi!==null && ssi.subSystemClass.validGenerationLocation) { val wired = sscc2wired.get(ssi.subSystemClass) - val path = ssi.subSystemClass.generationTargetPath+ssi.subSystemClass.getPath - val infopath = ssi.subSystemClass.generationInfoPath+ssi.subSystemClass.getPath + val path = ssi.subSystemClass.getPath val file = nr.getJavaFileName(ssi) checkDataPorts(ssi) val usedThreads = ETMapUtil::getUsedThreads(nr, ssi) - fileIO.generateFile("generating Node implementation", path, infopath, file, root.generate(ssi, wired, usedThreads)) + fileIO.generateFile("generating Node implementation", path + file, root.generate(ssi, wired, usedThreads)) if (dataConfigExt.hasVariableService(ssi)) varService.doGenerate(root, ssi); } diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/NodeRunnerGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/NodeRunnerGen.xtend index b6c383df7..1d6d1d65f 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/NodeRunnerGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/NodeRunnerGen.xtend @@ -39,9 +39,8 @@ class NodeRunnerGen { val ssi = root.getInstance(instpath) as SubSystemInstance if (ssi!==null && ssi.subSystemClass.validGenerationLocation) { val file = nr.getJavaClassName(ssi)+"Runner.java" - val filepath = ssi.subSystemClass.generationTargetPath+ssi.subSystemClass.getPath - val infopath = ssi.subSystemClass.generationInfoPath+ssi.subSystemClass.getPath - fileIO.generateFile("generating SubSystemRunner implementation", filepath, infopath, file, root.generate(ssi)) + val filepath = ssi.subSystemClass.getPath + fileIO.generateFile("generating SubSystemRunner implementation", filepath + file, root.generate(ssi)) } } } diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.xtend index ccf46358b..dc01fa902 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/OptionalActorFactoryGen.xtend @@ -26,10 +26,9 @@ class OptionalActorFactoryGen { for (oi: root.optionalInstances.filter(cl|cl.actorClass.isValidGenerationLocation)) { val ac = oi.actorClass val wired = ac2wired.get(ac) - val path = ac.generationTargetPath+ac.path - val infopath = ac.generationInfoPath+ac.path + val path = ac.path val file = ac.getJavaFactoryFileName - fileIO.generateFile("generating ActorClass Interface implementation", path, infopath, file, root.generate(oi, wired)) + fileIO.generateFile("generating ActorClass Interface implementation", path + file, root.generate(oi, wired)) } } diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/OptionalActorInterfaceGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/OptionalActorInterfaceGen.xtend index 4e63c010f..d99478b0d 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/OptionalActorInterfaceGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/OptionalActorInterfaceGen.xtend @@ -36,13 +36,12 @@ class OptionalActorInterfaceGen extends GenericActorClassGenerator { def doGenerate(Root root) { for (ac: root.optionalActorClasses.filter(cl|cl.isValidGenerationLocation)) { - val path = ac.generationTargetPath+ac.path - val infopath = ac.generationInfoPath+ac.path + val path = ac.path var file = ac.getJavaInterfaceFileName(false) - fileIO.generateFile("generating ActorClass Interface implementation", path, infopath, file, root.generate(ac, false)) + fileIO.generateFile("generating ActorClass Interface implementation", path + file, root.generate(ac, false)) file = ac.getJavaInterfaceFileName(true) - fileIO.generateFile("generating ActorClass Interface implementation", path, infopath, file, root.generate(ac, true)) + fileIO.generateFile("generating ActorClass Interface implementation", path + file, root.generate(ac, true)) } } diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend index 14788081f..749a6a1b3 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend @@ -48,8 +48,7 @@ class ProtocolClassGen extends GenericProtocolClassGenerator { def doGenerate(Root root) { for (pc: root.protocolClasses.filter(cl|cl.isValidGenerationLocation)) { - val path = pc.generationTargetPath+pc.getPath - val infopath = pc.generationInfoPath+pc.getPath + val path = pc.getPath val file = pc.getJavaFileName val contents = switch (pc.commType) { @@ -63,7 +62,7 @@ class ProtocolClassGen extends GenericProtocolClassGenerator { if (contents.toString.empty) diagnostician.error("synchronous protocols not supported yet", pc, null) else - fileIO.generateFile("generating ProtocolClass implementation", path, infopath, file, contents) + fileIO.generateFile("generating ProtocolClass implementation", path + file, contents) } } diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/VariableServiceGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/VariableServiceGen.xtend index 19d52f1f5..3b6dd69a8 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/VariableServiceGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/VariableServiceGen.xtend @@ -53,10 +53,9 @@ class VariableServiceGen { def doGenerate(Root root, SubSystemInstance ssi) { val nr = ETMapUtil::getNodeRef(ssi) val clsname = nr.getJavaClassName(ssi) - val path = ssi.subSystemClass.generationTargetPath+ssi.subSystemClass.getPath - val infopath = ssi.subSystemClass.generationInfoPath+ssi.subSystemClass.getPath + val path = ssi.subSystemClass.getPath val file = clsname+"VariableService.java" - fileIO.generateFile("generating VariableService implementation", path, infopath, file, root.generate(ssi)) + fileIO.generateFile("generating VariableService implementation", path + file, root.generate(ssi)) } def private generate(Root root, SubSystemInstance comp) { |