From 52241f46c3793b94ff0b7e8ada361881e1474b97 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Wed, 2 Dec 2020 19:23:15 +0100 Subject: Fix VQL validator breakage after Execute Application Configuration --- .../application/execution/GenerationTaskExecutor.xtend | 6 +++++- .../application/execution/PatternLanguageWithRSSetup.xtend | 6 +----- .../dslreasoner/application/execution/ScriptExecutor.xtend | 14 ++++++++++++-- 3 files changed, 18 insertions(+), 8 deletions(-) (limited to 'Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme') diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend index c3ba9f81..d718bb91 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend @@ -1,5 +1,6 @@ package hu.bme.mit.inf.dslreasoner.application.execution +import com.google.inject.Injector import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.GenerationTask import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic @@ -24,7 +25,9 @@ import java.util.LinkedList import java.util.Optional import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.emf.common.util.URI +import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor +@FinalFieldsConstructor class GenerationTaskExecutor { val metamodelLoader = new MetamodelLoader val modelLoader = new ModelLoader @@ -32,6 +35,7 @@ class GenerationTaskExecutor { val solverLoader = new SolverLoader val scopeLoader = new ScopeLoader val statisticsUtil = new StatisticSections2CSV + val Injector injector def executeGenerationTask( GenerationTask task, @@ -102,7 +106,7 @@ class GenerationTaskExecutor { var domain2LogicTransformationTime = System.nanoTime val Ecore2Logic ecore2Logic = new Ecore2Logic val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic) - val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic) + val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic, injector) val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic var modelGeneration = ecore2Logic.transformMetamodel(metamodelDescriptor,new Ecore2LogicConfiguration()) diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend index c209cde5..371f6f8c 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend @@ -1,11 +1,7 @@ package hu.bme.mit.inf.dslreasoner.application.execution -import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetupGenerated -import com.google.inject.Injector import com.google.inject.Guice -import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageRuntimeModule -import com.google.inject.Guice; -import com.google.inject.Injector; +import com.google.inject.Injector import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetup class PatternLanguageWithRSSetup extends EMFPatternLanguageStandaloneSetup{ diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend index 3dea677f..9d0985d2 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend @@ -1,5 +1,7 @@ package hu.bme.mit.inf.dslreasoner.application.execution +import com.google.inject.Inject +import com.google.inject.Injector import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigReference import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigSpecification import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript @@ -33,11 +35,19 @@ import org.eclipse.core.runtime.jobs.Job import org.eclipse.emf.common.util.URI import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor -@FinalFieldsConstructor class ScriptExecutor { val parser = new ApplicationConfigurationParser val ScriptConsole.Factory scriptConsoleFactory + val Injector injector + + @FinalFieldsConstructor + new() { + } + + new(ScriptConsole.Factory scriptConsoleFactory) { + this(scriptConsoleFactory, null) + } /** * Executes a script @@ -101,7 +111,7 @@ class ScriptExecutor { } def dispatch void execute(GenerationTask task, IProgressMonitor monitor) { - val generationTaskExecutor = new GenerationTaskExecutor + val generationTaskExecutor = new GenerationTaskExecutor(injector) generationTaskExecutor.executeGenerationTask(task,this,scriptConsoleFactory,monitor) } -- cgit v1.2.3-70-g09d2