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

[New] Set action to Planning state before planning

This commit is contained in:
Robert von Burg 2022-01-14 11:00:32 +01:00
parent 988fdd4d73
commit d7bd8bba39
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
li.strolch.service/src/main/java/li/strolch/execution/command/PlanActionCommand.java
View File

@ -17,6 +17,7 @@ package li.strolch.execution.command;
import static li.strolch.execution.policy.NoPlanning.DEFAULT_PLANNING; import static li.strolch.execution.policy.NoPlanning.DEFAULT_PLANNING;
import li.strolch.execution.policy.ConfirmationPolicy;
import li.strolch.execution.policy.PlanningPolicy; import li.strolch.execution.policy.PlanningPolicy;
import li.strolch.model.Resource; import li.strolch.model.Resource;
import li.strolch.model.State; import li.strolch.model.State;
@ -34,7 +35,7 @@ import li.strolch.utils.dbc.DBC;
* objects of the action are already constructed and {@link Action#getResourceId()} is set. * objects of the action are already constructed and {@link Action#getResourceId()} is set.
* *
* <br> * <br>
* * <p>
* It iterates the {@link IValueChange} operators and registers the resulting changes on the {@link StrolchTimedState} * It iterates the {@link IValueChange} operators and registers the resulting changes on the {@link StrolchTimedState}
* objects assigned to the {@link Resource}. * objects assigned to the {@link Resource}.
* *
@ -67,11 +68,20 @@ public class PlanActionCommand extends PlanningCommand {
@Override @Override
public Void visitAction(Action action) { public Void visitAction(Action action) {
if (action.getState() != State.CREATED && action.getState() != State.PLANNING)
throw new IllegalStateException("Can not plan action in state " + action.getState());
ConfirmationPolicy confirmationPolicy = getConfirmationPolicy(action);
action.setState(State.PLANNING);
confirmationPolicy.toPlanning(action);
PolicyDef planningPolicyDef = action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING); PolicyDef planningPolicyDef = action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING);
PlanningPolicy planningPolicy = tx().getPolicy(PlanningPolicy.class, planningPolicyDef); PlanningPolicy planningPolicy = tx().getPolicy(PlanningPolicy.class, planningPolicyDef);
planningPolicy.plan(action); planningPolicy.plan(action);
if (action.getState() == State.PLANNED) if (action.getState() == State.PLANNED)
getConfirmationPolicy(action).toPlanned(action); confirmationPolicy.toPlanned(action);
return null; return null;
} }
} }

2
li.strolch.service/src/main/java/li/strolch/execution/policy/SimplePlanning.java
View File

@ -55,6 +55,7 @@ public class SimplePlanning extends PlanningPolicy {
for (IValueChange<?> change : changes) { for (IValueChange<?> change : changes) {
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
StrolchTimedState timedState = resource.getTimedState(change.getStateId()); StrolchTimedState timedState = resource.getTimedState(change.getStateId());
//noinspection unchecked
timedState.applyChange(change, true); timedState.applyChange(change, true);
} }
@ -83,6 +84,7 @@ public class SimplePlanning extends PlanningPolicy {
for (IValueChange<?> change : changes) { for (IValueChange<?> change : changes) {
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
StrolchTimedState timedState = resource.getTimedState(change.getStateId()); StrolchTimedState timedState = resource.getTimedState(change.getStateId());
//noinspection unchecked
timedState.applyChange(change.getInverse(), true); timedState.applyChange(change.getInverse(), true);
} }