1 files changed, 4 insertions, 8 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/util/ParseUtil.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/util/ParseUtil.xtend
index d315ac3f..6febe0a6 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/util/ParseUtil.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/util/ParseUtil.xtend
@@ -12,21 +12,18 @@ import java.util.LinkedHashMap
 import org.eclipse.emf.common.util.URI

 import org.eclipse.emf.ecore.resource.Resource

 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.specification.SpecificationBuilder

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

 import org.eclipse.xtext.resource.XtextResourceSet

 

 class MyModule extends EMFPatternLanguageRuntimeModule implements Module{

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

-        return typeof(ExtensionBasedAnnotationValidatorLoader);

-    }

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

+//        return typeof(ExtensionBasedAnnotationValidatorLoader);

+//    }

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

         return typeof(GenmodelExtensionLoader);

     }

@@ -35,7 +32,6 @@ class MyModule extends EMFPatternLanguageRuntimeModule implements Module{
 class ParseUtil {

         val Injector injector;

         new() {

-                PatternLanguageStandaloneSetup.doSetup

                 EMFPatternLanguageStandaloneSetup.doSetup;

                 PartialinterpretationPackage.eINSTANCE.class;

                 LogicproblemPackage.eINSTANCE.class;