From 4f24be5ef3e1ca89d0ae21d217ff4404d77a2ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Wojciechowski?= Date: Fri, 10 Jul 2026 13:56:31 +0200 Subject: [PATCH 1/2] complete jv-oop task --- src/main/java/core/basesyntax/Bulldozer.java | 13 +++++++++++++ src/main/java/core/basesyntax/Excavator.java | 13 +++++++++++++ src/main/java/core/basesyntax/Machine.java | 9 +++++++++ src/main/java/core/basesyntax/MainApp.java | 14 ++++++++++++++ src/main/java/core/basesyntax/Truck.java | 13 +++++++++++++ 5 files changed, 62 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..e584d29e1 --- /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() { + + } + + @Override + public void stopWork() { + + } +} diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java new file mode 100644 index 000000000..90769cbdf --- /dev/null +++ b/src/main/java/core/basesyntax/Excavator.java @@ -0,0 +1,13 @@ +package core.basesyntax; + +public class Excavator extends Machine{ + @Override + public void doWork() { + + } + + @Override + public void stopWork() { + + } +} diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java new file mode 100644 index 000000000..bb31013a4 --- /dev/null +++ b/src/main/java/core/basesyntax/Machine.java @@ -0,0 +1,9 @@ +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..221ddbec8 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -2,4 +2,18 @@ public class MainApp { + public static void main(String[] args) { + Machine truck = new Truck(); + Machine bulldozer = new Bulldozer(); + Machine excavator = new Excavator(); + + Machine[] machines = {truck, bulldozer, 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..36d0c1f38 --- /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() { + + } + + @Override + public void stopWork() { + + } +} From 370d425fb9b9916076fff839f278d79ef7044394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Wojciechowski?= Date: Fri, 10 Jul 2026 14:17:31 +0200 Subject: [PATCH 2/2] fix code style issues --- src/main/java/core/basesyntax/Bulldozer.java | 14 +++++++------- src/main/java/core/basesyntax/Excavator.java | 14 +++++++------- src/main/java/core/basesyntax/Machine.java | 4 ++-- src/main/java/core/basesyntax/MainApp.java | 16 ++++++++-------- src/main/java/core/basesyntax/Truck.java | 14 +++++++------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java index e584d29e1..37ae05449 100644 --- a/src/main/java/core/basesyntax/Bulldozer.java +++ b/src/main/java/core/basesyntax/Bulldozer.java @@ -1,13 +1,13 @@ package core.basesyntax; -public class Bulldozer extends Machine{ - @Override - public void doWork() { +public class Bulldozer extends Machine { + @Override + public void doWork() { - } + } - @Override - public void stopWork() { + @Override + public void stopWork() { - } + } } diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java index 90769cbdf..49f4d9c7f 100644 --- a/src/main/java/core/basesyntax/Excavator.java +++ b/src/main/java/core/basesyntax/Excavator.java @@ -1,13 +1,13 @@ package core.basesyntax; -public class Excavator extends Machine{ - @Override - public void doWork() { +public class Excavator extends Machine { + @Override + public void doWork() { - } + } - @Override - public void stopWork() { + @Override + public void stopWork() { - } + } } diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java index bb31013a4..89cffe858 100644 --- a/src/main/java/core/basesyntax/Machine.java +++ b/src/main/java/core/basesyntax/Machine.java @@ -2,8 +2,8 @@ public abstract class Machine { - public abstract void doWork(); - public abstract void stopWork(); + 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 221ddbec8..268fdc75a 100644 --- a/src/main/java/core/basesyntax/MainApp.java +++ b/src/main/java/core/basesyntax/MainApp.java @@ -3,16 +3,16 @@ public class MainApp { public static void main(String[] args) { - Machine truck = new Truck(); - Machine bulldozer = new Bulldozer(); - Machine excavator = new Excavator(); + Machine truck = new Truck(); + Machine bulldozer = new Bulldozer(); + Machine excavator = new Excavator(); - Machine[] machines = {truck, bulldozer, excavator}; + Machine[] machines = {truck, bulldozer, excavator}; - for (Machine machine : machines) { - machine.doWork(); - machine.stopWork(); - } + 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 36d0c1f38..e1373e59a 100644 --- a/src/main/java/core/basesyntax/Truck.java +++ b/src/main/java/core/basesyntax/Truck.java @@ -1,13 +1,13 @@ package core.basesyntax; -public class Truck extends Machine{ - @Override - public void doWork() { +public class Truck extends Machine { + @Override + public void doWork() { - } + } - @Override - public void stopWork() { + @Override + public void stopWork() { - } + } }