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, 152 insertions, 0 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/RegionImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/RegionImpl.java
new file mode 100644
index 00000000..fa529ad6
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/RegionImpl.java
@@ -0,0 +1,152 @@
+/**

+ */

+package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl;

+

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex;

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

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

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

+

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+/**

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

+ * An implementation of the model object '<em><b>Region</b></em>'.

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

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ *   <li>{@link ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.RegionImpl#getVertices <em>Vertices</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class RegionImpl extends MinimalEObjectImpl.Container implements Region {

+        /**

+         * The cached value of the '{@link #getVertices() <em>Vertices</em>}' containment reference list.

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

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

+         * @see #getVertices()

+         * @generated

+         * @ordered

+         */

+        protected EList<Vertex> vertices;

+

+        /**

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

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

+         * @generated

+         */

+        protected RegionImpl() {

+                super();

+        }

+

+        /**

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

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

+         * @generated

+         */

+        @Override

+        protected EClass eStaticClass() {

+                return YakinduPackage.Literals.REGION;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public EList<Vertex> getVertices() {

+                if (vertices == null) {

+                        vertices = new EObjectContainmentEList<Vertex>(Vertex.class, this, YakinduPackage.REGION__VERTICES);

+                }

+                return vertices;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        @Override

+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+                switch (featureID) {

+                        case YakinduPackage.REGION__VERTICES:

+                                return ((InternalEList<?>)getVertices()).basicRemove(otherEnd, msgs);

+                }

+                return super.eInverseRemove(otherEnd, featureID, msgs);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        @Override

+        public Object eGet(int featureID, boolean resolve, boolean coreType) {

+                switch (featureID) {

+                        case YakinduPackage.REGION__VERTICES:

+                                return getVertices();

+                }

+                return super.eGet(featureID, resolve, coreType);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        @SuppressWarnings("unchecked")

+        @Override

+        public void eSet(int featureID, Object newValue) {

+                switch (featureID) {

+                        case YakinduPackage.REGION__VERTICES:

+                                getVertices().clear();

+                                getVertices().addAll((Collection<? extends Vertex>)newValue);

+                                return;

+                }

+                super.eSet(featureID, newValue);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        @Override

+        public void eUnset(int featureID) {

+                switch (featureID) {

+                        case YakinduPackage.REGION__VERTICES:

+                                getVertices().clear();

+                                return;

+                }

+                super.eUnset(featureID);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        @Override

+        public boolean eIsSet(int featureID) {

+                switch (featureID) {

+                        case YakinduPackage.REGION__VERTICES:

+                                return vertices != null && !vertices.isEmpty();

+                }

+                return super.eIsSet(featureID);

+        }

+

+} //RegionImpl