Execution update

2 files changed, 21 insertions, 4 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/ApplicationConfigurationParser.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/ApplicationConfigurationParser.xtend
new file mode 100644
index 00000000..ea738c5a
--- /dev/null
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/ApplicationConfigurationParser.xtend
@@ -0,0 +1,18 @@
+package hu.bme.mit.inf.dslreasoner.application.execution.util

+

+import org.eclipse.emf.common.util.URI

+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl

+import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript

+

+class ApplicationConfigurationParser {

+        public def parse(URI uri) {

+                val rs = new ResourceSetImpl

+                val res = rs.getResource(uri,true)

+                val content = res.contents.head

+                if(content instanceof ConfigurationScript) {

+                        return content

+                } else {

+                        throw new IllegalArgumentException('''Content is not an ConfigurationScript! (got: «content.class.simpleName»)''')

+                }

+        }

+}
\ No newline at end of file
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/VQLParser.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/VQLParser.xtend
index f85e3dcf..0da42e0f 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/VQLParser.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/VQLParser.xtend
@@ -3,6 +3,7 @@ package hu.bme.mit.inf.dslreasoner.application.execution.util
 import com.google.inject.Guice

 import com.google.inject.Injector

 import com.google.inject.Module

+import hu.bme.mit.inf.dslreasoner.application.execution.ScriptConsole

 import java.util.LinkedHashMap

 import java.util.List

 import org.eclipse.emf.common.util.URI

@@ -17,13 +18,11 @@ import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandalone
 import org.eclipse.viatra.query.patternlanguage.emf.GenmodelExtensionLoader

 import org.eclipse.viatra.query.patternlanguage.emf.IGenmodelMappingLoader

 import org.eclipse.viatra.query.patternlanguage.emf.eMFPatternLanguage.PatternModel

+import org.eclipse.viatra.query.patternlanguage.emf.scoping.CompoundMetamodelProviderService

+import org.eclipse.viatra.query.patternlanguage.emf.scoping.IMetamodelProvider

 import org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder

 import org.eclipse.viatra.query.runtime.api.IQuerySpecification

 import org.eclipse.xtext.resource.XtextResourceSet

-import hu.bme.mit.inf.dslreasoner.application.execution.ScriptConsole

-import org.eclipse.viatra.query.patternlanguage.emf.scoping.IMetamodelProvider

-import hu.bme.mit.inf.dslreasoner.application.linking.PreloadedMetamodelProvider

-import org.eclipse.viatra.query.patternlanguage.emf.scoping.CompoundMetamodelProviderService

 

 class MyModule extends EMFPatternLanguageRuntimeModule implements Module {

     def public Class<? extends IAnnotationValidatorLoader> bindAnnotationValidatorLoader() {