Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Belle2018-08-29 09:41:30 +0000
committerJan Belle2018-08-31 09:11:08 +0000
commit99a2c70b13dc3713b7e63c1e1b15ce1e46085815 (patch)
tree3d775f801d558855c85880dc4f7408986524016e /plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend
parent0c4faa4761c9085523c8f51dac59106eb2fbda48 (diff)
downloadorg.eclipse.etrice-99a2c70b13dc3713b7e63c1e1b15ce1e46085815.tar.gz
org.eclipse.etrice-99a2c70b13dc3713b7e63c1e1b15ce1e46085815.tar.xz
org.eclipse.etrice-99a2c70b13dc3713b7e63c1e1b15ce1e46085815.zip
[generator] Refactor generators to implement common generator interface
* migrated to new generator options implementation Change-Id: I086b384d502fcd1576256a2afaf08df2538b3670
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend')
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend12
1 files changed, 7 insertions, 5 deletions
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 369d92c64..ca7de0fea 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
@@ -20,19 +20,20 @@ import org.eclipse.etrice.core.room.DataClass
import org.eclipse.etrice.core.room.Message
import org.eclipse.etrice.core.room.ProtocolClass
import org.eclipse.etrice.generator.fsm.base.FileSystemHelpers
-import org.eclipse.etrice.generator.fsm.base.IGeneratorFileIo
+import org.eclipse.etrice.generator.base.io.IGeneratorFileIO
import org.eclipse.etrice.generator.generic.GenericProtocolClassGenerator
import org.eclipse.etrice.generator.generic.ProcedureHelpers
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.etrice.generator.generic.TypeHelpers
import org.eclipse.etrice.generator.java.Main
-import org.eclipse.etrice.core.genmodel.fsm.ILogger
import org.eclipse.etrice.generator.generic.ILanguageExtension
+import org.eclipse.etrice.core.genmodel.fsm.IDiagnostician
+import org.eclipse.etrice.generator.java.setup.GeneratorOptionsHelper
@Singleton
class ProtocolClassGen extends GenericProtocolClassGenerator {
- @Inject IGeneratorFileIo fileIO
+ @Inject IGeneratorFileIO fileIO
@Inject extension JavaExtensions
@Inject extension RoomExtensions
@Inject extension ProcedureHelpers
@@ -40,7 +41,8 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
@Inject extension TypeHelpers
@Inject extension DataClassGen
@Inject extension FileSystemHelpers
- @Inject ILogger logger
+ @Inject protected extension GeneratorOptionsHelper
+ @Inject IDiagnostician diagnostician
def doGenerate(Root root) {
for (pc: root.protocolClasses.filter(cl|cl.isValidGenerationLocation)) {
@@ -57,7 +59,7 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
""
}
if (contents.toString.empty)
- logger.logError("synchronous protocols not supported yet", pc)
+ diagnostician.error("synchronous protocols not supported yet", pc, null)
else
fileIO.generateFile("generating ProtocolClass implementation", path, infopath, file, contents)
}

Back to the top