diff options
| author | Henrik Rentz-Reichert | 2017-08-29 15:07:49 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2017-08-29 15:13:10 +0000 |
| commit | 04647080b992f0e78286475c0d079b90728e2e6c (patch) | |
| tree | 3e94896764d04aee6b724dacee1ca6e441c88f6a /plugins/org.eclipse.etrice.generator.java/src | |
| parent | e8aed4ad25ee7451045ddb0f3b6ec12eccee238e (diff) | |
| download | org.eclipse.etrice-04647080b992f0e78286475c0d079b90728e2e6c.tar.gz org.eclipse.etrice-04647080b992f0e78286475c0d079b90728e2e6c.tar.xz org.eclipse.etrice-04647080b992f0e78286475c0d079b90728e2e6c.zip | |
Bug 521498 - [genmodel, generators] gen. only explicitly passed models
* generate only models that are passed on the command line
* also in non-lib mode generate all ROOM classes
Change-Id: Ib0766d77ba9de3c1b4de4d9b97c0a301241603a2
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.java/src')
4 files changed, 4 insertions, 4 deletions
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 3c23c9a32..d573ba315 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 @@ -56,7 +56,7 @@ class ActorClassGen extends GenericActorClassGenerator { def doGenerate(Root root) { val HashMap<ActorClass, WiredActorClass> ac2wired = new HashMap<ActorClass, WiredActorClass> root.wiredInstances.filter(w|w instanceof WiredActorClass).forEach[w|ac2wired.put((w as WiredActorClass).actorClass, w as WiredActorClass)] - for (xpac: root.xpActorClasses.filter(cl|cl.actorClass.isValidGenerationLocation)) { + 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 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 4928d7b16..6f10d38d0 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 @@ -37,7 +37,7 @@ class DataClassGen { @Inject RoomHelpers roomHelpers def doGenerate(Root root) { - for (dc: root.usedDataClasses.filter(cl|cl.isValidGenerationLocation)) { + for (dc: root.dataClasses.filter(cl|cl.isValidGenerationLocation)) { var path = dc.generationTargetPath+dc.getPath var infopath = dc.generationInfoPath+dc.getPath var file = dc.getJavaFileName 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 3e25711d7..49747db36 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 @@ -32,7 +32,7 @@ class EnumerationTypeGen { @Inject extension FileSystemHelpers def doGenerate(Root root) { - for (et: root.usedEnumClasses.filter(cl|cl.isValidGenerationLocation)) { + for (et: root.enumClasses.filter(cl|cl.isValidGenerationLocation)) { var path = et.generationTargetPath+et.getPath var infopath = et.generationInfoPath+et.getPath var file = et.getJavaFileName 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 6bdb49beb..9bb517b43 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 @@ -42,7 +42,7 @@ class ProtocolClassGen extends GenericProtocolClassGenerator { @Inject ILogger logger def doGenerate(Root root) { - for (pc: root.usedProtocolClasses.filter(cl|cl.isValidGenerationLocation)) { + for (pc: root.protocolClasses.filter(cl|cl.isValidGenerationLocation)) { val path = pc.generationTargetPath+pc.getPath val infopath = pc.generationInfoPath+pc.getPath val file = pc.getJavaFileName |