From e3144e54c248e8a3b5abab0b68ab1b8ea9bf10dc Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Fri, 24 Mar 2023 18:36:31 +0100
Subject: [PATCH] Added isEmpty method to FileHandlingBudget
---
.../demo/data/Budget/FileHandlingBudget.java | 22 ++++++++++++++++++-
src/main/resources/Economics/Expense.register | 6 ++---
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java b/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java
index 1d082623..3fe4eb3a 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java
@@ -36,6 +36,23 @@ public class FileHandlingBudget {
}
}
+ /**
+ * Method for checking if a .register file is empty.
+ *
+ * @param fileTitle the name of the file you want to check
+ * @return true or false depending on if file is empty.
+ * @throws IOException if an input or output exception occurred.
+ */
+ public boolean isEmpty(String fileTitle) throws IOException {
+ try (BufferedReader br = new BufferedReader(new FileReader(filePath + fileTitle + fileType))) {
+ if (br.readLine() == null) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }
+
/**
* Method for reading (getting) a Budget from a file.
*
@@ -74,11 +91,14 @@ public class FileHandlingBudget {
} else if (line.startsWith(FileHandlingBudget.budgetDescription)) {
budgetDescription = line.replace(FileHandlingBudget.budgetDescription,"");
}
- if ((line.isEmpty() || (nextLine == null)) && (expenseCategory!=null)) {
+ if ((line.isEmpty() || (nextLine == null)) /*&& (expenseCategory!=null)*/) {
if(generalBudget == null){
+ System.out.println("hello 1");
+ System.out.println(budgetPeriod);
generalBudget = new GeneralBudget(budgetPeriod,maxAmount);
generalBudget.addToBudget(budgetAmount,budgetDescription,expenseCategory);
} else{
+ System.out.println("hello2");
generalBudget.addToBudget(budgetAmount,budgetDescription,expenseCategory);
}
}
diff --git a/src/main/resources/Economics/Expense.register b/src/main/resources/Economics/Expense.register
index 9dedb2c2..06e27051 100644
--- a/src/main/resources/Economics/Expense.register
+++ b/src/main/resources/Economics/Expense.register
@@ -1,18 +1,18 @@
date=2023-03-01
description=twelve
amount=12.0
-isReoccuring=Reoccurring
+isRecurring=Not recurring
category=CLOTHES
date=2023-03-11
description=1111
amount=121.0
-isReoccuring=Reoccurring
+isRecurring=Not recurring
category=OTHER
date=2024-03-16
description=1112111
amount=1000.0
-isReoccuring=Not reoccurring
+isRecurring=Not recurring
category=FOOD
--
GitLab