Merge branch 'Vampire-New' into Vampire-New

Conflicts:
	Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
	Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
	Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java
	Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore
	Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/ContentInNotLive.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/DirectSupertype.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/LoopInInheritence.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/NonSymmetricOpposite.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Opposite.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/OppositeDifferentClass.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF
	Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
	Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
	Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeScopeMapping.xtend
	Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
	Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Entry.java
	Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Synchronization.java
	Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/EntryImpl.java
	Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/SynchronizationImpl.java

1 files changed, 69 insertions, 0 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/filesystemFactory.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/filesystemFactory.java
new file mode 100644
index 00000000..401becfb
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/filesystemFactory.java
@@ -0,0 +1,69 @@
+/**

+ */

+package ca.mcgill.ecse.dslreasoner.standalone.test.filesystem;

+

+import org.eclipse.emf.ecore.EFactory;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Factory</b> for the model.

+ * It provides a create method for each non-abstract class of the model.

+ * <!-- end-user-doc -->

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage

+ * @generated

+ */

+public interface filesystemFactory extends EFactory {

+        /**

+         * The singleton instance of the factory.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        filesystemFactory eINSTANCE = ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.impl.filesystemFactoryImpl.init();

+

+        /**

+         * Returns a new object of class '<em>File System</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>File System</em>'.

+         * @generated

+         */

+        FileSystem createFileSystem();

+

+        /**

+         * Returns a new object of class '<em>Dir</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>Dir</em>'.

+         * @generated

+         */

+        Dir createDir();

+

+        /**

+         * Returns a new object of class '<em>File</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>File</em>'.

+         * @generated

+         */

+        File createFile();

+

+        /**

+         * Returns a new object of class '<em>Model</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>Model</em>'.

+         * @generated

+         */

+        Model createModel();

+

+        /**

+         * Returns the package supported by this factory.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return the package supported by this factory.

+         * @generated

+         */

+        filesystemPackage getfilesystemPackage();

+

+} //filesystemFactory