diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/CreateBudgetController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/CreateBudgetController.java index ea4656d65f4d496c7d902bbf521e8a00b85b7698..5ae3fdc5f1dfb8c959318010e01a2a42995ff535 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/CreateBudgetController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/CreateBudgetController.java @@ -157,6 +157,8 @@ public class CreateBudgetController { public boolean createNewFiles(String budgetName) { boolean empty; try { + + //TODO: Fiks at måned kommer med i navnet. empty = FileHandlingSelectedBudget.createBudgetDirectory( filePath + "/" + currentMonth + budgetName); FileHandlingSelectedBudget.createNewIncomeFile(filePath + "/" + currentMonth + budgetName, diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java index 7d3f39adeff41163ce303f448ab6cef91482ba83..dfc9714f788d60cad5ab9fedaf6f3c7c023a5f7e 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java @@ -100,19 +100,19 @@ public abstract class FinanceController { * Method that either reads data from a file with which it fills a budget register, if this is an * old budget, or instantiates a budget register if this is a new budget. * - * @param fileName The name of the file that is being read from. + * @param fileDestination The name of the file that is being read from. * @return An object of type GeneralBudget. * @throws IOException If an error occurs while reading from the file. */ - public GeneralBudget loadBudgetDataFromFile(String fileName) throws IOException { + public GeneralBudget loadBudgetDataFromFile(String fileDestination) throws IOException { //Instantiate new budget System.out.println("this is just beofre isempty"); - System.out.println(fileName); - if (FileHandlingBudget.isEmpty(fileName)) { + System.out.println(fileDestination); + if (FileHandlingBudget.isEmpty(fileDestination)) { general = new GeneralBudget(1000); } else { //Load previous budget try { - general = FileHandlingBudget.readGeneralBudgetFromFile(fileName); + general = FileHandlingBudget.readGeneralBudgetFromFile(fileDestination); } catch (IOException e) { showErrorDialogBox("File error", "Error in reading from fil", "An error occurred" + "when reading GeneralBudget from the file"); @@ -125,16 +125,16 @@ public abstract class FinanceController { * Method that either reads data from a file with which it fills an income register, if older * changes exist, or instantiates an income register if the file is empty. * - * @param fileName The name of the file that is being read from. + * @param fileDestination The name of the file that is being read from. * @return An object of type IncomeRegister. */ - public IncomeRegister loadIncomeDataFromFile(String fileName) { + public IncomeRegister loadIncomeDataFromFile(String fileDestination) { //Instantiate new incomeRegister try { - if (FileHandling.isEmpty(fileName)) { + if (FileHandling.isEmpty(fileDestination)) { incomeRegister = new IncomeRegister(); } else { //Load previous income register - incomeRegister = FileHandling.readIncomeRegisterFromFile(fileName); + incomeRegister = FileHandling.readIncomeRegisterFromFile(fileDestination); } } catch (IOException ioe) { ioe.printStackTrace(); @@ -148,16 +148,16 @@ public abstract class FinanceController { * Method that either reads data from a file with which it fills an expense register, if older * changes exist, or instantiates an expense register if the file is empty. * - * @param fileName The name of the file that is being read from. + * @param fileDestination The name of the file that is being read from. * @return An object of type IncomeRegister. */ - public ExpenseRegister loadExpenseDataFromFile(String fileName) { + public ExpenseRegister loadExpenseDataFromFile(String fileDestination) { //Instantiate expense register try { - if (FileHandling.isEmpty(fileName)) { + if (FileHandling.isEmpty(fileDestination)) { expenseRegister = new ExpenseRegister(); } else { //Load previous income register - expenseRegister = FileHandling.readExpenseRegisterFromFile(fileName); + expenseRegister = FileHandling.readExpenseRegisterFromFile(fileDestination); } } 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/FirstMenuController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/FirstMenuController.java index c5a8bdaa6fd940b630538256c997743823e39ee5..cccb5f95a910fa8c423e7dde9ff4bdb416dab69f 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/FirstMenuController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/FirstMenuController.java @@ -32,19 +32,19 @@ public class FirstMenuController { public void initialize() { String path = System.getProperty("user.home"); String buddyPath = path + "/BudgetBuddy"; - filePath = buddyPath + "/budget"; + filePath = buddyPath + "/budgets"; - File budget = new File(buddyPath + "/budget"); + File budget = new File(buddyPath + "/budgets"); if(!budget.exists()){ - budget.mkdir(); + budget.mkdirs(); } File economics = new File(buddyPath + "/economics"); if(!economics.exists()){ - economics.mkdir(); + economics.mkdirs(); } File recipes = new File(buddyPath + "/recipes"); if(!recipes.exists()){ - recipes.mkdir(); + recipes.mkdirs(); } 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 32232f68bdf80d10a69aa04ed3fc387f3333067d..6550eda5154a3f77479c711a794df90b4f6dece5 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java @@ -150,7 +150,7 @@ public class IncomeExpenseController extends FinanceController { public void initialize() { String path = System.getProperty("user.home"); - filePath = path + "/BudgetBuddyFiles/economics"; + filePath = path + "/BudgetBuddyFiles/budget/"; //Initialize columns setColumns(); @@ -158,10 +158,10 @@ public class IncomeExpenseController extends FinanceController { try { //Initialize registers incomeRegister = loadIncomeDataFromFile( - filePath+ "/" + FileHandlingSelectedBudget + filePath + FileHandlingSelectedBudget .readSelectedBudget( filePath + "SelectedBudget") + "/Income"); expenseRegister = loadExpenseDataFromFile( - "budgets/" + FileHandlingSelectedBudget + filePath + FileHandlingSelectedBudget .readSelectedBudget(filePath + "SelectedBudget") + "/Expense"); } catch (IOException ioe) { showErrorDialogBox("File reading error", "Could not read register", ""); diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/budget/FileHandlingSelectedBudget.java b/src/main/java/no/ntnu/idatt1002/demo/data/budget/FileHandlingSelectedBudget.java index ffc53faa3fe0e133c78f94a61c9899608a4057ba..68a8fe91afd31de651033796791ae977d7bf918d 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/data/budget/FileHandlingSelectedBudget.java +++ b/src/main/java/no/ntnu/idatt1002/demo/data/budget/FileHandlingSelectedBudget.java @@ -143,6 +143,7 @@ public class FileHandlingSelectedBudget { * @throws IOException if an input or output exception occurred. */ public static boolean createNewIncomeFile(String budgetDestination, String incomeFileTitle) + // TODO: Se over throws IOException { System.out.println("Income filePath: " + budgetDestination + "/" + incomeFileTitle + registerFileType);