Minor fix

AY1920S1-CS2103T-W11-1 · Oct 15, 2019 · 76560cd · 76560cd
1 parent 720b776
commit 76560cd
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 42 deletions.
diff --git a/src/main/java/seedu/algobase/logic/commands/DeleteTaskCommand.java b/src/main/java/seedu/algobase/logic/commands/DeleteTaskCommand.java
@@ -37,7 +37,7 @@ public class DeleteTaskCommand extends Command {
     private final DeleteTaskDescriptor deleteTaskDescriptor;
 
     /**
-     * Creates a DeleteTaskCommand to delete a {@code Task} to the specified {@code Plan}
+     * Creates a DeleteTaskCommand to delete a {@code Task} in the specified {@code Plan}
      *
      * @param deleteTaskDescriptor details of the plan and problem involved
      */
@@ -55,11 +55,10 @@ public CommandResult execute(Model model) throws CommandException {
         }
 
         Plan planToUpdate = lastShownPlanList.get(deleteTaskDescriptor.planIndex.getZeroBased());
-        Set<Task> taskSet = planToUpdate.getTasks();
-        List<Task> taskList = new ArrayList<>(taskSet);
+        List<Task> taskList = new ArrayList<>(planToUpdate.getTasks());
         Task task = taskList.get(deleteTaskDescriptor.taskIndex.getZeroBased());
         taskList.remove(deleteTaskDescriptor.taskIndex.getZeroBased());
-        taskSet = new HashSet<>(taskList);
+        Set<Task> taskSet = new HashSet<>(taskList);
         Plan updatedPlan = Plan.createUpdatedPlan(planToUpdate, taskSet);
         model.setPlan(planToUpdate, updatedPlan);
         return new CommandResult(String.format(MESSAGE_DELETE_TASK_SUCCESS, task));

diff --git a/src/main/java/seedu/algobase/logic/commands/DoneTaskCommand.java b/src/main/java/seedu/algobase/logic/commands/DoneTaskCommand.java
@@ -55,11 +55,10 @@ public CommandResult execute(Model model) throws CommandException {
         }
 
         Plan planToUpdate = lastShownPlanList.get(doneTaskDescriptor.planIndex.getZeroBased());
-        Set<Task> taskSet = planToUpdate.getTasks();
-        List<Task> taskList = new ArrayList<>(taskSet);
+        List<Task> taskList = new ArrayList<>(planToUpdate.getTasks());
         Task task = taskList.get(doneTaskDescriptor.taskIndex.getZeroBased());
         taskList.remove(doneTaskDescriptor.taskIndex.getZeroBased());
-        taskSet = new HashSet<>(taskList);
+        Set<Task> taskSet = new HashSet<>(taskList);
         taskSet.add(new Task(task.getProblem(), true));
         Plan updatedPlan = Plan.createUpdatedPlan(planToUpdate, taskSet);
         model.setPlan(planToUpdate, updatedPlan);

diff --git a/src/main/java/seedu/algobase/logic/commands/UndoneTaskCommand.java b/src/main/java/seedu/algobase/logic/commands/UndoneTaskCommand.java
@@ -55,11 +55,10 @@ public CommandResult execute(Model model) throws CommandException {
         }
 
         Plan planToUpdate = lastShownPlanList.get(undoneTaskDescriptor.planIndex.getZeroBased());
-        Set<Task> taskSet = planToUpdate.getTasks();
-        List<Task> taskList = new ArrayList<>(taskSet);
+        List<Task> taskList = new ArrayList<>(planToUpdate.getTasks());
         Task task = taskList.get(undoneTaskDescriptor.taskIndex.getZeroBased());
         taskList.remove(undoneTaskDescriptor.taskIndex.getZeroBased());
-        taskSet = new HashSet<>(taskList);
+        Set<Task> taskSet = new HashSet<>(taskList);
         taskSet.add(new Task(task.getProblem(), false));
         Plan updatedPlan = Plan.createUpdatedPlan(planToUpdate, taskSet);
         model.setPlan(planToUpdate, updatedPlan);

diff --git a/src/main/java/seedu/algobase/logic/parser/AlgoBaseParser.java b/src/main/java/seedu/algobase/logic/parser/AlgoBaseParser.java
@@ -55,64 +55,67 @@ public Command parseCommand(String userInput) throws ParseException {
         final String arguments = matcher.group("arguments");
         switch (commandWord) {
 
-        // Problems
+        //Problem
         case AddCommand.COMMAND_WORD:
             return new AddCommandParser().parse(arguments);
 
-        case AddPlanCommand.COMMAND_WORD:
-            return new AddPlanCommandParser().parse(arguments);
+        case DeleteCommand.COMMAND_WORD:
+            return new DeleteCommandParser().parse(arguments);
 
-        case AddTaskCommand.COMMAND_WORD:
-            return new AddTaskCommandParser().parse(arguments);
+        case EditCommand.COMMAND_WORD:
+            return new EditCommandParser().parse(arguments);
 
-        case ClearCommand.COMMAND_WORD:
-            return new ClearCommand();
+        case FindCommand.COMMAND_WORD:
+            return new FindCommandParser().parse(arguments);
 
-        case DeleteCommand.COMMAND_WORD:
-            return new DeleteCommandParser().parse(arguments);
+        case ListCommand.COMMAND_WORD:
+            return new ListCommand();
+
+        case SortCommand.COMMAND_WORD:
+            return new SortCommandParser().parse(arguments);
+
+        //Plan
+        case AddPlanCommand.COMMAND_WORD:
+            return new AddPlanCommandParser().parse(arguments);
 
         case DeletePlanCommand.COMMAND_WORD:
             return new DeletePlanCommandParser().parse(arguments);
 
+        case EditPlanCommand.COMMAND_WORD:
+            return new EditPlanCommandParser().parse(arguments);
+
+        case FindPlanCommand.COMMAND_WORD:
+            return new FindPlanCommandParser().parse(arguments);
+
+        case ListPlanCommand.COMMAND_WORD:
+            return new ListPlanCommand();
+
+        //Task
+        case AddTaskCommand.COMMAND_WORD:
+            return new AddTaskCommandParser().parse(arguments);
+
         case DeleteTaskCommand.COMMAND_WORD:
             return new DeleteTaskCommandParser().parse(arguments);
 
         case DoneTaskCommand.COMMAND_WORD:
             return new DoneTaskCommandParser().parse(arguments);
 
-        case EditCommand.COMMAND_WORD:
-            return new EditCommandParser().parse(arguments);
+        case UndoneTaskCommand.COMMAND_WORD:
+            return new UndoneTaskCommandParser().parse(arguments);
 
-        case EditPlanCommand.COMMAND_WORD:
-            return new EditPlanCommandParser().parse(arguments);
+        //Util
+        case ClearCommand.COMMAND_WORD:
+            return new ClearCommand();
 
         case ExitCommand.COMMAND_WORD:
             return new ExitCommand();
 
-        case FindCommand.COMMAND_WORD:
-            return new FindCommandParser().parse(arguments);
-
-        case FindPlanCommand.COMMAND_WORD:
-            return new FindPlanCommandParser().parse(arguments);
-
         case HelpCommand.COMMAND_WORD:
             return new HelpCommand();
 
-        case ListCommand.COMMAND_WORD:
-            return new ListCommand();
-
-        case ListPlanCommand.COMMAND_WORD:
-            return new ListPlanCommand();
-
-        case SortCommand.COMMAND_WORD:
-            return new SortCommandParser().parse(arguments);
-
         case SwitchCommand.COMMAND_WORD:
             return new SwitchCommandParser().parse(arguments);
 
-        case UndoneTaskCommand.COMMAND_WORD:
-            return new UndoneTaskCommandParser().parse(arguments);
-
         default:
             throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
         }

diff --git a/src/main/java/seedu/algobase/logic/parser/CliSyntax.java b/src/main/java/seedu/algobase/logic/parser/CliSyntax.java
@@ -17,7 +17,7 @@ public class CliSyntax {
     public static final Prefix PREFIX_SORTING_METHOD = new Prefix("m/");
     public static final Prefix PREFIX_SORTING_ORDER = new Prefix("ord/");
     public static final Prefix PREFIX_PLAN = new Prefix("plan/");
-    public static final Prefix PREFIX_PROBLEM = new Prefix("pro/");
+    public static final Prefix PREFIX_PROBLEM = new Prefix("prob/");
     public static final Prefix PREFIX_TASK = new Prefix("task/");
     public static final Prefix PREFIX_START_DATE = new Prefix("s/");
     public static final Prefix PREFIX_END_DATE = new Prefix("e/");