[generator.*] removed unused file system access
Change-Id: I5ac1109cec8836504e1584a6cb37a8af1c699a29
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/Main.java b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/Main.java
index 364633f..adebaf8 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/Main.java
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/Main.java
@@ -20,9 +20,9 @@
import org.eclipse.etrice.generator.base.AbstractGenerator;
import org.eclipse.etrice.generator.base.GlobalGeneratorSettings;
import org.eclipse.etrice.generator.base.IDataConfiguration;
+import org.eclipse.etrice.generator.c.gen.MainGen;
import org.eclipse.etrice.generator.c.gen.Validator;
import org.eclipse.etrice.generator.c.setup.GeneratorModule;
-import org.eclipse.xtext.generator.IGenerator;
import com.google.inject.Inject;
@@ -81,7 +81,7 @@
}
@Inject
- private IGenerator mainGenerator;
+ private MainGen mainGenerator;
@Inject
protected org.eclipse.etrice.generator.doc.gen.MainGen mainDocGenerator;
@@ -169,11 +169,10 @@
}
logger.logInfo("-- starting code generation");
- fileAccess.setOutputPath("src-gen/");
- mainGenerator.doGenerate(genModel.eResource(), fileAccess);
+ mainGenerator.doGenerate(genModel.eResource());
if (getSettings().isGenerateDocumentation()) {
- mainDocGenerator.doGenerate(genModel.eResource(), fileAccess);
+ mainDocGenerator.doGenerate(genModel.eResource());
}
if (diagnostician.isFailed()) {
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend
index 5ccfd41..cab53a1 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/MainGen.xtend
@@ -17,13 +17,10 @@
import com.google.inject.Singleton
import org.eclipse.emf.ecore.resource.Resource
import org.eclipse.etrice.core.genmodel.etricegen.Root
-import org.eclipse.xtext.generator.IFileSystemAccess
-import org.eclipse.xtext.generator.IGenerator
import org.eclipse.etrice.generator.generic.PrepareFileSystem
-import org.eclipse.etrice.generator.c.gen.NodeGen
@Singleton
-class MainGen implements IGenerator {
+class MainGen {
@Inject DataClassGen dataClassGen
@Inject EnumerationTypeGen enumClassGen
@@ -33,7 +30,7 @@
@Inject NodeRunnerGen nodeRunnerGen
@Inject PrepareFileSystem prepFS
- override void doGenerate(Resource resource, IFileSystemAccess fsa) {
+ def void doGenerate(Resource resource) {
prepFS.prepareCodeTargetPaths(resource)
for (e: resource.contents){
if (e instanceof Root) {
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/setup/GeneratorModule.java b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/setup/GeneratorModule.java
index 7742138..f6a9ec7 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/setup/GeneratorModule.java
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/setup/GeneratorModule.java
@@ -17,12 +17,11 @@
import org.eclipse.etrice.generator.base.IDataConfiguration;
import org.eclipse.etrice.generator.base.ITranslationProvider;
import org.eclipse.etrice.generator.c.Main;
-import org.eclipse.etrice.generator.c.gen.CTranslationProvider;
-import org.eclipse.etrice.generator.c.gen.MainGen;
-import org.eclipse.etrice.generator.generic.ILanguageExtension;
-import org.eclipse.xtext.generator.IGenerator;
import org.eclipse.etrice.generator.c.gen.CExtensions;
+import org.eclipse.etrice.generator.c.gen.CTranslationProvider;
import org.eclipse.etrice.generator.config.DataConfiguration;
+import org.eclipse.etrice.generator.generic.ILanguageExtension;
+
import com.google.inject.Binder;
public class GeneratorModule extends AbstractGeneratorBaseModule {
@@ -32,7 +31,6 @@
super.configure(binder);
binder.bind(AbstractGenerator.class).to(Main.class);
- binder.bind(IGenerator.class).to(MainGen.class);
}
@Override
diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java
index dbdf092..062ba12 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/MainGen.java
@@ -24,12 +24,10 @@
import org.eclipse.etrice.generator.c.gen.NodeRunnerGen;
import org.eclipse.etrice.generator.c.gen.ProtocolClassGen;
import org.eclipse.etrice.generator.generic.PrepareFileSystem;
-import org.eclipse.xtext.generator.IFileSystemAccess;
-import org.eclipse.xtext.generator.IGenerator;
@Singleton
@SuppressWarnings("all")
-public class MainGen implements IGenerator {
+public class MainGen {
@Inject
private DataClassGen dataClassGen;
@@ -51,7 +49,7 @@
@Inject
private PrepareFileSystem prepFS;
- public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
+ public void doGenerate(final Resource resource) {
this.prepFS.prepareCodeTargetPaths(resource);
EList<EObject> _contents = resource.getContents();
for (final EObject e : _contents) {
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 e31df97..64ae7b9 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
@@ -19,10 +19,10 @@
import org.eclipse.etrice.generator.base.AbstractGenerator;
import org.eclipse.etrice.generator.base.IDataConfiguration;
import org.eclipse.etrice.generator.cpp.gen.GeneratorSettings;
+import org.eclipse.etrice.generator.cpp.gen.MainGen;
import org.eclipse.etrice.generator.cpp.gen.Validator;
import org.eclipse.etrice.generator.cpp.setup.GeneratorModule;
import org.eclipse.etrice.generator.doc.gen.GlobalSettings;
-import org.eclipse.xtext.generator.IGenerator;
import org.eclipse.xtext.scoping.impl.ImportUriResolver;
import com.google.inject.Inject;
@@ -47,7 +47,7 @@
}
@Inject
- private IGenerator mainGenerator;
+ private MainGen mainGenerator;
@Inject
protected org.eclipse.etrice.generator.doc.gen.MainGen mainDocGenerator;
@@ -132,11 +132,10 @@
}
logger.logInfo("-- starting code generation");
- fileAccess.setOutputPath("src-gen/");
- mainGenerator.doGenerate(genModel.eResource(), fileAccess);
+ mainGenerator.doGenerate(genModel.eResource());
if (getSettings().isGenerateDocumentation()) {
- mainDocGenerator.doGenerate(genModel.eResource(), fileAccess);
+ mainDocGenerator.doGenerate(genModel.eResource());
}
if (diagnostician.isFailed()) {
diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/MainGen.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/MainGen.xtend
index f193990..450633b 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/MainGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/MainGen.xtend
@@ -18,11 +18,9 @@
import org.eclipse.emf.ecore.resource.Resource
import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.etrice.generator.generic.PrepareFileSystem
-import org.eclipse.xtext.generator.IFileSystemAccess
-import org.eclipse.xtext.generator.IGenerator
@Singleton
-class MainGen implements IGenerator {
+class MainGen {
@Inject DataClassGen dataClassGen
@Inject ProtocolClassGen protocolClassGen
@@ -31,7 +29,7 @@
@Inject SubSystemRunnerGen subsystemRunnerGen
@Inject PrepareFileSystem prepFS
- override void doGenerate(Resource resource, IFileSystemAccess fsa) {
+ def void doGenerate(Resource resource) {
prepFS.prepareCodeTargetPaths(resource)
for (e: resource.contents){
if (e instanceof Root) {
diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/setup/GeneratorModule.java b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/setup/GeneratorModule.java
index ac75f80..136bd75 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/setup/GeneratorModule.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/setup/GeneratorModule.java
@@ -22,9 +22,7 @@
import org.eclipse.etrice.generator.cpp.gen.CppExtensions;
import org.eclipse.etrice.generator.cpp.gen.CppTranslationProvider;
import org.eclipse.etrice.generator.cpp.gen.GeneratorSettings;
-import org.eclipse.etrice.generator.cpp.gen.MainGen;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
-import org.eclipse.xtext.generator.IGenerator;
import org.eclipse.xtext.scoping.impl.ImportUriResolver;
import com.google.inject.Binder;
@@ -36,7 +34,6 @@
super.configure(binder);
binder.bind(AbstractGenerator.class).to(Main.class);
- binder.bind(IGenerator.class).to(MainGen.class);
binder.bind(ImportUriResolver.class).to(ModelLocatorUriResolver.class);
diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/MainGen.java
index 4b39078..ccae327 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/MainGen.java
+++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/MainGen.java
@@ -23,12 +23,10 @@
import org.eclipse.etrice.generator.cpp.gen.SubSystemClassGen;
import org.eclipse.etrice.generator.cpp.gen.SubSystemRunnerGen;
import org.eclipse.etrice.generator.generic.PrepareFileSystem;
-import org.eclipse.xtext.generator.IFileSystemAccess;
-import org.eclipse.xtext.generator.IGenerator;
@Singleton
@SuppressWarnings("all")
-public class MainGen implements IGenerator {
+public class MainGen {
@Inject
private DataClassGen dataClassGen;
@@ -47,7 +45,7 @@
@Inject
private PrepareFileSystem prepFS;
- public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
+ public void doGenerate(final Resource resource) {
this.prepFS.prepareCodeTargetPaths(resource);
EList<EObject> _contents = resource.getContents();
for (final EObject e : _contents) {
diff --git a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/Main.java b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/Main.java
index 3a9f9a4..88c6dcc 100644
--- a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/Main.java
+++ b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/Main.java
@@ -13,12 +13,13 @@
package org.eclipse.etrice.generator.doc;
import java.util.Iterator;
+
import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.generator.base.AbstractGenerator;
import org.eclipse.etrice.generator.doc.gen.GlobalSettings;
import org.eclipse.etrice.generator.doc.gen.InstanceDiagramGen;
+import org.eclipse.etrice.generator.doc.gen.MainGen;
import org.eclipse.etrice.generator.doc.setup.GeneratorModule;
-import org.eclipse.xtext.generator.IGenerator;
import com.google.inject.Inject;
@@ -63,7 +64,7 @@
}
@Inject
- private IGenerator mainGenerator;
+ private MainGen mainGenerator;
@Inject
protected InstanceDiagramGen instanceDiagramGenerator;
@@ -94,8 +95,7 @@
}
logger.logInfo("-- starting code generation");
- fileAccess.setOutputPath("doc-gen/");
- mainGenerator.doGenerate(genModel.eResource(), fileAccess);
+ mainGenerator.doGenerate(genModel.eResource());
if (getSettings().isGenerateInstanceDiagram()) {
instanceDiagramGenerator.doGenerate(genModel);
diff --git a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/MainGen.xtend b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/MainGen.xtend
index 1d268a4..d5a187d 100644
--- a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/MainGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/MainGen.xtend
@@ -16,19 +16,16 @@
import com.google.inject.Singleton
import org.eclipse.emf.ecore.resource.Resource
import org.eclipse.etrice.core.genmodel.etricegen.Root
-import org.eclipse.xtext.generator.IFileSystemAccess
-import org.eclipse.xtext.generator.IGenerator
import org.eclipse.etrice.generator.generic.PrepareFileSystem
-
@Singleton
-class MainGen implements IGenerator {
+class MainGen {
@Inject InstanceDiagramGen instanceDiagramGen
@Inject PrepareFileSystem prepFS
@Inject DocGen docGen
- override void doGenerate(Resource resource, IFileSystemAccess fsa) {
+ def void doGenerate(Resource resource) {
prepFS.prepareDocTargetPaths(resource)
for (e: resource.contents){
if (e instanceof Root) {
diff --git a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/setup/GeneratorModule.java b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/setup/GeneratorModule.java
index 40fb311..e4becc5 100644
--- a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/setup/GeneratorModule.java
+++ b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/setup/GeneratorModule.java
@@ -19,9 +19,7 @@
import org.eclipse.etrice.generator.base.ITranslationProvider;
import org.eclipse.etrice.generator.doc.Main;
import org.eclipse.etrice.generator.doc.gen.GlobalSettings;
-import org.eclipse.etrice.generator.doc.gen.MainGen;
import org.eclipse.etrice.generator.generic.ILanguageExtension;
-import org.eclipse.xtext.generator.IGenerator;
import com.google.inject.Binder;
@@ -32,7 +30,6 @@
super.configure(binder);
binder.bind(AbstractGenerator.class).to(Main.class);
- binder.bind(IGenerator.class).to(MainGen.class);
binder.bind(GlobalGeneratorSettings.class).to(GlobalSettings.class);
}
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java
index 7e8997f..06fabcb 100644
--- a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java
+++ b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/MainGen.java
@@ -19,12 +19,10 @@
import org.eclipse.etrice.generator.doc.gen.DocGen;
import org.eclipse.etrice.generator.doc.gen.InstanceDiagramGen;
import org.eclipse.etrice.generator.generic.PrepareFileSystem;
-import org.eclipse.xtext.generator.IFileSystemAccess;
-import org.eclipse.xtext.generator.IGenerator;
@Singleton
@SuppressWarnings("all")
-public class MainGen implements IGenerator {
+public class MainGen {
@Inject
private InstanceDiagramGen instanceDiagramGen;
@@ -34,7 +32,7 @@
@Inject
private DocGen docGen;
- public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
+ public void doGenerate(final Resource resource) {
this.prepFS.prepareDocTargetPaths(resource);
EList<EObject> _contents = resource.getContents();
for (final EObject e : _contents) {
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/Main.java b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/Main.java
index d577eb9..240d021 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/Main.java
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/Main.java
@@ -22,9 +22,9 @@
import org.eclipse.etrice.generator.base.AbstractGenerator;
import org.eclipse.etrice.generator.base.IDataConfiguration;
import org.eclipse.etrice.generator.java.gen.GlobalSettings;
+import org.eclipse.etrice.generator.java.gen.MainGen;
import org.eclipse.etrice.generator.java.gen.Validator;
import org.eclipse.etrice.generator.java.setup.GeneratorModule;
-import org.eclipse.xtext.generator.IGenerator;
import org.eclipse.xtext.scoping.impl.ImportUriResolver;
import com.google.inject.Inject;
@@ -60,7 +60,7 @@
}
@Inject
- private IGenerator mainGenerator;
+ private MainGen mainGenerator;
@Inject
protected org.eclipse.etrice.generator.doc.gen.MainGen mainDocGenerator;
@@ -174,11 +174,10 @@
}
logger.logInfo("-- starting code generation");
- fileAccess.setOutputPath("src-gen/");
- mainGenerator.doGenerate(genModel.eResource(), fileAccess);
+ mainGenerator.doGenerate(genModel.eResource());
if (getSettings().isGenerateDocumentation()) {
- mainDocGenerator.doGenerate(genModel.eResource(), fileAccess);
+ mainDocGenerator.doGenerate(genModel.eResource());
}
if (diagnostician.isFailed()) {
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 ddff8c7..ae682d3 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
@@ -16,13 +16,11 @@
import com.google.inject.Singleton
import org.eclipse.emf.ecore.resource.Resource
import org.eclipse.etrice.core.genmodel.etricegen.Root
-import org.eclipse.xtext.generator.IFileSystemAccess
-import org.eclipse.xtext.generator.IGenerator
import org.eclipse.etrice.generator.generic.PrepareFileSystem
import org.eclipse.etrice.generator.java.Main
@Singleton
-class MainGen implements IGenerator {
+class MainGen {
@Inject DataClassGen dataClassGen
@Inject EnumerationTypeGen enumTypeGen
@@ -35,7 +33,7 @@
@Inject NodeRunnerGen nodeRunnerGen
@Inject PrepareFileSystem prepFS
- override void doGenerate(Resource resource, IFileSystemAccess fsa) {
+ def void doGenerate(Resource resource) {
prepFS.prepareCodeTargetPaths(resource)
for (e: resource.contents){
if (e instanceof Root) {
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/setup/GeneratorModule.java b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/setup/GeneratorModule.java
index 42547d9..45be29e 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/setup/GeneratorModule.java
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/setup/GeneratorModule.java
@@ -18,18 +18,12 @@
import org.eclipse.etrice.generator.base.GlobalGeneratorSettings;
import org.eclipse.etrice.generator.base.IDataConfiguration;
import org.eclipse.etrice.generator.base.ITranslationProvider;
+import org.eclipse.etrice.generator.generic.ILanguageExtension;
import org.eclipse.etrice.generator.java.Main;
import org.eclipse.etrice.generator.java.gen.GlobalSettings;
-import org.eclipse.etrice.generator.java.gen.MainGen;
-import org.eclipse.etrice.generator.java.gen.JavaTranslationProvider;
-import org.eclipse.xtext.generator.IGenerator;
-import org.eclipse.xtext.scoping.impl.ImportUriResolver;
-import org.eclipse.etrice.generator.generic.ILanguageExtension;
import org.eclipse.etrice.generator.java.gen.JavaExtensions;
-
-
-
-
+import org.eclipse.etrice.generator.java.gen.JavaTranslationProvider;
+import org.eclipse.xtext.scoping.impl.ImportUriResolver;
import com.google.inject.Binder;
@@ -40,7 +34,6 @@
super.configure(binder);
binder.bind(AbstractGenerator.class).to(Main.class);
- binder.bind(IGenerator.class).to(MainGen.class);
binder.bind(ImportUriResolver.class).to(ModelLocatorUriResolver.class);
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java
index 49c833a..7ba4c6b 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/MainGen.java
@@ -28,12 +28,10 @@
import org.eclipse.etrice.generator.java.gen.OptionalActorFactoryGen;
import org.eclipse.etrice.generator.java.gen.OptionalActorInterfaceGen;
import org.eclipse.etrice.generator.java.gen.ProtocolClassGen;
-import org.eclipse.xtext.generator.IFileSystemAccess;
-import org.eclipse.xtext.generator.IGenerator;
@Singleton
@SuppressWarnings("all")
-public class MainGen implements IGenerator {
+public class MainGen {
@Inject
private DataClassGen dataClassGen;
@@ -64,7 +62,7 @@
@Inject
private PrepareFileSystem prepFS;
- public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {
+ public void doGenerate(final Resource resource) {
this.prepFS.prepareCodeTargetPaths(resource);
EList<EObject> _contents = resource.getContents();
for (final EObject e : _contents) {
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java
index b114b6c..4a1462b 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java
@@ -39,7 +39,6 @@
import org.eclipse.etrice.core.scoping.StandardModelLocator;
import org.eclipse.etrice.generator.generic.RoomExtensions;
import org.eclipse.xtext.diagnostics.Severity;
-import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
import org.eclipse.xtext.util.CancelIndicator;
import org.eclipse.xtext.validation.CheckMode;
import org.eclipse.xtext.validation.IResourceValidator;
@@ -368,12 +367,6 @@
protected IDiagnostician diagnostician;
/**
- * The injected Java IO file access
- */
- @Inject
- protected JavaIoFileSystemAccess fileAccess;
-
- /**
* The injected platform relative URI resolver
*/
@Inject
