Implemented new file handling methods

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

@@ -149,6 +149,7 @@ public class IncomeExpenseController extends FinanceController {
   @FXML
   public void initialize() {
 
+    System.out.println("Start of initialize");
     //Initialize columns
     setColumns();
 
@@ -157,10 +158,13 @@ public class IncomeExpenseController extends FinanceController {
     income = FXCollections.observableArrayList(incomeRegister.getItems());
     incomeTableView.setItems(income);
 
+    System.out.println("After income rgister ");
     expenseRegister = loadExpenseDataFromFile("Expense");
     expenses = FXCollections.observableArrayList(expenseRegister.getItems());
     expenseTableView.setItems(expenses);
 
+    System.out.println("Afte expense register");
+
     //Setting pie chart values to correspond with the registers
     incomePieChart.setLegendSide(Side.RIGHT);
     incomePieChart.setLabelLineLength(10);
@@ -246,7 +250,6 @@ public class IncomeExpenseController extends FinanceController {
    */
   @Override
   public void handleEditBtn(javafx.event.ActionEvent event) { 
-    System.out.println(event.getSource());
     Income chosenIncome = incomeTableView.getSelectionModel().getSelectedItem();
     Expense chosenExpense = expenseTableView.getSelectionModel().getSelectedItem();
 
@@ -475,7 +478,7 @@ public class IncomeExpenseController extends FinanceController {
 
   public void saveDisposableIncomeToFile() throws IOException {
     String disposableIncomeAsString = String.valueOf(incomeRegister.getTotalSum() - expenseRegister.getTotalSum());
-    FileHandlingBudget.writeMaxAmountToFile(FileHandlingBudget.readCurrentFile("CurrentFile"), disposableIncomeAsString);
+    FileHandlingBudget.writeMaxAmountToFile(FileHandlingBudget.readCurrentFile(), disposableIncomeAsString);
   }
   /**
    * Switches scenes back to main menu, by loading a new FXML file and setting the scene to this location.
@@ -487,12 +490,13 @@ public class IncomeExpenseController extends FinanceController {
       FXMLLoader loader = new FXMLLoader();
       if (event.getSource() == returnBtn) {
         saveDataToFile();
-        loader.setLocation(getClass().getResource("/view/FirstMenu.fxml"));
-        System.out.println(FileHandlingBudget.deleteBudgetDirectory(FileHandlingBudget.readCurrentFile("CurrentFile")));
-        FileHandlingBudget.updateCurrentFile("");
+        loader.setLocation(getClass().getResource("/view/MainMenuNew.fxml"));
       } else if (event.getSource() == continueBtn) {
         loader.setLocation(getClass().getResource("/view/newBudgetBudgert.fxml"));
         saveDisposableIncomeToFile();
+      } else if (event.getSource() == null) {
+        FileHandlingBudget.deleteBudgetDirectory(FileHandlingBudget.readCurrentFile());
+        FileHandlingBudget.updateCurrentFile("");
       }
       Parent root = loader.load();
       Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
@@ -500,6 +504,7 @@ public class IncomeExpenseController extends FinanceController {
       stage.setScene(scene);
       stage.show();
     } catch(IOException ioe) {
+      ioe.printStackTrace();
         showErrorDialogBox("Loading error", "Error in loading", "Could not save"
           + "to file");
     }