Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Major] Removed State STARTING

This commit is contained in:
Robert von Burg 2017-06-14 16:46:04 +02:00
parent 08631498dc
commit 9251250949
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
li.strolch.model/src/main/java/li/strolch/model/State.java
View File

@ -30,7 +30,6 @@ public enum State {
CREATED("Created"), //$NON-NLS-1$ CREATED("Created"), //$NON-NLS-1$
PLANNING("Planning"), //$NON-NLS-1$ PLANNING("Planning"), //$NON-NLS-1$
PLANNED("Planned"), //$NON-NLS-1$ PLANNED("Planned"), //$NON-NLS-1$
STARTING("Starting"), //$NON-NLS-1$
EXECUTION("Execution"), //$NON-NLS-1$ EXECUTION("Execution"), //$NON-NLS-1$
WARNING("Warning"), //$NON-NLS-1$ WARNING("Warning"), //$NON-NLS-1$
ERROR("Error"), //$NON-NLS-1$ ERROR("Error"), //$NON-NLS-1$
@ -165,7 +164,7 @@ public enum State {
* @return true if {@link #STARTING} or {@link #EXECUTION} or {@link #WARNING} * @return true if {@link #STARTING} or {@link #EXECUTION} or {@link #WARNING}
*/ */
public boolean canSetToError() { public boolean canSetToError() {
return this == State.STARTING || this == State.EXECUTION || this == State.WARNING; return this == State.EXECUTION || this == State.WARNING;
} }
/** /**
@ -206,7 +205,7 @@ public enum State {
return State.WARNING; return State.WARNING;
// execution // execution
if (states.contains(State.EXECUTION) || states.contains(State.STARTING)) if (states.contains(State.EXECUTION))
return State.EXECUTION; return State.EXECUTION;
if (states.contains(State.EXECUTED) && (states.contains(State.CREATED) || states.contains(State.PLANNING) if (states.contains(State.EXECUTED) && (states.contains(State.CREATED) || states.contains(State.PLANNING)
|| states.contains(State.PLANNED))) || states.contains(State.PLANNED)))