Issue 258 fixed: "statemachine" replaced by "state machine".

examples/traffic_light/src-gen/traffic/light/IStatemachine.java

@@ -11,34 +11,34 @@ Contributors:
 package traffic.light;
 
 /**
- * Basic interface for statemachines.
+ * Basic interface for state machines.
  */
 public interface IStatemachine {
 
 	/**
-	 * Initializes the statemachine. Use to init internal variables etc.
+	 * Initializes the state machine. Used to init internal variables etc.
 	 */
 	public void init();
 
 	/**
-	 * Enters the statemachine. Sets the statemachine in a defined state.
+	 * Enters the state machine. Sets the state machine into a defined state.
 	 */
 	public void enter();
 
 	/**
-	 * Exits the statemachine. Leaves the statemachine with a defined state.
+	 * Exits the state machine. Leaves the state machine with a defined state.
 	 */
 	public void exit();
 
 	/**
-	 * Checks if the statemachine is active. 
-	 * A statemachine is active if it was entered. It is inactive if it has not been entered at all or if it was exited.
+	 * Checks whether the state machine is active. 
+	 * A state machine is active if it has been entered. It is inactive if it has not been entered at all or if it has been exited.
 	 */
 	public boolean isActive();
 
 	/**
-	 * Checks if all active states are final. 
-	 * If there are no active states then the statemachine is considered as incative and this method returns false.
+	 * Checks whether all active states are final. 
+	 * If there are no active states then the state machine is considered to be incative and this method returns <code>false</code>.
 	 */
 	public boolean isFinal();
 

examples/traffic_light/src-gen/traffic/light/RuntimeService.java

@@ -105,7 +105,7 @@ public class RuntimeService {
 	 * Registers an {@link IStatemachine} for scheduled fixed rate execution
 	 * 
 	 * @param statemachine
-	 *            - The statemachine to execute
+	 *            - The state machine to execute
 	 * @param cyclePeriod
 	 *            - the fixed rate cycle period for scheduling
 	 * @return {@code true} if state machine is added properly.
@@ -114,10 +114,10 @@ public class RuntimeService {
 			long cyclePeriod) {
 
 		if (timerTasks.containsKey(cyclePeriod)) {
-			// TimerTask for cycle time already existing -> add statemachine
+			// TimerTask for cycle time already existing -> add state machine
 			return timerTasks.get(cyclePeriod).addStatemachine(statemachine);
 		} else {
-			// Create new TimerTask for cycle period and add statemachine
+			// Create new TimerTask for cycle period and add state machine
 			StatemachineTimerTask timerTask = new StatemachineTimerTask();
 			timerTasks.put(cyclePeriod, timerTask);
 			boolean ret = timerTask.addStatemachine(statemachine);
@@ -135,9 +135,9 @@ public class RuntimeService {
 	 * Removes the given state machine from runtime service.
 	 * 
 	 * @param statemachine
-	 *            - the statemachine which should be removed
+	 *            - the state machine which should be removed
 	 * @param cyclePeriod
-	 *            - the scheduling cycle period of the statemachine
+	 *            - the scheduling cycle period of the state machine
 	 * @return {@code true} if state machine is removed properly.
 	 */
 	public boolean unregisterStatemachine(IStatemachine statemachine,
@@ -152,8 +152,8 @@ public class RuntimeService {
 	}
 
 	/**
-	 * Cancels the execution of statemachines for the given cycle period. This
-	 * stops the execution of statemachines which are registered for the given
+	 * Cancels the execution of state machines for the given cycle period. This
+	 * stops the execution of state machines which are registered for the given
 	 * cycle period and cancels the executing {@link TimerTask}.
 	 * 
 	 * @return {@code true} if poperly cancelled
@@ -170,7 +170,7 @@ public class RuntimeService {
 	}
 
 	/**
-	 * Pauses the execution of all statemachines which are registered for the
+	 * Pauses the execution of all state machines which are registered for the
 	 * given cyclePeriod.
 	 * 
 	 * @param cyclePeriod
@@ -186,7 +186,7 @@ public class RuntimeService {
 	}
 
 	/**
-	 * Resumes the execution of all statemachines which are registered for the
+	 * Resumes the execution of all state machines which are registered for the
 	 * given cyclePeriod.
 	 * 
 	 * @param cyclePeriod
@@ -202,7 +202,7 @@ public class RuntimeService {
 	}
 
 	/**
-	 * Cancels the execution of all registered statemachines. This cancels the
+	 * Cancels the execution of all registered state machines. This cancels the
 	 * executing {@link Timer} freeing all allocated resources and terminates
 	 * all existing execution threads.
 	 */

examples/traffic_light/src-gen/traffic/light/trafficlightwaiting/TrafficLightWaitingStatemachine.java

@@ -157,7 +157,7 @@ public class TrafficLightWaitingStatemachine implements ITrafficLightWaitingStat
 	public void enter() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		if (timer == null) {
 			throw new IllegalStateException("timer not set.");
@@ -1074,7 +1074,7 @@ public class TrafficLightWaitingStatemachine implements ITrafficLightWaitingStat
 	public void runCycle() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		clearOutEvents();
 

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/StatemachineHeader.xtend

@@ -88,18 +88,18 @@ class StatemachineHeader {
 		«ENDFOR»
 		
 		/*!
-		 * Checks if the statemachine is active (until 2.4.1 this method was used for states).
-		 * A statemachine is active if it was entered. It is inactive if it has not been entered at all or if it was exited.
+		 * Checks whether the state machine is active (until 2.4.1 this method was used for states).
+		 * A state machine is active if it was entered. It is inactive if it has not been entered at all or if it has been exited.
 		 */
 		extern sc_boolean «isActiveFctID»(const «scHandleDecl»);
 		
 		/*!
 		 * Checks if all active states are final. 
-		 * If there are no active states then the statemachine is considered as inactive and this method returns false.
+		 * If there are no active states then the state machine is considered being inactive. In this case this method returns false.
 		 */
 		extern sc_boolean «isFinalFctID»(const «scHandleDecl»);
 		
-		/*! Checks if the specified state is active (until 2.4.1 the used method for states was calles isActive()). */
+		/*! Checks if the specified state is active (until 2.4.1 the used method for states was called isActive()). */
 		extern sc_boolean «stateActiveFctID»(const «scHandleDecl», «statesEnumType» state);
 		
 		#ifdef __cplusplus

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/StatemachineHeader.xtend

@@ -225,15 +225,15 @@ class StatemachineHeader extends org.yakindu.sct.generator.c.StatemachineHeader
 		void runCycle();
 		
 		/*!
-		* Checks if the statemachine is active (until 2.4.1 this method was used for states).
-		* A statemachine is active if it was entered. It is inactive if it has not been entered at all or if it was exited.
+		* Checks if the state machine is active (until 2.4.1 this method was used for states).
+		* A state machine is active if it has been entered. It is inactive if it has not been entered at all or if it has been exited.
 		*/
 		sc_boolean isActive();
 		
 		
 		/*!
 		* Checks if all active states are final. 
-		* If there are no active states then the statemachine is considered as inactive and this method returns false.
+		* If there are no active states then the state machine is considered being inactive. In this case this method returns false.
 		*/
 		sc_boolean isFinal();
 	'''

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/StatemachineInterface.xtend

@@ -35,7 +35,7 @@ class StatemachineInterface {
 		#define «statemachineInterface.define»_H_
 		
 		/*
-		 * Basic interface for statemachines.
+		 * Basic interface for state machines.
 		 */
 		class «statemachineInterface» {
 			public:
@@ -43,17 +43,17 @@ class StatemachineInterface {
 				virtual ~«statemachineInterface»() = 0;
 				
 				/*
-				* Initializes the statemachine. Use to init internal variables etc.
+				* Initializes the state machine. Used to initialize internal variables etc.
 				*/
 				virtual void init() = 0;
 			
 				/*
-				* Enters the statemachine. Sets the statemachine in a defined state.
+				* Enters the state machine. Sets the state machine into a defined state.
 				*/
 				virtual void enter() = 0;
 			
 				/*
-				* Exits the statemachine. Leaves the statemachine with a defined state.
+				* Exits the state machine. Leaves the state machine with a defined state.
 				*/
 				virtual void exit() = 0;
 			
@@ -63,14 +63,14 @@ class StatemachineInterface {
 				virtual void runCycle() = 0;
 				
 				/*
-				* Checks if the statemachine is active. 
-			 	* A statemachine is active if it was entered. It is inactive if it has not been entered at all or if it was exited.
+				* Checks whether the state machine is active. 
+			 	* A state machine is active if it has been entered. It is inactive if it has not been entered at all or if it has been exited.
 			 	*/	
 				virtual	sc_boolean isActive() = 0;
 				
 				/*
 				* Checks if all active states are final. 
-			 	* If there are no active states then the statemachine is considered as inactive and this method returns false.
+			 	* If there are no active states then the state machine is considered being inactive. In this case this method returns false.
 			 	*/
 				virtual sc_boolean isFinal() = 0;
 		};

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/TimerInterface.xtend

@@ -40,7 +40,7 @@ class TimerInterface {
 		class TimedStatemachineInterface;
 		
 		/*
-		 * Basic interface for statemachines.
+		 * Basic interface for state machines.
 		 */
 		class «timerInterface» {
 			public:

plugins/org.yakindu.sct.generator.genmodel.ui/src/org/yakindu/sct/generator/genmodel/ui/wizard/GeneratorProjectTemplate.xtend

@@ -397,10 +397,10 @@ class GeneratorProjectTemplate {
 
 			public void generate(ExecutionFlow flow, GeneratorEntry entry, IFileSystemAccess access) {
 				StringBuilder builder = new StringBuilder();
-				builder.append("The name of the Statemachine is ");
+				builder.append("The name of the state machine is ");
 				builder.append(flow.getName());
 				builder.append(LBR).append(LBR);
-				builder.append("The Statemachine has the following states:");
+				builder.append("The state machine has the following states:");
 				builder.append(LBR).append(LBR);
 				for (ExecutionState state : flow.getStates()) {
 					builder.append(
@@ -446,9 +446,9 @@ class GeneratorProjectTemplate {
 			}
 		
 			def info(ExecutionFlow flow) {''«"'"»
-				The name of the Statemachine is '«'«'»flow.name»'
+				The name of the state machine is '«'«'»flow.name»'
 
-				The Statemachine has the following states:
+				The state machine has the following states:
 		
 				«'«'»FOR ExecutionState state : flow.states»
 					«'«'»state.name.replaceFirst(flow.name+'\\.','')»

plugins/org.yakindu.sct.generator.genmodel.ui/src/org/yakindu/sct/generator/genmodel/ui/wizard/XpandDefaultTemplate.xpt

@@ -17,9 +17,9 @@
  
 «DEFINE main(sgen::GeneratorEntry entry) FOR sexec::ExecutionFlow-»
 «FILE this.name+'.txt' -»
-The name of the Statemachine is '«this.name-»'
+The name of the state machine is '«this.name-»'
 
-The Statemachine has the following states:
+The state machine has the following states:
 
 «FOREACH this.states AS state-»
 «state.name.replaceFirst(this.name+'\\.','')»

plugins/org.yakindu.sct.generator.java/library/FeatureTypeLibrary.xmi

@@ -34,7 +34,7 @@
         parameterType="BOOLEAN"/>
   </types>
   <types name="RunnableWrapper"
-      comment="Generates a runnable wrapper for the statemachine"
+      comment="Generates a runnable wrapper for the state machine"
       optional="true">
     <parameters
         name="namePrefix"

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/IStatemachine.xtend

@@ -43,34 +43,34 @@ class IStatemachine {
 		package «entry.getBasePackageName()»;
 
 		/**
-		 * Basic interface for statemachines.
+		 * Basic interface for state machines.
 		 */
 		public interface IStatemachine {
 		
 			/**
-			 * Initializes the statemachine. Use to init internal variables etc.
+			 * Initializes the state machine. Used to initialize internal variables etc.
 			 */
 			public void init();
 		
 			/**
-			 * Enters the statemachine. Sets the statemachine in a defined state.
+			 * Enters the state machine. Sets the state machine into a defined state.
 			 */
 			public void enter();
 		
 			/**
-			 * Exits the statemachine. Leaves the statemachine with a defined state.
+			 * Exits the state machine. Leaves the state machine with a defined state.
 			 */
 			public void exit();
 		
 			/**
-			 * Checks if the statemachine is active. 
-			 * A statemachine is active if it was entered. It is inactive if it has not been entered at all or if it was exited.
+			 * Checks whether the state machine is active. 
+			 * A state machine is active if it has been entered. It is inactive if it has not been entered at all or if it has been exited.
 			 */
 			public boolean isActive();
 		
 			/**
-			 * Checks if all active states are final. 
-			 * If there are no active states then the statemachine is considered as incative and this method returns false.
+			 * Checks whether all active states are final. 
+			 * If there are no active states then the state machine is considered being incative. In this case this method returns <code>false</code>.
 			 */
 			public boolean isFinal();
 		

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/RunnableWrapper.xtend

@@ -21,7 +21,7 @@ import org.yakindu.base.types.typesystem.GenericTypeSystem
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
 
 /**
- * Generates the runnable wrapper for the statemachine. This wrapper implies event based execution semantics. 
+ * Generates the runnable wrapper for the state machine. This wrapper implies event based execution semantics. 
  */
 class RunnableWrapper {
 
@@ -52,9 +52,9 @@ class RunnableWrapper {
 		«flow.createImports(entry)»
 		
 		/**
-		 * Runnable wrapper of «flow.statemachineClassName». This wrapper provides a thread safe, runnable instance of the statemachine.
+		 * Runnable wrapper of «flow.statemachineClassName». This wrapper provides a thread-safe, runnable instance of the state machine.
 		 * The wrapper implements the {@link Runnable} interface and can be started in a thread by the client code. 
-		 * The run method then starts the main event processing loop for this statemachine.
+		 * The run method then starts the main event processing loop for this state machine.
 		 * 
 		 * This feature is in beta state. Currently not supported are
 		 * - interface observer
@@ -70,7 +70,7 @@ class RunnableWrapper {
 			«flow.timingFunctions(entry)»
 			
 			/**
-			 * init() will be delegated thread safe to the wrapped statemachine. 
+			 * init() will be delegated thread-safely to the wrapped state machine. 
 			 */ 
 			public void init() {
 				synchronized(statemachine) {
@@ -79,7 +79,7 @@ class RunnableWrapper {
 			}
 			
 			/**
-			 * enter() will be delegated thread safe to the wrapped statemachine.  
+			 * enter() will be delegated thread-safely to the wrapped state machine.  
 			 */ 
 			public void enter() {
 				synchronized(statemachine) {
@@ -88,7 +88,7 @@ class RunnableWrapper {
 			}
 			
 			/**
-			 * exit() will be delegated thread safe to the wrapped statemachine.  
+			 * exit() will be delegated thread-safely to the wrapped state machine.  
 			 */ 
 			public void exit() {
 				synchronized(statemachine) {
@@ -97,7 +97,7 @@ class RunnableWrapper {
 			}
 			
 			/**
-			 * isActive() will be delegated thread safe to the wrapped statemachine.  
+			 * isActive() will be delegated thread-safely to the wrapped state machine.  
 			 */ 
 			public boolean isActive() {
 				synchronized(statemachine) {
@@ -106,7 +106,7 @@ class RunnableWrapper {
 			}
 			
 			/**
-			 * isFinal() will be delegated thread safe to the wrapped statemachine.  
+			 * isFinal() will be delegated thread-safely to the wrapped state machine.  
 			 */ 
 			public boolean isFinal() {
 				synchronized(statemachine) {
@@ -116,7 +116,7 @@ class RunnableWrapper {
 			
 			
 			/**
-			 * runCycle() will be delegated thread safe to the wrapped statemachine.  
+			 * runCycle() will be delegated thread-safely to the wrapped state machine.  
 			 */ 
 			@Override
 			public void runCycle() {
@@ -126,8 +126,8 @@ class RunnableWrapper {
 			}
 
 			/**
-			 * This method will start the main execution loop for the statemachine. 
-			 * First it will init and enter the statemachine implicitly and then will start processing events 
+			 * This method will start the main execution loop for the state machine. 
+			 * First it will init and enter the state machine implicitly and then will start processing events 
 			 * from the event queue until the thread is interrupted. 
 			 */
 			@Override
@@ -175,7 +175,7 @@ class RunnableWrapper {
 		protected BlockingQueue<Runnable> eventQueue = new LinkedBlockingQueue<Runnable>();
 
 		/**
-		 * The core statemachine is simply wrapped and the event processing will be delegated to that statemachine instance.
+		 * The core state machine is simply wrapped and the event processing will be delegated to that state machine instance.
 		 * This instance will be created implicitly.
 		 */
 		protected «flow.statemachineClassName» statemachine = new «flow.statemachineClassName»();
@@ -302,7 +302,7 @@ class RunnableWrapper {
 			public void setTimer(ITimer timer) {
 				synchronized(statemachine) {
 					this.externalTimer = timer;
-					/* the wrapped statemachine uses timer proxy as timer */
+					/* the wrapped state machine uses timer proxy as timer */
 					statemachine.setTimer(timerProxy);
 				}
 			}

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/RuntimeService.xtend

@@ -126,7 +126,7 @@ class RuntimeService {
 			 * Registers an {@link IStatemachine} for scheduled fixed rate execution
 			 * 
 			 * @param statemachine
-			 *            - The statemachine to execute
+			 *            - The state machine to execute
 			 * @param cyclePeriod
 			 *            - the fixed rate cycle period for scheduling
 			 * @return {@code true} if state machine is added properly.
@@ -135,10 +135,10 @@ class RuntimeService {
 					long cyclePeriod) {
 		
 				if (timerTasks.containsKey(cyclePeriod)) {
-					// TimerTask for cycle time already existing -> add statemachine
-					return timerTasks.get(cyclePeriod).addStatemachine(statemachine);
+					// TimerTask for cycle time already existing -> add state machine
+					return timerTasks.get(cyclePeriod).addStatemachine(state machine);
 				} else {
-					// Create new TimerTask for cycle period and add statemachine
+					// Create new TimerTask for cycle period and add state machine
 					StatemachineTimerTask timerTask = new StatemachineTimerTask();
 					timerTasks.put(cyclePeriod, timerTask);
 					boolean ret = timerTask.addStatemachine(statemachine);
@@ -156,9 +156,9 @@ class RuntimeService {
 			 * Removes the given state machine from runtime service.
 			 * 
 			 * @param statemachine
-			 *            - the statemachine which should be removed
+			 *            - the state machine to be removed
 			 * @param cyclePeriod
-			 *            - the scheduling cycle period of the statemachine
+			 *            - the scheduling cycle period of the state machine
 			 * @return {@code true} if state machine is removed properly.
 			 */
 			public boolean unregisterStatemachine(IStatemachine statemachine,
@@ -173,8 +173,8 @@ class RuntimeService {
 			}
 
 			/**
-			 * Cancels the execution of statemachines for the given cycle period. This
-			 * stops the execution of statemachines which are registered for the given
+			 * Cancels the execution of state machines for the given cycle period. This
+			 * stops the execution of state machines which are registered for the given
 			 * cycle period and cancels the executing {@link TimerTask}.
 			 * 
 			 * @return {@code true} if poperly cancelled
@@ -191,7 +191,7 @@ class RuntimeService {
 			}
 
 			/**
-			 * Pauses the execution of all statemachines which are registered for the
+			 * Pauses the execution of all state machines which are registered for the
 			 * given cyclePeriod.
 			 * 
 			 * @param cyclePeriod
@@ -207,7 +207,7 @@ class RuntimeService {
 			}
 
 			/**
-			 * Resumes the execution of all statemachines which are registered for the
+			 * Resumes the execution of all state machines which are registered for the
 			 * given cyclePeriod.
 			 * 
 			 * @param cyclePeriod
@@ -223,7 +223,7 @@ class RuntimeService {
 			}
 
 			/**
-			 * Cancels the execution of all registered statemachines. This cancels the
+			 * Cancels the execution of all registered state machines. This cancels the
 			 * executing {@link Timer} freeing all allocated resources and terminates
 			 * all existing execution threads.
 			 */

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/Statemachine.xtend

@@ -579,7 +579,7 @@ class Statemachine {
 	def protected runCycleFunction(ExecutionFlow flow) '''
 		public void runCycle() {
 			if(!initialized)
-				throw new IllegalStateException("The statemachine needs to be initialized first by calling the init() function.");
+				throw new IllegalStateException("The state machine needs to be initialized first by calling the init() function.");
 			
 			clearOutEvents();
 			
@@ -605,7 +605,7 @@ class Statemachine {
 	def protected enterFunction(ExecutionFlow it) '''
 		public void enter() {
 			if(!initialized)
-				throw new IllegalStateException("The statemachine needs to be initialized first by calling the init() function.");
+				throw new IllegalStateException("The state machine needs to be initialized first by calling the init() function.");
 			
 			«IF timed»
 			if (timer == null) {

plugins/org.yakindu.sct.model.sgraph/src/org/yakindu/sct/model/sgraph/validation/SGraphJavaValidator.java

@@ -68,7 +68,7 @@ public class SGraphJavaValidator extends AbstractDeclarativeValidator {
 	public static final String ISSUE_CHOICE_WITHOUT_OUTGOING_TRANSITION = "A choice must have at least one outgoing transition.";
 	public static final String ISSUE_REGION_CANT_BE_ENTERED_USING_SHALLOW_HISTORY_NO_DEFAULT_ENTRY = "The region can't be entered using the shallow history. Add a default entry node.";
 	public static final String ISSUE_REGION_CANT_BE_ENTERED_USING_SHALLOW_HISTORY_NON_CONNECTED_DEFAULT_ENTRY = "The region can't be entered using the shallow history. Add a transition from default entry to a state.";
-	public static final String ISSUE_SUBMACHINE_UNRESOLVABLE = "Referenced Substatemachine '%s'does not exist!";
+	public static final String ISSUE_SUBMACHINE_UNRESOLVABLE = "Referenced substate machine '%s'does not exist!";
 	public static final String ISSUE_SYNCHRONIZATION_TARGET_STATES_NOT_ORTHOGONAL = "The target states of a synchronization must be orthogonal!";
 	public static final String ISSUE_SYNCHRONIZATION_TARGET_STATES_NOT_WITHIN_SAME_PARENTSTATE = "The target states of a synchronization have to be contained in the same parent state within different regions!";
 	public static final String ISSUE_SYNCHRONIZATION_SOURCE_STATES_NOT_ORTHOGONAL = "The source states of a synchronization must be orthogonal!";

test-plugins/org.yakindu.sct.generator.java.test/src-gen/org/yakindu/scr/IStatemachine.java

@@ -1,34 +1,34 @@
 package org.yakindu.scr;
 
 /**
- * Basic interface for statemachines.
+ * Basic interface for state machines.
  */
 public interface IStatemachine {
 
 	/**
-	 * Initializes the statemachine. Use to init internal variables etc.
+	 * Initializes the state machine. Use to init internal variables etc.
 	 */
 	public void init();
 
 	/**
-	 * Enters the statemachine. Sets the statemachine in a defined state.
+	 * Enters the state machine. Sets the state machine in a defined state.
 	 */
 	public void enter();
 
 	/**
-	 * Exits the statemachine. Leaves the statemachine with a defined state.
+	 * Exits the state machine. Leaves the state machine with a defined state.
 	 */
 	public void exit();
 
 	/**
-	 * Checks if the statemachine is active. 
-	 * A statemachine is active if it was entered. It is inactive if it has not been entered at all or if it was exited.
+	 * Checks if the state machine is active. 
+	 * A state machine is active if it was entered. It is inactive if it has not been entered at all or if it was exited.
 	 */
 	public boolean isActive();
 
 	/**
 	 * Checks if all active states are final. 
-	 * If there are no active states then the statemachine is considered as incative and this method returns false.
+	 * If there are no active states then the state machine is considered as incative and this method returns false.
 	 */
 	public boolean isFinal();
 

test-plugins/org.yakindu.sct.generator.java.test/src-gen/org/yakindu/scr/RuntimeService.java

@@ -95,7 +95,7 @@ public class RuntimeService {
 	 * Registers an {@link IStatemachine} for scheduled fixed rate execution
 	 * 
 	 * @param statemachine
-	 *            - The statemachine to execute
+	 *            - The state machine to execute
 	 * @param cyclePeriod
 	 *            - the fixed rate cycle period for scheduling
 	 * @return {@code true} if state machine is added properly.
@@ -104,10 +104,10 @@ public class RuntimeService {
 			long cyclePeriod) {
 
 		if (timerTasks.containsKey(cyclePeriod)) {
-			// TimerTask for cycle time already existing -> add statemachine
+			// TimerTask for cycle time already existing -> add state machine
 			return timerTasks.get(cyclePeriod).addStatemachine(statemachine);
 		} else {
-			// Create new TimerTask for cycle period and add statemachine
+			// Create new TimerTask for cycle period and add state machine
 			StatemachineTimerTask timerTask = new StatemachineTimerTask();
 			timerTasks.put(cyclePeriod, timerTask);
 			boolean ret = timerTask.addStatemachine(statemachine);
@@ -125,9 +125,9 @@ public class RuntimeService {
 	 * Removes the given state machine from runtime service.
 	 * 
 	 * @param statemachine
-	 *            - the statemachine which should be removed
+	 *            - the state machine which should be removed
 	 * @param cyclePeriod
-	 *            - the scheduling cycle period of the statemachine
+	 *            - the scheduling cycle period of the state machine
 	 * @return {@code true} if state machine is removed properly.
 	 */
 	public boolean unregisterStatemachine(IStatemachine statemachine,
@@ -142,8 +142,8 @@ public class RuntimeService {
 	}
 
 	/**
-	 * Cancels the execution of statemachines for the given cycle period. This
-	 * stops the execution of statemachines which are registered for the given
+	 * Cancels the execution of state machines for the given cycle period. This
+	 * stops the execution of state machines which are registered for the given
 	 * cycle period and cancels the executing {@link TimerTask}.
 	 * 
 	 * @return {@code true} if poperly cancelled
@@ -160,7 +160,7 @@ public class RuntimeService {
 	}
 
 	/**
-	 * Pauses the execution of all statemachines which are registered for the
+	 * Pauses the execution of all state machines which are registered for the
 	 * given cyclePeriod.
 	 * 
 	 * @param cyclePeriod
@@ -176,7 +176,7 @@ public class RuntimeService {
 	}
 
 	/**
-	 * Resumes the execution of all statemachines which are registered for the
+	 * Resumes the execution of all state machines which are registered for the
 	 * given cyclePeriod.
 	 * 
 	 * @param cyclePeriod
@@ -192,7 +192,7 @@ public class RuntimeService {
 	}
 
 	/**
-	 * Cancels the execution of all registered statemachines. This cancels the
+	 * Cancels the execution of all registered state machines. This cancels the
 	 * executing {@link Timer} freeing all allocated resources and terminates
 	 * all existing execution threads.
 	 */

test-plugins/org.yakindu.sct.generator.java.test/src-gen/org/yakindu/scr/statechartlocalreactions/StatechartLocalReactionsStatemachine.java

@@ -48,7 +48,7 @@ public class StatechartLocalReactionsStatemachine implements IStatechartLocalRea
 	public void enter() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		enterSequence_main_region_default();
 
@@ -268,7 +268,7 @@ public class StatechartLocalReactionsStatemachine implements IStatechartLocalRea
 	public void runCycle() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		clearOutEvents();
 

test-plugins/org.yakindu.sct.generator.java.test/src-gen/org/yakindu/scr/syncjoin/SyncJoinStatemachine.java

@@ -79,7 +79,7 @@ public class SyncJoinStatemachine implements ISyncJoinStatemachine {
 	public void enter() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		enterSequence_main_region_default();
 	}
@@ -436,7 +436,7 @@ public class SyncJoinStatemachine implements ISyncJoinStatemachine {
 	public void runCycle() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		clearOutEvents();
 

test-plugins/org.yakindu.sct.generator.java.test/src-gen/org/yakindu/scr/timedtransitions/TimedTransitionsStatemachine.java

@@ -38,7 +38,7 @@ public class TimedTransitionsStatemachine implements ITimedTransitionsStatemachi
 	public void enter() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		if (timer == null) {
 			throw new IllegalStateException("timer not set.");
@@ -210,7 +210,7 @@ public class TimedTransitionsStatemachine implements ITimedTransitionsStatemachi
 	public void runCycle() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		clearOutEvents();
 

test-plugins/org.yakindu.sct.generator.java.test/src-gen/org/yakindu/scr/transitionwithoutcondition/TransitionWithoutConditionStatemachine.java

@@ -30,7 +30,7 @@ public class TransitionWithoutConditionStatemachine implements ITransitionWithou
 	public void enter() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		enterSequence_main_region_default();
 	}
@@ -155,7 +155,7 @@ public class TransitionWithoutConditionStatemachine implements ITransitionWithou
 	public void runCycle() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		clearOutEvents();
 

test-plugins/org.yakindu.sct.generator.java.test/src-gen/org/yakindu/scr/triggerguardexpressions/TriggerGuardExpressionsStatemachine.java

@@ -65,7 +65,7 @@ public class TriggerGuardExpressionsStatemachine implements ITriggerGuardExpress
 	public void enter() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		enterSequence_main_region_default();
 	}
@@ -223,7 +223,7 @@ public class TriggerGuardExpressionsStatemachine implements ITriggerGuardExpress
 	public void runCycle() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		clearOutEvents();
 

test-plugins/org.yakindu.sct.generator.java.test/src-gen/org/yakindu/scr/valuedevents/ValuedEventsStatemachine.java

@@ -151,7 +151,7 @@ public class ValuedEventsStatemachine implements IValuedEventsStatemachine {
 	public void enter() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		enterSequence_main_region1_default();
 
@@ -777,7 +777,7 @@ public class ValuedEventsStatemachine implements IValuedEventsStatemachine {
 	public void runCycle() {
 		if (!initialized)
 			throw new IllegalStateException(
-					"The statemachine needs to be initialized first by calling the init() function.");
+					"The state machine needs to be initialized first by calling the init() function.");
 
 		clearOutEvents();
 

test-plugins/org.yakindu.sct.generator.java.test/src/org/yakindu/sct/generator/java/JavaSCTGeneratorTest.java

@@ -24,7 +24,7 @@ import org.yakindu.sct.test.models.TestModelInjectorProvider;
 
 /**
  * These tests only check for compile errors, they don't check the behaviour of
- * the generated Statemachine!
+ * the generated state machine!
  * 
  * @author andreas muelder - Initial contribution and API
  *