From 8999deaf8a20a9c2e3561520189f1c892fc55393 Mon Sep 17 00:00:00 2001 From: Salnikov Markiian Date: Thu, 3 Aug 2023 17:44:59 +0300 Subject: [PATCH 1/2] added Machine absct class, descendant classes, and redefined methods. Added the implementation to the main --- src/main/java/core/basesyntax/Bulldozer.java | 13 +++++++++++++ src/main/java/core/basesyntax/Excavator.java | 14 ++++++++++++++ src/main/java/core/basesyntax/Machine.java | 7 +++++++ src/main/java/core/basesyntax/MainApp.java | 11 +++++++++++ src/main/java/core/basesyntax/Truck.java | 13 +++++++++++++ 5 files changed, 58 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..a1372c018 --- /dev/null +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -0,0 +1,13 @@ +package core.basesyntax; + +public class Bulldozer extends Machine { + @Override + public void doWork() { + System.out.println("Bulldozer start doing his work"); + } + + @Override + public void stopWork() { + System.out.println("Bulldozer stop doing his work"); + } +} diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java new file mode 100644 index 000000000..720ae27f6 --- /dev/null +++ b/src/main/java/core/basesyntax/Excavator.java @@ -0,0 +1,14 @@ +package core.basesyntax; + +public class Excavator extends Machine { + + @Override + public void doWork() { + System.out.println("Excavator start doing his work"); + } + + @Override + public void stopWork() { + System.out.println("Excavator stop doing his work"); + } +} diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java new file mode 100644 index 000000000..9116677a1 --- /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..e700af75c 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -1,5 +1,16 @@ package core.basesyntax; public class MainApp { + public static void main(String[] args) { + Machine[] machineArray = { + new Truck(), + new Bulldozer(), + new Excavator() + }; + for (Machine machine : machineArray) { + 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..9443d6202 --- /dev/null +++ b/src/main/java/core/basesyntax/Truck.java @@ -0,0 +1,13 @@ +package core.basesyntax; + +public class Truck extends Machine { + @Override + public void doWork() { + System.out.println("Truck start doing his work"); + } + + @Override + public void stopWork() { + System.out.println("Truck stop doing his work"); + } +} From d9fabdd4525770724852bb8d6efa18ee0214f677 Mon Sep 17 00:00:00 2001 From: Salnikov Markiian Date: Mon, 7 Aug 2023 12:51:42 +0300 Subject: [PATCH 2/2] removed empty line in Excavator.java and Machine.java . separated the operators in Machine.java --- src/main/java/core/basesyntax/Excavator.java | 1 - src/main/java/core/basesyntax/Machine.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java index 720ae27f6..5f7cab36b 100644 --- a/src/main/java/core/basesyntax/Excavator.java +++ b/src/main/java/core/basesyntax/Excavator.java @@ -1,7 +1,6 @@ package core.basesyntax; public class Excavator extends Machine { - @Override public void doWork() { System.out.println("Excavator start doing his work"); diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java index 9116677a1..cad5be453 100644 --- a/src/main/java/core/basesyntax/Machine.java +++ b/src/main/java/core/basesyntax/Machine.java @@ -1,7 +1,7 @@ package core.basesyntax; public abstract class Machine { - public abstract void doWork(); + public abstract void stopWork(); }