diff options
author | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-05-08 17:03:07 +0200 |
---|---|---|
committer | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-05-08 17:03:07 +0200 |
commit | 4585a4d344da5498200548e7add61e5cccd44924 (patch) | |
tree | 3a030bea39db36db43d97b62124f6c2a7db111a7 /Application | |
parent | Updated and fixed dependencies: (diff) | |
download | VIATRA-Generator-4585a4d344da5498200548e7add61e5cccd44924.tar.gz VIATRA-Generator-4585a4d344da5498200548e7add61e5cccd44924.tar.zst VIATRA-Generator-4585a4d344da5498200548e7add61e5cccd44924.zip |
Refactored to the milestone version of Viatra 2.0
Diffstat (limited to 'Application')
9 files changed, 43 insertions, 16 deletions
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.xtend b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.xtend new file mode 100644 index 00000000..195aa77a --- /dev/null +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.xtend | |||
@@ -0,0 +1,11 @@ | |||
1 | /* | ||
2 | * generated by Xtext 2.12.0 | ||
3 | */ | ||
4 | package hu.bme.mit.inf.dslreasoner.application.ide | ||
5 | |||
6 | |||
7 | /** | ||
8 | * Use this class to register ide components. | ||
9 | */ | ||
10 | class ApplicationConfigurationIdeModule extends AbstractApplicationConfigurationIdeModule { | ||
11 | } | ||
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.xtend b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.xtend new file mode 100644 index 00000000..afaa5ee2 --- /dev/null +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.xtend | |||
@@ -0,0 +1,20 @@ | |||
1 | /* | ||
2 | * generated by Xtext 2.12.0 | ||
3 | */ | ||
4 | package hu.bme.mit.inf.dslreasoner.application.ide | ||
5 | |||
6 | import com.google.inject.Guice | ||
7 | import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationRuntimeModule | ||
8 | import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationStandaloneSetup | ||
9 | import org.eclipse.xtext.util.Modules2 | ||
10 | |||
11 | /** | ||
12 | * Initialization support for running Xtext languages as language servers. | ||
13 | */ | ||
14 | class ApplicationConfigurationIdeSetup extends ApplicationConfigurationStandaloneSetup { | ||
15 | |||
16 | override createInjector() { | ||
17 | Guice.createInjector(Modules2.mixin(new ApplicationConfigurationRuntimeModule, new ApplicationConfigurationIdeModule)) | ||
18 | } | ||
19 | |||
20 | } | ||
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 @@ | |||
1 | grammar hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration with org.eclipse.xtext.common.Terminals | 1 | grammar hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration with org.eclipse.xtext.common.Terminals |
2 | 2 | ||
3 | import "http://www.eclipse.org/emf/2002/Ecore" as ecore | 3 | import "http://www.eclipse.org/emf/2002/Ecore" as ecore |
4 | import "http://www.eclipse.org/viatra/query/patternlanguage/PatternLanguage" as viatra | 4 | import "http://www.eclipse.org/viatra/query/patternlanguage/emf/PatternLanguage" as viatra |
5 | generate applicationConfiguration "http://www.bme.hu/mit/inf/dslreasoner/application/ApplicationConfiguration" | 5 | generate applicationConfiguration "http://www.bme.hu/mit/inf/dslreasoner/application/ApplicationConfiguration" |
6 | 6 | ||
7 | ConfigurationScript: | 7 | 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 { | |||
30 | language = StandardLanguage { | 30 | language = StandardLanguage { |
31 | name = "hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration" | 31 | name = "hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration" |
32 | referencedResource = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel" | 32 | referencedResource = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel" |
33 | referencedResource = "platform:/resource/org.eclipse.viatra.query.patternlanguage/model/generated/PatternLanguage.genmodel" | 33 | referencedResource = "platform:/resource/org.eclipse.viatra.query.patternlanguage.emf/model/PatternLanguage.genmodel" |
34 | fileExtensions = "vsconfig" | 34 | fileExtensions = "vsconfig" |
35 | serializer = { | 35 | serializer = { |
36 | generateStub = false | 36 | 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 { | |||
198 | val vis1 = new PartialInterpretation2Gml | 198 | val vis1 = new PartialInterpretation2Gml |
199 | val gml = vis1.transform(representation) | 199 | val gml = vis1.transform(representation) |
200 | outputWorkspaceForRun.writeText('''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1».gml''',gml) | 200 | outputWorkspaceForRun.writeText('''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1».gml''',gml) |
201 | if(false && representation.newElements.size + representation.problem.elements.size < 150) { | 201 | if(representation.newElements.size + representation.problem.elements.size < 150) { |
202 | val vis2 = new GraphvizVisualisation | 202 | val vis2 = new GraphvizVisualisation |
203 | val dot = vis2.visualiseConcretization(representation) | 203 | val dot = vis2.visualiseConcretization(representation) |
204 | dot.writeToFile(outputWorkspaceForRun,'''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1»''') | 204 | 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 | |||
13 | import java.util.Set | 13 | import java.util.Set |
14 | import org.eclipse.emf.ecore.EClass | 14 | import org.eclipse.emf.ecore.EClass |
15 | import org.eclipse.emf.ecore.EPackage | 15 | import org.eclipse.emf.ecore.EPackage |
16 | import org.eclipse.viatra.query.patternlanguage.emf.eMFPatternLanguage.PatternModel | ||
17 | import org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder | 16 | import org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder |
18 | import org.eclipse.viatra.query.patternlanguage.patternLanguage.Pattern | 17 | import org.eclipse.viatra.query.patternlanguage.emf.vql.Pattern |
19 | import org.eclipse.viatra.query.patternlanguage.patternLanguage.PatternCompositionConstraint | 18 | import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternCompositionConstraint |
19 | import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternModel | ||
20 | import org.eclipse.viatra.query.runtime.api.IQuerySpecification | 20 | import org.eclipse.viatra.query.runtime.api.IQuerySpecification |
21 | import org.eclipse.xtext.EcoreUtil2 | 21 | import org.eclipse.xtext.EcoreUtil2 |
22 | 22 | ||
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 | |||
10 | import org.eclipse.emf.ecore.resource.Resource | 10 | import org.eclipse.emf.ecore.resource.Resource |
11 | import org.eclipse.emf.ecore.resource.ResourceSet | 11 | import org.eclipse.emf.ecore.resource.ResourceSet |
12 | import org.eclipse.emf.ecore.util.EcoreUtil | 12 | import org.eclipse.emf.ecore.util.EcoreUtil |
13 | import org.eclipse.viatra.query.patternlanguage.PatternLanguageStandaloneSetup | ||
14 | import org.eclipse.viatra.query.patternlanguage.annotations.ExtensionBasedAnnotationValidatorLoader | ||
15 | import org.eclipse.viatra.query.patternlanguage.annotations.IAnnotationValidatorLoader | ||
16 | import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageRuntimeModule | 13 | import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageRuntimeModule |
17 | import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetup | 14 | import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetup |
18 | import org.eclipse.viatra.query.patternlanguage.emf.GenmodelExtensionLoader | 15 | import org.eclipse.viatra.query.patternlanguage.emf.GenmodelExtensionLoader |
19 | import org.eclipse.viatra.query.patternlanguage.emf.IGenmodelMappingLoader | 16 | import org.eclipse.viatra.query.patternlanguage.emf.IGenmodelMappingLoader |
20 | import org.eclipse.viatra.query.patternlanguage.emf.eMFPatternLanguage.PatternModel | ||
21 | import org.eclipse.viatra.query.patternlanguage.emf.scoping.CompoundMetamodelProviderService | 17 | import org.eclipse.viatra.query.patternlanguage.emf.scoping.CompoundMetamodelProviderService |
22 | import org.eclipse.viatra.query.patternlanguage.emf.scoping.IMetamodelProvider | 18 | import org.eclipse.viatra.query.patternlanguage.emf.scoping.IMetamodelProvider |
23 | import org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder | 19 | import org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder |
20 | import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternModel | ||
24 | import org.eclipse.viatra.query.runtime.api.IQuerySpecification | 21 | import org.eclipse.viatra.query.runtime.api.IQuerySpecification |
25 | import org.eclipse.xtext.resource.XtextResourceSet | 22 | import org.eclipse.xtext.resource.XtextResourceSet |
26 | 23 | ||
27 | class MyModule extends EMFPatternLanguageRuntimeModule implements Module { | 24 | class MyModule extends EMFPatternLanguageRuntimeModule implements Module { |
28 | def public Class<? extends IAnnotationValidatorLoader> bindAnnotationValidatorLoader() { | 25 | // override public Class<? extends IAnnotationValidatorLoader> bindAnnotationValidatorLoader() { |
29 | return typeof(ExtensionBasedAnnotationValidatorLoader); | 26 | // return typeof(ExtensionBasedAnnotationValidatorLoader); |
30 | } | 27 | // } |
31 | def public Class<? extends IGenmodelMappingLoader> bindGenmodelMappingLoader() { | 28 | def public Class<? extends IGenmodelMappingLoader> bindGenmodelMappingLoader() { |
32 | return typeof(GenmodelExtensionLoader); | 29 | return typeof(GenmodelExtensionLoader); |
33 | } | 30 | } |
@@ -42,7 +39,6 @@ class VQLParser { | |||
42 | val SpecificationBuilder builder = new SpecificationBuilder | 39 | val SpecificationBuilder builder = new SpecificationBuilder |
43 | 40 | ||
44 | new() { | 41 | new() { |
45 | PatternLanguageStandaloneSetup.doSetup | ||
46 | EMFPatternLanguageStandaloneSetup.doSetup; | 42 | EMFPatternLanguageStandaloneSetup.doSetup; |
47 | 43 | ||
48 | injector = internalCreateInjector | 44 | 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 | |||
19 | import org.eclipse.emf.ecore.EEnum | 19 | import org.eclipse.emf.ecore.EEnum |
20 | import org.eclipse.emf.ecore.EObject | 20 | import org.eclipse.emf.ecore.EObject |
21 | import org.eclipse.emf.ecore.EReference | 21 | import org.eclipse.emf.ecore.EReference |
22 | import org.eclipse.viatra.query.patternlanguage.patternLanguage.PatternModel | 22 | import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternModel |
23 | import org.eclipse.xtext.EcoreUtil2 | 23 | import org.eclipse.xtext.EcoreUtil2 |
24 | import org.eclipse.xtext.naming.QualifiedName | 24 | import org.eclipse.xtext.naming.QualifiedName |
25 | import org.eclipse.xtext.scoping.IScope | 25 | 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 | |||
6 | import java.util.List | 6 | import java.util.List |
7 | import java.util.Set | 7 | import java.util.Set |
8 | import org.eclipse.emf.ecore.ENamedElement | 8 | import org.eclipse.emf.ecore.ENamedElement |
9 | import org.eclipse.viatra.query.patternlanguage.patternLanguage.Pattern | 9 | import org.eclipse.viatra.query.patternlanguage.emf.vql.Pattern |
10 | 10 | ||
11 | class QueryAndMetamodelValidator { | 11 | class QueryAndMetamodelValidator { |
12 | 12 | ||