Scope support for attributes

4 files changed, 3 insertions, 123 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/Partial2logicannotationsPackage.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/Partial2logicannotationsPackage.java
index 25438ba2..f3df1319 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/Partial2logicannotationsPackage.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/Partial2logicannotationsPackage.java
@@ -77,22 +77,13 @@ public interface Partial2logicannotationsPackage extends EPackage {
         int PARTIAL_MODEL_RELATION2_ASSERTION__TARGET = LogicproblemPackage.ASSERTION_ANNOTATION__TARGET;

 

         /**

-         * The feature id for the '<em><b>Links</b></em>' containment reference list.

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

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

-         * @generated

-         * @ordered

-         */

-        int PARTIAL_MODEL_RELATION2_ASSERTION__LINKS = LogicproblemPackage.ASSERTION_ANNOTATION_FEATURE_COUNT + 0;

-

-        /**

          * The feature id for the '<em><b>Target Relation</b></em>' reference.

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

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

          * @generated

          * @ordered

          */

-        int PARTIAL_MODEL_RELATION2_ASSERTION__TARGET_RELATION = LogicproblemPackage.ASSERTION_ANNOTATION_FEATURE_COUNT + 1;

+        int PARTIAL_MODEL_RELATION2_ASSERTION__TARGET_RELATION = LogicproblemPackage.ASSERTION_ANNOTATION_FEATURE_COUNT + 0;

 

         /**

          * The number of structural features of the '<em>Partial Model Relation2 Assertion</em>' class.

@@ -101,7 +92,7 @@ public interface Partial2logicannotationsPackage extends EPackage {
          * @generated

          * @ordered

          */

-        int PARTIAL_MODEL_RELATION2_ASSERTION_FEATURE_COUNT = LogicproblemPackage.ASSERTION_ANNOTATION_FEATURE_COUNT + 2;

+        int PARTIAL_MODEL_RELATION2_ASSERTION_FEATURE_COUNT = LogicproblemPackage.ASSERTION_ANNOTATION_FEATURE_COUNT + 1;

 

         /**

          * The number of operations of the '<em>Partial Model Relation2 Assertion</em>' class.

@@ -124,17 +115,6 @@ public interface Partial2logicannotationsPackage extends EPackage {
         EClass getPartialModelRelation2Assertion();

 

         /**

-         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.PartialModelRelation2Assertion#getLinks <em>Links</em>}'.

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

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

-         * @return the meta object for the containment reference list '<em>Links</em>'.

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.PartialModelRelation2Assertion#getLinks()

-         * @see #getPartialModelRelation2Assertion()

-         * @generated

-         */

-        EReference getPartialModelRelation2Assertion_Links();

-

-        /**

          * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.PartialModelRelation2Assertion#getTargetRelation <em>Target Relation</em>}'.

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

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

@@ -179,14 +159,6 @@ public interface Partial2logicannotationsPackage extends EPackage {
                 EClass PARTIAL_MODEL_RELATION2_ASSERTION = eINSTANCE.getPartialModelRelation2Assertion();

 

                 /**

-                 * The meta object literal for the '<em><b>Links</b></em>' containment reference list feature.

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

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

-                 * @generated

-                 */

-                EReference PARTIAL_MODEL_RELATION2_ASSERTION__LINKS = eINSTANCE.getPartialModelRelation2Assertion_Links();

-

-                /**

                  * The meta object literal for the '<em><b>Target Relation</b></em>' reference feature.

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

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

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/PartialModelRelation2Assertion.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/PartialModelRelation2Assertion.java
index 3c7f1a38..164725d3 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/PartialModelRelation2Assertion.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/PartialModelRelation2Assertion.java
@@ -5,10 +5,6 @@ package hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.pa
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration;

 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.AssertionAnnotation;

 

-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RelationLink;

-

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

-

 /**

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

  * A representation of the model object '<em><b>Partial Model Relation2 Assertion</b></em>'.

@@ -18,7 +14,6 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:

  * </p>

  * <ul>

- *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.PartialModelRelation2Assertion#getLinks <em>Links</em>}</li>

  *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.PartialModelRelation2Assertion#getTargetRelation <em>Target Relation</em>}</li>

  * </ul>

  *

@@ -28,22 +23,6 @@ import org.eclipse.emf.common.util.EList;
  */

 public interface PartialModelRelation2Assertion extends AssertionAnnotation {

         /**

-         * Returns the value of the '<em><b>Links</b></em>' containment reference list.

-         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RelationLink}.

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

-         * <p>

-         * If the meaning of the '<em>Links</em>' containment reference list isn't clear,

-         * there really should be more of a description here...

-         * </p>

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

-         * @return the value of the '<em>Links</em>' containment reference list.

-         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.Partial2logicannotationsPackage#getPartialModelRelation2Assertion_Links()

-         * @model containment="true"

-         * @generated

-         */

-        EList<RelationLink> getLinks();

-

-        /**

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

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

          * <p>

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/impl/Partial2logicannotationsPackageImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/impl/Partial2logicannotationsPackageImpl.java
index f83498cd..934abc24 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/impl/Partial2logicannotationsPackageImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/impl/Partial2logicannotationsPackageImpl.java
@@ -112,17 +112,8 @@ public class Partial2logicannotationsPackageImpl extends EPackageImpl implements
          * <!-- end-user-doc -->

          * @generated

          */

-        public EReference getPartialModelRelation2Assertion_Links() {

-                return (EReference)partialModelRelation2AssertionEClass.getEStructuralFeatures().get(0);

-        }

-

-        /**

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

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

-         * @generated

-         */

         public EReference getPartialModelRelation2Assertion_TargetRelation() {

-                return (EReference)partialModelRelation2AssertionEClass.getEStructuralFeatures().get(1);

+                return (EReference)partialModelRelation2AssertionEClass.getEStructuralFeatures().get(0);

         }

 

         /**

@@ -154,7 +145,6 @@ public class Partial2logicannotationsPackageImpl extends EPackageImpl implements
 

                 // Create classes and their features

                 partialModelRelation2AssertionEClass = createEClass(PARTIAL_MODEL_RELATION2_ASSERTION);

-                createEReference(partialModelRelation2AssertionEClass, PARTIAL_MODEL_RELATION2_ASSERTION__LINKS);

                 createEReference(partialModelRelation2AssertionEClass, PARTIAL_MODEL_RELATION2_ASSERTION__TARGET_RELATION);

         }

 

@@ -183,7 +173,6 @@ public class Partial2logicannotationsPackageImpl extends EPackageImpl implements
 

                 // Obtain other dependent packages

                 LogicproblemPackage theLogicproblemPackage = (LogicproblemPackage)EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI);

-                PartialinterpretationPackage thePartialinterpretationPackage = (PartialinterpretationPackage)EPackage.Registry.INSTANCE.getEPackage(PartialinterpretationPackage.eNS_URI);

                 LogiclanguagePackage theLogiclanguagePackage = (LogiclanguagePackage)EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI);

 

                 // Create type parameters

@@ -195,7 +184,6 @@ public class Partial2logicannotationsPackageImpl extends EPackageImpl implements
 

                 // Initialize classes, features, and operations; add parameters

                 initEClass(partialModelRelation2AssertionEClass, PartialModelRelation2Assertion.class, "PartialModelRelation2Assertion", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-                initEReference(getPartialModelRelation2Assertion_Links(), thePartialinterpretationPackage.getRelationLink(), null, "links", null, 0, -1, PartialModelRelation2Assertion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

                 initEReference(getPartialModelRelation2Assertion_TargetRelation(), theLogiclanguagePackage.getRelationDeclaration(), null, "targetRelation", null, 1, 1, PartialModelRelation2Assertion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

                 // Create resource

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/impl/PartialModelRelation2AssertionImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/impl/PartialModelRelation2AssertionImpl.java
index 92011d1c..c6d0c04f 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/impl/PartialModelRelation2AssertionImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partial2logicannotations/impl/PartialModelRelation2AssertionImpl.java
@@ -7,22 +7,11 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.impl.AssertionAnnotat
 

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.Partial2logicannotationsPackage;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.PartialModelRelation2Assertion;

-

-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RelationLink;

-

-import java.util.Collection;

-

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

-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.ENotificationImpl;

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

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

 

 /**

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

@@ -32,7 +21,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * The following features are implemented:

  * </p>

  * <ul>

- *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.impl.PartialModelRelation2AssertionImpl#getLinks <em>Links</em>}</li>

  *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.impl.PartialModelRelation2AssertionImpl#getTargetRelation <em>Target Relation</em>}</li>

  * </ul>

  *

@@ -40,16 +28,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  */

 public class PartialModelRelation2AssertionImpl extends AssertionAnnotationImpl implements PartialModelRelation2Assertion {

         /**

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

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

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

-         * @see #getLinks()

-         * @generated

-         * @ordered

-         */

-        protected EList<RelationLink> links;

-

-        /**

          * The cached value of the '{@link #getTargetRelation() <em>Target Relation</em>}' reference.

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

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

@@ -83,18 +61,6 @@ public class PartialModelRelation2AssertionImpl extends AssertionAnnotationImpl
          * <!-- end-user-doc -->

          * @generated

          */

-        public EList<RelationLink> getLinks() {

-                if (links == null) {

-                        links = new EObjectContainmentEList<RelationLink>(RelationLink.class, this, Partial2logicannotationsPackage.PARTIAL_MODEL_RELATION2_ASSERTION__LINKS);

-                }

-                return links;

-        }

-

-        /**

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

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

-         * @generated

-         */

         public RelationDeclaration getTargetRelation() {

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

                         InternalEObject oldTargetRelation = (InternalEObject)targetRelation;

@@ -134,24 +100,8 @@ public class PartialModelRelation2AssertionImpl extends AssertionAnnotationImpl
          * @generated

          */

         @Override

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

-                switch (featureID) {

-                        case Partial2logicannotationsPackage.PARTIAL_MODEL_RELATION2_ASSERTION__LINKS:

-                                return ((InternalEList<?>)getLinks()).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 Partial2logicannotationsPackage.PARTIAL_MODEL_RELATION2_ASSERTION__LINKS:

-                                return getLinks();

                         case Partial2logicannotationsPackage.PARTIAL_MODEL_RELATION2_ASSERTION__TARGET_RELATION:

                                 if (resolve) return getTargetRelation();

                                 return basicGetTargetRelation();

@@ -168,10 +118,6 @@ public class PartialModelRelation2AssertionImpl extends AssertionAnnotationImpl
         @Override

         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

-                        case Partial2logicannotationsPackage.PARTIAL_MODEL_RELATION2_ASSERTION__LINKS:

-                                getLinks().clear();

-                                getLinks().addAll((Collection<? extends RelationLink>)newValue);

-                                return;

                         case Partial2logicannotationsPackage.PARTIAL_MODEL_RELATION2_ASSERTION__TARGET_RELATION:

                                 setTargetRelation((RelationDeclaration)newValue);

                                 return;

@@ -187,9 +133,6 @@ public class PartialModelRelation2AssertionImpl extends AssertionAnnotationImpl
         @Override

         public void eUnset(int featureID) {

                 switch (featureID) {

-                        case Partial2logicannotationsPackage.PARTIAL_MODEL_RELATION2_ASSERTION__LINKS:

-                                getLinks().clear();

-                                return;

                         case Partial2logicannotationsPackage.PARTIAL_MODEL_RELATION2_ASSERTION__TARGET_RELATION:

                                 setTargetRelation((RelationDeclaration)null);

                                 return;

@@ -205,8 +148,6 @@ public class PartialModelRelation2AssertionImpl extends AssertionAnnotationImpl
         @Override

         public boolean eIsSet(int featureID) {

                 switch (featureID) {

-                        case Partial2logicannotationsPackage.PARTIAL_MODEL_RELATION2_ASSERTION__LINKS:

-                                return links != null && !links.isEmpty();

                         case Partial2logicannotationsPackage.PARTIAL_MODEL_RELATION2_ASSERTION__TARGET_RELATION:

                                 return targetRelation != null;

                 }