From 35d887b2b0a2fcaf480019f070bd6c58b325d23f Mon Sep 17 00:00:00 2001
From: OszkarSemerath <oszkar.semerath@gmail.com>
Date: Thu, 5 Jul 2018 14:51:12 +0200
Subject: Added support for running application in plain java.

(However, I might added several unnecessary dependencies to the
visualisation package.)
---
 .../execution/GenerationTaskExecutor.xtend           |  5 +++--
 .../application/execution/ScriptConsole.xtend        | 20 ++++++++++++--------
 .../application/execution/ScriptExecutor.xtend       |  3 ---
 3 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution')

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
-- 
cgit v1.2.3-70-g09d2