From b8d392efc16b4427f184b83f27704e7482641634 Mon Sep 17 00:00:00 2001 From: Alinka Lyn Date: Sun, 18 Aug 2024 14:53:29 +0300 Subject: [PATCH 1/3] created classes of inheritance added psvm to class MainApp --- src/main/java/core/basesyntax/Bulldozer.java | 15 +++++++++++++++ src/main/java/core/basesyntax/Excavator.java | 14 ++++++++++++++ src/main/java/core/basesyntax/Machine.java | 7 +++++++ src/main/java/core/basesyntax/MainApp.java | 8 ++++++++ src/main/java/core/basesyntax/Truck.java | 15 +++++++++++++++ 5 files changed, 59 insertions(+) create mode 100644 src/main/java/core/basesyntax/Bulldozer.java create mode 100644 src/main/java/core/basesyntax/Excavator.java create mode 100644 src/main/java/core/basesyntax/Machine.java create mode 100644 src/main/java/core/basesyntax/Truck.java diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java new file mode 100644 index 000000000..0d224b3ea --- /dev/null +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -0,0 +1,15 @@ +package core.basesyntax; + +class Bulldozer extends Machine { + @Override + public void doWork() { + System.out.println("Bulldozer started working."); + + } + + @Override + public void stopWork() { + System.out.println("Bulldozer stopped working."); + + } +} diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java new file mode 100644 index 000000000..3ae56af20 --- /dev/null +++ b/src/main/java/core/basesyntax/Excavator.java @@ -0,0 +1,14 @@ +package core.basesyntax; + +class Excavator extends Machine { + @Override + public void doWork() { + System.out.println("Excavator started working."); + } + + @Override + public void stopWork() { + System.out.println("Excavator stopped working."); + + } +} diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java new file mode 100644 index 000000000..474d05768 --- /dev/null +++ b/src/main/java/core/basesyntax/Machine.java @@ -0,0 +1,7 @@ +package core.basesyntax; + +abstract class Machine { + public abstract void doWork(); + + public abstract void stopWork(); +} diff --git a/src/main/java/core/basesyntax/MainApp.java b/src/main/java/core/basesyntax/MainApp.java index f99e9a019..c2813e5bb 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -1,5 +1,13 @@ package core.basesyntax; public class MainApp { + public static void main(String[] args) { + Machine[] machines = {new Truck(), new Bulldozer(), new Excavator()}; + + for (Machine machine : machines) { + machine.doWork(); + machine.stopWork(); + } + } } diff --git a/src/main/java/core/basesyntax/Truck.java b/src/main/java/core/basesyntax/Truck.java new file mode 100644 index 000000000..9958d01f1 --- /dev/null +++ b/src/main/java/core/basesyntax/Truck.java @@ -0,0 +1,15 @@ +package core.basesyntax; + +class Truck extends Machine { + + @Override + public void doWork() { + System.out.println("Truck started working"); + } + + @Override + public void stopWork() { + System.out.println("Truck stopped working"); + + } +} From 77bfeaa06d3026a0878fc44d8f07253c129c1865 Mon Sep 17 00:00:00 2001 From: Alinka Lyn Date: Sun, 18 Aug 2024 15:07:25 +0300 Subject: [PATCH 2/3] added fixes after review --- src/main/java/core/basesyntax/Bulldozer.java | 6 +++--- src/main/java/core/basesyntax/Excavator.java | 6 +++--- src/main/java/core/basesyntax/Machine.java | 2 +- src/main/java/core/basesyntax/Truck.java | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java index 0d224b3ea..360d515d4 100644 --- a/src/main/java/core/basesyntax/Bulldozer.java +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -1,15 +1,15 @@ package core.basesyntax; -class Bulldozer extends Machine { +public class Bulldozer extends Machine { @Override public void doWork() { - System.out.println("Bulldozer started working."); + System.out.println("Bulldozer is working."); } @Override public void stopWork() { - System.out.println("Bulldozer stopped working."); + System.out.println("Bulldozer has stopped working."); } } diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java index 3ae56af20..9ae181898 100644 --- a/src/main/java/core/basesyntax/Excavator.java +++ b/src/main/java/core/basesyntax/Excavator.java @@ -1,14 +1,14 @@ package core.basesyntax; -class Excavator extends Machine { +public class Excavator extends Machine { @Override public void doWork() { - System.out.println("Excavator started working."); + System.out.println("Excavator is digging the ground."); } @Override public void stopWork() { - System.out.println("Excavator stopped working."); + System.out.println("Excavator stopped digging the ground."); } } diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java index 474d05768..4219699a5 100644 --- a/src/main/java/core/basesyntax/Machine.java +++ b/src/main/java/core/basesyntax/Machine.java @@ -1,6 +1,6 @@ package core.basesyntax; -abstract class Machine { +public abstract class Machine { public abstract void doWork(); public abstract void stopWork(); diff --git a/src/main/java/core/basesyntax/Truck.java b/src/main/java/core/basesyntax/Truck.java index 9958d01f1..be97bd92c 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -4,12 +4,12 @@ class Truck extends Machine { @Override public void doWork() { - System.out.println("Truck started working"); + System.out.println("Truck is transporting goods."); } @Override public void stopWork() { - System.out.println("Truck stopped working"); + System.out.println("Truck stopped transporting goods."); } } From 0f919c0a6a65ecc3ab86ece3a7c6090e4f420678 Mon Sep 17 00:00:00 2001 From: Alinka Lyn Date: Mon, 19 Aug 2024 17:55:17 +0300 Subject: [PATCH 3/3] changes after review --- src/main/java/core/basesyntax/Bulldozer.java | 2 -- src/main/java/core/basesyntax/Excavator.java | 1 - src/main/java/core/basesyntax/Truck.java | 2 -- 3 files changed, 5 deletions(-) diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java index 360d515d4..cdc15af30 100644 --- a/src/main/java/core/basesyntax/Bulldozer.java +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -4,12 +4,10 @@ public class Bulldozer extends Machine { @Override public void doWork() { System.out.println("Bulldozer is working."); - } @Override public void stopWork() { System.out.println("Bulldozer has stopped working."); - } } diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java index 9ae181898..c3ce68fb9 100644 --- a/src/main/java/core/basesyntax/Excavator.java +++ b/src/main/java/core/basesyntax/Excavator.java @@ -9,6 +9,5 @@ public void doWork() { @Override public void stopWork() { System.out.println("Excavator stopped digging the ground."); - } } diff --git a/src/main/java/core/basesyntax/Truck.java b/src/main/java/core/basesyntax/Truck.java index be97bd92c..e0a8a6f67 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -1,7 +1,6 @@ package core.basesyntax; class Truck extends Machine { - @Override public void doWork() { System.out.println("Truck is transporting goods."); @@ -10,6 +9,5 @@ public void doWork() { @Override public void stopWork() { System.out.println("Truck stopped transporting goods."); - } }