From b77e9a690aae9727b4b602835730160deeef3d46 Mon Sep 17 00:00:00 2001 From: Daniel Poustka Date: Sat, 26 Dec 2020 10:30:22 +0100 Subject: [PATCH] Fixed startMoney for Nodes and Product --- .../cz/cvut/fel/sit/omo/foodchain/factory/NodeFactory.java | 2 -- .../java/cz/cvut/fel/sit/omo/foodchain/node/Customer.java | 2 +- .../java/cz/cvut/fel/sit/omo/foodchain/node/Distributor.java | 2 +- src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Farmer.java | 2 +- .../java/cz/cvut/fel/sit/omo/foodchain/node/Processor.java | 2 +- src/main/java/cz/cvut/fel/sit/omo/foodchain/node/Seller.java | 2 +- .../java/cz/cvut/fel/sit/omo/foodchain/product/Product.java | 4 ++-- 7 files changed, 7 insertions(+), 9 deletions(-) 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 603da9f..63237ce 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 @@ -47,7 +47,6 @@ public class NodeFactory switch (Objects.requireNonNull(nodeType)) { - //TODO Money constructor case Farmer: n = new Farmer(startMoney); break; @@ -66,7 +65,6 @@ public class NodeFactory } String[] subs = subsChannels.split(";"); - //todo Node subscription to channels by parser data for (String s : subs) { 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 f483c42..c3776f8 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 @@ -4,7 +4,7 @@ import java.util.Random; public class Customer extends BuyerNodeBase { - public Customer(int startMoney) { + public Customer(double startMoney) { super(); } 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 c7d1c2b..890c577 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 @@ -2,7 +2,7 @@ package cz.cvut.fel.sit.omo.foodchain.node; public class Distributor extends RetailerNodeBase { - public Distributor(int startMoney) { + public Distributor(double startMoney) { super(); } } 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 77d60b4..aa36abe 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 @@ -5,7 +5,7 @@ import cz.cvut.fel.sit.omo.foodchain.product.Product; public class Farmer extends SellerNodeBase { - public Farmer(int startMoney) { + public Farmer(double startMoney) { super(); } 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 7307eb9..a9cc92c 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 @@ -2,7 +2,7 @@ package cz.cvut.fel.sit.omo.foodchain.node; public class Processor extends RetailerNodeBase { - public Processor(int startMoney) { + public Processor(double startMoney) { super(); } } 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 8de5909..ec5fc21 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 @@ -2,7 +2,7 @@ package cz.cvut.fel.sit.omo.foodchain.node; public class Seller extends RetailerNodeBase { - public Seller(int startMoney) { + public Seller(double startMoney) { super(); } } diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/product/Product.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/product/Product.java index a1017aa..8c3ff4f 100644 --- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/product/Product.java +++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/product/Product.java @@ -27,7 +27,7 @@ public class Product this.money = Monetary.getDefaultAmountFactory().setCurrency("USD").setNumber(0).create(); } - public Product(String name, ProductType productType, Double money) + public Product(String name, ProductType productType, double money) { this.name = name; this.productType = productType; @@ -49,7 +49,7 @@ public class Product this.money = Monetary.getDefaultAmountFactory().setCurrency("USD").setNumber(0).create(); } - public Product(String name, ProductType productType, ProductState productState, Double money) + public Product(String name, ProductType productType, ProductState productState, double money) { this.name = name; this.productType = productType;