diff options
author | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-07-05 14:51:12 +0200 |
---|---|---|
committer | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-07-05 14:51:12 +0200 |
commit | 35d887b2b0a2fcaf480019f070bd6c58b325d23f (patch) | |
tree | 1ed8a0dbd26959b243e7afd997fa800d958b4f9d /Application | |
parent | Fixing multiple true/false + bug preventing generation without PS (diff) | |
download | VIATRA-Generator-35d887b2b0a2fcaf480019f070bd6c58b325d23f.tar.gz VIATRA-Generator-35d887b2b0a2fcaf480019f070bd6c58b325d23f.tar.zst VIATRA-Generator-35d887b2b0a2fcaf480019f070bd6c58b325d23f.zip |
Added support for running application in plain java.
(However, I might added several unnecessary dependencies to the
visualisation package.)
Diffstat (limited to 'Application')
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 { | |||
40 | } | 40 | } |
41 | } | 41 | } |
42 | return null; | 42 | return null; |
43 | } | 43 | } |
44 | 44 | ||
45 | } | 45 | } |
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, | |||
31 | org.eclipse.core.runtime;bundle-version="3.12.0", | 31 | org.eclipse.core.runtime;bundle-version="3.12.0", |
32 | org.eclipse.ui.console;bundle-version="3.6.201", | 32 | org.eclipse.ui.console;bundle-version="3.6.201", |
33 | org.eclipse.jface;bundle-version="3.12.2", | 33 | org.eclipse.jface;bundle-version="3.12.2", |
34 | org.eclipse.ui;bundle-version="3.108.1" | 34 | org.eclipse.ui;bundle-version="3.108.1", |
35 | org.eclipse.viatra.query.runtime.rete;bundle-version="2.0.0", | ||
36 | org.eclipse.viatra.query.runtime.localsearch;bundle-version="2.0.0" | ||
35 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | 37 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
36 | Export-Package: hu.bme.mit.inf.dslreasoner.application, | 38 | Export-Package: hu.bme.mit.inf.dslreasoner.application, |
37 | hu.bme.mit.inf.dslreasoner.application.applicationConfiguration, | 39 | 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 @@ | |||
3 | */ | 3 | */ |
4 | package hu.bme.mit.inf.dslreasoner.application | 4 | package hu.bme.mit.inf.dslreasoner.application |
5 | 5 | ||
6 | import com.google.inject.Guice | ||
7 | import com.google.inject.Injector | ||
6 | 8 | ||
7 | /** | 9 | /** |
8 | * Initialization support for running Xtext languages without Equinox extension registry. | 10 | * Initialization support for running Xtext languages without Equinox extension registry. |
9 | */ | 11 | */ |
10 | class ApplicationConfigurationStandaloneSetup extends ApplicationConfigurationStandaloneSetupGenerated { | 12 | class ApplicationConfigurationStandaloneSetup extends ApplicationConfigurationStandaloneSetupGenerated { |
11 | 13 | ||
14 | override Injector createInjector() { | ||
15 | return Guice.createInjector(new ApplicationConfigurationStandaloneRuntimeModule()); | ||
16 | } | ||
12 | def static void doSetup() { | 17 | def static void doSetup() { |
13 | new ApplicationConfigurationStandaloneSetup().createInjectorAndDoEMFRegistration() | 18 | new ApplicationConfigurationStandaloneSetup().createInjectorAndDoEMFRegistration() |
14 | } | 19 | } |
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 | |||
25 | import java.util.Scanner | 25 | import java.util.Scanner |
26 | import org.eclipse.core.runtime.IProgressMonitor | 26 | import org.eclipse.core.runtime.IProgressMonitor |
27 | import org.eclipse.emf.common.util.URI | 27 | import org.eclipse.emf.common.util.URI |
28 | import hu.bme.mit.inf.dslreasoner.workspace.URIBasedWorkspace | ||
28 | 29 | ||
29 | class GenerationTaskExecutor { | 30 | class GenerationTaskExecutor { |
30 | val metamodelLoader = new MetamodelLoader | 31 | val metamodelLoader = new MetamodelLoader |
@@ -69,13 +70,13 @@ class GenerationTaskExecutor { | |||
69 | 70 | ||
70 | try { | 71 | try { |
71 | val reasonerWorkspace = if(debugFolder!== null) { | 72 | val reasonerWorkspace = if(debugFolder!== null) { |
72 | new ProjectWorkspace(debugFolder.path,"") | 73 | new URIBasedWorkspace(debugFolder.path,"") |
73 | } else { | 74 | } else { |
74 | new NullWorkspace | 75 | new NullWorkspace |
75 | } | 76 | } |
76 | reasonerWorkspace.init | 77 | reasonerWorkspace.init |
77 | val outputWorkspace = if(outputFolder !== null) { | 78 | val outputWorkspace = if(outputFolder !== null) { |
78 | new ProjectWorkspace(outputFolder.path,"") | 79 | new URIBasedWorkspace(outputFolder.path,"") |
79 | } else { | 80 | } else { |
80 | new NullWorkspace | 81 | new NullWorkspace |
81 | } | 82 | } |
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 { | |||
144 | 144 | ||
145 | private def MessageConsole prepareRuntimeConsole() { | 145 | private def MessageConsole prepareRuntimeConsole() { |
146 | val plugin = ConsolePlugin.getDefault(); | 146 | val plugin = ConsolePlugin.getDefault(); |
147 | val conMan = plugin.getConsoleManager(); | 147 | if(plugin === null) { |
148 | val existingConsoles = conMan.getConsoles(); | 148 | return null |
149 | val existingConsolesWithID = existingConsoles.filter[it.name.equals(consoleID)] | ||
150 | if(existingConsolesWithID.empty) { | ||
151 | val MessageConsole res = new MessageConsole(consoleID,null) | ||
152 | conMan.addConsoles(#[res]); | ||
153 | return res | ||
154 | } else { | 149 | } else { |
155 | return existingConsolesWithID.head as MessageConsole | 150 | val conMan = plugin.getConsoleManager(); |
151 | val existingConsoles = conMan.getConsoles(); | ||
152 | val existingConsolesWithID = existingConsoles.filter[it.name.equals(consoleID)] | ||
153 | if(existingConsolesWithID.empty) { | ||
154 | val MessageConsole res = new MessageConsole(consoleID,null) | ||
155 | conMan.addConsoles(#[res]); | ||
156 | return res | ||
157 | } else { | ||
158 | return existingConsolesWithID.head as MessageConsole | ||
159 | } | ||
156 | } | 160 | } |
157 | } | 161 | } |
158 | 162 | ||
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 | |||
32 | 32 | ||
33 | class ScriptExecutor { | 33 | class ScriptExecutor { |
34 | val parser = new ApplicationConfigurationParser | 34 | val parser = new ApplicationConfigurationParser |
35 | def static void main(String[] args) { | ||
36 | println("generator") | ||
37 | } | ||
38 | 35 | ||
39 | /** | 36 | /** |
40 | * Executes a script | 37 | * Executes a script |