From 981200ef0410a6f73361a190ed25f200dbae37f5 Mon Sep 17 00:00:00 2001
From: Harry Linrui Xu <harrylx@stud.ntnu.no>
Date: Mon, 17 Apr 2023 12:27:37 +0200
Subject: [PATCH] Removed duplicate get methods in Overview, as a result from
merging conflict
---
.../demo/data/Economics/Overview.java | 25 -------------------
1 file changed, 25 deletions(-)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Overview.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Overview.java
index d47f3004..4ed63a56 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Overview.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Overview.java
@@ -42,31 +42,6 @@ public class Overview {
this.expenseRegister = expenseRegister;
this.budget = budget;
updateBalance();
- this.budget = budget;
- }
-
- /**
- * Get the IncomeRegister of the Overview.
- * @return IncomeRegister
- */
- public IncomeRegister getIncomeRegister() {
- return incomeRegister;
- }
-
- /**
- * Get the ExpenseRegister of the Overview.
- * @return ExpenseRegister
- */
- public ExpenseRegister getExpenseRegister() {
- return expenseRegister;
- }
-
- /**
- * Get the GeneralBudget of the Overview.
- * @return GeneralBudget
- */
- public GeneralBudget getBudget() {
- return budget;
}
/**
--
GitLab