Added javadoc comments to java state machine framework classes.

TestScenarios/TestModels/Test_Transition.sct

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/sgraph/2.0.0">
-  <sgraph:Statechart xmi:id="_yJVewfZKEeCz_6s_8P8IEA" specification="interface A:&#xA;in event event1 : integer = 1&#xA;in event event2&#xA;in event event3&#xA;in event event4&#xA;out event event5&#xA;&#xA;interface:&#xA;in event event5 : boolean&#xA;in event event6&#xA;out event event7&#xA;var i : integer&#xA;var j : real&#xA;" name="Test_Transition">
+  <sgraph:Statechart xmi:id="_yJVewfZKEeCz_6s_8P8IEA" specification="interface A:&#xA;in event event1 : integer&#xA;in event event2&#xA;in event event3&#xA;in event event4&#xA;out event event5&#xA;&#xA;interface:&#xA;in event event5 : boolean&#xA;in event event6&#xA;out event event7&#xA;var i : integer&#xA;var j : real&#xA;" name="Test_Transition">
     <regions xmi:id="_yMGe4PZKEeCz_6s_8P8IEA" name="">
       <vertices xsi:type="sgraph:Entry" xmi:id="_yPWAIPZKEeCz_6s_8P8IEA">
         <outgoingTransitions xmi:id="_yPtMgPZKEeCz_6s_8P8IEA" target="_yPZqgPZKEeCz_6s_8P8IEA"/>

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/Event.xpt

@@ -17,21 +17,46 @@ Contributors:
 «getLicenseHeader(entry)»
 package «entry.getBasePackageName()»;
 
+/**
+ * 
+ * Basic event class.
+ * 
+ * @param <T>
+ */
 public class Event<T extends Enum<T>> {
 
 	private T id;
-	
+
 	private int offset;
 
+	/**
+	 * Creates an event with the given id and an offset. The offset represents
+	 * the start index of the events position in the {@link EventVector} of the
+	 * statemachine.
+	 * 
+	 * @param id
+	 * @param offset
+	 */
 	public Event(T id, int offset) {
 		this.id = id;
 		this.offset = offset;
 	}
 
+	/**
+	 * Returns the event identifier.
+	 * 
+	 * @return
+	 */
 	public T getId() {
 		return id;
 	}
-	
+
+	/**
+	 * Returns the position of the event in the statemachines
+	 * {@link EventVector}
+	 * 
+	 * @return {@code int}
+	 */
 	public int getIndex() {
 		return offset + id.ordinal();
 	}

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/EventNotification.xpt

@@ -19,15 +19,29 @@ package
 
 import «entry.getBasePackageName()».Event;
 
+/**
+ * 
+ * Class to transmit an event within a notification.
+ * 
+ * 
+ */
 public class EventNotification extends Notification {
-	
+
 	private Event<? extends Enum<?>> event;
 	
+	/**
+	 * Initializes the notification with an {@link Event}.
+	 * @param event
+	 */
 	public EventNotification(Event<? extends Enum<?>> event) {
 		super(NotificationType.EventNotification);
 		this.event = event;
 	}
-
+	
+	/**
+	 * Returns the contained {@code Event}.
+	 * @return {@link Event}
+	 */
 	public Event<? extends Enum<?>> getEvent() {
 		return event;
 	}

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/EventVector.xpt

@@ -20,6 +20,12 @@ package
 import java.util.Collection;
 import java.util.Iterator;
 
+/**
+ * 
+ * The {@code EventVector} stores the events that occurred during a cycle.
+ * 
+ * @param <E>
+ */
 public class EventVector<E extends Event<? extends Enum<?>>> implements
 		Collection<E> {
 

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/INotificationListener.xpt

@@ -17,13 +17,29 @@ Contributors:
 «getLicenseHeader(entry)»
 package «entry.getBasePackageName()»;
 
+/**
+ * Interface a statemachine observer has to implement to receive notifications
+ * on event and variable changes.
+ * 
+ * 
+ */
 public interface INotificationListener {
-	
+
+	/**
+	 * Callback for a {@link EventNotification}
+	 * 
+	 * @param notification
+	 */
 	public void onEventRaised(EventNotification notification);
-	
+
+	/**
+	 * Callback for a {@link VariableNotification}
+	 * 
+	 * @param notification
+	 */
 	public void onVariableChanged(VariableNotification<?> notification);
 
-}	
+}
 «ENDFILE-»
 «ENDIF-»
 «ENDDEFINE»

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/INotificationSender.xpt

@@ -17,10 +17,28 @@ Contributors:
 «getLicenseHeader(entry)»
 package «entry.getBasePackageName()»;
 
+/**
+ * Interface a notification sender has to implement.
+ * 
+ */
 public interface INotificationSender {
-	
+
+	/**
+	 * Registers a notification listener.
+	 * 
+	 * @param listener
+	 *            {@link INotificationListener}
+	 * @return {@code true} if correct registered.
+	 */
 	public boolean addNotificationListener(INotificationListener listener);
 	
+	/**
+	 * Unregisters a notification listener.
+	 * 
+	 * @param listener
+	 *            {@link INotificationListener}
+	 * @return {@code true} if correct unregistered.
+	 */
 	public boolean removeNotificationListener(INotificationListener listener);
 }
 «ENDFILE-»

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/IStatemachine.xpt

@@ -16,12 +16,26 @@ Contributors:
 «getLicenseHeader(entry)»
 package «entry.getBasePackageName()»;
 
+/**
+ * Basic interface for statemachines.
+ * 
+ * 
+ */
 public interface IStatemachine {
-	
+
+	/**
+	 * Initializes the statemachine. Use to init internal variables etc.
+	 */
 	public void init();
 
+	/**
+	 * Start a run-to-completion cycle.
+	 */
 	public void runCycle();
-	
+
+	/**
+	 * Enters the statemachine. Sets the statemachine in a defined state.
+	 */
 	public void enter();
 }
 «ENDFILE-»

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/ITimedStatemachine.xpt

@@ -18,11 +18,26 @@ package
 
 import «entry.getBasePackageName()».ITimerNotificationListener;
 
-public interface ITimedStatemachine extends
-		IStatemachine, ITimerNotificationListener {
+/**
+ * Interface for state machines which use timed event triggers.
+ */
+public interface ITimedStatemachine extends IStatemachine,
+		ITimerNotificationListener {
 
+	/**
+	 * Set the {@link ITimerService} for the state machine. It must be set
+	 * externally on a timed state machine before a run cycle can be correct
+	 * executed.
+	 * 
+	 * @param timerService
+	 */
 	public void setTimerService(ITimerService timerService);
 
+	/**
+	 * Returns the currently used timer service.
+	 * 
+	 * @return {@link ITimerService}
+	 */
 	public ITimerService getTimerService();
 }
 «ENDFILE-»

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/ITimerNotificationListener.xpt

@@ -17,11 +17,22 @@ Contributors:
 «getLicenseHeader(entry)»
 package «entry.getBasePackageName()»;
 
+/**
+ * 
+ * Interface for {@link TimeEvent} listeners. These listers can be registered at
+ * a {@link ITimerService}. Used by {@link ITimedStatemachine} to register
+ * itself at the {@link ITimerService}.
+ * 
+ */
 public interface ITimerNotificationListener {
 	
+	/**
+	 * Callback method if a {@link TimeEvent} occurred.
+	 * @param timeEvent
+	 */
 	public void onTimeEventRaised(TimeEvent<? extends Enum<?>> timeEvent);
 
-}	
+}
 «ENDFILE-»
 «ENDIF-»
 «ENDDEFINE»

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/ITimerService.xpt

@@ -16,12 +16,41 @@ Contributors:
 «getLicenseHeader(entry)»
 package «entry.getBasePackageName()»;
 
+/**
+ * Interface a timer service has to implement. Use to implement your own timer
+ * service. A timer service has to be added to a timed state machine.
+ * 
+ */
 public interface ITimerService {
 
-	public void setTimer(TimeEvent<? extends Enum<?>> event, long time, long cycleStartTime);
+	/**
+	 * Starts the timing for a given {@link TimeEvent}.
+	 * 
+	 * @param event
+	 *            : The TimeEvent the timer service should throw if timed out.
+	 * @param time
+	 *            : Time in milliseconds after the given time event should be
+	 *            triggered
+	 * @param cycleStartTime
+	 *            : The absolute start time in milliseconds at which the last
+	 *            run cycle was called. Can be used to produce a more accurate
+	 *            timing behavior.
+	 */
+	public void setTimer(TimeEvent<? extends Enum<?>> event, long time,
+			long cycleStartTime);
 
+	/**
+	 * Unset the given {@link TimeEvent}. Use to unset cyclic repeated time
+	 * events.
+	 * 
+	 * @param event
+	 */
 	public void resetTimer(TimeEvent<? extends Enum<?>> event);
 
+	/**
+	 * Cancel timer service. Use this to end possible timing threads and free
+	 * memory resources.
+	 */
 	public void cancel();
 }
 «ENDFILE-»

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/Notification.xpt

@@ -17,14 +17,30 @@ Contributors:
 «getLicenseHeader(entry)»
 package «entry.getBasePackageName()»;
 
+/**
+ * 
+ * Basic class to represent a notification.
+ * 
+ * 
+ */
 public class Notification {
 
 	private NotificationType notificationType;
 
+	/**
+	 * Creates a notification with the given {@link NotificationType}
+	 * 
+	 * @param notificationType
+	 */
 	public Notification(NotificationType notificationType) {
 		this.notificationType = notificationType;
 	}
 
+	/**
+	 * Returns the {@link NotificationType} of notification.
+	 * 
+	 * @return {@link NotificationType}
+	 */
 	public NotificationType getNotificationType() {
 		return notificationType;
 	}

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/NotificationSender.xpt

@@ -20,6 +20,12 @@ package
 import java.util.HashSet;
 import java.util.Set;
 
+/**
+ * Implementation of a notification sender. This implementation is used by the
+ * statemachine and the generated interfaces to notify registered observers.
+ * Inherit from this class if necessary.
+ * 
+ */
 public class NotificationSender implements INotificationSender {
 
 	private Set<INotificationListener> listeners = new HashSet<INotificationListener>();
@@ -32,12 +38,23 @@ public class NotificationSender implements INotificationSender {
 		return listeners.remove(listener);
 	}
 
+	/**
+	 * Notify all registered listeners with the given {@link EventNotification}
+	 * 
+	 * @param notification
+	 */
 	protected void notifyListenersOnEventRaised(EventNotification notification) {
 		for (INotificationListener listener : listeners) {
 			listener.onEventRaised(notification);
 		}
 	}
 
+	/**
+	 * Notify all registered listeners with the given
+	 * {@link VariableNotification}
+	 * 
+	 * @param notification
+	 */
 	protected void notifyListenersOnVariableChanged(
 			VariableNotification<?> notification) {
 		for (INotificationListener listener : listeners) {

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/NotificationType.xpt

@@ -17,6 +17,9 @@ Contributors:
 «getLicenseHeader(entry)»
 package «entry.getBasePackageName()»;
 
+/**
+ * Enum to define possible notification types.
+ */
 public enum NotificationType {
 	EventNotification, VariableNotification, RuntimeCycleNotification
 }

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/RuntimeCycleNotification.xpt

@@ -17,15 +17,31 @@ Contributors:
 «getLicenseHeader(entry)»
 package «entry.getBasePackageName()»;
 
+/**
+ * This notification type is thrown by the runtime service if a statemachine
+ * cycle is executed.
+ * 
+ */
 public class RuntimeCycleNotification extends Notification {
 
 	private IStatemachine statemachine;
 
+	/**
+	 * Initializes notification with the given statemachine.
+	 * 
+	 * @param statemachine
+	 */
 	public RuntimeCycleNotification(IStatemachine statemachine) {
 		super(NotificationType.RuntimeCycleNotification);
 		this.statemachine = statemachine;
 	}
 
+	/**
+	 * Get the statemachine on which a run to completion step was executed by
+	 * the runtime service.
+	 * 
+	 * @return
+	 */
 	public IStatemachine getStatemachine() {
 		return statemachine;
 	}

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/RuntimeService.xpt

@@ -23,6 +23,11 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+/**
+ * Runtime service for state machines to execute a run to completion step
+ * periodically.
+ * 
+ */
 public class RuntimeService {
 
 	private Timer timer = new Timer();
@@ -43,10 +48,23 @@ public class RuntimeService {
 		}
 	};
 
+	/**
+	 * Create runtime service.
+	 * 
+	 * @param cyclePeriod
+	 *            : The period with which the registered state machines run
+	 *            cycle method is called.
+	 */
 	public RuntimeService(long cyclePeriod) {
 		timer.scheduleAtFixedRate(timerTask, 0, cyclePeriod);
 	}
 
+	/**
+	 * Adds the given state machine to runtime service.
+	 * 
+	 * @param statemachine
+	 * @return {@code true} if state machine is added properly.
+	 */
 	public boolean addStatemachine(IStatemachine statemachine) {
 		lock.writeLock().lock();
 		boolean ret = statemachineSet.add(statemachine);
@@ -54,6 +72,12 @@ public class RuntimeService {
 		return ret;
 	}
 
+	/**
+	 * Removes the given state machine from runtime service.
+	 * 
+	 * @param statemachine
+	 * @return {@code true} if state machine is removed properly.
+	 */
 	public boolean removeStatemachine(IStatemachine statemachine) {
 		lock.writeLock().lock();
 		boolean ret = statemachineSet.remove(statemachine);
@@ -61,6 +85,9 @@ public class RuntimeService {
 		return ret;
 	}
 
+	/**
+	 * Ends the runtime service.
+	 */
 	public void cancel() {
 		timer.cancel();
 	}

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/TimeEvent.xpt

@@ -17,32 +17,70 @@ Contributors:
 «getLicenseHeader(entry)»
 package «entry.getBasePackageName()»;
 
+/**
+ * Event that reflects a time event. It's internally used by
+ * {@link ITimedStatemachine}.
+ * 
+ * @author muehlbrandt
+ * 
+ * @param <T>
+ */
 public class TimeEvent<T extends Enum<T>> extends ValuedEvent<T, Boolean> {
 
 	private long time = -1;
 
 	private ITimedStatemachine statemachine;
 
+	/**
+	 * Constructor for a time event.
+	 * 
+	 * @param id
+	 *            : The event id.
+	 * @param offset
+	 *            : Offset which is added to the index position within the state
+	 *            machine's {@link EventVector}.
+	 * @param periodic
+	 *            : Set to {@code true} if event should be repeated
+	 *            periodically.
+	 */
 	public TimeEvent(T id, int offset, boolean periodic) {
 		super(id, offset, periodic);
 	}
 
+	/**
+	 * Sets the time delay after the event is called.
+	 * 
+	 * @param time
+	 */
 	public void setTime(long time) {
 		this.time = time;
 	}
 
+	/**
+	 * Returns the time delay after the event is called.
+	 */
 	public long getTime() {
 		return time;
 	}
 
+	/**
+	 * Returns the state machine reference of the event.
+	 * 
+	 */
 	public ITimedStatemachine getStatemachine() {
 		return statemachine;
 	}
 
+	/**
+	 * Sets the state machine reference of the event.
+	 * 
+	 * @param statemachine
+	 */
 	public void setStatemachine(ITimedStatemachine statemachine) {
 		this.statemachine = statemachine;
 	}
 }
+
 «ENDFILE-»
 «ENDIF-»
 «ENDDEFINE»

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/TimerService.xpt

@@ -22,8 +22,12 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import «entry.getBasePackageName()».EventNotification;
+«REM»import «entry.getBasePackageName()».EventNotification;«ENDREM»
 
+/**
+ * Default timer service implementation.
+ * 
+ */
 public class TimerService implements ITimerService {
 
 	private final Timer timer = new Timer();

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/ValuedEvent.xpt

@@ -17,19 +17,42 @@ Contributors:
 «getLicenseHeader(entry)»
 package «entry.getBasePackageName()»;
 
+/**
+ * An Event that contains values.
+ * 
+ * @param <T>
+ * @param <D>
+ */
 public class ValuedEvent<T extends Enum<T>, D> extends Event<T> {
 
 	private D value;
 
+	/**
+	 * Creates an event with the given id and an offset. The offset represents
+	 * the start index of the events position in the {@link EventVector} of the
+	 * statemachine.
+	 * 
+	 * @param id
+	 * @param offset
+	 * @param value
+	 */
 	public ValuedEvent(T name, int offset, D value) {
 		super(name, offset);
 		this.value = value;
 	}
 
+	/**
+	 * Returns the value hold by the event.
+	 */	
 	public D getValue() {
 		return value;
 	}
 
+	/**
+	 * Store a new value in the event.
+	 * 
+	 * @param value
+	 */
 	public void setValue(D value) {
 		if (value == null) {
 			throw new IllegalArgumentException();

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/templates/VariableNotification.xpt

@@ -17,12 +17,26 @@ Contributors:
 «getLicenseHeader(entry)»
 package «entry.getBasePackageName()»;
 
+/**
+ * Class to transmit a variable within a notification.
+ * 
+ */
 public class VariableNotification<T> extends Notification {
 
 	private T oldValue;
 	private T newValue;
 	private Enum<?> id;
 
+	/**
+	 * Constructor for VariableNotification.
+	 * 
+	 * @param id
+	 *            : the variable id
+	 * @param newValue
+	 *            : new variable value
+	 * @param oldValue
+	 *            : old variable value
+	 */
 	public VariableNotification(Enum<?> id, T newValue, T oldValue) {
 		super(NotificationType.VariableNotification);
 		this.id = id;
@@ -30,14 +44,23 @@ public class VariableNotification<T> extends Notification {
 		this.newValue = newValue;
 	}
 
+	/**
+	 * Returns the variable identifier.
+	 */
 	public Enum<?> getId() {
 		return id;
 	}
-
+	
+	/**
+	 * Returns the new value.
+	 */
 	public T getNewValue() {
 		return newValue;
 	}
-
+	
+	/**
+	 * Returns the old value.
+	 */
 	public T getOldValue() {
 		return oldValue;
 	}

test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/interfacetest/InterfaceTestCycleBasedStatemachine.java

@@ -237,6 +237,7 @@ public class InterfaceTestCycleBasedStatemachine extends NotificationSender
 				}
 			}
 		}
+
 	}
 	private void reactState2() {
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent1())) {
@@ -247,6 +248,7 @@ public class InterfaceTestCycleBasedStatemachine extends NotificationSender
 			stateVector[0] = State.State1;
 
 		}
+
 	}
 	private void reactState3() {
 		if (occuredEvents.contains(getInterfaceOtherImpl().getEventEvent3())) {
@@ -256,6 +258,7 @@ public class InterfaceTestCycleBasedStatemachine extends NotificationSender
 			stateVector[0] = State.State1;
 
 		}
+
 	}
 	private void reactState4() {
 		if (occuredEvents.contains(getInterfaceThirdImpl().getEventEvent5())) {
@@ -265,6 +268,7 @@ public class InterfaceTestCycleBasedStatemachine extends NotificationSender
 			stateVector[0] = State.State1;
 
 		}
+
 	}
 	public void runCycle() {
 		outEvents.clear();

test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_deephistory/Test_DeepHistoryCycleBasedStatemachine.java

@@ -176,31 +176,31 @@ public class Test_DeepHistoryCycleBasedStatemachine
 
 			case State6 :
 
-				historyVector[0] = stateVector[0];
-
 				historyVector[1] = stateVector[0];
+
+				historyVector[0] = stateVector[0];
 				stateVector[0] = State.$NullState$;
 
 				break;
 
 			case State8 :
 
-				historyVector[0] = stateVector[0];
+				historyVector[2] = stateVector[0];
 
 				historyVector[1] = stateVector[0];
 
-				historyVector[2] = stateVector[0];
+				historyVector[0] = stateVector[0];
 				stateVector[0] = State.$NullState$;
 
 				break;
 
 			case State9 :
 
-				historyVector[0] = stateVector[0];
+				historyVector[2] = stateVector[0];
 
 				historyVector[1] = stateVector[0];
 
-				historyVector[2] = stateVector[0];
+				historyVector[0] = stateVector[0];
 				stateVector[0] = State.$NullState$;
 
 				break;
@@ -218,7 +218,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 
 	}
 
-	private void deepEnterSequenceState20() {
+	private void deepEnterSequenceState2Region0() {
 		//Handle deep history entry of null
 		switch (historyVector[0]) {
 
@@ -230,19 +230,19 @@ public class Test_DeepHistoryCycleBasedStatemachine
 
 			case State6 :
 
-				deepEnterSequenceState40();
+				deepEnterSequenceState4Region0();
 
 				break;
 
 			case State8 :
 
-				deepEnterSequenceState40();
+				deepEnterSequenceState4Region0();
 
 				break;
 
 			case State9 :
 
-				deepEnterSequenceState40();
+				deepEnterSequenceState4Region0();
 
 				break;
 
@@ -257,7 +257,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 		}
 	}
 
-	private void deepEnterSequenceState40() {
+	private void deepEnterSequenceState4Region0() {
 		//Handle deep history entry of null
 		switch (historyVector[1]) {
 
@@ -269,13 +269,13 @@ public class Test_DeepHistoryCycleBasedStatemachine
 
 			case State8 :
 
-				deepEnterSequenceState70();
+				deepEnterSequenceState7Region0();
 
 				break;
 
 			case State9 :
 
-				deepEnterSequenceState70();
+				deepEnterSequenceState7Region0();
 
 				break;
 
@@ -284,7 +284,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 		}
 	}
 
-	private void deepEnterSequenceState70() {
+	private void deepEnterSequenceState7Region0() {
 		//Handle deep history entry of null
 		switch (historyVector[2]) {
 
@@ -312,7 +312,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 			//Enter the region with deep history
 			if (historyVector[0] != State.$NullState$) {
 
-				deepEnterSequenceState20();
+				deepEnterSequenceState2Region0();
 			} else {
 				nextStateIndex = 0;
 				stateVector[0] = State.State3;
@@ -320,6 +320,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState2() {
 	}
@@ -327,7 +328,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent2())) {
 
 			historyVector[0] = stateVector[0];
-			//Handle exit of all possible states (of null) at position 0...
+			//Handle exit of all possible states (of region0) at position 0...
 			switch (stateVector[0]) {
 
 				case State3 :
@@ -344,18 +345,18 @@ public class Test_DeepHistoryCycleBasedStatemachine
 
 				case State8 :
 
-					historyVector[1] = stateVector[0];
-
 					historyVector[2] = stateVector[0];
+
+					historyVector[1] = stateVector[0];
 					stateVector[0] = State.$NullState$;
 
 					break;
 
 				case State9 :
 
-					historyVector[1] = stateVector[0];
-
 					historyVector[2] = stateVector[0];
+
+					historyVector[1] = stateVector[0];
 					stateVector[0] = State.$NullState$;
 
 					break;
@@ -383,6 +384,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState4() {
 	}
@@ -390,7 +392,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent2())) {
 
 			historyVector[0] = stateVector[0];
-			//Handle exit of all possible states (of null) at position 0...
+			//Handle exit of all possible states (of region0) at position 0...
 			switch (stateVector[0]) {
 
 				case State3 :
@@ -407,18 +409,18 @@ public class Test_DeepHistoryCycleBasedStatemachine
 
 				case State8 :
 
-					historyVector[1] = stateVector[0];
-
 					historyVector[2] = stateVector[0];
+
+					historyVector[1] = stateVector[0];
 					stateVector[0] = State.$NullState$;
 
 					break;
 
 				case State9 :
 
-					historyVector[1] = stateVector[0];
-
 					historyVector[2] = stateVector[0];
+
+					historyVector[1] = stateVector[0];
 					stateVector[0] = State.$NullState$;
 
 					break;
@@ -440,7 +442,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 					.getEventEvent4())) {
 
 				historyVector[1] = stateVector[0];
-				//Handle exit of all possible states (of null) at position 0...
+				//Handle exit of all possible states (of region0) at position 0...
 				switch (stateVector[0]) {
 
 					case State6 :
@@ -482,6 +484,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState7() {
 	}
@@ -489,7 +492,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent2())) {
 
 			historyVector[0] = stateVector[0];
-			//Handle exit of all possible states (of null) at position 0...
+			//Handle exit of all possible states (of region0) at position 0...
 			switch (stateVector[0]) {
 
 				case State3 :
@@ -506,18 +509,18 @@ public class Test_DeepHistoryCycleBasedStatemachine
 
 				case State8 :
 
-					historyVector[1] = stateVector[0];
-
 					historyVector[2] = stateVector[0];
+
+					historyVector[1] = stateVector[0];
 					stateVector[0] = State.$NullState$;
 
 					break;
 
 				case State9 :
 
-					historyVector[1] = stateVector[0];
-
 					historyVector[2] = stateVector[0];
+
+					historyVector[1] = stateVector[0];
 					stateVector[0] = State.$NullState$;
 
 					break;
@@ -539,7 +542,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 					.getEventEvent4())) {
 
 				historyVector[1] = stateVector[0];
-				//Handle exit of all possible states (of null) at position 0...
+				//Handle exit of all possible states (of region0) at position 0...
 				switch (stateVector[0]) {
 
 					case State6 :
@@ -573,7 +576,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 						.getEventEvent6())) {
 
 					historyVector[2] = stateVector[0];
-					//Handle exit of all possible states (of null) at position 0...
+					//Handle exit of all possible states (of region0) at position 0...
 					switch (stateVector[0]) {
 
 						case State8 :
@@ -608,12 +611,13 @@ public class Test_DeepHistoryCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState9() {
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent2())) {
 
 			historyVector[0] = stateVector[0];
-			//Handle exit of all possible states (of null) at position 0...
+			//Handle exit of all possible states (of region0) at position 0...
 			switch (stateVector[0]) {
 
 				case State3 :
@@ -630,18 +634,18 @@ public class Test_DeepHistoryCycleBasedStatemachine
 
 				case State8 :
 
-					historyVector[1] = stateVector[0];
-
 					historyVector[2] = stateVector[0];
+
+					historyVector[1] = stateVector[0];
 					stateVector[0] = State.$NullState$;
 
 					break;
 
 				case State9 :
 
-					historyVector[1] = stateVector[0];
-
 					historyVector[2] = stateVector[0];
+
+					historyVector[1] = stateVector[0];
 					stateVector[0] = State.$NullState$;
 
 					break;
@@ -663,7 +667,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 					.getEventEvent4())) {
 
 				historyVector[1] = stateVector[0];
-				//Handle exit of all possible states (of null) at position 0...
+				//Handle exit of all possible states (of region0) at position 0...
 				switch (stateVector[0]) {
 
 					case State6 :
@@ -697,7 +701,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 						.getEventEvent6())) {
 
 					historyVector[2] = stateVector[0];
-					//Handle exit of all possible states (of null) at position 0...
+					//Handle exit of all possible states (of region0) at position 0...
 					switch (stateVector[0]) {
 
 						case State8 :
@@ -732,12 +736,13 @@ public class Test_DeepHistoryCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState5() {
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent2())) {
 
 			historyVector[0] = stateVector[0];
-			//Handle exit of all possible states (of null) at position 0...
+			//Handle exit of all possible states (of region0) at position 0...
 			switch (stateVector[0]) {
 
 				case State3 :
@@ -754,18 +759,18 @@ public class Test_DeepHistoryCycleBasedStatemachine
 
 				case State8 :
 
-					historyVector[1] = stateVector[0];
-
 					historyVector[2] = stateVector[0];
+
+					historyVector[1] = stateVector[0];
 					stateVector[0] = State.$NullState$;
 
 					break;
 
 				case State9 :
 
-					historyVector[1] = stateVector[0];
-
 					historyVector[2] = stateVector[0];
+
+					historyVector[1] = stateVector[0];
 					stateVector[0] = State.$NullState$;
 
 					break;
@@ -785,6 +790,7 @@ public class Test_DeepHistoryCycleBasedStatemachine
 		} else {
 
 		}
+
 	}
 	public void runCycle() {
 		outEvents.clear();

test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_expression/Test_ExpressionCycleBasedStatemachine.java

@@ -233,6 +233,7 @@ public class Test_ExpressionCycleBasedStatemachine extends NotificationSender
 			stateVector[0] = State.State2;
 
 		}
+
 	}
 	private void reactState2() {
 		if ((occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent1()) && (getDefaultInterfaceImpl()
@@ -255,6 +256,7 @@ public class Test_ExpressionCycleBasedStatemachine extends NotificationSender
 					getDefaultInterfaceImpl().getVarVar1() + (1));
 
 		}
+
 	}
 	public void runCycle() {
 		outEvents.clear();

test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_hierarchy/Test_HierarchyCycleBasedStatemachine.java

@@ -339,6 +339,7 @@ public class Test_HierarchyCycleBasedStatemachine extends NotificationSender
 			}
 
 		}
+
 	}
 	private void reactState10() {
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent1())) {
@@ -390,6 +391,7 @@ public class Test_HierarchyCycleBasedStatemachine extends NotificationSender
 			}
 
 		}
+
 	}
 	private void reactState2() {
 	}
@@ -623,6 +625,7 @@ public class Test_HierarchyCycleBasedStatemachine extends NotificationSender
 			}
 
 		}
+
 	}
 	private void reactState4() {
 	}
@@ -913,6 +916,7 @@ public class Test_HierarchyCycleBasedStatemachine extends NotificationSender
 			}
 
 		}
+
 	}
 	private void reactState6() {
 	}
@@ -1078,6 +1082,7 @@ public class Test_HierarchyCycleBasedStatemachine extends NotificationSender
 			}
 
 		}
+
 	}
 	private void reactState8() {
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent6())) {
@@ -1394,6 +1399,7 @@ public class Test_HierarchyCycleBasedStatemachine extends NotificationSender
 			}
 
 		}
+
 	}
 	public void runCycle() {
 		outEvents.clear();

test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_localactions/Test_LocalActionsCycleBasedStatemachine.java

@@ -242,6 +242,7 @@ public class Test_LocalActionsCycleBasedStatemachine extends NotificationSender
 			}
 
 		}
+
 	}
 	private void reactState2() {
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent3())) {
@@ -269,6 +270,7 @@ public class Test_LocalActionsCycleBasedStatemachine extends NotificationSender
 			}
 
 		}
+
 	}
 	public void runCycle() {
 		cycleStartTime = System.currentTimeMillis();

test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_parallelregions/Test_ParallelRegionsCycleBasedStatemachine.java

@@ -369,6 +369,7 @@ public class Test_ParallelRegionsCycleBasedStatemachine
 				}
 			}
 		}
+
 	}
 	private void reactState2() {
 	}
@@ -544,6 +545,7 @@ public class Test_ParallelRegionsCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState4() {
 	}
@@ -712,6 +714,7 @@ public class Test_ParallelRegionsCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState6() {
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent10())) {
@@ -878,6 +881,7 @@ public class Test_ParallelRegionsCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState9() {
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent10())) {
@@ -1109,6 +1113,7 @@ public class Test_ParallelRegionsCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState7() {
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent10())) {
@@ -1273,6 +1278,7 @@ public class Test_ParallelRegionsCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState8() {
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent10())) {
@@ -1357,6 +1363,7 @@ public class Test_ParallelRegionsCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	public void runCycle() {
 		outEvents.clear();

test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_shallowhistory/Test_ShallowHistoryCycleBasedStatemachine.java

@@ -179,18 +179,18 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 
 			case State8 :
 
-				historyVector[0] = stateVector[0];
-
 				historyVector[1] = stateVector[0];
+
+				historyVector[0] = stateVector[0];
 				stateVector[0] = State.$NullState$;
 
 				break;
 
 			case State9 :
 
-				historyVector[0] = stateVector[0];
-
 				historyVector[1] = stateVector[0];
+
+				historyVector[0] = stateVector[0];
 				stateVector[0] = State.$NullState$;
 
 				break;
@@ -208,7 +208,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 
 	}
 
-	private void shallowEnterSequenceState20() {
+	private void shallowEnterSequenceState2Region0() {
 		//Handle shallow history entry of null
 		switch (historyVector[0]) {
 
@@ -247,7 +247,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 		}
 	}
 
-	private void shallowEnterSequenceState70() {
+	private void shallowEnterSequenceState7Region0() {
 		//Handle shallow history entry of null
 		switch (historyVector[1]) {
 
@@ -274,7 +274,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 			//Enter the region with shallow history
 			if (historyVector[0] != State.$NullState$) {
 
-				shallowEnterSequenceState20();
+				shallowEnterSequenceState2Region0();
 			} else {
 				nextStateIndex = 0;
 				stateVector[0] = State.State3;
@@ -282,6 +282,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState2() {
 	}
@@ -289,7 +290,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent2())) {
 
 			historyVector[0] = stateVector[0];
-			//Handle exit of all possible states (of null) at position 0...
+			//Handle exit of all possible states (of region0) at position 0...
 			switch (stateVector[0]) {
 
 				case State3 :
@@ -339,6 +340,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState4() {
 	}
@@ -346,7 +348,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent2())) {
 
 			historyVector[0] = stateVector[0];
-			//Handle exit of all possible states (of null) at position 0...
+			//Handle exit of all possible states (of region0) at position 0...
 			switch (stateVector[0]) {
 
 				case State3 :
@@ -388,7 +390,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 		} else {
 			if (occuredEvents.contains(getDefaultInterfaceImpl()
 					.getEventEvent4())) {
-				//Handle exit of all possible states (of null) at position 0...
+				//Handle exit of all possible states (of region0) at position 0...
 				switch (stateVector[0]) {
 
 					case State6 :
@@ -425,7 +427,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 					//Enter the region with shallow history
 					if (historyVector[1] != State.$NullState$) {
 
-						shallowEnterSequenceState70();
+						shallowEnterSequenceState7Region0();
 					} else {
 						nextStateIndex = 0;
 						stateVector[0] = State.State8;
@@ -437,6 +439,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState7() {
 	}
@@ -444,7 +447,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent2())) {
 
 			historyVector[0] = stateVector[0];
-			//Handle exit of all possible states (of null) at position 0...
+			//Handle exit of all possible states (of region0) at position 0...
 			switch (stateVector[0]) {
 
 				case State3 :
@@ -486,7 +489,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 		} else {
 			if (occuredEvents.contains(getDefaultInterfaceImpl()
 					.getEventEvent4())) {
-				//Handle exit of all possible states (of null) at position 0...
+				//Handle exit of all possible states (of region0) at position 0...
 				switch (stateVector[0]) {
 
 					case State6 :
@@ -520,7 +523,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 						.getEventEvent6())) {
 
 					historyVector[1] = stateVector[0];
-					//Handle exit of all possible states (of null) at position 0...
+					//Handle exit of all possible states (of region0) at position 0...
 					switch (stateVector[0]) {
 
 						case State8 :
@@ -555,12 +558,13 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState9() {
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent2())) {
 
 			historyVector[0] = stateVector[0];
-			//Handle exit of all possible states (of null) at position 0...
+			//Handle exit of all possible states (of region0) at position 0...
 			switch (stateVector[0]) {
 
 				case State3 :
@@ -602,7 +606,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 		} else {
 			if (occuredEvents.contains(getDefaultInterfaceImpl()
 					.getEventEvent4())) {
-				//Handle exit of all possible states (of null) at position 0...
+				//Handle exit of all possible states (of region0) at position 0...
 				switch (stateVector[0]) {
 
 					case State6 :
@@ -636,7 +640,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 						.getEventEvent6())) {
 
 					historyVector[1] = stateVector[0];
-					//Handle exit of all possible states (of null) at position 0...
+					//Handle exit of all possible states (of region0) at position 0...
 					switch (stateVector[0]) {
 
 						case State8 :
@@ -671,12 +675,13 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 			}
 
 		}
+
 	}
 	private void reactState5() {
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent2())) {
 
 			historyVector[0] = stateVector[0];
-			//Handle exit of all possible states (of null) at position 0...
+			//Handle exit of all possible states (of region0) at position 0...
 			switch (stateVector[0]) {
 
 				case State3 :
@@ -718,6 +723,7 @@ public class Test_ShallowHistoryCycleBasedStatemachine
 		} else {
 
 		}
+
 	}
 	public void runCycle() {
 		outEvents.clear();

test-plugins/org.yakindu.sct.generator.java.runtime.test/src-gen/org/yakindu/sct/runtime/java/test_transition/Test_TransitionCycleBasedStatemachine.java

@@ -194,7 +194,7 @@ public class Test_TransitionCycleBasedStatemachine extends NotificationSender
 	}
 
 	public void exit() {
-		//Handle exit of all possible states (of ) at position 0...
+		//Handle exit of all possible states (of region0) at position 0...
 		switch (stateVector[0]) {
 
 			case State1 :
@@ -302,6 +302,7 @@ public class Test_TransitionCycleBasedStatemachine extends NotificationSender
 				}
 			}
 		}
+
 	}
 	private void reactState2() {
 		if (occuredEvents.contains(getDefaultInterfaceImpl().getEventEvent6())) {
@@ -316,6 +317,7 @@ public class Test_TransitionCycleBasedStatemachine extends NotificationSender
 			stateVector[0] = State.State1;
 
 		}
+
 	}
 	public void runCycle() {
 		cycleStartTime = System.currentTimeMillis();