Merge pull request nus-cs2103-AY2021S1#80 from yuanxing-y/master

Fix nits in conflicts

src/main/java/seedu/address/logic/commands/SetBudgetCommand.java

@@ -1,13 +1,12 @@
 package seedu.address.logic.commands;
 
-import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 
 import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
 
 public class SetBudgetCommand extends Command {
     public static final String COMMAND_WORD = "setBudget";
-    public static final String MESSAGE_SET_BUDGET_SUCCESS = "Successful! Te budget is now S$ %.2f.\n";
+    public static final String MESSAGE_SET_BUDGET_SUCCESS = "Successful! The budget is now S$ %.2f.\n";
     public static final String MESSAGE_SET_BUDGET_FAIL = "Set Budget failed, please enter a valid budget.\n";
 
     private final double budget;
@@ -18,7 +17,7 @@ public SetBudgetCommand(double budget) {
     }
 
     @Override
-    public CommandResult execute(Model model) throws CommandException {
+    public CommandResult execute(Model model) {
         model.setExpenseBookBudget(budget);
         String msg = String.format(MESSAGE_SET_BUDGET_SUCCESS, budget);
         return new CommandResult(msg);

src/main/java/seedu/address/logic/commands/ShowBudgetCommand.java

@@ -1,24 +1,24 @@
 package seedu.address.logic.commands;
 
-import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 
 public class ShowBudgetCommand extends Command {
 
     public static final String COMMAND_WORD = "showBudget";
     public static final String MESSAGE_BUDGET = "Current budget is: S$ %.2f\n";
     public static final String MESSAGE_REMAINING = "Remaining budget is: S$ %.2f\n";
-    public static final String MESSAGE_SETNEW = "Your current budget is S$0.00, \n"
+    public static final String MESSAGE_SETNEW = "Your current budget is S$ %.2f, \n"
             + "please set a new budget with command: setBudget AMOUNT\n";
 
     @Override
-    public CommandResult execute(Model model) throws CommandException {
-        if (model.getExpenseBookBudget() == 0) {
-            return new CommandResult(MESSAGE_SETNEW);
+    public CommandResult execute(Model model) {
+        double budget = model.getExpenseBookBudget();
+        if (model.getExpenseBookBudget() <= 0) {
+            String setNew = String.format(MESSAGE_SETNEW, budget);
+            return new CommandResult(setNew);
         } else {
-            String budgetMsg = String.format(MESSAGE_BUDGET, model.getExpenseBookBudget());
+            String budgetMsg = String.format(MESSAGE_BUDGET, budget);
             String remainingMsg = String.format(MESSAGE_REMAINING, model.getExpenseBookRemaining());
-
             return new CommandResult(budgetMsg + remainingMsg);
         }
     }

src/main/java/seedu/address/logic/parser/ExpenseBookParser.java

@@ -45,16 +45,16 @@ public Command parseCommand(String userInput) throws ParseException {
         switch (commandWord) {
         case DescriptionCommand.COMMAND_WORD:
             return new DescriptionCommandParser().parse(arguments);
+
         case AddExpenseCommand.COMMAND_WORD:
             return new AddExpenseCommandParser().parse(arguments);
+
         case DeleteExpenseCommand.COMMAND_WORD:
             return new DeleteExpenseCommandParser().parse(arguments);
 
         case ListExpenseCommand.COMMAND_WORD:
             return new ListExpenseCommand();
 
-        case DescriptionCommand.COMMAND_WORD:
-            return new DescriptionCommandParser().parse(arguments);
         case DeleteDescriptionCommand.COMMAND_WORD:
             return new DeleteDescriptionCommandParser().parse(arguments);
 
@@ -63,8 +63,9 @@ public Command parseCommand(String userInput) throws ParseException {
 
         case SetBudgetCommand.COMMAND_WORD:
             return new SetBudgetCommandParser().parse(arguments);
+
         default:
-                throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
+            throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
         }
     }
 }