1 files changed, 24 insertions, 8 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 c9ec68bb..25036df6 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
@@ -4,6 +4,7 @@ import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigRef
 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigSpecification

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.CustomEntry

+import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.DocumentLevelSpecification

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.DocumentationEntry

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.EPackageImport

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.FileReference

@@ -24,19 +25,24 @@ import hu.bme.mit.inf.dslreasoner.application.execution.util.ApplicationConfigur
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel

 import java.util.LinkedHashMap

 import java.util.Optional

-import org.eclipse.emf.common.util.URI

-import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.DocumentLevelSpecification

-import org.eclipse.core.runtime.jobs.Job

 import org.eclipse.core.runtime.IProgressMonitor

 import org.eclipse.core.runtime.Status

+import org.eclipse.core.runtime.jobs.Job

+import org.eclipse.emf.common.util.URI

+import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor

+import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ObjectiveSpecification

+import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ObjectiveReference

 

+@FinalFieldsConstructor

 class ScriptExecutor {

         val parser = new ApplicationConfigurationParser

         

+        val ScriptConsole.Factory scriptConsoleFactory

+        

         /**

          * Executes a script

          */

-        public def executeScript(URI uri) {

+        def executeScript(URI uri) {

                 val job = new Job('''Model Generation: «uri.lastSegment»''') {

                         override protected run(IProgressMonitor monitor) {

                                 try{

@@ -53,7 +59,7 @@ class ScriptExecutor {
                 job.schedule();

         }

         

-        public def executeScript(ConfigurationScript script, IProgressMonitor monitor) {

+        def executeScript(ConfigurationScript script, IProgressMonitor monitor) {

                 script.activateAllEPackageReferences

                 val tasks = script.commands.filter(Task)

                 

@@ -90,12 +96,12 @@ class ScriptExecutor {
 //              }

         }

         

-        def public dispatch execute(GenerationTask task, IProgressMonitor monitor) {

+        def dispatch void execute(GenerationTask task, IProgressMonitor monitor) {

                 val generationTaskExecutor = new GenerationTaskExecutor

-                generationTaskExecutor.executeGenerationTask(task,this,monitor)

+                generationTaskExecutor.executeGenerationTask(task,this,scriptConsoleFactory,monitor)

         }

         

-        def public dispatch execute(Task task, IProgressMonitor monitor) {

+        def dispatch void execute(Task task, IProgressMonitor monitor) {

                 throw new IllegalArgumentException('''Unsupported task type: «task.class.simpleName»!''')

         }

         

@@ -170,6 +176,16 @@ class ScriptExecutor {
                 null

         }

         

+        def dispatch getObjectiveSpecification(ObjectiveSpecification config) {

+                config

+        }

+        def dispatch getObjectiveSpecification(ObjectiveReference config) {

+                config.referred.specification

+        }

+        def dispatch getObjectiveSpecification(Void config) {

+                null

+        }

+        

         def dispatch getConfiguration(ConfigSpecification config) {

                 config

         }