From b07668b8c4d33651b72136d7b28c6813ef7770d0 Mon Sep 17 00:00:00 2001
From: SteffenLm <33038091+SteffenLm@users.noreply.github.com>
Date: Wed, 26 Oct 2022 15:24:42 +0200
Subject: [PATCH 1/5] implement solution

---
 Engine.java   | 18 ++++++++++++++++++
 Exercise.java |  7 +++----
 Vehicle.java  |  9 ++++++++-
 3 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 Engine.java

diff --git a/Engine.java b/Engine.java
new file mode 100644
index 0000000..dc7e7e7
--- /dev/null
+++ b/Engine.java
@@ -0,0 +1,18 @@
+public enum Engine {
+
+  DIESEL("Diesel"),
+  PETROL("Benzin"),
+  GAS("Gas"),
+  ELECTRO("Elektro");
+
+  private String description;
+
+  Engine(String description) {
+    this.description = description;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+}
diff --git a/Exercise.java b/Exercise.java
index 7987eca..f3b80e5 100644
--- a/Exercise.java
+++ b/Exercise.java
@@ -3,10 +3,9 @@ public class Exercise {
   public static void main(String[] args) {
     System.out.println("Anzahl Fahrzeuge: " + Vehicle.getNumberOfVehicles());
 
-    Vehicle vehicle = new Vehicle("Porsche", "911");
-    Vehicle vehicle1 = new Vehicle("Porsche", "911");
-    Vehicle vehicle2 = new Vehicle("MAN", "TGX");
-    Vehicle vehicle3 = new Vehicle("Opel", "Zafira Life");
+    Vehicle vehicle1 = new Vehicle("Porsche", "911", Engine.ELECTRO);
+    Vehicle vehicle2 = new Vehicle("MAN", "TGX", Engine.DIESEL);
+    Vehicle vehicle3 = new Vehicle("Opel", "Zafira Life", Engine.DIESEL);
 
     System.out.println("Anzahl Fahrzeuge: " + Vehicle.getNumberOfVehicles());
   }
diff --git a/Vehicle.java b/Vehicle.java
index 19b4112..7bb6952 100644
--- a/Vehicle.java
+++ b/Vehicle.java
@@ -3,12 +3,14 @@ public class Vehicle {
   private String make;
   private String model;
   private double speedInKmh;
+  private Engine engine;
   private static int numberOfVehicles;
 
-  public Vehicle(String make, String model) {
+  public Vehicle(String make, String model, Engine engine) {
     this.make = make;
     this.model = model;
     Vehicle.numberOfVehicles++;
+    this.engine = engine;
   }
 
   public String getMake() {
@@ -23,6 +25,10 @@ public double getSpeedInKmh() {
     return speedInKmh;
   }
 
+  public Engine getEngine() {
+    return engine;
+  }
+
   public static int getNumberOfVehicles() {
     return Vehicle.numberOfVehicles;
   }
@@ -40,4 +46,5 @@ public void brake(int valueInKmh) {
   public String toString() {
     return make + " " + model;
   }
+
 }

From 712ae074eac605a6e81fc7854b5b0bfffbb45f3d Mon Sep 17 00:00:00 2001
From: github-actions <>
Date: Wed, 26 Oct 2022 13:24:59 +0000
Subject: [PATCH 2/5] Google Java Format

---
 Engine.java  | 2 --
 Vehicle.java | 1 -
 2 files changed, 3 deletions(-)

diff --git a/Engine.java b/Engine.java
index dc7e7e7..ffc88a7 100644
--- a/Engine.java
+++ b/Engine.java
@@ -1,5 +1,4 @@
 public enum Engine {
-
   DIESEL("Diesel"),
   PETROL("Benzin"),
   GAS("Gas"),
@@ -14,5 +13,4 @@ public enum Engine {
   public String getDescription() {
     return description;
   }
-
 }
diff --git a/Vehicle.java b/Vehicle.java
index 7bb6952..168e189 100644
--- a/Vehicle.java
+++ b/Vehicle.java
@@ -46,5 +46,4 @@ public void brake(int valueInKmh) {
   public String toString() {
     return make + " " + model;
   }
-
 }

From c3453ebb59d9ee94a7143f8fe2e49e2b3d7f96b7 Mon Sep 17 00:00:00 2001
From: SteffenLm <33038091+SteffenLm@users.noreply.github.com>
Date: Wed, 21 Feb 2024 22:11:45 +0100
Subject: [PATCH 3/5] Fix Solution

---
 Vehicle.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Vehicle.java b/Vehicle.java
index 168e189..238f0bf 100644
--- a/Vehicle.java
+++ b/Vehicle.java
@@ -21,16 +21,12 @@ public String getModel() {
     return model;
   }
 
-  public double getSpeedInKmh() {
-    return speedInKmh;
-  }
-
   public Engine getEngine() {
     return engine;
   }
 
-  public static int getNumberOfVehicles() {
-    return Vehicle.numberOfVehicles;
+  public double getSpeedInKmh() {
+    return speedInKmh;
   }
 
   public void accelerate(int valueInKmh) {
@@ -46,4 +42,8 @@ public void brake(int valueInKmh) {
   public String toString() {
     return make + " " + model;
   }
+
+  public static int getNumberOfVehicles() {
+    return Vehicle.numberOfVehicles;
+  }
 }

From 9bfa34f37a715db26f6627c01a33357c3f834e15 Mon Sep 17 00:00:00 2001
From: SteffenLm <33038091+SteffenLm@users.noreply.github.com>
Date: Fri, 23 Feb 2024 20:06:24 +0100
Subject: [PATCH 4/5] adjust solution

---
 Exercise.java | 4 ++++
 Vehicle.java  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Exercise.java b/Exercise.java
index f3b80e5..a86eff8 100644
--- a/Exercise.java
+++ b/Exercise.java
@@ -7,6 +7,10 @@ public static void main(String[] args) {
     Vehicle vehicle2 = new Vehicle("MAN", "TGX", Engine.DIESEL);
     Vehicle vehicle3 = new Vehicle("Opel", "Zafira Life", Engine.DIESEL);
 
+    System.out.println(vehicle1.toString());
+    System.out.println(vehicle2.toString());
+    System.out.println(vehicle3.toString());
+
     System.out.println("Anzahl Fahrzeuge: " + Vehicle.getNumberOfVehicles());
   }
 }
diff --git a/Vehicle.java b/Vehicle.java
index 238f0bf..7665b3c 100644
--- a/Vehicle.java
+++ b/Vehicle.java
@@ -40,7 +40,7 @@ public void brake(int valueInKmh) {
   }
 
   public String toString() {
-    return make + " " + model;
+    return getMake() + " " + getModel() + " (" + getEngine().getDescription() + ")";
   }
 
   public static int getNumberOfVehicles() {

From 5a82eebf3b7f9add4607a346cbfa8299c9ecb5ac Mon Sep 17 00:00:00 2001
From: SteffenLm <33038091+SteffenLm@users.noreply.github.com>
Date: Fri, 14 Feb 2025 14:18:36 +0100
Subject: [PATCH 5/5] adjust solutoin

---
 Engine.java  | 2 +-
 Vehicle.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Engine.java b/Engine.java
index ffc88a7..5f2aea9 100644
--- a/Engine.java
+++ b/Engine.java
@@ -4,7 +4,7 @@ public enum Engine {
   GAS("Gas"),
   ELECTRO("Elektro");
 
-  private String description;
+  private final String description;
 
   Engine(String description) {
     this.description = description;
diff --git a/Vehicle.java b/Vehicle.java
index 7665b3c..7889629 100644
--- a/Vehicle.java
+++ b/Vehicle.java
@@ -1,9 +1,9 @@
 public class Vehicle {
 
-  private String make;
-  private String model;
+  private final String make;
+  private final String model;
   private double speedInKmh;
-  private Engine engine;
+  private final Engine engine;
   private static int numberOfVehicles;
 
   public Vehicle(String make, String model, Engine engine) {