diff --git a/src/main/java/animals/Carnivore.java b/src/main/java/animals/Carnivore.java index 3c33358..854a732 100644 --- a/src/main/java/animals/Carnivore.java +++ b/src/main/java/animals/Carnivore.java @@ -15,6 +15,7 @@ public abstract class Carnivore extends Animal{ int satiety = this.getSatiety(); if (food instanceof Meat) { satiety += food.getEnergy(); + this.setSatiety(satiety); System.out.println("Животное ест."); } else { diff --git a/src/main/java/animals/Herbivore.java b/src/main/java/animals/Herbivore.java index 182caa0..186672d 100644 --- a/src/main/java/animals/Herbivore.java +++ b/src/main/java/animals/Herbivore.java @@ -15,6 +15,7 @@ public class Herbivore extends Animal{ int satiety = this.getSatiety(); if (food instanceof Grass) { satiety += food.getEnergy(); + this.setSatiety(satiety); System.out.println("Животное ест."); } else { diff --git a/src/main/java/employee/Worker.java b/src/main/java/employee/Worker.java index 4c2a0c7..a9be3af 100644 --- a/src/main/java/employee/Worker.java +++ b/src/main/java/employee/Worker.java @@ -1,7 +1,6 @@ package employee; import animals.Animal; -import animals.Swim; import animals.Voice; import food.Food; import food.Grass; @@ -19,7 +18,7 @@ public class Worker { } public void feed(Animal animal, Food food){ - String type = new String(); + String type = ""; if (food instanceof Grass) type = " травой. "; if (food instanceof Meat) type = " мясом. "; diff --git a/src/main/java/food/Food.java b/src/main/java/food/Food.java index 059913f..5ae239b 100644 --- a/src/main/java/food/Food.java +++ b/src/main/java/food/Food.java @@ -1,7 +1,5 @@ package food; -import javax.naming.Name; - public abstract class Food { public abstract int getEnergy(); }