fix merging issue

7 files changed, 42 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/CompositeElementImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/CompositeElementImpl.java
index 0e298b95..96c642fb 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/CompositeElementImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/CompositeElementImpl.java
@@ -68,6 +68,7 @@ public abstract class CompositeElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Region> getRegions() {

                 if (regions == null) {

                         regions = new EObjectContainmentEList<Region>(Region.class, this, YakindummPackage.COMPOSITE_ELEMENT__REGIONS);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/RegionImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/RegionImpl.java
index 232e5ab6..06ae652a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/RegionImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/RegionImpl.java
@@ -68,6 +68,7 @@ public class RegionImpl extends MinimalEObjectImpl.Container implements Region {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Vertex> getVertices() {

                 if (vertices == null) {

                         vertices = new EObjectContainmentEList<Vertex>(Vertex.class, this, YakindummPackage.REGION__VERTICES);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/StateImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/StateImpl.java
index 6da0caec..bb1715f8 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/StateImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/StateImpl.java
@@ -67,6 +67,7 @@ public class StateImpl extends RegularStateImpl implements State {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Region> getRegions() {

                 if (regions == null) {

                         regions = new EObjectContainmentEList<Region>(Region.class, this, YakindummPackage.STATE__REGIONS);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/TransitionImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/TransitionImpl.java
index ff957869..1a7a275b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/TransitionImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/TransitionImpl.java
@@ -66,6 +66,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Vertex getTarget() {

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

                         InternalEObject oldTarget = (InternalEObject)target;

@@ -107,6 +108,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setTarget(Vertex newTarget) {

                 if (newTarget != target) {

                         NotificationChain msgs = null;

@@ -126,6 +128,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Vertex getSource() {

                 if (eContainerFeatureID() != YakindummPackage.TRANSITION__SOURCE) return null;

                 return (Vertex)eInternalContainer();

@@ -146,6 +149,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setSource(Vertex newSource) {

                 if (newSource != eInternalContainer() || (eContainerFeatureID() != YakindummPackage.TRANSITION__SOURCE && newSource != null)) {

                         if (EcoreUtil.isAncestor(this, newSource))

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/VertexImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/VertexImpl.java
index 13df20ee..a2989ade 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/VertexImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/VertexImpl.java
@@ -80,6 +80,7 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Transition> getIncomingTransitions() {

                 if (incomingTransitions == null) {

                         incomingTransitions = new EObjectWithInverseResolvingEList<Transition>(Transition.class, this, YakindummPackage.VERTEX__INCOMING_TRANSITIONS, YakindummPackage.TRANSITION__TARGET);

@@ -92,6 +93,7 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Transition> getOutgoingTransitions() {

                 if (outgoingTransitions == null) {

                         outgoingTransitions = new EObjectContainmentWithInverseEList<Transition>(Transition.class, this, YakindummPackage.VERTEX__OUTGOING_TRANSITIONS, YakindummPackage.TRANSITION__SOURCE);

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..79dd5b80 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
@@ -75,6 +75,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Region createRegion() {

                 RegionImpl region = new RegionImpl();

                 return region;

@@ -85,6 +86,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Transition createTransition() {

                 TransitionImpl transition = new TransitionImpl();

                 return transition;

@@ -95,6 +97,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Statechart createStatechart() {

                 StatechartImpl statechart = new StatechartImpl();

                 return statechart;

@@ -105,6 +108,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Entry createEntry() {

                 EntryImpl entry = new EntryImpl();

                 return entry;

@@ -115,6 +119,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Synchronization createSynchronization() {

                 SynchronizationImpl synchronization = new SynchronizationImpl();

                 return synchronization;

@@ -125,6 +130,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public State createState() {

                 StateImpl state = new StateImpl();

                 return state;

@@ -135,6 +141,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Choice createChoice() {

                 ChoiceImpl choice = new ChoiceImpl();

                 return choice;

@@ -145,6 +152,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Exit createExit() {

                 ExitImpl exit = new ExitImpl();

                 return exit;

@@ -155,6 +163,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FinalState createFinalState() {

                 FinalStateImpl finalState = new FinalStateImpl();

                 return finalState;

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

          * @generated

          */

+        @Override

         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..ccb5cb6a 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
@@ -150,7 +150,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 +164,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 +178,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;

@@ -188,6 +188,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getPseudostate() {

                 return pseudostateEClass;

         }

@@ -197,6 +198,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getVertex() {

                 return vertexEClass;

         }

@@ -206,6 +208,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getVertex_IncomingTransitions() {

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

         }

@@ -215,6 +218,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getVertex_OutgoingTransitions() {

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

         }

@@ -224,6 +228,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getRegion() {

                 return regionEClass;

         }

@@ -233,6 +238,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getRegion_Vertices() {

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

         }

@@ -242,6 +248,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getTransition() {

                 return transitionEClass;

         }

@@ -251,6 +258,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getTransition_Target() {

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

         }

@@ -260,6 +268,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getTransition_Source() {

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

         }

@@ -269,6 +278,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getStatechart() {

                 return statechartEClass;

         }

@@ -278,6 +288,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getEntry() {

                 return entryEClass;

         }

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

          * @generated

          */

+        @Override

         public EClass getSynchronization() {

                 return synchronizationEClass;

         }

@@ -296,6 +308,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getState() {

                 return stateEClass;

         }

@@ -305,6 +318,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getRegularState() {

                 return regularStateEClass;

         }

@@ -314,6 +328,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getCompositeElement() {

                 return compositeElementEClass;

         }

@@ -323,6 +338,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getCompositeElement_Regions() {

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

         }

@@ -332,6 +348,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getChoice() {

                 return choiceEClass;

         }

@@ -341,6 +358,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getExit() {

                 return exitEClass;

         }

@@ -350,6 +368,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFinalState() {

                 return finalStateEClass;

         }

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

          * @generated

          */

+        @Override

         public YakindummFactory getYakindummFactory() {

                 return (YakindummFactory)getEFactoryInstance();

         }