7 files changed, 91 insertions, 190 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java
index 70ee268e..cf8f1fe8 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java
@@ -4,16 +4,13 @@ package satellite.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
-import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import satellite.AntennaGain;
 import satellite.CommSubsystem;
-import satellite.DirectedCommunicationLink;
 import satellite.SatellitePackage;
 import satellite.TransceiverBand;
 
@@ -27,7 +24,6 @@ import satellite.TransceiverBand;
  * <ul>
  *   <li>{@link satellite.impl.CommSubsystemImpl#getBand <em>Band</em>}</li>
  *   <li>{@link satellite.impl.CommSubsystemImpl#getGain <em>Gain</em>}</li>
- *   <li>{@link satellite.impl.CommSubsystemImpl#getCommunicationLink <em>Communication Link</em>}</li>
  * </ul>
  *
  * @generated
@@ -74,16 +70,6 @@ public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements C
         protected AntennaGain gain = GAIN_EDEFAULT;
 
         /**
-         * The cached value of the '{@link #getCommunicationLink() <em>Communication Link</em>}' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getCommunicationLink()
-         * @generated
-         * @ordered
-         */
-        protected DirectedCommunicationLink communicationLink;
-
-        /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -156,81 +142,12 @@ public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements C
          * @generated
          */
         @Override
-        public DirectedCommunicationLink getCommunicationLink() {
-                return communicationLink;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public NotificationChain basicSetCommunicationLink(DirectedCommunicationLink newCommunicationLink,
-                        NotificationChain msgs) {
-                DirectedCommunicationLink oldCommunicationLink = communicationLink;
-                communicationLink = newCommunicationLink;
-                if (eNotificationRequired()) {
-                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-                                        SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK, oldCommunicationLink, newCommunicationLink);
-                        if (msgs == null)
-                                msgs = notification;
-                        else
-                                msgs.add(notification);
-                }
-                return msgs;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setCommunicationLink(DirectedCommunicationLink newCommunicationLink) {
-                if (newCommunicationLink != communicationLink) {
-                        NotificationChain msgs = null;
-                        if (communicationLink != null)
-                                msgs = ((InternalEObject) communicationLink).eInverseRemove(this,
-                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK, null, msgs);
-                        if (newCommunicationLink != null)
-                                msgs = ((InternalEObject) newCommunicationLink).eInverseAdd(this,
-                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK, null, msgs);
-                        msgs = basicSetCommunicationLink(newCommunicationLink, msgs);
-                        if (msgs != null)
-                                msgs.dispatch();
-                } else if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK,
-                                        newCommunicationLink, newCommunicationLink));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-                switch (featureID) {
-                case SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK:
-                        return basicSetCommunicationLink(null, 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 SatellitePackage.COMM_SUBSYSTEM__BAND:
                         return getBand();
                 case SatellitePackage.COMM_SUBSYSTEM__GAIN:
                         return getGain();
-                case SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK:
-                        return getCommunicationLink();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -249,9 +166,6 @@ public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements C
                 case SatellitePackage.COMM_SUBSYSTEM__GAIN:
                         setGain((AntennaGain) newValue);
                         return;
-                case SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK:
-                        setCommunicationLink((DirectedCommunicationLink) newValue);
-                        return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -270,9 +184,6 @@ public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements C
                 case SatellitePackage.COMM_SUBSYSTEM__GAIN:
                         setGain(GAIN_EDEFAULT);
                         return;
-                case SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK:
-                        setCommunicationLink((DirectedCommunicationLink) null);
-                        return;
                 }
                 super.eUnset(featureID);
         }
@@ -289,8 +200,6 @@ public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements C
                         return band != BAND_EDEFAULT;
                 case SatellitePackage.COMM_SUBSYSTEM__GAIN:
                         return gain != GAIN_EDEFAULT;
-                case SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK:
-                        return communicationLink != null;
                 }
                 return super.eIsSet(featureID);
         }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommunicatingElementImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommunicatingElementImpl.java
index f472580b..1f79da3b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommunicatingElementImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommunicatingElementImpl.java
@@ -3,12 +3,16 @@
 package satellite.impl;
 
 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.impl.MinimalEObjectImpl;
 
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
@@ -45,6 +49,16 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
         protected EList<CommSubsystem> commSubsystem;
 
         /**
+         * The cached value of the '{@link #getCommunicationLink() <em>Communication Link</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getCommunicationLink()
+         * @generated
+         * @ordered
+         */
+        protected DirectedCommunicationLink communicationLink;
+
+        /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -84,10 +98,7 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
          */
         @Override
         public DirectedCommunicationLink getCommunicationLink() {
-                DirectedCommunicationLink communicationLink = basicGetCommunicationLink();
-                return communicationLink != null && communicationLink.eIsProxy()
-                                ? (DirectedCommunicationLink) eResolveProxy((InternalEObject) communicationLink)
-                                : communicationLink;
+                return communicationLink;
         }
 
         /**
@@ -95,11 +106,46 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
          * <!-- end-user-doc -->
          * @generated
          */
-        public DirectedCommunicationLink basicGetCommunicationLink() {
-                // TODO: implement this method to return the 'Communication Link' reference
-                // -> do not perform proxy resolution
-                // Ensure that you remove @generated or mark it @generated NOT
-                throw new UnsupportedOperationException();
+        public NotificationChain basicSetCommunicationLink(DirectedCommunicationLink newCommunicationLink,
+                        NotificationChain msgs) {
+                DirectedCommunicationLink oldCommunicationLink = communicationLink;
+                communicationLink = newCommunicationLink;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK, oldCommunicationLink,
+                                        newCommunicationLink);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setCommunicationLink(DirectedCommunicationLink newCommunicationLink) {
+                if (newCommunicationLink != communicationLink) {
+                        NotificationChain msgs = null;
+                        if (communicationLink != null)
+                                msgs = ((InternalEObject) communicationLink).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK, null,
+                                                msgs);
+                        if (newCommunicationLink != null)
+                                msgs = ((InternalEObject) newCommunicationLink).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK, null,
+                                                msgs);
+                        msgs = basicSetCommunicationLink(newCommunicationLink, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK, newCommunicationLink,
+                                        newCommunicationLink));
         }
 
         /**
@@ -112,6 +158,8 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
                 switch (featureID) {
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
                         return ((InternalEList<?>) getCommSubsystem()).basicRemove(otherEnd, msgs);
+                case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
+                        return basicSetCommunicationLink(null, msgs);
                 }
                 return super.eInverseRemove(otherEnd, featureID, msgs);
         }
@@ -127,9 +175,7 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
                         return getCommSubsystem();
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
-                        if (resolve)
-                                return getCommunicationLink();
-                        return basicGetCommunicationLink();
+                        return getCommunicationLink();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -147,6 +193,9 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
                         getCommSubsystem().clear();
                         getCommSubsystem().addAll((Collection<? extends CommSubsystem>) newValue);
                         return;
+                case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
+                        setCommunicationLink((DirectedCommunicationLink) newValue);
+                        return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -162,6 +211,9 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
                         getCommSubsystem().clear();
                         return;
+                case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
+                        setCommunicationLink((DirectedCommunicationLink) null);
+                        return;
                 }
                 super.eUnset(featureID);
         }
@@ -177,7 +229,7 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
                         return commSubsystem != null && !commSubsystem.isEmpty();
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
-                        return basicGetCommunicationLink() != null;
+                        return communicationLink != null;
                 }
                 return super.eIsSet(featureID);
         }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java
index 350a9bcc..a7ba37a7 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java
@@ -14,7 +14,7 @@ import satellite.SatellitePackage;
  *
  * @generated
  */
-public class CubeSat3UImpl extends CubeSatImpl implements CubeSat3U {
+public class CubeSat3UImpl extends SpacecraftImpl implements CubeSat3U {
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java
index 3b9c5988..d4f42e6c 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java
@@ -14,7 +14,7 @@ import satellite.SatellitePackage;
  *
  * @generated
  */
-public class CubeSat6UImpl extends CubeSatImpl implements CubeSat6U {
+public class CubeSat6UImpl extends SpacecraftImpl implements CubeSat6U {
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSatImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSatImpl.java
deleted file mode 100644
index 660bd062..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSatImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- */
-package satellite.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import satellite.CubeSat;
-import satellite.SatellitePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Cube Sat</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public abstract class CubeSatImpl extends SpacecraftImpl implements CubeSat {
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected CubeSatImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.CUBE_SAT;
-        }
-
-} //CubeSatImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java
index 68e4ce30..2347fe07 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java
@@ -14,7 +14,6 @@ import satellite.AntennaGain;
 import satellite.CommSubsystem;
 import satellite.CommunicatingElement;
 import satellite.ConstellationMission;
-import satellite.CubeSat;
 import satellite.CubeSat3U;
 import satellite.CubeSat6U;
 import satellite.DirectedCommunicationLink;
@@ -125,13 +124,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * <!-- end-user-doc -->
          * @generated
          */
-        private EClass cubeSatEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
         private EEnum transceiverBandEEnum = null;
 
         /**
@@ -368,16 +360,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EReference getCommSubsystem_CommunicationLink() {
-                return (EReference) commSubsystemEClass.getEStructuralFeatures().get(2);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public EClass getDirectedCommunicationLink() {
                 return directedCommunicationLinkEClass;
         }
@@ -458,16 +440,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EClass getCubeSat() {
-                return cubeSatEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public EEnum getTransceiverBand() {
                 return transceiverBandEEnum;
         }
@@ -542,7 +514,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 commSubsystemEClass = createEClass(COMM_SUBSYSTEM);
                 createEAttribute(commSubsystemEClass, COMM_SUBSYSTEM__BAND);
                 createEAttribute(commSubsystemEClass, COMM_SUBSYSTEM__GAIN);
-                createEReference(commSubsystemEClass, COMM_SUBSYSTEM__COMMUNICATION_LINK);
 
                 directedCommunicationLinkEClass = createEClass(DIRECTED_COMMUNICATION_LINK);
                 createEReference(directedCommunicationLinkEClass, DIRECTED_COMMUNICATION_LINK__SOURCE);
@@ -558,8 +529,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 
                 smallSatEClass = createEClass(SMALL_SAT);
 
-                cubeSatEClass = createEClass(CUBE_SAT);
-
                 // Create enums
                 transceiverBandEEnum = createEEnum(TRANSCEIVER_BAND);
                 antennaGainEEnum = createEEnum(ANTENNA_GAIN);
@@ -599,10 +568,9 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 groundStationNetworkEClass.getESuperTypes().add(this.getCommunicatingElement());
                 spacecraftEClass.getESuperTypes().add(this.getCommunicatingElement());
                 interferometryPayloadEClass.getESuperTypes().add(this.getPayload());
-                cubeSat3UEClass.getESuperTypes().add(this.getCubeSat());
-                cubeSat6UEClass.getESuperTypes().add(this.getCubeSat());
+                cubeSat3UEClass.getESuperTypes().add(this.getSpacecraft());
+                cubeSat6UEClass.getESuperTypes().add(this.getSpacecraft());
                 smallSatEClass.getESuperTypes().add(this.getSpacecraft());
-                cubeSatEClass.getESuperTypes().add(this.getSpacecraft());
 
                 // Initialize classes, features, and operations; add parameters
                 initEClass(constellationMissionEClass, ConstellationMission.class, "ConstellationMission", IS_ABSTRACT,
@@ -626,8 +594,8 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                                 2, CommunicatingElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
                                 !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getCommunicatingElement_CommunicationLink(), this.getDirectedCommunicationLink(), null,
-                                "communicationLink", null, 0, 1, CommunicatingElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE,
-                                !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+                                "communicationLink", null, 0, 1, CommunicatingElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+                                IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(groundStationNetworkEClass, GroundStationNetwork.class, "GroundStationNetwork", !IS_ABSTRACT,
                                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -646,9 +614,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEAttribute(getCommSubsystem_Gain(), this.getAntennaGain(), "gain", null, 1, 1, CommSubsystem.class,
                                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEReference(getCommSubsystem_CommunicationLink(), this.getDirectedCommunicationLink(), null,
-                                "communicationLink", null, 0, 1, CommSubsystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                                IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(directedCommunicationLinkEClass, DirectedCommunicationLink.class, "DirectedCommunicationLink",
                                 !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -673,8 +638,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 initEClass(smallSatEClass, SmallSat.class, "SmallSat", !IS_ABSTRACT, !IS_INTERFACE,
                                 IS_GENERATED_INSTANCE_CLASS);
 
-                initEClass(cubeSatEClass, CubeSat.class, "CubeSat", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
                 // Initialize enums and add enum literals
                 initEEnum(transceiverBandEEnum, TransceiverBand.class, "TransceiverBand");
                 addEEnumLiteral(transceiverBandEEnum, TransceiverBand.UHF);
@@ -697,6 +660,8 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 // Create annotations
                 // http://www.eclipse.org/emf/2002/Ecore
                 createEcoreAnnotations();
+                // org.eclipse.viatra.query.querybasedfeature
+                createOrgAnnotations();
         }
 
         /**
@@ -710,4 +675,16 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 addAnnotation(this, source, new String[] { "settingDelegates", "org.eclipse.viatra.query.querybasedfeature" });
         }
 
+        /**
+         * Initializes the annotations for <b>org.eclipse.viatra.query.querybasedfeature</b>.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected void createOrgAnnotations() {
+                String source = "org.eclipse.viatra.query.querybasedfeature";
+                addAnnotation(getSpacecraft_Kind(), source,
+                                new String[] { "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind" });
+        }
+
 } //SatellitePackageImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java
index ef98fb07..73609fbd 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java
@@ -6,6 +6,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
@@ -41,14 +42,15 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
         protected Payload payload;
 
         /**
-         * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
+         * The cached setting delegate for the '{@link #getKind() <em>Kind</em>}' attribute.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @see #getKind()
          * @generated
          * @ordered
          */
-        protected static final SpacecraftKind KIND_EDEFAULT = SpacecraftKind.CUBE_SAT3_U;
+        protected EStructuralFeature.Internal.SettingDelegate KIND__ESETTING_DELEGATE = ((EStructuralFeature.Internal) SatellitePackage.Literals.SPACECRAFT__KIND)
+                        .getSettingDelegate();
 
         /**
          * <!-- begin-user-doc -->
@@ -128,9 +130,7 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
          */
         @Override
         public SpacecraftKind getKind() {
-                // TODO: implement this method to return the 'Kind' attribute
-                // Ensure that you remove @generated or mark it @generated NOT
-                throw new UnsupportedOperationException();
+                return (SpacecraftKind) KIND__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);
         }
 
         /**
@@ -204,7 +204,7 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
                         return payload != null;
                 case SatellitePackage.SPACECRAFT__KIND:
-                        return getKind() != KIND_EDEFAULT;
+                        return KIND__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
                 }
                 return super.eIsSet(featureID);
         }