From bae1a8fae296c0d86c6a1b2ee45a923f153fa7cd 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/4] implement solution --- Vehicle.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Vehicle.java b/Vehicle.java index 238f0bf..f1d0926 100644 --- a/Vehicle.java +++ b/Vehicle.java @@ -46,4 +46,5 @@ public String toString() { public static int getNumberOfVehicles() { return Vehicle.numberOfVehicles; } + } From 8b1cfd8e531f9ab8c107f9d2665b2c8cee6e4657 Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Wed, 26 Oct 2022 13:24:59 +0000 Subject: [PATCH 2/4] Google Java Format --- Vehicle.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Vehicle.java b/Vehicle.java index f1d0926..238f0bf 100644 --- a/Vehicle.java +++ b/Vehicle.java @@ -46,5 +46,4 @@ public String toString() { public static int getNumberOfVehicles() { return Vehicle.numberOfVehicles; } - } From f8937b47b5d40d6275c318777483c48968822a46 Mon Sep 17 00:00:00 2001 From: SteffenLm <33038091+SteffenLm@users.noreply.github.com> Date: Thu, 27 Oct 2022 14:07:11 +0200 Subject: [PATCH 3/4] implement solution --- Car.java | 23 +++++++++++++++++++++++ Engine.java | 2 +- Exercise.java | 15 ++++++++++++--- Truck.java | 31 +++++++++++++++++++++++++++++++ Vehicle.java | 2 +- 5 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 Car.java create mode 100644 Truck.java diff --git a/Car.java b/Car.java new file mode 100644 index 0000000..ca1d82c --- /dev/null +++ b/Car.java @@ -0,0 +1,23 @@ +public class Car extends Vehicle { + + private final int seats; + + public Car(String make, String model, Engine engine, int seats) { + super(make, model, engine); + this.seats = seats; + } + + public int getSeats() { + return seats; + } + + public void doATurboBoost() { + speedInKmh *= 2; + System.out.println( + getMake() + " " + getModel() + " macht einen Turboboost und beschleunigt auf " + speedInKmh + " km/h"); + } + + public String toString() { + return getMake() + " " + getModel() + " (" + getEngine().getDescription() + ", " + seats + " Sitzplaetze)"; + } +} 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/Exercise.java b/Exercise.java index f3b80e5..8255262 100644 --- a/Exercise.java +++ b/Exercise.java @@ -3,10 +3,19 @@ public class Exercise { public static void main(String[] args) { System.out.println("Anzahl Fahrzeuge: " + Vehicle.getNumberOfVehicles()); - 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); + 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(car1.toString()); + System.out.println(truck1.toString()); + System.out.println(car2.toString()); + + car1.accelerate(50); + truck1.transform(); + car1.doATurboBoost(); + truck1.transform(); } } diff --git a/Truck.java b/Truck.java new file mode 100644 index 0000000..c6f82c7 --- /dev/null +++ b/Truck.java @@ -0,0 +1,31 @@ +public class Truck extends Vehicle { + + private final int cargo; + private boolean isTransformed; + + public Truck(String make, String model, Engine engine, int cargo) { + super(make, model, engine); + this.cargo = cargo; + } + + public int getCargo() { + return cargo; + } + + public boolean isTransformed() { + return isTransformed; + } + + public void transform() { + if (isTransformed) { + System.out.println(getMake() + " " + getModel() + " verwandelt sich in einen Lastwagen zurueck"); + } else { + System.out.println(getMake() + " " + getModel() + " verwandelt sich in einen Autobot"); + } + isTransformed = !isTransformed; + } + + public String toString() { + return getMake() + " " + getModel() + " (" + getEngine().getDescription() + ", " + cargo + "t)"; + } +} diff --git a/Vehicle.java b/Vehicle.java index 238f0bf..216451f 100644 --- a/Vehicle.java +++ b/Vehicle.java @@ -2,7 +2,7 @@ public class Vehicle { private String make; private String model; - private double speedInKmh; + protected double speedInKmh; private Engine engine; private static int numberOfVehicles; From 4d0daea6bc2439dc8c3c5716333eb7753d451d75 Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Wed, 21 Feb 2024 22:30:42 +0000 Subject: [PATCH 4/4] Google Java Format --- Car.java | 16 ++++++++++++++-- Truck.java | 3 ++- 2 files changed, 16 insertions(+), 3 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/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"); }