diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java index 1299010d4a4e5c09ed3e40020a9d6b051e38d8bd..12a6217800a48a51e0d876c77635f17cd4c05815 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java @@ -103,10 +103,11 @@ public class BudgetController extends FinanceController { descriptionCol.setCellValueFactory(new PropertyValueFactory<BudgetItem, String>("budgetDescription")); try { - System.out.println("Fuck you"); - general = loadBudgetDataFromFile(FileHandlingBudget.readCurrentFile("CurrentFile") + "/Budget"); + System.out.println("Just in budget try"); + general = loadBudgetDataFromFile("Budget"); budgetList = FXCollections.observableArrayList(general.getBudgetItems()); budgetTableView.setItems(budgetList); + System.out.println("After loading general"); if (FileHandlingBudget.isNewBudget("Budget")) { returnBtn.setOpacity(0); returnBtn.setDisable(true); @@ -123,8 +124,7 @@ public class BudgetController extends FinanceController { } } catch(IOException ioe) { ioe.printStackTrace(); - showErrorDialogBox("File reading error", "Error in reading file", "Could not" - + "read from the Budget file"); + showErrorDialogBox(ioe.getMessage(), ioe.getMessage(), ioe.getMessage()); } formatDatePicker(); } @@ -287,7 +287,9 @@ public class BudgetController extends FinanceController { try { if (event.getSource() == returnBtn || event.getSource() == continueBtn) { //Adds unused categories to the table + System.out.println(general.getBudgetItems().size()); general.addUnusedCategories(); + System.out.println(general.getBudgetItems().size()); //Always saving the data when switching scenes loader.setLocation(getClass().getResource("/view/MainMenuNew.fxml")); } else if (event.getSource() == backBtn) { @@ -301,8 +303,9 @@ public class BudgetController extends FinanceController { stage.show(); } catch(Exception ioe) { - showErrorDialogBox("Loading error", "Error in loading", "Could load" - + "to FXML file"); + ioe.printStackTrace(); + showErrorDialogBox("Loading error", "Error in loading", "Could not load" + + " FXML file in: " + loader.getLocation()); } } } diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/CreateBudgetController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/CreateBudgetController.java index aa2091e3a080a37b51618445f58f56934ad29119..036ff19fae4d96ac5a63ab1710a1de9c1eb3b953 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/CreateBudgetController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/CreateBudgetController.java @@ -118,7 +118,7 @@ public class CreateBudgetController { empty = false; System.out.println(ioe.getMessage()); ioe.printStackTrace(); - showErrorMsgBox(ioe.getMessage(), ioe.getMessage(), ioe.getMessage()); + showErrorMsgBox(ioe.getMessage(), ioe.getMessage(), ioe.getMessage()); } return empty; } diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java index 043cebb3d73ac9b60091ddf2fe97967798a5c809..36a538221a4bc5b5b24b698619a6b32cb62ca6d0 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java @@ -116,11 +116,14 @@ public abstract class FinanceController { //Instantiate new incomeRegister try { if (FileHandling.isEmpty(fileName)) { + System.out.println("Creating new income register"); incomeRegister = new IncomeRegister(); } else { //Load previous income register + System.out.println("Loading old income register"); incomeRegister = FileHandling.readIncomeRegisterFromFile(fileName); } } catch (IOException ioe) { + ioe.printStackTrace(); showErrorDialogBox("File reading error", "Error in reading from file", "Could not" + "read the IncomeRegister from file"); } @@ -137,8 +140,10 @@ public abstract class FinanceController { try { if (FileHandling.isEmpty(fileName)) { expenseRegister = new ExpenseRegister(); + System.out.println("Creaging new expense register"); } else { //Load previous income register expenseRegister = FileHandling.readExpenseRegisterFromFile(fileName); + System.out.println("Loading saved expense register"); } } catch (IOException ioe) { showErrorDialogBox("File reading error", "Error in reading from file", "Could not"