Added derived attribute isComposite

plugins/org.yakindu.sct.model.sgraph/model/emf/sgraph.ecore

@@ -99,7 +99,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="submachine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         changeable="false" volatile="true" transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="simple" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        volatile="true" transient="true" derived="true"/>
+        changeable="false" volatile="true" transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="composite" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         changeable="false" volatile="true" transient="true" derived="true"/>
   </eClassifiers>

plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/State.java

@@ -122,23 +122,12 @@ public interface State extends Vertex, ExpressionElement, ReactiveElement, Scope
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Simple</em>' attribute.
-	 * @see #setSimple(boolean)
 	 * @see org.yakindu.sct.model.sgraph.SGraphPackage#getState_Simple()
-	 * @model transient="true" volatile="true" derived="true"
+	 * @model transient="true" changeable="false" volatile="true" derived="true"
 	 * @generated
 	 */
 	boolean isSimple();
 
-	/**
-	 * Sets the value of the '{@link org.yakindu.sct.model.sgraph.State#isSimple <em>Simple</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Simple</em>' attribute.
-	 * @see #isSimple()
-	 * @generated
-	 */
-	void setSimple(boolean value);
-
 	/**
 	 * Returns the value of the '<em><b>Composite</b></em>' attribute.
 	 * <!-- begin-user-doc -->

plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/impl/FinalStateImpl.java

@@ -11,7 +11,6 @@
 package org.yakindu.sct.model.sgraph.impl;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.yakindu.sct.model.sgraph.FinalState;
 import org.yakindu.sct.model.sgraph.SGraphPackage;
 

plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/impl/StateImpl.java

@@ -61,8 +61,7 @@ public class StateImpl extends VertexImpl implements State {
 
 	/**
 	 * The default value of the '{@link #getExpression() <em>Expression</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getExpression()
 	 * @generated
 	 * @ordered
@@ -71,8 +70,7 @@ public class StateImpl extends VertexImpl implements State {
 
 	/**
 	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getExpression()
 	 * @generated
 	 * @ordered
@@ -81,8 +79,7 @@ public class StateImpl extends VertexImpl implements State {
 
 	/**
 	 * The cached value of the '{@link #getReactions() <em>Reactions</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getReactions()
 	 * @generated
 	 * @ordered
@@ -90,9 +87,10 @@ public class StateImpl extends VertexImpl implements State {
 	protected EList<Reaction> reactions;
 
 	/**
-	 * The cached value of the '{@link #getLocalReactions() <em>Local Reactions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getLocalReactions()
+	 * <em>Local Reactions</em>}' containment reference list. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getLocalReactions()
 	 * @generated
 	 * @ordered
@@ -101,8 +99,7 @@ public class StateImpl extends VertexImpl implements State {
 
 	/**
 	 * The cached value of the '{@link #getScopes() <em>Scopes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getScopes()
 	 * @generated
 	 * @ordered
@@ -129,8 +126,8 @@ public class StateImpl extends VertexImpl implements State {
 
 	/**
 	 * The cached value of the '{@link #getSubstatechart() <em>Substatechart</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
 	 * @see #getSubstatechart()
 	 * @generated
 	 * @ordered
@@ -139,8 +136,7 @@ public class StateImpl extends VertexImpl implements State {
 
 	/**
 	 * The default value of the '{@link #isSubmachine() <em>Submachine</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSubmachine()
 	 * @generated
 	 * @ordered
@@ -149,8 +145,7 @@ public class StateImpl extends VertexImpl implements State {
 
 	/**
 	 * The default value of the '{@link #isSimple() <em>Simple</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSimple()
 	 * @generated
 	 * @ordered
@@ -159,8 +154,7 @@ public class StateImpl extends VertexImpl implements State {
 
 	/**
 	 * The default value of the '{@link #isComposite() <em>Composite</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isComposite()
 	 * @generated
 	 * @ordered
@@ -185,8 +179,7 @@ public class StateImpl extends VertexImpl implements State {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public String getExpression() {
@@ -194,8 +187,7 @@ public class StateImpl extends VertexImpl implements State {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public void setExpression(String newExpression) {
@@ -206,8 +198,7 @@ public class StateImpl extends VertexImpl implements State {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public EList<Reaction> getReactions() {
@@ -218,8 +209,7 @@ public class StateImpl extends VertexImpl implements State {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public EList<Reaction> getLocalReactions() {
@@ -230,8 +220,7 @@ public class StateImpl extends VertexImpl implements State {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public EList<Scope> getScopes() {
@@ -262,8 +251,7 @@ public class StateImpl extends VertexImpl implements State {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public Statechart getSubstatechart() {
@@ -279,8 +267,7 @@ public class StateImpl extends VertexImpl implements State {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public Statechart basicGetSubstatechart() {
@@ -288,8 +275,7 @@ public class StateImpl extends VertexImpl implements State {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public void setSubstatechart(Statechart newSubstatechart) {
@@ -300,8 +286,8 @@ public class StateImpl extends VertexImpl implements State {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public boolean isSubmachine() {
@@ -309,34 +295,22 @@ public class StateImpl extends VertexImpl implements State {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	public boolean isSimple() {
 		return !isComposite() && !isSubmachine();
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSimple(boolean newSimple) {
-		// TODO: implement this method to set the 'Simple' attribute
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
 	 */
 	public boolean isComposite() {
-		// TODO: implement this method to return the 'Composite' attribute
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
+		return getSubRegions().size() > 0;
 	}
 
 	/**
@@ -415,9 +389,6 @@ public class StateImpl extends VertexImpl implements State {
 			case SGraphPackage.STATE__SUBSTATECHART:
 				setSubstatechart((Statechart)newValue);
 				return;
-			case SGraphPackage.STATE__SIMPLE:
-				setSimple((Boolean)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -444,9 +415,6 @@ public class StateImpl extends VertexImpl implements State {
 			case SGraphPackage.STATE__SUBSTATECHART:
 				setSubstatechart((Statechart)null);
 				return;
-			case SGraphPackage.STATE__SIMPLE:
-				setSimple(SIMPLE_EDEFAULT);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -483,8 +451,7 @@ public class StateImpl extends VertexImpl implements State {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
@@ -512,8 +479,7 @@ public class StateImpl extends VertexImpl implements State {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
@@ -541,8 +507,7 @@ public class StateImpl extends VertexImpl implements State {
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override

plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/impl/sgraph.ecore

@@ -98,7 +98,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="submachine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         changeable="false" volatile="true" transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="simple" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        volatile="true" transient="true" derived="true"/>
+        changeable="false" volatile="true" transient="true" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="composite" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         changeable="false" volatile="true" transient="true" derived="true"/>
   </eClassifiers>