From 1f2e44d8b550cce60d3cb5057e6b63a60cc60dd8 Mon Sep 17 00:00:00 2001 From: perehod93-qa Date: Mon, 20 Oct 2025 20:08:30 +0300 Subject: [PATCH 1/5] done --- src/main/java/Lesson_3/Park/Main.java | 13 +++++++ src/main/java/Lesson_3/Park/Park.java | 38 +++++++++++++++++++++ src/main/java/Lesson_3/Product/Main.java | 22 ++++++++++++ src/main/java/Lesson_3/Product/Product.java | 31 +++++++++++++++++ 4 files changed, 104 insertions(+) create mode 100644 src/main/java/Lesson_3/Park/Main.java create mode 100644 src/main/java/Lesson_3/Park/Park.java create mode 100644 src/main/java/Lesson_3/Product/Main.java create mode 100644 src/main/java/Lesson_3/Product/Product.java diff --git a/src/main/java/Lesson_3/Park/Main.java b/src/main/java/Lesson_3/Park/Main.java new file mode 100644 index 0000000..c4daf29 --- /dev/null +++ b/src/main/java/Lesson_3/Park/Main.java @@ -0,0 +1,13 @@ +package Lesson_3.Park; + +public class Main { + public static void main(String[] args) { + Park park = new Park(); + + park.addAttraction("Американские горки", "10:00 - 18:00", 300); + park.addAttraction("Карусель", "09:00 - 20:00", 150); + park.addAttraction("Лабиринт", "11:00 - 17:00", 200); + park.addAttraction("Комната страха", "11:00 - 17:00", 250); + park.showAttractions(); + } +} diff --git a/src/main/java/Lesson_3/Park/Park.java b/src/main/java/Lesson_3/Park/Park.java new file mode 100644 index 0000000..5bbdf62 --- /dev/null +++ b/src/main/java/Lesson_3/Park/Park.java @@ -0,0 +1,38 @@ +package Lesson_3.Park; + +import java.util.ArrayList; +import java.util.List; + +public class Park { + + public class Attraction { + String name; + String workingHours; + double cost; + + public Attraction(String name, String workingHours, double cost) { + this.name = name; + this.workingHours = workingHours; + this.cost = cost; + } + + public void displayInfo() { + System.out.println("Аттракцион: " + name); + System.out.println("Время работы: " + workingHours); + System.out.println("Стоимость: " + cost); + System.out.println("---------------------------"); + } + } + + private List attractions = new ArrayList<>(); + + public void addAttraction(String name, String workingHours, double cost) { + attractions.add(new Attraction(name, workingHours, cost)); + } + + public void showAttractions() { + for (Attraction attraction : attractions) { + attraction.displayInfo(); + } + } +} diff --git a/src/main/java/Lesson_3/Product/Main.java b/src/main/java/Lesson_3/Product/Main.java new file mode 100644 index 0000000..70115a7 --- /dev/null +++ b/src/main/java/Lesson_3/Product/Main.java @@ -0,0 +1,22 @@ +package Lesson_3.Product; + +public class Main { + public static void main(String[] args) { + Product[] productsArray = new Product[5]; + + productsArray[0] = new Product("Samsung S25 Ultra", "01.02.2025", + "Samsung Corp.", "Korea", 5599, true); + productsArray[1] = new Product("Apple iPhone 15", "15.09.2024", + "Apple Inc.", "USA", 9999, false); + productsArray[2] = new Product("Xiaomi Mi 13", "10.03.2024", + "Xiaomi", "China", 4999, false); + productsArray[3] = new Product("Sony WH-1000XM5", "20.07.2023", + "Sony", "Japan", 2999, true); + productsArray[4] = new Product("Dell XPS 13", "05.11.2023", + "Dell", "USA", 11999, false); + + for (Product p : productsArray) { + p.displayInfo(); + } + } +} diff --git a/src/main/java/Lesson_3/Product/Product.java b/src/main/java/Lesson_3/Product/Product.java new file mode 100644 index 0000000..fb6a141 --- /dev/null +++ b/src/main/java/Lesson_3/Product/Product.java @@ -0,0 +1,31 @@ +package Lesson_3.Product; + +public class Product { + String name; + String productionDate; + String manufacturer; + String countryOfOrigin; + double price; + boolean isReserved; + + public Product(String name, String productionDate, String manufacturer, + String countryOfOrigin, double price, boolean isReserved) { + this.name = name; + this.productionDate = productionDate; + this.manufacturer = manufacturer; + this.countryOfOrigin = countryOfOrigin; + this.price = price; + this.isReserved = isReserved; + } + + public void displayInfo() { + System.out.println("Название: " + name); + System.out.println("Дата производства: " + productionDate); + System.out.println("Производитель: " + manufacturer); + System.out.println("Страна происхождения: " + countryOfOrigin); + System.out.println("Цена: " + price); + System.out.println("Забронировано: " + (isReserved ? "Да" : "Нет")); + System.out.println("---------------------------"); + } +} + From e17e68c065431afcfad1d36b4582d0943945831e Mon Sep 17 00:00:00 2001 From: perehod93-qa Date: Tue, 21 Oct 2025 17:54:50 +0300 Subject: [PATCH 2/5] Try number two --- src/main/java/Lesson_3/Park/Main.java | 13 ------- src/main/java/Lesson_3/Park/Park.java | 38 ------------------- src/main/java/lesson_3/Item.java | 15 ++++++++ src/main/java/lesson_3/park/Attraction.java | 22 +++++++++++ src/main/java/lesson_3/park/Park.java | 29 ++++++++++++++ src/main/java/lesson_3/park/ParkMain.java | 25 ++++++++++++ .../Product => lesson_3/product}/Product.java | 23 +++++------ .../product/ProductMain.java} | 6 +-- 8 files changed, 106 insertions(+), 65 deletions(-) delete mode 100644 src/main/java/Lesson_3/Park/Main.java delete mode 100644 src/main/java/Lesson_3/Park/Park.java create mode 100644 src/main/java/lesson_3/Item.java create mode 100644 src/main/java/lesson_3/park/Attraction.java create mode 100644 src/main/java/lesson_3/park/Park.java create mode 100644 src/main/java/lesson_3/park/ParkMain.java rename src/main/java/{Lesson_3/Product => lesson_3/product}/Product.java (76%) rename src/main/java/{Lesson_3/Product/Main.java => lesson_3/product/ProductMain.java} (93%) diff --git a/src/main/java/Lesson_3/Park/Main.java b/src/main/java/Lesson_3/Park/Main.java deleted file mode 100644 index c4daf29..0000000 --- a/src/main/java/Lesson_3/Park/Main.java +++ /dev/null @@ -1,13 +0,0 @@ -package Lesson_3.Park; - -public class Main { - public static void main(String[] args) { - Park park = new Park(); - - park.addAttraction("Американские горки", "10:00 - 18:00", 300); - park.addAttraction("Карусель", "09:00 - 20:00", 150); - park.addAttraction("Лабиринт", "11:00 - 17:00", 200); - park.addAttraction("Комната страха", "11:00 - 17:00", 250); - park.showAttractions(); - } -} diff --git a/src/main/java/Lesson_3/Park/Park.java b/src/main/java/Lesson_3/Park/Park.java deleted file mode 100644 index 5bbdf62..0000000 --- a/src/main/java/Lesson_3/Park/Park.java +++ /dev/null @@ -1,38 +0,0 @@ -package Lesson_3.Park; - -import java.util.ArrayList; -import java.util.List; - -public class Park { - - public class Attraction { - String name; - String workingHours; - double cost; - - public Attraction(String name, String workingHours, double cost) { - this.name = name; - this.workingHours = workingHours; - this.cost = cost; - } - - public void displayInfo() { - System.out.println("Аттракцион: " + name); - System.out.println("Время работы: " + workingHours); - System.out.println("Стоимость: " + cost); - System.out.println("---------------------------"); - } - } - - private List attractions = new ArrayList<>(); - - public void addAttraction(String name, String workingHours, double cost) { - attractions.add(new Attraction(name, workingHours, cost)); - } - - public void showAttractions() { - for (Attraction attraction : attractions) { - attraction.displayInfo(); - } - } -} diff --git a/src/main/java/lesson_3/Item.java b/src/main/java/lesson_3/Item.java new file mode 100644 index 0000000..9dae6c3 --- /dev/null +++ b/src/main/java/lesson_3/Item.java @@ -0,0 +1,15 @@ +package lesson_3; + +public abstract class Item { + protected String name; + + public Item(String name) { + this.name = name; + } + + public abstract void displayInfo(); + + public String getName() { + return name; + } +} diff --git a/src/main/java/lesson_3/park/Attraction.java b/src/main/java/lesson_3/park/Attraction.java new file mode 100644 index 0000000..a21527f --- /dev/null +++ b/src/main/java/lesson_3/park/Attraction.java @@ -0,0 +1,22 @@ +package lesson_3.park; + +import lesson_3.Item; + +public class Attraction extends Item { + private String workingHours; + private double cost; + + public Attraction(String name, String workingHours, double cost) { + super(name); + this.workingHours = workingHours; + this.cost = cost; + } + + @Override + public void displayInfo() { + System.out.println("Аттракцион: " + name); + System.out.println("Время работы: " + workingHours); + System.out.println("Стоимость: " + cost); + System.out.println("---------------------------"); + } +} \ No newline at end of file diff --git a/src/main/java/lesson_3/park/Park.java b/src/main/java/lesson_3/park/Park.java new file mode 100644 index 0000000..c50374e --- /dev/null +++ b/src/main/java/lesson_3/park/Park.java @@ -0,0 +1,29 @@ +package lesson_3.park; + +import java.util.ArrayList; +import java.util.List; + +public class Park { + private String parkName; + private List attractions; + + public Park(String parkName) { + this.parkName = parkName; + this.attractions = new ArrayList<>(); + } + + public void addAttraction(String name, String workingHours, double cost) { + attractions.add(new Attraction(name, workingHours, cost)); + } + + public void showAttractions() { + System.out.println("Парк: " + parkName); + for (Attraction attraction : attractions) { + attraction.displayInfo(); + } + } + + public String getParkName() { + return parkName; + } +} \ No newline at end of file diff --git a/src/main/java/lesson_3/park/ParkMain.java b/src/main/java/lesson_3/park/ParkMain.java new file mode 100644 index 0000000..2592066 --- /dev/null +++ b/src/main/java/lesson_3/park/ParkMain.java @@ -0,0 +1,25 @@ +package lesson_3.park; + +import lesson_3.park.Park; + +public class ParkMain { + public static void main(String[] args) { + Park amusementPark = new Park("Весёлый городок"); + + amusementPark.addAttraction("Колесо обозрения", "10:00 - 22:00", 300); + amusementPark.addAttraction("Американские горки", "11:00 - 21:00", 500); + amusementPark.addAttraction("Комната страха", "14:00 - 23:00", 400); + + Park pokatushkiPark = new Park("Покатушки"); + + pokatushkiPark.addAttraction("Машинки", "10:00 - 22:00", 200); + pokatushkiPark.addAttraction("Американские горки", "11:00 - 21:00", 500); + pokatushkiPark.addAttraction("Комната страха", "14:00 - 23:00", 400); + pokatushkiPark.addAttraction("Карусель", "10:00 - 22:00", 250); + + + amusementPark.showAttractions(); + System.out.println(); + pokatushkiPark.showAttractions(); + } +} \ No newline at end of file diff --git a/src/main/java/Lesson_3/Product/Product.java b/src/main/java/lesson_3/product/Product.java similarity index 76% rename from src/main/java/Lesson_3/Product/Product.java rename to src/main/java/lesson_3/product/Product.java index fb6a141..8801cf0 100644 --- a/src/main/java/Lesson_3/Product/Product.java +++ b/src/main/java/lesson_3/product/Product.java @@ -1,16 +1,17 @@ -package Lesson_3.Product; +package lesson_3.product; -public class Product { - String name; - String productionDate; - String manufacturer; - String countryOfOrigin; - double price; - boolean isReserved; +import lesson_3.Item; + +public class Product extends Item { + private String productionDate; + private String manufacturer; + private String countryOfOrigin; + private double price; + private boolean isReserved; public Product(String name, String productionDate, String manufacturer, String countryOfOrigin, double price, boolean isReserved) { - this.name = name; + super(name); this.productionDate = productionDate; this.manufacturer = manufacturer; this.countryOfOrigin = countryOfOrigin; @@ -18,6 +19,7 @@ public Product(String name, String productionDate, String manufacturer, this.isReserved = isReserved; } + @Override public void displayInfo() { System.out.println("Название: " + name); System.out.println("Дата производства: " + productionDate); @@ -27,5 +29,4 @@ public void displayInfo() { System.out.println("Забронировано: " + (isReserved ? "Да" : "Нет")); System.out.println("---------------------------"); } -} - +} \ No newline at end of file diff --git a/src/main/java/Lesson_3/Product/Main.java b/src/main/java/lesson_3/product/ProductMain.java similarity index 93% rename from src/main/java/Lesson_3/Product/Main.java rename to src/main/java/lesson_3/product/ProductMain.java index 70115a7..d31da67 100644 --- a/src/main/java/Lesson_3/Product/Main.java +++ b/src/main/java/lesson_3/product/ProductMain.java @@ -1,6 +1,6 @@ -package Lesson_3.Product; +package lesson_3.product; -public class Main { +public class ProductMain { public static void main(String[] args) { Product[] productsArray = new Product[5]; @@ -19,4 +19,4 @@ public static void main(String[] args) { p.displayInfo(); } } -} +} \ No newline at end of file From 9a225fda442790847df344b945f73098387e23dc Mon Sep 17 00:00:00 2001 From: perehod93-qa Date: Tue, 21 Oct 2025 19:06:17 +0300 Subject: [PATCH 3/5] lesson_4 done --- src/main/java/lesson_4/animals/Animal.java | 38 +++++++++++++++++ .../java/lesson_4/animals/AnimalsMain.java | 42 +++++++++++++++++++ src/main/java/lesson_4/animals/Bowl.java | 29 +++++++++++++ src/main/java/lesson_4/animals/Cat.java | 26 ++++++++++++ src/main/java/lesson_4/animals/Dog.java | 14 +++++++ src/main/java/lesson_4/shapes/Circle.java | 20 +++++++++ .../java/lesson_4/shapes/GeometricFigure.java | 26 ++++++++++++ src/main/java/lesson_4/shapes/Measurable.java | 11 +++++ src/main/java/lesson_4/shapes/Rectangle.java | 22 ++++++++++ src/main/java/lesson_4/shapes/ShapesMain.java | 16 +++++++ src/main/java/lesson_4/shapes/Triangle.java | 23 ++++++++++ 11 files changed, 267 insertions(+) create mode 100644 src/main/java/lesson_4/animals/Animal.java create mode 100644 src/main/java/lesson_4/animals/AnimalsMain.java create mode 100644 src/main/java/lesson_4/animals/Bowl.java create mode 100644 src/main/java/lesson_4/animals/Cat.java create mode 100644 src/main/java/lesson_4/animals/Dog.java create mode 100644 src/main/java/lesson_4/shapes/Circle.java create mode 100644 src/main/java/lesson_4/shapes/GeometricFigure.java create mode 100644 src/main/java/lesson_4/shapes/Measurable.java create mode 100644 src/main/java/lesson_4/shapes/Rectangle.java create mode 100644 src/main/java/lesson_4/shapes/ShapesMain.java create mode 100644 src/main/java/lesson_4/shapes/Triangle.java diff --git a/src/main/java/lesson_4/animals/Animal.java b/src/main/java/lesson_4/animals/Animal.java new file mode 100644 index 0000000..dc20e7f --- /dev/null +++ b/src/main/java/lesson_4/animals/Animal.java @@ -0,0 +1,38 @@ +package lesson_4.animals; + +import lombok.Getter; + +public abstract class Animal { + protected String name; + protected int runLimit; + protected int swimLimit; + + @Getter + private static int animalsCount = 0; + + public Animal(String name, int runLimit, int swimLimit) { + this.name = name; + this.runLimit = runLimit; + this.swimLimit = swimLimit; + animalsCount++; + } + + public void run(int distance) { + if (distance <= runLimit) { + System.out.println(name + " пробежал " + distance + " м."); + } else { + System.out.println(name + " не смог пробежать " + distance + " м."); + } + } + + public void swim(int distance) { + if (swimLimit == 0) { + System.out.println(name + " не умеет плавать."); + } else if (distance <= swimLimit) { + System.out.println(name + " проплыл " + distance + " м."); + } else { + System.out.println(name + " не смог проплыть " + distance + " м."); + } + } + +} \ No newline at end of file diff --git a/src/main/java/lesson_4/animals/AnimalsMain.java b/src/main/java/lesson_4/animals/AnimalsMain.java new file mode 100644 index 0000000..144245b --- /dev/null +++ b/src/main/java/lesson_4/animals/AnimalsMain.java @@ -0,0 +1,42 @@ +package lesson_4.animals; + +public class AnimalsMain { + public static void main(String[] args) { + Cat[] cats = { + new Cat("Барсик"), + new Cat("Мурка"), + new Cat("Рыжик") + }; + + Dog dog = new Dog("Бобик"); + + Bowl bowl = new Bowl(40); + + for (Cat cat : cats) { + cat.eat(bowl, 15); + } + + System.out.println(); + + bowl.addFood(30); + for (Cat cat : cats) { + if (!cat.isFull()) { + cat.eat(bowl, 15); + } + } + + System.out.println(); + + cats[0].run(100); + cats[0].swim(5); + + dog.run(400); + dog.swim(8); + + System.out.println(); + + System.out.println("Создано котов: " + Cat.getCatsCount()); + System.out.println("Создано собак: " + Dog.getDogsCount()); + System.out.println("Всего животных: " + Animal.getAnimalsCount()); + } +} \ No newline at end of file diff --git a/src/main/java/lesson_4/animals/Bowl.java b/src/main/java/lesson_4/animals/Bowl.java new file mode 100644 index 0000000..dde631b --- /dev/null +++ b/src/main/java/lesson_4/animals/Bowl.java @@ -0,0 +1,29 @@ +package lesson_4.animals; + +import lombok.Getter; + +@Getter +public class Bowl { + private int foodAmount; + + public Bowl(int foodAmount) { + this.foodAmount = Math.max(foodAmount, 0); + } + + public boolean decreaseFood(int amount) { + if (amount <= foodAmount) { + foodAmount -= amount; + return true; + } else { + return false; + } + } + + public void addFood(int amount) { + if (amount > 0) { + foodAmount += amount; + System.out.println("Добавлено " + amount + " еды. Сейчас в миске: " + foodAmount); + } + } + +} diff --git a/src/main/java/lesson_4/animals/Cat.java b/src/main/java/lesson_4/animals/Cat.java new file mode 100644 index 0000000..ee45676 --- /dev/null +++ b/src/main/java/lesson_4/animals/Cat.java @@ -0,0 +1,26 @@ +package lesson_4.animals; + +import lombok.Getter; + +@Getter +public class Cat extends Animal { + @Getter + private static int catsCount = 0; + private boolean isFull; + + public Cat(String name) { + super(name, 200, 0); // коты не умеют плавать + this.isFull = false; + catsCount++; + } + + public void eat(Bowl bowl, int amount) { + if (bowl.decreaseFood(amount)) { + isFull = true; + System.out.println(name + " покушал и теперь сыт."); + } else { + System.out.println(name + " остался голодным. Недостаточно еды."); + } + } + +} diff --git a/src/main/java/lesson_4/animals/Dog.java b/src/main/java/lesson_4/animals/Dog.java new file mode 100644 index 0000000..6672cd0 --- /dev/null +++ b/src/main/java/lesson_4/animals/Dog.java @@ -0,0 +1,14 @@ +package lesson_4.animals; + +import lombok.Getter; + +public class Dog extends Animal { + @Getter + private static int dogsCount = 0; + + public Dog(String name) { + super(name, 500, 10); + dogsCount++; + } + +} diff --git a/src/main/java/lesson_4/shapes/Circle.java b/src/main/java/lesson_4/shapes/Circle.java new file mode 100644 index 0000000..87b6e62 --- /dev/null +++ b/src/main/java/lesson_4/shapes/Circle.java @@ -0,0 +1,20 @@ +package lesson_4.shapes; + +public class Circle extends GeometricFigure { + private double radius; + + public Circle(double radius, String fillColor, String borderColor) { + super(fillColor, borderColor); + this.radius = radius; + } + + @Override + public double getPerimeter() { + return 2 * Math.PI * radius; + } + + @Override + public double getArea() { + return Math.PI * radius * radius; + } +} diff --git a/src/main/java/lesson_4/shapes/GeometricFigure.java b/src/main/java/lesson_4/shapes/GeometricFigure.java new file mode 100644 index 0000000..00113a2 --- /dev/null +++ b/src/main/java/lesson_4/shapes/GeometricFigure.java @@ -0,0 +1,26 @@ +package lesson_4.shapes; + +public abstract class GeometricFigure implements Measurable { + protected String fillColor; + protected String borderColor; + + public GeometricFigure(String fillColor, String borderColor) { + this.fillColor = fillColor; + this.borderColor = borderColor; + } + + public String getFillColor() { + return fillColor; + } + + public String getBorderColor() { + return borderColor; + } + + public void printFullInfo() { + printInfo(); + System.out.println("Цвет заливки: " + fillColor); + System.out.println("Цвет границы: " + borderColor); + System.out.println("---------------------------"); + } +} diff --git a/src/main/java/lesson_4/shapes/Measurable.java b/src/main/java/lesson_4/shapes/Measurable.java new file mode 100644 index 0000000..c26b301 --- /dev/null +++ b/src/main/java/lesson_4/shapes/Measurable.java @@ -0,0 +1,11 @@ +package lesson_4.shapes; + +public interface Measurable { + double getPerimeter(); + double getArea(); + + default void printInfo() { + System.out.println("Периметр: " + getPerimeter()); + System.out.println("Площадь: " + getArea()); + } +} diff --git a/src/main/java/lesson_4/shapes/Rectangle.java b/src/main/java/lesson_4/shapes/Rectangle.java new file mode 100644 index 0000000..40852eb --- /dev/null +++ b/src/main/java/lesson_4/shapes/Rectangle.java @@ -0,0 +1,22 @@ +package lesson_4.shapes; + +public class Rectangle extends GeometricFigure { + private double width; + private double height; + + public Rectangle(double width, double height, String fillColor, String borderColor) { + super(fillColor, borderColor); + this.width = width; + this.height = height; + } + + @Override + public double getPerimeter() { + return 2 * (width + height); + } + + @Override + public double getArea() { + return width * height; + } +} diff --git a/src/main/java/lesson_4/shapes/ShapesMain.java b/src/main/java/lesson_4/shapes/ShapesMain.java new file mode 100644 index 0000000..7019ae6 --- /dev/null +++ b/src/main/java/lesson_4/shapes/ShapesMain.java @@ -0,0 +1,16 @@ +package lesson_4.shapes; + +public class ShapesMain { + public static void main(String[] args) { + GeometricFigure[] figures = { + new Circle(5, "Красный", "Чёрный"), + new Rectangle(4, 6, "Синий", "Зелёный"), + new Triangle(3, 4, 5, "Жёлтый", "Фиолетовый") + }; + + for (GeometricFigure figure : figures) { + System.out.println(figure.getClass().getSimpleName() + ":"); + figure.printFullInfo(); + } + } +} diff --git a/src/main/java/lesson_4/shapes/Triangle.java b/src/main/java/lesson_4/shapes/Triangle.java new file mode 100644 index 0000000..ff62e3c --- /dev/null +++ b/src/main/java/lesson_4/shapes/Triangle.java @@ -0,0 +1,23 @@ +package lesson_4.shapes; + +public class Triangle extends GeometricFigure { + private double a, b, c; + + public Triangle(double a, double b, double c, String fillColor, String borderColor) { + super(fillColor, borderColor); + this.a = a; + this.b = b; + this.c = c; + } + + @Override + public double getPerimeter() { + return a + b + c; + } + + @Override + public double getArea() { + double s = getPerimeter() / 2; + return Math.sqrt(s * (s - a) * (s - b) * (s - c)); + } +} From 97506cdf4b460e3a719d3c1aeaba92dcdb31d6d2 Mon Sep 17 00:00:00 2001 From: perehod93-qa Date: Wed, 22 Oct 2025 15:35:34 +0300 Subject: [PATCH 4/5] lesson_4 done --- src/main/java/lesson_3/park/Attraction.java | 22 --------------------- src/main/java/lesson_3/park/Park.java | 21 ++++++++++++++++++++ src/main/java/lesson_3/park/ParkMain.java | 2 -- 3 files changed, 21 insertions(+), 24 deletions(-) delete mode 100644 src/main/java/lesson_3/park/Attraction.java diff --git a/src/main/java/lesson_3/park/Attraction.java b/src/main/java/lesson_3/park/Attraction.java deleted file mode 100644 index a21527f..0000000 --- a/src/main/java/lesson_3/park/Attraction.java +++ /dev/null @@ -1,22 +0,0 @@ -package lesson_3.park; - -import lesson_3.Item; - -public class Attraction extends Item { - private String workingHours; - private double cost; - - public Attraction(String name, String workingHours, double cost) { - super(name); - this.workingHours = workingHours; - this.cost = cost; - } - - @Override - public void displayInfo() { - System.out.println("Аттракцион: " + name); - System.out.println("Время работы: " + workingHours); - System.out.println("Стоимость: " + cost); - System.out.println("---------------------------"); - } -} \ No newline at end of file diff --git a/src/main/java/lesson_3/park/Park.java b/src/main/java/lesson_3/park/Park.java index c50374e..942d90d 100644 --- a/src/main/java/lesson_3/park/Park.java +++ b/src/main/java/lesson_3/park/Park.java @@ -1,5 +1,7 @@ package lesson_3.park; +import lesson_3.Item; + import java.util.ArrayList; import java.util.List; @@ -26,4 +28,23 @@ public void showAttractions() { public String getParkName() { return parkName; } + + public class Attraction extends Item { + private String workingHours; + private double cost; + + public Attraction(String name, String workingHours, double cost) { + super(name); + this.workingHours = workingHours; + this.cost = cost; + } + + @Override + public void displayInfo() { + System.out.println("Аттракцион: " + name); + System.out.println("Время работы: " + workingHours); + System.out.println("Стоимость: " + cost); + System.out.println("---------------------------"); + } + } } \ No newline at end of file diff --git a/src/main/java/lesson_3/park/ParkMain.java b/src/main/java/lesson_3/park/ParkMain.java index 2592066..a842f42 100644 --- a/src/main/java/lesson_3/park/ParkMain.java +++ b/src/main/java/lesson_3/park/ParkMain.java @@ -1,7 +1,5 @@ package lesson_3.park; -import lesson_3.park.Park; - public class ParkMain { public static void main(String[] args) { Park amusementPark = new Park("Весёлый городок"); From 148080b2e1548d320a4640059268274aba4a20ff Mon Sep 17 00:00:00 2001 From: perehod93-qa Date: Thu, 23 Oct 2025 12:30:34 +0300 Subject: [PATCH 5/5] lesson_4 corrected --- src/main/java/lesson_3/park/ParkMain.java | 1 - src/main/java/lesson_4/animals/Animal.java | 1 - src/main/java/lesson_4/animals/AnimalsMain.java | 2 +- src/main/java/lesson_4/animals/Bowl.java | 12 +++--------- src/main/java/lesson_4/animals/Cat.java | 10 +++++----- src/main/java/lesson_4/animals/Dog.java | 3 +-- src/main/java/lesson_4/shapes/Circle.java | 2 +- src/main/java/lesson_4/shapes/GeometricFigure.java | 2 +- src/main/java/lesson_4/shapes/Measurable.java | 2 +- src/main/java/lesson_4/shapes/Rectangle.java | 2 +- src/main/java/lesson_4/shapes/ShapesMain.java | 2 +- src/main/java/lesson_4/shapes/Triangle.java | 2 +- 12 files changed, 16 insertions(+), 25 deletions(-) diff --git a/src/main/java/lesson_3/park/ParkMain.java b/src/main/java/lesson_3/park/ParkMain.java index a842f42..438a892 100644 --- a/src/main/java/lesson_3/park/ParkMain.java +++ b/src/main/java/lesson_3/park/ParkMain.java @@ -15,7 +15,6 @@ public static void main(String[] args) { pokatushkiPark.addAttraction("Комната страха", "14:00 - 23:00", 400); pokatushkiPark.addAttraction("Карусель", "10:00 - 22:00", 250); - amusementPark.showAttractions(); System.out.println(); pokatushkiPark.showAttractions(); diff --git a/src/main/java/lesson_4/animals/Animal.java b/src/main/java/lesson_4/animals/Animal.java index dc20e7f..5071451 100644 --- a/src/main/java/lesson_4/animals/Animal.java +++ b/src/main/java/lesson_4/animals/Animal.java @@ -34,5 +34,4 @@ public void swim(int distance) { System.out.println(name + " не смог проплыть " + distance + " м."); } } - } \ No newline at end of file diff --git a/src/main/java/lesson_4/animals/AnimalsMain.java b/src/main/java/lesson_4/animals/AnimalsMain.java index 144245b..938378e 100644 --- a/src/main/java/lesson_4/animals/AnimalsMain.java +++ b/src/main/java/lesson_4/animals/AnimalsMain.java @@ -10,7 +10,7 @@ public static void main(String[] args) { Dog dog = new Dog("Бобик"); - Bowl bowl = new Bowl(40); + Bowl bowl = new Bowl(20); for (Cat cat : cats) { cat.eat(bowl, 15); diff --git a/src/main/java/lesson_4/animals/Bowl.java b/src/main/java/lesson_4/animals/Bowl.java index dde631b..cf2fae6 100644 --- a/src/main/java/lesson_4/animals/Bowl.java +++ b/src/main/java/lesson_4/animals/Bowl.java @@ -10,13 +10,8 @@ public Bowl(int foodAmount) { this.foodAmount = Math.max(foodAmount, 0); } - public boolean decreaseFood(int amount) { - if (amount <= foodAmount) { - foodAmount -= amount; - return true; - } else { - return false; - } + public void decreaseFood(int amount) { + foodAmount = Math.max(foodAmount - amount, 0); } public void addFood(int amount) { @@ -25,5 +20,4 @@ public void addFood(int amount) { System.out.println("Добавлено " + amount + " еды. Сейчас в миске: " + foodAmount); } } - -} +} \ No newline at end of file diff --git a/src/main/java/lesson_4/animals/Cat.java b/src/main/java/lesson_4/animals/Cat.java index ee45676..ca478d0 100644 --- a/src/main/java/lesson_4/animals/Cat.java +++ b/src/main/java/lesson_4/animals/Cat.java @@ -9,18 +9,18 @@ public class Cat extends Animal { private boolean isFull; public Cat(String name) { - super(name, 200, 0); // коты не умеют плавать + super(name, 200, 0); this.isFull = false; catsCount++; } public void eat(Bowl bowl, int amount) { - if (bowl.decreaseFood(amount)) { + if (bowl.getFoodAmount() >= amount) { + bowl.decreaseFood(amount); isFull = true; System.out.println(name + " покушал и теперь сыт."); } else { - System.out.println(name + " остался голодным. Недостаточно еды."); + System.out.println(name + " остался голодным. Недостаточно еды "); } } - -} +} \ No newline at end of file diff --git a/src/main/java/lesson_4/animals/Dog.java b/src/main/java/lesson_4/animals/Dog.java index 6672cd0..96e8dac 100644 --- a/src/main/java/lesson_4/animals/Dog.java +++ b/src/main/java/lesson_4/animals/Dog.java @@ -10,5 +10,4 @@ public Dog(String name) { super(name, 500, 10); dogsCount++; } - -} +} \ No newline at end of file diff --git a/src/main/java/lesson_4/shapes/Circle.java b/src/main/java/lesson_4/shapes/Circle.java index 87b6e62..1c2b78b 100644 --- a/src/main/java/lesson_4/shapes/Circle.java +++ b/src/main/java/lesson_4/shapes/Circle.java @@ -17,4 +17,4 @@ public double getPerimeter() { public double getArea() { return Math.PI * radius * radius; } -} +} \ No newline at end of file diff --git a/src/main/java/lesson_4/shapes/GeometricFigure.java b/src/main/java/lesson_4/shapes/GeometricFigure.java index 00113a2..b362540 100644 --- a/src/main/java/lesson_4/shapes/GeometricFigure.java +++ b/src/main/java/lesson_4/shapes/GeometricFigure.java @@ -23,4 +23,4 @@ public void printFullInfo() { System.out.println("Цвет границы: " + borderColor); System.out.println("---------------------------"); } -} +} \ No newline at end of file diff --git a/src/main/java/lesson_4/shapes/Measurable.java b/src/main/java/lesson_4/shapes/Measurable.java index c26b301..a319e90 100644 --- a/src/main/java/lesson_4/shapes/Measurable.java +++ b/src/main/java/lesson_4/shapes/Measurable.java @@ -8,4 +8,4 @@ default void printInfo() { System.out.println("Периметр: " + getPerimeter()); System.out.println("Площадь: " + getArea()); } -} +} \ No newline at end of file diff --git a/src/main/java/lesson_4/shapes/Rectangle.java b/src/main/java/lesson_4/shapes/Rectangle.java index 40852eb..b062652 100644 --- a/src/main/java/lesson_4/shapes/Rectangle.java +++ b/src/main/java/lesson_4/shapes/Rectangle.java @@ -19,4 +19,4 @@ public double getPerimeter() { public double getArea() { return width * height; } -} +} \ No newline at end of file diff --git a/src/main/java/lesson_4/shapes/ShapesMain.java b/src/main/java/lesson_4/shapes/ShapesMain.java index 7019ae6..203fa87 100644 --- a/src/main/java/lesson_4/shapes/ShapesMain.java +++ b/src/main/java/lesson_4/shapes/ShapesMain.java @@ -13,4 +13,4 @@ public static void main(String[] args) { figure.printFullInfo(); } } -} +} \ No newline at end of file diff --git a/src/main/java/lesson_4/shapes/Triangle.java b/src/main/java/lesson_4/shapes/Triangle.java index ff62e3c..ac92eba 100644 --- a/src/main/java/lesson_4/shapes/Triangle.java +++ b/src/main/java/lesson_4/shapes/Triangle.java @@ -20,4 +20,4 @@ public double getArea() { double s = getPerimeter() / 2; return Math.sqrt(s * (s - a) * (s - b) * (s - c)); } -} +} \ No newline at end of file