Browse Source

Removed EAttribute priority from Region and Transition since it is unused.

Andreas Mülder 11 years ago
parent
commit
35ba11601b

+ 0 - 2
plugins/org.yakindu.sct.model.sgraph/model/emf/sgraph.ecore

@@ -14,7 +14,6 @@
   <eClassifiers xsi:type="ecore:EClass" name="Region" eSuperTypes="../../../org.yakindu.base.types/model/base.ecore#//NamedElement">
   <eClassifiers xsi:type="ecore:EClass" name="Region" eSuperTypes="../../../org.yakindu.base.types/model/base.ecore#//NamedElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="vertices" ordered="false"
     <eStructuralFeatures xsi:type="ecore:EReference" name="vertices" ordered="false"
         upperBound="-1" eType="#//Vertex" containment="true" eOpposite="#//Vertex/parentRegion"/>
         upperBound="-1" eType="#//Vertex" containment="true" eOpposite="#//Vertex/parentRegion"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="priority" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="composite" lowerBound="1"
     <eStructuralFeatures xsi:type="ecore:EReference" name="composite" lowerBound="1"
         eType="#//CompositeElement" eOpposite="#//CompositeElement/regions"/>
         eType="#//CompositeElement" eOpposite="#//CompositeElement/regions"/>
   </eClassifiers>
   </eClassifiers>
@@ -23,7 +22,6 @@
         lowerBound="1" eType="#//Vertex" eOpposite="#//Vertex/incomingTransitions"/>
         lowerBound="1" eType="#//Vertex" eOpposite="#//Vertex/incomingTransitions"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"
     <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"
         lowerBound="1" eType="#//Vertex" eOpposite="#//Vertex/outgoingTransitions"/>
         lowerBound="1" eType="#//Vertex" eOpposite="#//Vertex/outgoingTransitions"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="priority" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
   </eClassifiers>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FinalState" eSuperTypes="#//RegularState"/>
   <eClassifiers xsi:type="ecore:EClass" name="FinalState" eSuperTypes="#//RegularState"/>
   <eClassifiers xsi:type="ecore:EClass" name="Variable" abstract="true" eSuperTypes="#//Declaration"/>
   <eClassifiers xsi:type="ecore:EClass" name="Variable" abstract="true" eSuperTypes="#//Declaration"/>

+ 0 - 27
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/Region.java

@@ -22,7 +22,6 @@ import org.yakindu.base.base.NamedElement;
  * The following features are supported:
  * The following features are supported:
  * <ul>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgraph.Region#getVertices <em>Vertices</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.Region#getVertices <em>Vertices</em>}</li>
- *   <li>{@link org.yakindu.sct.model.sgraph.Region#getPriority <em>Priority</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.Region#getComposite <em>Composite</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.Region#getComposite <em>Composite</em>}</li>
  * </ul>
  * </ul>
  * </p>
  * </p>
@@ -57,32 +56,6 @@ public interface Region extends NamedElement {
 	 */
 	 */
 	EList<Vertex> getVertices();
 	EList<Vertex> getVertices();
 
 
-	/**
-	 * Returns the value of the '<em><b>Priority</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Priority</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Priority</em>' attribute.
-	 * @see #setPriority(int)
-	 * @see org.yakindu.sct.model.sgraph.SGraphPackage#getRegion_Priority()
-	 * @model
-	 * @generated
-	 */
-	int getPriority();
-
-	/**
-	 * Sets the value of the '{@link org.yakindu.sct.model.sgraph.Region#getPriority <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Priority</em>' attribute.
-	 * @see #getPriority()
-	 * @generated
-	 */
-	void setPriority(int value);
-
 	/**
 	/**
 	 * Returns the value of the '<em><b>Composite</b></em>' container reference.
 	 * Returns the value of the '<em><b>Composite</b></em>' container reference.
 	 * It is bidirectional and its opposite is '{@link org.yakindu.sct.model.sgraph.CompositeElement#getRegions <em>Regions</em>}'.
 	 * It is bidirectional and its opposite is '{@link org.yakindu.sct.model.sgraph.CompositeElement#getRegions <em>Regions</em>}'.

+ 3 - 59
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/SGraphPackage.java

@@ -210,15 +210,6 @@ public interface SGraphPackage extends EPackage {
 	 */
 	 */
 	int REGION__VERTICES = BasePackage.NAMED_ELEMENT_FEATURE_COUNT + 0;
 	int REGION__VERTICES = BasePackage.NAMED_ELEMENT_FEATURE_COUNT + 0;
 
 
-	/**
-	 * The feature id for the '<em><b>Priority</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__PRIORITY = BasePackage.NAMED_ELEMENT_FEATURE_COUNT + 1;
-
 	/**
 	/**
 	 * The feature id for the '<em><b>Composite</b></em>' container reference.
 	 * The feature id for the '<em><b>Composite</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- begin-user-doc -->
@@ -226,7 +217,7 @@ public interface SGraphPackage extends EPackage {
 	 * @generated
 	 * @generated
 	 * @ordered
 	 * @ordered
 	 */
 	 */
-	int REGION__COMPOSITE = BasePackage.NAMED_ELEMENT_FEATURE_COUNT + 2;
+	int REGION__COMPOSITE = BasePackage.NAMED_ELEMENT_FEATURE_COUNT + 1;
 
 
 	/**
 	/**
 	 * The number of structural features of the '<em>Region</em>' class.
 	 * The number of structural features of the '<em>Region</em>' class.
@@ -235,7 +226,7 @@ public interface SGraphPackage extends EPackage {
 	 * @generated
 	 * @generated
 	 * @ordered
 	 * @ordered
 	 */
 	 */
-	int REGION_FEATURE_COUNT = BasePackage.NAMED_ELEMENT_FEATURE_COUNT + 3;
+	int REGION_FEATURE_COUNT = BasePackage.NAMED_ELEMENT_FEATURE_COUNT + 2;
 
 
 	/**
 	/**
 	 * The meta object id for the '{@link org.yakindu.sct.model.sgraph.impl.SpecificationElementImpl <em>Specification Element</em>}' class.
 	 * The meta object id for the '{@link org.yakindu.sct.model.sgraph.impl.SpecificationElementImpl <em>Specification Element</em>}' class.
@@ -338,15 +329,6 @@ public interface SGraphPackage extends EPackage {
 	 */
 	 */
 	int TRANSITION__SOURCE = SPECIFICATION_ELEMENT_FEATURE_COUNT + 5;
 	int TRANSITION__SOURCE = SPECIFICATION_ELEMENT_FEATURE_COUNT + 5;
 
 
-	/**
-	 * The feature id for the '<em><b>Priority</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__PRIORITY = SPECIFICATION_ELEMENT_FEATURE_COUNT + 6;
-
 	/**
 	/**
 	 * The number of structural features of the '<em>Transition</em>' class.
 	 * The number of structural features of the '<em>Transition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- begin-user-doc -->
@@ -354,7 +336,7 @@ public interface SGraphPackage extends EPackage {
 	 * @generated
 	 * @generated
 	 * @ordered
 	 * @ordered
 	 */
 	 */
-	int TRANSITION_FEATURE_COUNT = SPECIFICATION_ELEMENT_FEATURE_COUNT + 7;
+	int TRANSITION_FEATURE_COUNT = SPECIFICATION_ELEMENT_FEATURE_COUNT + 6;
 
 
 	/**
 	/**
 	 * The meta object id for the '{@link org.yakindu.sct.model.sgraph.impl.RegularStateImpl <em>Regular State</em>}' class.
 	 * The meta object id for the '{@link org.yakindu.sct.model.sgraph.impl.RegularStateImpl <em>Regular State</em>}' class.
@@ -1426,17 +1408,6 @@ public interface SGraphPackage extends EPackage {
 	 */
 	 */
 	EReference getRegion_Vertices();
 	EReference getRegion_Vertices();
 
 
-	/**
-	 * Returns the meta object for the attribute '{@link org.yakindu.sct.model.sgraph.Region#getPriority <em>Priority</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Priority</em>'.
-	 * @see org.yakindu.sct.model.sgraph.Region#getPriority()
-	 * @see #getRegion()
-	 * @generated
-	 */
-	EAttribute getRegion_Priority();
-
 	/**
 	/**
 	 * Returns the meta object for the container reference '{@link org.yakindu.sct.model.sgraph.Region#getComposite <em>Composite</em>}'.
 	 * Returns the meta object for the container reference '{@link org.yakindu.sct.model.sgraph.Region#getComposite <em>Composite</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- begin-user-doc -->
@@ -1480,17 +1451,6 @@ public interface SGraphPackage extends EPackage {
 	 */
 	 */
 	EReference getTransition_Source();
 	EReference getTransition_Source();
 
 
-	/**
-	 * Returns the meta object for the attribute '{@link org.yakindu.sct.model.sgraph.Transition#getPriority <em>Priority</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Priority</em>'.
-	 * @see org.yakindu.sct.model.sgraph.Transition#getPriority()
-	 * @see #getTransition()
-	 * @generated
-	 */
-	EAttribute getTransition_Priority();
-
 	/**
 	/**
 	 * Returns the meta object for class '{@link org.yakindu.sct.model.sgraph.FinalState <em>Final State</em>}'.
 	 * Returns the meta object for class '{@link org.yakindu.sct.model.sgraph.FinalState <em>Final State</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- begin-user-doc -->
@@ -2036,14 +1996,6 @@ public interface SGraphPackage extends EPackage {
 		 */
 		 */
 		EReference REGION__VERTICES = eINSTANCE.getRegion_Vertices();
 		EReference REGION__VERTICES = eINSTANCE.getRegion_Vertices();
 
 
-		/**
-		 * The meta object literal for the '<em><b>Priority</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute REGION__PRIORITY = eINSTANCE.getRegion_Priority();
-
 		/**
 		/**
 		 * The meta object literal for the '<em><b>Composite</b></em>' container reference feature.
 		 * The meta object literal for the '<em><b>Composite</b></em>' container reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- begin-user-doc -->
@@ -2078,14 +2030,6 @@ public interface SGraphPackage extends EPackage {
 		 */
 		 */
 		EReference TRANSITION__SOURCE = eINSTANCE.getTransition_Source();
 		EReference TRANSITION__SOURCE = eINSTANCE.getTransition_Source();
 
 
-		/**
-		 * The meta object literal for the '<em><b>Priority</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TRANSITION__PRIORITY = eINSTANCE.getTransition_Priority();
-
 		/**
 		/**
 		 * The meta object literal for the '{@link org.yakindu.sct.model.sgraph.impl.FinalStateImpl <em>Final State</em>}' class.
 		 * The meta object literal for the '{@link org.yakindu.sct.model.sgraph.impl.FinalStateImpl <em>Final State</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- begin-user-doc -->

+ 0 - 27
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/Transition.java

@@ -23,7 +23,6 @@ import org.yakindu.base.base.DocumentedElement;
  * <ul>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgraph.Transition#getTarget <em>Target</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.Transition#getTarget <em>Target</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.Transition#getSource <em>Source</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.Transition#getSource <em>Source</em>}</li>
- *   <li>{@link org.yakindu.sct.model.sgraph.Transition#getPriority <em>Priority</em>}</li>
  * </ul>
  * </ul>
  * </p>
  * </p>
  *
  *
@@ -95,30 +94,4 @@ public interface Transition extends SpecificationElement, Reaction, DocumentedEl
 	 */
 	 */
 	void setSource(Vertex value);
 	void setSource(Vertex value);
 
 
-	/**
-	 * Returns the value of the '<em><b>Priority</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Priority</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Priority</em>' attribute.
-	 * @see #setPriority(int)
-	 * @see org.yakindu.sct.model.sgraph.SGraphPackage#getTransition_Priority()
-	 * @model
-	 * @generated
-	 */
-	int getPriority();
-
-	/**
-	 * Sets the value of the '{@link org.yakindu.sct.model.sgraph.Transition#getPriority <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Priority</em>' attribute.
-	 * @see #getPriority()
-	 * @generated
-	 */
-	void setPriority(int value);
-
 } // Transition
 } // Transition

+ 0 - 68
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/impl/RegionImpl.java

@@ -35,7 +35,6 @@ import org.yakindu.sct.model.sgraph.Vertex;
  * The following features are implemented:
  * The following features are implemented:
  * <ul>
  * <ul>
  *   <li>{@link org.yakindu.sct.model.sgraph.impl.RegionImpl#getVertices <em>Vertices</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.impl.RegionImpl#getVertices <em>Vertices</em>}</li>
- *   <li>{@link org.yakindu.sct.model.sgraph.impl.RegionImpl#getPriority <em>Priority</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.impl.RegionImpl#getComposite <em>Composite</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.impl.RegionImpl#getComposite <em>Composite</em>}</li>
  * </ul>
  * </ul>
  * </p>
  * </p>
@@ -60,26 +59,6 @@ public class RegionImpl extends NamedElementImpl implements Region {
 	 */
 	 */
 	protected EList<Vertex> vertices;
 	protected EList<Vertex> vertices;
 
 
-	/**
-	 * The default value of the '{@link #getPriority() <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPriority()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int PRIORITY_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getPriority() <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPriority()
-	 * @generated
-	 * @ordered
-	 */
-	protected int priority = PRIORITY_EDEFAULT;
-
 	/**
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- end-user-doc -->
@@ -111,27 +90,6 @@ public class RegionImpl extends NamedElementImpl implements Region {
 		return vertices;
 		return vertices;
 	}
 	}
 
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getPriority() {
-		return priority;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPriority(int newPriority) {
-		int oldPriority = priority;
-		priority = newPriority;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SGraphPackage.REGION__PRIORITY, oldPriority, priority));
-	}
-
 	/**
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- end-user-doc -->
@@ -242,8 +200,6 @@ public class RegionImpl extends NamedElementImpl implements Region {
 		switch (featureID) {
 		switch (featureID) {
 			case SGraphPackage.REGION__VERTICES:
 			case SGraphPackage.REGION__VERTICES:
 				return getVertices();
 				return getVertices();
-			case SGraphPackage.REGION__PRIORITY:
-				return getPriority();
 			case SGraphPackage.REGION__COMPOSITE:
 			case SGraphPackage.REGION__COMPOSITE:
 				if (resolve) return getComposite();
 				if (resolve) return getComposite();
 				return basicGetComposite();
 				return basicGetComposite();
@@ -264,9 +220,6 @@ public class RegionImpl extends NamedElementImpl implements Region {
 				getVertices().clear();
 				getVertices().clear();
 				getVertices().addAll((Collection<? extends Vertex>)newValue);
 				getVertices().addAll((Collection<? extends Vertex>)newValue);
 				return;
 				return;
-			case SGraphPackage.REGION__PRIORITY:
-				setPriority((Integer)newValue);
-				return;
 			case SGraphPackage.REGION__COMPOSITE:
 			case SGraphPackage.REGION__COMPOSITE:
 				setComposite((CompositeElement)newValue);
 				setComposite((CompositeElement)newValue);
 				return;
 				return;
@@ -285,9 +238,6 @@ public class RegionImpl extends NamedElementImpl implements Region {
 			case SGraphPackage.REGION__VERTICES:
 			case SGraphPackage.REGION__VERTICES:
 				getVertices().clear();
 				getVertices().clear();
 				return;
 				return;
-			case SGraphPackage.REGION__PRIORITY:
-				setPriority(PRIORITY_EDEFAULT);
-				return;
 			case SGraphPackage.REGION__COMPOSITE:
 			case SGraphPackage.REGION__COMPOSITE:
 				setComposite((CompositeElement)null);
 				setComposite((CompositeElement)null);
 				return;
 				return;
@@ -305,28 +255,10 @@ public class RegionImpl extends NamedElementImpl implements Region {
 		switch (featureID) {
 		switch (featureID) {
 			case SGraphPackage.REGION__VERTICES:
 			case SGraphPackage.REGION__VERTICES:
 				return vertices != null && !vertices.isEmpty();
 				return vertices != null && !vertices.isEmpty();
-			case SGraphPackage.REGION__PRIORITY:
-				return priority != PRIORITY_EDEFAULT;
 			case SGraphPackage.REGION__COMPOSITE:
 			case SGraphPackage.REGION__COMPOSITE:
 				return basicGetComposite() != null;
 				return basicGetComposite() != null;
 		}
 		}
 		return super.eIsSet(featureID);
 		return super.eIsSet(featureID);
 	}
 	}
 
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (priority: ");
-		result.append(priority);
-		result.append(')');
-		return result.toString();
-	}
-
 } //RegionImpl
 } //RegionImpl

+ 1 - 1
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/impl/SGraphFactoryImpl.java

@@ -56,7 +56,7 @@ public class SGraphFactoryImpl extends EFactoryImpl implements SGraphFactory {
 	 */
 	 */
 	public static SGraphFactory init() {
 	public static SGraphFactory init() {
 		try {
 		try {
-			SGraphFactory theSGraphFactory = (SGraphFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.yakindu.org/sct/sgraph/2.0.0"); 
+			SGraphFactory theSGraphFactory = (SGraphFactory)EPackage.Registry.INSTANCE.getEFactory(SGraphPackage.eNS_URI);
 			if (theSGraphFactory != null) {
 			if (theSGraphFactory != null) {
 				return theSGraphFactory;
 				return theSGraphFactory;
 			}
 			}

+ 1 - 23
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/impl/SGraphPackageImpl.java

@@ -377,22 +377,13 @@ public class SGraphPackageImpl extends EPackageImpl implements SGraphPackage {
 		return (EReference)regionEClass.getEStructuralFeatures().get(0);
 		return (EReference)regionEClass.getEStructuralFeatures().get(0);
 	}
 	}
 
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRegion_Priority() {
-		return (EAttribute)regionEClass.getEStructuralFeatures().get(1);
-	}
-
 	/**
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @generated
 	 */
 	 */
 	public EReference getRegion_Composite() {
 	public EReference getRegion_Composite() {
-		return (EReference)regionEClass.getEStructuralFeatures().get(2);
+		return (EReference)regionEClass.getEStructuralFeatures().get(1);
 	}
 	}
 
 
 	/**
 	/**
@@ -422,15 +413,6 @@ public class SGraphPackageImpl extends EPackageImpl implements SGraphPackage {
 		return (EReference)transitionEClass.getEStructuralFeatures().get(1);
 		return (EReference)transitionEClass.getEStructuralFeatures().get(1);
 	}
 	}
 
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTransition_Priority() {
-		return (EAttribute)transitionEClass.getEStructuralFeatures().get(2);
-	}
-
 	/**
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- end-user-doc -->
@@ -864,13 +846,11 @@ public class SGraphPackageImpl extends EPackageImpl implements SGraphPackage {
 
 
 		regionEClass = createEClass(REGION);
 		regionEClass = createEClass(REGION);
 		createEReference(regionEClass, REGION__VERTICES);
 		createEReference(regionEClass, REGION__VERTICES);
-		createEAttribute(regionEClass, REGION__PRIORITY);
 		createEReference(regionEClass, REGION__COMPOSITE);
 		createEReference(regionEClass, REGION__COMPOSITE);
 
 
 		transitionEClass = createEClass(TRANSITION);
 		transitionEClass = createEClass(TRANSITION);
 		createEReference(transitionEClass, TRANSITION__TARGET);
 		createEReference(transitionEClass, TRANSITION__TARGET);
 		createEReference(transitionEClass, TRANSITION__SOURCE);
 		createEReference(transitionEClass, TRANSITION__SOURCE);
-		createEAttribute(transitionEClass, TRANSITION__PRIORITY);
 
 
 		finalStateEClass = createEClass(FINAL_STATE);
 		finalStateEClass = createEClass(FINAL_STATE);
 
 
@@ -1009,13 +989,11 @@ public class SGraphPackageImpl extends EPackageImpl implements SGraphPackage {
 
 
 		initEClass(regionEClass, Region.class, "Region", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(regionEClass, Region.class, "Region", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getRegion_Vertices(), this.getVertex(), this.getVertex_ParentRegion(), "vertices", null, 0, -1, Region.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getRegion_Vertices(), this.getVertex(), this.getVertex_ParentRegion(), "vertices", null, 0, -1, Region.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getRegion_Priority(), ecorePackage.getEInt(), "priority", null, 0, 1, Region.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getRegion_Composite(), this.getCompositeElement(), this.getCompositeElement_Regions(), "composite", null, 1, 1, Region.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getRegion_Composite(), this.getCompositeElement(), this.getCompositeElement_Regions(), "composite", null, 1, 1, Region.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 
 		initEClass(transitionEClass, Transition.class, "Transition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(transitionEClass, Transition.class, "Transition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getTransition_Target(), this.getVertex(), this.getVertex_IncomingTransitions(), "target", null, 1, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getTransition_Target(), this.getVertex(), this.getVertex_IncomingTransitions(), "target", null, 1, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getTransition_Source(), this.getVertex(), this.getVertex_OutgoingTransitions(), "source", null, 1, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getTransition_Source(), this.getVertex(), this.getVertex_OutgoingTransitions(), "source", null, 1, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getTransition_Priority(), ecorePackage.getEInt(), "priority", null, 0, 1, Transition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 
 		initEClass(finalStateEClass, FinalState.class, "FinalState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEClass(finalStateEClass, FinalState.class, "FinalState", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 

File diff suppressed because it is too large
+ 259 - 405
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/impl/StateImpl.java


+ 116 - 190
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/impl/StatechartImpl.java

@@ -41,39 +41,29 @@ import org.yakindu.sct.model.sgraph.Statechart;
  * <p>
  * <p>
  * The following features are implemented:
  * The following features are implemented:
  * <ul>
  * <ul>
- * <li>{@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getReactions <em>
- * Reactions</em>}</li>
- * <li>
- * {@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getLocalReactions
- * <em>Local Reactions</em>}</li>
- * <li>{@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getScopes <em>
- * Scopes</em>}</li>
- * <li>{@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getNamespace <em>
- * Namespace</em>}</li>
- * <li>{@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getRegions <em>
- * Regions</em>}</li>
- * <li>{@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getName <em>Name
- * </em>}</li>
- * <li>{@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getDocumentation
- * <em>Documentation</em>}</li>
+ *   <li>{@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getReactions <em>Reactions</em>}</li>
+ *   <li>{@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getLocalReactions <em>Local Reactions</em>}</li>
+ *   <li>{@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getScopes <em>Scopes</em>}</li>
+ *   <li>{@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getNamespace <em>Namespace</em>}</li>
+ *   <li>{@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getRegions <em>Regions</em>}</li>
+ *   <li>{@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.yakindu.sct.model.sgraph.impl.StatechartImpl#getDocumentation <em>Documentation</em>}</li>
  * </ul>
  * </ul>
  * </p>
  * </p>
- * 
+ *
  * @generated
  * @generated
  */
  */
 public class StatechartImpl extends SpecificationElementImpl implements
 public class StatechartImpl extends SpecificationElementImpl implements
 		Statechart {
 		Statechart {
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	public static final String copyright = "Copyright (c) 2011 committers of YAKINDU and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\nContributors:\r\ncommitters of YAKINDU - initial API and implementation\r\n";
 	public static final String copyright = "Copyright (c) 2011 committers of YAKINDU and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\nContributors:\r\ncommitters of YAKINDU - initial API and implementation\r\n";
 
 
 	/**
 	/**
-	 * The cached value of the '{@link #getScopes() <em>Scopes</em>}'
-	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getScopes() <em>Scopes</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getScopes()
 	 * @see #getScopes()
 	 * @generated
 	 * @generated
 	 * @ordered
 	 * @ordered
@@ -81,9 +71,8 @@ public class StatechartImpl extends SpecificationElementImpl implements
 	protected EList<Scope> scopes;
 	protected EList<Scope> scopes;
 
 
 	/**
 	/**
-	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getNamespace()
 	 * @see #getNamespace()
 	 * @generated
 	 * @generated
 	 * @ordered
 	 * @ordered
@@ -91,9 +80,8 @@ public class StatechartImpl extends SpecificationElementImpl implements
 	protected static final String NAMESPACE_EDEFAULT = null;
 	protected static final String NAMESPACE_EDEFAULT = null;
 
 
 	/**
 	/**
-	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getNamespace()
 	 * @see #getNamespace()
 	 * @generated
 	 * @generated
 	 * @ordered
 	 * @ordered
@@ -101,9 +89,8 @@ public class StatechartImpl extends SpecificationElementImpl implements
 	protected String namespace = NAMESPACE_EDEFAULT;
 	protected String namespace = NAMESPACE_EDEFAULT;
 
 
 	/**
 	/**
-	 * The cached value of the '{@link #getRegions() <em>Regions</em>}'
-	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getRegions() <em>Regions</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getRegions()
 	 * @see #getRegions()
 	 * @generated
 	 * @generated
 	 * @ordered
 	 * @ordered
@@ -113,7 +100,6 @@ public class StatechartImpl extends SpecificationElementImpl implements
 	/**
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getName()
 	 * @see #getName()
 	 * @generated
 	 * @generated
 	 * @ordered
 	 * @ordered
@@ -123,7 +109,6 @@ public class StatechartImpl extends SpecificationElementImpl implements
 	/**
 	/**
 	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getName()
 	 * @see #getName()
 	 * @generated
 	 * @generated
 	 * @ordered
 	 * @ordered
@@ -131,10 +116,9 @@ public class StatechartImpl extends SpecificationElementImpl implements
 	protected String name = NAME_EDEFAULT;
 	protected String name = NAME_EDEFAULT;
 
 
 	/**
 	/**
-	 * The default value of the '{@link #getDocumentation()
-	 * <em>Documentation</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * end-user-doc -->
-	 * 
 	 * @see #getDocumentation()
 	 * @see #getDocumentation()
 	 * @generated
 	 * @generated
 	 * @ordered
 	 * @ordered
@@ -142,10 +126,9 @@ public class StatechartImpl extends SpecificationElementImpl implements
 	protected static final String DOCUMENTATION_EDEFAULT = null;
 	protected static final String DOCUMENTATION_EDEFAULT = null;
 
 
 	/**
 	/**
-	 * The cached value of the '{@link #getDocumentation()
-	 * <em>Documentation</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * end-user-doc -->
-	 * 
 	 * @see #getDocumentation()
 	 * @see #getDocumentation()
 	 * @generated
 	 * @generated
 	 * @ordered
 	 * @ordered
@@ -154,7 +137,6 @@ public class StatechartImpl extends SpecificationElementImpl implements
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	protected StatechartImpl() {
 	protected StatechartImpl() {
@@ -163,7 +145,6 @@ public class StatechartImpl extends SpecificationElementImpl implements
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	@Override
 	@Override
@@ -205,20 +186,17 @@ public class StatechartImpl extends SpecificationElementImpl implements
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	public EList<Scope> getScopes() {
 	public EList<Scope> getScopes() {
 		if (scopes == null) {
 		if (scopes == null) {
-			scopes = new EObjectContainmentEList.Resolving<Scope>(Scope.class,
-					this, SGraphPackage.STATECHART__SCOPES);
+			scopes = new EObjectContainmentEList.Resolving<Scope>(Scope.class, this, SGraphPackage.STATECHART__SCOPES);
 		}
 		}
 		return scopes;
 		return scopes;
 	}
 	}
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	public String getNamespace() {
 	public String getNamespace() {
@@ -227,35 +205,28 @@ public class StatechartImpl extends SpecificationElementImpl implements
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	public void setNamespace(String newNamespace) {
 	public void setNamespace(String newNamespace) {
 		String oldNamespace = namespace;
 		String oldNamespace = namespace;
 		namespace = newNamespace;
 		namespace = newNamespace;
 		if (eNotificationRequired())
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					SGraphPackage.STATECHART__NAMESPACE, oldNamespace,
-					namespace));
+			eNotify(new ENotificationImpl(this, Notification.SET, SGraphPackage.STATECHART__NAMESPACE, oldNamespace, namespace));
 	}
 	}
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	public EList<Region> getRegions() {
 	public EList<Region> getRegions() {
 		if (regions == null) {
 		if (regions == null) {
-			regions = new EObjectContainmentWithInverseEList.Resolving<Region>(
-					Region.class, this, SGraphPackage.STATECHART__REGIONS,
-					SGraphPackage.REGION__COMPOSITE);
+			regions = new EObjectContainmentWithInverseEList.Resolving<Region>(Region.class, this, SGraphPackage.STATECHART__REGIONS, SGraphPackage.REGION__COMPOSITE);
 		}
 		}
 		return regions;
 		return regions;
 	}
 	}
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	public String getName() {
 	public String getName() {
@@ -264,20 +235,17 @@ public class StatechartImpl extends SpecificationElementImpl implements
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	public void setName(String newName) {
 	public void setName(String newName) {
 		String oldName = name;
 		String oldName = name;
 		name = newName;
 		name = newName;
 		if (eNotificationRequired())
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					SGraphPackage.STATECHART__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, SGraphPackage.STATECHART__NAME, oldName, name));
 	}
 	}
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	public String getDocumentation() {
 	public String getDocumentation() {
@@ -286,21 +254,17 @@ public class StatechartImpl extends SpecificationElementImpl implements
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	public void setDocumentation(String newDocumentation) {
 	public void setDocumentation(String newDocumentation) {
 		String oldDocumentation = documentation;
 		String oldDocumentation = documentation;
 		documentation = newDocumentation;
 		documentation = newDocumentation;
 		if (eNotificationRequired())
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					SGraphPackage.STATECHART__DOCUMENTATION, oldDocumentation,
-					documentation));
+			eNotify(new ENotificationImpl(this, Notification.SET, SGraphPackage.STATECHART__DOCUMENTATION, oldDocumentation, documentation));
 	}
 	}
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
@@ -308,192 +272,169 @@ public class StatechartImpl extends SpecificationElementImpl implements
 	public NotificationChain eInverseAdd(InternalEObject otherEnd,
 	public NotificationChain eInverseAdd(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 		switch (featureID) {
-		case SGraphPackage.STATECHART__REGIONS:
-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getRegions())
-					.basicAdd(otherEnd, msgs);
+			case SGraphPackage.STATECHART__REGIONS:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getRegions()).basicAdd(otherEnd, msgs);
 		}
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 	}
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	@Override
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 		switch (featureID) {
-		case SGraphPackage.STATECHART__SCOPES:
-			return ((InternalEList<?>) getScopes()).basicRemove(otherEnd, msgs);
-		case SGraphPackage.STATECHART__REGIONS:
-			return ((InternalEList<?>) getRegions())
-					.basicRemove(otherEnd, msgs);
+			case SGraphPackage.STATECHART__SCOPES:
+				return ((InternalEList<?>)getScopes()).basicRemove(otherEnd, msgs);
+			case SGraphPackage.STATECHART__REGIONS:
+				return ((InternalEList<?>)getRegions()).basicRemove(otherEnd, msgs);
 		}
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 	}
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	@Override
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 		switch (featureID) {
-		case SGraphPackage.STATECHART__REACTIONS:
-			return getReactions();
-		case SGraphPackage.STATECHART__LOCAL_REACTIONS:
-			return getLocalReactions();
-		case SGraphPackage.STATECHART__SCOPES:
-			return getScopes();
-		case SGraphPackage.STATECHART__NAMESPACE:
-			return getNamespace();
-		case SGraphPackage.STATECHART__REGIONS:
-			return getRegions();
-		case SGraphPackage.STATECHART__NAME:
-			return getName();
-		case SGraphPackage.STATECHART__DOCUMENTATION:
-			return getDocumentation();
+			case SGraphPackage.STATECHART__REACTIONS:
+				return getReactions();
+			case SGraphPackage.STATECHART__LOCAL_REACTIONS:
+				return getLocalReactions();
+			case SGraphPackage.STATECHART__SCOPES:
+				return getScopes();
+			case SGraphPackage.STATECHART__NAMESPACE:
+				return getNamespace();
+			case SGraphPackage.STATECHART__REGIONS:
+				return getRegions();
+			case SGraphPackage.STATECHART__NAME:
+				return getName();
+			case SGraphPackage.STATECHART__DOCUMENTATION:
+				return getDocumentation();
 		}
 		}
 		return super.eGet(featureID, resolve, coreType);
 		return super.eGet(featureID, resolve, coreType);
 	}
 	}
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
 	public void eSet(int featureID, Object newValue) {
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 		switch (featureID) {
-		case SGraphPackage.STATECHART__SCOPES:
-			getScopes().clear();
-			getScopes().addAll((Collection<? extends Scope>) newValue);
-			return;
-		case SGraphPackage.STATECHART__NAMESPACE:
-			setNamespace((String) newValue);
-			return;
-		case SGraphPackage.STATECHART__REGIONS:
-			getRegions().clear();
-			getRegions().addAll((Collection<? extends Region>) newValue);
-			return;
-		case SGraphPackage.STATECHART__NAME:
-			setName((String) newValue);
-			return;
-		case SGraphPackage.STATECHART__DOCUMENTATION:
-			setDocumentation((String) newValue);
-			return;
+			case SGraphPackage.STATECHART__SCOPES:
+				getScopes().clear();
+				getScopes().addAll((Collection<? extends Scope>)newValue);
+				return;
+			case SGraphPackage.STATECHART__NAMESPACE:
+				setNamespace((String)newValue);
+				return;
+			case SGraphPackage.STATECHART__REGIONS:
+				getRegions().clear();
+				getRegions().addAll((Collection<? extends Region>)newValue);
+				return;
+			case SGraphPackage.STATECHART__NAME:
+				setName((String)newValue);
+				return;
+			case SGraphPackage.STATECHART__DOCUMENTATION:
+				setDocumentation((String)newValue);
+				return;
 		}
 		}
 		super.eSet(featureID, newValue);
 		super.eSet(featureID, newValue);
 	}
 	}
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	@Override
 	@Override
 	public void eUnset(int featureID) {
 	public void eUnset(int featureID) {
 		switch (featureID) {
 		switch (featureID) {
-		case SGraphPackage.STATECHART__SCOPES:
-			getScopes().clear();
-			return;
-		case SGraphPackage.STATECHART__NAMESPACE:
-			setNamespace(NAMESPACE_EDEFAULT);
-			return;
-		case SGraphPackage.STATECHART__REGIONS:
-			getRegions().clear();
-			return;
-		case SGraphPackage.STATECHART__NAME:
-			setName(NAME_EDEFAULT);
-			return;
-		case SGraphPackage.STATECHART__DOCUMENTATION:
-			setDocumentation(DOCUMENTATION_EDEFAULT);
-			return;
+			case SGraphPackage.STATECHART__SCOPES:
+				getScopes().clear();
+				return;
+			case SGraphPackage.STATECHART__NAMESPACE:
+				setNamespace(NAMESPACE_EDEFAULT);
+				return;
+			case SGraphPackage.STATECHART__REGIONS:
+				getRegions().clear();
+				return;
+			case SGraphPackage.STATECHART__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case SGraphPackage.STATECHART__DOCUMENTATION:
+				setDocumentation(DOCUMENTATION_EDEFAULT);
+				return;
 		}
 		}
 		super.eUnset(featureID);
 		super.eUnset(featureID);
 	}
 	}
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	@Override
 	@Override
 	public boolean eIsSet(int featureID) {
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
 		switch (featureID) {
-		case SGraphPackage.STATECHART__REACTIONS:
-			return !getReactions().isEmpty();
-		case SGraphPackage.STATECHART__LOCAL_REACTIONS:
-			return !getLocalReactions().isEmpty();
-		case SGraphPackage.STATECHART__SCOPES:
-			return scopes != null && !scopes.isEmpty();
-		case SGraphPackage.STATECHART__NAMESPACE:
-			return NAMESPACE_EDEFAULT == null ? namespace != null
-					: !NAMESPACE_EDEFAULT.equals(namespace);
-		case SGraphPackage.STATECHART__REGIONS:
-			return regions != null && !regions.isEmpty();
-		case SGraphPackage.STATECHART__NAME:
-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
-					.equals(name);
-		case SGraphPackage.STATECHART__DOCUMENTATION:
-			return DOCUMENTATION_EDEFAULT == null ? documentation != null
-					: !DOCUMENTATION_EDEFAULT.equals(documentation);
+			case SGraphPackage.STATECHART__REACTIONS:
+				return !getReactions().isEmpty();
+			case SGraphPackage.STATECHART__LOCAL_REACTIONS:
+				return !getLocalReactions().isEmpty();
+			case SGraphPackage.STATECHART__SCOPES:
+				return scopes != null && !scopes.isEmpty();
+			case SGraphPackage.STATECHART__NAMESPACE:
+				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);
+			case SGraphPackage.STATECHART__REGIONS:
+				return regions != null && !regions.isEmpty();
+			case SGraphPackage.STATECHART__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case SGraphPackage.STATECHART__DOCUMENTATION:
+				return DOCUMENTATION_EDEFAULT == null ? documentation != null : !DOCUMENTATION_EDEFAULT.equals(documentation);
 		}
 		}
 		return super.eIsSet(featureID);
 		return super.eIsSet(featureID);
 	}
 	}
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	@Override
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
 		if (baseClass == ReactiveElement.class) {
 		if (baseClass == ReactiveElement.class) {
 			switch (derivedFeatureID) {
 			switch (derivedFeatureID) {
-			case SGraphPackage.STATECHART__REACTIONS:
-				return SGraphPackage.REACTIVE_ELEMENT__REACTIONS;
-			case SGraphPackage.STATECHART__LOCAL_REACTIONS:
-				return SGraphPackage.REACTIVE_ELEMENT__LOCAL_REACTIONS;
-			default:
-				return -1;
+				case SGraphPackage.STATECHART__REACTIONS: return SGraphPackage.REACTIVE_ELEMENT__REACTIONS;
+				case SGraphPackage.STATECHART__LOCAL_REACTIONS: return SGraphPackage.REACTIVE_ELEMENT__LOCAL_REACTIONS;
+				default: return -1;
 			}
 			}
 		}
 		}
 		if (baseClass == ScopedElement.class) {
 		if (baseClass == ScopedElement.class) {
 			switch (derivedFeatureID) {
 			switch (derivedFeatureID) {
-			case SGraphPackage.STATECHART__SCOPES:
-				return SGraphPackage.SCOPED_ELEMENT__SCOPES;
-			case SGraphPackage.STATECHART__NAMESPACE:
-				return SGraphPackage.SCOPED_ELEMENT__NAMESPACE;
-			default:
-				return -1;
+				case SGraphPackage.STATECHART__SCOPES: return SGraphPackage.SCOPED_ELEMENT__SCOPES;
+				case SGraphPackage.STATECHART__NAMESPACE: return SGraphPackage.SCOPED_ELEMENT__NAMESPACE;
+				default: return -1;
 			}
 			}
 		}
 		}
 		if (baseClass == CompositeElement.class) {
 		if (baseClass == CompositeElement.class) {
 			switch (derivedFeatureID) {
 			switch (derivedFeatureID) {
-			case SGraphPackage.STATECHART__REGIONS:
-				return SGraphPackage.COMPOSITE_ELEMENT__REGIONS;
-			default:
-				return -1;
+				case SGraphPackage.STATECHART__REGIONS: return SGraphPackage.COMPOSITE_ELEMENT__REGIONS;
+				default: return -1;
 			}
 			}
 		}
 		}
 		if (baseClass == NamedElement.class) {
 		if (baseClass == NamedElement.class) {
 			switch (derivedFeatureID) {
 			switch (derivedFeatureID) {
-			case SGraphPackage.STATECHART__NAME:
-				return BasePackage.NAMED_ELEMENT__NAME;
-			default:
-				return -1;
+				case SGraphPackage.STATECHART__NAME: return BasePackage.NAMED_ELEMENT__NAME;
+				default: return -1;
 			}
 			}
 		}
 		}
 		if (baseClass == DocumentedElement.class) {
 		if (baseClass == DocumentedElement.class) {
 			switch (derivedFeatureID) {
 			switch (derivedFeatureID) {
-			case SGraphPackage.STATECHART__DOCUMENTATION:
-				return BasePackage.DOCUMENTED_ELEMENT__DOCUMENTATION;
-			default:
-				return -1;
+				case SGraphPackage.STATECHART__DOCUMENTATION: return BasePackage.DOCUMENTED_ELEMENT__DOCUMENTATION;
+				default: return -1;
 			}
 			}
 		}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -501,53 +442,40 @@ public class StatechartImpl extends SpecificationElementImpl implements
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	@Override
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
 		if (baseClass == ReactiveElement.class) {
 		if (baseClass == ReactiveElement.class) {
 			switch (baseFeatureID) {
 			switch (baseFeatureID) {
-			case SGraphPackage.REACTIVE_ELEMENT__REACTIONS:
-				return SGraphPackage.STATECHART__REACTIONS;
-			case SGraphPackage.REACTIVE_ELEMENT__LOCAL_REACTIONS:
-				return SGraphPackage.STATECHART__LOCAL_REACTIONS;
-			default:
-				return -1;
+				case SGraphPackage.REACTIVE_ELEMENT__REACTIONS: return SGraphPackage.STATECHART__REACTIONS;
+				case SGraphPackage.REACTIVE_ELEMENT__LOCAL_REACTIONS: return SGraphPackage.STATECHART__LOCAL_REACTIONS;
+				default: return -1;
 			}
 			}
 		}
 		}
 		if (baseClass == ScopedElement.class) {
 		if (baseClass == ScopedElement.class) {
 			switch (baseFeatureID) {
 			switch (baseFeatureID) {
-			case SGraphPackage.SCOPED_ELEMENT__SCOPES:
-				return SGraphPackage.STATECHART__SCOPES;
-			case SGraphPackage.SCOPED_ELEMENT__NAMESPACE:
-				return SGraphPackage.STATECHART__NAMESPACE;
-			default:
-				return -1;
+				case SGraphPackage.SCOPED_ELEMENT__SCOPES: return SGraphPackage.STATECHART__SCOPES;
+				case SGraphPackage.SCOPED_ELEMENT__NAMESPACE: return SGraphPackage.STATECHART__NAMESPACE;
+				default: return -1;
 			}
 			}
 		}
 		}
 		if (baseClass == CompositeElement.class) {
 		if (baseClass == CompositeElement.class) {
 			switch (baseFeatureID) {
 			switch (baseFeatureID) {
-			case SGraphPackage.COMPOSITE_ELEMENT__REGIONS:
-				return SGraphPackage.STATECHART__REGIONS;
-			default:
-				return -1;
+				case SGraphPackage.COMPOSITE_ELEMENT__REGIONS: return SGraphPackage.STATECHART__REGIONS;
+				default: return -1;
 			}
 			}
 		}
 		}
 		if (baseClass == NamedElement.class) {
 		if (baseClass == NamedElement.class) {
 			switch (baseFeatureID) {
 			switch (baseFeatureID) {
-			case BasePackage.NAMED_ELEMENT__NAME:
-				return SGraphPackage.STATECHART__NAME;
-			default:
-				return -1;
+				case BasePackage.NAMED_ELEMENT__NAME: return SGraphPackage.STATECHART__NAME;
+				default: return -1;
 			}
 			}
 		}
 		}
 		if (baseClass == DocumentedElement.class) {
 		if (baseClass == DocumentedElement.class) {
 			switch (baseFeatureID) {
 			switch (baseFeatureID) {
-			case BasePackage.DOCUMENTED_ELEMENT__DOCUMENTATION:
-				return SGraphPackage.STATECHART__DOCUMENTATION;
-			default:
-				return -1;
+				case BasePackage.DOCUMENTED_ELEMENT__DOCUMENTATION: return SGraphPackage.STATECHART__DOCUMENTATION;
+				default: return -1;
 			}
 			}
 		}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
@@ -555,13 +483,11 @@ public class StatechartImpl extends SpecificationElementImpl implements
 
 
 	/**
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @generated
 	 */
 	 */
 	@Override
 	@Override
 	public String toString() {
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 
 		StringBuffer result = new StringBuffer(super.toString());
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (namespace: ");
 		result.append(" (namespace: ");

+ 0 - 54
plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/impl/TransitionImpl.java

@@ -43,7 +43,6 @@ import org.yakindu.sct.model.sgraph.Vertex;
  *   <li>{@link org.yakindu.sct.model.sgraph.impl.TransitionImpl#getDocumentation <em>Documentation</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.impl.TransitionImpl#getDocumentation <em>Documentation</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.impl.TransitionImpl#getTarget <em>Target</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.impl.TransitionImpl#getTarget <em>Target</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.impl.TransitionImpl#getSource <em>Source</em>}</li>
  *   <li>{@link org.yakindu.sct.model.sgraph.impl.TransitionImpl#getSource <em>Source</em>}</li>
- *   <li>{@link org.yakindu.sct.model.sgraph.impl.TransitionImpl#getPriority <em>Priority</em>}</li>
  * </ul>
  * </ul>
  * </p>
  * </p>
  *
  *
@@ -117,26 +116,6 @@ public class TransitionImpl extends SpecificationElementImpl implements Transiti
 	 */
 	 */
 	protected Vertex target;
 	protected Vertex target;
 
 
-	/**
-	 * The default value of the '{@link #getPriority() <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPriority()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int PRIORITY_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getPriority() <em>Priority</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPriority()
-	 * @generated
-	 * @ordered
-	 */
-	protected int priority = PRIORITY_EDEFAULT;
-
 	/**
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- end-user-doc -->
@@ -432,27 +411,6 @@ public class TransitionImpl extends SpecificationElementImpl implements Transiti
 			eNotify(new ENotificationImpl(this, Notification.SET, SGraphPackage.TRANSITION__SOURCE, newSource, newSource));
 			eNotify(new ENotificationImpl(this, Notification.SET, SGraphPackage.TRANSITION__SOURCE, newSource, newSource));
 	}
 	}
 
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getPriority() {
-		return priority;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPriority(int newPriority) {
-		int oldPriority = priority;
-		priority = newPriority;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SGraphPackage.TRANSITION__PRIORITY, oldPriority, priority));
-	}
-
 	/**
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- end-user-doc -->
@@ -533,8 +491,6 @@ public class TransitionImpl extends SpecificationElementImpl implements Transiti
 			case SGraphPackage.TRANSITION__SOURCE:
 			case SGraphPackage.TRANSITION__SOURCE:
 				if (resolve) return getSource();
 				if (resolve) return getSource();
 				return basicGetSource();
 				return basicGetSource();
-			case SGraphPackage.TRANSITION__PRIORITY:
-				return getPriority();
 		}
 		}
 		return super.eGet(featureID, resolve, coreType);
 		return super.eGet(featureID, resolve, coreType);
 	}
 	}
@@ -567,9 +523,6 @@ public class TransitionImpl extends SpecificationElementImpl implements Transiti
 			case SGraphPackage.TRANSITION__SOURCE:
 			case SGraphPackage.TRANSITION__SOURCE:
 				setSource((Vertex)newValue);
 				setSource((Vertex)newValue);
 				return;
 				return;
-			case SGraphPackage.TRANSITION__PRIORITY:
-				setPriority((Integer)newValue);
-				return;
 		}
 		}
 		super.eSet(featureID, newValue);
 		super.eSet(featureID, newValue);
 	}
 	}
@@ -600,9 +553,6 @@ public class TransitionImpl extends SpecificationElementImpl implements Transiti
 			case SGraphPackage.TRANSITION__SOURCE:
 			case SGraphPackage.TRANSITION__SOURCE:
 				setSource((Vertex)null);
 				setSource((Vertex)null);
 				return;
 				return;
-			case SGraphPackage.TRANSITION__PRIORITY:
-				setPriority(PRIORITY_EDEFAULT);
-				return;
 		}
 		}
 		super.eUnset(featureID);
 		super.eUnset(featureID);
 	}
 	}
@@ -627,8 +577,6 @@ public class TransitionImpl extends SpecificationElementImpl implements Transiti
 				return target != null;
 				return target != null;
 			case SGraphPackage.TRANSITION__SOURCE:
 			case SGraphPackage.TRANSITION__SOURCE:
 				return basicGetSource() != null;
 				return basicGetSource() != null;
-			case SGraphPackage.TRANSITION__PRIORITY:
-				return priority != PRIORITY_EDEFAULT;
 		}
 		}
 		return super.eIsSet(featureID);
 		return super.eIsSet(featureID);
 	}
 	}
@@ -693,8 +641,6 @@ public class TransitionImpl extends SpecificationElementImpl implements Transiti
 		StringBuffer result = new StringBuffer(super.toString());
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (documentation: ");
 		result.append(" (documentation: ");
 		result.append(documentation);
 		result.append(documentation);
-		result.append(", priority: ");
-		result.append(priority);
 		result.append(')');
 		result.append(')');
 		return result.toString();
 		return result.toString();
 	}
 	}