From 84de0af232ff012d8417dcca595aeb6004e39bbd Mon Sep 17 00:00:00 2001 From: aeen Date: Sat, 25 Apr 2026 09:59:19 +0330 Subject: [PATCH] Refactor: remove example package --- src/main/java/org/{example => }/Main.java | 6 +----- src/main/java/org/{example => }/behavior/Chargeable.java | 2 +- src/main/java/org/{example => }/behavior/Refuelable.java | 2 +- src/main/java/org/{example => }/behavior/Serviceable.java | 4 ++-- src/main/java/org/{example => }/model/Car.java | 4 ++-- src/main/java/org/{example => }/model/ElectricCar.java | 4 ++-- src/main/java/org/{example => }/model/GasCar.java | 4 ++-- src/main/java/org/{example => }/model/SportsCar.java | 2 +- src/main/java/org/{example => }/model/Vehicle.java | 2 +- src/main/java/org/{example => }/util/VehicleInspector.java | 5 +++-- 10 files changed, 16 insertions(+), 19 deletions(-) rename src/main/java/org/{example => }/Main.java (96%) rename src/main/java/org/{example => }/behavior/Chargeable.java (68%) rename src/main/java/org/{example => }/behavior/Refuelable.java (68%) rename src/main/java/org/{example => }/behavior/Serviceable.java (61%) rename src/main/java/org/{example => }/model/Car.java (92%) rename src/main/java/org/{example => }/model/ElectricCar.java (93%) rename src/main/java/org/{example => }/model/GasCar.java (92%) rename src/main/java/org/{example => }/model/SportsCar.java (96%) rename src/main/java/org/{example => }/model/Vehicle.java (97%) rename src/main/java/org/{example => }/util/VehicleInspector.java (85%) diff --git a/src/main/java/org/example/Main.java b/src/main/java/org/Main.java similarity index 96% rename from src/main/java/org/example/Main.java rename to src/main/java/org/Main.java index 688fed8..7a3d8c8 100644 --- a/src/main/java/org/example/Main.java +++ b/src/main/java/org/Main.java @@ -1,8 +1,4 @@ -package org.example; - -import org.example.model.*; -import org.example.util.VehicleInspector; -import org.example.behavior.Serviceable; +package org; public class Main { public static void main(String[] args) { diff --git a/src/main/java/org/example/behavior/Chargeable.java b/src/main/java/org/behavior/Chargeable.java similarity index 68% rename from src/main/java/org/example/behavior/Chargeable.java rename to src/main/java/org/behavior/Chargeable.java index 581fcf6..707fd29 100644 --- a/src/main/java/org/example/behavior/Chargeable.java +++ b/src/main/java/org/behavior/Chargeable.java @@ -1,4 +1,4 @@ -package org.example.behavior; +package org.behavior; public interface Chargeable { void charge(double amount); diff --git a/src/main/java/org/example/behavior/Refuelable.java b/src/main/java/org/behavior/Refuelable.java similarity index 68% rename from src/main/java/org/example/behavior/Refuelable.java rename to src/main/java/org/behavior/Refuelable.java index d4ffbb2..16b0700 100644 --- a/src/main/java/org/example/behavior/Refuelable.java +++ b/src/main/java/org/behavior/Refuelable.java @@ -1,4 +1,4 @@ -package org.example.behavior; +package org.behavior; public interface Refuelable { void refuel(double amount); diff --git a/src/main/java/org/example/behavior/Serviceable.java b/src/main/java/org/behavior/Serviceable.java similarity index 61% rename from src/main/java/org/example/behavior/Serviceable.java rename to src/main/java/org/behavior/Serviceable.java index 1ed008e..4ab3fc3 100644 --- a/src/main/java/org/example/behavior/Serviceable.java +++ b/src/main/java/org/behavior/Serviceable.java @@ -1,6 +1,6 @@ -package org.example.behavior; +package org.behavior; -import org.example.model.Vehicle; +import org.model.Vehicle; public interface Serviceable { diff --git a/src/main/java/org/example/model/Car.java b/src/main/java/org/model/Car.java similarity index 92% rename from src/main/java/org/example/model/Car.java rename to src/main/java/org/model/Car.java index 5932b92..cb81367 100644 --- a/src/main/java/org/example/model/Car.java +++ b/src/main/java/org/model/Car.java @@ -1,4 +1,4 @@ -package org.example.model; +package org.model; /* * Car extends Vehicle. @@ -9,7 +9,7 @@ package org.example.model; * - performService(): print "General car service completed" */ -import org.example.behavior.Serviceable; +import org.behavior.Serviceable; public abstract class Car extends Vehicle implements Serviceable { diff --git a/src/main/java/org/example/model/ElectricCar.java b/src/main/java/org/model/ElectricCar.java similarity index 93% rename from src/main/java/org/example/model/ElectricCar.java rename to src/main/java/org/model/ElectricCar.java index 4ec83f7..ee9f5f9 100644 --- a/src/main/java/org/example/model/ElectricCar.java +++ b/src/main/java/org/model/ElectricCar.java @@ -1,4 +1,4 @@ -package org.example.model; +package org.model; /* * ElectricCar extends Car. @@ -11,7 +11,7 @@ package org.example.model; * Reset chargeLevel to 100 */ -import org.example.behavior.Chargeable; +import org.behavior.Chargeable; public class ElectricCar extends Car implements Chargeable { diff --git a/src/main/java/org/example/model/GasCar.java b/src/main/java/org/model/GasCar.java similarity index 92% rename from src/main/java/org/example/model/GasCar.java rename to src/main/java/org/model/GasCar.java index 4ec6cd6..58b3e45 100644 --- a/src/main/java/org/example/model/GasCar.java +++ b/src/main/java/org/model/GasCar.java @@ -1,4 +1,4 @@ -package org.example.model; +package org.model; /* * GasCar extends Car. @@ -11,7 +11,7 @@ package org.example.model; * Reset fuelLevel to 100 */ -import org.example.behavior.Refuelable; +import org.behavior.Refuelable; public class GasCar extends Car implements Refuelable { diff --git a/src/main/java/org/example/model/SportsCar.java b/src/main/java/org/model/SportsCar.java similarity index 96% rename from src/main/java/org/example/model/SportsCar.java rename to src/main/java/org/model/SportsCar.java index 557fb39..2f8e459 100644 --- a/src/main/java/org/example/model/SportsCar.java +++ b/src/main/java/org/model/SportsCar.java @@ -1,4 +1,4 @@ -package org.example.model; +package org.model; /* * SportsCar extends GasCar. diff --git a/src/main/java/org/example/model/Vehicle.java b/src/main/java/org/model/Vehicle.java similarity index 97% rename from src/main/java/org/example/model/Vehicle.java rename to src/main/java/org/model/Vehicle.java index 10cd28e..70615a9 100644 --- a/src/main/java/org/example/model/Vehicle.java +++ b/src/main/java/org/model/Vehicle.java @@ -1,4 +1,4 @@ -package org.example.model; +package org.model; /* * Abstract base class for all vehicles. diff --git a/src/main/java/org/example/util/VehicleInspector.java b/src/main/java/org/util/VehicleInspector.java similarity index 85% rename from src/main/java/org/example/util/VehicleInspector.java rename to src/main/java/org/util/VehicleInspector.java index 4116550..d2b1b53 100644 --- a/src/main/java/org/example/util/VehicleInspector.java +++ b/src/main/java/org/util/VehicleInspector.java @@ -1,6 +1,7 @@ -package org.example.util; +package org.util; -import org.example.model.*; +import org.example.*; +import org.model.Vehicle; /* * Utility class to inspect vehicles.