From 52241f46c3793b94ff0b7e8ada361881e1474b97 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Wed, 2 Dec 2020 19:23:15 +0100 Subject: Fix VQL validator breakage after Execute Application Configuration --- .../.ApplicationConfigurationIdeModule.xtendbin | Bin 1700 -> 1700 bytes .../ide/.ApplicationConfigurationIdeSetup.xtendbin | Bin 2525 -> 2525 bytes .../META-INF/MANIFEST.MF | 3 ++- .../plugin.xml | 2 +- .../ui/execute/ExecuteScriptHandler.java | 13 +++++++++++-- .../execution/GenerationTaskExecutor.xtend | 6 +++++- .../execution/PatternLanguageWithRSSetup.xtend | 6 +----- .../application/execution/ScriptExecutor.xtend | 14 ++++++++++++-- .../start-standalone.launch | 21 ++++++++++++--------- .../.SolverSemanticHighlightCalculator.xtendbin | Bin 5333 -> 5333 bytes .../.SolverSemanticTextAttributeProvider.xtendbin | Bin 4902 -> 4902 bytes .../validation/.SolverLanguageValidator.xtendbin | Bin 1716 -> 1716 bytes ....SolverLanguageTokenDefInjectingParser.xtendbin | Bin 2741 -> 2741 bytes ...nguageSyntheticTokenSyntacticSequencer.xtendbin | Bin 2757 -> 2757 bytes 14 files changed, 44 insertions(+), 21 deletions(-) (limited to 'Application') diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin index b0ce2497..1c86e38f 100644 Binary files a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin and b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin differ diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin index b69f4fca..57c8ab25 100644 Binary files a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin and b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin differ 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 @@ 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; 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 c3ba9f81..d718bb91 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 @@ -1,5 +1,6 @@ package hu.bme.mit.inf.dslreasoner.application.execution +import com.google.inject.Injector import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.GenerationTask import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic @@ -24,7 +25,9 @@ import java.util.LinkedList import java.util.Optional import org.eclipse.core.runtime.IProgressMonitor import org.eclipse.emf.common.util.URI +import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor +@FinalFieldsConstructor class GenerationTaskExecutor { val metamodelLoader = new MetamodelLoader val modelLoader = new ModelLoader @@ -32,6 +35,7 @@ class GenerationTaskExecutor { val solverLoader = new SolverLoader val scopeLoader = new ScopeLoader val statisticsUtil = new StatisticSections2CSV + val Injector injector def executeGenerationTask( GenerationTask task, @@ -102,7 +106,7 @@ class GenerationTaskExecutor { var domain2LogicTransformationTime = System.nanoTime val Ecore2Logic ecore2Logic = new Ecore2Logic val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic) - val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic) + val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic, injector) val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic var modelGeneration = ecore2Logic.transformMetamodel(metamodelDescriptor,new Ecore2LogicConfiguration()) diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend index c209cde5..371f6f8c 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend @@ -1,11 +1,7 @@ package hu.bme.mit.inf.dslreasoner.application.execution -import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetupGenerated -import com.google.inject.Injector import com.google.inject.Guice -import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageRuntimeModule -import com.google.inject.Guice; -import com.google.inject.Injector; +import com.google.inject.Injector import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetup class PatternLanguageWithRSSetup extends EMFPatternLanguageStandaloneSetup{ 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 3dea677f..9d0985d2 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 @@ -1,5 +1,7 @@ package hu.bme.mit.inf.dslreasoner.application.execution +import com.google.inject.Inject +import com.google.inject.Injector import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigReference import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigSpecification import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript @@ -33,11 +35,19 @@ import org.eclipse.core.runtime.jobs.Job import org.eclipse.emf.common.util.URI import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor -@FinalFieldsConstructor class ScriptExecutor { val parser = new ApplicationConfigurationParser val ScriptConsole.Factory scriptConsoleFactory + val Injector injector + + @FinalFieldsConstructor + new() { + } + + new(ScriptConsole.Factory scriptConsoleFactory) { + this(scriptConsoleFactory, null) + } /** * Executes a script @@ -101,7 +111,7 @@ class ScriptExecutor { } def dispatch void execute(GenerationTask task, IProgressMonitor monitor) { - val generationTaskExecutor = new GenerationTaskExecutor + val generationTaskExecutor = new GenerationTaskExecutor(injector) generationTaskExecutor.executeGenerationTask(task,this,scriptConsoleFactory,monitor) } diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/start-standalone.launch b/Application/hu.bme.mit.inf.dslreasoner.application/start-standalone.launch index 1f3744a7..437bc6e2 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/start-standalone.launch +++ b/Application/hu.bme.mit.inf.dslreasoner.application/start-standalone.launch @@ -1,12 +1,15 @@ - - - - - - - - - + + + + + + + + + + + + diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin index 0ccad2d7..a107bf27 100644 Binary files a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin and b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin differ diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin index 55a1bdd4..994dbd52 100644 Binary files a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin and b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin differ diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin index 1d870094..9839769e 100644 Binary files a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin and b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin differ diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin index 1147f2ef..d2fd056e 100644 Binary files a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin and b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin differ diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin index 8bb907a2..30cf1dbd 100644 Binary files a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin and b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin differ -- cgit v1.2.3-54-g00ecf