From 47e3b251d54eb007e84e917338888c51bd7364e9 Mon Sep 17 00:00:00 2001
From: Bohdan <111230201+FireFalcons@users.noreply.github.com>
Date: Thu, 22 Aug 2024 15:22:55 +0300
Subject: [PATCH 1/6] =?UTF-8?q?created=20classes,=20overridden=20abstract?=
 =?UTF-8?q?=20methods,=20and=20created=20an=20array=20of=20class=20data?=
 =?UTF-8?q?=C3=91=C3=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/core/basesyntax/Bulldozer.java | 14 ++++++++++++++
 src/main/java/core/basesyntax/Excavator.java | 15 +++++++++++++++
 src/main/java/core/basesyntax/Machine.java   |  6 ++++++
 src/main/java/core/basesyntax/MainApp.java   | 12 +++++++++++-
 src/main/java/core/basesyntax/Truck.java     | 14 ++++++++++++++
 5 files changed, 60 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..550f26c61
--- /dev/null
+++ b/src/main/java/core/basesyntax/Bulldozer.java
@@ -0,0 +1,14 @@
+package core.basesyntax;
+
+public class Bulldozer extends Machine{
+
+    @Override
+    public void doWork() {
+        System.out.println("the bulldozer started it`s work");
+    }
+
+    @Override
+    public void stopWork() {
+        System.out.println("the bulldozer stopped it`s 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..168ca2cf0
--- /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("the excavator started it`s work");
+
+    }
+
+    @Override
+    public void stopWork() {
+        System.out.println("the excavator stopped it`s 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..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..ac40c3410 100644
--- a/src/main/java/core/basesyntax/MainApp.java
+++ b/src/main/java/core/basesyntax/MainApp.java
@@ -1,5 +1,15 @@
 package core.basesyntax;
-
 public class MainApp {
+    public static void main(String[] args) {
+        Machine truck = new Truck();
+        Machine bulldozer = new Bulldozer();
+        Machine excavator = new Excavator();
+        Machine[] machine = {truck, bulldozer, excavator};
 
+        for (Machine m : machine) {
+            m.doWork();
+            m.stopWork();
+            System.out.println();
+        }
+    }
 }
diff --git a/src/main/java/core/basesyntax/Truck.java b/src/main/java/core/basesyntax/Truck.java
new file mode 100644
index 000000000..7a087e4d7
--- /dev/null
+++ b/src/main/java/core/basesyntax/Truck.java
@@ -0,0 +1,14 @@
+package core.basesyntax;
+
+public class Truck extends Machine{
+
+    @Override
+    public void doWork() {
+        System.out.println("the truck started it`s work");
+    }
+
+    @Override
+    public void stopWork() {
+        System.out.println("the truck stopped it`s work");
+    }
+}

From 11ab46d387d56bafbb641b6f97190a42c4329354 Mon Sep 17 00:00:00 2001
From: Bohdan <111230201+FireFalcons@users.noreply.github.com>
Date: Thu, 22 Aug 2024 15:44:39 +0300
Subject: [PATCH 2/6] added fixed after review

---
 src/main/java/core/basesyntax/Bulldozer.java | 8 +++-----
 src/main/java/core/basesyntax/Excavator.java | 7 ++-----
 src/main/java/core/basesyntax/Machine.java   | 1 -
 src/main/java/core/basesyntax/MainApp.java   | 5 +++--
 src/main/java/core/basesyntax/Truck.java     | 8 +++-----
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java
index 550f26c61..ec584d552 100644
--- a/src/main/java/core/basesyntax/Bulldozer.java
+++ b/src/main/java/core/basesyntax/Bulldozer.java
@@ -1,14 +1,12 @@
 package core.basesyntax;
-
-public class Bulldozer extends Machine{
-
+public class Bulldozer extends Machine {
     @Override
     public void doWork() {
-        System.out.println("the bulldozer started it`s work");
+        System.out.println("Bulldozer started it's work");
     }
 
     @Override
     public void stopWork() {
-        System.out.println("the bulldozer stopped it`s work");
+        System.out.println("Bulldozer stopped it's work");
     }
 }
diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java
index 168ca2cf0..a955cefc8 100644
--- a/src/main/java/core/basesyntax/Excavator.java
+++ b/src/main/java/core/basesyntax/Excavator.java
@@ -1,15 +1,12 @@
 package core.basesyntax;
-
 public class Excavator extends Machine {
-
     @Override
     public void doWork() {
-        System.out.println("the excavator started it`s work");
-
+        System.out.println("Excavator started it's work");
     }
 
     @Override
     public void stopWork() {
-        System.out.println("the excavator stopped it`s work");
+        System.out.println("Excavator stopped it's work");
     }
 }
diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java
index 5a62715c2..584a9aaeb 100644
--- a/src/main/java/core/basesyntax/Machine.java
+++ b/src/main/java/core/basesyntax/Machine.java
@@ -1,5 +1,4 @@
 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 ac40c3410..ca5bd2597 100644
--- a/src/main/java/core/basesyntax/MainApp.java
+++ b/src/main/java/core/basesyntax/MainApp.java
@@ -1,12 +1,13 @@
 package core.basesyntax;
 public class MainApp {
     public static void main(String[] args) {
+
         Machine truck = new Truck();
         Machine bulldozer = new Bulldozer();
         Machine excavator = new Excavator();
-        Machine[] machine = {truck, bulldozer, excavator};
+        Machine[] machines = {truck, bulldozer, excavator};
 
-        for (Machine m : machine) {
+        for (Machine m : machines) {
             m.doWork();
             m.stopWork();
             System.out.println();
diff --git a/src/main/java/core/basesyntax/Truck.java b/src/main/java/core/basesyntax/Truck.java
index 7a087e4d7..b6d77300c 100644
--- a/src/main/java/core/basesyntax/Truck.java
+++ b/src/main/java/core/basesyntax/Truck.java
@@ -1,14 +1,12 @@
 package core.basesyntax;
-
-public class Truck extends Machine{
-
+public class Truck extends Machine {
     @Override
     public void doWork() {
-        System.out.println("the truck started it`s work");
+        System.out.println("Truck started it's work");
     }
 
     @Override
     public void stopWork() {
-        System.out.println("the truck stopped it`s work");
+        System.out.println("Truck stopped it's work");
     }
 }

From b0bae410d49712a1d1302b46fa6dc320dbcfd4a8 Mon Sep 17 00:00:00 2001
From: Bohdan <111230201+FireFalcons@users.noreply.github.com>
Date: Thu, 22 Aug 2024 15:57:09 +0300
Subject: [PATCH 3/6] fixed the mistakes after rewatching

---
 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   | 9 ++++-----
 src/main/java/core/basesyntax/Truck.java     | 1 +
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/core/basesyntax/Bulldozer.java b/src/main/java/core/basesyntax/Bulldozer.java
index ec584d552..2d3f5dc06 100644
--- a/src/main/java/core/basesyntax/Bulldozer.java
+++ b/src/main/java/core/basesyntax/Bulldozer.java
@@ -1,4 +1,5 @@
 package core.basesyntax;
+
 public class Bulldozer extends Machine {
     @Override
     public void doWork() {
diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java
index a955cefc8..076ad39cc 100644
--- a/src/main/java/core/basesyntax/Excavator.java
+++ b/src/main/java/core/basesyntax/Excavator.java
@@ -1,4 +1,5 @@
 package core.basesyntax;
+
 public class Excavator extends Machine {
     @Override
     public void doWork() {
diff --git a/src/main/java/core/basesyntax/Machine.java b/src/main/java/core/basesyntax/Machine.java
index 584a9aaeb..5a62715c2 100644
--- a/src/main/java/core/basesyntax/Machine.java
+++ b/src/main/java/core/basesyntax/Machine.java
@@ -1,4 +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 ca5bd2597..a5f00f7b1 100644
--- a/src/main/java/core/basesyntax/MainApp.java
+++ b/src/main/java/core/basesyntax/MainApp.java
@@ -1,16 +1,15 @@
 package core.basesyntax;
+
 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 m : machines) {
-            m.doWork();
-            m.stopWork();
-            System.out.println();
+        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 b6d77300c..0c2220a46 100644
--- a/src/main/java/core/basesyntax/Truck.java
+++ b/src/main/java/core/basesyntax/Truck.java
@@ -1,4 +1,5 @@
 package core.basesyntax;
+
 public class Truck extends Machine {
     @Override
     public void doWork() {

From 29109a86197a062c8f6e4677ecdd06310583fdf7 Mon Sep 17 00:00:00 2001
From: Bohdan <111230201+FireFalcons@users.noreply.github.com>
Date: Thu, 22 Aug 2024 16:09:29 +0300
Subject: [PATCH 4/6] fixed errors in in MainApp and Machine classes

---
 src/main/java/core/basesyntax/Machine.java     | 1 +
 src/main/java/core/basesyntax/MainApp.java     | 2 +-
 src/test/java/core/basesyntax/MainAppTest.java | 4 +---
 3 files changed, 3 insertions(+), 4 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 a5f00f7b1..1045b91ba 100644
--- a/src/main/java/core/basesyntax/MainApp.java
+++ b/src/main/java/core/basesyntax/MainApp.java
@@ -7,7 +7,7 @@ public static void main(String[] args) {
         Machine excavator = new Excavator();
         Machine[] machines = {truck, bulldozer, excavator};
 
-        for (Machine machine: machines){
+        for (Machine machine: machines) {
             machine.doWork();
             machine.stopWork();
         }
diff --git a/src/test/java/core/basesyntax/MainAppTest.java b/src/test/java/core/basesyntax/MainAppTest.java
index 2f91cdabd..320531a9d 100644
--- a/src/test/java/core/basesyntax/MainAppTest.java
+++ b/src/test/java/core/basesyntax/MainAppTest.java
@@ -1,5 +1,3 @@
 package core.basesyntax;
 
-public class MainAppTest {
-
-}
\ No newline at end of file
+public class MainAppTest {}
\ No newline at end of file

From bde023b9c01522547423ff21cd257741791d6807 Mon Sep 17 00:00:00 2001
From: Bohdan <111230201+FireFalcons@users.noreply.github.com>
Date: Thu, 22 Aug 2024 21:47:10 +0300
Subject: [PATCH 5/6] shortened the code in MainApp class

---
 src/main/java/core/basesyntax/MainApp.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/core/basesyntax/MainApp.java b/src/main/java/core/basesyntax/MainApp.java
index 1045b91ba..a8981aa8e 100644
--- a/src/main/java/core/basesyntax/MainApp.java
+++ b/src/main/java/core/basesyntax/MainApp.java
@@ -2,10 +2,11 @@
 
 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};
+        Machine[] machines = {
+                new Truck(),
+                new Bulldozer(),
+                new Excavator()
+        };
 
         for (Machine machine: machines) {
             machine.doWork();

From 77d4451798ff9790ec545407a05e6312666ec16d Mon Sep 17 00:00:00 2001
From: Bohdan <111230201+FireFalcons@users.noreply.github.com>
Date: Sat, 24 Aug 2024 12:06:05 +0300
Subject: [PATCH 6/6] fixes style

---
 src/main/java/core/basesyntax/Excavator.java | 1 +
 src/main/java/core/basesyntax/MainApp.java   | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/core/basesyntax/Excavator.java b/src/main/java/core/basesyntax/Excavator.java
index 076ad39cc..9cd3c08d0 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 {
+
     @Override
     public void doWork() {
         System.out.println("Excavator started it's work");
diff --git a/src/main/java/core/basesyntax/MainApp.java b/src/main/java/core/basesyntax/MainApp.java
index a8981aa8e..97f640578 100644
--- a/src/main/java/core/basesyntax/MainApp.java
+++ b/src/main/java/core/basesyntax/MainApp.java
@@ -1,14 +1,15 @@
 package core.basesyntax;
 
 public class MainApp {
+
     public static void main(String[] args) {
         Machine[] machines = {
-                new Truck(),
-                new Bulldozer(),
-                new Excavator()
+            new Truck(),
+            new Bulldozer(),
+            new Excavator()
         };
 
-        for (Machine machine: machines) {
+        for (Machine machine : machines) {
             machine.doWork();
             machine.stopWork();
         }