3 files changed, 216 insertions, 3 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/EntryImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/EntryImpl.java
index 35003e0d..27041630 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/EntryImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/EntryImpl.java
@@ -3,19 +3,47 @@
 package hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.impl;

 

 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.Entry;

+import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.EntryType;

 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage;

 

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

 import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

 

 /**

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

  * An implementation of the model object '<em><b>Entry</b></em>'.

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

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.impl.EntryImpl#getType <em>Type</em>}</li>

+ * </ul>

  *

  * @generated

  */

 public class EntryImpl extends PseudostateImpl implements Entry {

         /**

+         * The default value of the '{@link #getType() <em>Type</em>}' attribute.

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

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

+         * @see #getType()

+         * @generated

+         * @ordered

+         */

+        protected static final EntryType TYPE_EDEFAULT = EntryType.NORMAL;

+        /**

+         * The cached value of the '{@link #getType() <em>Type</em>}' attribute.

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

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

+         * @see #getType()

+         * @generated

+         * @ordered

+         */

+        protected EntryType type = TYPE_EDEFAULT;

+

+        /**

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

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

          * @generated

@@ -34,4 +62,99 @@ public class EntryImpl extends PseudostateImpl implements Entry {
                 return YakindummPackage.Literals.ENTRY;

         }

 

+        /**

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

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

+         * @generated

+         */

+        public EntryType getType() {

+                return type;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public void setType(EntryType newType) {

+                EntryType oldType = type;

+                type = newType == null ? TYPE_EDEFAULT : newType;

+                if (eNotificationRequired())

+                        eNotify(new ENotificationImpl(this, Notification.SET, YakindummPackage.ENTRY__TYPE, oldType, type));

+        }

+

+        /**

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

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

+         * @generated

+         */

+        @Override

+        public Object eGet(int featureID, boolean resolve, boolean coreType) {

+                switch (featureID) {

+                        case YakindummPackage.ENTRY__TYPE:

+                                return getType();

+                }

+                return super.eGet(featureID, resolve, coreType);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        @Override

+        public void eSet(int featureID, Object newValue) {

+                switch (featureID) {

+                        case YakindummPackage.ENTRY__TYPE:

+                                setType((EntryType)newValue);

+                                return;

+                }

+                super.eSet(featureID, newValue);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        @Override

+        public void eUnset(int featureID) {

+                switch (featureID) {

+                        case YakindummPackage.ENTRY__TYPE:

+                                setType(TYPE_EDEFAULT);

+                                return;

+                }

+                super.eUnset(featureID);

+        }

+

+        /**

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

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

+         * @generated

+         */

+        @Override

+        public boolean eIsSet(int featureID) {

+                switch (featureID) {

+                        case YakindummPackage.ENTRY__TYPE:

+                                return type != TYPE_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(" (Type: ");

+                result.append(type);

+                result.append(')');

+                return result.toString();

+        }

+

 } //EntryImpl

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummFactoryImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummFactoryImpl.java
index 9c4fc4f1..d4fc2d01 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummFactoryImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummFactoryImpl.java
@@ -5,6 +5,7 @@ package hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.impl;
 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.*;

 

 import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EDataType;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 

@@ -75,6 +76,36 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

+        public Object createFromString(EDataType eDataType, String initialValue) {

+                switch (eDataType.getClassifierID()) {

+                        case YakindummPackage.ENTRY_TYPE:

+                                return createEntryTypeFromString(eDataType, initialValue);

+                        default:

+                                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+                }

+        }

+

+        /**

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

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

+         * @generated

+         */

+        @Override

+        public String convertToString(EDataType eDataType, Object instanceValue) {

+                switch (eDataType.getClassifierID()) {

+                        case YakindummPackage.ENTRY_TYPE:

+                                return convertEntryTypeToString(eDataType, instanceValue);

+                        default:

+                                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+                }

+        }

+

+        /**

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

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

+         * @generated

+         */

         public Region createRegion() {

                 RegionImpl region = new RegionImpl();

                 return region;

@@ -165,6 +196,26 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        public EntryType createEntryTypeFromString(EDataType eDataType, String initialValue) {

+                EntryType result = EntryType.get(initialValue);

+                if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+                return result;

+        }

+

+        /**

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

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

+         * @generated

+         */

+        public String convertEntryTypeToString(EDataType eDataType, Object instanceValue) {

+                return instanceValue == null ? null : instanceValue.toString();

+        }

+

+        /**

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

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

+         * @generated

+         */

         public YakindummPackage getYakindummPackage() {

                 return (YakindummPackage)getEPackage();

         }

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummPackageImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummPackageImpl.java
index 77092c17..e6da53ec 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummPackageImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummPackageImpl.java
@@ -5,6 +5,7 @@ package hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.impl;
 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.Choice;

 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.CompositeElement;

 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.Entry;

+import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.EntryType;

 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.Exit;

 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.FinalState;

 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.Pseudostate;

@@ -18,7 +19,9 @@ import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.Vertex;
 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummFactory;

 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage;

 

+import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EEnum;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

 

@@ -123,6 +126,13 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
         private EClass finalStateEClass = null;

 

         /**

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

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

+         * @generated

+         */

+        private EEnum entryTypeEEnum = null;

+

+        /**

          * Creates an instance of the model <b>Package</b>, registered with

          * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

          * package URI value.

@@ -150,7 +160,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
 

         /**

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

@@ -164,7 +174,8 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
                 if (isInited) return (YakindummPackage)EPackage.Registry.INSTANCE.getEPackage(YakindummPackage.eNS_URI);

 

                 // Obtain or create and register package

-                YakindummPackageImpl theYakindummPackage = (YakindummPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof YakindummPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new YakindummPackageImpl());

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

+                YakindummPackageImpl theYakindummPackage = registeredYakindummPackage instanceof YakindummPackageImpl ? (YakindummPackageImpl)registeredYakindummPackage : new YakindummPackageImpl();

 

                 isInited = true;

 

@@ -177,7 +188,6 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
                 // Mark meta-data to indicate it can't be changed

                 theYakindummPackage.freeze();

 

-  

                 // Update the registry and return the package

                 EPackage.Registry.INSTANCE.put(YakindummPackage.eNS_URI, theYakindummPackage);

                 return theYakindummPackage;

@@ -287,6 +297,15 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        public EAttribute getEntry_Type() {

+                return (EAttribute)entryEClass.getEStructuralFeatures().get(0);

+        }

+

+        /**

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

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

+         * @generated

+         */

         public EClass getSynchronization() {

                 return synchronizationEClass;

         }

@@ -359,6 +378,15 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        public EEnum getEntryType() {

+                return entryTypeEEnum;

+        }

+

+        /**

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

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

+         * @generated

+         */

         public YakindummFactory getYakindummFactory() {

                 return (YakindummFactory)getEFactoryInstance();

         }

@@ -398,6 +426,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
                 statechartEClass = createEClass(STATECHART);

 

                 entryEClass = createEClass(ENTRY);

+                createEAttribute(entryEClass, ENTRY__TYPE);

 

                 synchronizationEClass = createEClass(SYNCHRONIZATION);

 

@@ -413,6 +442,9 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
                 exitEClass = createEClass(EXIT);

 

                 finalStateEClass = createEClass(FINAL_STATE);

+

+                // Create enums

+                entryTypeEEnum = createEEnum(ENTRY_TYPE);

         }

 

         /**

@@ -471,6 +503,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
                 initEClass(statechartEClass, Statechart.class, "Statechart", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

                 initEClass(entryEClass, Entry.class, "Entry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+                initEAttribute(getEntry_Type(), this.getEntryType(), "Type", null, 0, 1, Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

                 initEClass(synchronizationEClass, Synchronization.class, "Synchronization", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

@@ -487,6 +520,12 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
 

                 initEClass(finalStateEClass, FinalState.class, "FinalState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

+                // Initialize enums and add enum literals

+                initEEnum(entryTypeEEnum, EntryType.class, "EntryType");

+                addEEnumLiteral(entryTypeEEnum, EntryType.NORMAL);

+                addEEnumLiteral(entryTypeEEnum, EntryType.HISTORY);

+                addEEnumLiteral(entryTypeEEnum, EntryType.DEEP_HISTORY);

+

                 // Create resource

                 createResource(eNS_URI);

         }