Removed unused imports and fields.

plugins/org.yakindu.sct.model.sexec.interpreter/src/org/yakindu/sct/model/sexec/interpreter/impl/ExecutionFlowInterpreter.xtend

@@ -11,66 +11,41 @@
 package org.yakindu.sct.model.sexec.interpreter.impl
 
 import com.google.inject.Inject
-import org.yakindu.sct.model.sexec.interpreter.IStatementInterpreter
-import org.yakindu.sct.simulation.core.IExecutionContext
-import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.simulation.runtime.sgraph.ExecutionScopeAdapter
-import org.yakindu.sct.simulation.runtime.stext.RTScope
-import org.yakindu.sct.model.sgraph.Declaration
+import com.google.inject.name.Named
+import org.yakindu.base.types.ITypeSystemAccess
 import org.yakindu.sct.model.sexec.Call
 import org.yakindu.sct.model.sexec.Check
-import org.yakindu.sct.model.stext.stext.VariableDefinition
-import org.yakindu.sct.model.stext.stext.EventDefinition
-import org.yakindu.sct.simulation.runtime.ExecutionScope
-import org.yakindu.sct.model.sexec.ExecutionState
-import org.yakindu.sct.model.sexec.Cycle
-import org.yakindu.sct.model.sgraph.Scope
-import org.yakindu.sct.simulation.core.ScopeVariable
-import org.yakindu.sct.simulation.core.ScopeEvent
-import org.yakindu.sct.model.sexec.Step
-import org.yakindu.sct.model.sexec.Sequence
 import org.yakindu.sct.model.sexec.EnterState
 import org.yakindu.sct.model.sexec.Execution
+import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.model.sexec.ExitState
+import org.yakindu.sct.model.sexec.HistoryEntry
 import org.yakindu.sct.model.sexec.If
+import org.yakindu.sct.model.sexec.SaveHistory
 import org.yakindu.sct.model.sexec.ScheduleTimeEvent
+import org.yakindu.sct.model.sexec.Sequence
+import org.yakindu.sct.model.sexec.SexecFactory
 import org.yakindu.sct.model.sexec.StateSwitch
-import org.yakindu.sct.model.sexec.UnscheduleTimeEvent
-import java.util.List
-import org.yakindu.sct.model.stext.stext.Type
-import org.yakindu.sct.simulation.core.ISGraphExecutionScope
-import org.yakindu.sct.model.sexec.StateCase
+import org.yakindu.sct.model.sexec.Step
 import org.yakindu.sct.model.sexec.TimeEvent
-import org.yakindu.sct.model.sexec.ReactionFired
-import org.yakindu.sct.simulation.core.runtime.IExecutionContext
-import ScopeVariable
-import ScopeEvent
-import org.yakindu.sct.model.sgraph.naming.SGraphNameProvider
-import org.yakindu.sct.simulation.core.runtime.impl.ExecutionVariable
-import org.yakindu.sct.simulation.core.runtime.impl.ExecutionEvent
+import org.yakindu.sct.model.sexec.Trace
+import org.yakindu.sct.model.sexec.TraceBeginRunCycle
+import org.yakindu.sct.model.sexec.TraceEndRunCycle
+import org.yakindu.sct.model.sexec.UnscheduleTimeEvent
+import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter
+import org.yakindu.sct.model.sexec.interpreter.IStatementInterpreter
+import org.yakindu.sct.model.sexec.interpreter.ITimingService
+import org.yakindu.sct.model.sgraph.Scope
+import org.yakindu.sct.model.stext.naming.StextNameProvider
+import org.yakindu.sct.model.stext.stext.EventDefinition
 import org.yakindu.sct.model.stext.stext.InterfaceScope
 import org.yakindu.sct.model.stext.stext.InternalScope
-import org.yakindu.sct.model.stext.naming.StextNameProvider
-import org.yakindu.sct.model.sexec.interpreter.ITimingService
-import com.google.inject.name.Named
-import org.yakindu.sct.model.sexec.interpreter.InterpreterModule
-import org.yakindu.sct.model.sexec.TraceStateEntered
-import org.yakindu.sct.model.sexec.TraceStateExited
-import org.yakindu.sct.model.sexec.TraceNodeExecuted
-import org.yakindu.base.types.Type
-import org.yakindu.sct.simulation.core.runtime.IExecutionFacade
-import org.yakindu.sct.model.sexec.interpreter.IExecutionFlowInterpreter
+import org.yakindu.sct.model.stext.stext.VariableDefinition
 import org.yakindu.sct.simulation.core.runtime.AbstractExecutionFacade
-import org.yakindu.sct.model.sexec.Trace
-import java.util.Arrays
-import org.yakindu.sct.model.sexec.impl.ExecutionStateImpl
+import org.yakindu.sct.simulation.core.runtime.IExecutionContext
 import org.yakindu.sct.simulation.core.runtime.IExecutionContextListener
-import org.yakindu.sct.model.sexec.SaveHistory
-import org.yakindu.sct.model.sexec.HistoryEntry
-import org.yakindu.sct.model.sexec.TraceBeginRunCycle
-import org.yakindu.sct.model.sexec.SexecFactory
-import org.yakindu.sct.model.sexec.TraceEndRunCycle
-import org.yakindu.base.types.ITypeSystemAccess
+import org.yakindu.sct.simulation.core.runtime.impl.ExecutionEvent
+import org.yakindu.sct.simulation.core.runtime.impl.ExecutionVariable
 
 /**
  * 

plugins/org.yakindu.sct.model.sexec.interpreter/src/org/yakindu/sct/model/sexec/interpreter/stext/StextStatementInterpreter.xtend

@@ -9,55 +9,40 @@
  * 
  */
 package org.yakindu.sct.model.sexec.interpreter.stext
- 
-import org.yakindu.sct.model.sexec.interpreter.IStatementInterpreter
-import org.yakindu.sct.simulation.core.IExecutionContext
+
+import com.google.inject.Inject
+import org.eclipse.emf.ecore.EObject
+import org.eclipse.xtext.util.SimpleAttributeResolver
 import org.yakindu.sct.model.sgraph.Statement
-import org.yakindu.sct.model.stext.stext.LogicalAndExpression
-import org.yakindu.sct.model.stext.stext.LogicalOrExpression
-import org.yakindu.sct.model.stext.stext.ElementReferenceExpression
-import org.yakindu.sct.model.stext.stext.LogicalRelationExpression
-import org.yakindu.sct.model.stext.stext.RelationalOperator
-import org.yakindu.sct.model.stext.stext.PrimitiveValueExpression
-import org.yakindu.sct.model.stext.stext.IntLiteral
-import org.yakindu.sct.model.stext.stext.BoolLiteral
-import org.yakindu.sct.model.stext.stext.RealLiteral
-import org.yakindu.sct.simulation.core.ScopeVariable
-import org.yakindu.sct.simulation.core.ScopeEvent
-import org.yakindu.sct.model.stext.stext.NumericalAddSubtractExpression
-import org.yakindu.sct.model.stext.stext.NumericalMultiplyDivideExpression
+import org.yakindu.sct.model.stext.naming.StextNameProvider
 import org.yakindu.sct.model.stext.stext.ActiveStateReferenceExpression
+import org.yakindu.sct.model.stext.stext.AssignmentExpression
+import org.yakindu.sct.model.stext.stext.AssignmentOperator
 import org.yakindu.sct.model.stext.stext.BitwiseAndExpression
 import org.yakindu.sct.model.stext.stext.BitwiseOrExpression
 import org.yakindu.sct.model.stext.stext.BitwiseXorExpression
+import org.yakindu.sct.model.stext.stext.BoolLiteral
 import org.yakindu.sct.model.stext.stext.ConditionalExpression
-import org.yakindu.sct.model.stext.stext.EventRaisedReferenceExpression
+import org.yakindu.sct.model.stext.stext.ElementReferenceExpression
+import org.yakindu.sct.model.stext.stext.EventDefinition
+import org.yakindu.sct.model.stext.stext.EventRaisingExpression
 import org.yakindu.sct.model.stext.stext.EventValueReferenceExpression
+import org.yakindu.sct.model.stext.stext.FeatureCall
+import org.yakindu.sct.model.stext.stext.HexLiteral
+import org.yakindu.sct.model.stext.stext.IntLiteral
+import org.yakindu.sct.model.stext.stext.LogicalAndExpression
 import org.yakindu.sct.model.stext.stext.LogicalNotExpression
+import org.yakindu.sct.model.stext.stext.LogicalOrExpression
+import org.yakindu.sct.model.stext.stext.LogicalRelationExpression
+import org.yakindu.sct.model.stext.stext.NumericalAddSubtractExpression
+import org.yakindu.sct.model.stext.stext.NumericalMultiplyDivideExpression
 import org.yakindu.sct.model.stext.stext.NumericalUnaryExpression
-import org.yakindu.sct.model.stext.stext.OperationCall
+import org.yakindu.sct.model.stext.stext.PrimitiveValueExpression
+import org.yakindu.sct.model.stext.stext.RealLiteral
 import org.yakindu.sct.model.stext.stext.ShiftExpression
-import org.yakindu.sct.model.stext.stext.AssignmentOperator
-import org.yakindu.sct.simulation.core.runtime.IExecutionContext
-import org.yakindu.sct.model.sgraph.Declaration
-import org.yakindu.sct.model.stext.stext.InterfaceScope
-import org.yakindu.sct.model.stext.stext.InternalScope
-import org.yakindu.sct.model.sgraph.Scope
-import com.google.inject.Inject
-import org.yakindu.sct.model.stext.naming.StextNameProvider
-import org.yakindu.sct.model.stext.stext.HexLiteral
-import org.yakindu.sct.model.stext.stext.ElementReferenceExpression
-import org.yakindu.sct.model.stext.stext.FeatureCall
-import org.yakindu.sct.model.stext.stext.AssignmentExpression
-import org.yakindu.sct.model.stext.stext.EventRaisingExpression
-import org.yakindu.sct.model.stext.stext.VariableDefinition
-import org.yakindu.sct.model.stext.stext.EventDefinition
-import org.yakindu.sct.model.stext.stext.impl.StringLiteralImpl
 import org.yakindu.sct.model.stext.stext.StringLiteral
-import org.yakindu.base.types.Feature
-import org.yakindu.base.base.NamedElement
-import org.eclipse.xtext.util.SimpleAttributeResolver
-import org.eclipse.emf.ecore.EObject
+import org.yakindu.sct.model.stext.stext.VariableDefinition
+import org.yakindu.sct.simulation.core.runtime.IExecutionContext
 
 /**
  * 

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/SexecPackage.java

@@ -8,7 +8,6 @@ package org.yakindu.sct.model.sexec;
 
 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;
 import org.yakindu.base.base.BasePackage;

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/impl/SexecFactoryImpl.java

@@ -11,7 +11,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.yakindu.sct.model.sexec.*;
 import org.yakindu.sct.model.sexec.Call;
 import org.yakindu.sct.model.sexec.Check;
 import org.yakindu.sct.model.sexec.CheckRef;

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/BehaviorMapping.xtend

@@ -1,45 +1,43 @@
 package org.yakindu.sct.model.sexec.transformation
 
-import static extension org.eclipse.xtext.xtend2.lib.EObjectExtensions.*
-
-import org.yakindu.sct.model.sgraph.State
 import com.google.inject.Inject
-import org.yakindu.sct.model.sexec.Step
-import org.yakindu.sct.model.stext.stext.ReactionEffect
-import org.yakindu.sct.model.sgraph.Statement
-import org.yakindu.sct.model.stext.stext.TimeEventSpec
-import org.yakindu.sct.model.stext.stext.PrimitiveValueExpression
-import org.yakindu.sct.model.stext.stext.IntLiteral
-import org.yakindu.sct.model.stext.stext.TimeUnit
-import org.yakindu.sct.model.stext.stext.Expression
-import org.yakindu.sct.model.stext.stext.NumericalMultiplyDivideExpression
-import org.yakindu.sct.model.stext.stext.MultiplicativeOperator
-import org.yakindu.sct.model.sexec.Sequence
-import org.yakindu.sct.model.sgraph.Effect
-import org.yakindu.sct.model.sexec.Execution
+import java.util.List
 import org.eclipse.emf.ecore.util.EcoreUtil
+import org.yakindu.sct.model.sexec.Check
+import org.yakindu.sct.model.sexec.Execution
+import org.yakindu.sct.model.sexec.ExecutionChoice
 import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sgraph.Statechart
+import org.yakindu.sct.model.sexec.ExecutionRegion
+import org.yakindu.sct.model.sexec.ExecutionScope
 import org.yakindu.sct.model.sexec.ExecutionState
 import org.yakindu.sct.model.sexec.Reaction
+import org.yakindu.sct.model.sexec.Sequence
+import org.yakindu.sct.model.sexec.Step
+import org.yakindu.sct.model.sgraph.Choice
+import org.yakindu.sct.model.sgraph.Effect
+import org.yakindu.sct.model.sgraph.Entry
+import org.yakindu.sct.model.sgraph.Region
+import org.yakindu.sct.model.sgraph.RegularState
+import org.yakindu.sct.model.sgraph.State
+import org.yakindu.sct.model.sgraph.Statechart
+import org.yakindu.sct.model.sgraph.Statement
 import org.yakindu.sct.model.sgraph.Transition
-import org.yakindu.sct.model.sexec.Check
 import org.yakindu.sct.model.sgraph.Trigger
-import org.yakindu.sct.model.stext.stext.ReactionTrigger
+import org.yakindu.sct.model.stext.stext.AlwaysEvent
+import org.yakindu.sct.model.stext.stext.Expression
+import org.yakindu.sct.model.stext.stext.IntLiteral
 import org.yakindu.sct.model.stext.stext.LocalReaction
-import java.util.List
-import org.yakindu.sct.model.stext.stext.RegularEventSpec
+import org.yakindu.sct.model.stext.stext.MultiplicativeOperator
+import org.yakindu.sct.model.stext.stext.NumericalMultiplyDivideExpression
 import org.yakindu.sct.model.stext.stext.OnCycleEvent
-import org.yakindu.sct.model.stext.stext.AlwaysEvent
-import org.yakindu.sct.model.sgraph.RegularState
-import java.util.ArrayList
-import org.yakindu.sct.model.sexec.StateSwitch
-import org.yakindu.sct.model.sexec.ExecutionScope
-import org.yakindu.sct.model.sgraph.Region
-import org.yakindu.sct.model.sexec.ExecutionRegion
-import org.yakindu.sct.model.sgraph.Choice
-import org.yakindu.sct.model.sgraph.Entry
-import org.yakindu.sct.model.sexec.ExecutionChoice
+import org.yakindu.sct.model.stext.stext.PrimitiveValueExpression
+import org.yakindu.sct.model.stext.stext.ReactionEffect
+import org.yakindu.sct.model.stext.stext.ReactionTrigger
+import org.yakindu.sct.model.stext.stext.RegularEventSpec
+import org.yakindu.sct.model.stext.stext.TimeEventSpec
+import org.yakindu.sct.model.stext.stext.TimeUnit
+
+import static extension org.eclipse.xtext.xtend2.lib.EObjectExtensions.*
  
 
 class BehaviorMapping {
@@ -49,9 +47,6 @@ class BehaviorMapping {
 	@Inject extension SexecExtensions sexec
 	@Inject extension SexecElementMapping factory
 	@Inject extension SgraphExtensions sgraph
-	@Inject extension StextExtensions stext
-	@Inject extension StateVectorBuilder svBuilder
-	@Inject extension SequenceBuilder seqBuilder
 	@Inject extension TraceExtensions trace
 
 
@@ -379,7 +374,6 @@ class BehaviorMapping {
 				RegularState: source.create
 			}
 		
-		val target = t.target
 		var executionTarget = switch (source) {
 				RegularState: source.create
 			}

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/FlowOptimizer.xtend

@@ -1,38 +1,32 @@
 package org.yakindu.sct.model.sexec.transformation
 
-import static extension org.eclipse.xtext.xtend2.lib.EObjectExtensions.*
-
-import com.google.inject.Inject
-import org.eclipse.xtext.naming.IQualifiedNameProvider
-import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sexec.ExecutionState
-import org.yakindu.sct.model.sexec.Check
-import org.yakindu.sct.model.sexec.CheckRef
-import java.util.List
 import java.util.ArrayList
-import org.eclipse.emf.ecore.util.EcoreUtil
+import java.util.List
 import org.eclipse.emf.ecore.EObject
-import org.yakindu.sct.model.sexec.If
+import org.eclipse.emf.ecore.util.EcoreUtil
 import org.yakindu.sct.model.sexec.Call
-import org.yakindu.sct.model.sexec.Step
+import org.yakindu.sct.model.sexec.Check
+import org.yakindu.sct.model.sexec.CheckRef
+import org.yakindu.sct.model.sexec.ExecutionChoice
+import org.yakindu.sct.model.sexec.ExecutionEntry
+import org.yakindu.sct.model.sexec.ExecutionFlow
+import org.yakindu.sct.model.sexec.ExecutionRegion
+import org.yakindu.sct.model.sexec.ExecutionState
+import org.yakindu.sct.model.sexec.HistoryEntry
+import org.yakindu.sct.model.sexec.If
 import org.yakindu.sct.model.sexec.Sequence
 import org.yakindu.sct.model.sexec.SexecFactory
-import org.yakindu.sct.model.sgraph.SGraphFactory
-import org.yakindu.sct.model.stext.stext.StextFactory
-import org.yakindu.sct.model.sexec.StateSwitch
 import org.yakindu.sct.model.sexec.StateCase
-import org.eclipse.xtext.EcoreUtil2
-import org.yakindu.sct.model.sexec.ExecutionRegion
-import org.yakindu.sct.model.sexec.HistoryEntry
-import org.yakindu.sct.model.sexec.ExecutionChoice
-import org.yakindu.sct.model.sexec.ExecutionEntry
-import org.yakindu.sct.model.stext.stext.PrimitiveValueExpression
+import org.yakindu.sct.model.sexec.StateSwitch
+import org.yakindu.sct.model.sexec.Step
+import org.yakindu.sct.model.sgraph.SGraphFactory
 import org.yakindu.sct.model.stext.stext.BoolLiteral
+import org.yakindu.sct.model.stext.stext.PrimitiveValueExpression
+import org.yakindu.sct.model.stext.stext.StextFactory
+
+import static extension org.eclipse.xtext.xtend2.lib.EObjectExtensions.*
  
 class FlowOptimizer {
-
-	@Inject extension IQualifiedNameProvider qfnProvider
-	@Inject extension SexecElementMapping factory
 	
 	boolean _inlineReactions        def inlineReactions(boolean b)      {_inlineReactions = b}
 	boolean _inlineEntryActions     def inlineEntryActions(boolean b)   {_inlineEntryActions = b}

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/ModelSequencer.xtend

@@ -1,107 +1,32 @@
 package org.yakindu.sct.model.sexec.transformation
 
-import org.yakindu.sct.model.sgraph.Statechart
-import org.eclipse.xtext.xtend2.lib.EObjectExtensions
-import org.eclipse.xtext.xbase.lib.CollectionExtensions
-import org.eclipse.emf.common.util.TreeIterator
 import com.google.inject.Inject
+import java.util.Collection
+import org.apache.commons.logging.LogConfigurationException
+import org.apache.commons.logging.LogFactory
+import org.eclipse.emf.ecore.EObject
 import org.eclipse.xtext.EcoreUtil2
-import org.yakindu.sct.model.sgraph.State
-import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sexec.ExecutionState
 import org.eclipse.xtext.naming.IQualifiedNameProvider
-import org.yakindu.sct.model.sexec.Cycle
-import org.yakindu.sct.model.sgraph.Transition
-import org.yakindu.sct.model.sexec.If
-import org.yakindu.sct.model.sgraph.Trigger
-import org.yakindu.sct.model.stext.stext.ReactionTrigger
-import org.yakindu.sct.model.sgraph.Statement
-import org.yakindu.sct.model.stext.stext.Expression
-import org.yakindu.sct.model.stext.stext.EventSpec
-import org.yakindu.sct.model.stext.stext.RegularEventSpec
+import org.yakindu.base.types.Feature
+import org.yakindu.sct.model.sexec.ExecutionFlow
+import org.yakindu.sct.model.sexec.TimeEvent
 import org.yakindu.sct.model.sgraph.Declaration
-import org.yakindu.sct.model.sexec.Step
-import org.eclipse.emf.ecore.util.EcoreUtil
-import org.yakindu.sct.model.sgraph.Scope
-import org.yakindu.sct.model.stext.stext.EventDefinition
-import org.yakindu.sct.model.stext.stext.VariableDefinition
-import org.yakindu.sct.model.sgraph.Region
-import org.yakindu.sct.model.sgraph.Entry
-import org.yakindu.sct.model.sgraph.SGraphPackage
-import org.yakindu.sct.model.sexec.EnterState
-import org.yakindu.sct.model.sexec.ExitState
-import org.yakindu.sct.model.sexec.Check
-import org.yakindu.sct.model.sexec.Reaction
-import org.yakindu.sct.model.sexec.Sequence
-import org.yakindu.sct.model.stext.stext.ReactionEffect
-import org.yakindu.sct.model.sgraph.Effect
-import org.yakindu.sct.model.sexec.Execution
+import org.yakindu.sct.model.sgraph.Statechart
 import org.yakindu.sct.model.stext.stext.ElementReferenceExpression
-import org.yakindu.sct.model.stext.stext.StextPackage
-import java.util.List
-import org.eclipse.emf.ecore.EObject
-import org.yakindu.sct.model.stext.stext.Assignment
-import org.yakindu.sct.model.sgraph.Variable
-import org.yakindu.sct.model.stext.stext.LocalReaction
-import org.yakindu.sct.model.stext.stext.EntryEvent
-import org.yakindu.sct.model.stext.stext.ExitEvent
-import org.eclipse.xtext.common.services.Ecore2XtextTerminalConverters
-import org.eclipse.emf.ecore.util.EcoreUtil$AbstractFilteredSettingsIterator
-import java.util.ArrayList
-import org.yakindu.sct.model.stext.stext.TimeEventSpec
-import org.yakindu.sct.model.sexec.TimeEvent
-import org.yakindu.sct.model.stext.stext.TimeEventType
-import org.yakindu.sct.model.stext.stext.PrimitiveValueExpression
-import org.yakindu.sct.model.stext.stext.TimeUnit
-import org.yakindu.sct.model.stext.stext.MultiplicativeOperator
-import org.yakindu.sct.model.stext.stext.NumericalMultiplyDivideExpression
-import org.yakindu.sct.model.sexec.StateSwitch
-import org.yakindu.sct.model.stext.stext.OnCycleEvent
-import org.yakindu.sct.model.stext.stext.AlwaysEvent
-import org.yakindu.sct.model.stext.stext.IntLiteral
-import org.yakindu.sct.model.stext.stext.BoolLiteral
-import org.yakindu.sct.model.sgraph.RegularState
-import org.yakindu.sct.model.sgraph.FinalState
-import org.yakindu.sct.model.sgraph.Vertex
-import org.yakindu.sct.model.sgraph.Choice
-import org.yakindu.sct.model.sexec.ExecutionChoice
-import org.yakindu.sct.model.stext.stext.DefaultEvent
-import org.yakindu.sct.model.sexec.ExecutionNode
-import com.google.inject.name.Named
-import org.yakindu.sct.model.sexec.ExecutionRegion
-import org.yakindu.sct.model.sexec.ExecutionScope
-import org.yakindu.sct.model.sexec.StateVector
-import org.yakindu.sct.model.stext.stext.OperationCall
-import org.yakindu.sct.model.stext.stext.Operation
-import java.util.Set
-import java.util.Collection
-import org.yakindu.sct.model.stext.stext.TypedElementReferenceExpression
-import org.yakindu.base.base.NamedElement
-import org.apache.commons.logging.LogFactory
+import org.yakindu.sct.model.stext.stext.EventDefinition
 import org.yakindu.sct.model.stext.stext.FeatureCall
-import org.apache.commons.logging.LogConfigurationException
-import org.yakindu.base.types.Feature
 import org.yakindu.sct.model.stext.stext.OperationDefinition
+import org.yakindu.sct.model.stext.stext.VariableDefinition
 
 class ModelSequencer {
 	 
 	@Inject extension IQualifiedNameProvider qfnProvider
 	@Inject extension SexecElementMapping mapping
-	@Inject extension StatechartExtensions sct
-	@Inject extension SgraphExtensions sgraph
-	@Inject extension StextExtensions stext
-	@Inject extension SexecExtensions sexec
 	@Inject extension StructureMapping structureMapping
 	@Inject extension BehaviorMapping behaviorMapping
 	@Inject extension ReactionBuilder reactBuilder
 	@Inject extension SequenceBuilder seqBuilder
 	@Inject extension StateVectorBuilder svBuilder
-	@Inject extension TraceExtensions trace
-	
-	@Inject
-	@Named("ADD_TRACES") 
-	boolean _addTraceSteps 
-	
 	
 	/* ==========================================================================
 	 * TRANSFORMATION ROOT

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/ReactionBuilder.xtend

@@ -1,25 +1,23 @@
 package org.yakindu.sct.model.sexec.transformation
 
-import org.yakindu.sct.model.sgraph.Entry
+import com.google.common.collect.Iterables
 import com.google.inject.Inject
+import org.eclipse.xtext.EcoreUtil2
+import org.yakindu.sct.model.sexec.Check
+import org.yakindu.sct.model.sexec.ExecutionFlow
+import org.yakindu.sct.model.sexec.ExecutionNode
+import org.yakindu.sct.model.sexec.Sequence
+import org.yakindu.sct.model.sexec.Step
+import org.yakindu.sct.model.sgraph.Choice
+import org.yakindu.sct.model.sgraph.Entry
 import org.yakindu.sct.model.sgraph.EntryKind
+import org.yakindu.sct.model.sgraph.FinalState
 import org.yakindu.sct.model.sgraph.Region
-import org.yakindu.sct.model.sexec.StateSwitch
+import org.yakindu.sct.model.sgraph.RegularState
 import org.yakindu.sct.model.sgraph.State
-import org.yakindu.sct.model.sexec.ExecutionRegion
 import org.yakindu.sct.model.sgraph.Statechart
-import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sexec.Sequence
-import org.yakindu.sct.model.sgraph.RegularState
-import org.yakindu.sct.model.sexec.Check
-import org.yakindu.sct.model.stext.stext.PrimitiveValueExpression
 import org.yakindu.sct.model.stext.stext.BoolLiteral
-import org.yakindu.sct.model.sgraph.Choice
-import org.yakindu.sct.model.sexec.ExecutionNode
-import org.yakindu.sct.model.sexec.Step
-import org.yakindu.sct.model.sgraph.FinalState
-import org.eclipse.xtext.EcoreUtil2
-import com.google.common.collect.Iterables
+import org.yakindu.sct.model.stext.stext.PrimitiveValueExpression
 
 class ReactionBuilder {
 	@Inject extension SexecElementMapping mapping

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/SequenceBuilder.xtend

@@ -1,28 +1,23 @@
 package org.yakindu.sct.model.sexec.transformation
 
-import static extension org.eclipse.xtext.xtend2.lib.EObjectExtensions.*
-import static extension org.eclipse.emf.ecore.util.EcoreUtil.*
-import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sgraph.Statechart
-import org.yakindu.sct.model.sgraph.Region
-import org.yakindu.sct.model.sgraph.Vertex
-import org.yakindu.sct.model.sgraph.FinalState
-import org.yakindu.sct.model.sgraph.State
 import com.google.inject.Inject
 import com.google.inject.name.Named
-import org.yakindu.sct.model.sexec.Sequence
-import org.yakindu.sct.model.sexec.ExecutionRegion
-import java.util.List
-import org.yakindu.sct.model.sgraph.RegularState
 import java.util.ArrayList
+import org.yakindu.sct.model.sexec.ExecutionFlow
+import org.yakindu.sct.model.sexec.ExecutionRegion
+import org.yakindu.sct.model.sexec.ExecutionState
 import org.yakindu.sct.model.sexec.StateSwitch
-import org.yakindu.sct.model.stext.stext.VariableDefinition
+import org.yakindu.sct.model.sgraph.FinalState
+import org.yakindu.sct.model.sgraph.Region
+import org.yakindu.sct.model.sgraph.RegularState
+import org.yakindu.sct.model.sgraph.State
+import org.yakindu.sct.model.sgraph.Statechart
+import org.yakindu.sct.model.sgraph.Vertex
 import org.yakindu.sct.model.stext.stext.AssignmentOperator
-import org.yakindu.sct.model.sexec.ExecutionState
-import org.yakindu.sct.model.sexec.ExecutionScope
-import org.yakindu.sct.model.sgraph.Entry
-import org.yakindu.sct.model.sgraph.EntryKind
-import org.yakindu.sct.model.sexec.StateVectorType
+import org.yakindu.sct.model.stext.stext.VariableDefinition
+
+import static extension org.eclipse.emf.ecore.util.EcoreUtil.*
+import static extension org.eclipse.xtext.xtend2.lib.EObjectExtensions.*
 
 class SequenceBuilder {
 	

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/SexecElementMapping.xtend

@@ -1,71 +1,55 @@
 package org.yakindu.sct.model.sexec.transformation
 
-/**
- * This extension class defines all factory (create) functions that are required 
- * for creating a flow element based on a statechrt source element. Thus most create functions are parametrized 
- * by elements from the source statechart. 
- * 
- * @author axel terfloth
- */ 
-
 import com.google.inject.Inject
-import org.eclipse.xtext.naming.IQualifiedNameProvider
-
-import org.yakindu.sct.model.sexec.SexecFactory
-import org.yakindu.sct.model.stext.stext.StextFactory
-import org.yakindu.sct.model.sexec.ExecutionState
-import org.yakindu.sct.model.sgraph.State
-import org.yakindu.sct.model.sgraph.Scope
+import com.google.inject.Singleton
 import org.eclipse.emf.ecore.util.EcoreUtil
-import org.yakindu.sct.model.stext.stext.InterfaceScope
-import org.yakindu.sct.model.stext.stext.InternalScope
-import org.yakindu.sct.model.stext.stext.EventDefinition
-import org.yakindu.sct.model.stext.stext.VariableDefinition
-import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sgraph.Statechart
+import org.eclipse.xtext.naming.IQualifiedNameProvider
+import org.eclipse.xtext.util.Strings
+import org.yakindu.base.base.NamedElement
+import org.yakindu.sct.model.sexec.Call
 import org.yakindu.sct.model.sexec.Check
-import org.yakindu.sct.model.stext.stext.ReactionTrigger
-import org.yakindu.sct.model.sexec.Reaction
-import org.yakindu.sct.model.sgraph.Transition
 import org.yakindu.sct.model.sexec.CheckRef
-import org.yakindu.sct.model.sexec.Call
+import org.yakindu.sct.model.sexec.ExecutionChoice
+import org.yakindu.sct.model.sexec.ExecutionEntry
+import org.yakindu.sct.model.sexec.ExecutionFlow
+import org.yakindu.sct.model.sexec.ExecutionRegion
+import org.yakindu.sct.model.sexec.ExecutionState
+import org.yakindu.sct.model.sexec.Reaction
+import org.yakindu.sct.model.sexec.ScheduleTimeEvent
+import org.yakindu.sct.model.sexec.SexecFactory
 import org.yakindu.sct.model.sexec.Step
 import org.yakindu.sct.model.sexec.TimeEvent
-import org.yakindu.sct.model.sexec.ScheduleTimeEvent
-import org.yakindu.sct.model.sgraph.Statement
 import org.yakindu.sct.model.sexec.UnscheduleTimeEvent
-import org.yakindu.sct.model.stext.stext.LocalReaction
-import org.yakindu.sct.model.sgraph.RegularState
-import org.yakindu.sct.model.sgraph.FinalState
 import org.yakindu.sct.model.sgraph.Choice
-import org.yakindu.sct.model.sexec.ExecutionChoice
-import org.yakindu.sct.model.sexec.ExecutionRegion
+import org.yakindu.sct.model.sgraph.CompositeElement
+import org.yakindu.sct.model.sgraph.Entry
+import org.yakindu.sct.model.sgraph.EntryKind
+import org.yakindu.sct.model.sgraph.FinalState
 import org.yakindu.sct.model.sgraph.Region
-import com.google.inject.Singleton
-import org.yakindu.sct.model.stext.stext.TimeEventSpec
-import org.yakindu.sct.model.stext.stext.TimeEventType
-import org.yakindu.sct.model.stext.stext.Expression
-import org.yakindu.sct.model.stext.stext.EventSpec
-import org.yakindu.sct.model.stext.stext.RegularEventSpec
-import org.yakindu.sct.model.stext.stext.OnCycleEvent
-import org.yakindu.sct.model.stext.stext.BoolLiteral
+import org.yakindu.sct.model.sgraph.RegularState
+import org.yakindu.sct.model.sgraph.Scope
+import org.yakindu.sct.model.sgraph.State
+import org.yakindu.sct.model.sgraph.Statechart
+import org.yakindu.sct.model.sgraph.Statement
+import org.yakindu.sct.model.sgraph.Transition
 import org.yakindu.sct.model.stext.stext.AlwaysEvent
+import org.yakindu.sct.model.stext.stext.BoolLiteral
 import org.yakindu.sct.model.stext.stext.DefaultEvent
-import org.yakindu.sct.model.stext.stext.OperationCall
-import org.yakindu.sct.model.stext.stext.Operation
-import org.yakindu.sct.model.sgraph.Entry
-import org.yakindu.sct.model.sexec.ExecutionEntry
-import org.yakindu.sct.model.sgraph.EntryKind
-import org.yakindu.sct.model.stext.stext.TypedElementReferenceExpression
+import org.yakindu.sct.model.stext.stext.ElementReferenceExpression
+import org.yakindu.sct.model.stext.stext.EventDefinition
+import org.yakindu.sct.model.stext.stext.EventSpec
+import org.yakindu.sct.model.stext.stext.Expression
 import org.yakindu.sct.model.stext.stext.FeatureCall
-import org.yakindu.base.base.NamedElement
-import org.apache.commons.logging.LogFactory
-import org.apache.commons.logging.LogConfigurationException
+import org.yakindu.sct.model.stext.stext.InterfaceScope
+import org.yakindu.sct.model.stext.stext.LocalReaction
+import org.yakindu.sct.model.stext.stext.OnCycleEvent
 import org.yakindu.sct.model.stext.stext.OperationDefinition
-import org.eclipse.xtext.util.Strings
-import org.eclipse.xtext.EcoreUtil2
-import org.yakindu.sct.model.sgraph.CompositeElement
-import org.yakindu.sct.model.stext.stext.ElementReferenceExpression
+import org.yakindu.sct.model.stext.stext.ReactionTrigger
+import org.yakindu.sct.model.stext.stext.RegularEventSpec
+import org.yakindu.sct.model.stext.stext.StextFactory
+import org.yakindu.sct.model.stext.stext.TimeEventSpec
+import org.yakindu.sct.model.stext.stext.TimeEventType
+import org.yakindu.sct.model.stext.stext.VariableDefinition
  
 
 @Singleton class SexecElementMapping {

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/SexecExtensions.xtend

@@ -1,23 +1,14 @@
 package org.yakindu.sct.model.sexec.transformation
 
-import org.yakindu.sct.model.sexec.SexecFactory
-import org.yakindu.sct.model.sexec.ExecutionState
+import java.util.List
 import org.yakindu.sct.model.sexec.EnterState
-import com.google.inject.Inject
+import org.yakindu.sct.model.sexec.ExecutionRegion
+import org.yakindu.sct.model.sexec.ExecutionScope
+import org.yakindu.sct.model.sexec.ExecutionState
 import org.yakindu.sct.model.sexec.ExitState
+import org.yakindu.sct.model.sexec.SexecFactory
 import org.yakindu.sct.model.sexec.StateVector
 import org.yakindu.sct.model.sexec.Step
-import org.yakindu.sct.model.stext.stext.Expression
-import org.yakindu.sct.model.stext.stext.OnCycleEvent
-import org.yakindu.sct.model.stext.stext.BoolLiteral
-import org.yakindu.sct.model.stext.stext.AlwaysEvent
-import org.yakindu.sct.model.stext.stext.EventSpec
-import org.yakindu.sct.model.stext.stext.RegularEventSpec
-import org.yakindu.sct.model.stext.stext.TimeEventSpec
-import org.yakindu.sct.model.sexec.ExecutionScope
-import java.util.Collections
-import java.util.List
-import org.yakindu.sct.model.sexec.ExecutionRegion
 
 class SexecExtensions {
 	

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/StateVectorBuilder.xtend

@@ -1,20 +1,17 @@
 package org.yakindu.sct.model.sexec.transformation
 
-import static extension org.eclipse.xtext.xtend2.lib.EObjectExtensions.*
-
-import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sgraph.Statechart
-import org.yakindu.sct.model.sgraph.Region
-import org.yakindu.sct.model.sgraph.Vertex
-import org.yakindu.sct.model.sgraph.State
-import org.yakindu.sct.model.sgraph.FinalState
 import com.google.inject.Inject
+import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.model.sexec.StateVector
-import org.yakindu.sct.model.sgraph.RegularState
 import org.yakindu.sct.model.sgraph.Choice
-import org.yakindu.sct.model.sexec.ExecutionRegion
-import org.yakindu.sct.model.sgraph.EntryKind
-import org.yakindu.sct.model.sgraph.Entry
+import org.yakindu.sct.model.sgraph.FinalState
+import org.yakindu.sct.model.sgraph.Region
+import org.yakindu.sct.model.sgraph.RegularState
+import org.yakindu.sct.model.sgraph.State
+import org.yakindu.sct.model.sgraph.Statechart
+import org.yakindu.sct.model.sgraph.Vertex
+
+import static extension org.eclipse.xtext.xtend2.lib.EObjectExtensions.*
 
 class StateVectorBuilder {
 	

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/StatechartExtensions.xtend

@@ -1,29 +1,28 @@
 package org.yakindu.sct.model.sexec.transformation
 
-import static extension org.eclipse.xtext.xtend2.lib.EObjectExtensions.*
-
-import org.yakindu.sct.model.sgraph.Statechart
-import org.yakindu.sct.model.sgraph.Region
-import org.yakindu.sct.model.sgraph.Vertex
-import org.yakindu.sct.model.sgraph.State
-import org.yakindu.sct.model.sgraph.Trigger
-import org.yakindu.sct.model.sgraph.Reaction
-import org.yakindu.sct.model.sgraph.Transition
-import java.util.List
 import java.util.ArrayList
-import org.yakindu.sct.model.stext.stext.TimeEventSpec
+import java.util.List
 import org.eclipse.xtext.EcoreUtil2
-import org.yakindu.sct.model.stext.stext.LocalReaction
+import org.yakindu.sct.model.sgraph.Choice
+import org.yakindu.sct.model.sgraph.Entry
+import org.yakindu.sct.model.sgraph.Reaction
 import org.yakindu.sct.model.sgraph.ReactiveElement
-import org.yakindu.sct.model.sgraph.Scope
+import org.yakindu.sct.model.sgraph.Region
 import org.yakindu.sct.model.sgraph.RegularState
-import org.yakindu.sct.model.sgraph.Choice
+import org.yakindu.sct.model.sgraph.Scope
+import org.yakindu.sct.model.sgraph.State
+import org.yakindu.sct.model.sgraph.Statechart
+import org.yakindu.sct.model.sgraph.Transition
+import org.yakindu.sct.model.sgraph.Trigger
+import org.yakindu.sct.model.sgraph.Vertex
 import org.yakindu.sct.model.stext.stext.EntryEvent
 import org.yakindu.sct.model.stext.stext.ExitEvent
+import org.yakindu.sct.model.stext.stext.LocalReaction
 import org.yakindu.sct.model.stext.stext.ReactionTrigger
-import org.yakindu.sct.model.sgraph.SGraphFactory
 import org.yakindu.sct.model.stext.stext.StextFactory
-import org.yakindu.sct.model.sgraph.Entry
+import org.yakindu.sct.model.stext.stext.TimeEventSpec
+
+import static extension org.eclipse.xtext.xtend2.lib.EObjectExtensions.*
  
 class StatechartExtensions {
 	

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/StructureMapping.xtend

@@ -1,33 +1,27 @@
 package org.yakindu.sct.model.sexec.transformation
 
-import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sgraph.Statechart
-import org.yakindu.sct.model.sgraph.Scope
-import org.yakindu.sct.model.sgraph.Declaration
-import org.yakindu.sct.model.stext.stext.EventDefinition
-import org.yakindu.sct.model.stext.stext.VariableDefinition
 import com.google.inject.Inject
-import org.yakindu.sct.model.sexec.ExecutionState
-import org.yakindu.sct.model.sgraph.FinalState
-import org.yakindu.sct.model.sgraph.State
-import org.yakindu.sct.model.sgraph.RegularState
-import org.yakindu.sct.model.sgraph.Region
+import java.util.ArrayList
+import org.eclipse.xtext.EcoreUtil2
+import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.model.sexec.ExecutionRegion
 import org.yakindu.sct.model.sexec.ExecutionScope
-import org.eclipse.xtext.EcoreUtil2
-import java.util.ArrayList
+import org.yakindu.sct.model.sexec.ExecutionState
 import org.yakindu.sct.model.sexec.TimeEvent
-import org.yakindu.sct.model.stext.stext.OperationCall
-import org.yakindu.sct.model.stext.stext.Operation
-import org.yakindu.sct.model.sgraph.Entry
-import org.yakindu.sct.model.sgraph.EntryKind
+import org.yakindu.sct.model.sgraph.Declaration
+import org.yakindu.sct.model.sgraph.FinalState
+import org.yakindu.sct.model.sgraph.Region
+import org.yakindu.sct.model.sgraph.RegularState
+import org.yakindu.sct.model.sgraph.Scope
+import org.yakindu.sct.model.sgraph.State
+import org.yakindu.sct.model.sgraph.Statechart
+import org.yakindu.sct.model.stext.stext.EventDefinition
 import org.yakindu.sct.model.stext.stext.OperationDefinition
+import org.yakindu.sct.model.stext.stext.VariableDefinition
 
 class StructureMapping {
 	 
 	@Inject extension SexecElementMapping mapping
-	@Inject extension SexecExtensions sexec
-	@Inject extension SgraphExtensions sgraph
 	@Inject extension StatechartExtensions sct
 	
 	
@@ -129,7 +123,6 @@ class StructureMapping {
 	//
 
 	def ExecutionFlow mapPseudoStates(Statechart statechart, ExecutionFlow r){
-		val allChoices = statechart.allChoices
 		r.nodes.addAll( statechart.allChoices.map( choice | choice.create ) );
 		r.nodes.addAll( statechart.allEntries.map( entry | entry.create ) );
 		return r

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/TraceExtensions.xtend

@@ -1,13 +1,12 @@
 package org.yakindu.sct.model.sexec.transformation
 
-import org.yakindu.sct.model.sexec.Reaction
-import org.yakindu.sct.model.sexec.ExecutionNode
-import org.yakindu.sct.model.sexec.ExecutionState
 import com.google.inject.Inject
 import com.google.inject.name.Named
+import org.yakindu.sct.model.sexec.ExecutionNode
+import org.yakindu.sct.model.sexec.ExecutionState
+import org.yakindu.sct.model.sexec.Reaction
 import org.yakindu.sct.model.sexec.Sequence
 import org.yakindu.sct.model.sgraph.RegularState
-import org.yakindu.sct.model.sexec.ExecutionRegion
 
 class TraceExtensions {
 	

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/util/SexecAdapterFactory.java

@@ -11,7 +11,6 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.yakindu.base.base.NamedElement;
-import org.yakindu.sct.model.sexec.*;
 import org.yakindu.sct.model.sexec.Call;
 import org.yakindu.sct.model.sexec.Check;
 import org.yakindu.sct.model.sexec.CheckRef;

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/util/SexecSwitch.java

@@ -10,7 +10,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
 import org.yakindu.base.base.NamedElement;
-import org.yakindu.sct.model.sexec.*;
 import org.yakindu.sct.model.sexec.Call;
 import org.yakindu.sct.model.sexec.Check;
 import org.yakindu.sct.model.sexec.CheckRef;