Renamed classes, added more interface methods

src/main/java/cz/cvut/fel/sit/omo/foodchain/FoodChain.java

@@ -1,4 +1,7 @@
 package cz.cvut.fel.sit.omo.foodchain;
 
 public class FoodChain {
+    public static void main(String[] args) {
+
+    }
 }

src/main/java/cz/cvut/fel/sit/omo/foodchain/channel/Channel.java

@@ -1,4 +0,0 @@
-package cz.cvut.fel.sit.omo.foodchain.channel;
-
-public interface Channel {
-}

src/main/java/cz/cvut/fel/sit/omo/foodchain/channel/ChannelBase.java

@@ -1,4 +1,11 @@
 package cz.cvut.fel.sit.omo.foodchain.channel;
 
-public abstract class ChannelBase implements Channel {
+import cz.cvut.fel.sit.omo.foodchain.operation.Transaction;
+import cz.cvut.fel.sit.omo.foodchain.requirement.Requirement;
+
+import java.util.Queue;
+
+public abstract class ChannelBase implements IChannel {
+    Queue<Requirement> requirements;
+    Queue<Transaction> transactions;
 }

src/main/java/cz/cvut/fel/sit/omo/foodchain/channel/FruitChannel.java

@@ -1,4 +1,26 @@
 package cz.cvut.fel.sit.omo.foodchain.channel;
 
+import cz.cvut.fel.sit.omo.foodchain.operation.Transaction;
+import cz.cvut.fel.sit.omo.foodchain.requirement.Requirement;
+
 public class FruitChannel extends ChannelBase {
+    @Override
+    public Transaction getNextTransaction() {
+        return null;
+    }
+
+    @Override
+    public Requirement getNextRequirement() {
+        return null;
+    }
+
+    @Override
+    public void addRequirement(Requirement requirement) {
+
+    }
+
+    @Override
+    public void addTransaction(Transaction transaction) {
+
+    }
 }

src/main/java/cz/cvut/fel/sit/omo/foodchain/channel/IChannel.java

@@ -0,0 +1,12 @@
+package cz.cvut.fel.sit.omo.foodchain.channel;
+
+import cz.cvut.fel.sit.omo.foodchain.operation.Transaction;
+import cz.cvut.fel.sit.omo.foodchain.requirement.Requirement;
+
+public interface IChannel {
+    public Transaction getNextTransaction();
+    public Requirement getNextRequirement();
+
+    public void addRequirement(Requirement requirement);
+    public void addTransaction(Transaction transaction);
+}

src/main/java/cz/cvut/fel/sit/omo/foodchain/channel/MeetChannel.java

@@ -1,4 +1,26 @@
 package cz.cvut.fel.sit.omo.foodchain.channel;
 
+import cz.cvut.fel.sit.omo.foodchain.operation.Transaction;
+import cz.cvut.fel.sit.omo.foodchain.requirement.Requirement;
+
 public class MeetChannel extends ChannelBase {
+    @Override
+    public Transaction getNextTransaction() {
+        return null;
+    }
+
+    @Override
+    public Requirement getNextRequirement() {
+        return null;
+    }
+
+    @Override
+    public void addRequirement(Requirement requirement) {
+
+    }
+
+    @Override
+    public void addTransaction(Transaction transaction) {
+
+    }
 }

src/main/java/cz/cvut/fel/sit/omo/foodchain/channel/VegetableChannel.java

@@ -1,4 +1,26 @@
 package cz.cvut.fel.sit.omo.foodchain.channel;
 
+import cz.cvut.fel.sit.omo.foodchain.operation.Transaction;
+import cz.cvut.fel.sit.omo.foodchain.requirement.Requirement;
+
 public class VegetableChannel extends ChannelBase {
+    @Override
+    public Transaction getNextTransaction() {
+        return null;
+    }
+
+    @Override
+    public Requirement getNextRequirement() {
+        return null;
+    }
+
+    @Override
+    public void addRequirement(Requirement requirement) {
+
+    }
+
+    @Override
+    public void addTransaction(Transaction transaction) {
+
+    }
 }

src/main/java/cz/cvut/fel/sit/omo/foodchain/node/BuyerNodeBase.java

@@ -2,7 +2,7 @@ package cz.cvut.fel.sit.omo.foodchain.node;
 
 import cz.cvut.fel.sit.omo.foodchain.product.Product;
 
-public class BuyerNodeBase extends NodeBase implements BuyerNodeInterface {
+public class BuyerNodeBase extends NodeBase implements IBuyerNode {
     @Override
     public void sellProduct(Product product) {
 

src/main/java/cz/cvut/fel/sit/omo/foodchain/node/IBuyerNode.java

@@ -2,7 +2,7 @@ package cz.cvut.fel.sit.omo.foodchain.node;
 
 import cz.cvut.fel.sit.omo.foodchain.product.Product;
 
-public interface BuyerNodeInterface {
+public interface IBuyerNode {
 
     void sellProduct(Product product);
 

src/main/java/cz/cvut/fel/sit/omo/foodchain/node/INode.java

@@ -1,6 +1,6 @@
 package cz.cvut.fel.sit.omo.foodchain.node;
 
-import cz.cvut.fel.sit.omo.foodchain.channel.Channel;
+import cz.cvut.fel.sit.omo.foodchain.channel.IChannel;
 import cz.cvut.fel.sit.omo.foodchain.operation.Action;
 import cz.cvut.fel.sit.omo.foodchain.operation.Transaction;
 import cz.cvut.fel.sit.omo.foodchain.product.Product;
@@ -10,22 +10,22 @@ import cz.cvut.fel.sit.omo.foodchain.signature.Signature;
 
 import java.awt.*;
 
-public interface NodeInterface {
+public interface INode {
-    void sendTransaction(Product product, NodeInterface node);
+    void sendTransaction(Product product, INode INode);
 
     void receiveTransaction(Transaction transaction);
 
     void refuseTransaction(Transaction transaction);
 
-    Transaction readNextTransaction(Channel channel);
+    Transaction readNextTransaction(IChannel channel);
 
-    Requirement readNextRequirement(Channel channel);
+    Requirement readNextRequirement(IChannel channel);
 
     void acceptRequirement(Requirement requirement);
 
-    void subscribeToChannel(Channel channel);
+    void subscribeToChannel(IChannel channel);
 
-    void unsubscribeFromChannel(Channel channel);
+    void unsubscribeFromChannel(IChannel channel);
 
     void doAction(Action action, Product product);
 

src/main/java/cz/cvut/fel/sit/omo/foodchain/node/ISellerNode.java

@@ -2,7 +2,7 @@ package cz.cvut.fel.sit.omo.foodchain.node;
 
 import cz.cvut.fel.sit.omo.foodchain.product.Product;
 
-public interface SellerNodeInterface {
+public interface ISellerNode {
 
     void buyProduct(Product product);
 }

src/main/java/cz/cvut/fel/sit/omo/foodchain/node/NodeBase.java

@@ -1,6 +1,6 @@
 package cz.cvut.fel.sit.omo.foodchain.node;
 
-import cz.cvut.fel.sit.omo.foodchain.channel.Channel;
+import cz.cvut.fel.sit.omo.foodchain.channel.IChannel;
 import cz.cvut.fel.sit.omo.foodchain.operation.Action;
 import cz.cvut.fel.sit.omo.foodchain.operation.Transaction;
 import cz.cvut.fel.sit.omo.foodchain.product.Product;
@@ -10,9 +10,9 @@ import cz.cvut.fel.sit.omo.foodchain.signature.Signature;
 
 import java.awt.*;
 
-public class NodeBase implements NodeInterface {
+public class NodeBase implements INode {
     @Override
-    public void sendTransaction(Product product, NodeInterface node) {
+    public void sendTransaction(Product product, INode node) {
 
     }
 
@@ -27,12 +27,12 @@ public class NodeBase implements NodeInterface {
     }
 
     @Override
-    public Transaction readNextTransaction(Channel channel) {
+    public Transaction readNextTransaction(IChannel channel) {
         return null;
     }
 
     @Override
-    public Requirement readNextRequirement(Channel channel) {
+    public Requirement readNextRequirement(IChannel channel) {
         return null;
     }
 
@@ -42,12 +42,12 @@ public class NodeBase implements NodeInterface {
     }
 
     @Override
-    public void subscribeToChannel(Channel channel) {
+    public void subscribeToChannel(IChannel channel) {
 
     }
 
     @Override
-    public void unsubscribeFromChannel(Channel channel) {
+    public void unsubscribeFromChannel(IChannel channel) {
 
     }
 

src/main/java/cz/cvut/fel/sit/omo/foodchain/node/RetailerNodeBase.java

@@ -2,7 +2,7 @@ package cz.cvut.fel.sit.omo.foodchain.node;
 
 import cz.cvut.fel.sit.omo.foodchain.product.Product;
 
-public class RetailerNodeBase extends NodeBase implements BuyerNodeInterface, SellerNodeInterface {
+public class RetailerNodeBase extends NodeBase implements IBuyerNode, ISellerNode {
     @Override
     public void sellProduct(Product product) {
 

src/main/java/cz/cvut/fel/sit/omo/foodchain/node/SellerNodeBase.java

@@ -2,7 +2,7 @@ package cz.cvut.fel.sit.omo.foodchain.node;
 
 import cz.cvut.fel.sit.omo.foodchain.product.Product;
 
-public class SellerNodeBase extends NodeBase implements SellerNodeInterface {
+public class SellerNodeBase extends NodeBase implements ISellerNode {
     @Override
     public void buyProduct(Product product) {
 

src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/IOperation.java

@@ -1,4 +1,4 @@
 package cz.cvut.fel.sit.omo.foodchain.operation;
 
-public interface OperationInterface {
+public interface IOperation {
 }

src/main/java/cz/cvut/fel/sit/omo/foodchain/operation/OperationBase.java

@@ -1,4 +1,5 @@
 package cz.cvut.fel.sit.omo.foodchain.operation;
 
 public class OperationBase {
+    IOperation lastOperation;
 }

src/main/java/cz/cvut/fel/sit/omo/foodchain/pool/ChannelPool.java

@@ -1,6 +1,6 @@
 package cz.cvut.fel.sit.omo.foodchain.pool;
 
-import cz.cvut.fel.sit.omo.foodchain.channel.Channel;
+import cz.cvut.fel.sit.omo.foodchain.channel.IChannel;
 
-public class ChannelPool extends PoolListBase<Channel> {
+public class ChannelPool extends PoolListBase<IChannel> {
 }

src/main/java/cz/cvut/fel/sit/omo/foodchain/pool/IPool.java

@@ -2,7 +2,7 @@ package cz.cvut.fel.sit.omo.foodchain.pool;
 
 import java.util.Collection;
 
-public interface PoolInterface<T> {
+public interface IPool<T> {
     Collection<T> findAll();
 
     void add(T element);

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.NodeInterface;
+import cz.cvut.fel.sit.omo.foodchain.node.INode;
 
-public class NodePool extends PoolListBase<NodeInterface> {
+public class NodePool extends PoolListBase<INode> {
 }

src/main/java/cz/cvut/fel/sit/omo/foodchain/pool/PoolListBase.java

@@ -4,7 +4,7 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
-public abstract class PoolListBase<T> implements PoolInterface<T> {
+public abstract class PoolListBase<T> implements IPool<T> {
     List<T> pool;
 
     public PoolListBase() {

src/main/java/cz/cvut/fel/sit/omo/foodchain/product/ProductState.java

@@ -1,4 +1,4 @@
 package cz.cvut.fel.sit.omo.foodchain.product;
 
-public class ProductState {
+public enum ProductState {
 }

src/main/java/cz/cvut/fel/sit/omo/foodchain/reporting/ReportTextFileVisitor.java

@@ -1,4 +1,19 @@
 package cz.cvut.fel.sit.omo.foodchain.reporting;
 
+import cz.cvut.fel.sit.omo.foodchain.channel.IChannel;
+import cz.cvut.fel.sit.omo.foodchain.node.INode;
+import cz.cvut.fel.sit.omo.foodchain.operation.IOperation;
+
 public class ReportTextFileVisitor {
+    public void visit(INode node){
+
+    }
+
+    public void visit(IOperation operationBase){
+
+    }
+
+    public void visit(IChannel channel){
+
+    }
 }

src/main/java/cz/cvut/fel/sit/omo/foodchain/util/Singleton.java

@@ -10,7 +10,7 @@ public class Singleton {
     private static final Singleton instance = new Singleton();
 
     @SuppressWarnings("rawtypes")
-    private final Map<Class, Object> mapHolder = new HashMap<Class, Object>();
+    private final Map<Class, Object> mapHolder = new HashMap<>();
 
     private Singleton() {
     }