Daniel Poustka 015d558afe Merge branch 'develop' into feature/factory_impl ...

# Conflicts:
#	src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/NodeFactory.java
#	src/main/java/cz/cvut/fel/sit/omo/foodchain/product/Product.java

2020-12-26 10:26:27 +01:00

..

channel

Added configuration and ChannelSubstcriptionType

2020-12-25 18:39:29 +01:00

factory

Fixed Node subscription

2020-12-26 10:22:36 +01:00

node

Changed constructors

2020-12-26 10:19:30 +01:00

operation

Added configuration and ChannelSubstcriptionType

2020-12-25 18:39:29 +01:00

parser

Added configuration and ChannelSubstcriptionType

2020-12-25 18:39:29 +01:00

pool

Added configuration and ChannelSubstcriptionType

2020-12-25 18:39:29 +01:00

product

Merge branch 'develop' into feature/factory_impl

2020-12-26 10:26:27 +01:00

reporting

Added configuration and ChannelSubstcriptionType

2020-12-25 18:39:29 +01:00

requirement

Added configuration and ChannelSubstcriptionType

2020-12-25 18:39:29 +01:00

scenario

Adding TODO and fixing after-merging code

2020-12-25 19:03:26 +01:00

signature

Added configuration and ChannelSubstcriptionType

2020-12-25 18:39:29 +01:00

util

Added configuration and ChannelSubstcriptionType

2020-12-25 18:39:29 +01:00

FoodChain.java

Added channel and nodes parsing into main

2020-12-25 20:47:39 +01:00