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 1d0826230f350682487f1ed9d8ef774d634fad55..3fe4eb3a0f177a7375d8ee06225313d787e4c1cf 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 9dedb2c21ea397672d7e23ea19972e5fcabe4830..06e27051887b2718c0d462e929dd90f7fa1b9bb2 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