From ecd584ca952ed2a43e9320fef68ca17ded0eebdc Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Sun, 23 Apr 2023 14:35:57 +0200
Subject: [PATCH] Changed back lamb to lam in food enums + added code block
inside catch block
---
.../idatt1002/demo/controller/MainMenuController.java | 11 +++--------
.../no/ntnu/idatt1002/demo/data/recipes/FoodItem.java | 4 ++--
src/main/resources/budgets/Archive.archive | 5 +----
src/main/resources/budgets/SelectedBudget.current | 2 +-
4 files changed, 7 insertions(+), 15 deletions(-)
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 46b048c9..d0f49062 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 30dc12b3..94c1696f 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 415bab20..92bbadc7 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 5d60f791..16076517 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
--
GitLab