Fix VQL validator breakage after Execute Application Configuration

1 files changed, 12 insertions, 2 deletions

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)

         }