From 0fdfab07e8e12dde787ae4c448d019bbd26c86c5 Mon Sep 17 00:00:00 2001 From: Oleksandr Hordienko Date: Mon, 8 Sep 2025 19:39:03 +0300 Subject: [PATCH 1/4] create new class and method to output --- src/main/java/core/basesyntax/Bulldozer.java | 12 ++++++++++++ src/main/java/core/basesyntax/Excavator.java | 12 ++++++++++++ src/main/java/core/basesyntax/Machine.java | 7 +++++++ src/main/java/core/basesyntax/MainApp.java | 9 ++++++++- src/main/java/core/basesyntax/Truck.java | 12 ++++++++++++ 5 files changed, 51 insertions(+), 1 deletion(-) 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..e58a75131 --- /dev/null +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -0,0 +1,12 @@ +package core.basesyntax; + +public class Bulldozer extends Machine { + + public void doWork() { + System.out.println("Bulldozer started its work"); + } + + 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..ad72ba5f1 --- /dev/null +++ b/src/main/java/core/basesyntax/Excavator.java @@ -0,0 +1,12 @@ +package core.basesyntax; + +public class Excavator extends Machine { + + public void doWork() { + System.out.println("Excavator started its work"); + } + + 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..4219699a5 --- /dev/null +++ b/src/main/java/core/basesyntax/Machine.java @@ -0,0 +1,7 @@ +package core.basesyntax; + +public 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..3feb68454 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -1,5 +1,12 @@ package core.basesyntax; public class MainApp { - + public static void main(String[] args) { + // All executable code goes inside this method + 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..72f6e05c3 --- /dev/null +++ b/src/main/java/core/basesyntax/Truck.java @@ -0,0 +1,12 @@ +package core.basesyntax; + +public class Truck extends Machine { + + public void doWork() { + System.out.println("Truck started its work"); + } + + public void stopWork() { + System.out.println("Truck stopped working"); + } +} From 8f9824f62937a837e26748471b4eef53d2dc84bb Mon Sep 17 00:00:00 2001 From: Oleksandr Hordienko Date: Mon, 8 Sep 2025 20:16:07 +0300 Subject: [PATCH 2/4] fix the problem --- src/main/java/core/basesyntax/Bulldozer.java | 7 +++---- src/main/java/core/basesyntax/Excavator.java | 7 +++---- src/main/java/core/basesyntax/Machine.java | 2 -- src/main/java/core/basesyntax/MainApp.java | 1 - src/main/java/core/basesyntax/Truck.java | 7 +++---- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java index e58a75131..b7389cf89 100644 --- a/src/main/java/core/basesyntax/Bulldozer.java +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -1,11 +1,10 @@ package core.basesyntax; - public class Bulldozer extends Machine { - + @Override public void doWork() { - System.out.println("Bulldozer started its work"); + 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 index ad72ba5f1..f5db05102 100644 --- a/src/main/java/core/basesyntax/Excavator.java +++ b/src/main/java/core/basesyntax/Excavator.java @@ -1,11 +1,10 @@ package core.basesyntax; - public class Excavator extends Machine { - + @Override public void doWork() { - System.out.println("Excavator started its work"); + 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 index 4219699a5..70849b4f7 100644 --- a/src/main/java/core/basesyntax/Machine.java +++ b/src/main/java/core/basesyntax/Machine.java @@ -1,7 +1,5 @@ package core.basesyntax; - public 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 3feb68454..3f83cd876 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -1,5 +1,4 @@ package core.basesyntax; - public class MainApp { public static void main(String[] args) { // All executable code goes inside this method diff --git a/src/main/java/core/basesyntax/Truck.java b/src/main/java/core/basesyntax/Truck.java index 72f6e05c3..ad9ba1395 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -1,11 +1,10 @@ package core.basesyntax; - public class Truck extends Machine { - + @Override public void doWork() { - System.out.println("Truck started its work"); + System.out.println("Truck started working"); } - + @Override public void stopWork() { System.out.println("Truck stopped working"); } From 5f848c3b5cc0924f66f15062684e26cafe4cb196 Mon Sep 17 00:00:00 2001 From: Oleksandr Hordienko Date: Mon, 8 Sep 2025 20:29:38 +0300 Subject: [PATCH 3/4] fix the problem --- src/main/java/core/basesyntax/Bulldozer.java | 2 ++ src/main/java/core/basesyntax/Excavator.java | 2 ++ src/main/java/core/basesyntax/Machine.java | 2 ++ src/main/java/core/basesyntax/MainApp.java | 1 + src/main/java/core/basesyntax/Truck.java | 2 ++ 5 files changed, 9 insertions(+) diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java index b7389cf89..124a533e5 100644 --- a/src/main/java/core/basesyntax/Bulldozer.java +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -1,9 +1,11 @@ package core.basesyntax; + public 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 index f5db05102..418773a88 100644 --- a/src/main/java/core/basesyntax/Excavator.java +++ b/src/main/java/core/basesyntax/Excavator.java @@ -1,9 +1,11 @@ package core.basesyntax; + public 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 index 70849b4f7..4219699a5 100644 --- a/src/main/java/core/basesyntax/Machine.java +++ b/src/main/java/core/basesyntax/Machine.java @@ -1,5 +1,7 @@ package core.basesyntax; + public 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 3f83cd876..3feb68454 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -1,4 +1,5 @@ package core.basesyntax; + public class MainApp { public static void main(String[] args) { // All executable code goes inside this method diff --git a/src/main/java/core/basesyntax/Truck.java b/src/main/java/core/basesyntax/Truck.java index ad9ba1395..35b6038f3 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -1,9 +1,11 @@ package core.basesyntax; + public 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 5d93987b6833912af5c9f667bb6d728c484a8c37 Mon Sep 17 00:00:00 2001 From: Oleksandr Hordienko Date: Mon, 8 Sep 2025 22:08:22 +0300 Subject: [PATCH 4/4] fix the problem --- src/main/java/core/basesyntax/Bulldozer.java | 4 +--- src/main/java/core/basesyntax/Excavator.java | 4 +--- src/main/java/core/basesyntax/Machine.java | 4 +--- src/main/java/core/basesyntax/MainApp.java | 3 +-- src/main/java/core/basesyntax/Truck.java | 4 +--- 5 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java index 124a533e5..0645ff181 100644 --- a/src/main/java/core/basesyntax/Bulldozer.java +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -1,13 +1,11 @@ package core.basesyntax; - public class Bulldozer extends Machine { @Override public void doWork() { System.out.println("Bulldozer started working"); } - @Override public void stopWork() { System.out.println("Bulldozer stopped working"); } -} +} \ No newline at end of file diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java index 418773a88..5e730d43b 100644 --- a/src/main/java/core/basesyntax/Excavator.java +++ b/src/main/java/core/basesyntax/Excavator.java @@ -1,13 +1,11 @@ package core.basesyntax; - public class Excavator extends Machine { @Override public void doWork() { System.out.println("Excavator started working"); } - @Override public void stopWork() { System.out.println("Excavator stopped working"); } -} +} \ No newline at end of file diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java index 4219699a5..28996c07a 100644 --- a/src/main/java/core/basesyntax/Machine.java +++ b/src/main/java/core/basesyntax/Machine.java @@ -1,7 +1,5 @@ package core.basesyntax; - public abstract class Machine { public abstract void doWork(); - public abstract void stopWork(); -} +} \ No newline at end of file diff --git a/src/main/java/core/basesyntax/MainApp.java b/src/main/java/core/basesyntax/MainApp.java index 3feb68454..f1dd58337 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -1,5 +1,4 @@ package core.basesyntax; - public class MainApp { public static void main(String[] args) { // All executable code goes inside this method @@ -9,4 +8,4 @@ public static void main(String[] args) { machine.stopWork(); } } -} +} \ No newline at end of file diff --git a/src/main/java/core/basesyntax/Truck.java b/src/main/java/core/basesyntax/Truck.java index 35b6038f3..b1920543b 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -1,13 +1,11 @@ package core.basesyntax; - public class Truck extends Machine { @Override public void doWork() { System.out.println("Truck started working"); } - @Override public void stopWork() { System.out.println("Truck stopped working"); } -} +} \ No newline at end of file