Merge branch-A-Personality to master

src/main/java/corgi/commands/AddTaskCommand.java

@@ -3,8 +3,11 @@
 import java.util.Stack;
 
 import corgi.State;
+import corgi.tasks.Deadline;
+import corgi.tasks.Event;
 import corgi.tasks.Task;
 import corgi.tasks.TaskList;
+import corgi.tasks.ToDo;
 import corgi.ui.TextRenderer;
 import javafx.util.Pair;
 
@@ -33,6 +36,13 @@ public class AddTaskCommand extends Command {
     public AddTaskCommand(Task target) {
         super(false);
         this.target = target;
+        if (target instanceof ToDo) {
+            this.taskType = "todo";
+        } else if (target instanceof Deadline) {
+            this.taskType = "deadline";
+        } else if (target instanceof Event) {
+            this.taskType = "event";
+        }
     }
 
     /**

src/main/java/corgi/ui/TextRenderer.java

@@ -95,13 +95,6 @@ public String showTaskAdded(String type, String taskInfo, int currentListSize) {
                 "\nNow you have " + currentListSize + " " + (currentListSize > 1 ? "tasks" : "task") + " in the list.");
     }
 
-    /**
-     * Display a message indicating tasks have been loaded from data file.
-     */
-    public String showTasksLoaded(int size) {
-        return returnMessage("Successfully loaded " + size + " tasks!");
-    }
-
     /**
      * Display a exit message.
      */
@@ -115,7 +108,8 @@ public String showExitMsg() {
      * @param date The target date.
      */
     public String showNoTaskOnDate(String date) {
-        return returnMessage("No tasks or events are scheduled for " + date + ".");
+        return returnMessage("Ugh, seriously? No tasks or events on " + date
+                + "? What a waste of time.");
     }
 
     /**
@@ -125,7 +119,11 @@ public String showNoTaskOnDate(String date) {
      * @param tasksOnDate The tasks occurred on the target date.
      */
     public String showTasksOnDate(String date, String tasksOnDate) {
-        return returnMessage("Here are the tasks and events happening on " + date + ":", tasksOnDate);
+        return returnMessage("Fine, here's what's going on on " + date + ":",
+                "",
+                tasksOnDate,
+                "",
+                "Don't expect me to be excited about it.");
     }
 
     /**
@@ -134,7 +132,8 @@ public String showTasksOnDate(String date, String tasksOnDate) {
      * @param keyword The target keyword.
      */
     public String showKeywordNotFound(String keyword) {
-        return returnMessage("No task containing keyword \"" + keyword + "\".");
+        return returnMessage("No task with that annoying keyword \"" + keyword
+                + "\" found. It's like searching for a bone in an empty bowl.");
     }
 
     /**
@@ -145,7 +144,8 @@ public String showKeywordNotFound(String keyword) {
      */
     public String showTasksWithKeyword(String keyword, String tasksContainKeyword) {
         return returnMessage(
-                "Here are the tasks containing keyword \"" + keyword + "\":",
+                "Ugh, fine, I found tasks with that ridiculous keyword \"" + keyword + "\":",
+                "",
                 tasksContainKeyword);
     }
 
@@ -203,7 +203,15 @@ public String showTaskList(String taskList) {
         return taskList;
     }
 
+    /**
+     * Generates a message indicating a successful undo of the last command.
+     *
+     * @param commandDesc The description of the undone command.
+     * @return A string message indicating the successful undo.
+     */
     public String showUndoSucceed(String commandDesc) {
-        return returnMessage("Undo successful: " + commandDesc);
+        return returnMessage("Argh, fine!",
+                "I undid it: " + commandDesc,
+                "You better think twice next time!");
     }
 }