Update README.md

.idea/.name

@@ -1 +0,0 @@
-Main.java

README.md

@@ -41,9 +41,9 @@ The project consists of the following classes and interfaces:
        |      GasCar       |               |    ElectricCar    |
        |      (Class)      |               |      (Class)      |
        +-------------------+               +-------------------+
-         ^               ^                                   ^
+         ^               |                                   |
          | extends       | implements                        | implements
-         |               |                                   |
+         |               ⌄                                   ⌄
 +-------------------+  +-------------------+       +-------------------+
 |     SportsCar     |  |    Refuelable     |       |    Chargeable     |
 |      (Class)      |  |    (Interface)    |       |    (Interface)    |
@@ -118,7 +118,14 @@ Add a `HybridCar` class
 - Create a `HybridCar` class that extends `Car`.
 - It will need variables for both battery level and fuel level
 - Implement `Refuelable` and `Chargeable` together
-- (Optional) Override methods to manage both power sources (driving drains battery first, then gas)
+- Service logic for HybridCar:
+```
+needsService(): return true if mileage > 10000
+performService():
+Print "Engine oil changed and battery system checked"
+Reset fuelLevel to 100
+Reset chargeLevel to 100
+```
 
 ## Workflow
 1. Fork the repository to your own Git account
@@ -133,6 +140,6 @@ git checkout -b develop
 ```
 git push origin develop
 ```
-7. Create a Pull Request from `develop` to `main`
+7. Create a Pull Request from `develop` to `main` or `master`
 
 # GOOD LUCK! :)

src/main/java/org/Main.java

@@ -1,7 +1,4 @@
 package org;
-import org.model.*;
-
-import java.util.ArrayList;
 
 public class Main {
     public static void main(String[] args) {
@@ -20,14 +17,9 @@ public class Main {
         //          ElectricCar tesla = new ElectricCar(...);
         // ============================================================
 
-        ElectricCar tesla = new ElectricCar("Tesla", "Roodster",
-                2023, 0, 7, 53, 80);
-        GasCar ferrari= new GasCar("Scuderia Ferrari", "SF90",
-                2024, 100, 4,78,"petrol");
-        SportsCar lamborghini= new SportsCar("lamborghini", "huracan",
-                2026, 20000, 2,72 ,"Petrol",2.6);
-        HybridCar porsche= new HybridCar("porsche", "panamara",
-                2024, 200, 7, 26, 50);
+
+
+
 
         // ============================================================
         // TODO 2:
@@ -40,7 +32,7 @@ public class Main {
         // as their parent type (Vehicle).
         // ============================================================
 
-        Vehicle[] vehicle={tesla,ferrari,lamborghini,porsche};
+
 
 
 
@@ -55,11 +47,7 @@ public class Main {
         //   behavior and can call inherited methods.
         // ============================================================
 
-        for (int i=0; i< vehicle.length; i++)
-        {
-            vehicle[i].basicInfo();
-            System.out.println("=======================================");
-        }
+
 
 
 
@@ -74,11 +62,7 @@ public class Main {
         //   • Show subclass‑specific inspection messages
         // ============================================================
 
-        for (int i=0; i<4; i++)
-        {
-            vehicle[i].performService();
-            System.out.println("=======================================");
-        }
+
 
 
 
@@ -96,7 +80,6 @@ public class Main {
         //
         // ============================================================
 
-        Serviceable[] serviceables = {tesla, ferrari, lamborghini, porsche};
 
 
 
@@ -124,18 +107,6 @@ public class Main {
         // ============================================================
 
 
-        for (Serviceables s: serviceables)
-        {
-            Vehicle v= (Vehicle) s;
-            if (v.needsService())
-            {
-                System.out.println("brand: "+ v.getBrand()+ " model"+ v.getModel());
-                v.performService();
-            }
-            else
-                System.out.println("brand: "+ v.getBrand()+ " model"+ v.getModel()+" does not need service");
-            System.out.println("=======================================");
-        }
 
 
 
@@ -147,7 +118,7 @@ public class Main {
         //
         // ============================================================
 
-        System.out.println("=== Workshop Completed ===");
+
 
 
 

src/main/java/org/model/Car.java

@@ -15,21 +15,18 @@ public abstract class Car extends Vehicle implements Serviceable {
 
     private int seats;
 
-    public Car(String brand, String model, int year, double mileage, int seats) {
+    public Car(String brand, String model, int year,
+               double mileage, int seats) {
 
         // TODO: Call super constructor
-        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
+
     /*
      * Implement Serviceable methods:
      *
@@ -41,21 +38,4 @@ public abstract class Car extends Vehicle implements Serviceable {
      * performService():
      * - Print: "General car service completed"
      */
-
-    @Override
-    public boolean needsService()
-    {
-        if (getMileage()>1000)
-            return true;
-        else
-            return false;
-    }
-
-    public abstract void performService();
-
-    @Override
-    public void showDetails()
-    {
-        System.out.println("Car's seats: "+ seats);
-    }
 }

src/main/java/org/model/ElectricCar.java

@@ -28,32 +28,12 @@ public class ElectricCar extends Car implements Chargeable {
     }
 
     // TODO: Override getEnergyType() → return "Electric"
-    @Override
-    public String getEnergyType()
-    {
-        return "Electric";
-    }
 
     // TODO: Override showDetails()
-    @Override
-    public void showDetails()
-    {
-        System.out.println("batteryCapacity: "+ batteryCapacity+ " chargeLevel: "+ chargeLevel);
-    }
+    // Call super.showDetails()
+    // Print battery capacity and charge level
 
     // TODO: Implement charge(double amount)
-    public void performService()
-    {
-        System.out.println("Battery system checked");
-        chargeLevel=100;
-    }
-
-    @Override
-    public boolean needsService()
-    {
-        if (getMileage()>8000)
-            return true;
-        else
-            return false;
-    }
+    // Validate negative
+    // Cap at 100
 }

src/main/java/org/model/GasCar.java

@@ -28,32 +28,12 @@ public class GasCar extends Car implements Refuelable {
     }
 
     // TODO: Override getEnergyType() → return fuelType + " (Gas)"
-    @Override
-    public String getEnergyType()
-    {
-        return "Gas";
-    }
 
     // TODO: Implement refuel(double amount)
-    public void performService()
-    {
-        System.out.println("Engine oil changed");
-        fuelLevel=100;
-    }
-
-    @Override
-    public boolean needsService()
-    {
-        if (getMileage()>12000)
-            return true;
-        else
-            return false;
-    }
+    // Validate amount
+    // Cap at 100
 
     // TODO: Override showDetails()
-    @Override
-    public void showDetails()
-    {
-        System.out.println("fuelType: "+fuelType+" fuelLevel: "+fuelLevel);
-    }
+    // Call super.showDetails()
+    // Print fuel level and fuel type
 }

src/main/java/org/model/HybridCar.java

@@ -1,42 +0,0 @@
-package org.model;
-
-import org.behavior.Chargeable;
-
-public class HybridCar extends Car implements Chargeable {
-    private int batteryCapacity;
-    private double chargeLevel;
-
-    public HybridCar(String brand, String model, int year,
-                       double mileage, int seats,
-                       int batteryCapacity, double chargeLevel) {
-
-        super(brand, model, year, mileage, seats);
-        this.batteryCapacity = batteryCapacity;
-        this.chargeLevel = chargeLevel;
-    }
-
-    public String getEnergyType()
-    {
-        return "Hybrid";
-    }
-
-    @Override
-    public boolean needsService()
-    {
-        if (getMileage()>24000)
-            return true;
-        else
-            return false;
-    }
-
-    public void performService() {
-        System.out.println("Battery system checked");
-        chargeLevel=100;
-    }
-
-    @Override
-    public void showDetails()
-    {
-        System.out.println("batteryCapacity: "+ batteryCapacity+ " chargeLevel: "+ chargeLevel);
-    }
-}

src/main/java/org/model/SportsCar.java

@@ -24,29 +24,7 @@ public class SportsCar extends GasCar {
         this.zeroToHundred = zeroToHundred;
     }
 
-    public void performService()
-    {
-        System.out.println("High-performance brake system checked");
-    }
-
-    @Override
-    public boolean needsService()
-    {
-        if (getMileage()>5000)
-            return true;
-        else
-            return false;
-    }
-
     // TODO: Override showDetails()
-    // Print header
     // Call super.showDetails()
     // Print acceleration time
-    @Override
-    public void showDetails()
-    {
-        System.out.println("sport car");
-        super.showDetails();
-        System.out.println(zeroToHundred);
-    }
 }

src/main/java/org/model/Vehicle.java

@@ -21,35 +21,12 @@ public abstract class Vehicle {
     }
 
     // TODO: Create getters for all fields
-    public String getBrand() {
-        return brand;
-    }
-    public String getModel(){
-        return model;
-    }
-    public int getYear(){
-        return year;
-    }
-    public double getMileage() {
-        return mileage;
-    }
 
     // TODO: Implement addMileage(double km)
     // If km is negative → print error
     // Otherwise increase mileage
-    public double addMileage(double km)
-    {
-        if (km<0)
-        {
-            System.out.println("error");
-            return mileage;
-        }
-        mileage+=km*0.621371;
-        return mileage;
-    }
 
     // TODO: Declare abstract method getEnergyType()
-    public abstract String getEnergyType();
 
     public void basicInfo() {
         System.out.println(
@@ -60,6 +37,4 @@ public abstract class Vehicle {
     }
 
     public abstract void showDetails();
-    public abstract void performService();
-    public abstract boolean needsService();
 }