diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/FileHandling.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/FileHandling.java index ce4e00ed260290b4e79207556604b7956c5b2344..2ab08c9790b64f989d55f9476fa09e8df650b375 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/FileHandling.java +++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/FileHandling.java @@ -73,7 +73,7 @@ public class FileHandling{ boolean reoccuring = false; IncomeCategory incomeCategory = null; try (BufferedReader br = new BufferedReader(new FileReader(filePath + fileTitle + fileType))) { - String line; + String line = br.readLine(); String nextLine = br.readLine(); while ((line = nextLine) != null) { nextLine = br.readLine(); @@ -92,13 +92,13 @@ public class FileHandling{ case "STUDENT_LOAN" -> IncomeCategory.STUDENT_LOAN; default -> IncomeCategory.SALARY; }; - } - if(line.isEmpty() || (nextLine == null)) { + } if(line.isEmpty() || (nextLine == null)) { if(description.equals("")){ incomeRegister.addItem(new Income(amount, reoccuring, incomeCategory, date)); } else{ incomeRegister.addItem(new Income(description, amount, reoccuring, incomeCategory, date)); } + nextLine=br.readLine(); description = ""; } } @@ -121,7 +121,7 @@ public class FileHandling{ boolean reoccuring = false; ExpenseCategory expenseCategory = null; try (BufferedReader br = new BufferedReader(new FileReader(filePath + fileTitle + fileType))) { - String line; + String line = br.readLine(); String nextLine = br.readLine(); while ((line = nextLine) != null) { nextLine = br.readLine(); @@ -148,6 +148,7 @@ public class FileHandling{ } else { expenseRegister.addItem(new Expense(description, amount, reoccuring, expenseCategory, date)); } + nextLine = br.readLine(); description = ""; } }