Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Belle2018-09-05 04:45:56 -0400
committerJan Belle2018-09-05 04:45:56 -0400
commite7ee5f01c807c86a6088ed321be578af10ce73bf (patch)
tree37113500de61f8ac72f87a5162db401ec4344d21 /plugins/org.eclipse.etrice.generator.cpp
parent939c36bfa9fda11e14101a3552400f0137ced60c (diff)
downloadorg.eclipse.etrice-e7ee5f01c807c86a6088ed321be578af10ce73bf.tar.gz
org.eclipse.etrice-e7ee5f01c807c86a6088ed321be578af10ce73bf.tar.xz
org.eclipse.etrice-e7ee5f01c807c86a6088ed321be578af10ce73bf.zip
[generator.base] Separate emf setup from generator interface
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.cpp')
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/Main.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/Main.java b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/Main.java
index 1a1fa6037..97a442ffd 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/Main.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/Main.java
@@ -22,6 +22,8 @@ import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.generator.base.AbstractGenerator;
import org.eclipse.etrice.generator.base.IDataConfiguration;
import org.eclipse.etrice.generator.base.args.Arguments;
+import org.eclipse.etrice.generator.base.io.IGeneratorFileIO;
+import org.eclipse.etrice.generator.base.logging.ILogger;
import org.eclipse.etrice.generator.base.logging.Loglevel;
import org.eclipse.etrice.generator.cpp.gen.MainGen;
import org.eclipse.etrice.generator.cpp.gen.Validator;
@@ -53,14 +55,14 @@ public class Main extends AbstractGenerator {
@Inject
protected IDataConfiguration dataConfig;
- protected int runGenerator(List<Resource> resources, Arguments arguments) {
+ protected int runGenerator(List<Resource> resources, Arguments arguments, IGeneratorFileIO fileIO, ILogger logger) {
if (!dataConfig.setResources(getResourceSet(), logger)) {
logger.logError("configuration errors");
return GENERATOR_ERROR;
}
- Root genModel = createGeneratorModel(resources, arguments);
+ Root genModel = createGeneratorModel(resources, arguments, logger);
if (diagnostician.isFailed() || genModel==null) {
logger.logError("errors during build of generator model");
return GENERATOR_ERROR;

Back to the top