12 files changed, 59 insertions, 59 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/META-INF/MANIFEST.MF b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/META-INF/MANIFEST.MF
index bca8e840..25c8cbb9 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/META-INF/MANIFEST.MF
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/META-INF/MANIFEST.MF
@@ -7,27 +7,27 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: ca.mcgill.ecse.dslreasoner.standalone.test.ecore.queries,
-  ca.mcgill.ecse.dslreasoner.standalone.test.fam,
-  ca.mcgill.ecse.dslreasoner.standalone.test.fam.impl,
-  ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries,
-  ca.mcgill.ecse.dslreasoner.standalone.test.fam.util,
-  ca.mcgill.ecse.dslreasoner.standalone.test.filesystem,
-  ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.impl,
-  ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.queries,
-  ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.util,
-  ca.mcgill.ecse.dslreasoner.standalone.test.yakindu,
-  ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl,
-  ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries,
-  ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.util
+ ca.mcgill.ecse.dslreasoner.standalone.test.fam,
+ ca.mcgill.ecse.dslreasoner.standalone.test.fam.impl,
+ ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries,
+ ca.mcgill.ecse.dslreasoner.standalone.test.fam.util,
+ ca.mcgill.ecse.dslreasoner.standalone.test.filesystem,
+ ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.impl,
+ ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.queries,
+ ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.util,
+ ca.mcgill.ecse.dslreasoner.standalone.test.yakindu,
+ ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl,
+ ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries,
+ ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.util
 Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
-  org.eclipse.core.runtime;bundle-version="3.13.0",
-  org.eclipse.emf.ecore;bundle-version="2.13.0";visibility:=reexport,
-  org.eclipse.viatra.query.runtime;bundle-version="2.1.0",
-  org.eclipse.viatra.query.runtime.rete;bundle-version="2.1.0",
-  org.eclipse.viatra.query.runtime.localsearch;bundle-version="2.1.0",
-  org.eclipse.xtext.xbase.lib;bundle-version="2.12.0",
-  hu.bme.mit.inf.dslreasoner.application;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0"
+ org.eclipse.core.runtime;bundle-version="3.13.0",
+ org.eclipse.emf.ecore;bundle-version="2.13.0";visibility:=reexport,
+ org.eclipse.viatra.query.runtime;bundle-version="2.1.0",
+ org.eclipse.viatra.query.runtime.rete;bundle-version="2.1.0",
+ org.eclipse.viatra.query.runtime.localsearch;bundle-version="2.1.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.12.0",
+ hu.bme.mit.inf.dslreasoner.application;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0"
 Import-Package: org.apache.log4j
 Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.standalone.test
 Bundle-ActivationPolicy: lazy
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF
index 6ab952ff..10da7ca1 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF
@@ -7,45 +7,45 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: ca.mcgill.ecse.dslreasoner.vampire.queries,
-  ca.mcgill.ecse.dslreasoner.vampire.yakindumm,
-  ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl,
-  ca.mcgill.ecse.dslreasoner.vampire.yakindumm.util
+ ca.mcgill.ecse.dslreasoner.vampire.yakindumm,
+ ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl,
+ ca.mcgill.ecse.dslreasoner.vampire.yakindumm.util
 Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
-  org.eclipse.core.runtime,
-  org.eclipse.emf.ecore;visibility:=reexport,
-  org.eclipse.viatra.query.runtime.rete,
-  org.eclipse.viatra.query.runtime.localsearch,
-  com.google.guava,
-  org.eclipse.xtext.xbase.lib,
-  org.eclipse.xtend.lib,
-  org.eclipse.xtend.lib.macro,
-  ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
-  ca.mcgill.ecse.dslreasoner.vampire.reasoner;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",
-  org.eclipse.emf.ecore.xmi;bundle-version="2.13.0",
-  hu.bme.mit.inf.dlsreasoner.alloy.reasoner;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0",
-  ModelGenExampleFAM_plugin;bundle-version="1.0.0",
-  ModelGenExampleFAM_plugin.validation;bundle-version="0.0.1",
-  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.validation;bundle-version="0.0.1",
-  org.eclipse.viatra.query.runtime;bundle-version="2.1.0",
-  org.eclipse.collections;bundle-version="9.2.0",
-  hu.bme.mit.inf.dslreasoner.application.FAMTest;bundle-version="1.0.0",
-  ca.mcgill.ecse.dslreasoner.standalone.test;bundle-version="1.0.0",
-  org.apache.httpcomponents.httpcore;bundle-version="4.4.6",
-  org.apache.httpcomponents.httpclient;bundle-version="4.5.2",
-  org.apache.httpcomponents.httpclient.source;bundle-version="4.5.2",
-  org.apache.httpcomponents.httpclient.win;bundle-version="4.5.2",
-  org.apache.httpcomponents.httpcore.source;bundle-version="4.4.6",
-  hu.bme.mit.inf.dslreasoner.alloy.language;bundle-version="1.0.0",
-  hu.bme.mit.inf.dslreasoner.alloy.language.ui;bundle-version="1.0.0"
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.viatra.query.runtime.rete,
+ org.eclipse.viatra.query.runtime.localsearch,
+ com.google.guava,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtend.lib.macro,
+ ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
+ ca.mcgill.ecse.dslreasoner.vampire.reasoner;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.13.0",
+ hu.bme.mit.inf.dlsreasoner.alloy.reasoner;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0",
+ ModelGenExampleFAM_plugin;bundle-version="1.0.0",
+ ModelGenExampleFAM_plugin.validation;bundle-version="0.0.1",
+ hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.validation;bundle-version="0.0.1",
+ org.eclipse.viatra.query.runtime;bundle-version="2.1.0",
+ org.eclipse.collections;bundle-version="9.2.0",
+ hu.bme.mit.inf.dslreasoner.application.FAMTest;bundle-version="1.0.0",
+ ca.mcgill.ecse.dslreasoner.standalone.test;bundle-version="1.0.0",
+ org.apache.httpcomponents.httpcore;bundle-version="4.4.6",
+ org.apache.httpcomponents.httpclient;bundle-version="4.5.2",
+ org.apache.httpcomponents.httpclient.source;bundle-version="4.5.2",
+ org.apache.httpcomponents.httpclient.win;bundle-version="4.5.2",
+ org.apache.httpcomponents.httpcore.source;bundle-version="4.4.6",
+ hu.bme.mit.inf.dslreasoner.alloy.language;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.alloy.language.ui;bundle-version="1.0.0"
 Import-Package: org.apache.log4j
 Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.test
 Bundle-ActivationPolicy: lazy
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
index 7ccbe59f..cb9eee35 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
index b03f527f..22765580 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
index 6bc303df..4870ad10 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
index a34d7d3b..424255f4 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
index a8c5f173..aa2ddaf2 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
index 9a2c84d7..dbe4f400 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
index f39505b0..4da01ec2 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
index 51d32da7..9d323253 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java
index 0c1b3fe9..2af5d456 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java
@@ -42,7 +42,7 @@ import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 @SuppressWarnings("all")

 public class VampireTest {

   @Extension

-  private final static LogicProblemBuilder builder = new LogicProblemBuilder();

+  private static final LogicProblemBuilder builder = new LogicProblemBuilder();

   

   public static void main(final String[] args) {

     try {

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin
index 0278755b..d0f61cf1 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin