From 88543d0c68bd138a231b89ce7f4c1186a92d4321 Mon Sep 17 00:00:00 2001
From: Nikita Iryupin <iryupnik@cvut.cz>
Date: Fri, 25 Dec 2020 19:03:26 +0100
Subject: [PATCH] Adding TODO and fixing after-merging code

---
 .../omo/foodchain/factory/NodeFactory.java    | 39 ++++++++++---------
 .../fel/sit/omo/foodchain/node/NodeBase.java  |  6 +--
 .../sit/omo/foodchain/product/Product.java    |  1 +
 .../scenario/ConsumeProductStep.java          |  2 +-
 .../scenario/GenerateProductStep.java         |  4 +-
 5 files changed, 27 insertions(+), 25 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 e113986..91a2c1a 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
@@ -43,24 +43,25 @@ public class NodeFactory
             System.err.println("! Fatal error in NodeFactory: " + e.getMessage());
         }
 
-        switch (Objects.requireNonNull(nodeType))
-        {
-            case Farmer:
-                n = new Farmer(startMoney);
-                break;
-            case Processor:
-                n = new Processor(startMoney);
-                break;
-            case Distributor:
-                n = new Distributor(startMoney);
-                break;
-            case Seller:
-                n = new Seller(startMoney);
-                break;
-            case Customer:
-                n = new Customer(startMoney);
-                break;
-        }
+//        switch (Objects.requireNonNull(nodeType))
+//        {
+//            //TODO Money constructor
+//            case Farmer:
+//                n = new Farmer(startMoney);
+//                break;
+//            case Processor:
+//                n = new Processor(startMoney);
+//                break;
+//            case Distributor:
+//                n = new Distributor(startMoney);
+//                break;
+//            case Seller:
+//                n = new Seller(startMoney);
+//                break;
+//            case Customer:
+//                n = new Customer(startMoney);
+//                break;
+//        }
 
         String[] subs = subsChannels.split(";");
         //todo Node subscription to channels by parser data
@@ -68,7 +69,7 @@ public class NodeFactory
         for (String s : subs)
         {
             ChannelPool temp = FoodChain.getFactoryManager().getPoolDatabaseInstance().getChannelPoolInstance();
-            n.subscribeToChannel(temp.findByName(s));
+//            n.subscribeToChannel(temp.findByType(s)); //TODO String to enum
         }
 
         return n;
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/NodeBase.java
index 68d05b1..cc8af0d 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/NodeBase.java
@@ -74,9 +74,9 @@ public class NodeBase implements ChannelObserver {
     }
 
     public Transaction readNextTransaction(ChannelBase channel) {
-
-
-        return channel.getNextTransaction();
+        //TODO
+        return null;
+//        return channel.getNextTransaction();
     }
 
 
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 bf50960..6dafc88 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,6 +27,7 @@ public class Product
         this.money = Monetary.getDefaultAmountFactory().setCurrency("USD").setNumber(0).create();
     }
 
+    //TODO money int constructor
     public Product(String name, ProductType productType, MonetaryAmount money)
     {
         this.name = name;
diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/ConsumeProductStep.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/ConsumeProductStep.java
index ab8161f..3d28897 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/ConsumeProductStep.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/scenario/ConsumeProductStep.java
@@ -4,7 +4,7 @@ import cz.cvut.fel.sit.omo.foodchain.node.Customer;
 
 public class ConsumeProductStep extends ScenarioStep {
 
-    private Customer node;
+    private final Customer node;
 
     public ConsumeProductStep(Customer node) {
         this.node = node;
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 8db7187..f5e595b 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
@@ -7,8 +7,8 @@ import cz.cvut.fel.sit.omo.foodchain.product.Product;
 
 public class GenerateProductStep extends ScenarioStep {
 
-    private Farmer node;
-    private Product product;
+    private final Farmer node;
+    private final Product product;
 
     public GenerateProductStep(Farmer node) {
         this.node = node;