From bf4a94dd1d0c9c47b5e11160adc698154aec3008 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/7] implement solution --- Vehicle.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Vehicle.java b/Vehicle.java index 216451f..d1c9f1d 100644 --- a/Vehicle.java +++ b/Vehicle.java @@ -46,4 +46,5 @@ public String toString() { public static int getNumberOfVehicles() { return Vehicle.numberOfVehicles; } + } From aad2791ba7c7a70ff35cdc0fb769bdae4b4e6476 Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Wed, 26 Oct 2022 13:24:59 +0000 Subject: [PATCH 2/7] Google Java Format --- Vehicle.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Vehicle.java b/Vehicle.java index d1c9f1d..216451f 100644 --- a/Vehicle.java +++ b/Vehicle.java @@ -46,5 +46,4 @@ public String toString() { public static int getNumberOfVehicles() { return Vehicle.numberOfVehicles; } - } From 215cab427d46dc7b55ed6db872d939c84d747a74 Mon Sep 17 00:00:00 2001 From: SteffenLm <33038091+SteffenLm@users.noreply.github.com> Date: Thu, 27 Oct 2022 14:17:38 +0200 Subject: [PATCH 3/7] implement solution --- Exercise.java | 7 ++++++- Rental.java | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 Rental.java diff --git a/Exercise.java b/Exercise.java index 8255262..0918da5 100644 --- a/Exercise.java +++ b/Exercise.java @@ -1,7 +1,7 @@ public class Exercise { public static void main(String[] args) { - System.out.println("Anzahl Fahrzeuge: " + Vehicle.getNumberOfVehicles()); + Rental rental = new Rental("Fahrzeugvermietung Mueller"); Car car1 = new Car("Porsche", "911", Engine.ELECTRO, 2); Truck truck1 = new Truck("MAN", "TGX", Engine.DIESEL, 20); @@ -17,5 +17,10 @@ public static void main(String[] args) { truck1.transform(); car1.doATurboBoost(); truck1.transform(); + rental.addVehicle(car1); + rental.addVehicle(truck1); + rental.addVehicle(car2); + + rental.print(); } } diff --git a/Rental.java b/Rental.java new file mode 100644 index 0000000..efa0100 --- /dev/null +++ b/Rental.java @@ -0,0 +1,39 @@ +import java.util.ArrayList; + +public class Rental { + + private String name; + private ArrayList vehicles; + + public Rental(String name) { + this.name = name; + vehicles = new ArrayList<>(); + } + + public void addVehicle(Vehicle vehicle) { + vehicles.add(vehicle); + } + + public void addAllVehicles(Vehicle... vehicles) { + for (Vehicle v : vehicles) { + this.vehicles.add(v); + } + } + + public void transformAllTrucks() { + for (Vehicle c : vehicles) { + if (c instanceof Truck) { + Truck t = (Truck) c; + t.transform(); + } + } + } + + public void print() { + System.out.println(name); + System.out.println("Unsere Fahrzeuge: "); + for (Vehicle v : vehicles) { + v.print(); + } + } +} From 2223d69ef1b20026aa1fd198e30589f2f26707d1 Mon Sep 17 00:00:00 2001 From: SteffenLm <33038091+SteffenLm@users.noreply.github.com> Date: Thu, 27 Oct 2022 14:23:45 +0200 Subject: [PATCH 4/7] remove method --- Rental.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Rental.java b/Rental.java index efa0100..c30320c 100644 --- a/Rental.java +++ b/Rental.java @@ -20,15 +20,6 @@ public void addAllVehicles(Vehicle... vehicles) { } } - public void transformAllTrucks() { - for (Vehicle c : vehicles) { - if (c instanceof Truck) { - Truck t = (Truck) c; - t.transform(); - } - } - } - public void print() { System.out.println(name); System.out.println("Unsere Fahrzeuge: "); From 97f926c7781a5779af27ea2e7cfe6a78ceea55fe Mon Sep 17 00:00:00 2001 From: SteffenLm <33038091+SteffenLm@users.noreply.github.com> Date: Wed, 21 Feb 2024 23:54:49 +0100 Subject: [PATCH 5/7] implement soluton --- Exercise.java | 36 ++++++++++++++++++------------------ Rental.java | 19 ++++++++++++++----- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/Exercise.java b/Exercise.java index 0918da5..abb0d11 100644 --- a/Exercise.java +++ b/Exercise.java @@ -1,26 +1,26 @@ public class Exercise { - public static void main(String[] args) { - Rental rental = new Rental("Fahrzeugvermietung Mueller"); + public static void main(String[] args) { + Rental rental = new Rental("Fahrzeugvermietung Mueller"); - Car car1 = new Car("Porsche", "911", Engine.ELECTRO, 2); - Truck truck1 = new Truck("MAN", "TGX", Engine.DIESEL, 20); - Car car2 = new Car("Opel", "Zafira Life", Engine.DIESEL, 7); + Car car1 = new Car("Porsche", "911", Engine.ELECTRO, 2); + Truck truck1 = new Truck("MAN", "TGX", Engine.DIESEL, 20); + Car car2 = new Car("Opel", "Zafira Life", Engine.DIESEL, 7); - System.out.println("Anzahl Fahrzeuge: " + Vehicle.getNumberOfVehicles()); + System.out.println("Anzahl Fahrzeuge: " + Vehicle.getNumberOfVehicles()); - System.out.println(car1.toString()); - System.out.println(truck1.toString()); - System.out.println(car2.toString()); + System.out.println(car1.toString()); + System.out.println(truck1.toString()); + System.out.println(car2.toString()); - car1.accelerate(50); - truck1.transform(); - car1.doATurboBoost(); - truck1.transform(); - rental.addVehicle(car1); - rental.addVehicle(truck1); - rental.addVehicle(car2); + car1.accelerate(50); + truck1.transform(); + car1.doATurboBoost(); + truck1.transform(); + rental.addVehicle(car1); + rental.addVehicle(truck1); + rental.addVehicle(car2); - rental.print(); - } + System.out.println(rental.toString()); + } } diff --git a/Rental.java b/Rental.java index c30320c..f743221 100644 --- a/Rental.java +++ b/Rental.java @@ -10,6 +10,14 @@ public Rental(String name) { vehicles = new ArrayList<>(); } + public String getName() { + return name; + } + + public ArrayList getVehicles() { + return vehicles; + } + public void addVehicle(Vehicle vehicle) { vehicles.add(vehicle); } @@ -20,11 +28,12 @@ public void addAllVehicles(Vehicle... vehicles) { } } - public void print() { - System.out.println(name); - System.out.println("Unsere Fahrzeuge: "); - for (Vehicle v : vehicles) { - v.print(); + public String toString() { + String result = name + "\n" + + "Unsere Fahrzeuge: \n"; + for (Vehicle vehicle : vehicles) { + result += vehicle.toString() + "\n"; } + return result; } } From 7d4a30d26539e1bc08a3043091b802f4596ee8ff Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Wed, 21 Feb 2024 22:55:12 +0000 Subject: [PATCH 6/7] Google Java Format --- Car.java | 16 ++++++++++++++-- Exercise.java | 36 ++++++++++++++++++------------------ Rental.java | 3 +-- Truck.java | 3 ++- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/Car.java b/Car.java index ca1d82c..3b6e6bf 100644 --- a/Car.java +++ b/Car.java @@ -14,10 +14,22 @@ public int getSeats() { public void doATurboBoost() { speedInKmh *= 2; System.out.println( - getMake() + " " + getModel() + " macht einen Turboboost und beschleunigt auf " + speedInKmh + " km/h"); + getMake() + + " " + + getModel() + + " macht einen Turboboost und beschleunigt auf " + + speedInKmh + + " km/h"); } public String toString() { - return getMake() + " " + getModel() + " (" + getEngine().getDescription() + ", " + seats + " Sitzplaetze)"; + return getMake() + + " " + + getModel() + + " (" + + getEngine().getDescription() + + ", " + + seats + + " Sitzplaetze)"; } } diff --git a/Exercise.java b/Exercise.java index abb0d11..2d4d392 100644 --- a/Exercise.java +++ b/Exercise.java @@ -1,26 +1,26 @@ public class Exercise { - public static void main(String[] args) { - Rental rental = new Rental("Fahrzeugvermietung Mueller"); + public static void main(String[] args) { + Rental rental = new Rental("Fahrzeugvermietung Mueller"); - Car car1 = new Car("Porsche", "911", Engine.ELECTRO, 2); - Truck truck1 = new Truck("MAN", "TGX", Engine.DIESEL, 20); - Car car2 = new Car("Opel", "Zafira Life", Engine.DIESEL, 7); + Car car1 = new Car("Porsche", "911", Engine.ELECTRO, 2); + Truck truck1 = new Truck("MAN", "TGX", Engine.DIESEL, 20); + Car car2 = new Car("Opel", "Zafira Life", Engine.DIESEL, 7); - System.out.println("Anzahl Fahrzeuge: " + Vehicle.getNumberOfVehicles()); + System.out.println("Anzahl Fahrzeuge: " + Vehicle.getNumberOfVehicles()); - System.out.println(car1.toString()); - System.out.println(truck1.toString()); - System.out.println(car2.toString()); + System.out.println(car1.toString()); + System.out.println(truck1.toString()); + System.out.println(car2.toString()); - car1.accelerate(50); - truck1.transform(); - car1.doATurboBoost(); - truck1.transform(); - rental.addVehicle(car1); - rental.addVehicle(truck1); - rental.addVehicle(car2); + car1.accelerate(50); + truck1.transform(); + car1.doATurboBoost(); + truck1.transform(); + rental.addVehicle(car1); + rental.addVehicle(truck1); + rental.addVehicle(car2); - System.out.println(rental.toString()); - } + System.out.println(rental.toString()); + } } diff --git a/Rental.java b/Rental.java index f743221..58df918 100644 --- a/Rental.java +++ b/Rental.java @@ -29,8 +29,7 @@ public void addAllVehicles(Vehicle... vehicles) { } public String toString() { - String result = name + "\n" - + "Unsere Fahrzeuge: \n"; + String result = name + "\n" + "Unsere Fahrzeuge: \n"; for (Vehicle vehicle : vehicles) { result += vehicle.toString() + "\n"; } diff --git a/Truck.java b/Truck.java index c6f82c7..ae110f6 100644 --- a/Truck.java +++ b/Truck.java @@ -18,7 +18,8 @@ public boolean isTransformed() { public void transform() { if (isTransformed) { - System.out.println(getMake() + " " + getModel() + " verwandelt sich in einen Lastwagen zurueck"); + System.out.println( + getMake() + " " + getModel() + " verwandelt sich in einen Lastwagen zurueck"); } else { System.out.println(getMake() + " " + getModel() + " verwandelt sich in einen Autobot"); } From 487025ce567620a5d593cc9a335d5163fe4b767a Mon Sep 17 00:00:00 2001 From: SteffenLm <33038091+SteffenLm@users.noreply.github.com> Date: Thu, 22 Feb 2024 00:01:33 +0100 Subject: [PATCH 7/7] fix final --- Rental.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rental.java b/Rental.java index 58df918..218eb37 100644 --- a/Rental.java +++ b/Rental.java @@ -2,8 +2,8 @@ public class Rental { - private String name; - private ArrayList vehicles; + private final String name; + private final ArrayList vehicles; public Rental(String name) { this.name = name;