From c16ae2002294d1a4f0ed852ca1509addaef98c15 Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Thu, 12 Mar 2026 19:26:54 +0100 Subject: [PATCH] Fix: Errors after plain merge --- helpmehelpapplication/pom.xml | 5 +++++ .../ntnu/systemutvikling/team6/DAO/CharityDAO.java | 4 ++-- .../systemutvikling/team6/DAO/DonationDAO.java | 2 +- .../ntnu/systemutvikling/team6/HmHApplication.java | 12 ++++++------ .../team6/controller/FrontpageController.java | 14 ++------------ .../team6/database/DatabaseConnection.java | 2 +- .../team6/database/DatabaseManager.java | 8 ++++---- .../systemutvikling/team6/models/Organization.java | 2 +- .../team6/scraper/APICharityData.java | 4 ++-- .../team6/scraper/APICharityScraper.java | 8 ++++---- .../team6/models/CharityRegistryTest.java | 4 ++-- 11 files changed, 30 insertions(+), 35 deletions(-) diff --git a/helpmehelpapplication/pom.xml b/helpmehelpapplication/pom.xml index 2c394ed..1794a9e 100644 --- a/helpmehelpapplication/pom.xml +++ b/helpmehelpapplication/pom.xml @@ -25,6 +25,11 @@ javafx-controls 25.0.1 + + org.openjfx + javafx-fxml + 21 + org.seleniumhq.selenium selenium-java diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/CharityDAO.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/CharityDAO.java index 8f15320..210a853 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/CharityDAO.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/CharityDAO.java @@ -1,6 +1,6 @@ -package ntnu.sytemutvikling.team6.DAO; +package ntnu.systemutvikling.team6.DAO; -import ntnu.sytemutvikling.team6.scraper.APICharityData; +import ntnu.systemutvikling.team6.scraper.APICharityData; import java.sql.*; import java.util.List; diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/DonationDAO.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/DonationDAO.java index b902276..99abf9b 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/DonationDAO.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/DonationDAO.java @@ -1,4 +1,4 @@ -package ntnu.sytemutvikling.team6.DAO; +package ntnu.systemutvikling.team6.DAO; public class DonationDAO { } diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java index 8a5a2e5..8c7f62c 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java @@ -1,10 +1,10 @@ -package ntnu.sytemutvikling.team6; +package ntnu.systemutvikling.team6; -import ntnu.sytemutvikling.team6.database.DatabaseConnection; -import ntnu.sytemutvikling.team6.database.DatabaseManager; -import ntnu.sytemutvikling.team6.models.Charity; -import ntnu.sytemutvikling.team6.models.CharityRegistry; -import ntnu.sytemutvikling.team6.scraper.APICharityScraper; +import ntnu.systemutvikling.team6.database.DatabaseConnection; +import ntnu.systemutvikling.team6.database.DatabaseManager; +import ntnu.systemutvikling.team6.models.Charity; +import ntnu.systemutvikling.team6.models.CharityRegistry; +import ntnu.systemutvikling.team6.scraper.APICharityScraper; import java.io.IOException; import java.net.URISyntaxException; 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 90b684a..3ee3d39 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java @@ -15,18 +15,7 @@ public class FrontpageController { public void initialize() { try { - List charities = - List.of( - new Charity("Redd Barna", - "Protecting children's rights worldwide.", - "Children"), - new Charity("Leger Uten Grenser", - "Emergency medical aid in crisis areas.", - "Health"), - new Charity( - "Kirkens Nødhjelp", - "Humanitarian aid and long-term development work.", - "Emergency Aid")); + /* for (Charity ch : charities) { @@ -40,6 +29,7 @@ public void initialize() { cardsContainer.getChildren().add(card); } + */ } catch (Exception e) { e.printStackTrace(); diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseConnection.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseConnection.java index 0cb9c52..fb9ffec 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseConnection.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseConnection.java @@ -1,4 +1,4 @@ -package ntnu.sytemutvikling.team6.database; +package ntnu.systemutvikling.team6.database; import java.sql.Connection; import java.sql.DriverManager; diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseManager.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseManager.java index f226f4a..5d41544 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseManager.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseManager.java @@ -1,8 +1,8 @@ -package ntnu.sytemutvikling.team6.database; +package ntnu.systemutvikling.team6.database; -import ntnu.sytemutvikling.team6.models.Charity; -import ntnu.sytemutvikling.team6.models.CharityRegistry; -import ntnu.sytemutvikling.team6.scraper.APICharityData; +import ntnu.systemutvikling.team6.models.Charity; +import ntnu.systemutvikling.team6.models.CharityRegistry; +import ntnu.systemutvikling.team6.scraper.APICharityData; import java.sql.*; import java.util.List; diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Organization.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Organization.java index d6ab8bc..710bcd5 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Organization.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Organization.java @@ -1,4 +1,4 @@ -package ntnu.sytemutvikling.team6.models; +package ntnu.systemutvikling.team6.models; public class Organization { private final String name; diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/APICharityData.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/APICharityData.java index 1a9bd2b..f773542 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/APICharityData.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/APICharityData.java @@ -1,6 +1,6 @@ -package ntnu.sytemutvikling.team6.scraper; +package ntnu.systemutvikling.team6.scraper; -import ntnu.sytemutvikling.team6.database.DatabaseManager; +import ntnu.systemutvikling.team6.database.DatabaseManager; /** * Represents data parsed from the IK API JSON response. diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/APICharityScraper.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/APICharityScraper.java index 5685cfe..7a92cee 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/APICharityScraper.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/APICharityScraper.java @@ -1,9 +1,9 @@ -package ntnu.sytemutvikling.team6.scraper; +package ntnu.systemutvikling.team6.scraper; import com.google.gson.Gson; -import ntnu.sytemutvikling.team6.database.DatabaseConnection; -import ntnu.sytemutvikling.team6.models.Charity; -import ntnu.sytemutvikling.team6.models.CharityRegistry; +import ntnu.systemutvikling.team6.database.DatabaseConnection; +import ntnu.systemutvikling.team6.models.Charity; +import ntnu.systemutvikling.team6.models.CharityRegistry; import java.io.IOException; import java.net.*; diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/CharityRegistryTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/CharityRegistryTest.java index e8f7af2..3977424 100644 --- a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/CharityRegistryTest.java +++ b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/CharityRegistryTest.java @@ -21,7 +21,7 @@ public class CharityRegistryTest { @BeforeEach public void setup() { registry = new CharityRegistry(); - charity = new Charity("Charity1", "Something Somewhere Somehow", "Cancer"); + //charity = new Charity("Charity1", "Something Somewhere Somehow", "Cancer"); } @Test @@ -49,7 +49,7 @@ void testGetAllCharitiesReturnsUnmodifiableList() { void testFindCharityByIdFound() { registry.addCharity(charity); - Optional result = registry.findCharityById(charity.getId()); + Optional result = registry.findCharityById(charity.getUUID()); assertTrue(result.isPresent()); assertEquals(charity, result.get());