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 52d91f46091e987a55738ff9ca80584fcd0cd09f..d69a4e9c2430e53295095079a65d058332d2a076 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; }