From 219018ce61386850a0fa281a0c19cb7ecf8bacbd Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Wed, 22 Mar 2023 15:47:47 +0100
Subject: [PATCH] Enabled filereading for tableview such that files can be
loaded
---
.../idatt1002/demo/controller/ExpensesController.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java
index 52d91f46..d69a4e9c 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java
@@ -85,9 +85,7 @@ public class ExpensesController {
show.setItems(filter);
show.setValue("All");
- //expenseRegister = loadDataFromFile("wawawiwa");
- Expense newExpense = new Expense(99, true, ExpenseCategory.FOOD, "1/1/23");
- expenseRegister.addItem(newExpense);
+ expenseRegister = loadDataFromFile("Expense");
expenses = FXCollections.observableArrayList(expenseRegister.getItems());
dateColumn.setCellValueFactory(new PropertyValueFactory<Expense, String>("date"));
@@ -182,7 +180,11 @@ public class ExpensesController {
if (fileHandling.isEmpty(fileName)) {
//expenseRegister = new ExpenseRegister();
} else {
+ try{
expenseRegister = fileHandling.readExpenseRegisterFromFile(fileName);
+ } catch(IOException e) {
+ e.printStackTrace();
+ }
}
return expenseRegister;
}
--
GitLab