From 73d8e07eb533ed47c5c827785a4e3b87d7dcd954 Mon Sep 17 00:00:00 2001 From: yevhen Date: Thu, 1 Aug 2024 20:45:19 +0300 Subject: [PATCH 1/6] made changes --- src/main/java/core/basesyntax/Bulldozer.java | 15 +++++++++++++++ src/main/java/core/basesyntax/Excavator.java | 15 +++++++++++++++ src/main/java/core/basesyntax/Machine.java | 6 ++++++ src/main/java/core/basesyntax/MainApp.java | 11 ++++++++++- src/main/java/core/basesyntax/Truck.java | 13 +++++++++++++ 5 files changed, 59 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..cc4c83387 --- /dev/null +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -0,0 +1,15 @@ +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 finished the job"); + + } +} diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java new file mode 100644 index 000000000..bb3a94234 --- /dev/null +++ b/src/main/java/core/basesyntax/Excavator.java @@ -0,0 +1,15 @@ +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 finished the job"); + + } +} diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java new file mode 100644 index 000000000..5a62715c2 --- /dev/null +++ b/src/main/java/core/basesyntax/Machine.java @@ -0,0 +1,6 @@ +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..9f7f8e462 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -1,5 +1,14 @@ package core.basesyntax; public class MainApp { - +public static void Main() { + Machine bulldozer = new Bulldozer(); + Machine truck = new Truck(); + Machine excavator = new Excavator(); + Machine[] machines = {bulldozer, truck, excavator}; + for(int i = 0; i < machines.length; i++) { + machines[i].doWork(); + machines[i].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..51c2c3dd2 --- /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 started working"); + } + + @Override + public void stopWork() { +System.out.println("Truck finished the job"); + } +} From 449cd658d8f3e770f4ed76ea1cbd3d4d497f6e5e Mon Sep 17 00:00:00 2001 From: yevhen Date: Thu, 15 Aug 2024 15:20:28 +0300 Subject: [PATCH 2/6] made changes 19 --- src/main/java/core/basesyntax/MainApp.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/core/basesyntax/MainApp.java b/src/main/java/core/basesyntax/MainApp.java index 9f7f8e462..8d3b66b59 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -2,13 +2,13 @@ public class MainApp { public static void Main() { - Machine bulldozer = new Bulldozer(); - Machine truck = new Truck(); - Machine excavator = new Excavator(); - Machine[] machines = {bulldozer, truck, excavator}; - for(int i = 0; i < machines.length; i++) { - machines[i].doWork(); - machines[i].stopWork(); + Machine bulldozer = new Bulldozer(); + Machine truck = new Truck(); + Machine excavator = new Excavator(); + Machine[] machines = {bulldozer, truck, excavator}; + for(int i = 0; i < machines.length; i++) { + machines[i].doWork(); + machines[i].stopWork(); } -} + } } From 4b6f9a7705dcd4fc8f96526e88db9dbceac572f2 Mon Sep 17 00:00:00 2001 From: yevhen Date: Fri, 16 Aug 2024 12:08:34 +0300 Subject: [PATCH 3/6] made changes 19 --- src/main/java/core/basesyntax/MainApp.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/core/basesyntax/MainApp.java b/src/main/java/core/basesyntax/MainApp.java index 8d3b66b59..28437a1c8 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -9,6 +9,6 @@ public static void Main() { for(int i = 0; i < machines.length; i++) { machines[i].doWork(); machines[i].stopWork(); - } - } + } + } } From 4b23d90e640eb41fa29319a20a5a8f2bb151d17c Mon Sep 17 00:00:00 2001 From: yevhen Date: Fri, 16 Aug 2024 12:30:23 +0300 Subject: [PATCH 4/6] made changes 20 --- src/main/java/core/basesyntax/MainApp.java | 6 +++--- src/main/java/core/basesyntax/Truck.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/core/basesyntax/MainApp.java b/src/main/java/core/basesyntax/MainApp.java index 28437a1c8..b3a7eb063 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -1,14 +1,14 @@ package core.basesyntax; public class MainApp { -public static void Main() { +public static void MainApp() { Machine bulldozer = new Bulldozer(); Machine truck = new Truck(); Machine excavator = new Excavator(); Machine[] machines = {bulldozer, truck, excavator}; for(int i = 0; i < machines.length; i++) { - machines[i].doWork(); - machines[i].stopWork(); + machines[i].doWork(); + machines[i].stopWork(); } } } diff --git a/src/main/java/core/basesyntax/Truck.java b/src/main/java/core/basesyntax/Truck.java index 51c2c3dd2..aaa2e6e7f 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -1,6 +1,6 @@ package core.basesyntax; -public class Truck extends Machine{ +public class Truck extends Machine { @Override public void doWork() { System.out.println("Truck started working"); @@ -8,6 +8,6 @@ public void doWork() { @Override public void stopWork() { -System.out.println("Truck finished the job"); + System.out.println("Truck finished the job"); } } From d0e253011aa1921fe651a8ebbeeb5bad2874859a Mon Sep 17 00:00:00 2001 From: yevhen Date: Fri, 16 Aug 2024 12:50:58 +0300 Subject: [PATCH 5/6] made changes 21 --- src/main/java/core/basesyntax/Machine.java | 1 + src/main/java/core/basesyntax/MainApp.java | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java index 5a62715c2..cad5be453 100644 --- a/src/main/java/core/basesyntax/Machine.java +++ b/src/main/java/core/basesyntax/Machine.java @@ -2,5 +2,6 @@ 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 b3a7eb063..502b0f928 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -1,14 +1,14 @@ package core.basesyntax; public class MainApp { -public static void MainApp() { - Machine bulldozer = new Bulldozer(); - Machine truck = new Truck(); - Machine excavator = new Excavator(); - Machine[] machines = {bulldozer, truck, excavator}; - for(int i = 0; i < machines.length; i++) { - machines[i].doWork(); - machines[i].stopWork(); - } - } + public static void Main() { + Machine bulldozer = new Bulldozer(); + Machine truck = new Truck(); + Machine excavator = new Excavator(); + Machine[] machines = {bulldozer, truck, excavator}; + for (int i = 0; i < machines.length; i++) { + machines[i].doWork(); + machines[i].stopWork(); + } + } } From 889a1c40ffc0c8b78cc351210ef4c87077ad603d Mon Sep 17 00:00:00 2001 From: yevhen Date: Fri, 16 Aug 2024 12:56:23 +0300 Subject: [PATCH 6/6] made changes 22 --- src/main/java/core/basesyntax/MainApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/core/basesyntax/MainApp.java b/src/main/java/core/basesyntax/MainApp.java index 502b0f928..ccc0f237a 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -1,7 +1,7 @@ package core.basesyntax; public class MainApp { - public static void Main() { + public static void main() { Machine bulldozer = new Bulldozer(); Machine truck = new Truck(); Machine excavator = new Excavator();