Trying to run generator in measurement environment

21 files changed, 159 insertions, 69 deletions

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionType.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionType.java
index 59fe3fb2..9f2316a0 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionType.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionType.java
@@ -205,6 +205,7 @@ public enum FunctionType implements Enumerator {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public int getValue() {

           return value;

         }

@@ -214,6 +215,7 @@ public enum FunctionType implements Enumerator {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public String getName() {

           return name;

         }

@@ -223,6 +225,7 @@ public enum FunctionType implements Enumerator {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public String getLiteral() {

           return literal;

         }

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalData.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalData.java
index 39639f99..59fa0fd4 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalData.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalData.java
@@ -60,13 +60,13 @@ public interface FunctionalData extends EObject {
          * </p>

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

          * @return the value of the '<em>Interface</em>' container reference.

-         * @see #setInterface(FunctionalInterface)

+         * @see #setInterface(functionalarchitecture.FunctionalInterface)

          * @see functionalarchitecture.FunctionalarchitecturePackage#getFunctionalData_Interface()

          * @see functionalarchitecture.FunctionalInterface#getData

          * @model opposite="data" transient="false"

          * @generated

          */

-        FunctionalInterface getInterface();

+        functionalarchitecture.FunctionalInterface getInterface();

 

         /**

          * Sets the value of the '{@link functionalarchitecture.FunctionalData#getInterface <em>Interface</em>}' container reference.

@@ -76,6 +76,6 @@ public interface FunctionalData extends EObject {
          * @see #getInterface()

          * @generated

          */

-        void setInterface(FunctionalInterface value);

+        void setInterface(functionalarchitecture.FunctionalInterface value);

 

 } // FunctionalData

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalElement.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalElement.java
index f5a2ff19..5d1d3254 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalElement.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalElement.java
@@ -33,13 +33,13 @@ public interface FunctionalElement extends EObject {
          * </p>

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

          * @return the value of the '<em>Interface</em>' containment reference.

-         * @see #setInterface(FunctionalInterface)

+         * @see #setInterface(functionalarchitecture.FunctionalInterface)

          * @see functionalarchitecture.FunctionalarchitecturePackage#getFunctionalElement_Interface()

          * @see functionalarchitecture.FunctionalInterface#getElement

          * @model opposite="element" containment="true"

          * @generated

          */

-        FunctionalInterface getInterface();

+        functionalarchitecture.FunctionalInterface getInterface();

 

         /**

          * Sets the value of the '{@link functionalarchitecture.FunctionalElement#getInterface <em>Interface</em>}' containment reference.

@@ -49,7 +49,7 @@ public interface FunctionalElement extends EObject {
          * @see #getInterface()

          * @generated

          */

-        void setInterface(FunctionalInterface value);

+        void setInterface(functionalarchitecture.FunctionalInterface value);

 

         /**

          * Returns the value of the '<em><b>Model</b></em>' reference.

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FAMTerminatorImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FAMTerminatorImpl.java
index 382e0170..94cd240a 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FAMTerminatorImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FAMTerminatorImpl.java
@@ -55,6 +55,7 @@ public class FAMTerminatorImpl extends MinimalEObjectImpl.Container implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalData getData() {

                 if (eContainerFeatureID() != FunctionalarchitecturePackage.FAM_TERMINATOR__DATA) return null;

                 return (FunctionalData)eInternalContainer();

@@ -75,6 +76,7 @@ public class FAMTerminatorImpl extends MinimalEObjectImpl.Container implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setData(FunctionalData newData) {

                 if (newData != eInternalContainer() || (eContainerFeatureID() != FunctionalarchitecturePackage.FAM_TERMINATOR__DATA && newData != null)) {

                         if (EcoreUtil.isAncestor(this, newData))

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionImpl.java
index 46736c8c..6e89bc65 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionImpl.java
@@ -79,6 +79,7 @@ public class FunctionImpl extends FunctionalElementImpl implements Function {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<FunctionalElement> getSubElements() {

                 if (subElements == null) {

                         subElements = new EObjectContainmentWithInverseEList<FunctionalElement>(FunctionalElement.class, this, FunctionalarchitecturePackage.FUNCTION__SUB_ELEMENTS, FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__PARENT);

@@ -91,6 +92,7 @@ public class FunctionImpl extends FunctionalElementImpl implements Function {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionType getType() {

                 return (FunctionType)TYPE__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);

         }

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalArchitectureModelImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalArchitectureModelImpl.java
index 78f6d6f2..a7d6c919 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalArchitectureModelImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalArchitectureModelImpl.java
@@ -68,6 +68,7 @@ public class FunctionalArchitectureModelImpl extends MinimalEObjectImpl.Containe
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<FunctionalElement> getRootElements() {

                 if (rootElements == null) {

                         rootElements = new EObjectContainmentEList<FunctionalElement>(FunctionalElement.class, this, FunctionalarchitecturePackage.FUNCTIONAL_ARCHITECTURE_MODEL__ROOT_ELEMENTS);

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalDataImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalDataImpl.java
index 10937e8d..ec8f2cef 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalDataImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalDataImpl.java
@@ -4,7 +4,6 @@ package functionalarchitecture.impl;
 

 import functionalarchitecture.FAMTerminator;

 import functionalarchitecture.FunctionalData;

-import functionalarchitecture.FunctionalInterface;

 import functionalarchitecture.FunctionalarchitecturePackage;

 

 import org.eclipse.emf.common.notify.Notification;

@@ -67,6 +66,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FAMTerminator getTerminator() {

                 return terminator;

         }

@@ -91,6 +91,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setTerminator(FAMTerminator newTerminator) {

                 if (newTerminator != terminator) {

                         NotificationChain msgs = null;

@@ -110,9 +111,10 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
          * <!-- end-user-doc -->

          * @generated

          */

-        public FunctionalInterface getInterface() {

+        @Override

+        public functionalarchitecture.FunctionalInterface getInterface() {

                 if (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE) return null;

-                return (FunctionalInterface)eInternalContainer();

+                return (functionalarchitecture.FunctionalInterface)eInternalContainer();

         }

 

         /**

@@ -120,7 +122,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
          * <!-- end-user-doc -->

          * @generated

          */

-        public NotificationChain basicSetInterface(FunctionalInterface newInterface, NotificationChain msgs) {

+        public NotificationChain basicSetInterface(functionalarchitecture.FunctionalInterface newInterface, NotificationChain msgs) {

                 msgs = eBasicSetContainer((InternalEObject)newInterface, FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE, msgs);

                 return msgs;

         }

@@ -130,7 +132,8 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
          * <!-- end-user-doc -->

          * @generated

          */

-        public void setInterface(FunctionalInterface newInterface) {

+        @Override

+        public void setInterface(functionalarchitecture.FunctionalInterface newInterface) {

                 if (newInterface != eInternalContainer() || (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE && newInterface != null)) {

                         if (EcoreUtil.isAncestor(this, newInterface))

                                 throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

@@ -138,7 +141,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
                         if (eInternalContainer() != null)

                                 msgs = eBasicRemoveFromContainer(msgs);

                         if (newInterface != null)

-                                msgs = ((InternalEObject)newInterface).eInverseAdd(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, FunctionalInterface.class, msgs);

+                                msgs = ((InternalEObject)newInterface).eInverseAdd(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, functionalarchitecture.FunctionalInterface.class, msgs);

                         msgs = basicSetInterface(newInterface, msgs);

                         if (msgs != null) msgs.dispatch();

                 }

@@ -161,7 +164,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
                         case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE:

                                 if (eInternalContainer() != null)

                                         msgs = eBasicRemoveFromContainer(msgs);

-                                return basicSetInterface((FunctionalInterface)otherEnd, msgs);

+                                return basicSetInterface((functionalarchitecture.FunctionalInterface)otherEnd, msgs);

                 }

                 return super.eInverseAdd(otherEnd, featureID, msgs);

         }

@@ -191,7 +194,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
         public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

                 switch (eContainerFeatureID()) {

                         case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE:

-                                return eInternalContainer().eInverseRemove(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, FunctionalInterface.class, msgs);

+                                return eInternalContainer().eInverseRemove(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, functionalarchitecture.FunctionalInterface.class, msgs);

                 }

                 return super.eBasicRemoveFromContainerFeature(msgs);

         }

@@ -224,7 +227,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
                                 setTerminator((FAMTerminator)newValue);

                                 return;

                         case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE:

-                                setInterface((FunctionalInterface)newValue);

+                                setInterface((functionalarchitecture.FunctionalInterface)newValue);

                                 return;

                 }

                 super.eSet(featureID, newValue);

@@ -242,7 +245,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
                                 setTerminator((FAMTerminator)null);

                                 return;

                         case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE:

-                                setInterface((FunctionalInterface)null);

+                                setInterface((functionalarchitecture.FunctionalInterface)null);

                                 return;

                 }

                 super.eUnset(featureID);

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalElementImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalElementImpl.java
index 809e9ed5..c923caae 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalElementImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalElementImpl.java
@@ -5,7 +5,6 @@ package functionalarchitecture.impl;
 import functionalarchitecture.Function;

 import functionalarchitecture.FunctionalArchitectureModel;

 import functionalarchitecture.FunctionalElement;

-import functionalarchitecture.FunctionalInterface;

 import functionalarchitecture.FunctionalarchitecturePackage;

 

 import org.eclipse.emf.common.notify.Notification;

@@ -44,7 +43,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * @generated

          * @ordered

          */

-        protected FunctionalInterface interface_;

+        protected functionalarchitecture.FunctionalInterface interface_;

 

         /**

          * The cached setting delegate for the '{@link #getModel() <em>Model</em>}' reference.

@@ -80,7 +79,8 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

-        public FunctionalInterface getInterface() {

+        @Override

+        public functionalarchitecture.FunctionalInterface getInterface() {

                 return interface_;

         }

 

@@ -89,8 +89,8 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

-        public NotificationChain basicSetInterface(FunctionalInterface newInterface, NotificationChain msgs) {

-                FunctionalInterface oldInterface = interface_;

+        public NotificationChain basicSetInterface(functionalarchitecture.FunctionalInterface newInterface, NotificationChain msgs) {

+                functionalarchitecture.FunctionalInterface oldInterface = interface_;

                 interface_ = newInterface;

                 if (eNotificationRequired()) {

                         ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE, oldInterface, newInterface);

@@ -104,13 +104,14 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

-        public void setInterface(FunctionalInterface newInterface) {

+        @Override

+        public void setInterface(functionalarchitecture.FunctionalInterface newInterface) {

                 if (newInterface != interface_) {

                         NotificationChain msgs = null;

                         if (interface_ != null)

-                                msgs = ((InternalEObject)interface_).eInverseRemove(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT, FunctionalInterface.class, msgs);

+                                msgs = ((InternalEObject)interface_).eInverseRemove(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT, functionalarchitecture.FunctionalInterface.class, msgs);

                         if (newInterface != null)

-                                msgs = ((InternalEObject)newInterface).eInverseAdd(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT, FunctionalInterface.class, msgs);

+                                msgs = ((InternalEObject)newInterface).eInverseAdd(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT, functionalarchitecture.FunctionalInterface.class, msgs);

                         msgs = basicSetInterface(newInterface, msgs);

                         if (msgs != null) msgs.dispatch();

                 }

@@ -123,6 +124,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalArchitectureModel getModel() {

                 return (FunctionalArchitectureModel)MODEL__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);

         }

@@ -141,6 +143,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setModel(FunctionalArchitectureModel newModel) {

                 MODEL__ESETTING_DELEGATE.dynamicSet(this, null, 0, newModel);

         }

@@ -150,6 +153,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Function getParent() {

                 if (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__PARENT) return null;

                 return (Function)eInternalContainer();

@@ -170,6 +174,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setParent(Function newParent) {

                 if (newParent != eInternalContainer() || (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__PARENT && newParent != null)) {

                         if (EcoreUtil.isAncestor(this, newParent))

@@ -197,7 +202,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
                         case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE:

                                 if (interface_ != null)

                                         msgs = ((InternalEObject)interface_).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE, null, msgs);

-                                return basicSetInterface((FunctionalInterface)otherEnd, msgs);

+                                return basicSetInterface((functionalarchitecture.FunctionalInterface)otherEnd, msgs);

                         case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__PARENT:

                                 if (eInternalContainer() != null)

                                         msgs = eBasicRemoveFromContainer(msgs);

@@ -264,7 +269,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

                         case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE:

-                                setInterface((FunctionalInterface)newValue);

+                                setInterface((functionalarchitecture.FunctionalInterface)newValue);

                                 return;

                         case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__MODEL:

                                 setModel((FunctionalArchitectureModel)newValue);

@@ -285,7 +290,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
         public void eUnset(int featureID) {

                 switch (featureID) {

                         case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE:

-                                setInterface((FunctionalInterface)null);

+                                setInterface((functionalarchitecture.FunctionalInterface)null);

                                 return;

                         case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__MODEL:

                                 setModel((FunctionalArchitectureModel)null);

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInputImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInputImpl.java
index 9df1ec0c..33a136ed 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInputImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInputImpl.java
@@ -66,6 +66,7 @@ public class FunctionalInputImpl extends FunctionalDataImpl implements Functiona
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<InformationLink> getIncomingLinks() {

                 if (incomingLinks == null) {

                         incomingLinks = new EObjectWithInverseResolvingEList<InformationLink>(InformationLink.class, this, FunctionalarchitecturePackage.FUNCTIONAL_INPUT__INCOMING_LINKS, FunctionalarchitecturePackage.INFORMATION_LINK__TO);

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInterfaceImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInterfaceImpl.java
index 20151886..53aa2dac 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInterfaceImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInterfaceImpl.java
@@ -4,7 +4,6 @@ package functionalarchitecture.impl;
 

 import functionalarchitecture.FunctionalData;

 import functionalarchitecture.FunctionalElement;

-import functionalarchitecture.FunctionalInterface;

 import functionalarchitecture.FunctionalarchitecturePackage;

 

 import java.util.Collection;

@@ -38,7 +37,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *

  * @generated

  */

-public class FunctionalInterfaceImpl extends MinimalEObjectImpl.Container implements FunctionalInterface {

+public class FunctionalInterfaceImpl extends MinimalEObjectImpl.Container implements functionalarchitecture.FunctionalInterface {

         /**

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

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

@@ -73,6 +72,7 @@ public class FunctionalInterfaceImpl extends MinimalEObjectImpl.Container implem
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<FunctionalData> getData() {

                 if (data == null) {

                         data = new EObjectContainmentWithInverseEList<FunctionalData>(FunctionalData.class, this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE);

@@ -85,6 +85,7 @@ public class FunctionalInterfaceImpl extends MinimalEObjectImpl.Container implem
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalElement getElement() {

                 if (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT) return null;

                 return (FunctionalElement)eInternalContainer();

@@ -105,6 +106,7 @@ public class FunctionalInterfaceImpl extends MinimalEObjectImpl.Container implem
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setElement(FunctionalElement newElement) {

                 if (newElement != eInternalContainer() || (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT && newElement != null)) {

                         if (EcoreUtil.isAncestor(this, newElement))

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalOutputImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalOutputImpl.java
index 1ae2a964..061af113 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalOutputImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalOutputImpl.java
@@ -66,6 +66,7 @@ public class FunctionalOutputImpl extends FunctionalDataImpl implements Function
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<InformationLink> getOutgoingLinks() {

                 if (outgoingLinks == null) {

                         outgoingLinks = new EObjectContainmentWithInverseEList<InformationLink>(InformationLink.class, this, FunctionalarchitecturePackage.FUNCTIONAL_OUTPUT__OUTGOING_LINKS, FunctionalarchitecturePackage.INFORMATION_LINK__FROM);

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitectureFactoryImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitectureFactoryImpl.java
index 56ecfa25..9c9f495a 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitectureFactoryImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitectureFactoryImpl.java
@@ -2,9 +2,15 @@
  */

 package functionalarchitecture.impl;

 

-import functionalarchitecture.*;

-import functionalarchitecture.FunctionalInterface;

-

+import functionalarchitecture.FAMTerminator;

+import functionalarchitecture.Function;

+import functionalarchitecture.FunctionType;

+import functionalarchitecture.FunctionalArchitectureModel;

+import functionalarchitecture.FunctionalInput;

+import functionalarchitecture.FunctionalOutput;

+import functionalarchitecture.FunctionalarchitectureFactory;

+import functionalarchitecture.FunctionalarchitecturePackage;

+import functionalarchitecture.InformationLink;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EDataType;

 import org.eclipse.emf.ecore.EObject;

@@ -105,6 +111,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalArchitectureModel createFunctionalArchitectureModel() {

                 FunctionalArchitectureModelImpl functionalArchitectureModel = new FunctionalArchitectureModelImpl();

                 return functionalArchitectureModel;

@@ -115,6 +122,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Function createFunction() {

                 FunctionImpl function = new FunctionImpl();

                 return function;

@@ -125,6 +133,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FAMTerminator createFAMTerminator() {

                 FAMTerminatorImpl famTerminator = new FAMTerminatorImpl();

                 return famTerminator;

@@ -135,6 +144,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public InformationLink createInformationLink() {

                 InformationLinkImpl informationLink = new InformationLinkImpl();

                 return informationLink;

@@ -145,7 +155,8 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

-        public FunctionalInterface createFunctionalInterface() {

+        @Override

+        public functionalarchitecture.FunctionalInterface createFunctionalInterface() {

                 FunctionalInterfaceImpl functionalInterface = new FunctionalInterfaceImpl();

                 return functionalInterface;

         }

@@ -155,6 +166,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalInput createFunctionalInput() {

                 FunctionalInputImpl functionalInput = new FunctionalInputImpl();

                 return functionalInput;

@@ -165,6 +177,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalOutput createFunctionalOutput() {

                 FunctionalOutputImpl functionalOutput = new FunctionalOutputImpl();

                 return functionalOutput;

@@ -195,6 +208,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalarchitecturePackage getFunctionalarchitecturePackage() {

                 return (FunctionalarchitecturePackage)getEPackage();

         }

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitecturePackageImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitecturePackageImpl.java
index 22c15533..04945f1c 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitecturePackageImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitecturePackageImpl.java
@@ -9,7 +9,6 @@ import functionalarchitecture.FunctionalArchitectureModel;
 import functionalarchitecture.FunctionalData;

 import functionalarchitecture.FunctionalElement;

 import functionalarchitecture.FunctionalInput;

-import functionalarchitecture.FunctionalInterface;

 import functionalarchitecture.FunctionalOutput;

 import functionalarchitecture.FunctionalarchitectureFactory;

 import functionalarchitecture.FunctionalarchitecturePackage;

@@ -128,7 +127,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
 

         /**

          * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-         * 

+         *

          * <p>This method is used to initialize {@link FunctionalarchitecturePackage#eINSTANCE} when that field is accessed.

          * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

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

@@ -142,7 +141,8 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
                 if (isInited) return (FunctionalarchitecturePackage)EPackage.Registry.INSTANCE.getEPackage(FunctionalarchitecturePackage.eNS_URI);

 

                 // Obtain or create and register package

-                FunctionalarchitecturePackageImpl theFunctionalarchitecturePackage = (FunctionalarchitecturePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FunctionalarchitecturePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FunctionalarchitecturePackageImpl());

+                Object registeredFunctionalarchitecturePackage = EPackage.Registry.INSTANCE.get(eNS_URI);

+                FunctionalarchitecturePackageImpl theFunctionalarchitecturePackage = registeredFunctionalarchitecturePackage instanceof FunctionalarchitecturePackageImpl ? (FunctionalarchitecturePackageImpl)registeredFunctionalarchitecturePackage : new FunctionalarchitecturePackageImpl();

 

                 isInited = true;

 

@@ -155,7 +155,6 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
                 // Mark meta-data to indicate it can't be changed

                 theFunctionalarchitecturePackage.freeze();

 

-  

                 // Update the registry and return the package

                 EPackage.Registry.INSTANCE.put(FunctionalarchitecturePackage.eNS_URI, theFunctionalarchitecturePackage);

                 return theFunctionalarchitecturePackage;

@@ -166,6 +165,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunctionalElement() {

                 return functionalElementEClass;

         }

@@ -175,6 +175,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalElement_Interface() {

                 return (EReference)functionalElementEClass.getEStructuralFeatures().get(0);

         }

@@ -184,6 +185,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalElement_Model() {

                 return (EReference)functionalElementEClass.getEStructuralFeatures().get(1);

         }

@@ -193,6 +195,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalElement_Parent() {

                 return (EReference)functionalElementEClass.getEStructuralFeatures().get(2);

         }

@@ -202,6 +205,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunctionalArchitectureModel() {

                 return functionalArchitectureModelEClass;

         }

@@ -211,6 +215,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalArchitectureModel_RootElements() {

                 return (EReference)functionalArchitectureModelEClass.getEStructuralFeatures().get(0);

         }

@@ -220,6 +225,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunction() {

                 return functionEClass;

         }

@@ -229,6 +235,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunction_SubElements() {

                 return (EReference)functionEClass.getEStructuralFeatures().get(0);

         }

@@ -238,6 +245,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EAttribute getFunction_Type() {

                 return (EAttribute)functionEClass.getEStructuralFeatures().get(1);

         }

@@ -247,6 +255,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFAMTerminator() {

                 return famTerminatorEClass;

         }

@@ -256,6 +265,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFAMTerminator_Data() {

                 return (EReference)famTerminatorEClass.getEStructuralFeatures().get(0);

         }

@@ -265,6 +275,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getInformationLink() {

                 return informationLinkEClass;

         }

@@ -274,6 +285,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getInformationLink_From() {

                 return (EReference)informationLinkEClass.getEStructuralFeatures().get(0);

         }

@@ -283,6 +295,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getInformationLink_To() {

                 return (EReference)informationLinkEClass.getEStructuralFeatures().get(1);

         }

@@ -292,6 +305,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunctionalInterface() {

                 return functionalInterfaceEClass;

         }

@@ -301,6 +315,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalInterface_Data() {

                 return (EReference)functionalInterfaceEClass.getEStructuralFeatures().get(0);

         }

@@ -310,6 +325,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalInterface_Element() {

                 return (EReference)functionalInterfaceEClass.getEStructuralFeatures().get(1);

         }

@@ -319,6 +335,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunctionalInput() {

                 return functionalInputEClass;

         }

@@ -328,6 +345,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalInput_IncomingLinks() {

                 return (EReference)functionalInputEClass.getEStructuralFeatures().get(0);

         }

@@ -337,6 +355,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunctionalOutput() {

                 return functionalOutputEClass;

         }

@@ -346,6 +365,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalOutput_OutgoingLinks() {

                 return (EReference)functionalOutputEClass.getEStructuralFeatures().get(0);

         }

@@ -355,6 +375,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunctionalData() {

                 return functionalDataEClass;

         }

@@ -364,6 +385,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalData_Terminator() {

                 return (EReference)functionalDataEClass.getEStructuralFeatures().get(0);

         }

@@ -373,6 +395,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalData_Interface() {

                 return (EReference)functionalDataEClass.getEStructuralFeatures().get(1);

         }

@@ -382,6 +405,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EEnum getFunctionType() {

                 return functionTypeEEnum;

         }

@@ -391,6 +415,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalarchitectureFactory getFunctionalarchitectureFactory() {

                 return (FunctionalarchitectureFactory)getEFactoryInstance();

         }

@@ -503,9 +528,9 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
                 initEReference(getInformationLink_From(), this.getFunctionalOutput(), this.getFunctionalOutput_OutgoingLinks(), "from", null, 0, 1, InformationLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

                 initEReference(getInformationLink_To(), this.getFunctionalInput(), this.getFunctionalInput_IncomingLinks(), "to", null, 1, 1, InformationLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-                initEClass(functionalInterfaceEClass, FunctionalInterface.class, "FunctionalInterface", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-                initEReference(getFunctionalInterface_Data(), this.getFunctionalData(), this.getFunctionalData_Interface(), "data", null, 0, -1, FunctionalInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-                initEReference(getFunctionalInterface_Element(), this.getFunctionalElement(), this.getFunctionalElement_Interface(), "element", null, 0, 1, FunctionalInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEClass(functionalInterfaceEClass, functionalarchitecture.FunctionalInterface.class, "FunctionalInterface", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+                initEReference(getFunctionalInterface_Data(), this.getFunctionalData(), this.getFunctionalData_Interface(), "data", null, 0, -1, functionalarchitecture.FunctionalInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEReference(getFunctionalInterface_Element(), this.getFunctionalElement(), this.getFunctionalElement_Interface(), "element", null, 0, 1, functionalarchitecture.FunctionalInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

                 initEClass(functionalInputEClass, FunctionalInput.class, "FunctionalInput", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

                 initEReference(getFunctionalInput_IncomingLinks(), this.getInformationLink(), this.getInformationLink_To(), "IncomingLinks", null, 0, -1, FunctionalInput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -540,12 +565,12 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * @generated

          */

         protected void createEcoreAnnotations() {

-                String source = "http://www.eclipse.org/emf/2002/Ecore";        

+                String source = "http://www.eclipse.org/emf/2002/Ecore";

                 addAnnotation

-                  (this, 

-                   source, 

+                  (this,

+                   source,

                    new String[] {

-                         "settingDelegates", "org.eclipse.viatra.query.querybasedfeature"

+                           "settingDelegates", "org.eclipse.viatra.query.querybasedfeature"

                    });

         }

 

@@ -556,18 +581,18 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * @generated

          */

         protected void createOrgAnnotations() {

-                String source = "org.eclipse.viatra.query.querybasedfeature";   

+                String source = "org.eclipse.viatra.query.querybasedfeature";

                 addAnnotation

-                  (getFunctionalElement_Model(), 

-                   source, 

+                  (getFunctionalElement_Model(),

+                   source,

                    new String[] {

-                         "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.transima.fam.model"

-                   });  

+                           "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.transima.fam.model"

+                   });

                 addAnnotation

-                  (getFunction_Type(), 

-                   source, 

+                  (getFunction_Type(),

+                   source,

                    new String[] {

-                         "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.transima.fam.type"

+                           "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.transima.fam.type"

                    });

         }

 

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/InformationLinkImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/InformationLinkImpl.java
index 4b46fef8..ead4f9e9 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/InformationLinkImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/InformationLinkImpl.java
@@ -67,6 +67,7 @@ public class InformationLinkImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalOutput getFrom() {

                 if (eContainerFeatureID() != FunctionalarchitecturePackage.INFORMATION_LINK__FROM) return null;

                 return (FunctionalOutput)eInternalContainer();

@@ -87,6 +88,7 @@ public class InformationLinkImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setFrom(FunctionalOutput newFrom) {

                 if (newFrom != eInternalContainer() || (eContainerFeatureID() != FunctionalarchitecturePackage.INFORMATION_LINK__FROM && newFrom != null)) {

                         if (EcoreUtil.isAncestor(this, newFrom))

@@ -108,6 +110,7 @@ public class InformationLinkImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalInput getTo() {

                 if (to != null && to.eIsProxy()) {

                         InternalEObject oldTo = (InternalEObject)to;

@@ -149,6 +152,7 @@ public class InformationLinkImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setTo(FunctionalInput newTo) {

                 if (newTo != to) {

                         NotificationChain msgs = null;

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureAdapterFactory.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureAdapterFactory.java
index f990a7a4..9846bd62 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureAdapterFactory.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureAdapterFactory.java
@@ -2,9 +2,15 @@
  */

 package functionalarchitecture.util;

 

-import functionalarchitecture.*;

-import functionalarchitecture.FunctionalInterface;

-

+import functionalarchitecture.FAMTerminator;

+import functionalarchitecture.Function;

+import functionalarchitecture.FunctionalArchitectureModel;

+import functionalarchitecture.FunctionalData;

+import functionalarchitecture.FunctionalElement;

+import functionalarchitecture.FunctionalInput;

+import functionalarchitecture.FunctionalOutput;

+import functionalarchitecture.FunctionalarchitecturePackage;

+import functionalarchitecture.InformationLink;

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

 

@@ -89,7 +95,7 @@ public class FunctionalarchitectureAdapterFactory extends AdapterFactoryImpl {
                                 return createInformationLinkAdapter();

                         }

                         @Override

-                        public Adapter caseFunctionalInterface(FunctionalInterface object) {

+                        public Adapter caseFunctionalInterface(functionalarchitecture.FunctionalInterface object) {

                                 return createFunctionalInterfaceAdapter();

                         }

                         @Override

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureSwitch.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureSwitch.java
index b481a978..a1bbb480 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureSwitch.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureSwitch.java
@@ -2,9 +2,15 @@
  */

 package functionalarchitecture.util;

 

-import functionalarchitecture.*;

-import functionalarchitecture.FunctionalInterface;

-

+import functionalarchitecture.FAMTerminator;

+import functionalarchitecture.Function;

+import functionalarchitecture.FunctionalArchitectureModel;

+import functionalarchitecture.FunctionalData;

+import functionalarchitecture.FunctionalElement;

+import functionalarchitecture.FunctionalInput;

+import functionalarchitecture.FunctionalOutput;

+import functionalarchitecture.FunctionalarchitecturePackage;

+import functionalarchitecture.InformationLink;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 

@@ -99,7 +105,7 @@ public class FunctionalarchitectureSwitch<T> extends Switch<T> {
                                 return result;

                         }

                         case FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE: {

-                                FunctionalInterface functionalInterface = (FunctionalInterface)theEObject;

+                                functionalarchitecture.FunctionalInterface functionalInterface = (functionalarchitecture.FunctionalInterface)theEObject;

                                 T result = caseFunctionalInterface(functionalInterface);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

@@ -214,7 +220,7 @@ public class FunctionalarchitectureSwitch<T> extends Switch<T> {
          * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

          * @generated

          */

-        public T caseFunctionalInterface(FunctionalInterface object) {

+        public T caseFunctionalInterface(functionalarchitecture.FunctionalInterface object) {

                 return null;

         }

 

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
index 213ec0ed..c117a28e 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
@@ -5,10 +5,13 @@
   <extension id="extension.derived.hu.bme.mit.inf.dslreasoner.domains.transima.fam.type" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">
     <wellbehaving-derived-feature classifier-name="Function" feature-name="type" package-nsUri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"/>
   </extension>
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <!-- @generated FamMetamodel -->
-    <package class="functionalarchitecture.FunctionalarchitecturePackage" genModel="model/FamMetamodel.genmodel" uri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"/>
-  </extension>
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated FamMetamodel -->
+      <package
+            uri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"
+            class="functionalarchitecture.FunctionalarchitecturePackage"
+            genModel="model/FamMetamodel.genmodel"/>
+   </extension>
   <extension id="hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">
     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns" id="hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns">
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.terminatorAndInformation"/>
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDefinitionIndexer.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDefinitionIndexer.xtend
index cedcec5a..9845560c 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDefinitionIndexer.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDefinitionIndexer.xtend
@@ -5,6 +5,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem
 import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality

 import java.util.Map

+import org.eclipse.emf.common.util.Enumerator

 import org.eclipse.emf.ecore.EAttribute

 import org.eclipse.emf.ecore.EEnumLiteral

 import org.eclipse.emf.ecore.EReference

@@ -17,6 +18,7 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall

+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.ConstantValue

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall

@@ -24,7 +26,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeCo
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery

 

 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint

 

 class RelationDefinitionIndexer {

         val PatternGenerator base;

@@ -228,6 +229,9 @@ class RelationDefinitionIndexer {
                 if(target instanceof EEnumLiteral) {

                         targetString = '''const_«target.name»_«target.EEnum.name»'''

                         additionalDefinition = '''DefinedElement.name(«targetString»,"«target.name» «target.EEnum.name»");  //LogicProblem.elements(problem,«targetString»);'''

+                } else if(target instanceof Enumerator) {

+                        targetString = '''const_«target.name»_«target.class.simpleName»'''

+                        additionalDefinition = '''DefinedElement.name(«targetString»,"«target.name» «target.class.simpleName»");  //LogicProblem.elements(problem,«targetString»);'''

                 } else if(target instanceof Integer) {

                         targetString = '''const_«target»_Integer'''

                         additionalDefinition = '''IntegerElement.value(«targetString»,«target»);'''

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/META-INF/MANIFEST.MF b/Tests/hu.bme.mit.inf.dslreasoner.run/META-INF/MANIFEST.MF
index 548d3608..cc274c7c 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/META-INF/MANIFEST.MF
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/META-INF/MANIFEST.MF
@@ -26,6 +26,10 @@ Require-Bundle: hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlan
  org.eclipse.viatra.query.runtime.localsearch;bundle-version="1.5.0",
  hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0",
  hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0",
- hu.bme.mit.inf.dslreasoner.domains.alloyexamples;bundle-version="1.0.0"
+ hu.bme.mit.inf.dslreasoner.domains.alloyexamples;bundle-version="1.0.0",
+ org.eclipse.collections;bundle-version="9.2.0",
+ org.eclipse.viatra.query.patternlanguage.emf;bundle-version="2.2.0",
+ org.eclipse.viatra.query.runtime.rete;bundle-version="2.2.0",
+ org.objectweb.asm;bundle-version="7.0.0"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/initialModels/FAM.xmi b/Tests/hu.bme.mit.inf.dslreasoner.run/initialModels/FAM.xmi
index d2797166..e4115194 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/initialModels/FAM.xmi
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/initialModels/FAM.xmi
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <fam:FunctionalArchitectureModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fam="FAM" xsi:schemaLocation="FAM FAM.ecore"/>

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fam="http://www.inf.mit.bme.hu/viatrasolver/example/fam"/>

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
index 91c46dd6..fe4dcadd 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
@@ -34,6 +34,8 @@ import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.EReference

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

 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl

+import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetup

+import org.eclipse.viatra.query.runtime.rete.matcher.ReteEngine

 

 class SimpleRun {

         

@@ -125,7 +127,9 @@ class SimpleRun {
         }

         

         def static loadPartialModel(ReasonerWorkspace inputs) {

-                Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl());

+                EMFPatternLanguageStandaloneSetup.doSetup

+                ReteEngine.getClass

+                Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xmi", new XMIResourceFactoryImpl());

                 inputs.readModel(EObject,"FAM.xmi").eResource.allContents.toList

         }