From c70ff2b07a6d8d5d9439a1098dbad747ed8e6ffd Mon Sep 17 00:00:00 2001 From: Dima Date: Sun, 22 Sep 2024 22:58:00 +0800 Subject: [PATCH 01/11] Created class Machine --- src/main/java/core/basesyntax/Bulldozer.java | 12 ++++++++++++ src/main/java/core/basesyntax/Excavator.java | 12 ++++++++++++ src/main/java/core/basesyntax/Machine.java | 8 ++++++++ src/main/java/core/basesyntax/MainApp.java | 11 +++++++++++ src/main/java/core/basesyntax/Truck.java | 13 +++++++++++++ 5 files changed, 56 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..8e76ce14f --- /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..ec3db7acd --- /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..926941370 --- /dev/null +++ b/src/main/java/core/basesyntax/Machine.java @@ -0,0 +1,8 @@ +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..f0e820945 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[] 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..b3a64eeb8 --- /dev/null +++ b/src/main/java/core/basesyntax/Truck.java @@ -0,0 +1,13 @@ +package core.basesyntax; + +class Truck extends Machine { + @Override + public void doWork() { + System.out.println("Truck started its work."); + } + + public void stopWork() { + System.out.println("Truck stopped working."); + } +} + From 5d7ff28151cc0ad786f99affbee0c5d2aab07683 Mon Sep 17 00:00:00 2001 From: Dima Date: Sun, 22 Sep 2024 23:07:48 +0800 Subject: [PATCH 02/11] Implement changes --- src/main/java/core/basesyntax/Bulldozer.java | 2 +- src/main/java/core/basesyntax/Excavator.java | 2 +- src/main/java/core/basesyntax/Truck.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java index 8e76ce14f..7fd8697a2 100644 --- a/src/main/java/core/basesyntax/Bulldozer.java +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -7,6 +7,6 @@ public void doWork() { } 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 ec3db7acd..e1aff2b15 100644 --- a/src/main/java/core/basesyntax/Excavator.java +++ b/src/main/java/core/basesyntax/Excavator.java @@ -7,6 +7,6 @@ public void doWork() { } public void stopWork() { - System.out.println("Excavator stopped working."); + System.out.println("Excavator has stopped working."); } } diff --git a/src/main/java/core/basesyntax/Truck.java b/src/main/java/core/basesyntax/Truck.java index b3a64eeb8..63f6fd24b 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -7,7 +7,7 @@ public void doWork() { } public void stopWork() { - System.out.println("Truck stopped working."); + System.out.println("Truck has stopped working."); } } From 28393ccdb8d02fcca11346e7594382e6f54215c9 Mon Sep 17 00:00:00 2001 From: Dima Date: Tue, 24 Sep 2024 21:13:58 +0800 Subject: [PATCH 03/11] Implement changes --- src/main/java/core/basesyntax/Bulldozer.java | 1 - src/main/java/core/basesyntax/Excavator.java | 1 - src/main/java/core/basesyntax/Machine.java | 2 -- 3 files changed, 4 deletions(-) diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java index 7fd8697a2..24fdcad2d 100644 --- a/src/main/java/core/basesyntax/Bulldozer.java +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -1,7 +1,6 @@ package core.basesyntax; public class Bulldozer extends Machine { - public void doWork() { System.out.println("Bulldozer started its work."); } diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java index e1aff2b15..6a50a102f 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 { - public void doWork() { System.out.println("Excavator started its work."); } diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java index 926941370..50b184861 100644 --- a/src/main/java/core/basesyntax/Machine.java +++ b/src/main/java/core/basesyntax/Machine.java @@ -1,8 +1,6 @@ package core.basesyntax; abstract class Machine { - public abstract void doWork(); - public abstract void stopWork(); } From 0015a74ea44dedb4706ee93a5043916bdad369b3 Mon Sep 17 00:00:00 2001 From: Dima Date: Tue, 24 Sep 2024 21:56:13 +0800 Subject: [PATCH 04/11] Implement changes --- src/main/java/core/basesyntax/Machine.java | 2 +- src/main/java/core/basesyntax/Truck.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java index 50b184861..5a62715c2 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 63f6fd24b..0b2f71d7c 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -1,6 +1,6 @@ package core.basesyntax; -class Truck extends Machine { +public class Truck extends Machine { @Override public void doWork() { System.out.println("Truck started its work."); From bff30d983a664847d5a90546870ff0a9399d2d14 Mon Sep 17 00:00:00 2001 From: Dima Date: Tue, 24 Sep 2024 22:00:34 +0800 Subject: [PATCH 05/11] Implement changes --- src/main/java/core/basesyntax/Bulldozer.java | 1 + src/main/java/core/basesyntax/Excavator.java | 1 + src/main/java/core/basesyntax/Machine.java | 1 + src/main/java/core/basesyntax/MainApp.java | 2 ++ src/main/java/core/basesyntax/Truck.java | 1 + 5 files changed, 6 insertions(+) diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java index 24fdcad2d..7fd8697a2 100644 --- a/src/main/java/core/basesyntax/Bulldozer.java +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -1,6 +1,7 @@ package core.basesyntax; public class Bulldozer extends Machine { + public void doWork() { System.out.println("Bulldozer started its work."); } diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java index 6a50a102f..e1aff2b15 100644 --- a/src/main/java/core/basesyntax/Excavator.java +++ b/src/main/java/core/basesyntax/Excavator.java @@ -1,6 +1,7 @@ package core.basesyntax; public class Excavator extends Machine { + public void doWork() { System.out.println("Excavator started its work."); } diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java index 5a62715c2..9116677a1 100644 --- a/src/main/java/core/basesyntax/Machine.java +++ b/src/main/java/core/basesyntax/Machine.java @@ -1,6 +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 f0e820945..691213948 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -1,6 +1,7 @@ package core.basesyntax; public class MainApp { + public static void main(String[] args) { Machine[] machines = { new Truck(), @@ -14,3 +15,4 @@ public static void main(String[] args) { } } } + diff --git a/src/main/java/core/basesyntax/Truck.java b/src/main/java/core/basesyntax/Truck.java index 0b2f71d7c..5f24ab0f7 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -1,6 +1,7 @@ package core.basesyntax; public class Truck extends Machine { + @Override public void doWork() { System.out.println("Truck started its work."); From a205c811aa1eb3ede2dab33f389aabfcfb1ea907 Mon Sep 17 00:00:00 2001 From: Dima Date: Wed, 25 Sep 2024 16:48:57 +0800 Subject: [PATCH 06/11] Implement changes --- src/main/java/core/basesyntax/Machine.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java index 9116677a1..4aea2f871 100644 --- a/src/main/java/core/basesyntax/Machine.java +++ b/src/main/java/core/basesyntax/Machine.java @@ -3,5 +3,6 @@ public abstract class Machine { public abstract void doWork(); + public abstract void stopWork(); } From 657f3fc15781c4b0b06cbbf13e7eb2952715dca6 Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 30 Sep 2024 16:16:23 +0800 Subject: [PATCH 07/11] Implement changes --- src/main/java/core/basesyntax/Bulldozer.java | 1 - src/main/java/core/basesyntax/Excavator.java | 1 - src/main/java/core/basesyntax/Machine.java | 2 -- src/main/java/core/basesyntax/Truck.java | 1 - 4 files changed, 5 deletions(-) diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java index 7fd8697a2..861882c45 100644 --- a/src/main/java/core/basesyntax/Bulldozer.java +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -5,7 +5,6 @@ public class Bulldozer extends Machine { public void doWork() { System.out.println("Bulldozer started its work."); } - 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 e1aff2b15..f973cf5d3 100644 --- a/src/main/java/core/basesyntax/Excavator.java +++ b/src/main/java/core/basesyntax/Excavator.java @@ -5,7 +5,6 @@ public class Excavator extends Machine { public void doWork() { System.out.println("Excavator started its work."); } - public void stopWork() { System.out.println("Excavator has stopped working."); } diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java index 4aea2f871..5a62715c2 100644 --- a/src/main/java/core/basesyntax/Machine.java +++ b/src/main/java/core/basesyntax/Machine.java @@ -1,8 +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/Truck.java b/src/main/java/core/basesyntax/Truck.java index 5f24ab0f7..defc4fce8 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -6,7 +6,6 @@ public class Truck extends Machine { public void doWork() { System.out.println("Truck started its work."); } - public void stopWork() { System.out.println("Truck has stopped working."); } From 55822b736841600d944c3b67c7eef5dfcbf8a903 Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 30 Sep 2024 16:18:05 +0800 Subject: [PATCH 08/11] Implement changes --- src/main/java/core/basesyntax/Bulldozer.java | 1 + src/main/java/core/basesyntax/Excavator.java | 1 + src/main/java/core/basesyntax/Machine.java | 1 + src/main/java/core/basesyntax/Truck.java | 1 + 4 files changed, 4 insertions(+) diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java index 861882c45..7fd8697a2 100644 --- a/src/main/java/core/basesyntax/Bulldozer.java +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -5,6 +5,7 @@ public class Bulldozer extends Machine { public void doWork() { System.out.println("Bulldozer started its work."); } + 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 f973cf5d3..e1aff2b15 100644 --- a/src/main/java/core/basesyntax/Excavator.java +++ b/src/main/java/core/basesyntax/Excavator.java @@ -5,6 +5,7 @@ public class Excavator extends Machine { public void doWork() { System.out.println("Excavator started its work."); } + public void stopWork() { System.out.println("Excavator has stopped working."); } 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/Truck.java b/src/main/java/core/basesyntax/Truck.java index defc4fce8..5f24ab0f7 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -6,6 +6,7 @@ public class Truck extends Machine { public void doWork() { System.out.println("Truck started its work."); } + public void stopWork() { System.out.println("Truck has stopped working."); } From 40a42b83f3480e5a45bd7a1d7164e0df2351dea3 Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 30 Sep 2024 17:05:39 +0800 Subject: [PATCH 09/11] Implement changes --- src/main/java/core/basesyntax/Bulldozer.java | 1 - src/main/java/core/basesyntax/Excavator.java | 1 - src/main/java/core/basesyntax/Machine.java | 1 - src/main/java/core/basesyntax/MainApp.java | 2 -- src/main/java/core/basesyntax/Truck.java | 2 -- 5 files changed, 7 deletions(-) diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java index 7fd8697a2..861882c45 100644 --- a/src/main/java/core/basesyntax/Bulldozer.java +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -5,7 +5,6 @@ public class Bulldozer extends Machine { public void doWork() { System.out.println("Bulldozer started its work."); } - 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 e1aff2b15..f973cf5d3 100644 --- a/src/main/java/core/basesyntax/Excavator.java +++ b/src/main/java/core/basesyntax/Excavator.java @@ -5,7 +5,6 @@ public class Excavator extends Machine { public void doWork() { System.out.println("Excavator started its work."); } - public void stopWork() { System.out.println("Excavator has stopped working."); } diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java index cad5be453..5a62715c2 100644 --- a/src/main/java/core/basesyntax/Machine.java +++ b/src/main/java/core/basesyntax/Machine.java @@ -2,6 +2,5 @@ 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 691213948..603d0b97a 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -1,14 +1,12 @@ 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 index 5f24ab0f7..a2de4b9a3 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -1,12 +1,10 @@ package core.basesyntax; public class Truck extends Machine { - @Override public void doWork() { System.out.println("Truck started its work."); } - public void stopWork() { System.out.println("Truck has stopped working."); } From 2260b17457bdfaeee8ee1cb329a7dfe4aa88f024 Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 30 Sep 2024 22:34:28 +0800 Subject: [PATCH 10/11] Fixed issues --- src/main/java/core/basesyntax/Bulldozer.java | 3 ++- src/main/java/core/basesyntax/Excavator.java | 3 ++- src/main/java/core/basesyntax/MainApp.java | 1 + src/main/java/core/basesyntax/Truck.java | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java index 861882c45..3039f6acb 100644 --- a/src/main/java/core/basesyntax/Bulldozer.java +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -1,10 +1,11 @@ package core.basesyntax; public class Bulldozer extends Machine { - + @Override public void doWork() { System.out.println("Bulldozer started its work."); } + 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 f973cf5d3..af010b19d 100644 --- a/src/main/java/core/basesyntax/Excavator.java +++ b/src/main/java/core/basesyntax/Excavator.java @@ -1,10 +1,11 @@ package core.basesyntax; public class Excavator extends Machine { - + @Override public void doWork() { System.out.println("Excavator started its work."); } + public void stopWork() { System.out.println("Excavator has stopped working."); } diff --git a/src/main/java/core/basesyntax/MainApp.java b/src/main/java/core/basesyntax/MainApp.java index 603d0b97a..a755fa9b2 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -7,6 +7,7 @@ public static void main(String[] args) { 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 index a2de4b9a3..0b2f71d7c 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -5,6 +5,7 @@ public class Truck extends Machine { public void doWork() { System.out.println("Truck started its work."); } + public void stopWork() { System.out.println("Truck has stopped working."); } From f074813cbd998e8432616efa6ca837e2fc3e1d30 Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 30 Sep 2024 22:37:07 +0800 Subject: [PATCH 11/11] Fixed issues --- src/main/java/core/basesyntax/Machine.java | 1 + 1 file changed, 1 insertion(+) 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(); }