From 4f637dfc7ae08a46ad655dd806681a89f3634de9 Mon Sep 17 00:00:00 2001
From: ksilar <44767399+ksilerman@users.noreply.github.com>
Date: Wed, 12 Dec 2018 12:03:37 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=B4=D0=BE=D0=BC=D0=B0=D1=88=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 java_7.java | 63 +++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 51 insertions(+), 12 deletions(-)

diff --git a/java_7.java b/java_7.java
index de940c3..01da55b 100644
--- a/java_7.java
+++ b/java_7.java
@@ -1,19 +1,50 @@
+/**
+ * Java. level 1. Lesson 7. Example of homework,
+ * autor Rudenko Alexander
+ * version date 12/12/2018
+ *
+ */
+import java.util.Scanner;
+
 public class java_7 {
     public static void main(String[] args) {
+        int amount_food;
+        int variant;
         Cat[] arrCat = {
-                         new Cat("Barsik", 3, false),
-                         new Cat("Murzik", 8, false),
-                         new Cat("Tabasik", 12, false)
+                         new Cat("Barsik", 3),
+                         new Cat("Murzik", 8),
+                         new Cat("Tabasik", 12)
         };
-        Plate plate = new Plate(500);
+        System.out.println("Введите кол-во еды в тарелке");
+        Scanner scan = new Scanner(System.in);
+        amount_food = scan.nextInt();
+        Plate plate = new Plate(amount_food);
         System.out.println("Кол-во еды: " + plate);
-       // if (plate > 23) {
+
             for (Cat arrcat : arrCat) {
+                if (plate.getFood() >= arrcat.getAppetite()) {
                 arrcat.eat(plate);
                 System.out.println(arrcat);
-            }
-        //}
-        System.out.println("после кормежки осталось: " + plate);
+            } else {
+                System.out.println(arrcat);
+                System.out.println("Не хватает еды в тарелке");
+                    System.out.println("Добавить еды? 1 - да, 2 - нет");
+                    variant = scan.nextInt();
+                    switch (variant) {
+                        case 1:
+                             System.out.println("Сколько добавить еды?");
+                            amount_food = scan.nextInt();
+                             plate.increaseFood(amount_food);
+                             arrcat.eat(plate);
+                             System.out.println(arrcat);
+                            break;
+                        case 2:
+                            System.out.println(arrcat);
+                            break;
+                    }
+                }
+        }
+        System.out.println("после кормежки осталось еды: " + plate);
     }
 }
 
@@ -22,18 +53,23 @@ class Cat {
         private int appetite;
         private boolean satiety;
 
-        Cat(String name, int appetite, boolean satiety) {
+        Cat(String name, int appetite) {
             this.name = name;
             this.appetite = appetite;
             this.satiety = satiety;
         }
 
-       void eat(Plate plate) {
+        public int getAppetite() {
+            return appetite;
+        }
+
+        void eat(Plate plate) {
             plate.dicreaseFood(appetite);
+            satiety = true;
         }
         @Override
         public String toString() {
-            return name + " " + "съел - " + appetite + " " + "Голодный? - " + satiety;
+            return name + " " + "сьел - " + appetite + " " + "Поел? - " + satiety;
         }
     }
 
@@ -51,9 +87,12 @@ void increaseFood(int food) {
             this.food += food;
         }
 
+        public int getFood() {
+            return food;
+        }
+
         @Override
         public String toString() {
             return "" + food;
         }
     }
-

From 7d5c520906575741652bcbd9d13c44128e98c56e Mon Sep 17 00:00:00 2001
From: ksilar <44767399+ksilerman@users.noreply.github.com>
Date: Wed, 12 Dec 2018 12:24:10 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=BD=D0=B5=20=D0=B1=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=88=D0=BE=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

убрана строка this.satiety = satiety; из конструктора класса Cat
---
 java_7.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java_7.java b/java_7.java
index 01da55b..cd28e7f 100644
--- a/java_7.java
+++ b/java_7.java
@@ -56,7 +56,6 @@ class Cat {
         Cat(String name, int appetite) {
             this.name = name;
             this.appetite = appetite;
-            this.satiety = satiety;
         }
 
         public int getAppetite() {