Refactored to the milestone version of Viatra 2.0

7 files changed, 12 insertions, 16 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext
index 2361d965..1f9495cf 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext
@@ -1,7 +1,7 @@
 grammar hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration with org.eclipse.xtext.common.Terminals

 

 import "http://www.eclipse.org/emf/2002/Ecore" as ecore

-import "http://www.eclipse.org/viatra/query/patternlanguage/PatternLanguage" as viatra

+import "http://www.eclipse.org/viatra/query/patternlanguage/emf/PatternLanguage" as viatra

 generate applicationConfiguration "http://www.bme.hu/mit/inf/dslreasoner/application/ApplicationConfiguration"

 

 ConfigurationScript:

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/GenerateApplicationConfiguration.mwe2 b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/GenerateApplicationConfiguration.mwe2
index 9265ce4a..13cc78a8 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/GenerateApplicationConfiguration.mwe2
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/GenerateApplicationConfiguration.mwe2
@@ -30,7 +30,7 @@ Workflow {
                 language = StandardLanguage {

                         name = "hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration"

                         referencedResource = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"

-                        referencedResource = "platform:/resource/org.eclipse.viatra.query.patternlanguage/model/generated/PatternLanguage.genmodel"

+                        referencedResource = "platform:/resource/org.eclipse.viatra.query.patternlanguage.emf/model/PatternLanguage.genmodel"

                         fileExtensions = "vsconfig"

                         serializer = {

                                 generateStub = false

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 5506d762..2cbfc20d 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
@@ -198,7 +198,7 @@ class GenerationTaskExecutor {
                                                         val vis1 = new PartialInterpretation2Gml

                                                         val gml = vis1.transform(representation)

                                                         outputWorkspaceForRun.writeText('''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1».gml''',gml)

-                                                        if(false && representation.newElements.size + representation.problem.elements.size < 150) {

+                                                        if(representation.newElements.size + representation.problem.elements.size < 150) {

                                                                 val vis2 = new GraphvizVisualisation

                                                                 val dot = vis2.visualiseConcretization(representation)

                                                                 dot.writeToFile(outputWorkspaceForRun,'''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1»''')

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/QueryLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/QueryLoader.xtend
index 73a8ad59..c25bfb07 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/QueryLoader.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/QueryLoader.xtend
@@ -13,10 +13,10 @@ import java.util.List
 import java.util.Set

 import org.eclipse.emf.ecore.EClass

 import org.eclipse.emf.ecore.EPackage

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

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

-import org.eclipse.viatra.query.patternlanguage.patternLanguage.Pattern

-import org.eclipse.viatra.query.patternlanguage.patternLanguage.PatternCompositionConstraint

+import org.eclipse.viatra.query.patternlanguage.emf.vql.Pattern

+import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternCompositionConstraint

+import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternModel

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

 import org.eclipse.xtext.EcoreUtil2

 

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 0da42e0f..e458267c 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
@@ -10,24 +10,21 @@ import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.resource.Resource

 import org.eclipse.emf.ecore.resource.ResourceSet

 import org.eclipse.emf.ecore.util.EcoreUtil

-import org.eclipse.viatra.query.patternlanguage.PatternLanguageStandaloneSetup

-import org.eclipse.viatra.query.patternlanguage.annotations.ExtensionBasedAnnotationValidatorLoader

-import org.eclipse.viatra.query.patternlanguage.annotations.IAnnotationValidatorLoader

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

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

 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.patternlanguage.emf.vql.PatternModel

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

 import org.eclipse.xtext.resource.XtextResourceSet

 

 class MyModule extends EMFPatternLanguageRuntimeModule implements Module {

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

-        return typeof(ExtensionBasedAnnotationValidatorLoader);

-    }

+//    override public Class<? extends IAnnotationValidatorLoader> bindAnnotationValidatorLoader() {

+//        return typeof(ExtensionBasedAnnotationValidatorLoader);

+//    }

     def public Class<? extends IGenmodelMappingLoader> bindGenmodelMappingLoader() {

         return typeof(GenmodelExtensionLoader);

     }

@@ -42,7 +39,6 @@ class VQLParser {
         val SpecificationBuilder builder = new SpecificationBuilder

         

         new() {

-                PatternLanguageStandaloneSetup.doSetup

                 EMFPatternLanguageStandaloneSetup.doSetup;

                 

                 injector = internalCreateInjector

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend
index 8973e7cf..36948c2d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EClass
 import org.eclipse.emf.ecore.EEnum

 import org.eclipse.emf.ecore.EObject

 import org.eclipse.emf.ecore.EReference

-import org.eclipse.viatra.query.patternlanguage.patternLanguage.PatternModel

+import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternModel

 import org.eclipse.xtext.EcoreUtil2

 import org.eclipse.xtext.naming.QualifiedName

 import org.eclipse.xtext.scoping.IScope

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.xtend
index 0efd522b..e5488e50 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.xtend
@@ -6,7 +6,7 @@ import java.util.LinkedList
 import java.util.List

 import java.util.Set

 import org.eclipse.emf.ecore.ENamedElement

-import org.eclipse.viatra.query.patternlanguage.patternLanguage.Pattern

+import org.eclipse.viatra.query.patternlanguage.emf.vql.Pattern

 

 class QueryAndMetamodelValidator {