7 files changed, 287 insertions, 48 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat3UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat3UImpl.java
new file mode 100644
index 00000000..3e0d6f2c
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat3UImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cube Sat3 U</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CubeSat3UImpl extends CubeSatImpl implements CubeSat3U {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected CubeSat3UImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SatellitePackage.Literals.CUBE_SAT3_U;
+        }
+
+} //CubeSat3UImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat6UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat6UImpl.java
new file mode 100644
index 00000000..7ad2bc87
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat6UImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat6U;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cube Sat6 U</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CubeSat6UImpl extends CubeSatImpl implements CubeSat6U {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected CubeSat6UImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SatellitePackage.Literals.CUBE_SAT6_U;
+        }
+
+} //CubeSat6UImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSatImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSatImpl.java
new file mode 100644
index 00000000..b8e364a3
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSatImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- 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/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatelliteFactoryImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatelliteFactoryImpl.java
index 0cb07cfa..028ba662 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatelliteFactoryImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatelliteFactoryImpl.java
@@ -67,6 +67,12 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
                         return createDirectedCommunicationLink();
                 case SatellitePackage.INTERFEROMETRY_PAYLOAD:
                         return createInterferometryPayload();
+                case SatellitePackage.CUBE_SAT3_U:
+                        return createCubeSat3U();
+                case SatellitePackage.CUBE_SAT6_U:
+                        return createCubeSat6U();
+                case SatellitePackage.SMALL_SAT:
+                        return createSmallSat();
                 default:
                         throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
                 }
@@ -170,6 +176,39 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
          * <!-- end-user-doc -->
          * @generated
          */
+        @Override
+        public CubeSat3U createCubeSat3U() {
+                CubeSat3UImpl cubeSat3U = new CubeSat3UImpl();
+                return cubeSat3U;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public CubeSat6U createCubeSat6U() {
+                CubeSat6UImpl cubeSat6U = new CubeSat6UImpl();
+                return cubeSat6U;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public SmallSat createSmallSat() {
+                SmallSatImpl smallSat = new SmallSatImpl();
+                return smallSat;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         public TransceiverBand createTransceiverBandFromString(EDataType eDataType, String initialValue) {
                 TransceiverBand result = TransceiverBand.get(initialValue);
                 if (result == null)
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatellitePackageImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatellitePackageImpl.java
index 48ba32b8..bbe77e4d 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatellitePackageImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatellitePackageImpl.java
@@ -6,6 +6,9 @@ import hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat6U;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.GroundStationNetwork;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission;
@@ -13,6 +16,7 @@ import hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryPayload;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.Payload;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.SatelliteFactory;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand;
@@ -100,6 +104,34 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * <!-- end-user-doc -->
          * @generated
          */
+        private EClass cubeSat3UEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass cubeSat6UEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass smallSatEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass cubeSatEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         private EEnum transceiverBandEEnum = null;
 
         /**
@@ -386,6 +418,46 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
+        public EClass getCubeSat3U() {
+                return cubeSat3UEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getCubeSat6U() {
+                return cubeSat6UEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getSmallSat() {
+                return smallSatEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getCubeSat() {
+                return cubeSatEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
         public EEnum getTransceiverBand() {
                 return transceiverBandEEnum;
         }
@@ -469,6 +541,14 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 
                 interferometryPayloadEClass = createEClass(INTERFEROMETRY_PAYLOAD);
 
+                cubeSat3UEClass = createEClass(CUBE_SAT3_U);
+
+                cubeSat6UEClass = createEClass(CUBE_SAT6_U);
+
+                smallSatEClass = createEClass(SMALL_SAT);
+
+                cubeSatEClass = createEClass(CUBE_SAT);
+
                 // Create enums
                 transceiverBandEEnum = createEEnum(TRANSCEIVER_BAND);
                 antennaGainEEnum = createEEnum(ANTENNA_GAIN);
@@ -508,6 +588,10 @@ 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());
+                smallSatEClass.getESuperTypes().add(this.getSpacecraft());
+                cubeSatEClass.getESuperTypes().add(this.getSpacecraft());
 
                 // Initialize classes, features, and operations; add parameters
                 initEClass(constellationMissionEClass, ConstellationMission.class, "ConstellationMission", IS_ABSTRACT,
@@ -543,7 +627,7 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
                                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEAttribute(getSpacecraft_Kind(), this.getSpacecraftKind(), "kind", null, 1, 1, Spacecraft.class,
-                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                                IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
                 initEClass(commSubsystemEClass, CommSubsystem.class, "CommSubsystem", !IS_ABSTRACT, !IS_INTERFACE,
                                 IS_GENERATED_INSTANCE_CLASS);
@@ -566,6 +650,17 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 initEClass(interferometryPayloadEClass, InterferometryPayload.class, "InterferometryPayload", !IS_ABSTRACT,
                                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
+                initEClass(cubeSat3UEClass, CubeSat3U.class, "CubeSat3U", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(cubeSat6UEClass, CubeSat6U.class, "CubeSat6U", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                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);
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SmallSatImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SmallSatImpl.java
new file mode 100644
index 00000000..522991ad
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SmallSatImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Small Sat</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SmallSatImpl extends SpacecraftImpl implements SmallSat {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected SmallSatImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SatellitePackage.Literals.SMALL_SAT;
+        }
+
+} //SmallSatImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SpacecraftImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SpacecraftImpl.java
index 2135af2c..9d74270a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SpacecraftImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SpacecraftImpl.java
@@ -49,15 +49,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
          * @ordered
          */
         protected static final SpacecraftKind KIND_EDEFAULT = SpacecraftKind.CUBE_SAT3_U;
-        /**
-         * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getKind()
-         * @generated
-         * @ordered
-         */
-        protected SpacecraftKind kind = KIND_EDEFAULT;
 
         /**
          * <!-- begin-user-doc -->
@@ -137,20 +128,9 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
          */
         @Override
         public SpacecraftKind getKind() {
-                return kind;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setKind(SpacecraftKind newKind) {
-                SpacecraftKind oldKind = kind;
-                kind = newKind == null ? KIND_EDEFAULT : newKind;
-                if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.SPACECRAFT__KIND, oldKind, kind));
+                // TODO: implement this method to return the 'Kind' attribute
+                // Ensure that you remove @generated or mark it @generated NOT
+                throw new UnsupportedOperationException();
         }
 
         /**
@@ -194,9 +174,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
                         setPayload((Payload) newValue);
                         return;
-                case SatellitePackage.SPACECRAFT__KIND:
-                        setKind((SpacecraftKind) newValue);
-                        return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -212,9 +189,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
                         setPayload((Payload) null);
                         return;
-                case SatellitePackage.SPACECRAFT__KIND:
-                        setKind(KIND_EDEFAULT);
-                        return;
                 }
                 super.eUnset(featureID);
         }
@@ -230,26 +204,9 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
                         return payload != null;
                 case SatellitePackage.SPACECRAFT__KIND:
-                        return kind != KIND_EDEFAULT;
+                        return getKind() != KIND_EDEFAULT;
                 }
                 return super.eIsSet(featureID);
         }
 
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String toString() {
-                if (eIsProxy())
-                        return super.toString();
-
-                StringBuilder result = new StringBuilder(super.toString());
-                result.append(" (kind: ");
-                result.append(kind);
-                result.append(')');
-                return result.toString();
-        }
-
 } //SpacecraftImpl