Fix VQL validator breakage after Execute Application Configuration

3 files changed, 14 insertions, 4 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/META-INF/MANIFEST.MF b/Application/hu.bme.mit.inf.dslreasoner.application.ui/META-INF/MANIFEST.MF
index 38bb7dbd..2f2c83ef 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/META-INF/MANIFEST.MF
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@ Require-Bundle: hu.bme.mit.inf.dslreasoner.application,
  org.eclipse.xtext.builder,
  org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
- org.eclipse.viatra.addon.validation.runtime.ui;bundle-version="1.7.0"
+ org.eclipse.viatra.addon.validation.runtime.ui;bundle-version="1.7.0",
+ org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="2.4.1"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: hu.bme.mit.inf.dslreasoner.application.ui.quickfix,
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml b/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml
index 304df098..2895983e 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml
@@ -410,7 +410,7 @@
  <extension

        point="org.eclipse.ui.commands">

     <command

-          defaultHandler="hu.bme.mit.inf.dslreasoner.application.ui.execute.ExecuteScriptHandler"

+          defaultHandler="org.eclipse.viatra.query.patternlanguage.emf.ui.ReusablePatternLanguageExecutableExtensionFactory:hu.bme.mit.inf.dslreasoner.application.ui.execute.ExecuteScriptHandler"

           id="hu.bme.mit.inf.dslreasoner.application.ui.executescript"

           name="ExecuteScript">

     </command>

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 380410d0..8d9d07a6 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
@@ -12,14 +12,23 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.ui.handlers.HandlerUtil;

 

+import com.google.inject.Inject;

+import com.google.inject.Injector;

+

 import hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor;

 

 public class ExecuteScriptHandler extends AbstractHandler implements IHandler {

-

-        ScriptExecutor scriptExecutor = new ScriptExecutor(RuntimeConsoleBasedScriptConsole.FACTORY);

+        

+        ScriptExecutor scriptExecutor;

+        

+        @Inject

+        public void setInjector(Injector injector) {

+                scriptExecutor = new ScriptExecutor(RuntimeConsoleBasedScriptConsole.FACTORY, injector);

+        }

         

         @Override

         public Object execute(ExecutionEvent event) throws ExecutionException {

+                assert scriptExecutor != null : "Injector must be set";

                 ISelection selection = HandlerUtil.getCurrentSelection(event);

                 if(selection instanceof StructuredSelection) {

                         StructuredSelection structuredSelection = (StructuredSelection) selection;