diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java index 46b048c9e0db845216bf77f5872fb8f967e28542..d0f49062ba3c03da5d5473eee58bdeffee87ca8c 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java @@ -128,16 +128,11 @@ public class MainMenuController { generalBudget = loadBudgetDataFromFile( "budgets/" + FileHandlingSelectedBudget .readSelectedBudget("budgets/SelectedBudget") + "/Budget"); - } catch (IOException ioe) { + overview = new Overview(incomeRegister, expenseRegister, generalBudget); + } catch (IOException | IllegalArgumentException ioe) { ioe.printStackTrace(); - Alert alert = new Alert(AlertType.ERROR); - alert.setTitle("Could not load register data"); - alert.setHeaderText("Could not load register data"); - alert.setContentText("There was an error loading in the registers"); - - alert.showAndWait(); + showErrorDialogBox(ioe.getMessage(), ioe.getMessage(), ioe.getMessage()); } - overview = new Overview(incomeRegister, expenseRegister, generalBudget); mainBar.setStyle("-fx-accent: rgb(48,215,106);"); diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/recipes/FoodItem.java b/src/main/java/no/ntnu/idatt1002/demo/data/recipes/FoodItem.java index 30dc12b375bed00749f1ed5234190e9c5bf9dff3..94c1696f841b361237b67e790347d9448b8857e3 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/data/recipes/FoodItem.java +++ b/src/main/java/no/ntnu/idatt1002/demo/data/recipes/FoodItem.java @@ -287,9 +287,9 @@ public enum FoodItem { BROCCOLI("broccoli"), /** - * Lamb + * Lam */ - LAMB("lamb"), + LAM("lam"), /** * Sugar. diff --git a/src/main/resources/budgets/Archive.archive b/src/main/resources/budgets/Archive.archive index 415bab20c3fe4b8bf68d40fed7fd72f6b4e0620c..92bbadc75e7a0d12ca16ffa702c311280f70242c 100644 --- a/src/main/resources/budgets/Archive.archive +++ b/src/main/resources/budgets/Archive.archive @@ -1,4 +1 @@ -APRILnew -APRILsecond -APRILreasonable -APRILpåske +APRILels diff --git a/src/main/resources/budgets/SelectedBudget.current b/src/main/resources/budgets/SelectedBudget.current index 5d60f791060cd30d347b32fc1ff332ce182e0c55..160765175f94b330face63124bef8d27303d181c 100644 --- a/src/main/resources/budgets/SelectedBudget.current +++ b/src/main/resources/budgets/SelectedBudget.current @@ -1 +1 @@ -APRILreasonable +APRILels \ No newline at end of file