9 files changed, 59 insertions, 20 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/execute/ExecuteScriptHandler.java b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/execute/ExecuteScriptHandler.java
index ce1330bd..43d22ab3 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/execute/ExecuteScriptHandler.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/execute/ExecuteScriptHandler.java
@@ -40,6 +40,6 @@ public class ExecuteScriptHandler extends AbstractHandler implements IHandler {
                         }

                 }

                 return null;

-        }

+        } 

 

 }

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/META-INF/MANIFEST.MF b/Application/hu.bme.mit.inf.dslreasoner.application/META-INF/MANIFEST.MF
index 037dbf52..92b9840b 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/META-INF/MANIFEST.MF
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/META-INF/MANIFEST.MF
@@ -31,7 +31,9 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.core.runtime;bundle-version="3.12.0",

  org.eclipse.ui.console;bundle-version="3.6.201",

  org.eclipse.jface;bundle-version="3.12.2",

- org.eclipse.ui;bundle-version="3.108.1"

+ org.eclipse.ui;bundle-version="3.108.1",

+ org.eclipse.viatra.query.runtime.rete;bundle-version="2.0.0",

+ org.eclipse.viatra.query.runtime.localsearch;bundle-version="2.0.0"

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Export-Package: hu.bme.mit.inf.dslreasoner.application,

  hu.bme.mit.inf.dslreasoner.application.applicationConfiguration,

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfigurationStandaloneSetup.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfigurationStandaloneSetup.xtend
index ef07c9b3..1f9dc9db 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfigurationStandaloneSetup.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfigurationStandaloneSetup.xtend
@@ -3,12 +3,17 @@
  */

 package hu.bme.mit.inf.dslreasoner.application

 

+import com.google.inject.Guice

+import com.google.inject.Injector

 

 /**

  * Initialization support for running Xtext languages without Equinox extension registry.

  */

 class ApplicationConfigurationStandaloneSetup extends ApplicationConfigurationStandaloneSetupGenerated {

 

+        override Injector createInjector() {

+                return Guice.createInjector(new ApplicationConfigurationStandaloneRuntimeModule());

+        }

         def static void doSetup() {

                 new ApplicationConfigurationStandaloneSetup().createInjectorAndDoEMFRegistration()

         }

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 61526ce6..40ffaf28 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
@@ -25,6 +25,7 @@ import java.util.Optional
 import java.util.Scanner

 import org.eclipse.core.runtime.IProgressMonitor

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

+import hu.bme.mit.inf.dslreasoner.workspace.URIBasedWorkspace

 

 class GenerationTaskExecutor {

         val metamodelLoader = new MetamodelLoader

@@ -69,13 +70,13 @@ class GenerationTaskExecutor {
                 

                 try {

                         val reasonerWorkspace = if(debugFolder!== null) {

-                                new ProjectWorkspace(debugFolder.path,"")

+                                new URIBasedWorkspace(debugFolder.path,"")

                         } else {

                                 new NullWorkspace

                         }

                         reasonerWorkspace.init

                         val outputWorkspace = if(outputFolder !== null) {

-                                new ProjectWorkspace(outputFolder.path,"")

+                                new URIBasedWorkspace(outputFolder.path,"")

                         } else {

                                 new NullWorkspace

                         }

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend
index 1d8c473f..030d2b9e 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend
@@ -144,15 +144,19 @@ class ScriptConsole {
         

         private def MessageConsole prepareRuntimeConsole() {

                 val plugin = ConsolePlugin.getDefault();

-                val conMan = plugin.getConsoleManager();

-                val existingConsoles = conMan.getConsoles();

-                val existingConsolesWithID = existingConsoles.filter[it.name.equals(consoleID)]

-                if(existingConsolesWithID.empty) {

-                        val MessageConsole res = new MessageConsole(consoleID,null)

-                        conMan.addConsoles(#[res]);

-                        return res

+                if(plugin === null) {

+                        return null

                 } else {

-                        return existingConsolesWithID.head as MessageConsole

+                        val conMan = plugin.getConsoleManager();

+                        val existingConsoles = conMan.getConsoles();

+                        val existingConsolesWithID = existingConsoles.filter[it.name.equals(consoleID)]

+                        if(existingConsolesWithID.empty) {

+                                val MessageConsole res = new MessageConsole(consoleID,null)

+                                conMan.addConsoles(#[res]);

+                                return res

+                        } else {

+                                return existingConsolesWithID.head as MessageConsole

+                        }

                 }

         }

         

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 d8a37184..b9813040 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
@@ -32,9 +32,6 @@ import org.eclipse.core.runtime.Status
 

 class ScriptExecutor {

         val parser = new ApplicationConfigurationParser

-        def static void main(String[] args) {

-                println("generator")
-        }

         

         /**

          * Executes a script

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
index 652db34c..6fa1fcfd 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicProblemBuilder.xtend
@@ -61,7 +61,8 @@ public class LogicProblemBuilder{
                         val element = result.get(0);

                         if(element == "bool" ||

                            element == "int" ||

-                           element == "real") throw new LogicProblemBuilderException('''Reserved keyword "«element»"!''')

+                           element == "real" ||

+                           element == "string") throw new LogicProblemBuilderException('''Reserved keyword "«element»"!''')

                         else return result.join(' ')

                 }

                 else return result.join(' ')

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
index 18331278..699c9308 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
@@ -12,8 +12,33 @@ Require-Bundle: com.google.guava,
  hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",

  hu.bme.mit.inf.dslreasoner.logic.model.validation;bundle-version="0.0.1",

  org.eclipse.emf.ecore.xmi;bundle-version="2.12.0",

- guru.nidi.graphviz-java;bundle-version="0.2.1"

-Import-Package: org.apache.log4j;version="1.2.15"

+ guru.nidi.graphviz-java;bundle-version="0.2.1";visibility:=reexport,

+ org.apache.batik.transcoder;bundle-version="1.6.0",

+ org.apache.batik.dom;bundle-version="[1.6.1,1.6.2]",

+ org.apache.batik.bridge;bundle-version="[1.6.0,1.6.1]",

+ org.apache.batik.dom.svg;bundle-version="[1.6.0,1.6.1]",

+ org.apache.batik.util;bundle-version="[1.6.0,1.6.1]",

+ org.apache.batik.css;bundle-version="[1.6.0,1.6.1]",

+ org.apache.batik.parser;bundle-version="[1.6.0,1.6.1]",

+ org.apache.batik.pdf;bundle-version="[1.6.0,1.6.1]",

+ org.apache.batik.svggen;bundle-version="[1.6.0,1.6.1]",

+ org.apache.batik.xml;bundle-version="[1.6.0,1.6.1]",

+ org.apache.batik.ext.awt;bundle-version="[1.6.0,1.6.1]",

+ org.apache.batik.util.gui;bundle-version="[1.6.0,1.6.1]",

+ org.apache.xerces;bundle-version="2.9.0",

+ org.w3c.dom.svg;bundle-version="1.1.0",

+ org.w3c.css.sac;bundle-version="1.3.1"

+Import-Package: com.eclipsesource.v8;version="4.6.0",

+ com.eclipsesource.v8.debug;version="4.6.0",

+ com.eclipsesource.v8.utils;version="4.6.0",

+ com.eclipsesource.v8.utils.typedarrays;version="4.6.0",

+ javax.imageio,

+ javax.xml.parsers,

+ org.apache.log4j;version="1.2.15",

+ org.slf4j;version="1.7.2",

+ org.w3c.dom,

+ org.xml.sax,

+ org.xml.sax.helpers

 Export-Package: hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz

 Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.visualisation

 

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/VisualisationQueque.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/VisualisationQueque.xtend
index 79074bfc..b067ba7d 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/VisualisationQueque.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/VisualisationQueque.xtend
@@ -11,6 +11,7 @@ import java.util.concurrent.BlockingQueue
 import java.util.concurrent.CompletableFuture

 import java.util.concurrent.LinkedBlockingQueue

 import org.eclipse.xtend.lib.annotations.Data

+import java.util.function.Consumer

 

 class VisualisationQueque {

         val BlockingQueue<VisualisationQueueEntry> taskQueue = new LinkedBlockingQueue

@@ -43,9 +44,12 @@ class VisualisationQueque {
                         // do nothing

                 } else {

                         runnerThread = new Thread(new Runnable() {

-                                val engine = new GraphvizV8Engine()

-                                

                                 override run() {

+                                        val engine = new GraphvizV8Engine()

+                                        val nullConsumer = new Consumer<GraphvizEngine>() {

+                                                override accept(GraphvizEngine t) {}

+                                        }

+                                        engine.init(nullConsumer,nullConsumer)

                                         //println("Visualisation thread started")

                                         while(true) {

                                                 val head = taskQueue.take