diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2013-09-17 08:54:33 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2013-09-17 08:54:33 +0200 |
| commit | 8b32fe15554c0103585321c3d397f6e46dd451b4 (patch) | |
| tree | fbf5f86108d61cafc362bebeceda85a71b8dc0bb /src/main/java/com/c2kernel/lifecycle/instance/stateMachine | |
| parent | e99ed30f6cae36c5f3fa03007d991e67894a01bb (diff) | |
Merge and tidy after 2.4
Diffstat (limited to 'src/main/java/com/c2kernel/lifecycle/instance/stateMachine')
| -rw-r--r-- | src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java | 44 |
2 files changed, 23 insertions, 23 deletions
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java index 6d8033c..f9cf144 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java @@ -132,7 +132,7 @@ public class StateMachine implements DescriptionObject State currentState = getState(act.getState());
if (transition.originState.equals(currentState)) {
transition.getPerformingRole(act, agent);
- return transition.terminalState;
+ return transition.targetState;
}
else
throw new InvalidTransitionException();
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java index b88ddab..9815889 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java @@ -19,17 +19,17 @@ public class Transition implements Serializable { int id;
String name;
- int originStateCode;
- int terminalStateCode;
+ int originStateId;
+ int targetStateId;
State originState;
- State terminalState;
+ State targetState;
String reservation;
String enabledProp; // Boolean property that permits this transition e.g. 'Skippable'
// activation properties
boolean requiresActive = true; // Whether the activity must be active for this transition to be available
- boolean finishing; // whether the terminal state is a finishing state;
+ boolean finishing; // whether the target state is a finishing state;
// permissions
String roleOverride;
@@ -56,13 +56,13 @@ public class Transition implements Serializable { this.originState = originState;
}
- public State getTerminalState() {
- return terminalState;
+ public State getTargetState() {
+ return targetState;
}
- public void setTerminalState(State terminalState) {
- this.terminalState = terminalState;
- finishing = terminalState.finished;
+ public void setTargetState(State targetState) {
+ this.targetState = targetState;
+ finishing = targetState.finished;
}
public String getEnabledProp() {
@@ -119,25 +119,25 @@ public class Transition implements Serializable { protected boolean resolveStates(HashMap<String, State> states) {
boolean allFound = true;
- if (states.keySet().contains(originStateCode)) {
- originState = states.get(originStateCode);
+ if (states.keySet().contains(originStateId)) {
+ originState = states.get(originStateId);
originState.addPossibleTransition(this);
}
else
allFound = false;
- if (states.keySet().contains(terminalStateCode))
- terminalState = states.get(terminalStateCode);
+ if (states.keySet().contains(targetStateId))
+ targetState = states.get(targetStateId);
else
allFound = false;
return allFound;
}
- public int getOriginStateCode() {
- return originStateCode;
+ public int getOriginStateId() {
+ return originStateId;
}
- public void setOriginStateCode(int originStateCode) {
- this.originStateCode = originStateCode;
+ public void setOriginStateId(int originStateId) {
+ this.originStateId = originStateId;
}
public int getId() {
@@ -148,12 +148,12 @@ public class Transition implements Serializable { this.id = id;
}
- public int getTerminalStateCode() {
- return terminalStateCode;
+ public int getTargetStateId() {
+ return targetStateId;
}
- public void setTerminalStateCode(int terminalStateCode) {
- this.terminalStateCode = terminalStateCode;
+ public void setTargetStateId(int targetStateId) {
+ this.targetStateId = targetStateId;
}
public String getPerformingRole(Activity act, AgentPath agent) throws ObjectNotFoundException, AccessRightsException {
@@ -209,7 +209,7 @@ public class Transition implements Serializable { public String getReservation(Activity act, AgentPath agent) {
if (reservation == null || reservation.length() == 0)
- reservation = terminalState.finished?"clear":"set";
+ reservation = targetState.finished?"clear":"set";
String reservedAgent = act.getCurrentAgentName();
if (reservation.equals("set"))
|