Changeset 10688 for trunk/FACT++/src/StateMachineImp.cc

Timestamp:

05/12/11 21:52:22 (14 years ago)

Author:

tbretz

Message:

Renamed AddConfiguration and AddTransition to AddEvent

File:

• trunk/FACT++/src/StateMachineImp.cc (modified) (11 diffs)

trunk/FACT++/src/StateMachineImp.cc

@@ -109 +109 @@
 //! Subsequent, i.e. derived classes should setup all allowed state
 //! transitions as well as all allowed configuration event by
-//! AddTransition, AddConfiguration and AddStateName.
+//! AddEvent and AddStateName.
 //!
 //! @param out
@@ -492 +492 @@
 //!    greater or equal zero. A negative target state is used to flag
 //!    commands which do not initiate a state transition. If this is
-//!    desired use AddConfiguration instead.
+//!    desired use AddEvent instead.
 //!
 //! @param name
@@ -523 +523 @@
 //!    greater or equal zero. A negative target state is used to flag
 //!    commands which do not initiate a state transition. If this is
-//!    desired use AddConfiguration instead.
+//!    desired use AddEvent instead.
 //!
 //! @param name
@@ -540 +540 @@
 //!    received commands is properly extracted. No check is done.
 //
-EventImp &StateMachineImp::AddTransition(int targetstate, const char *name, const char *states, const char *fmt)
+EventImp &StateMachineImp::AddEvent(int targetstate, const char *name, const char *states, const char *fmt)
 {
     EventImp *evt = CreateEvent(targetstate, name, fmt);
@@ -564 +564 @@
 //!    greater or equal zero. A negative target state is used to flag
 //!    commands which do not initiate a state transition. If this is
-//!    desired use AddConfiguration instead.
+//!    desired use AddEvent instead.
 //!
 //! @param name
@@ -575 +575 @@
 //!    by this command.
 //
-EventImp &StateMachineImp::AddTransition(int targetstate, const char *name, int s1, int s2, int s3, int s4, int s5)
+EventImp &StateMachineImp::AddEvent(int targetstate, const char *name, int s1, int s2, int s3, int s4, int s5)
 {
     ostringstream str;
     str << s1 << ' '  << s2 << ' ' << s3 << ' ' << s4 << ' ' << s5;
-    return AddTransition(targetstate, name, str.str().c_str(), "");
+    return AddEvent(targetstate, name, str.str().c_str(), "");
 }
 
@@ -592 +592 @@
 //!    greater or equal zero. A negative target state is used to flag
 //!    commands which do not initiate a state transition. If this is
-//!    desired use AddConfiguration instead.
+//!    desired use AddEvent instead.
 //!
 //! @param name
@@ -609 +609 @@
 //!    by this command.
 //
-EventImp &StateMachineImp::AddTransition(int targetstate, const char *name, const char *fmt, int s1, int s2, int s3, int s4, int s5)
+EventImp &StateMachineImp::AddEvent(int targetstate, const char *name, const char *fmt, int s1, int s2, int s3, int s4, int s5)
 {
     ostringstream str;
     str << s1 << ' '  << s2 << ' ' << s3 << ' ' << s4 << ' ' << s5;
-    return AddTransition(targetstate, name, str.str().c_str(), fmt);
-}
-
-// --------------------------------------------------------------------------
-//
-//! This function calls AddTransition with a target-state of -1 which means
+    return AddEvent(targetstate, name, str.str().c_str(), fmt);
+}
+
+// --------------------------------------------------------------------------
+//
+//! This function calls AddEvent with a target-state of -1 which means
 //! that the command will not change the state at all. This shell be used
-//! for configuration commands. As well as in AddTransition the states in
+//! for configuration commands. As well as in AddEvent the states in
 //! which such a configuration command is accepted can be given.
 //!
@@ -638 +638 @@
 //!    received commands is properly extracted. No check is done.
 //!
-EventImp &StateMachineImp::AddConfiguration(const char *name, const char *states, const char *fmt)
-{
-    return AddTransition(-1, name, states, fmt);
-}
-
-// --------------------------------------------------------------------------
-//
-//! This function calls AddTransition with a target-state of -1 which means
+EventImp &StateMachineImp::AddEvent(const char *name, const char *states, const char *fmt)
+{
+    return AddEvent(-1, name, states, fmt);
+}
+
+// --------------------------------------------------------------------------
+//
+//! This function calls AddEvent with a target-state of -1 which means
 //! that the command will not change the state at all. This shell be used
-//! for configuration commands. As well as in AddTransition the states in
+//! for configuration commands. As well as in AddEvent the states in
 //! which such a configuration command is accepted can be given.
 //!
@@ -659 +659 @@
 //!    by this command.
 //
-EventImp &StateMachineImp::AddConfiguration(const char *name, int s1, int s2, int s3, int s4, int s5)
-{
-    return AddTransition(-1, name, s1, s2, s3, s4, s5);
-}
-
-// --------------------------------------------------------------------------
-//
-//! This function calls AddTransition with a target-state of -1 which means
+EventImp &StateMachineImp::AddEvent(const char *name, int s1, int s2, int s3, int s4, int s5)
+{
+    return AddEvent(-1, name, s1, s2, s3, s4, s5);
+}
+
+// --------------------------------------------------------------------------
+//
+//! This function calls AddEvent with a target-state of -1 which means
 //! that the command will not change the state at all. This shell be used
-//! for configuration commands. As well as in AddTransition the states in
+//! for configuration commands. As well as in AddEvent the states in
 //! which such a configuration command is accepted can be given.
 //!
@@ -686 +686 @@
 //!    by this command.
 //
-EventImp &StateMachineImp::AddConfiguration(const char *name, const char *fmt, int s1, int s2, int s3, int s4, int s5)
-{
-    return AddTransition(-1, name, fmt, s1, s2, s3, s4, s5);
+EventImp &StateMachineImp::AddEvent(const char *name, const char *fmt, int s1, int s2, int s3, int s4, int s5)
+{
+    return AddEvent(-1, name, fmt, s1, s2, s3, s4, s5);
 }