Remove unnecessary comments

src/main/java/seedu/address/model/FinanceTracker.java

@@ -112,15 +112,6 @@ public boolean hasExpense(Expense expense) {
      */
     public void addExpense(Expense p) {
         expenses.add(p);
-        /*
-        int index = budgets.getIndex(p.getCategory());
-        if (index != -1) {
-            Budget targetBudget = budgets.get(p.getCategory());
-            Budget updatedBudget = budgets.get(p.getCategory());
-            updatedBudget.updateTotalSpent(p.getAmount().value);
-            updatedBudget.updatePercentage();
-            budgets.setBudget(targetBudget, updatedBudget);
-        }*/
         indicateModified();
     }
 
@@ -140,17 +131,6 @@ public void setExpense(Expense target, Expense editedExpense) {
      */
     public void removeExpense(Expense key) {
         expenses.remove(key);
-
-        /*
-        int index = budgets.getIndex(key.getCategory());
-        if (index != -1) {
-            Budget targetBudget = budgets.get(key.getCategory());
-            Budget updatedBudget = budgets.get(key.getCategory());
-            double diff = 0 - key.getAmount().value;
-            updatedBudget.updateTotalSpent(diff);
-            updatedBudget.updatePercentage();
-            budgets.setBudget(targetBudget, updatedBudget);
-        }*/
         indicateModified();
     }
 
@@ -223,7 +203,6 @@ public void setBudget(Budget target, Budget editedBudget) {
         indicateModified();
     }
 
-
     /**
      * Removes {@code key} from this {@code FinanceTracker}.
      * {@code key} must exist in the budget list in the finance tracker.
@@ -233,7 +212,6 @@ public void removeBudget(Budget key) {
         indicateModified();
     }
 
-
     //// recurring-level operations =====================================================================
 
     /**
@@ -292,7 +270,7 @@ protected void indicateModified() {
         invalidationListenerManager.callListeners(this);
     }
 
-    //// util methods
+    //// util methods ==========================================================================
 
     @Override
     public String toString() {

src/main/java/seedu/address/model/ModelManager.java

@@ -158,6 +158,7 @@ public boolean hasExpense(Expense expense) {
     @Override
     public void deleteExpense(Expense target) {
         versionedFinanceTracker.removeExpense(target);
+        // update totalSpent of budget of respective category
         int index = -1;
         for (Budget budget : filteredBudgets) {
             if (budget.getCategory() == target.getCategory()) {
@@ -182,6 +183,7 @@ public void deleteExpense(Expense target) {
     public void addExpense(Expense expense) {
         versionedFinanceTracker.addExpense(expense);
         updateFilteredExpenseList(PREDICATE_SHOW_ALL_EXPENSES);
+        // update totalSpent of budget of respective category
         unfilteredExpenses = versionedFinanceTracker.getExpenseList();
         int index = -1;
         for (Budget budget : filteredBudgets) {
@@ -207,16 +209,17 @@ public void addExpense(Expense expense) {
     public void setExpense(Expense target, Expense editedExpense) {
         requireAllNonNull(target, editedExpense);
         versionedFinanceTracker.setExpense(target, editedExpense);
+        // update totalSpent of budget of respective category
         unfilteredExpenses = versionedFinanceTracker.getExpenseList();
-        // find budget of initial category
+        // identify budget of category of target
         int index = -1;
         for (Budget budget : filteredBudgets) {
             if (budget.getCategory() == target.getCategory()) {
                 index = filteredBudgets.indexOf(budget);
                 break;
             }
         }
-        // find budget of edited category
+        // identify budget of category of editedExpense
         int index2 = -1;
         for (Budget budget : filteredBudgets) {
             if (budget.getCategory() == editedExpense.getCategory()) {
@@ -231,14 +234,12 @@ public void setExpense(Expense target, Expense editedExpense) {
             return;
         }
 
-        // NOW YOU KNOW THAT AT LEAST ONE OF AMOUNT, CATEGORY AND DATE HAS BEEN CHANGED
-
         Budget targetBudget = filteredBudgets.get(index);
         Budget updatedBudget = new Budget(filteredBudgets.get(index));
         Budget targetBudget2 = filteredBudgets.get(index2);
         Budget updatedBudget2 = new Budget(filteredBudgets.get(index2));
 
-        // only amount changed. index != -1, index1 == -1.
+        // case where only amount is edited.
         if (target.getAmount() != editedExpense.getAmount()
                 && target.getCategory() == editedExpense.getCategory()
                 && target.getDate() == editedExpense.getDate()) {
@@ -247,16 +248,16 @@ public void setExpense(Expense target, Expense editedExpense) {
             updatedBudget.updatePercentage();
         }
 
-        // date changed, category unchanged. index != -1, index1 == -1.
+        // date changed, category unchanged.
         if (target.getDate() != editedExpense.getDate() && target.getCategory() == editedExpense.getCategory()) {
-            // initial date and edited date both not within budget's time frame
+            // target date and editedExpense date both not within budget's time frame
             if ((target.getDate().getLocalDate().isBefore(targetBudget.getStartDate().getLocalDate())
                     || target.getDate().getLocalDate().isAfter(targetBudget.getEndDate().getLocalDate()))
                     && (editedExpense.getDate().getLocalDate().isBefore(targetBudget.getStartDate().getLocalDate())
                     || editedExpense.getDate().getLocalDate().isAfter(targetBudget.getEndDate().getLocalDate()))) {
                 return;
             }
-            // initial date not within budget time frame but edited date is, add to totalSpent
+            // target date not within budget time frame but editedExpense date is, add to totalSpent of updatedBudget2
             if ((target.getDate().getLocalDate().isBefore(targetBudget.getStartDate().getLocalDate())
                     || target.getDate().getLocalDate().isAfter(targetBudget.getEndDate().getLocalDate()))
                     && !(editedExpense.getDate().getLocalDate().isBefore(targetBudget.getStartDate().getLocalDate())
@@ -267,24 +268,24 @@ public void setExpense(Expense target, Expense editedExpense) {
                     || target.getDate().getLocalDate().isAfter(targetBudget.getEndDate().getLocalDate()))
                     && (editedExpense.getDate().getLocalDate().isBefore(targetBudget.getStartDate().getLocalDate())
                     || editedExpense.getDate().getLocalDate().isAfter(targetBudget.getEndDate().getLocalDate()))) {
-                // initial date is within budget time frame but edited date is no longer within budget's duration
+                // target date is within budget time frame but editedExpense date is no longer within budget's duration
                 updatedBudget.updateTotalSpent(0 - target.getAmount().value);
                 updatedBudget.updatePercentage();
             } else if (!(target.getDate().getLocalDate().isBefore(targetBudget.getStartDate().getLocalDate())
                     || target.getDate().getLocalDate().isAfter(targetBudget.getEndDate().getLocalDate()))
                     && !(editedExpense.getDate().getLocalDate().isBefore(targetBudget.getStartDate().getLocalDate())
                     || editedExpense.getDate().getLocalDate().isAfter(targetBudget.getEndDate().getLocalDate()))) {
-                // initial date and edited date are both within budget time frame
+                // target date and editedExpense date are both within budget time frame
                 double diff = editedExpense.getAmount().value - target.getAmount().value;
                 updatedBudget.updateTotalSpent(diff);
                 updatedBudget.updatePercentage();
             }
         }
 
-        // category changed
+        // category of expense changed
         if (target.getCategory() != editedExpense.getCategory()) {
             if (index != -1) {
-                // check if initial date is within budget1 time frame
+                // check if target date is within budget1 time frame
                 if (!(target.getDate().getLocalDate().isBefore(targetBudget.getStartDate().getLocalDate())
                         || target.getDate().getLocalDate().isAfter(targetBudget.getEndDate().getLocalDate()))) {
                     updatedBudget.updateTotalSpent(0 - target.getAmount().value);

src/main/java/seedu/address/model/budget/Budget.java

@@ -31,7 +31,6 @@ public class Budget {
     private double percentage;
     private boolean isAboutToExceed; // when percentage reaches 90
 
-    // constructor
     public Budget(Category category, Amount amount, Date startDate, Date endDate, String remarks, int totalSpent,
                   double percentage) {
         requireAllNonNull(category, amount, endDate);
@@ -48,6 +47,7 @@ public Budget(Category category, Amount amount, Date startDate, Date endDate, St
         this.percentage = (((double) totalSpent) / amount.value) * 100;
         isAboutToExceed = false;
     }
+
     public Budget(Budget toCopy) {
         requireNonNull(toCopy);
         this.category = toCopy.category;
@@ -212,5 +212,4 @@ public String toString() {
         }
         return builder.toString();
     }
-
 }

src/test/java/seedu/address/model/budget/BudgetListTest.java

@@ -60,75 +60,30 @@ public void setExpense_targetBudgetNotInList_throwsBudgetNotFoundException() {
         budgetList.setBudget(BUDGET, BUDGET);
     }
 
-    /*@Test
-    public void setBudget_editedBudgetIsSameBudget_success() {
-        budgetList.addBudget(TRAVEL_BUDGET);
-        budgetList.setBudget(TRAVEL_BUDGET, TRAVEL_BUDGET);
-        BudgetList expectedBudgetList = new BudgetList();
-        expectedBudgetList.addBudget(TRAVEL_BUDGET);
-        assertEquals(expectedBudgetList, budgetList);
-    }*/
-
-    /*@Test
-    public void setBudget_editedBudgetIsDifferentBudget_success() {
-        budgetList.addBudget(ENTERTAINMENT_BUDGET);
-        budgetList.setBudget(ENTERTAINMENT_BUDGET, BUDGET);
-        BudgetList expectedBudgetList = new BudgetList();
-        expectedBudgetList.addBudget(BUDGET);
-        assertEquals(expectedBudgetList, budgetList);
-    }*/
-
     @Test
     public void setBudget_nullBudgetList_throwsNullPointerException() {
         thrown.expect(NullPointerException.class);
         budgetList.setBudgets((BudgetList) null);
     }
 
-    /*@Test
-    public void setBudget_budgetList_replacesOwnListWithProvidedBudgetList() {
-        budgetList.addBudget(UTILITIES_BUDGET);
-        BudgetList expectedBudgetList = new BudgetList();
-        expectedBudgetList.addBudget(SHOPPING_BUDGET);
-        budgetList.setBudgets(expectedBudgetList);
-        assertEquals(expectedBudgetList, budgetList);
-    }*/
-
     @Test
     public void setBudgets_nullList_throwsNullPointerException() {
         thrown.expect(NullPointerException.class);
         budgetList.setBudgets((List<Budget>) null);
     }
 
-    /*@Test
-    public void setBudgets_list_replacesOwnListWithProvidedList() {
-        budgetList.addBudget(WORK_BUDGET);
-        List<Budget> budgetList = Collections.singletonList(ENTERTAINMENT_BUDGET);
-        this.budgetList.setBudgets(budgetList);
-        BudgetList expectedBudgetList = new BudgetList();
-        expectedBudgetList.addBudget(ENTERTAINMENT_BUDGET);
-        assertEquals(expectedBudgetList, this.budgetList);
-    }*/
-
-    /*@Test
+    @Test
     public void remove_nullBudget_throwsNullPointerException() {
         thrown.expect(NullPointerException.class);
         budgetList.removeBudget(null);
-    }*/
+    }
 
     @Test
     public void remove_budgetDoesNotExist_throwsBudgetNotFoundException() {
         thrown.expect(BudgetNotFoundException.class);
         budgetList.removeBudget(HEALTHCARE_BUDGET);
     }
 
-    /*@Test
-    public void remove_existingBudget_removesBudget() {
-        budgetList.addBudget(WORK_BUDGET);
-        budgetList.removeBudget(WORK_BUDGET);
-        BudgetList expectedBudgetList = new BudgetList();
-        assertEquals(expectedBudgetList, budgetList);
-    }*/
-
     @Test
     public void asUnmodifiableObservableList_modifyList_throwsUnsupportedOperationException() {
         thrown.expect(UnsupportedOperationException.class);

src/test/java/seedu/address/model/budget/BudgetTest.java

@@ -7,6 +7,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.VALID_CATEGORY_DEBT;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_ENDDATE_BUDGET;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_REMARKS_BUDGET;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_REMARKS_DEBT;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_STARTDATE_BUDGET;
 import static seedu.address.testutil.TypicalBudgets.BUDGET;
 import static seedu.address.testutil.TypicalBudgets.FOOD_BUDGET;
@@ -63,15 +64,15 @@ public void isSameBudget() {
         assertFalse(FOOD_BUDGET.equals(editedBudget));
 
         // different remarks -> returns false
-        //editedBudget = new BudgetBuilder(FOOD_BUDGET).withRemarks(VALID_REMARKS_DEBT).build();
-        //assertFalse(FOOD_BUDGET.equals(editedBudget));
+        editedBudget = new BudgetBuilder(FOOD_BUDGET).withRemarks(VALID_REMARKS_DEBT).build();
+        assertFalse(FOOD_BUDGET.equals(editedBudget));
     }
 
     @Test
     public void equals() {
         // same values -> returns true
-        //Budget budgetCopy = new BudgetBuilder(FOOD_BUDGET).build();
-        // assertTrue(FOOD_BUDGET.equals(budgetCopy));
+        Budget budgetCopy = new BudgetBuilder(FOOD_BUDGET).build();
+        assertTrue(FOOD_BUDGET.equals(budgetCopy));
 
         // same object -> returns true
         assertTrue(FOOD_BUDGET.equals(FOOD_BUDGET));

src/test/java/systemtests/budgetsystemtests/AddBudgetCommandSystemTest.java

@@ -73,8 +73,7 @@ public void add() {
 
         /* ----------------------------------- Perform invalid add operations --------------------------------------- */
 
-        /* Case:
-        missing category -> rejected */
+        /* Case: missing category -> rejected */
         command = AddBudgetCommand.COMMAND_WORD + AMOUNT_DESC_BUDGET + STARTDATE_DESC_BUDGET + ENDDATE_DESC_BUDGET
                 + REMARKS_DESC_BUDGET;
         assertCommandFailure(command, String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddBudgetCommand.MESSAGE_USAGE));

src/test/java/systemtests/budgetsystemtests/DeleteBudgetCommandSystemTest.java

@@ -11,6 +11,8 @@
 
 import seedu.address.commons.core.Messages;
 import seedu.address.logic.commands.budgetcommands.DeleteBudgetCommand;
+import seedu.address.logic.commands.generalcommands.RedoCommand;
+import seedu.address.logic.commands.generalcommands.UndoCommand;
 import seedu.address.model.Model;
 import seedu.address.model.attributes.Category;
 import seedu.address.model.budget.Budget;
@@ -35,37 +37,16 @@ public void delete() {
         assertCommandSuccess(command, expectedModel, expectedResultMessage);
 
         /* Case: undo deleting the travel budget in the list -> travel budget restored */
-        /*command = UndoCommand.COMMAND_WORD;
+        command = UndoCommand.COMMAND_WORD;
         expectedResultMessage = UndoCommand.MESSAGE_SUCCESS;
         assertCommandSuccess(command, modelBeforeDeletingTravel, expectedResultMessage);
 
         /* Case: redo deleting the travel budget in the list -> travel budget deleted again */
-        /*command = RedoCommand.COMMAND_WORD;
+        command = RedoCommand.COMMAND_WORD;
         removeBudget(modelBeforeDeletingTravel, category);
         expectedResultMessage = RedoCommand.MESSAGE_SUCCESS;
         assertCommandSuccess(command, modelBeforeDeletingTravel, expectedResultMessage);
 
-        /* --------------------- Performing delete operation while a budget card is selected ---------------------- */
-        //implement selectbudget first
-        /* Case: delete the selected budget -> budget list panel selects the budget before the deleted budget */
-        /*showAllExpenses();
-        expectedModel = getModel();
-        Category categorySelected = SHOPPING;
-        int selectedIndex = -1;
-        for (Budget budget : expectedModel.getFilteredBudgetList()) {
-            if (budget.getCategory() == categorySelected) {
-                selectedIndex = expectedModel.getFilteredBudgetList().indexOf(budget);
-                break;
-            }
-        }
-        int expectedIndex = selectedIndex - 1;
-        Category expectedCategory = expectedModel.getFilteredBudgetList().get(expectedIndex).getCategory();
-        //selectBudget(categorySelected);
-        command = DeleteBudgetCommand.COMMAND_WORD + " " + categorySelected.toString();
-        deletedBudget = removeBudget(expectedModel, categorySelected);
-        expectedResultMessage = String.format(MESSAGE_DELETE_BUDGET_SUCCESS, deletedBudget);
-        assertCommandSuccess(command, expectedModel, expectedResultMessage, expectedCategory);
-
         /* --------------------------------- Performing invalid delete operation ------------------------------------ */
 
         /* Case: invalid category -> rejected */

src/test/java/systemtests/budgetsystemtests/EditBudgetCommandSystemTest.java

@@ -76,7 +76,7 @@ public void edit() {
         assertCommandSuccess(command, category, BUDGET);
 
         /* Case: edit a budget with new values same as another budget's values -> edited
-         * In this case, test edits travel budget with values to be the same as food budget except for the category
+         * In this case, test edits travel budget with values to be the same as food budget
          */
         assertTrue(getModel().getFinanceTracker().getBudgetList().contains(BUDGET));
         category = FOOD;
@@ -110,21 +110,6 @@ public void edit() {
                 .build();
         assertCommandSuccess(command, category, editedBudget);
 
-        /* --------------------- Performing edit operation while a budget card is selected -------------------------*/
-        /* Case: selects first card in the budget list, edit a budget -> edited, card selection remains unchanged but
-         * browser url changes
-         */
-        /*
-        selectBudget(TRAVEL);
-
-        command = EditBudgetCommand.COMMAND_WORD + " " + CATEGORY_DESC_BUDGET + AMOUNT_DESC_EXPENSE
-                + STARTDATE_DESC_BUDGET_2 + ENDDATE_DESC_BUDGET_2 + REMARKS_DESC_BUDGET;
-        // this can be misleading: card selection actually remains unchanged but the
-        // browser's url is updated to reflect the new budget's amount, start date and end date
-        assertCommandSuccess(command, category, BUDGET, category);
-        */
-
-
         /* --------------------------------- Performing invalid edit operation -------------------------------------- */
 
         /* Case: invalid category -> rejected */