Major refactor of the Commands classes and the handling of responses

Author: weixue123

src/main/java/duke/commands/AddEventCommand.java

@@ -1,25 +1,21 @@
 package duke.commands;
 
-import java.time.LocalDateTime;
-
-import duke.tasks.Deadline;
+import duke.tasks.Task;
 import duke.tasks.TaskList;
-import duke.ui.Ui;
 
 /**
- * Handles the logic of adding a <code>Deadline</code> to the to-do list.
+ * Handles the logic of adding a <code>Task</code> to the to-do list.
  */
-public class AddDeadlineCommand extends Command {
-    private final Deadline deadline;
+public class AddTaskCommand extends Command {
+    private final Task task;
 
     /**
-     * Initializes a command to add a <code>Deadline</code> with a description and a datetime.
+     * Initializes a command to add a <code>Task</code> to the to-do list.
      *
-     * @param description Description of the deadline task.
-     * @param byDateTime  The task's deadline.
+     * @param task The <code>Task</code> to be added to the to-do list.
      */
-    public AddDeadlineCommand(String description, LocalDateTime byDateTime) {
-        this.deadline = new Deadline(description, byDateTime);
+    public AddTaskCommand(Task task) {
+        this.task = task;
     }
 
     /**
@@ -32,21 +28,23 @@ public boolean isExit() {
     }
 
     /**
-     * Adds the created <code>Deadline</code> to the input <code>TaskList</code>.
+     * Adds the created <code>Task</code> to the input <code>TaskList</code>.
      *
      * @param tasks A collection of <code>Task</code> objects representing the application's state.
      */
     public void execute(TaskList tasks) {
-        tasks.addTask(this.deadline);
+        tasks.addTask(this.task);
     }
 
     /**
-     * Computes a response to notify the users the adding of the <code>Deadline</code>.
+     * Computes a response to notify the users the adding of the <code>Task</code>.
      *
      * @param tasks A collection of <code>Task</code> objects representing the application's state.
      * @return A <code>String</code> to respond to the adding of the <code>Deadline</code>.
      */
     public String getResponse(TaskList tasks) {
-        return Ui.getAddTaskResponse(tasks, this.deadline);
+        return "Got it. I've added this task:\n"
+                + this.task.getStatusString() + "\n"
+                + "Now you have " + tasks.getSize() + " task(s) in the list.";
     }
 }

…va/duke/commands/AddDeadlineCommand.java …n/java/duke/commands/AddTaskCommand.javasrc/main/java/duke/commands/AddDeadlineCommand.java renamed to src/main/java/duke/commands/AddTaskCommand.java src/main/java/duke/commands/AddDeadlineCommand.java renamed to src/main/java/duke/commands/AddTaskCommand.java

@@ -1,7 +1,6 @@
 package duke.commands;
 
 import duke.tasks.TaskList;
-import duke.ui.Ui;
 
 /**
  * Handles the logic of terminating the application.
@@ -32,6 +31,6 @@ public void execute(TaskList tasks) {
      * @return A <code>String</code> to respond to the closing of the application.
      */
     public String getResponse(TaskList tasks) {
-        return Ui.getByeResponse();
+        return "Bye. Hope to see you again soon!";
     }
 }

src/main/java/duke/commands/AddToDoCommand.java

@@ -1,8 +1,8 @@
 package duke.commands;
 
+import duke.exceptions.TaskNumberNotExistException;
 import duke.tasks.Task;
 import duke.tasks.TaskList;
-import duke.ui.Ui;
 
 /**
  * Handles the logic of deleting a task from the to-do list.
@@ -48,6 +48,14 @@ public void execute(TaskList tasks) {
      * @return A <code>String</code> to respond to the deletion of a <code>Task</code> (if any).
      */
     public String getResponse(TaskList tasks) {
-        return Ui.getDeleteResponse(this.deletedTask, this.index);
+        try {
+            if (null == this.deletedTask) {
+                throw new TaskNumberNotExistException(this.index);
+            }
+        } catch (TaskNumberNotExistException e) {
+            return e.getMessage();
+        }
+
+        return "Noted. I've removed this task:\n" + this.deletedTask.getStatusString();
     }
 }

src/main/java/duke/commands/ByeCommand.java

@@ -1,8 +1,8 @@
 package duke.commands;
 
+import duke.exceptions.TaskNumberNotExistException;
 import duke.tasks.Task;
 import duke.tasks.TaskList;
-import duke.ui.Ui;
 
 /**
  * Handles the logic of marking a task in the to-do as done.
@@ -50,6 +50,14 @@ public void execute(TaskList tasks) {
      * @return A <code>String</code> to respond to marking a <code>Task</code> as done.
      */
     public String getResponse(TaskList tasks) {
-        return Ui.getDoneResponse(this.doneTask, this.index);
+        try {
+            if (null == this.doneTask) {
+                throw new TaskNumberNotExistException(this.index);
+            }
+        } catch (TaskNumberNotExistException e) {
+            return e.getMessage();
+        }
+
+        return "Nice! I've marked this task as done:\n" + this.doneTask.getStatusString();
     }
 }

src/main/java/duke/commands/DeleteCommand.java

@@ -2,7 +2,6 @@
 
 import duke.tasks.Task;
 import duke.tasks.TaskList;
-import duke.ui.Ui;
 
 /**
  * Handles the logic of searching the to-do list for tasks that matches certain keywords.
@@ -57,6 +56,10 @@ public String getResponse(TaskList tasks) {
             }
         }
 
-        return Ui.getFindResponse(matchingTasks, this.keywords);
+        if (matchingTasks.getSize() == 0) {
+            return "There are no tasks matching the '" + this.keywords + "' in your list :O";
+        } else {
+            return "Here are the matching tasks in your list:\n" + matchingTasks.getTaskListAsString();
+        }
     }
 }

src/main/java/duke/commands/DoneCommand.java

@@ -1,16 +1,15 @@
 package duke.commands;
 
 import duke.tasks.TaskList;
-import duke.ui.Ui;
 
 /**
  * Handles the logic for when the users input invalid commands
  */
-public class DoNothingCommand extends Command {
-    private final String exceptionMessage;
+public class InvalidInputCommand extends Command {
+    private final String message;
 
-    public DoNothingCommand(String exceptionMessage) {
-        this.exceptionMessage = exceptionMessage;
+    public InvalidInputCommand(String message) {
+        this.message = message;
     }
 
     /**
@@ -28,7 +27,7 @@ public void execute(TaskList tasks) {
      * @return Error message
      */
     public String getResponse(TaskList tasks) {
-        return this.exceptionMessage;
+        return this.message;
     }
 
     /**

src/main/java/duke/commands/FindCommand.java

@@ -1,7 +1,6 @@
 package duke.commands;
 
 import duke.tasks.TaskList;
-import duke.ui.Ui;
 
 /**
  * Handles the logic of listing the tasks in the to-do list.
@@ -34,6 +33,10 @@ public boolean isExit() {
      * @return A <code>String</code> displaying the existing tasks.
      */
     public String getResponse(TaskList tasks) {
-        return Ui.getListResponse(tasks);
+        if (tasks.getSize() == 0) {
+            return "You have no tasks in your list yet :)";
+        } else {
+            return "Here are the task(s) in your list:\n" + tasks.getTaskListAsString();
+        }
     }
 }

…java/duke/commands/DoNothingCommand.java …a/duke/commands/InvalidInputCommand.javasrc/main/java/duke/commands/DoNothingCommand.java renamed to src/main/java/duke/commands/InvalidInputCommand.java src/main/java/duke/commands/DoNothingCommand.java renamed to src/main/java/duke/commands/InvalidInputCommand.java

@@ -70,7 +70,6 @@ public void saveTasks(TaskList tasks) {
         } catch (IOException e) {
             e.printStackTrace();
         }
-
     }
 
     /**
@@ -91,15 +90,21 @@ private Task createTaskFromSavedString(String taskDetails) {
         LocalDateTime dateTime = Parser.convertToDateTime(dateTimeString);
 
         Task newTask;
-        if (taskType.equals("T")) {
+        switch (taskType) {
+        case "T":
             newTask = new ToDo(description);
-        } else if (taskType.equals("D")) {
+            break;
+        case "D":
             newTask = new Deadline(description, dateTime);
-        } else {
+            break;
+        case "E":
             newTask = new Event(description, dateTime);
+            break;
+        default:
+            newTask = null;
         }
 
-        if (done.equals("1")) {
+        if (done.equals("1") && newTask != null) {
             newTask.markAsDone();
         }
 
@@ -125,8 +130,10 @@ private String convertTaskToSavableString(Task task) {
         } else if (task instanceof Event) {
             taskType = "E";
             dateTimeString = ((Event) task).getAtDateTimeString();
-        } else {
+        } else if (task instanceof ToDo) {
             taskType = "T";
+        } else {
+            return "";
         }
 
         String done = task.isDone() ? "1" : "0";