From 43eb9a24644cc87178749ec4c871a14409b7250d Mon Sep 17 00:00:00 2001 From: Daniel Poustka Date: Fri, 25 Dec 2020 15:53:17 +0100 Subject: [PATCH] Added nothing in fact... --- .../omo/foodchain/factory/ChannelFactory.java | 26 ++++++++- .../omo/foodchain/factory/FactoryManager.java | 54 +++++++++++++------ .../omo/foodchain/factory/NodeFactory.java | 4 +- .../omo/foodchain/factory/ProductFactory.java | 10 +++- .../foodchain/factory/ScenarioFactory.java | 3 +- 5 files changed, 76 insertions(+), 21 deletions(-) diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/ChannelFactory.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/ChannelFactory.java index bdf9c73..4e4d700 100644 --- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/ChannelFactory.java +++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/ChannelFactory.java @@ -1,4 +1,28 @@ package cz.cvut.fel.sit.omo.foodchain.factory; -public class ChannelFactory { + +import cz.cvut.fel.sit.omo.foodchain.channel.*; + +public class ChannelFactory +{ + public enum ChannelType + { + Fruit, Vegetable, Meat, Other; + } + + public ChannelBase makeChannel(ChannelType typeOfChannel) + { + switch (typeOfChannel) + { + case Fruit: + return new FruitChannel(); + case Vegetable: + return new VegetableChannel(); + case Meat: + return new MeatChannel(); + case Other: + return new OtherChannel(); + } + return null; + } } diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/FactoryManager.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/FactoryManager.java index 755418c..ef15aab 100644 --- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/FactoryManager.java +++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/FactoryManager.java @@ -5,48 +5,68 @@ import cz.cvut.fel.sit.omo.foodchain.util.Singleton; import java.lang.reflect.InvocationTargetException; -public class FactoryManager { - //todo - public NodeFactory getNodeFactoryInstance() { - try { +public class FactoryManager +{ + public NodeFactory getNodeFactoryInstance() + { + try + { return Singleton.getInstance(NodeFactory.class); - } catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) { + } + catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) + { e.printStackTrace(); } return null; } - public ChannelFactory getChannelFactoryInstance() { - try { + public ChannelFactory getChannelFactoryInstance() + { + try + { return Singleton.getInstance(ChannelFactory.class); - } catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) { + } + catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) + { e.printStackTrace(); } return null; } - public ScenarioFactory getScenarioFactoryInstance() { - try { + public ScenarioFactory getScenarioFactoryInstance() + { + try + { return Singleton.getInstance(ScenarioFactory.class); - } catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) { + } + catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) + { e.printStackTrace(); } return null; } - public ProductFactory getProductFactoryInstance() { - try { + public ProductFactory getProductFactoryInstance() + { + try + { return Singleton.getInstance(ProductFactory.class); - } catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) { + } + catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) + { e.printStackTrace(); } return null; } - public PoolDatabase getPoolDatabaseInstance() { - try { + public PoolDatabase getPoolDatabaseInstance() + { + try + { return Singleton.getInstance(PoolDatabase.class); - } catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) { + } + catch (IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) + { e.printStackTrace(); } return null; 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 0e9286b..b02fade 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 @@ -1,4 +1,6 @@ package cz.cvut.fel.sit.omo.foodchain.factory; -public class NodeFactory { +public class NodeFactory +{ + //make } diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/ProductFactory.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/ProductFactory.java index c2c7a8e..eaa3822 100644 --- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/ProductFactory.java +++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/ProductFactory.java @@ -1,4 +1,12 @@ package cz.cvut.fel.sit.omo.foodchain.factory; -public class ProductFactory { +import cz.cvut.fel.sit.omo.foodchain.product.Product; +import cz.cvut.fel.sit.omo.foodchain.product.ProductType; + +public class ProductFactory +{ + public Product makeProduct(String name, ProductType productType) + { + return new Product(name, productType); + } } 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 1a04f18..c92ad3f 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 @@ -1,4 +1,5 @@ package cz.cvut.fel.sit.omo.foodchain.factory; -public class ScenarioFactory { +public class ScenarioFactory +{ }