diff --git a/pom.xml b/pom.xml
index 4da069c..e2b91a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,8 @@
- 12
- 12
+ 14
+ 14
\ No newline at end of file
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/FoodChain.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/FoodChain.java
index 47e3d15..d5e7717 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/FoodChain.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/FoodChain.java
@@ -2,7 +2,7 @@ package cz.cvut.fel.sit.omo.foodchain;
import cz.cvut.fel.sit.omo.foodchain.channel.ChannelBase;
import cz.cvut.fel.sit.omo.foodchain.factory.FactoryManager;
-import cz.cvut.fel.sit.omo.foodchain.node.NodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.base.NodeBase;
import cz.cvut.fel.sit.omo.foodchain.parser.ConfigurationParser;
import cz.cvut.fel.sit.omo.foodchain.parser.ParserResult;
import cz.cvut.fel.sit.omo.foodchain.parser.ParserResultElement;
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/NodeFactory.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/NodeFactory.java
index 281ecee..b0b32a4 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/NodeFactory.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/NodeFactory.java
@@ -3,6 +3,8 @@ package cz.cvut.fel.sit.omo.foodchain.factory;
import cz.cvut.fel.sit.omo.foodchain.FoodChain;
import cz.cvut.fel.sit.omo.foodchain.channel.ChannelSubscriptionType;
import cz.cvut.fel.sit.omo.foodchain.node.*;
+import cz.cvut.fel.sit.omo.foodchain.node.base.NodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.enums.NodeType;
import cz.cvut.fel.sit.omo.foodchain.parser.ParserResultElement;
import cz.cvut.fel.sit.omo.foodchain.pool.ChannelPool;
import cz.cvut.fel.sit.omo.foodchain.product.ProductType;
@@ -12,11 +14,6 @@ import java.util.Objects;
public class NodeFactory
{
- enum NodeType
- {
- Farmer, Processor, Distributor, Seller, Customer;
- }
-
/**
* Creates Node based on input ParserResultElement
* @param input data from Node is created
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/ScenarioFactory.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/ScenarioFactory.java
index 410cb77..b4dc5cd 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/ScenarioFactory.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/ScenarioFactory.java
@@ -3,7 +3,7 @@ package cz.cvut.fel.sit.omo.foodchain.factory;
import cz.cvut.fel.sit.omo.foodchain.FoodChain;
import cz.cvut.fel.sit.omo.foodchain.node.Customer;
import cz.cvut.fel.sit.omo.foodchain.node.Farmer;
-import cz.cvut.fel.sit.omo.foodchain.node.NodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.base.NodeBase;
import cz.cvut.fel.sit.omo.foodchain.operation.ProductOperationType;
import cz.cvut.fel.sit.omo.foodchain.operation.TransactionType;
import cz.cvut.fel.sit.omo.foodchain.parser.ParserResultElement;
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Customer.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Customer.java
index c3776f8..36cef45 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Customer.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Customer.java
@@ -1,11 +1,16 @@
package cz.cvut.fel.sit.omo.foodchain.node;
+import cz.cvut.fel.sit.omo.foodchain.node.base.BuyerNodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.enums.NodeType;
+
import java.util.Random;
public class Customer extends BuyerNodeBase {
public Customer(double startMoney) {
- super();
+ super(startMoney);
+ allowedSeller = NodeType.Distributor;
+ allowedPurchaser = NodeType.None;
}
public void consumeProduct() {
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Distributor.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Distributor.java
index 890c577..f3669d7 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Distributor.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Distributor.java
@@ -1,8 +1,13 @@
package cz.cvut.fel.sit.omo.foodchain.node;
+import cz.cvut.fel.sit.omo.foodchain.node.base.RetailerNodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.enums.NodeType;
+
public class Distributor extends RetailerNodeBase {
public Distributor(double startMoney) {
- super();
+ super(startMoney);
+ allowedSeller = NodeType.Seller;
+ allowedPurchaser = NodeType.Customer;
}
}
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Farmer.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Farmer.java
index aa36abe..9234d06 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Farmer.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Farmer.java
@@ -1,12 +1,16 @@
package cz.cvut.fel.sit.omo.foodchain.node;
+import cz.cvut.fel.sit.omo.foodchain.node.base.SellerNodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.enums.NodeType;
import cz.cvut.fel.sit.omo.foodchain.operation.TransactionType;
import cz.cvut.fel.sit.omo.foodchain.product.Product;
public class Farmer extends SellerNodeBase {
public Farmer(double startMoney) {
- super();
+ super(startMoney);
+ allowedSeller = NodeType.None;
+ allowedPurchaser = NodeType.Processor;
}
public void generateProduct(Product product) {
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Processor.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Processor.java
index a9cc92c..1cb68a9 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Processor.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Processor.java
@@ -1,8 +1,13 @@
package cz.cvut.fel.sit.omo.foodchain.node;
+import cz.cvut.fel.sit.omo.foodchain.node.base.RetailerNodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.enums.NodeType;
+
public class Processor extends RetailerNodeBase {
public Processor(double startMoney) {
- super();
+ super(startMoney);
+ allowedSeller = NodeType.Farmer;
+ allowedPurchaser = NodeType.Seller;
}
}
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Seller.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Seller.java
index ec5fc21..47b9c5b 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Seller.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Seller.java
@@ -1,8 +1,13 @@
package cz.cvut.fel.sit.omo.foodchain.node;
+import cz.cvut.fel.sit.omo.foodchain.node.base.RetailerNodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.enums.NodeType;
+
public class Seller extends RetailerNodeBase {
public Seller(double startMoney) {
- super();
+ super(startMoney);
+ allowedSeller = NodeType.Processor;
+ allowedPurchaser = NodeType.Distributor;
}
}
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/BuyerNodeBase.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/BuyerNodeBase.java
similarity index 52%
rename from src/main/java/cz/cvut/fel/sit/omo/foodchain/node/BuyerNodeBase.java
rename to src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/BuyerNodeBase.java
index 70d5d56..bc64e09 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/BuyerNodeBase.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/BuyerNodeBase.java
@@ -1,8 +1,13 @@
-package cz.cvut.fel.sit.omo.foodchain.node;
+package cz.cvut.fel.sit.omo.foodchain.node.base;
+import cz.cvut.fel.sit.omo.foodchain.node.interfaces.IBuyerNode;
import cz.cvut.fel.sit.omo.foodchain.product.Product;
public class BuyerNodeBase extends NodeBase implements IBuyerNode {
+ public BuyerNodeBase(double m){
+ super(m);
+ }
+
@Override
public void buyProduct(Product product) {
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/NodeBase.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/NodeBase.java
similarity index 86%
rename from src/main/java/cz/cvut/fel/sit/omo/foodchain/node/NodeBase.java
rename to src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/NodeBase.java
index 09f6bd2..0ec5ab7 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/NodeBase.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/NodeBase.java
@@ -1,7 +1,8 @@
-package cz.cvut.fel.sit.omo.foodchain.node;
+package cz.cvut.fel.sit.omo.foodchain.node.base;
import cz.cvut.fel.sit.omo.foodchain.channel.ChannelBase;
import cz.cvut.fel.sit.omo.foodchain.channel.ChannelSubscriptionType;
+import cz.cvut.fel.sit.omo.foodchain.node.enums.NodeType;
import cz.cvut.fel.sit.omo.foodchain.operation.*;
import cz.cvut.fel.sit.omo.foodchain.product.Product;
import cz.cvut.fel.sit.omo.foodchain.product.ProductType;
@@ -21,10 +22,12 @@ import java.util.Map;
public class NodeBase implements ChannelObserver {
private final Map subscribedChannels;
private final List products;
- private final MonetaryAmount money;
-
private final List refusedTransactions;
+ private final MonetaryAmount money;
+ protected NodeType allowedSeller;
+ protected NodeType allowedPurchaser;
+
public NodeBase() {
subscribedChannels = new HashMap<>();
products = new LinkedList<>();
@@ -140,9 +143,17 @@ public class NodeBase implements ChannelObserver {
return SignatureManager.validateSignature(transaction);
}
+ boolean senderPurchaserCheck(Requirement req) {
+ String simpleName = req.getCreator().getClass().getSimpleName();
+
+ return !req.getCreator().equals(this) &&
+ (((allowedSeller == NodeType.valueOf(simpleName) || allowedSeller == NodeType.All) && (req.getTransactionType() == TransactionType.SALE)) ||
+ ((allowedPurchaser == NodeType.valueOf(simpleName) || allowedPurchaser == NodeType.All) && req.getTransactionType() == TransactionType.PURCHASE));
+ }
+
@Override
public void update(Requirement requirement) {
- if (!requirement.getCreator().equals(this))
+ if (senderPurchaserCheck(requirement))
acceptRequirement(requirement);
}
}
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/RetailerNodeBase.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/RetailerNodeBase.java
similarity index 56%
rename from src/main/java/cz/cvut/fel/sit/omo/foodchain/node/RetailerNodeBase.java
rename to src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/RetailerNodeBase.java
index 3081dec..9a69ab8 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/RetailerNodeBase.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/RetailerNodeBase.java
@@ -1,8 +1,14 @@
-package cz.cvut.fel.sit.omo.foodchain.node;
+package cz.cvut.fel.sit.omo.foodchain.node.base;
+import cz.cvut.fel.sit.omo.foodchain.node.interfaces.IBuyerNode;
+import cz.cvut.fel.sit.omo.foodchain.node.interfaces.ISellerNode;
import cz.cvut.fel.sit.omo.foodchain.product.Product;
public class RetailerNodeBase extends NodeBase implements IBuyerNode, ISellerNode {
+ public RetailerNodeBase(double startMoney) {
+ super(startMoney);
+ }
+
@Override
public void sellProduct(Product product) {
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/SellerNodeBase.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/SellerNodeBase.java
similarity index 57%
rename from src/main/java/cz/cvut/fel/sit/omo/foodchain/node/SellerNodeBase.java
rename to src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/SellerNodeBase.java
index 9a8c8d9..d85ce1e 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/SellerNodeBase.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/base/SellerNodeBase.java
@@ -1,8 +1,13 @@
-package cz.cvut.fel.sit.omo.foodchain.node;
+package cz.cvut.fel.sit.omo.foodchain.node.base;
+import cz.cvut.fel.sit.omo.foodchain.node.interfaces.ISellerNode;
import cz.cvut.fel.sit.omo.foodchain.product.Product;
public class SellerNodeBase extends NodeBase implements ISellerNode {
+ public SellerNodeBase(double startMoney) {
+ super(startMoney);
+ }
+
@Override
public void sellProduct(Product product) {
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/enums/NodeType.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/enums/NodeType.java
new file mode 100644
index 0000000..c0cefcc
--- /dev/null
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/enums/NodeType.java
@@ -0,0 +1,5 @@
+package cz.cvut.fel.sit.omo.foodchain.node.enums;
+
+public enum NodeType {
+ Farmer, Processor, Distributor, Seller, Customer, None, All
+}
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/IBuyerNode.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/interfaces/IBuyerNode.java
similarity index 69%
rename from src/main/java/cz/cvut/fel/sit/omo/foodchain/node/IBuyerNode.java
rename to src/main/java/cz/cvut/fel/sit/omo/foodchain/node/interfaces/IBuyerNode.java
index 48a1176..8e62eb5 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/IBuyerNode.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/interfaces/IBuyerNode.java
@@ -1,4 +1,4 @@
-package cz.cvut.fel.sit.omo.foodchain.node;
+package cz.cvut.fel.sit.omo.foodchain.node.interfaces;
import cz.cvut.fel.sit.omo.foodchain.product.Product;
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/ISellerNode.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/interfaces/ISellerNode.java
similarity index 75%
rename from src/main/java/cz/cvut/fel/sit/omo/foodchain/node/ISellerNode.java
rename to src/main/java/cz/cvut/fel/sit/omo/foodchain/node/interfaces/ISellerNode.java
index a63b91e..25ed0cd 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/ISellerNode.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/interfaces/ISellerNode.java
@@ -1,4 +1,4 @@
-package cz.cvut.fel.sit.omo.foodchain.node;
+package cz.cvut.fel.sit.omo.foodchain.node.interfaces;
import cz.cvut.fel.sit.omo.foodchain.product.Product;
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/Action.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/Action.java
index 6a48dd1..8e35694 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/Action.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/Action.java
@@ -1,6 +1,6 @@
package cz.cvut.fel.sit.omo.foodchain.operation;
-import cz.cvut.fel.sit.omo.foodchain.node.NodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.base.NodeBase;
import cz.cvut.fel.sit.omo.foodchain.product.Product;
public class Action extends OperationBase {
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/FinancialTransaction.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/FinancialTransaction.java
index a2a9128..1c2b20a 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/FinancialTransaction.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/FinancialTransaction.java
@@ -1,6 +1,6 @@
package cz.cvut.fel.sit.omo.foodchain.operation;
-import cz.cvut.fel.sit.omo.foodchain.node.NodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.base.NodeBase;
import javax.money.MonetaryAmount;
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/OperationBase.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/OperationBase.java
index 12dd4b3..c2d1587 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/OperationBase.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/OperationBase.java
@@ -1,6 +1,6 @@
package cz.cvut.fel.sit.omo.foodchain.operation;
-import cz.cvut.fel.sit.omo.foodchain.node.NodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.base.NodeBase;
import java.time.LocalDateTime;
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/ProductTransaction.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/ProductTransaction.java
index ab70adc..6539950 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/ProductTransaction.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/ProductTransaction.java
@@ -1,6 +1,6 @@
package cz.cvut.fel.sit.omo.foodchain.operation;
-import cz.cvut.fel.sit.omo.foodchain.node.NodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.base.NodeBase;
import cz.cvut.fel.sit.omo.foodchain.product.Product;
public class ProductTransaction extends Transaction {
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/Transaction.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/Transaction.java
index 9b2e668..5c7dd46 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/Transaction.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/Transaction.java
@@ -1,6 +1,6 @@
package cz.cvut.fel.sit.omo.foodchain.operation;
-import cz.cvut.fel.sit.omo.foodchain.node.NodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.base.NodeBase;
import cz.cvut.fel.sit.omo.foodchain.signature.Signature;
import cz.cvut.fel.sit.omo.foodchain.signature.SignatureManager;
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/pool/NodePool.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/pool/NodePool.java
index 07423b1..99d9dcb 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/pool/NodePool.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/pool/NodePool.java
@@ -1,6 +1,6 @@
package cz.cvut.fel.sit.omo.foodchain.pool;
-import cz.cvut.fel.sit.omo.foodchain.node.NodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.base.NodeBase;
public class NodePool extends PoolListBase {
}
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/reporting/ReportTextFileVisitor.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/reporting/ReportTextFileVisitor.java
index 2ffc478..353a3d5 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/reporting/ReportTextFileVisitor.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/reporting/ReportTextFileVisitor.java
@@ -1,7 +1,7 @@
package cz.cvut.fel.sit.omo.foodchain.reporting;
import cz.cvut.fel.sit.omo.foodchain.channel.ChannelBase;
-import cz.cvut.fel.sit.omo.foodchain.node.NodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.base.NodeBase;
import cz.cvut.fel.sit.omo.foodchain.operation.OperationBase;
public class ReportTextFileVisitor {
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/requirement/Requirement.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/requirement/Requirement.java
index 48c536a..5c50c13 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/requirement/Requirement.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/requirement/Requirement.java
@@ -1,6 +1,6 @@
package cz.cvut.fel.sit.omo.foodchain.requirement;
-import cz.cvut.fel.sit.omo.foodchain.node.NodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.base.NodeBase;
import cz.cvut.fel.sit.omo.foodchain.operation.TransactionType;
import cz.cvut.fel.sit.omo.foodchain.product.ProductType;
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/DoActionStep.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/DoActionStep.java
index ad41b28..433376a 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/DoActionStep.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/DoActionStep.java
@@ -1,6 +1,6 @@
package cz.cvut.fel.sit.omo.foodchain.scenario;
-import cz.cvut.fel.sit.omo.foodchain.node.NodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.base.NodeBase;
import cz.cvut.fel.sit.omo.foodchain.operation.ProductOperationType;
import cz.cvut.fel.sit.omo.foodchain.product.Product;
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/GenerateProductStep.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/GenerateProductStep.java
index 92b0655..7e9703c 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/GenerateProductStep.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/GenerateProductStep.java
@@ -2,7 +2,6 @@ package cz.cvut.fel.sit.omo.foodchain.scenario;
import cz.cvut.fel.sit.omo.foodchain.FoodChain;
import cz.cvut.fel.sit.omo.foodchain.node.Farmer;
-import cz.cvut.fel.sit.omo.foodchain.node.NodeBase;
import cz.cvut.fel.sit.omo.foodchain.product.Product;
public class GenerateProductStep extends ScenarioStep {
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/SendRequirementStep.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/SendRequirementStep.java
index cd5eb5c..1542449 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/SendRequirementStep.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/SendRequirementStep.java
@@ -1,6 +1,6 @@
package cz.cvut.fel.sit.omo.foodchain.scenario;
-import cz.cvut.fel.sit.omo.foodchain.node.NodeBase;
+import cz.cvut.fel.sit.omo.foodchain.node.base.NodeBase;
import cz.cvut.fel.sit.omo.foodchain.operation.TransactionType;
import cz.cvut.fel.sit.omo.foodchain.product.ProductType;