Clean up TimeEventSpec code

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

@@ -15,6 +15,7 @@ import java.util.List
 import org.eclipse.xtext.EcoreUtil2
 import org.yakindu.sct.model.sgraph.Choice
 import org.yakindu.sct.model.sgraph.Entry
+import org.yakindu.sct.model.sgraph.Exit
 import org.yakindu.sct.model.sgraph.Reaction
 import org.yakindu.sct.model.sgraph.ReactiveElement
 import org.yakindu.sct.model.sgraph.Region
@@ -22,18 +23,17 @@ 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.Synchronization
 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.ReactionEffect
 import org.yakindu.sct.model.stext.stext.ReactionTrigger
 import org.yakindu.sct.model.stext.stext.StextFactory
 import org.yakindu.sct.model.stext.stext.TimeEventSpec
-import org.yakindu.sct.model.sgraph.Synchronization
-import org.yakindu.sct.model.sgraph.Exit
-import org.yakindu.sct.model.stext.stext.ReactionEffect
 
 class StatechartExtensions {
 	
@@ -82,22 +82,11 @@ class StatechartExtensions {
 	 * Provides a list of all TimeEventSpecs that are defined in the context of 'state'.
 	 */
 	def dispatch List<TimeEventSpec> timeEventSpecs(State state) { 
-		// TODO: also query local reactions
 		var tesList = new ArrayList<TimeEventSpec>()
-		
-		state.outgoingTransitions.fold(tesList, 
-			[s, r | {
-				EcoreUtil2::eAllContentsAsList(r).filter(typeof (TimeEventSpec)).forEach(tes | s.add(tes))
-				s
-			}]
-		)
 
-		state.localReactions.fold(tesList, 
-			[s, r | {
-				EcoreUtil2::eAllContentsAsList(r).filter(typeof (TimeEventSpec)).forEach(tes | s.add(tes))
-				s
-			}]
-		)
+		getTimeEventSpecs(state.outgoingTransitions, tesList)
+
+		getTimeEventSpecs(state.localReactions, tesList)
 				
 		return tesList
 	}
@@ -106,17 +95,20 @@ class StatechartExtensions {
 	 * Provides a list of all TimeEventSpecs that are defined in the context of 'state'.
 	 */
 	def dispatch List<TimeEventSpec> timeEventSpecs(Statechart state) { 
-		// TODO: also query local reactions
 		var tesList = new ArrayList<TimeEventSpec>()
 		
-		state.localReactions.fold(tesList, 
+		getTimeEventSpecs(state.localReactions, tesList)
+				
+		return tesList
+	}
+	
+	protected def List<TimeEventSpec> getTimeEventSpecs(List<? extends Reaction> reactions, List<TimeEventSpec> tesList) {
+		reactions.fold(tesList, 
 			[s, r | {
 				EcoreUtil2::eAllContentsAsList(r).filter(typeof (TimeEventSpec)).forEach(tes | s.add(tes))
 				s
 			}]
 		)
-				
-		return tesList
 	}
 
 	def dispatch ReactiveElement reactiveElement(Reaction r) {