From fd72eafe6a87f10de5a73e5f1e6a211d8809d586 Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Thu, 23 Apr 2026 16:24:18 +0200 Subject: [PATCH] Fix: Moved and renamed CategorySelect to CategoryDAO --- .../team6/controller/FrontpageController.java | 7 ++----- .../{Readers/CategorySelect.java => DAO/CategoryDAO.java} | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) rename helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/{Readers/CategorySelect.java => DAO/CategoryDAO.java} (91%) diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java index 041f32d..ff81ba7 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java @@ -6,19 +6,16 @@ import java.util.Objects; import java.util.Random; -import javafx.application.Platform; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; -import javafx.scene.control.Button; import javafx.scene.control.CheckBox; import javafx.scene.control.Label; -import javafx.scene.control.TextField; import javafx.scene.layout.FlowPane; import ntnu.systemutvikling.team6.controller.components.*; import ntnu.systemutvikling.team6.database.DatabaseConnection; -import ntnu.systemutvikling.team6.database.Readers.CategorySelect; +import ntnu.systemutvikling.team6.database.DAO.CategoryDAO; import ntnu.systemutvikling.team6.database.Readers.CharitySelect; import ntnu.systemutvikling.team6.database.Readers.DonationSelect; import ntnu.systemutvikling.team6.models.Charity; @@ -78,7 +75,7 @@ private void loadPage(){ DatabaseConnection conn = new DatabaseConnection(); CharitySelect cdb = new CharitySelect(conn); DonationSelect ddb = new DonationSelect(conn); - CategorySelect categoryselect = new CategorySelect(conn); + CategoryDAO categoryselect = new CategoryDAO(conn); CharityRegistry charities = cdb.getCharitiesFromDB(); DonationRegistry donations = ddb.getDonationFromDB(); List categories = categoryselect.getCategoriesFromDB(); diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CategorySelect.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/CategoryDAO.java similarity index 91% rename from helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CategorySelect.java rename to helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/CategoryDAO.java index 5ce735e..ff7801b 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CategorySelect.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DAO/CategoryDAO.java @@ -1,4 +1,4 @@ -package ntnu.systemutvikling.team6.database.Readers; +package ntnu.systemutvikling.team6.database.DAO; import java.sql.Connection; import java.sql.ResultSet; @@ -13,7 +13,7 @@ * *

All queries are executed against a MySQL database via a {@link DatabaseConnection}. */ -public class CategorySelect { +public class CategoryDAO { private final DatabaseConnection connection; /** @@ -22,7 +22,7 @@ public class CategorySelect { * @param connection the {@link DatabaseConnection} to use for executing queries; must not be * {@code null} */ - public CategorySelect(DatabaseConnection connection) { + public CategoryDAO(DatabaseConnection connection) { this.connection = connection; }