diff --git a/src/main/java/org/model/Car.java b/src/main/java/org/model/Car.java index 03b46e5..5d23953 100644 --- a/src/main/java/org/model/Car.java +++ b/src/main/java/org/model/Car.java @@ -59,6 +59,7 @@ public abstract class Car extends Vehicle implements Serviceable { @Override public boolean needsService(Vehicle v) { + return v.getMileage() > 10000; } diff --git a/src/main/java/org/model/ElectricCar.java b/src/main/java/org/model/ElectricCar.java index 78c8a35..d67fb5f 100644 --- a/src/main/java/org/model/ElectricCar.java +++ b/src/main/java/org/model/ElectricCar.java @@ -68,7 +68,7 @@ public class ElectricCar extends Car implements Chargeable { @Override public boolean needsService(Vehicle v) { - return super.needsService(v) || chargeLevel < 100; + return super.needsService(v); } @Override diff --git a/src/main/java/org/model/GasCar.java b/src/main/java/org/model/GasCar.java index 5225958..be787be 100644 --- a/src/main/java/org/model/GasCar.java +++ b/src/main/java/org/model/GasCar.java @@ -70,7 +70,7 @@ public class GasCar extends Car implements Refuelable { @Override public boolean needsService(Vehicle v) { - return v.getMileage() > 10000 || fuelLevel < 100; + return super.needsService(v); } @Override