nikita/food-chain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added simple error if node cannot do a action due to ProductTypeOperation restrictions

Browse Source
This commit is contained in:
Daniel Poustka 2020-12-27 12:22:59 +01:00
parent e25879bcb6
commit 59246406a6
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/NodeBase.java
View File

@ -164,7 +164,7 @@ public class NodeBase implements ChannelObserver {
* @param action type of product operation to do * @param action type of product operation to do
* @param product product to proceed * @param product product to proceed
*/ */
public void doAction(ProductOperationType action, Product product) public void doAction(ProductOperationType action, Product product) throws IllegalCallerException
{ {
if(action.getNode().equals(this.nodeType)) if(action.getNode().equals(this.nodeType))
new Action(this, product, action); new Action(this, product, action);

8
src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/DoActionStep.java
View File

@ -22,11 +22,17 @@ public class DoActionStep extends ScenarioStep {
@Override @Override
void execute() { void execute() {
if (product != null){ //todo maybe do a better error handling
try {
if (product != null) {
nodeBase.doAction(productOperationType, product); nodeBase.doAction(productOperationType, product);
} }
else { else {
nodeBase.doAction(productOperationType); nodeBase.doAction(productOperationType);
} }
} }
catch (IllegalCallerException e) {
System.err.println(e.getMessage());
}
}
} }