Bugfix: Highlighting of composite states disappears after next event even though it is still active

plugins/org.yakindu.sct.simulation.core/src/org/yakindu/sct/simulation/core/runtime/IExecutionContext.java

@@ -82,7 +82,7 @@ public interface IExecutionContext {
 	/**
 	 * Returns a Set with all currently active states
 	 */
-	public Set<Vertex> getActiveStates();
+	public Set<Vertex> getActiveLeafStates();
 	/**
 	 * Returns the active state configuration
 	 */

plugins/org.yakindu.sct.simulation.core/src/org/yakindu/sct/simulation/core/runtime/impl/ExecutionContextImpl.java

@@ -145,7 +145,7 @@ public class ExecutionContextImpl extends AbstractExecutionContext implements
 		// TODO: Implement me
 	}
 
-	public Set<Vertex> getActiveStates() {
+	public Set<Vertex> getActiveLeafStates() {
 		Set<Vertex> vertices = new HashSet<Vertex>();
 		for (ExecutionState state : activeStateConfig) {
 			vertices.add((Vertex) state.getSourceElement());

plugins/org.yakindu.sct.simulation.core/src/org/yakindu/sct/simulation/core/session/SimulationSession.java

@@ -11,12 +11,17 @@
 package org.yakindu.sct.simulation.core.session;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import org.yakindu.sct.model.sgraph.CompositeElement;
+import org.yakindu.sct.model.sgraph.State;
+import org.yakindu.sct.model.sgraph.Vertex;
 import org.yakindu.sct.simulation.core.runtime.IExecutionContext;
 import org.yakindu.sct.simulation.core.runtime.IExecutionFacade;
 import org.yakindu.sct.simulation.core.runtime.impl.ExecutionEvent;
@@ -151,7 +156,7 @@ public class SimulationSession implements Runnable {
 		}
 	}
 
-	public IExecutionContext getExecutionScope() {
+	public IExecutionContext getExecutionContext() {
 		return facade.getExecutionContext();
 	}
 
@@ -159,4 +164,21 @@ public class SimulationSession implements Runnable {
 		return currentState;
 	}
 
+	public Set<Vertex> getActiveStates() {
+		Set<Vertex> activeStates = new HashSet<Vertex>();
+		Set<Vertex> leafStates = facade.getExecutionContext()
+				.getActiveLeafStates();
+		activeStates.addAll(leafStates);
+		for (Vertex vertex : leafStates) {
+			CompositeElement composite = vertex.getParentRegion()
+					.getComposite();
+			while (composite instanceof State) {
+				activeStates.add((State) composite);
+				composite = ((State) composite).getParentRegion()
+						.getComposite();
+			}
+		}
+		return activeStates;
+	}
+
 }