From 7874c9f59640832332ed4817132d3728ba5c6e91 Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Mon, 17 Apr 2023 14:41:21 +0200
Subject: [PATCH] Made all filehandling implementations static
---
.../demo/controller/BudgetController.java | 11 ++++------
.../controller/IncomeExpenseController.java | 21 +++++++------------
.../idatt1002/demo/controller/MainMenu.java | 16 ++++++--------
3 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
index 510dd50f..0144b420 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
@@ -142,9 +142,8 @@ public class BudgetController implements FinanceController {
* is being used.
*/
private void setButtons() {
- FileHandlingBudget fileHandlingBudget = new FileHandlingBudget();
try {
- if (fileHandlingBudget.isEmpty("Budget")) {
+ if (FileHandlingBudget.isEmpty("Budget")) {
returnBtn.setOpacity(0);
} else {
addBtn.setDisable(true);
@@ -306,8 +305,7 @@ public class BudgetController implements FinanceController {
*/
@Override
public void saveDataToFile() throws IOException {
- FileHandlingBudget fileHandlingBudget = new FileHandlingBudget();
- fileHandlingBudget.writeGeneralBudgetToFile("Budget", general);
+ FileHandlingBudget.writeGeneralBudgetToFile("Budget", general);
}
/**
@@ -328,14 +326,13 @@ public class BudgetController implements FinanceController {
* @throws IOException If an error occurs while reading from the file.
*/
public GeneralBudget loadBudgetDataFromFile(String fileName) throws IOException {
- FileHandlingBudget fileHandlingBudget = new FileHandlingBudget();
//Instantiate new budget
- if (fileHandlingBudget.isEmpty(fileName)) {
+ if (FileHandlingBudget.isEmpty(fileName)) {
general = new GeneralBudget(1000);
//throws new IOException("Not valid budget")
} else { //Load previous budget
try {
- general = fileHandlingBudget.readGeneralBudgetFromFile(fileName);
+ general = FileHandlingBudget.readGeneralBudgetFromFile(fileName);
} catch (IOException e) {
showErrorDialogBox("File error", "Error in reading from fil", "An error occurred"
+ "when reading GeneralBudget from the file");
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java
index f66b3fa6..2a7b37d0 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java
@@ -146,12 +146,8 @@ public class IncomeExpenseController implements FinanceController {
@FXML
private PieChart incomePieChart;
-
- FileHandling fileHandling;
-
@FXML
public void initialize() {
- fileHandling = new FileHandling();
//Initialize columns
setColumns();
@@ -510,8 +506,8 @@ public class IncomeExpenseController implements FinanceController {
*/
@Override
public void saveDataToFile() throws IOException {
- fileHandling.writeItemRegisterToFile(incomeRegister, "Income");
- fileHandling.writeItemRegisterToFile(expenseRegister, "Expense");
+ FileHandling.writeItemRegisterToFile(incomeRegister, "Income");
+ FileHandling.writeItemRegisterToFile(expenseRegister, "Expense");
}
@@ -523,10 +519,10 @@ public class IncomeExpenseController implements FinanceController {
public IncomeRegister loadIncomeDataFromFile(String fileName) {
//Instantiate new incomeRegister
try {
- if (fileHandling.isEmpty(fileName)) {
+ if (FileHandling.isEmpty(fileName)) {
incomeRegister = new IncomeRegister();
} else { //Load previous income register
- incomeRegister = fileHandling.readIncomeRegisterFromFile(fileName);
+ incomeRegister = FileHandling.readIncomeRegisterFromFile(fileName);
}
} catch (IOException ioe) {
showErrorDialogBox("File reading error", "Error in reading from file", "Could not"
@@ -543,10 +539,10 @@ public class IncomeExpenseController implements FinanceController {
public ExpenseRegister loadExpenseDataFromFile(String fileName) {
//ItemRegister<T extends Item>
try {
- if (fileHandling.isEmpty(fileName)) {
+ if (FileHandling.isEmpty(fileName)) {
expenseRegister = new ExpenseRegister();
} else { //Load previous income register
- expenseRegister = fileHandling.readExpenseRegisterFromFile(fileName);
+ expenseRegister = FileHandling.readExpenseRegisterFromFile(fileName);
}
} catch (IOException ioe) {
showErrorDialogBox("File reading error", "Error in reading from file", "Could not"
@@ -561,13 +557,12 @@ public class IncomeExpenseController implements FinanceController {
* @return An object of type GeneralBudget.
*/
public GeneralBudget loadBudgetDataFromFile(String fileName) {
- FileHandlingBudget fileHandlingBudget = new FileHandlingBudget();
//Instantiate new budget
try {
- if (fileHandling.isEmpty(fileName)) {
+ if (FileHandlingBudget.isEmpty(fileName)) {
generalBudget = new GeneralBudget(1000);
} else { //Load previous income register
- generalBudget = fileHandlingBudget.readGeneralBudgetFromFile(fileName);
+ generalBudget = FileHandlingBudget.readGeneralBudgetFromFile(fileName);
}
} catch (IOException ioe) {
showErrorDialogBox("File reading error", "Error in reading from file", "Could not"
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java
index 0bb5d1d0..f4790417 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java
@@ -96,13 +96,10 @@ public class MainMenu {
IncomeRegister incomeRegister;
- FileHandling fileHandling;
-
Overview overview;
@FXML
public void initialize() {
- fileHandling = new FileHandling();
//Initialize all registers + overview
try {
incomeRegister = loadIncomeDataFromFile("Income");
@@ -168,11 +165,11 @@ public class MainMenu {
*/
public IncomeRegister loadIncomeDataFromFile(String fileName) throws IOException {
//Instantiate incomeRegister
- if (fileHandling.isEmpty(fileName)) {
+ if (FileHandling.isEmpty(fileName)) {
incomeRegister = new IncomeRegister();
} else { //Load previous income register
try {
- incomeRegister = fileHandling.readIncomeRegisterFromFile(fileName);
+ incomeRegister = FileHandling.readIncomeRegisterFromFile(fileName);
} catch (IOException e) {
e.printStackTrace();
}
@@ -188,11 +185,11 @@ public class MainMenu {
*/
public ExpenseRegister loadExpenseDataFromFile(String fileName) throws IOException {
//Instantiate expense register
- if (fileHandling.isEmpty(fileName)) {
+ if (FileHandling.isEmpty(fileName)) {
expenseRegister = new ExpenseRegister();
} else {
try {
- expenseRegister = fileHandling.readExpenseRegisterFromFile(fileName);
+ expenseRegister = FileHandling.readExpenseRegisterFromFile(fileName);
} catch (IOException e) {
e.printStackTrace();
}
@@ -207,13 +204,12 @@ public class MainMenu {
* @throws IOException If an error occurs while reading from the file.
*/
public GeneralBudget loadBudgetDataFromFile(String fileName) throws IOException {
- FileHandlingBudget fileHandlingBudget = new FileHandlingBudget();
//Instantiate new budget
- if (fileHandlingBudget.isEmpty(fileName)) {
+ if (FileHandlingBudget.isEmpty(fileName)) {
generalBudget = new GeneralBudget(1000);
} else { //Load previous budget
try {
- generalBudget = fileHandlingBudget.readGeneralBudgetFromFile(fileName);
+ generalBudget = FileHandlingBudget.readGeneralBudgetFromFile(fileName);
} catch (IOException e) {
e.printStackTrace();
}
--
GitLab