Commit hw3

src/main/java/Zoo.java

@@ -1,14 +1,9 @@
-import animals.Animal;
+import animals.*;
-import animals.Swim;
-import animals.Bear;
-import animals.Fish;
-import animals.Kotik;
-import animals.Deer;
-import animals.Duck;
-import animals.Sheep;
 import employee.Worker;
 import food.Grass;
 import food.Meat;
+import model.Aviary;
+import model.Size;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,6 +12,9 @@ public class Zoo {
 
     private static final List<Animal> allAnimals = new ArrayList<>();
 
+    private static final Aviary<Carnivorous> carnivorousAviary = new Aviary<>(Size.LARGE);
+    private static final Aviary<Herbivore> herbivoreAviary = new Aviary<>(Size.MEDIUM);
+
     public static void main(String[] args) {
 
         System.out.println("Зоопарк: ");
@@ -41,17 +39,9 @@ public class Zoo {
         Grass grass = new Grass();
         Meat meat = new Meat();
 
-        kotik1.run();
-        bear1.run();
-        duck1.fly();
-        fish1.swim();
-
-        worker1.feed(bear1, grass);
         worker1.feed(kotik1, meat);
-        worker1.feed(fish1, meat);
-        worker2.feed(deer1, grass);
         worker2.feed(duck1, grass);
-        worker2.feed(sheep1, meat);
+        //worker2.feed(sheep1, meat);
 
         Duck duck2 = new Duck();
         Worker worker3 = new Worker();
@@ -80,6 +70,24 @@ public class Zoo {
         else {
             System.out.println("В пруду никого нет.");
         }
+
+        fillCarnivorousAviary();
+        fillHerbivoreAviary();
+
+        if(getCarnivorous("Белла") != null){
+            System.out.println(getCarnivorous("Белла"));
+        }
+        else {
+            System.out.println("Животное с именем 'Белла' не найдено");
+        }
+
+        if(getHerbivore("Бека") != null){
+            System.out.println(getHerbivore("Бека"));
+        }
+        else {
+            System.out.println("Животное с именем 'Белла' не найдено");
+        }
+
     }
 
     public static Swim[] createPond(){
@@ -93,4 +101,23 @@ public class Zoo {
 
         return pondList.toArray(new Swim[0]);
     }
+
+    public static void  fillCarnivorousAviary(){
+        carnivorousAviary.addAnimal(new Bear ("Маша"));
+        carnivorousAviary.addAnimal(new Bear("Белла"));
+    }
+
+    public static void  fillHerbivoreAviary(){
+        herbivoreAviary.addAnimal(new Deer ("Аня"));
+        herbivoreAviary.addAnimal(new Deer("Олли"));
+        herbivoreAviary.addAnimal(new Sheep("Бека"));
+    }
+
+    public static Animal getCarnivorous(String name){
+        return carnivorousAviary.getAnimal(name);
+    }
+
+    public static Animal getHerbivore(String name){
+        return herbivoreAviary.getAnimal(name);
+    }
 }

src/main/java/animals/Animal.java

@@ -1,5 +1,7 @@
 package animals;
 
+import food.WrongFoodException;
+import model.Size;
 import food.Food;
 
 public abstract class Animal {
@@ -22,7 +24,7 @@ public abstract class Animal {
         this.satiety = satiety;
     }
 
-    public abstract void eat(Food food);
+    public abstract void eat(Food food) throws WrongFoodException;
 
     public Animal() {
     }
@@ -31,4 +33,6 @@ public abstract class Animal {
         this.name = name;
         this.satiety = 2;
     }
+
+    public abstract Size getSize();
 }

src/main/java/animals/Bear.java

@@ -1,7 +1,14 @@
 package animals;
 
+import model.Size;
+
 public class Bear extends Carnivorous implements Run, Voice {
 
+    @Override
+    public Size getSize() {
+        return Size.LARGE;
+    }
+
     public Bear(String name) {
         super(name);
         this.setSatiety(2);

src/main/java/animals/Carnivorous.java

@@ -1,6 +1,7 @@
 package animals;
 import food.Food;
 import food.Meat;
+import food.WrongFoodException;
 
 public abstract class Carnivorous extends Animal{
 
@@ -11,7 +12,7 @@ public abstract class Carnivorous extends Animal{
     }
 
     @Override
-    public void eat(Food food) {
+    public void eat(Food food) throws WrongFoodException {
         int satiety = this.getSatiety();
         if (food instanceof Meat) {
             satiety += food.getEnergy();
@@ -19,7 +20,7 @@ public abstract class Carnivorous extends Animal{
             System.out.println("Животное ест.");
         }
         else {
-            System.out.println("Не получилось. Это животное ест только мясо.");
+            throw new WrongFoodException("Это животное хищник, ест только мясо.");
         }
     }
 }

src/main/java/animals/Deer.java

@@ -1,7 +1,14 @@
 package animals;
 
+import model.Size;
+
 public class Deer extends Herbivore implements Run {
 
+    @Override
+    public Size getSize() {
+        return Size.MEDIUM;
+    }
+
     public Deer(String name) {
         super(name);
         this.setSatiety(2);

src/main/java/animals/Duck.java

@@ -1,7 +1,14 @@
 package animals;
 
+import model.Size;
+
 public class Duck extends Herbivore implements Run, Swim, Fly, Voice {
 
+    @Override
+    public Size getSize() {
+        return Size.SMALL;
+    }
+
     public Duck(String name) {
         super(name);
         this.setSatiety(2);

src/main/java/animals/Fish.java

@@ -1,7 +1,14 @@
 package animals;
 
+import model.Size;
+
 public class Fish extends Carnivorous implements Swim {
 
+    @Override
+    public Size getSize() {
+        return Size.MEDIUM;
+    }
+
     public Fish(String name) {
         super(name);
         this.setSatiety(2);

src/main/java/animals/Herbivore.java

@@ -1,6 +1,7 @@
 package animals;
 import food.Food;
 import food.Grass;
+import food.WrongFoodException;
 
 public abstract class Herbivore extends Animal{
 
@@ -11,7 +12,7 @@ public abstract class Herbivore extends Animal{
     }
 
     @Override
-    public void eat(Food food) {
+    public void eat(Food food) throws WrongFoodException {
         int satiety = this.getSatiety();
         if (food instanceof Grass) {
             satiety += food.getEnergy();
@@ -19,7 +20,7 @@ public abstract class Herbivore extends Animal{
             System.out.println("Животное ест.");
         }
         else {
-            System.out.println("Не получилось. Это животное ест только траву.");
+            throw new WrongFoodException("Это животное тровоядное, ест только траву.");
         }
     }
 }

src/main/java/animals/Kotik.java

@@ -1,7 +1,14 @@
 package animals;
 
+import model.Size;
+
 public class Kotik extends Carnivorous implements Run, Voice {
 
+    @Override
+    public Size getSize() {
+        return Size.SMALL;
+    }
+
     public Kotik(String name) {
         super(name);
         this.setSatiety(2);

src/main/java/animals/Sheep.java

@@ -1,7 +1,14 @@
 package animals;
 
+import model.Size;
+
 public class Sheep extends Herbivore implements Run, Voice {
 
+    @Override
+    public Size getSize() {
+        return Size.MEDIUM;
+    }
+
     public Sheep(String name) {
         super(name);
         this.setSatiety(2);

src/main/java/employee/Worker.java

@@ -5,6 +5,7 @@ import animals.Voice;
 import food.Food;
 import food.Grass;
 import food.Meat;
+import food.WrongFoodException;
 
 public class Worker {
     private String Name;
@@ -23,12 +24,17 @@ public class Worker {
         if (food instanceof Grass) type = " травой. ";
         if (food instanceof Meat) type = " мясом. ";
 
-        if (this.Name != null && animal.getName() != null) {
+        try {
-            System.out.println(this.getName() + " кормит животное " + animal.getName() + type);
+            if (this.Name != null && animal.getName() != null) {
-            animal.eat(food);
+                System.out.println(this.getName() + " кормит животное " + animal.getName() + type);
+                animal.eat(food);
+            }
+            else{
+                animal.eat(food);
+            }
         }
-        else{
+        catch (WrongFoodException e){
-            animal.eat(food);
+            e.printStackTrace();
         }
     }
 

src/main/java/food/WrongFoodException.java

@@ -0,0 +1,7 @@
+package food;
+
+public class WrongFoodException extends Exception {
+    public WrongFoodException(String message) {
+        super(message);
+    }
+}

src/main/java/model/Aviary.java

@@ -0,0 +1,48 @@
+package model;
+
+import animals.Animal;
+import java.util.HashMap;
+
+public class Aviary<A extends Animal>{
+
+    private Size size;
+
+    public Aviary(Size size){
+        this.size = size;
+    }
+
+    public Size getSize() {
+        return size;
+    }
+
+    public void setSize(Size size) {
+        this.size = size;
+    }
+
+    private HashMap<String, A> map = new HashMap<>();
+
+    public void addAnimal(A animal){
+        if (animal.getSize() != this.size){
+            throw new WrongSizeException("Размер животного - " + animal.getSize() + ", не подходит размеру вальера - " + this.size);
+        }
+        else {
+            map.put(animal.getName(), animal);
+        }
+    }
+
+    public A getAnimal(String name){
+        return map.get(name);
+    }
+
+    public boolean removeAnimal(String name){
+        return map.remove(name, getAnimal(name));
+    }
+
+    public HashMap<String, A> getMap() {
+        return map;
+    }
+
+    public void setMap(HashMap<String, A> map) {
+        this.map = map;
+    }
+}

src/main/java/model/Size.java

@@ -0,0 +1,5 @@
+package model;
+
+public enum Size {
+    SMALL, MEDIUM, LARGE
+}

src/main/java/model/WrongSizeException.java

@@ -0,0 +1,7 @@
+package model;
+
+public class WrongSizeException extends RuntimeException {
+    public WrongSizeException(String message) {
+        super(message);
+    }
+}