Changed the method caller class from FileHandlingBudget to...

Changed the method caller class from FileHandlingBudget to FileHandlingBudgetArchive or FileHandlingSelectedBudget that are responsible for these methods

src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java

@@ -20,6 +20,8 @@ import javafx.stage.Stage;
 import no.ntnu.idatt1002.demo.data.Budget.BudgetItem;
 import no.ntnu.idatt1002.demo.data.Budget.BudgetRegister;
 import no.ntnu.idatt1002.demo.data.Budget.FileHandlingBudget;
+import no.ntnu.idatt1002.demo.data.Budget.FileHandlingBudgetArchive;
+import no.ntnu.idatt1002.demo.data.Budget.FileHandlingSelectedBudget;
 import no.ntnu.idatt1002.demo.data.Budget.GeneralBudget;
 import no.ntnu.idatt1002.demo.data.Economics.ExpenseCategory;
 
@@ -105,10 +107,10 @@ public class BudgetController extends FinanceController {
             budgetTableView.setItems(budgetList);
             System.out.println("After loading general");
 
-            if (FileHandlingBudget.isBudgetRegisterEmpty()) {
+            if (FileHandlingBudgetArchive.isBudgetRegisterEmpty()) {
                 budgetRegister = new BudgetRegister();
             } else {
-                budgetRegister = FileHandlingBudget.readBudgetArchive("");
+                budgetRegister = FileHandlingBudgetArchive.readBudgetArchive("");
             }
 
             if (FileHandlingBudget.isNewBudget("Budget")) {
@@ -283,7 +285,7 @@ public class BudgetController extends FinanceController {
     public void updateBudgetRegister(String budgetFolderName) {
         try {
             budgetRegister.addBudgetName(budgetFolderName);
-            FileHandlingBudget.writeBudgetRegisterToArchive(budgetRegister);
+            FileHandlingBudgetArchive.writeBudgetRegisterToArchive(budgetRegister);
         } catch(IOException ioe) {
             showErrorDialogBox(ioe.getMessage(), ioe.getMessage(), ioe.getMessage());
         }
@@ -304,7 +306,7 @@ public class BudgetController extends FinanceController {
                 general.addUnusedCategories();
                 System.out.println(general.getBudgetItems().size());
                 //Always saving the data when switching scenes
-                updateBudgetRegister(FileHandlingBudget.readSelectedBudget());
+                updateBudgetRegister(FileHandlingSelectedBudget.readSelectedBudget());
                 loader.setLocation(getClass().getResource("/view/MainMenuNew.fxml"));
             } else if (event.getSource() == backBtn) {
                 loader.setLocation(getClass().getResource("/view/dualList.fxml"));

src/main/java/no/ntnu/idatt1002/demo/controller/CreateBudgetController.java

@@ -14,6 +14,7 @@ import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.stage.Stage;
 import no.ntnu.idatt1002.demo.data.Budget.FileHandlingBudget;
+import no.ntnu.idatt1002.demo.data.Budget.FileHandlingSelectedBudget;
 import no.ntnu.idatt1002.demo.data.Economics.Expense;
 
 public class CreateBudgetController {
@@ -110,10 +111,10 @@ public class CreateBudgetController {
   public boolean createNewFiles(String budgetName) {
     boolean empty;
     try {
-      empty = FileHandlingBudget.createBudgetDirectory(currentMonth + budgetName);
-      FileHandlingBudget.createNewIncomeFile(currentMonth + budgetName, "Income");
-      FileHandlingBudget.createNewExpenseFile(currentMonth + budgetName, "Expense");
-      FileHandlingBudget.createNewBudgetFile(currentMonth + budgetName, "Budget");
+      empty = FileHandlingSelectedBudget.createBudgetDirectory(currentMonth + budgetName);
+      FileHandlingSelectedBudget.createNewIncomeFile(currentMonth + budgetName, "Income");
+      FileHandlingSelectedBudget.createNewExpenseFile(currentMonth + budgetName, "Expense");
+      FileHandlingSelectedBudget.createNewBudgetFile(currentMonth + budgetName, "Budget");
     } catch (IOException ioe) {
       empty = false;
       System.out.println(ioe.getMessage());
@@ -125,7 +126,7 @@ public class CreateBudgetController {
 
   public void updateCurrentFile(String currentMonth, String budgetName) {
     try {
-      FileHandlingBudget.updateSelectedBudget(currentMonth + budgetName);
+      FileHandlingSelectedBudget.updateSelectedBudget(currentMonth + budgetName);
     } catch (IOException ioe) {
       showErrorMsgBox(ioe.getMessage(), ioe.getMessage(), ioe.getMessage());
     }

src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java

@@ -26,6 +26,8 @@ import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import no.ntnu.idatt1002.demo.data.Budget.FileHandlingBudget;
+import no.ntnu.idatt1002.demo.data.Budget.FileHandlingBudgetArchive;
+import no.ntnu.idatt1002.demo.data.Budget.FileHandlingSelectedBudget;
 import no.ntnu.idatt1002.demo.data.Budget.GeneralBudget;
 import no.ntnu.idatt1002.demo.data.Economics.Expense;
 import no.ntnu.idatt1002.demo.data.Economics.ExpenseCategory;
@@ -475,7 +477,7 @@ public class IncomeExpenseController extends FinanceController {
 
   public void saveDisposableIncomeToFile() throws IOException {
     String disposableIncomeAsString = String.valueOf(incomeRegister.getTotalSum() - expenseRegister.getTotalSum());
-    FileHandlingBudget.writeMaxAmountToFile(FileHandlingBudget.readSelectedBudget(), disposableIncomeAsString);
+    FileHandlingBudget.writeMaxAmountToFile(FileHandlingSelectedBudget.readSelectedBudget(), disposableIncomeAsString);
   }
   /**
    * Switches scenes back to main menu, by loading a new FXML file and setting the scene to this location.
@@ -492,9 +494,9 @@ public class IncomeExpenseController extends FinanceController {
         loader.setLocation(getClass().getResource("/view/newBudgetBudgert.fxml"));
         saveDisposableIncomeToFile();
       } else if (event.getSource() == null) {
-        FileHandlingBudget.deleteBudgetDirectory(FileHandlingBudget.readSelectedBudget());
+        FileHandlingBudgetArchive.deleteBudgetDirectory(FileHandlingSelectedBudget.readSelectedBudget());
         //removeBudgetNameFromArchive
-        FileHandlingBudget.updateSelectedBudget("");
+        FileHandlingSelectedBudget.updateSelectedBudget("");
       }
       Parent root = loader.load();
       Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();

src/main/java/no/ntnu/idatt1002/demo/controller/SceneController.java

@@ -14,6 +14,7 @@ import javafx.scene.control.Dialog;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import no.ntnu.idatt1002.demo.data.Budget.FileHandlingBudget;
+import no.ntnu.idatt1002.demo.data.Budget.FileHandlingSelectedBudget;
 import no.ntnu.idatt1002.demo.data.Economics.Income;
 
 public class SceneController {
@@ -64,7 +65,7 @@ public class SceneController {
     dialog.showAndWait();
 
     try {
-      if (FileHandlingBudget.readSelectedBudget() != null) {
+      if (FileHandlingSelectedBudget.readSelectedBudget() != null) {
         switchNext(event);
       }
     } catch (IOException ioe) {
@@ -112,7 +113,7 @@ public class SceneController {
     dialog.showAndWait();
 
     try {
-      if (FileHandlingBudget.readSelectedBudget() != null) {
+      if (FileHandlingSelectedBudget.readSelectedBudget() != null) {
         switchChosenBudget(event);
       }
     } catch(IOException ioe) {

src/main/java/no/ntnu/idatt1002/demo/controller/SelectBudgetController.java

@@ -11,6 +11,8 @@ import javafx.scene.input.MouseButton;
 import javafx.stage.Stage;
 import no.ntnu.idatt1002.demo.data.Budget.BudgetRegister;
 import no.ntnu.idatt1002.demo.data.Budget.FileHandlingBudget;
+import no.ntnu.idatt1002.demo.data.Budget.FileHandlingBudgetArchive;
+import no.ntnu.idatt1002.demo.data.Budget.FileHandlingSelectedBudget;
 
 public class SelectBudgetController {
 
@@ -24,10 +26,10 @@ public class SelectBudgetController {
   @FXML
   public void initialize() throws IOException {
     try {
-      if (FileHandlingBudget.isBudgetRegisterEmpty()) {
+      if (FileHandlingBudgetArchive.isBudgetRegisterEmpty()) {
         budgetRegister = new BudgetRegister();
       } else {
-        budgetRegister = FileHandlingBudget.readBudgetArchive("");
+        budgetRegister = FileHandlingBudgetArchive.readBudgetArchive("");
       }
     } catch (IOException ioe) {
       ioe.printStackTrace();
@@ -49,7 +51,7 @@ public class SelectBudgetController {
   public void selectBudget(ActionEvent event) throws IOException {
     String name = budgetListView.getSelectionModel().getSelectedItem();
     System.out.println(name);
-    FileHandlingBudget.updateSelectedBudget(name);
+    FileHandlingSelectedBudget.updateSelectedBudget(name);
 
     final Node source = (Node) event.getSource();
     ((Stage) source.getScene().getWindow()).close();
@@ -57,7 +59,7 @@ public class SelectBudgetController {
 
   @FXML
   public void exitWindow(ActionEvent event) throws IOException {
-    FileHandlingBudget.updateSelectedBudget("");
+    FileHandlingSelectedBudget.updateSelectedBudget("");
     final Node source = (Node) event.getSource();
     ((Stage) source.getScene().getWindow()).close();
   }