Added support for running application in plain java.

(However, I might added several unnecessary dependencies to the
visualisation package.)

6 files changed, 24 insertions, 15 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