diff options
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp')
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.xtend index b7ae0d347..8b39d7bbc 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.xtend +++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ConfigGenAddon.xtend @@ -21,6 +21,7 @@ import org.eclipse.etrice.core.genmodel.etricegen.InstanceBase import org.eclipse.etrice.core.room.ActorClass import org.eclipse.etrice.core.room.Attribute import org.eclipse.etrice.core.room.DataClass +import org.eclipse.etrice.core.room.EnumerationType import org.eclipse.etrice.core.room.ExternalType import org.eclipse.etrice.core.room.PrimitiveType import org.eclipse.etrice.core.room.util.RoomHelpers @@ -28,8 +29,6 @@ import org.eclipse.etrice.generator.base.IDataConfiguration import org.eclipse.etrice.generator.generic.ProcedureHelpers import org.eclipse.etrice.generator.generic.RoomExtensions import org.eclipse.etrice.generator.generic.TypeHelpers -import static extension org.eclipse.etrice.core.room.util.RoomHelpers.* -import org.eclipse.etrice.core.room.EnumerationType class ConfigGenAddon { @@ -37,6 +36,7 @@ class ConfigGenAddon { @Inject extension TypeHelpers typeHelpers @Inject extension ProcedureHelpers helpers @Inject IDataConfiguration dataConfigExt + @Inject extension RoomHelpers @Inject extension RoomExtensions // For SubSystemClassGen @@ -46,7 +46,7 @@ class ConfigGenAddon { «applyInstanceConfig(ai, aiVariableName, new ArrayList<Attribute>().union(a))» «ENDFOR» «FOR pi : ai.orderedIfItemInstances» - «var attribs = RoomHelpers::getPortClass(pi.interfaceItem)?.attributes» + «var attribs = getPortClass(pi.interfaceItem)?.attributes» «IF attribs != null» «FOR a : attribs» «applyInstanceConfig(pi, aiVariableName+"."+invokeGetter(pi.name, null), new ArrayList<Attribute>().union(a))» diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/DataClassGen.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/DataClassGen.xtend index 1ff4c13ae..71a93d078 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/DataClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/DataClassGen.xtend @@ -25,8 +25,7 @@ import org.eclipse.etrice.generator.generic.RoomExtensions import org.eclipse.etrice.generator.generic.TypeHelpers import org.eclipse.etrice.generator.cpp.gen.Initialization import org.eclipse.xtext.generator.JavaIoFileSystemAccess - -import static extension org.eclipse.etrice.core.room.util.RoomHelpers.* +import org.eclipse.etrice.core.room.util.RoomHelpers import org.eclipse.etrice.generator.cpp.Main /** @@ -42,6 +41,7 @@ class DataClassGen { @Inject extension ProcedureHelpers helpers @Inject extension TypeHelpers typeHelpers @Inject extension Initialization + @Inject extension RoomHelpers @Inject ILogger logger def doGenerate(Root root) { |