Complete project with HybridCar bonus

This commit is contained in:
2026-04-28 13:34:36 +03:30
parent 6cb8f9a8d8
commit 90285184dd
8 changed files with 263 additions and 204 deletions
+26 -27
View File
@@ -1,41 +1,40 @@
package org.model;
/*
* Car extends Vehicle.
* This class SHOULD implement Serviceable.
*
* Service logic for Car:
* - needsService(): return true if mileage > 10,000
* - performService(): print "General car service completed"
*/
import org.behavior.Serviceable;
public abstract class Car extends Vehicle implements Serviceable {
private int seats;
public Car(String brand, String model, int year,
double mileage, int seats) {
// TODO: Call super constructor
public Car(String brand, String model, int year, double mileage, int seats) {
super(brand , model , year , mileage);
this.seats = seats;
}
// TODO: Override getEnergyType() → return "Unknown"
@Override
public String getEnergyType() {
return "Unknown";
}
// TODO: Override showDetails()
// Print brand, model, year, mileage, and number of seats
@Override
public void showDetails() {
super.basicInfo();
System.out.println(" | Seats: " + seats);
}
@Override
public boolean needsService(Vehicle v) {
if (v.getMileage()> 10000){
return true;
}else{
return false;
}
}
@Override
public void performService() {
System.out.println("General car service completed");
}
/*
* Implement Serviceable methods:
*
* needsService(Vehicle v):
* - Check the mileage of the current car
* - If mileage > 10000 return true
* - Otherwise return false
*
* performService():
* - Print: "General car service completed"
*/
}
+36 -18
View File
@@ -1,16 +1,5 @@
package org.model;
/*
* ElectricCar extends Car.
* It already inherits Serviceable from Car.
*
* Service logic for ElectricCar:
* - needsService(): return true if mileage > 8000
* - performService():
* Print "Battery system checked"
* Reset chargeLevel to 100
*/
import org.behavior.Chargeable;
public class ElectricCar extends Car implements Chargeable {
@@ -27,13 +16,42 @@ public class ElectricCar extends Car implements Chargeable {
this.chargeLevel = chargeLevel;
}
// TODO: Override getEnergyType() → return "Electric"
@Override
public String getEnergyType() {
return "Electric";
}
// TODO: Override showDetails()
// Call super.showDetails()
// Print battery capacity and charge level
@Override
public void showDetails() {
super.showDetails();
System.out.println(" | battery Capacity: "+batteryCapacity+" | charge Level: "+chargeLevel);
}
// TODO: Implement charge(double amount)
// Validate negative
// Cap at 100
@Override
public void charge(double amount) {
if (amount <= 0) {
System.out.println("Invalid amount! Must be positive.");
return;
}
if (chargeLevel + amount > 100) {
chargeLevel = 100;
System.out.println("Battery is fully charged! Charge level is now 100.0%");
}else {
chargeLevel += amount;
System.out.println("Added " + amount + "% charge. Charge level is now " + chargeLevel + "%");
}
}
@Override
public boolean needsService(Vehicle v) {
if (v.getMileage()> 8000){
return true;
}else{
return false;
}
}
@Override
public void performService() {
System.out.println("Battery system checked");
chargeLevel = 100;
}
}
+39 -17
View File
@@ -1,15 +1,5 @@
package org.model;
/*
* GasCar extends Car.
* Inherits Serviceable from Car.
*
* Service logic for GasCar:
* - needsService(): return true if mileage > 12000
* - performService():
* Print "Engine oil changed"
* Reset fuelLevel to 100
*/
import org.behavior.Refuelable;
@@ -27,13 +17,45 @@ public class GasCar extends Car implements Refuelable {
this.fuelType = fuelType;
}
// TODO: Override getEnergyType() → return fuelType + " (Gas)"
@Override
public boolean needsService(Vehicle v) {
if (v.getMileage()> 12000){
return true;
}else{
return false;
}
}
// TODO: Implement refuel(double amount)
// Validate amount
// Cap at 100
@Override
public void performService() {
System.out.println("Engine oil changed");
fuelLevel = 100;
}
// TODO: Override showDetails()
// Call super.showDetails()
// Print fuel level and fuel type
@Override
public String getEnergyType() {
return fuelType + " (Gas)";
}
@Override
public void refuel(double amount) {
if (amount <= 0){
System.out.println("Invalid amount! Must be positive.");
return;
}
if (fuelLevel + amount > 100) {
fuelLevel = 100;
System.out.println("Tank is full! Fuel level is now 100.0");
} else {
fuelLevel += amount;
System.out.println("Added " + amount + " units. Fuel level is now " + fuelLevel);
}
}
@Override
public void showDetails() {
super.showDetails();
System.out.println(" | fuel Level: "+fuelLevel+" | fuel Type: "+fuelType);
}
}
+65
View File
@@ -0,0 +1,65 @@
package org.model;
import org.behavior.Chargeable;
import org.behavior.Refuelable;
public class HybridCar extends Car implements Refuelable, Chargeable {
private double batteryLevel;
private double fuelLevel;
public HybridCar(String brand, String model, int year,
double mileage, int seats,
double batteryLevel, double fuelLevel){
super(brand , model , year , mileage, seats);
this.batteryLevel = batteryLevel;
this.fuelLevel= fuelLevel;
}
@Override
public boolean needsService(Vehicle v) {
if (v.getMileage()> 10000){
return true;
}else{
return false;
}
}
@Override
public void performService() {
System.out.println("Engine oil changed and battery system checked");
fuelLevel = 100;
batteryLevel = 100;
}
@Override
public void refuel(double amount) {
if (amount <= 0){
System.out.println("Invalid amount! Must be positive.");
return;
}
if (fuelLevel + amount > 100) {
fuelLevel = 100;
System.out.println("Tank is full! Fuel level is now 100.0");
} else {
fuelLevel += amount;
System.out.println("Added " + amount + " units. Fuel level is now " + fuelLevel);
}
}
@Override
public void charge(double amount) {
if (amount <= 0){
System.out.println("Invalid amount! Must be positive.");
return;
}
if (batteryLevel + amount > 100) {
batteryLevel = 100;
System.out.println("Battery is fully charged! battery level is now 100.0");
} else {
batteryLevel += amount;
System.out.println("Added " + amount + " units. Battery level is now " + batteryLevel);
}
}
}
+22 -12
View File
@@ -1,14 +1,5 @@
package org.model;
/*
* SportsCar extends GasCar.
*
* Special service logic for SportsCar:
* - needsService(): return true if mileage > 5000
* - performService():
* Print "High-performance brake system checked"
*/
public class SportsCar extends GasCar {
private double zeroToHundred;
@@ -24,7 +15,26 @@ public class SportsCar extends GasCar {
this.zeroToHundred = zeroToHundred;
}
// TODO: Override showDetails()
// Call super.showDetails()
// Print acceleration time
@Override
public boolean needsService(Vehicle v) {
if (v.getMileage()> 5000){
return true;
}else{
return false;
}
}
@Override
public void performService() {
super.performService();
System.out.println("High-performance brake system checked");
}
@Override
public void showDetails() {
super.showDetails();
System.out.println(" | Acceleration time (0-100): " + zeroToHundred + " seconds");
}
}
+20 -5
View File
@@ -19,14 +19,29 @@ public abstract class Vehicle {
this.year = year;
this.mileage = mileage;
}
public String getBrand(){
return brand;
}
public String getModel(){
return model;
}
public int getYear(){
return year;
}
public double getMileage(){
return mileage;
}
public void addMileage(double km){
if (km < 0){
System.out.println("error");
} else{
mileage+= km;
}
}
public abstract String getEnergyType();
// TODO: Create getters for all fields
// TODO: Implement addMileage(double km)
// If km is negative → print error
// Otherwise increase mileage
// TODO: Declare abstract method getEnergyType()
public void basicInfo() {
System.out.println(