8 files changed, 60 insertions, 5 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/AssertionAnnotationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/AssertionAnnotationImpl.java
index 1e015974..8475fa72 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/AssertionAnnotationImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/AssertionAnnotationImpl.java
@@ -64,6 +64,7 @@ public class AssertionAnnotationImpl extends AnnotationImpl implements Assertion
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Assertion getTarget() {

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

                         InternalEObject oldTarget = (InternalEObject)target;

@@ -105,6 +106,7 @@ public class AssertionAnnotationImpl extends AnnotationImpl implements Assertion
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setTarget(Assertion newTarget) {

                 if (newTarget != target) {

                         NotificationChain msgs = null;

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ConstantAnnotationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ConstantAnnotationImpl.java
index 734ce70c..b9021015 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ConstantAnnotationImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ConstantAnnotationImpl.java
@@ -64,6 +64,7 @@ public class ConstantAnnotationImpl extends AnnotationImpl implements ConstantAn
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Constant getTarget() {

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

                         InternalEObject oldTarget = (InternalEObject)target;

@@ -105,6 +106,7 @@ public class ConstantAnnotationImpl extends AnnotationImpl implements ConstantAn
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setTarget(Constant newTarget) {

                 if (newTarget != target) {

                         NotificationChain msgs = null;

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ContainmentHierarchyImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ContainmentHierarchyImpl.java
index 909f49a5..bb7b8ede 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ContainmentHierarchyImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/ContainmentHierarchyImpl.java
@@ -105,6 +105,7 @@ public class ContainmentHierarchyImpl extends MinimalEObjectImpl.Container imple
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Type> getTypesOrderedInHierarchy() {

                 if (typesOrderedInHierarchy == null) {

                         typesOrderedInHierarchy = new EObjectResolvingEList<Type>(Type.class, this, LogicproblemPackage.CONTAINMENT_HIERARCHY__TYPES_ORDERED_IN_HIERARCHY);

@@ -117,6 +118,7 @@ public class ContainmentHierarchyImpl extends MinimalEObjectImpl.Container imple
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Function> getContainmentFunctions() {

                 if (containmentFunctions == null) {

                         containmentFunctions = new EObjectResolvingEList<Function>(Function.class, this, LogicproblemPackage.CONTAINMENT_HIERARCHY__CONTAINMENT_FUNCTIONS);

@@ -129,6 +131,7 @@ public class ContainmentHierarchyImpl extends MinimalEObjectImpl.Container imple
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Relation> getContainmentRelations() {

                 if (containmentRelations == null) {

                         containmentRelations = new EObjectResolvingEList<Relation>(Relation.class, this, LogicproblemPackage.CONTAINMENT_HIERARCHY__CONTAINMENT_RELATIONS);

@@ -141,6 +144,7 @@ public class ContainmentHierarchyImpl extends MinimalEObjectImpl.Container imple
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Constant getRootConstant() {

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

                         InternalEObject oldRootConstant = (InternalEObject)rootConstant;

@@ -167,6 +171,7 @@ public class ContainmentHierarchyImpl extends MinimalEObjectImpl.Container imple
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setRootConstant(Constant newRootConstant) {

                 Constant oldRootConstant = rootConstant;

                 rootConstant = newRootConstant;

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/FunctionAnnotationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/FunctionAnnotationImpl.java
index 77ee58c2..a65374f8 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/FunctionAnnotationImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/FunctionAnnotationImpl.java
@@ -64,6 +64,7 @@ public class FunctionAnnotationImpl extends AnnotationImpl implements FunctionAn
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Function getTarget() {

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

                         InternalEObject oldTarget = (InternalEObject)target;

@@ -105,6 +106,7 @@ public class FunctionAnnotationImpl extends AnnotationImpl implements FunctionAn
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setTarget(Function newTarget) {

                 if (newTarget != target) {

                         NotificationChain msgs = null;

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicProblemImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicProblemImpl.java
index 70b31163..f3aa5808 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicProblemImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicProblemImpl.java
@@ -152,6 +152,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Type> getTypes() {

                 if (types == null) {

                         types = new EObjectContainmentEList<Type>(Type.class, this, LogicproblemPackage.LOGIC_PROBLEM__TYPES);

@@ -164,6 +165,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Function> getFunctions() {

                 if (functions == null) {

                         functions = new EObjectContainmentEList<Function>(Function.class, this, LogicproblemPackage.LOGIC_PROBLEM__FUNCTIONS);

@@ -176,6 +178,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Assertion> getAssertions() {

                 if (assertions == null) {

                         assertions = new EObjectContainmentEList<Assertion>(Assertion.class, this, LogicproblemPackage.LOGIC_PROBLEM__ASSERTIONS);

@@ -188,6 +191,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Relation> getRelations() {

                 if (relations == null) {

                         relations = new EObjectContainmentEList<Relation>(Relation.class, this, LogicproblemPackage.LOGIC_PROBLEM__RELATIONS);

@@ -200,6 +204,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Constant> getConstants() {

                 if (constants == null) {

                         constants = new EObjectContainmentEList<Constant>(Constant.class, this, LogicproblemPackage.LOGIC_PROBLEM__CONSTANTS);

@@ -212,6 +217,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<DefinedElement> getElements() {

                 if (elements == null) {

                         elements = new EObjectContainmentEList<DefinedElement>(DefinedElement.class, this, LogicproblemPackage.LOGIC_PROBLEM__ELEMENTS);

@@ -224,6 +230,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<ContainmentHierarchy> getContainmentHierarchies() {

                 if (containmentHierarchies == null) {

                         containmentHierarchies = new EObjectContainmentEList<ContainmentHierarchy>(ContainmentHierarchy.class, this, LogicproblemPackage.LOGIC_PROBLEM__CONTAINMENT_HIERARCHIES);

@@ -236,6 +243,7 @@ public class LogicProblemImpl extends MinimalEObjectImpl.Container implements Lo
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Annotation> getAnnotations() {

                 if (annotations == null) {

                         annotations = new EObjectContainmentEList<Annotation>(Annotation.class, this, LogicproblemPackage.LOGIC_PROBLEM__ANNOTATIONS);

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemFactoryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemFactoryImpl.java
index 66a8f116..a4703586 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemFactoryImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemFactoryImpl.java
@@ -73,6 +73,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public LogicProblem createLogicProblem() {

                 LogicProblemImpl logicProblem = new LogicProblemImpl();

                 return logicProblem;

@@ -83,6 +84,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public ContainmentHierarchy createContainmentHierarchy() {

                 ContainmentHierarchyImpl containmentHierarchy = new ContainmentHierarchyImpl();

                 return containmentHierarchy;

@@ -93,6 +95,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public RelationAnnotation createRelationAnnotation() {

                 RelationAnnotationImpl relationAnnotation = new RelationAnnotationImpl();

                 return relationAnnotation;

@@ -103,6 +106,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public ConstantAnnotation createConstantAnnotation() {

                 ConstantAnnotationImpl constantAnnotation = new ConstantAnnotationImpl();

                 return constantAnnotation;

@@ -113,6 +117,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionAnnotation createFunctionAnnotation() {

                 FunctionAnnotationImpl functionAnnotation = new FunctionAnnotationImpl();

                 return functionAnnotation;

@@ -123,6 +128,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public AssertionAnnotation createAssertionAnnotation() {

                 AssertionAnnotationImpl assertionAnnotation = new AssertionAnnotationImpl();

                 return assertionAnnotation;

@@ -133,6 +139,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Annotation createAnnotation() {

                 AnnotationImpl annotation = new AnnotationImpl();

                 return annotation;

@@ -143,6 +150,7 @@ public class LogicproblemFactoryImpl extends EFactoryImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public LogicproblemPackage getLogicproblemPackage() {

                 return (LogicproblemPackage)getEPackage();

         }

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemPackageImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemPackageImpl.java
index 1dd429e7..3d50b05c 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemPackageImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/LogicproblemPackageImpl.java
@@ -109,7 +109,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
 

         /**

          * 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 LogicproblemPackage#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 -->

@@ -123,13 +123,16 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
                 if (isInited) return (LogicproblemPackage)EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI);

 

                 // Obtain or create and register package

-                LogicproblemPackageImpl theLogicproblemPackage = (LogicproblemPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LogicproblemPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LogicproblemPackageImpl());

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

+                LogicproblemPackageImpl theLogicproblemPackage = registeredLogicproblemPackage instanceof LogicproblemPackageImpl ? (LogicproblemPackageImpl)registeredLogicproblemPackage : new LogicproblemPackageImpl();

 

                 isInited = true;

 

                 // Obtain or create and register interdependencies

-                LogiclanguagePackageImpl theLogiclanguagePackage = (LogiclanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI) instanceof LogiclanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI) : LogiclanguagePackage.eINSTANCE);

-                LogicresultPackageImpl theLogicresultPackage = (LogicresultPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LogicresultPackage.eNS_URI) instanceof LogicresultPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LogicresultPackage.eNS_URI) : LogicresultPackage.eINSTANCE);

+                Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI);

+                LogiclanguagePackageImpl theLogiclanguagePackage = (LogiclanguagePackageImpl)(registeredPackage instanceof LogiclanguagePackageImpl ? registeredPackage : LogiclanguagePackage.eINSTANCE);

+                registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LogicresultPackage.eNS_URI);

+                LogicresultPackageImpl theLogicresultPackage = (LogicresultPackageImpl)(registeredPackage instanceof LogicresultPackageImpl ? registeredPackage : LogicresultPackage.eINSTANCE);

 

                 // Create package meta-data objects

                 theLogicproblemPackage.createPackageContents();

@@ -144,7 +147,6 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
                 // Mark meta-data to indicate it can't be changed

                 theLogicproblemPackage.freeze();

 

-  

                 // Update the registry and return the package

                 EPackage.Registry.INSTANCE.put(LogicproblemPackage.eNS_URI, theLogicproblemPackage);

                 return theLogicproblemPackage;

@@ -155,6 +157,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getLogicProblem() {

                 return logicProblemEClass;

         }

@@ -164,6 +167,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getLogicProblem_Types() {

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

         }

@@ -173,6 +177,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getLogicProblem_Functions() {

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

         }

@@ -182,6 +187,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getLogicProblem_Assertions() {

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

         }

@@ -191,6 +197,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getLogicProblem_Relations() {

                 return (EReference)logicProblemEClass.getEStructuralFeatures().get(3);

         }

@@ -200,6 +207,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getLogicProblem_Constants() {

                 return (EReference)logicProblemEClass.getEStructuralFeatures().get(4);

         }

@@ -209,6 +217,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getLogicProblem_Elements() {

                 return (EReference)logicProblemEClass.getEStructuralFeatures().get(5);

         }

@@ -218,6 +227,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getLogicProblem_ContainmentHierarchies() {

                 return (EReference)logicProblemEClass.getEStructuralFeatures().get(6);

         }

@@ -227,6 +237,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getLogicProblem_Annotations() {

                 return (EReference)logicProblemEClass.getEStructuralFeatures().get(7);

         }

@@ -236,6 +247,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getContainmentHierarchy() {

                 return containmentHierarchyEClass;

         }

@@ -245,6 +257,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getContainmentHierarchy_TypesOrderedInHierarchy() {

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

         }

@@ -254,6 +267,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getContainmentHierarchy_ContainmentFunctions() {

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

         }

@@ -263,6 +277,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getContainmentHierarchy_ContainmentRelations() {

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

         }

@@ -272,6 +287,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getContainmentHierarchy_RootConstant() {

                 return (EReference)containmentHierarchyEClass.getEStructuralFeatures().get(3);

         }

@@ -281,6 +297,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getRelationAnnotation() {

                 return relationAnnotationEClass;

         }

@@ -290,6 +307,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getRelationAnnotation_Target() {

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

         }

@@ -299,6 +317,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getConstantAnnotation() {

                 return constantAnnotationEClass;

         }

@@ -308,6 +327,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getConstantAnnotation_Target() {

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

         }

@@ -317,6 +337,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunctionAnnotation() {

                 return functionAnnotationEClass;

         }

@@ -326,6 +347,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionAnnotation_Target() {

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

         }

@@ -335,6 +357,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getAssertionAnnotation() {

                 return assertionAnnotationEClass;

         }

@@ -344,6 +367,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getAssertionAnnotation_Target() {

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

         }

@@ -353,6 +377,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getAnnotation() {

                 return annotationEClass;

         }

@@ -362,6 +387,7 @@ public class LogicproblemPackageImpl extends EPackageImpl implements Logicproble
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public LogicproblemFactory getLogicproblemFactory() {

                 return (LogicproblemFactory)getEFactoryInstance();

         }

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/RelationAnnotationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/RelationAnnotationImpl.java
index 23fb6e5d..22e5527e 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/RelationAnnotationImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logicproblem/impl/RelationAnnotationImpl.java
@@ -64,6 +64,7 @@ public class RelationAnnotationImpl extends AnnotationImpl implements RelationAn
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Relation getTarget() {

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

                         InternalEObject oldTarget = (InternalEObject)target;

@@ -105,6 +106,7 @@ public class RelationAnnotationImpl extends AnnotationImpl implements RelationAn
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setTarget(Relation newTarget) {

                 if (newTarget != target) {

                         NotificationChain msgs = null;