removed aggregation relationship of CarDatabase and RentalDatabase

yuans-dev · Jul 25, 2024 · 8177567 · 8177567
1 parent c2ad8c3
commit 8177567
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/src/crms/form/MainForm.java b/src/crms/form/MainForm.java
@@ -1106,7 +1106,7 @@ public void warn() {
 
     private void initializeProgram() {
         carManager = new CarManager(CarDatabase.getInstance());
-        rentalManager = new RentalManager(RentalDatabase.getInstance(CarDatabase.getInstance()));
+        rentalManager = new RentalManager(RentalDatabase.getInstance());
         updateCarTable(carManager.generateReport());
     }
 

diff --git a/src/crms/lib/RentalDatabase.java b/src/crms/lib/RentalDatabase.java
@@ -9,7 +9,6 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.time.LocalDate;
-import java.util.ArrayList;
 
 /**
  * The {@code RentalService} class is responsible for managing rental operations
@@ -26,28 +25,24 @@ public class RentalDatabase extends Database<Rental> {
 
     private final String filename = "rentals.txt";
     private static RentalDatabase instance;
-    private CarDatabase carDatabase;
 
     /**
      * Private constructor to prevent instantiation. Initializes the rentals
      * list.
-     */
-    private RentalDatabase() {
-        dataList = new ArrayList<>();
-    }
-
-    /**
+     *
+     * private RentalDatabase() { dataList = new ArrayList<>(); }
+     *
+     * /**
      * Returns the singleton instance of {@code RentalService}. If the instance
      * does not exist, it is created and the rentals are fetched from disk.
      *
      * @param carManager the {@code CarInventory} instance required to fetch
      * associated {@code Car} objects.
      * @return the singleton instance of {@code RentalService}.
      */
-    public static RentalDatabase getInstance(CarDatabase carDatabase) {
+    public static RentalDatabase getInstance() {
         if (instance == null) {
             instance = new RentalDatabase();
-            instance.carDatabase = carDatabase;
             instance.fetchFromDisk();
         }
         return instance;
@@ -81,6 +76,7 @@ public void fetchFromDisk() {
             while (reader.ready()) {
                 String text = reader.readLine();
                 String[] lineComponents = text.split("###");
+                var carDatabase = CarDatabase.getInstance();
                 try {
                     Car car = carDatabase.getItemById(lineComponents[2]);
                     if (car == null) {