From 3639bc29fa019eb1788ac1ce277ffa56a8699c02 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 13 Aug 2022 09:56:34 +0800
Subject: [PATCH 01/67] Add basic bot requirements

---
 src/main/java/CommandMatcher.java | 25 +++++++++++
 src/main/java/Duke.java           | 74 ++++++++++++++++++++++++++++---
 2 files changed, 93 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/CommandMatcher.java

diff --git a/src/main/java/CommandMatcher.java b/src/main/java/CommandMatcher.java
new file mode 100644
index 0000000000..3ec27964b2
--- /dev/null
+++ b/src/main/java/CommandMatcher.java
@@ -0,0 +1,25 @@
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+public class CommandMatcher {
+    private Predicate<String> check;
+    private Consumer<String> action;
+    CommandMatcher(Predicate<String> check, Consumer<String> action) {
+        this.check = check;
+        this.action = action;
+    }
+
+    /**
+     * Checks if the string matches
+     * If it does, it would execute the action
+     * @param input The string to check if it is for this command
+     * @return if the string matches
+     */
+    public boolean run(String input) {
+        if (check.test(input)) {
+            action.accept(input);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
index 5d313334cc..530a6859a4 100644
--- a/src/main/java/Duke.java
+++ b/src/main/java/Duke.java
@@ -1,10 +1,72 @@
+import java.util.ArrayList;
+import java.util.Scanner;
+
 public class Duke {
+    /** List of commands */
+    private static ArrayList<CommandMatcher> commands;
+
+    /**
+     * Style a single line
+     * @param line what is to be printed
+     */
+    public static void messagePrint(String line) {
+        messagePrint(new String[]{line});
+    }
+
+    /**
+     * Style some lines, given as an array of lines
+     * @param lines the lines of what is to be printed
+     */
+    public static void messagePrint(String[] lines) {
+        System.out.println(",----------------------------------------------------------------");
+        for (String str : lines) {
+            System.out.print("| ");
+            System.out.println(str);
+        }
+        System.out.println("'----------------------------------------------------------------");
+    }
+
+    private static void greet() {
+        Duke.messagePrint(new String[]{
+                "...where is this again?",
+                "Oh, hello, I didn't see you there - I'm Anthea, a chatbot...",
+                "...or at least that's what they told me." });
+    }
+
+    private static void leave() {
+        Duke.messagePrint("It was nice to have you around, I'm going back to sleep...");
+    }
+
+    private static void initializeCommands() {
+        commands = new ArrayList<>();
+
+        // default command matcher - echo
+        commands.add(new CommandMatcher(
+                (str) -> true,
+                (str) -> Duke.messagePrint(str)));
+    }
+
+    private static void handleCommand(String command) {
+        for (CommandMatcher matcher : commands) {
+            if (matcher.run(command)) {
+                break;
+            }
+        }
+    }
+
     public static void main(String[] args) {
-        String logo = " ____        _        \n"
-                + "|  _ \\ _   _| | _____ \n"
-                + "| | | | | | | |/ / _ \\\n"
-                + "| |_| | |_| |   <  __/\n"
-                + "|____/ \\__,_|_|\\_\\___|\n";
-        System.out.println("Hello from\n" + logo);
+        greet();
+        initializeCommands();
+        Scanner input = new Scanner(System.in);
+        boolean keepRunning = true;
+        while (keepRunning) {
+            String command = input.nextLine();
+            if (command.equals("bye")) {
+                keepRunning = false;
+            } else {
+                handleCommand(command);
+            }
+        }
+        leave();
     }
 }

From c2e2fc30db50e6f486b014220a619b51a8407a0c Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Tue, 16 Aug 2022 13:37:18 +0800
Subject: [PATCH 02/67] Add listing feature

Text entered by the user is stored and can be displayed.
---
 src/main/java/Duke.java | 45 ++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
index 530a6859a4..9f028e7eaa 100644
--- a/src/main/java/Duke.java
+++ b/src/main/java/Duke.java
@@ -1,21 +1,26 @@
 import java.util.ArrayList;
 import java.util.Scanner;
 
+/**
+ * The main method of the chatbot, as well as its startup and teardown.
+ */
 public class Duke {
     /** List of commands */
     private static ArrayList<CommandMatcher> commands;
+    /** List of strings to remember */
+    private static ArrayList<String> list;
 
     /**
-     * Style a single line
-     * @param line what is to be printed
+     * Style and print a single line with a border.
+     * @param line line to be printed
      */
     public static void messagePrint(String line) {
         messagePrint(new String[]{line});
     }
 
     /**
-     * Style some lines, given as an array of lines
-     * @param lines the lines of what is to be printed
+     * Style and print lines with a border.
+     * @param lines lines to be printed
      */
     public static void messagePrint(String[] lines) {
         System.out.println(",----------------------------------------------------------------");
@@ -27,10 +32,12 @@ public static void messagePrint(String[] lines) {
     }
 
     private static void greet() {
-        Duke.messagePrint(new String[]{
-                "...where is this again?",
-                "Oh, hello, I didn't see you there - I'm Anthea, a chatbot...",
-                "...or at least that's what they told me." });
+        String[] greeting = {
+            "...where is this again?",
+            "Oh, hello, I didn't see you there - I'm Anthea, a chatbot...",
+            "...or at least that's what they told me."
+        };
+        Duke.messagePrint(greeting);
     }
 
     private static void leave() {
@@ -39,11 +46,21 @@ private static void leave() {
 
     private static void initializeCommands() {
         commands = new ArrayList<>();
+        list = new ArrayList<>();
 
-        // default command matcher - echo
-        commands.add(new CommandMatcher(
-                (str) -> true,
-                (str) -> Duke.messagePrint(str)));
+        commands.add(new CommandMatcher((str) -> str.equals("list"), (str) -> {
+            String[] output = new String[list.size()];
+            for (int i = 0; i < list.size(); i++) {
+                output[i] = (i + 1) + ". " + list.get(i);
+            }
+            Duke.messagePrint(output);
+        }));
+
+        // default command matcher - add to list
+        commands.add(new CommandMatcher((str) -> true, (str) -> {
+            list.add(str);
+            Duke.messagePrint("added: " + str);
+        }));
     }
 
     private static void handleCommand(String command) {
@@ -54,6 +71,10 @@ private static void handleCommand(String command) {
         }
     }
 
+    /**
+     * The main structure of the chatbot execution.
+     * @param args command line args which are not used
+     */
     public static void main(String[] args) {
         greet();
         initializeCommands();

From 1f5f99b8da0d3c13e6416a92f8ac581c631add4c Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Tue, 16 Aug 2022 14:10:52 +0800
Subject: [PATCH 03/67] Add ability to mark and unmark tasks as done

---
 src/main/java/CommandMatcher.java |  9 ++++++
 src/main/java/Duke.java           | 48 ++++++++++++++++++++++++++++---
 src/main/java/Task.java           | 29 +++++++++++++++++++
 3 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/Task.java

diff --git a/src/main/java/CommandMatcher.java b/src/main/java/CommandMatcher.java
index 3ec27964b2..ccb37f488a 100644
--- a/src/main/java/CommandMatcher.java
+++ b/src/main/java/CommandMatcher.java
@@ -1,6 +1,10 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
+/**
+ * This class serves as a way to abstract the idea of making a command
+ * as a matching process and an action.
+ */
 public class CommandMatcher {
     private Predicate<String> check;
     private Consumer<String> action;
@@ -9,6 +13,11 @@ public class CommandMatcher {
         this.action = action;
     }
 
+    CommandMatcher(String prefix, Consumer<String> action) {
+        this.check = (cmd) -> cmd.startsWith(prefix);
+        this.action = action;
+    }
+
     /**
      * Checks if the string matches
      * If it does, it would execute the action
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
index 9f028e7eaa..1c4d88aa96 100644
--- a/src/main/java/Duke.java
+++ b/src/main/java/Duke.java
@@ -1,4 +1,5 @@
 import java.util.ArrayList;
+import java.util.Optional;
 import java.util.Scanner;
 
 /**
@@ -8,7 +9,7 @@ public class Duke {
     /** List of commands */
     private static ArrayList<CommandMatcher> commands;
     /** List of strings to remember */
-    private static ArrayList<String> list;
+    private static ArrayList<Task> list;
 
     /**
      * Style and print a single line with a border.
@@ -44,21 +45,60 @@ private static void leave() {
         Duke.messagePrint("It was nice to have you around, I'm going back to sleep...");
     }
 
+    private static Optional<Task> getTask(String index) {
+        try {
+            int idx = Integer.parseInt(index);
+            Task task = list.get(idx - 1);
+            return Optional.of(task);
+        } catch (NumberFormatException ex) {
+            messagePrint("Sorry, I didn't understand " + index + ", please give me a number.");
+            return Optional.empty();
+        } catch (IndexOutOfBoundsException ex) {
+            messagePrint("Sorry, the number " + index + ", wasn't in the range.");
+            return Optional.empty();
+        }
+    }
+
     private static void initializeCommands() {
         commands = new ArrayList<>();
         list = new ArrayList<>();
 
         commands.add(new CommandMatcher((str) -> str.equals("list"), (str) -> {
-            String[] output = new String[list.size()];
+            String[] output = new String[list.size() + 1];
+            output[0] = "Here, your tasks:";
             for (int i = 0; i < list.size(); i++) {
-                output[i] = (i + 1) + ". " + list.get(i);
+                output[i + 1] = (i + 1) + "." + list.get(i).toString();
             }
             Duke.messagePrint(output);
         }));
 
+        commands.add(new CommandMatcher("mark ", (str) -> {
+            String[] parts = str.split(" ", 2);
+            getTask(parts[1]).ifPresent((task) -> {
+                task.markAsDone();
+                String[] output = {
+                    "Marked your task as done:",
+                    task.toString()
+                };
+                Duke.messagePrint(output);
+            });
+        }));
+
+        commands.add(new CommandMatcher("unmark ", (str) -> {
+            String[] parts = str.split(" ", 2);
+            getTask(parts[1]).ifPresent((task) -> {
+                task.markAsNotDone();
+                String[] output = {
+                    "Aw... it's not done yet:",
+                    task.toString()
+                };
+                Duke.messagePrint(output);
+            });
+        }));
+
         // default command matcher - add to list
         commands.add(new CommandMatcher((str) -> true, (str) -> {
-            list.add(str);
+            list.add(new Task(str));
             Duke.messagePrint("added: " + str);
         }));
     }
diff --git a/src/main/java/Task.java b/src/main/java/Task.java
new file mode 100644
index 0000000000..cb593b4f8e
--- /dev/null
+++ b/src/main/java/Task.java
@@ -0,0 +1,29 @@
+/**
+ * A task stores the state and description of a task.
+ */
+public class Task {
+    private static final char MARKER_DONE = 'X';
+    private static final char MARKER_NOT_DONE = ' ';
+    private String name;
+    private boolean done;
+    Task(String name) {
+        this.name = name;
+        this.done = false;
+    }
+
+    public void markAsDone() {
+        this.done = true;
+    }
+    public void markAsNotDone() {
+        this.done = false;
+    }
+
+    private char getDoneMarker() {
+        return this.done ? MARKER_DONE : MARKER_NOT_DONE;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("[%c] %s", getDoneMarker(), name);
+    }
+}

From ea599f713a9583b2620b44828d7f776a06746df7 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Wed, 17 Aug 2022 23:33:36 +0800
Subject: [PATCH 04/67] Add ToDo, Deadline, Event

---
 src/main/java/Deadline.java             | 16 ++++++++++
 src/main/java/Duke.java                 | 40 +++++++++++++++++++++----
 src/main/java/Event.java                | 16 ++++++++++
 src/main/java/PrefixCommandMatcher.java | 27 +++++++++++++++++
 src/main/java/ToDo.java                 | 14 +++++++++
 5 files changed, 107 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/Deadline.java
 create mode 100644 src/main/java/Event.java
 create mode 100644 src/main/java/PrefixCommandMatcher.java
 create mode 100644 src/main/java/ToDo.java

diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java
new file mode 100644
index 0000000000..765e09c462
--- /dev/null
+++ b/src/main/java/Deadline.java
@@ -0,0 +1,16 @@
+/**
+ * Handles a task with a deadline
+ */
+public class Deadline extends Task {
+    protected String datetime;
+
+    public Deadline(String description, String by) {
+        super(description);
+        datetime = by;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("[D]%s (by: %s)", super.toString(), datetime);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
index 1c4d88aa96..a1a5a3feb1 100644
--- a/src/main/java/Duke.java
+++ b/src/main/java/Duke.java
@@ -72,9 +72,8 @@ private static void initializeCommands() {
             Duke.messagePrint(output);
         }));
 
-        commands.add(new CommandMatcher("mark ", (str) -> {
-            String[] parts = str.split(" ", 2);
-            getTask(parts[1]).ifPresent((task) -> {
+        commands.add(new PrefixCommandMatcher("mark", (str, map) -> {
+            getTask(str).ifPresent((task) -> {
                 task.markAsDone();
                 String[] output = {
                     "Marked your task as done:",
@@ -84,9 +83,8 @@ private static void initializeCommands() {
             });
         }));
 
-        commands.add(new CommandMatcher("unmark ", (str) -> {
-            String[] parts = str.split(" ", 2);
-            getTask(parts[1]).ifPresent((task) -> {
+        commands.add(new PrefixCommandMatcher("unmark", (str, map) -> {
+            getTask(str).ifPresent((task) -> {
                 task.markAsNotDone();
                 String[] output = {
                     "Aw... it's not done yet:",
@@ -96,6 +94,36 @@ private static void initializeCommands() {
             });
         }));
 
+        commands.add(new PrefixCommandMatcher("deadline", (str, map) -> {
+            Task task = new Deadline(str, map.getOrDefault("by", "[unknown]"));
+            list.add(task);
+            String[] output = {
+                "Good luck with the deadline, here's the task:",
+                task.toString()
+            };
+            Duke.messagePrint(output);
+        }));
+
+        commands.add(new PrefixCommandMatcher("todo", (str, map) -> {
+            Task task = new ToDo(str);
+            list.add(task);
+            String[] output = {
+                "I've recorded this thing you need to do:",
+                task.toString()
+            };
+            Duke.messagePrint(output);
+        }));
+
+        commands.add(new PrefixCommandMatcher("event", (str, map) -> {
+            Task task = new Event(str, map.getOrDefault("at", "[unknown]"));
+            list.add(task);
+            String[] output = {
+                "That's going to happen at some time later:",
+                task.toString()
+            };
+            Duke.messagePrint(output);
+        }));
+
         // default command matcher - add to list
         commands.add(new CommandMatcher((str) -> true, (str) -> {
             list.add(new Task(str));
diff --git a/src/main/java/Event.java b/src/main/java/Event.java
new file mode 100644
index 0000000000..3a20f99a5c
--- /dev/null
+++ b/src/main/java/Event.java
@@ -0,0 +1,16 @@
+/**
+ * Handles an event
+ */
+public class Event extends Task {
+    protected String datetime;
+
+    public Event(String description, String at) {
+        super(description);
+        datetime = at;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("[E]%s (at: %s)", super.toString(), datetime);
+    }
+}
diff --git a/src/main/java/PrefixCommandMatcher.java b/src/main/java/PrefixCommandMatcher.java
new file mode 100644
index 0000000000..ea1fc3ba79
--- /dev/null
+++ b/src/main/java/PrefixCommandMatcher.java
@@ -0,0 +1,27 @@
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.BiConsumer;
+
+/**
+ * Makes a command matcher based on prefix
+ * It splits the slash options "/by /at" and other parts as a Map&lt;String, String&gt;
+ * and trims the string involved. The action takes the String and String
+ */
+public class PrefixCommandMatcher extends CommandMatcher {
+    PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String>> action) {
+        super((cmd) -> cmd.startsWith(prefix + " "), (cmd) -> {
+            String withoutPrefix = cmd.split(" ", 2)[1];
+            String[] commandParts = withoutPrefix.split(" \\\\");
+            Map<String, String> map = new HashMap<>();
+            for (int i = 1; i < commandParts.length; i++) {
+                String[] keyAndValue = commandParts[i].split(" ", 2);
+                if (keyAndValue.length == 2) {
+                    map.put(keyAndValue[0].strip(), keyAndValue[1].strip());
+                } else {
+                    map.put(keyAndValue[0].strip(), "");
+                }
+            }
+            action.accept(commandParts[0].strip(), map);
+        });
+    }
+}
diff --git a/src/main/java/ToDo.java b/src/main/java/ToDo.java
new file mode 100644
index 0000000000..4c65967190
--- /dev/null
+++ b/src/main/java/ToDo.java
@@ -0,0 +1,14 @@
+/**
+ * A class that stores something to do
+ */
+public class ToDo extends Task {
+
+    public ToDo(String description) {
+        super(description);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("[T]%s", super.toString());
+    }
+}

From b285814e52f45381bf67574d7f1948b39c9834b4 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Wed, 17 Aug 2022 23:48:25 +0800
Subject: [PATCH 05/67] Fix bug that backslash is used for commands instead of
 forward slash Add EXPECTED output for testing

---
 src/main/java/PrefixCommandMatcher.java |   2 +-
 text-ui-test/EXPECTED.TXT               | 157 ++++++++++++++++++++++--
 text-ui-test/input.txt                  |  31 +++++
 3 files changed, 182 insertions(+), 8 deletions(-)

diff --git a/src/main/java/PrefixCommandMatcher.java b/src/main/java/PrefixCommandMatcher.java
index ea1fc3ba79..8baa9c7ff6 100644
--- a/src/main/java/PrefixCommandMatcher.java
+++ b/src/main/java/PrefixCommandMatcher.java
@@ -11,7 +11,7 @@ public class PrefixCommandMatcher extends CommandMatcher {
     PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String>> action) {
         super((cmd) -> cmd.startsWith(prefix + " "), (cmd) -> {
             String withoutPrefix = cmd.split(" ", 2)[1];
-            String[] commandParts = withoutPrefix.split(" \\\\");
+            String[] commandParts = withoutPrefix.split(" /");
             Map<String, String> map = new HashMap<>();
             for (int i = 1; i < commandParts.length; i++) {
                 String[] keyAndValue = commandParts[i].split(" ", 2);
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index 657e74f6e7..0bf63cb0a1 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -1,7 +1,150 @@
-Hello from
- ____        _        
-|  _ \ _   _| | _____ 
-| | | | | | | |/ / _ \
-| |_| | |_| |   <  __/
-|____/ \__,_|_|\_\___|
-
+,----------------------------------------------------------------
+| ...where is this again?
+| Oh, hello, I didn't see you there - I'm Anthea, a chatbot...
+| ...or at least that's what they told me.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| added: random
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[ ] random
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [X] random
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 2, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand not a number, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand not a number, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I've recorded this thing you need to do:
+| [T][ ] homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I've recorded this thing you need to do:
+| [T][ ] other homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I've recorded this thing you need to do:
+| [T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Aw... it's not done yet:
+| [ ] random
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Aw... it's not done yet:
+| [T][ ] homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[ ] random
+| 2.[T][ ] homework
+| 3.[T][ ] other homework
+| 4.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [T][X] other homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[ ] random
+| 2.[T][ ] homework
+| 3.[T][X] other homework
+| 4.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [T][X] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[ ] random
+| 2.[T][ ] homework
+| 3.[T][X] other homework
+| 4.[T][X] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 5, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[ ] random
+| 2.[T][ ] homework
+| 3.[T][X] other homework
+| 4.[T][X] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 6, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[ ] random
+| 2.[T][ ] homework
+| 3.[T][X] other homework
+| 4.[T][X] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's going to happen at some time later:
+| [E][ ] meet friends (at: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's going to happen at some time later:
+| [E][ ] meet people at dinner (at: 6:25 pm)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's going to happen at some time later:
+| [E][ ] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[ ] random
+| 2.[T][ ] homework
+| 3.[T][X] other homework
+| 4.[T][X] project 12
+| 5.[E][ ] meet friends (at: [unknown])
+| 6.[E][ ] meet people at dinner (at: 6:25 pm)
+| 7.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Good luck with the deadline, here's the task:
+| [D][ ] /at mysterious (by: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Good luck with the deadline, here's the task:
+| [D][ ] /by mysterious number 2 (by: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Good luck with the deadline, here's the task:
+| [D][ ] rush this please (by: when?)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[ ] random
+| 2.[T][ ] homework
+| 3.[T][X] other homework
+| 4.[T][X] project 12
+| 5.[E][ ] meet friends (at: [unknown])
+| 6.[E][ ] meet people at dinner (at: 6:25 pm)
+| 7.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 8.[D][ ] /at mysterious (by: [unknown])
+| 9.[D][ ] /by mysterious number 2 (by: [unknown])
+| 10.[D][ ] rush this please (by: when?)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| It was nice to have you around, I'm going back to sleep...
+'----------------------------------------------------------------
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
index e69de29bb2..611ae7a02d 100644
--- a/text-ui-test/input.txt
+++ b/text-ui-test/input.txt
@@ -0,0 +1,31 @@
+random
+list
+mark 1
+mark 2
+mark 0
+mark -1
+mark not a number
+unmark not a number
+todo homework /at /by 1:23
+todo other homework /options ignored
+todo project 12
+unmark 1
+unmark 2
+list
+mark 3
+list
+mark 4
+list
+mark 5
+list
+mark 6
+list
+event meet friends
+event meet people at dinner /at 6:25 pm
+event meet people at function x/y/z whatever /at oh no not this /by /at 7:12am
+list
+deadline /at mysterious
+deadline /by mysterious number 2
+deadline rush this please /by when? /option is ignored
+list
+bye

From 7be191c7fb2d45a0336c1d8a5d9d2de1cf900f9b Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Thu, 18 Aug 2022 00:00:38 +0800
Subject: [PATCH 06/67] Handle errors

---
 src/main/java/Duke.java                 |   3 +-
 src/main/java/PrefixCommandMatcher.java |  11 ++-
 text-ui-test/EXPECTED.TXT               | 120 ++++++++++++++----------
 text-ui-test/input.txt                  |  13 ++-
 4 files changed, 89 insertions(+), 58 deletions(-)

diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
index a1a5a3feb1..aace1da813 100644
--- a/src/main/java/Duke.java
+++ b/src/main/java/Duke.java
@@ -126,8 +126,7 @@ private static void initializeCommands() {
 
         // default command matcher - add to list
         commands.add(new CommandMatcher((str) -> true, (str) -> {
-            list.add(new Task(str));
-            Duke.messagePrint("added: " + str);
+            Duke.messagePrint("(>.<')  I'm sorry, I don't really know what that means.");
         }));
     }
 
diff --git a/src/main/java/PrefixCommandMatcher.java b/src/main/java/PrefixCommandMatcher.java
index 8baa9c7ff6..b9711813ec 100644
--- a/src/main/java/PrefixCommandMatcher.java
+++ b/src/main/java/PrefixCommandMatcher.java
@@ -9,7 +9,11 @@
  */
 public class PrefixCommandMatcher extends CommandMatcher {
     PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String>> action) {
-        super((cmd) -> cmd.startsWith(prefix + " "), (cmd) -> {
+        super((cmd) -> cmd.startsWith(prefix + " ") || cmd.equals(prefix), (cmd) -> {
+            if (cmd.equals(prefix)) {
+                Duke.messagePrint("(>.<') Add a description to your " + prefix + ".");
+                return;
+            }
             String withoutPrefix = cmd.split(" ", 2)[1];
             String[] commandParts = withoutPrefix.split(" /");
             Map<String, String> map = new HashMap<>();
@@ -21,6 +25,11 @@ public class PrefixCommandMatcher extends CommandMatcher {
                     map.put(keyAndValue[0].strip(), "");
                 }
             }
+            commandParts[0] = commandParts[0].strip();
+            if (commandParts[0].equals("")) {
+                Duke.messagePrint("(>.<') The description for " + prefix + " shouldn't be empty.");
+                return;
+            }
             action.accept(commandParts[0].strip(), map);
         });
     }
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index 0bf63cb0a1..84ab68c473 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -4,30 +4,28 @@
 | ...or at least that's what they told me.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
-| added: random
+| (>.<')  I'm sorry, I don't really know what that means.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
-| Here, your tasks:
-| 1.[ ] random
+| (>.<')  I'm sorry, I don't really know what that means.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
-| Marked your task as done:
-| [X] random
+| (>.<') Add a description to your todo.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
-| Sorry, the number 2, wasn't in the range.
+| (>.<') Add a description to your deadline.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
-| Sorry, the number 0, wasn't in the range.
+| (>.<') Add a description to your event.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
-| Sorry, the number -1, wasn't in the range.
+| (>.<') Add a description to your mark.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
-| Sorry, I didn't understand not a number, please give me a number.
+| (>.<') Add a description to your unmark.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
-| Sorry, I didn't understand not a number, please give me a number.
+| Here, your tasks:
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | I've recorded this thing you need to do:
@@ -42,61 +40,81 @@
 | [T][ ] project 12
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
-| Aw... it's not done yet:
-| [ ] random
+| Marked your task as done:
+| [T][X] homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [T][X] other homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand not a number, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand not a number, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][X] homework
+| 2.[T][X] other homework
+| 3.[T][ ] project 12
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Aw... it's not done yet:
 | [T][ ] homework
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
+| Aw... it's not done yet:
+| [T][ ] other homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
 | Here, your tasks:
-| 1.[ ] random
-| 2.[T][ ] homework
-| 3.[T][ ] other homework
-| 4.[T][ ] project 12
+| 1.[T][ ] homework
+| 2.[T][ ] other homework
+| 3.[T][ ] project 12
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Marked your task as done:
-| [T][X] other homework
+| [T][X] project 12
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
-| 1.[ ] random
-| 2.[T][ ] homework
-| 3.[T][X] other homework
-| 4.[T][ ] project 12
+| 1.[T][ ] homework
+| 2.[T][ ] other homework
+| 3.[T][X] project 12
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
-| Marked your task as done:
-| [T][X] project 12
+| Sorry, the number 4, wasn't in the range.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
-| 1.[ ] random
-| 2.[T][ ] homework
-| 3.[T][X] other homework
-| 4.[T][X] project 12
+| 1.[T][ ] homework
+| 2.[T][ ] other homework
+| 3.[T][X] project 12
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Sorry, the number 5, wasn't in the range.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
-| 1.[ ] random
-| 2.[T][ ] homework
-| 3.[T][X] other homework
-| 4.[T][X] project 12
+| 1.[T][ ] homework
+| 2.[T][ ] other homework
+| 3.[T][X] project 12
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Sorry, the number 6, wasn't in the range.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
-| 1.[ ] random
-| 2.[T][ ] homework
-| 3.[T][X] other homework
-| 4.[T][X] project 12
+| 1.[T][ ] homework
+| 2.[T][ ] other homework
+| 3.[T][X] project 12
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | That's going to happen at some time later:
@@ -112,13 +130,12 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
-| 1.[ ] random
-| 2.[T][ ] homework
-| 3.[T][X] other homework
-| 4.[T][X] project 12
-| 5.[E][ ] meet friends (at: [unknown])
-| 6.[E][ ] meet people at dinner (at: 6:25 pm)
-| 7.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 1.[T][ ] homework
+| 2.[T][ ] other homework
+| 3.[T][X] project 12
+| 4.[E][ ] meet friends (at: [unknown])
+| 5.[E][ ] meet people at dinner (at: 6:25 pm)
+| 6.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Good luck with the deadline, here's the task:
@@ -134,16 +151,15 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
-| 1.[ ] random
-| 2.[T][ ] homework
-| 3.[T][X] other homework
-| 4.[T][X] project 12
-| 5.[E][ ] meet friends (at: [unknown])
-| 6.[E][ ] meet people at dinner (at: 6:25 pm)
-| 7.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
-| 8.[D][ ] /at mysterious (by: [unknown])
-| 9.[D][ ] /by mysterious number 2 (by: [unknown])
-| 10.[D][ ] rush this please (by: when?)
+| 1.[T][ ] homework
+| 2.[T][ ] other homework
+| 3.[T][X] project 12
+| 4.[E][ ] meet friends (at: [unknown])
+| 5.[E][ ] meet people at dinner (at: 6:25 pm)
+| 6.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 7.[D][ ] /at mysterious (by: [unknown])
+| 8.[D][ ] /by mysterious number 2 (by: [unknown])
+| 9.[D][ ] rush this please (by: when?)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | It was nice to have you around, I'm going back to sleep...
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
index 611ae7a02d..a6267309c9 100644
--- a/text-ui-test/input.txt
+++ b/text-ui-test/input.txt
@@ -1,14 +1,21 @@
 random
+
+todo
+deadline
+event
+mark
+unmark
 list
+todo homework /at /by 1:23
+todo other homework /options ignored
+todo project 12
 mark 1
 mark 2
 mark 0
 mark -1
 mark not a number
 unmark not a number
-todo homework /at /by 1:23
-todo other homework /options ignored
-todo project 12
+list
 unmark 1
 unmark 2
 list

From 4320c7fa6674a5a3abfdce72d489044841076008 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Thu, 18 Aug 2022 00:11:43 +0800
Subject: [PATCH 07/67] Add deleting of tasks

---
 src/main/java/Duke.java   | 12 ++++++++++++
 text-ui-test/EXPECTED.TXT | 32 ++++++++++++++++++++++++++++++++
 text-ui-test/input.txt    |  7 +++++++
 3 files changed, 51 insertions(+)

diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
index aace1da813..144da5949e 100644
--- a/src/main/java/Duke.java
+++ b/src/main/java/Duke.java
@@ -124,6 +124,18 @@ private static void initializeCommands() {
             Duke.messagePrint(output);
         }));
 
+        commands.add(new PrefixCommandMatcher("delete", (str, map) -> {
+            getTask(str).ifPresent((task) -> {
+                list.remove(task);
+                String[] output = {
+                    "It seems you didn't need this task anymore, so I removed it:",
+                    task.toString(),
+                    String.format("You have %d tasks left.", list.size())
+                };
+                Duke.messagePrint(output);
+            });
+        }));
+
         // default command matcher - add to list
         commands.add(new CommandMatcher((str) -> true, (str) -> {
             Duke.messagePrint("(>.<')  I'm sorry, I don't really know what that means.");
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index 84ab68c473..16cb93c8bd 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -162,5 +162,37 @@
 | 9.[D][ ] rush this please (by: when?)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
+| It seems you didn't need this task anymore, so I removed it:
+| [T][ ] other homework
+| You have 8 tasks left.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| It seems you didn't need this task anymore, so I removed it:
+| [T][X] project 12
+| You have 7 tasks left.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your delete.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand nan, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 24, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
 | It was nice to have you around, I'm going back to sleep...
 '----------------------------------------------------------------
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
index a6267309c9..7ef1d45254 100644
--- a/text-ui-test/input.txt
+++ b/text-ui-test/input.txt
@@ -35,4 +35,11 @@ deadline /at mysterious
 deadline /by mysterious number 2
 deadline rush this please /by when? /option is ignored
 list
+delete 2
+delete 2
+list
+delete 0
+delete
+delete nan
+delete 24
 bye

From 84bac1781158b85fca6958f750eb342db2098101 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Fri, 19 Aug 2022 21:59:57 +0800
Subject: [PATCH 08/67] Improve documentation, add command robustness to extra
 spaces

---
 src/main/java/CommandMatcher.java       | 25 ++++++++++++++++++-------
 src/main/java/Deadline.java             |  9 +++++++--
 src/main/java/Duke.java                 | 12 ++++++------
 src/main/java/Event.java                |  7 ++++++-
 src/main/java/PrefixCommandMatcher.java | 13 +++++++++----
 src/main/java/ToDo.java                 |  6 +++++-
 text-ui-test/EXPECTED.TXT               | 15 +++++++++++++++
 text-ui-test/input.txt                  |  2 ++
 8 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/src/main/java/CommandMatcher.java b/src/main/java/CommandMatcher.java
index ccb37f488a..bf3ce705bb 100644
--- a/src/main/java/CommandMatcher.java
+++ b/src/main/java/CommandMatcher.java
@@ -8,21 +8,32 @@
 public class CommandMatcher {
     private Predicate<String> check;
     private Consumer<String> action;
-    CommandMatcher(Predicate<String> check, Consumer<String> action) {
+
+    /**
+     * Creates an object that handles checking and executing a command.
+     * @param check Predicate to check if the command should be run.
+     * @param action Action to run.
+     */
+    public CommandMatcher(Predicate<String> check, Consumer<String> action) {
         this.check = check;
         this.action = action;
     }
 
-    CommandMatcher(String prefix, Consumer<String> action) {
-        this.check = (cmd) -> cmd.startsWith(prefix);
+    /**
+     * Creates an object that handles checking and executing a command.
+     * @param prefix Prefix of the command which is checked.
+     * @param action Action to run.
+     */
+    public CommandMatcher(String prefix, Consumer<String> action) {
+        this.check = (cmd) -> cmd.strip().startsWith(prefix);
         this.action = action;
     }
 
     /**
-     * Checks if the string matches
-     * If it does, it would execute the action
-     * @param input The string to check if it is for this command
-     * @return if the string matches
+     * Checks if the string matches.
+     * If it does, it would execute the action.
+     * @param input String to check if it is for this command.
+     * @return If the string matches.
      */
     public boolean run(String input) {
         if (check.test(input)) {
diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java
index 765e09c462..406da81048 100644
--- a/src/main/java/Deadline.java
+++ b/src/main/java/Deadline.java
@@ -1,9 +1,14 @@
 /**
- * Handles a task with a deadline
+ * Handles a task with a deadline.
  */
 public class Deadline extends Task {
     protected String datetime;
 
+    /**
+     * Creates a Deadline object.
+     * @param description Description of deadline.
+     * @param by Time of deadline.
+     */
     public Deadline(String description, String by) {
         super(description);
         datetime = by;
@@ -13,4 +18,4 @@ public Deadline(String description, String by) {
     public String toString() {
         return String.format("[D]%s (by: %s)", super.toString(), datetime);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
index 144da5949e..8c90244db8 100644
--- a/src/main/java/Duke.java
+++ b/src/main/java/Duke.java
@@ -12,16 +12,16 @@ public class Duke {
     private static ArrayList<Task> list;
 
     /**
-     * Style and print a single line with a border.
-     * @param line line to be printed
+     * Styles and prints a single line with a border.
+     * @param line Line to be printed
      */
     public static void messagePrint(String line) {
         messagePrint(new String[]{line});
     }
 
     /**
-     * Style and print lines with a border.
-     * @param lines lines to be printed
+     * Styles and prints lines with a border.
+     * @param lines Lines to be printed
      */
     public static void messagePrint(String[] lines) {
         System.out.println(",----------------------------------------------------------------");
@@ -151,8 +151,8 @@ private static void handleCommand(String command) {
     }
 
     /**
-     * The main structure of the chatbot execution.
-     * @param args command line args which are not used
+     * Runs the chatbot execution.
+     * @param args Command line args which are not used.
      */
     public static void main(String[] args) {
         greet();
diff --git a/src/main/java/Event.java b/src/main/java/Event.java
index 3a20f99a5c..02e7b287c9 100644
--- a/src/main/java/Event.java
+++ b/src/main/java/Event.java
@@ -1,9 +1,14 @@
 /**
- * Handles an event
+ * Handles an event.
  */
 public class Event extends Task {
     protected String datetime;
 
+    /**
+     * Creates an event.
+     * @param description Description of event.
+     * @param at Time of event.
+     */
     public Event(String description, String at) {
         super(description);
         datetime = at;
diff --git a/src/main/java/PrefixCommandMatcher.java b/src/main/java/PrefixCommandMatcher.java
index b9711813ec..e72af6023e 100644
--- a/src/main/java/PrefixCommandMatcher.java
+++ b/src/main/java/PrefixCommandMatcher.java
@@ -3,13 +3,18 @@
 import java.util.function.BiConsumer;
 
 /**
- * Makes a command matcher based on prefix
+ * Makes a command matcher based on prefix.
  * It splits the slash options "/by /at" and other parts as a Map&lt;String, String&gt;
- * and trims the string involved. The action takes the String and String
+ * and trims the string involved.
+ * The action takes the String and a map containing the options.
  */
 public class PrefixCommandMatcher extends CommandMatcher {
-    PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String>> action) {
-        super((cmd) -> cmd.startsWith(prefix + " ") || cmd.equals(prefix), (cmd) -> {
+    /**
+     * Creates a command matcher that tries to match a prefix.
+     */
+    public PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String>> action) {
+        super((cmd) -> cmd.strip().startsWith(prefix + " ") || cmd.strip().equals(prefix), (cmd) -> {
+            cmd = cmd.strip();
             if (cmd.equals(prefix)) {
                 Duke.messagePrint("(>.<') Add a description to your " + prefix + ".");
                 return;
diff --git a/src/main/java/ToDo.java b/src/main/java/ToDo.java
index 4c65967190..64209e18fa 100644
--- a/src/main/java/ToDo.java
+++ b/src/main/java/ToDo.java
@@ -1,8 +1,12 @@
 /**
- * A class that stores something to do
+ * A class that stores something to do.
  */
 public class ToDo extends Task {
 
+    /**
+     * Creates a todo item.
+     * @param description Description of todo.
+     */
     public ToDo(String description) {
         super(description);
     }
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index 16cb93c8bd..7c0ae7ecc9 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -194,5 +194,20 @@
 | Sorry, the number 24, wasn't in the range.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
+| That's going to happen at some time later:
+| [E][ ] wow  much  space (at: 10am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
 | It was nice to have you around, I'm going back to sleep...
 '----------------------------------------------------------------
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
index 7ef1d45254..9c999d0633 100644
--- a/text-ui-test/input.txt
+++ b/text-ui-test/input.txt
@@ -42,4 +42,6 @@ delete 0
 delete
 delete nan
 delete 24
+  event  wow  much  space / very /wow /at 10am
+list
 bye

From 2af3298df72c557c220effedcb918436ebfff07a Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 20 Aug 2022 14:54:08 +0800
Subject: [PATCH 09/67] Add file I/O for persistent state

We need a common interchange format for Tasks to interact with
files. We also need a way to extend the testing to deal with the
case where the file is missing.

Let's add common String[] method getAsStringArray() format for
Tasks. To make it easier to make the tasks, let's also add
TaskFactory to utilise the Factory design pattern.

Let's come up with a new encoding for the file. As Base64 methods
are available in Java 11, this can be done by encoding string
information for each file in Base64, and separated with commas on
a single line.

Let's run the test twice, once after deleting the duke.txt file and
once after not deleting the file. This would allow us to do
regression testing in both cases.
---
 src/main/java/Deadline.java       |  22 ++-
 src/main/java/Duke.java           |  69 +++----
 src/main/java/Event.java          |  22 ++-
 src/main/java/FileState.java      | 112 +++++++++++
 src/main/java/Task.java           |  14 +-
 src/main/java/TaskFactory.java    |  46 +++++
 src/main/java/TasksFileState.java |  32 ++++
 src/main/java/ToDo.java           |  25 ++-
 text-ui-test/ACTUAL1.TXT          | 304 ++++++++++++++++++++++++++++++
 text-ui-test/EXPECTED.TXT         |   4 +-
 text-ui-test/EXPECTED1.TXT        | 304 ++++++++++++++++++++++++++++++
 text-ui-test/duke.txt             |  16 ++
 text-ui-test/runtest.bat          |  12 ++
 13 files changed, 931 insertions(+), 51 deletions(-)
 create mode 100644 src/main/java/FileState.java
 create mode 100644 src/main/java/TaskFactory.java
 create mode 100644 src/main/java/TasksFileState.java
 create mode 100644 text-ui-test/ACTUAL1.TXT
 create mode 100644 text-ui-test/EXPECTED1.TXT
 create mode 100644 text-ui-test/duke.txt

diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java
index 406da81048..9cc80f9dcb 100644
--- a/src/main/java/Deadline.java
+++ b/src/main/java/Deadline.java
@@ -10,7 +10,17 @@ public class Deadline extends Task {
      * @param by Time of deadline.
      */
     public Deadline(String description, String by) {
-        super(description);
+        this(description, by, false);
+    }
+
+    /**
+     * Creates a Deadline object.
+     * @param description Description of deadline.
+     * @param by Time of deadline.
+     * @param done If the task is done.
+     */
+    public Deadline(String description, String by, boolean done) {
+        super(description, done);
         datetime = by;
     }
 
@@ -18,4 +28,14 @@ public Deadline(String description, String by) {
     public String toString() {
         return String.format("[D]%s (by: %s)", super.toString(), datetime);
     }
+
+    /**
+     * Get a string array representation suitable for printing to files.
+     * @return String array representation.
+     */
+    @Override
+    public String[] getAsStringArray() {
+        String[] data = super.getAsStringArray();
+        return new String[]{ "Deadline", data[1], data[2], datetime };
+    }
 }
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
index 8c90244db8..592b113a05 100644
--- a/src/main/java/Duke.java
+++ b/src/main/java/Duke.java
@@ -11,19 +11,11 @@ public class Duke {
     /** List of strings to remember */
     private static ArrayList<Task> list;
 
-    /**
-     * Styles and prints a single line with a border.
-     * @param line Line to be printed
-     */
-    public static void messagePrint(String line) {
-        messagePrint(new String[]{line});
-    }
-
     /**
      * Styles and prints lines with a border.
      * @param lines Lines to be printed
      */
-    public static void messagePrint(String[] lines) {
+    public static void messagePrint(String... lines) {
         System.out.println(",----------------------------------------------------------------");
         for (String str : lines) {
             System.out.print("| ");
@@ -33,12 +25,9 @@ public static void messagePrint(String[] lines) {
     }
 
     private static void greet() {
-        String[] greeting = {
-            "...where is this again?",
-            "Oh, hello, I didn't see you there - I'm Anthea, a chatbot...",
-            "...or at least that's what they told me."
-        };
-        Duke.messagePrint(greeting);
+        Duke.messagePrint("...where is this again?",
+                "Oh, hello, I didn't see you there - I'm Anthea, a chatbot...",
+                "...or at least that's what they told me.");
     }
 
     private static void leave() {
@@ -59,9 +48,16 @@ private static Optional<Task> getTask(String index) {
         }
     }
 
+    private static void initializeTaskList() {
+        list = TasksFileState.getTasks();
+    }
+
+    private static void finalizeTaskList() {
+        TasksFileState.saveTasks(list);
+    }
+
     private static void initializeCommands() {
         commands = new ArrayList<>();
-        list = new ArrayList<>();
 
         commands.add(new CommandMatcher((str) -> str.equals("list"), (str) -> {
             String[] output = new String[list.size() + 1];
@@ -86,59 +82,44 @@ private static void initializeCommands() {
         commands.add(new PrefixCommandMatcher("unmark", (str, map) -> {
             getTask(str).ifPresent((task) -> {
                 task.markAsNotDone();
-                String[] output = {
-                    "Aw... it's not done yet:",
-                    task.toString()
-                };
-                Duke.messagePrint(output);
+                Duke.messagePrint("Aw... it's not done yet:",
+                        task.toString());
             });
         }));
 
         commands.add(new PrefixCommandMatcher("deadline", (str, map) -> {
             Task task = new Deadline(str, map.getOrDefault("by", "[unknown]"));
             list.add(task);
-            String[] output = {
-                "Good luck with the deadline, here's the task:",
-                task.toString()
-            };
-            Duke.messagePrint(output);
+            Duke.messagePrint("Good luck with the deadline, here's the task:",
+                    task.toString());
         }));
 
         commands.add(new PrefixCommandMatcher("todo", (str, map) -> {
             Task task = new ToDo(str);
             list.add(task);
-            String[] output = {
-                "I've recorded this thing you need to do:",
-                task.toString()
-            };
-            Duke.messagePrint(output);
+            Duke.messagePrint("I've recorded this thing you need to do:",
+                    task.toString());
         }));
 
         commands.add(new PrefixCommandMatcher("event", (str, map) -> {
             Task task = new Event(str, map.getOrDefault("at", "[unknown]"));
             list.add(task);
-            String[] output = {
-                "That's going to happen at some time later:",
-                task.toString()
-            };
-            Duke.messagePrint(output);
+            Duke.messagePrint("That's going to happen at some time later:",
+                    task.toString());
         }));
 
         commands.add(new PrefixCommandMatcher("delete", (str, map) -> {
             getTask(str).ifPresent((task) -> {
                 list.remove(task);
-                String[] output = {
-                    "It seems you didn't need this task anymore, so I removed it:",
-                    task.toString(),
-                    String.format("You have %d tasks left.", list.size())
-                };
-                Duke.messagePrint(output);
+                Duke.messagePrint("It seems you didn't need this task anymore, so I removed it:",
+                        task.toString(),
+                        String.format("You have %d tasks left.", list.size()));
             });
         }));
 
         // default command matcher - add to list
         commands.add(new CommandMatcher((str) -> true, (str) -> {
-            Duke.messagePrint("(>.<')  I'm sorry, I don't really know what that means.");
+            Duke.messagePrint("(>.<') I'm sorry, I don't really know what that means.");
         }));
     }
 
@@ -156,6 +137,7 @@ private static void handleCommand(String command) {
      */
     public static void main(String[] args) {
         greet();
+        initializeTaskList();
         initializeCommands();
         Scanner input = new Scanner(System.in);
         boolean keepRunning = true;
@@ -167,6 +149,7 @@ public static void main(String[] args) {
                 handleCommand(command);
             }
         }
+        finalizeTaskList();
         leave();
     }
 }
diff --git a/src/main/java/Event.java b/src/main/java/Event.java
index 02e7b287c9..47fc0a6ab4 100644
--- a/src/main/java/Event.java
+++ b/src/main/java/Event.java
@@ -10,7 +10,17 @@ public class Event extends Task {
      * @param at Time of event.
      */
     public Event(String description, String at) {
-        super(description);
+        this(description, at, false);
+    }
+
+    /**
+     * Creates an event.
+     * @param description Description of event.
+     * @param at Time of event.
+     * @param done If the task is done.
+     */
+    public Event(String description, String at, boolean done) {
+        super(description, done);
         datetime = at;
     }
 
@@ -18,4 +28,14 @@ public Event(String description, String at) {
     public String toString() {
         return String.format("[E]%s (at: %s)", super.toString(), datetime);
     }
+
+    /**
+     * Get a string array representation suitable for printing to files.
+     * @return String array representation.
+     */
+    @Override
+    public String[] getAsStringArray() {
+        String[] data = super.getAsStringArray();
+        return new String[]{ "Event", data[1], data[2], datetime };
+    }
 }
diff --git a/src/main/java/FileState.java b/src/main/java/FileState.java
new file mode 100644
index 0000000000..e065d58739
--- /dev/null
+++ b/src/main/java/FileState.java
@@ -0,0 +1,112 @@
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.stream.Stream;
+
+/**
+ * Handles file state.
+ */
+public class FileState {
+    private static Map<String, FileState> fileStates = new HashMap<>();
+    private String contents = null;
+    private String fileName;
+
+    private FileState(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public static FileState getFileState(String fileName) {
+        if (!fileStates.containsKey(fileName)) {
+            fileStates.put(fileName, new FileState(fileName));
+        }
+        return fileStates.get(fileName);
+    }
+
+    /*public String getContents() {
+        if (contents == null) {
+            try {
+                File f = new File(fileName);
+                Scanner s = new Scanner(f);
+                StringBuilder sb = new StringBuilder();
+                boolean isFirst = true;
+                while (s.hasNext()) {
+                    if (isFirst) {
+                        isFirst = false;
+                    } else {
+                        sb.append('\n');
+                    }
+                    sb.append(s.nextLine());
+                }
+                contents = sb.toString();
+            } catch (FileNotFoundException ex) {
+                // file not found or error
+                contents = "";
+            }
+        }
+        return contents;
+    }*/
+
+    ///**
+    // * Saves the string to the file on disk
+    // * @param str string to save
+    // */
+    /*public void saveContents(String str) {
+        contents = str;
+        // write to file TODO
+    }*/
+
+    private static String toBase64(String input) {
+        return Base64.getEncoder().encodeToString(input.getBytes(StandardCharsets.UTF_16));
+    }
+
+    private static String fromBase64(String input) {
+        return StandardCharsets.UTF_16.decode(ByteBuffer.wrap(Base64.getDecoder().decode(input))).toString();
+    }
+
+    public String[][] getLines() {
+        ArrayList<String[]> lines = new ArrayList<>();
+        try {
+            File f = new File(fileName);
+            Scanner sc = new Scanner(f);
+            while (sc.hasNext()) {
+                ArrayList<String> curLine = new ArrayList<>();
+                for (String str : sc.nextLine().split(",")) {
+                    curLine.add(fromBase64(str));
+                }
+                lines.add(curLine.toArray(new String[] {}));
+            }
+            return (String[][]) lines.toArray(new String[][] {});
+        } catch (FileNotFoundException ex) {
+            // file not found or error
+            return new String[][] {};
+        }
+    }
+
+    /**
+     * Saves the string to the file on disk.
+     * @param strings Strings to save.
+     */
+    public void saveLines(String[][] strings) {
+        try {
+            FileWriter writer = new FileWriter(fileName, false);
+            for (int i = 0; i < strings.length; i++) {
+                if (i > 0) {
+                    writer.append('\n');
+                }
+                StringBuilder builder = new StringBuilder();
+                for (String s : strings[i]) {
+                    builder.append(',').append(toBase64(s));
+                }
+                writer.append(builder.substring(1));
+            }
+            writer.close();
+        } catch (IOException ex) {
+            Duke.messagePrint("(>.<') I was unable to record your tasks...");
+            ex.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/java/Task.java b/src/main/java/Task.java
index cb593b4f8e..6b22a6a06a 100644
--- a/src/main/java/Task.java
+++ b/src/main/java/Task.java
@@ -7,8 +7,12 @@ public class Task {
     private String name;
     private boolean done;
     Task(String name) {
+        this(name, false);
+    }
+
+    Task(String name, boolean done) {
         this.name = name;
-        this.done = false;
+        this.done = done;
     }
 
     public void markAsDone() {
@@ -26,4 +30,12 @@ private char getDoneMarker() {
     public String toString() {
         return String.format("[%c] %s", getDoneMarker(), name);
     }
+
+    /**
+     * Get a string array representation suitable for printing to files.
+     * @return String array representation.
+     */
+    public String[] getAsStringArray() {
+        return new String[]{ "Task", name, String.valueOf(done) };
+    }
 }
diff --git a/src/main/java/TaskFactory.java b/src/main/java/TaskFactory.java
new file mode 100644
index 0000000000..bacbb01123
--- /dev/null
+++ b/src/main/java/TaskFactory.java
@@ -0,0 +1,46 @@
+import java.util.Optional;
+
+/**
+ * Constructs tasks from strings
+ */
+public class TaskFactory {
+    /**
+     * Constructs the task.
+     * @param taskData Data for the task.
+     * @return Task according to taskData.
+     * @throws IllegalArgumentException If taskData does not conform to the format.
+     */
+    public static Task constructTask(String[] taskData) throws IllegalArgumentException {
+        if (taskData == null || taskData.length < 1) {
+            throw new IllegalArgumentException("taskData cannot be null or of length 1");
+        }
+        if (taskData[0].equals("Task") && taskData.length >= 3) {
+            return new Task(taskData[1], taskData[2].equals("true"));
+        }
+        if (taskData[0].equals("ToDo") && taskData.length >= 3) {
+            return new ToDo(taskData[1], taskData[2].equals("true"));
+        }
+        if (taskData[0].equals("Deadline") && taskData.length >= 4) {
+            return new Deadline(taskData[1], taskData[3], taskData[2].equals("true"));
+        }
+        if (taskData[0].equals("Event") && taskData.length >= 4) {
+            return new Event(taskData[1], taskData[3], taskData[2].equals("true"));
+        }
+        throw new IllegalArgumentException("Unsupported task type or incorrect task data length");
+    }
+
+    /**
+     * Constructs the task.
+     * @param taskData Data for the task.
+     * @return Optional of Task according to taskData, Optional.empty() if cannot construct.
+     */
+    public static Optional<Task> constructOptionalTask(String[] taskData) {
+        try {
+            return Optional.of(constructTask(taskData));
+        } catch (IllegalArgumentException ex) {
+            Duke.messagePrint("(>.<') did not understand this task - dropping it",
+                    String.join(", ", taskData));
+            return Optional.empty();
+        }
+    }
+}
diff --git a/src/main/java/TasksFileState.java b/src/main/java/TasksFileState.java
new file mode 100644
index 0000000000..de24a99bd0
--- /dev/null
+++ b/src/main/java/TasksFileState.java
@@ -0,0 +1,32 @@
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Accesses a file for tasks.
+ */
+public class TasksFileState {
+
+    /**
+     * Gets ArrayList of previously saved tasks.
+     * @return ArrayList of tasks.
+     */
+    public static ArrayList<Task> getTasks() {
+        FileState fileState = FileState.getFileState("./duke.txt");
+        ArrayList<Task> tasks = new ArrayList<>();
+        for (String[] line : fileState.getLines()) {
+            TaskFactory.constructOptionalTask(line).ifPresent((task) -> tasks.add(task));
+        }
+        return tasks;
+    }
+
+    /**
+     * Saves a list of tasks to the default file.
+     * @param tasks List of tasks.
+     */
+    public static void saveTasks(List<Task> tasks) {
+        List<String[]> lines = tasks.stream().map(Task::getAsStringArray).collect(Collectors.toList());
+        FileState fileState = FileState.getFileState("./duke.txt");
+        fileState.saveLines((String[][]) lines.toArray(new String[][]{}));
+    }
+}
diff --git a/src/main/java/ToDo.java b/src/main/java/ToDo.java
index 64209e18fa..584351dc7d 100644
--- a/src/main/java/ToDo.java
+++ b/src/main/java/ToDo.java
@@ -4,15 +4,34 @@
 public class ToDo extends Task {
 
     /**
-     * Creates a todo item.
-     * @param description Description of todo.
+     * Creates a task item.
+     * @param description Description of task.
      */
     public ToDo(String description) {
-        super(description);
+        this(description, false);
+    }
+
+    /**
+     * Creates a task item.
+     * @param description Description of task.
+     * @param done If the task is done.
+     */
+    public ToDo(String description, boolean done) {
+        super(description, done);
     }
 
     @Override
     public String toString() {
         return String.format("[T]%s", super.toString());
     }
+
+    /**
+     * Get a string array representation suitable for printing to files.
+     * @return String array representation.
+     */
+    @Override
+    public String[] getAsStringArray() {
+        String[] data = super.getAsStringArray();
+        return new String[]{ "ToDo", data[1], data[2] };
+    }
 }
diff --git a/text-ui-test/ACTUAL1.TXT b/text-ui-test/ACTUAL1.TXT
new file mode 100644
index 0000000000..daa5869735
--- /dev/null
+++ b/text-ui-test/ACTUAL1.TXT
@@ -0,0 +1,304 @@
+,----------------------------------------------------------------
+| ...where is this again?
+| Oh, hello, I didn't see you there - I'm Anthea, a chatbot...
+| ...or at least that's what they told me.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') I'm sorry, I don't really know what that means.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') I'm sorry, I don't really know what that means.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your todo.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your deadline.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your event.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your mark.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your unmark.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I've recorded this thing you need to do:
+| [T][ ] homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I've recorded this thing you need to do:
+| [T][ ] other homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I've recorded this thing you need to do:
+| [T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [T][X] homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [E][X] meet friends (at: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand not a number, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand not a number, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][X] homework
+| 2.[E][X] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Aw... it's not done yet:
+| [T][ ] homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Aw... it's not done yet:
+| [E][ ] meet friends (at: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [E][X] meet people at dinner (at: 6:25 pm)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][X] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [E][X] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][X] meet people at dinner (at: 6:25 pm)
+| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [D][X] /at mysterious (by: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][X] meet people at dinner (at: 6:25 pm)
+| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][X] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [D][X] /by mysterious number 2 (by: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][X] meet people at dinner (at: 6:25 pm)
+| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][X] /at mysterious (by: [unknown])
+| 6.[D][X] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's going to happen at some time later:
+| [E][ ] meet friends (at: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's going to happen at some time later:
+| [E][ ] meet people at dinner (at: 6:25 pm)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's going to happen at some time later:
+| [E][ ] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][X] meet people at dinner (at: 6:25 pm)
+| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][X] /at mysterious (by: [unknown])
+| 6.[D][X] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+| 12.[E][ ] meet friends (at: [unknown])
+| 13.[E][ ] meet people at dinner (at: 6:25 pm)
+| 14.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Good luck with the deadline, here's the task:
+| [D][ ] /at mysterious (by: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Good luck with the deadline, here's the task:
+| [D][ ] /by mysterious number 2 (by: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Good luck with the deadline, here's the task:
+| [D][ ] rush this please (by: when?)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][X] meet people at dinner (at: 6:25 pm)
+| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][X] /at mysterious (by: [unknown])
+| 6.[D][X] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+| 12.[E][ ] meet friends (at: [unknown])
+| 13.[E][ ] meet people at dinner (at: 6:25 pm)
+| 14.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 15.[D][ ] /at mysterious (by: [unknown])
+| 16.[D][ ] /by mysterious number 2 (by: [unknown])
+| 17.[D][ ] rush this please (by: when?)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| It seems you didn't need this task anymore, so I removed it:
+| [E][ ] meet friends (at: [unknown])
+| You have 16 tasks left.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| It seems you didn't need this task anymore, so I removed it:
+| [E][X] meet people at dinner (at: 6:25 pm)
+| You have 15 tasks left.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 3.[D][X] /at mysterious (by: [unknown])
+| 4.[D][X] /by mysterious number 2 (by: [unknown])
+| 5.[D][ ] rush this please (by: when?)
+| 6.[E][ ] wow  much  space (at: 10am)
+| 7.[T][ ] homework
+| 8.[T][ ] other homework
+| 9.[T][ ] project 12
+| 10.[E][ ] meet friends (at: [unknown])
+| 11.[E][ ] meet people at dinner (at: 6:25 pm)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 13.[D][ ] /at mysterious (by: [unknown])
+| 14.[D][ ] /by mysterious number 2 (by: [unknown])
+| 15.[D][ ] rush this please (by: when?)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your delete.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand nan, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 24, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's going to happen at some time later:
+| [E][ ] wow  much  space (at: 10am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 3.[D][X] /at mysterious (by: [unknown])
+| 4.[D][X] /by mysterious number 2 (by: [unknown])
+| 5.[D][ ] rush this please (by: when?)
+| 6.[E][ ] wow  much  space (at: 10am)
+| 7.[T][ ] homework
+| 8.[T][ ] other homework
+| 9.[T][ ] project 12
+| 10.[E][ ] meet friends (at: [unknown])
+| 11.[E][ ] meet people at dinner (at: 6:25 pm)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 13.[D][ ] /at mysterious (by: [unknown])
+| 14.[D][ ] /by mysterious number 2 (by: [unknown])
+| 15.[D][ ] rush this please (by: when?)
+| 16.[E][ ] wow  much  space (at: 10am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| It was nice to have you around, I'm going back to sleep...
+'----------------------------------------------------------------
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index 7c0ae7ecc9..f8387f0ae7 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -4,10 +4,10 @@
 | ...or at least that's what they told me.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
-| (>.<')  I'm sorry, I don't really know what that means.
+| (>.<') I'm sorry, I don't really know what that means.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
-| (>.<')  I'm sorry, I don't really know what that means.
+| (>.<') I'm sorry, I don't really know what that means.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | (>.<') Add a description to your todo.
diff --git a/text-ui-test/EXPECTED1.TXT b/text-ui-test/EXPECTED1.TXT
new file mode 100644
index 0000000000..daa5869735
--- /dev/null
+++ b/text-ui-test/EXPECTED1.TXT
@@ -0,0 +1,304 @@
+,----------------------------------------------------------------
+| ...where is this again?
+| Oh, hello, I didn't see you there - I'm Anthea, a chatbot...
+| ...or at least that's what they told me.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') I'm sorry, I don't really know what that means.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') I'm sorry, I don't really know what that means.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your todo.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your deadline.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your event.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your mark.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your unmark.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I've recorded this thing you need to do:
+| [T][ ] homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I've recorded this thing you need to do:
+| [T][ ] other homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I've recorded this thing you need to do:
+| [T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [T][X] homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [E][X] meet friends (at: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand not a number, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand not a number, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][X] homework
+| 2.[E][X] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Aw... it's not done yet:
+| [T][ ] homework
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Aw... it's not done yet:
+| [E][ ] meet friends (at: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [E][X] meet people at dinner (at: 6:25 pm)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][X] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [E][X] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][X] meet people at dinner (at: 6:25 pm)
+| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [D][X] /at mysterious (by: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][X] meet people at dinner (at: 6:25 pm)
+| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][X] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Marked your task as done:
+| [D][X] /by mysterious number 2 (by: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][X] meet people at dinner (at: 6:25 pm)
+| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][X] /at mysterious (by: [unknown])
+| 6.[D][X] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's going to happen at some time later:
+| [E][ ] meet friends (at: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's going to happen at some time later:
+| [E][ ] meet people at dinner (at: 6:25 pm)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's going to happen at some time later:
+| [E][ ] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][X] meet people at dinner (at: 6:25 pm)
+| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][X] /at mysterious (by: [unknown])
+| 6.[D][X] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+| 12.[E][ ] meet friends (at: [unknown])
+| 13.[E][ ] meet people at dinner (at: 6:25 pm)
+| 14.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Good luck with the deadline, here's the task:
+| [D][ ] /at mysterious (by: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Good luck with the deadline, here's the task:
+| [D][ ] /by mysterious number 2 (by: [unknown])
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Good luck with the deadline, here's the task:
+| [D][ ] rush this please (by: when?)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][X] meet people at dinner (at: 6:25 pm)
+| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 5.[D][X] /at mysterious (by: [unknown])
+| 6.[D][X] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ] wow  much  space (at: 10am)
+| 9.[T][ ] homework
+| 10.[T][ ] other homework
+| 11.[T][ ] project 12
+| 12.[E][ ] meet friends (at: [unknown])
+| 13.[E][ ] meet people at dinner (at: 6:25 pm)
+| 14.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 15.[D][ ] /at mysterious (by: [unknown])
+| 16.[D][ ] /by mysterious number 2 (by: [unknown])
+| 17.[D][ ] rush this please (by: when?)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| It seems you didn't need this task anymore, so I removed it:
+| [E][ ] meet friends (at: [unknown])
+| You have 16 tasks left.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| It seems you didn't need this task anymore, so I removed it:
+| [E][X] meet people at dinner (at: 6:25 pm)
+| You have 15 tasks left.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 3.[D][X] /at mysterious (by: [unknown])
+| 4.[D][X] /by mysterious number 2 (by: [unknown])
+| 5.[D][ ] rush this please (by: when?)
+| 6.[E][ ] wow  much  space (at: 10am)
+| 7.[T][ ] homework
+| 8.[T][ ] other homework
+| 9.[T][ ] project 12
+| 10.[E][ ] meet friends (at: [unknown])
+| 11.[E][ ] meet people at dinner (at: 6:25 pm)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 13.[D][ ] /at mysterious (by: [unknown])
+| 14.[D][ ] /by mysterious number 2 (by: [unknown])
+| 15.[D][ ] rush this please (by: when?)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your delete.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand nan, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 24, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's going to happen at some time later:
+| [E][ ] wow  much  space (at: 10am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 3.[D][X] /at mysterious (by: [unknown])
+| 4.[D][X] /by mysterious number 2 (by: [unknown])
+| 5.[D][ ] rush this please (by: when?)
+| 6.[E][ ] wow  much  space (at: 10am)
+| 7.[T][ ] homework
+| 8.[T][ ] other homework
+| 9.[T][ ] project 12
+| 10.[E][ ] meet friends (at: [unknown])
+| 11.[E][ ] meet people at dinner (at: 6:25 pm)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 13.[D][ ] /at mysterious (by: [unknown])
+| 14.[D][ ] /by mysterious number 2 (by: [unknown])
+| 15.[D][ ] rush this please (by: when?)
+| 16.[E][ ] wow  much  space (at: 10am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| It was nice to have you around, I'm going back to sleep...
+'----------------------------------------------------------------
diff --git a/text-ui-test/duke.txt b/text-ui-test/duke.txt
new file mode 100644
index 0000000000..78ee9ae569
--- /dev/null
+++ b/text-ui-test/duke.txt
@@ -0,0 +1,16 @@
+/v8AVABvAEQAbw==,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
+/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AdAByAHUAZQ==,/v8ANwA6ADEAMgBhAG0=
+/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
+/v8ARQB2AGUAbgB0,/v8AdwBvAHcAIAAgAG0AdQBjAGgAIAAgAHMAcABhAGMAZQ==,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
+/v8AVABvAEQAbw==,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
+/v8AVABvAEQAbw==,/v8AbwB0AGgAZQByACAAaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
+/v8AVABvAEQAbw==,/v8AcAByAG8AagBlAGMAdAAgADEAMg==,/v8AZgBhAGwAcwBl
+/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAGYAcgBpAGUAbgBkAHM=,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZABpAG4AbgBlAHI=,/v8AZgBhAGwAcwBl,/v8ANgA6ADIANQAgAHAAbQ==
+/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AZgBhAGwAcwBl,/v8ANwA6ADEAMgBhAG0=
+/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
+/v8ARQB2AGUAbgB0,/v8AdwBvAHcAIAAgAG0AdQBjAGgAIAAgAHMAcABhAGMAZQ==,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
\ No newline at end of file
diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat
index 0873744649..74c2478cc0 100644
--- a/text-ui-test/runtest.bat
+++ b/text-ui-test/runtest.bat
@@ -14,8 +14,20 @@ IF ERRORLEVEL 1 (
 )
 REM no error here, errorlevel == 0
 
+REM delete data
+if exist duke.txt del duke.txt
+
 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
 java -classpath ..\bin Duke < input.txt > ACTUAL.TXT
 
 REM compare the output to the expected output
 FC ACTUAL.TXT EXPECTED.TXT
+
+REM delete output from previous run
+if exist ACTUAL1.TXT del ACTUAL1.TXT
+
+REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL1.TXT
+java -classpath ..\bin Duke < input.txt > ACTUAL1.TXT
+
+REM compare the output to the expected output
+FC ACTUAL1.TXT EXPECTED1.TXT

From edc2f9217143e75913c455c401f441a22fc717ec Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 20 Aug 2022 21:41:28 +0800
Subject: [PATCH 10/67] Add capability to recognise some date/time formats

---
 src/main/java/Deadline.java       |  6 ++---
 src/main/java/Event.java          |  6 ++---
 src/main/java/ParsedDateTime.java | 39 +++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/ParsedDateTime.java

diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java
index 406da81048..c1fb2d7546 100644
--- a/src/main/java/Deadline.java
+++ b/src/main/java/Deadline.java
@@ -2,7 +2,7 @@
  * Handles a task with a deadline.
  */
 public class Deadline extends Task {
-    protected String datetime;
+    protected ParsedDateTime datetime;
 
     /**
      * Creates a Deadline object.
@@ -11,11 +11,11 @@ public class Deadline extends Task {
      */
     public Deadline(String description, String by) {
         super(description);
-        datetime = by;
+        datetime = new ParsedDateTime(by);
     }
 
     @Override
     public String toString() {
-        return String.format("[D]%s (by: %s)", super.toString(), datetime);
+        return String.format("[D]%s (by: %s)", super.toString(), datetime.toString());
     }
 }
diff --git a/src/main/java/Event.java b/src/main/java/Event.java
index 02e7b287c9..5955ad5b44 100644
--- a/src/main/java/Event.java
+++ b/src/main/java/Event.java
@@ -2,7 +2,7 @@
  * Handles an event.
  */
 public class Event extends Task {
-    protected String datetime;
+    protected ParsedDateTime datetime;
 
     /**
      * Creates an event.
@@ -11,11 +11,11 @@ public class Event extends Task {
      */
     public Event(String description, String at) {
         super(description);
-        datetime = at;
+        datetime = new ParsedDateTime(at);
     }
 
     @Override
     public String toString() {
-        return String.format("[E]%s (at: %s)", super.toString(), datetime);
+        return String.format("[E]%s (at: %s)", super.toString(), datetime.toString());
     }
 }
diff --git a/src/main/java/ParsedDateTime.java b/src/main/java/ParsedDateTime.java
new file mode 100644
index 0000000000..131088e10d
--- /dev/null
+++ b/src/main/java/ParsedDateTime.java
@@ -0,0 +1,39 @@
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.Optional;
+
+/**
+ * Helper class to parse date/time strings
+ */
+public class ParsedDateTime {
+    private static final DateTimeFormatter[] formatters = {
+        DateTimeFormatter.ofPattern("yyyy-MM-dd"), DateTimeFormatter.ofPattern("d/M/yyyy HHmm"),
+        DateTimeFormatter.BASIC_ISO_DATE, DateTimeFormatter.ISO_LOCAL_DATE, DateTimeFormatter.ISO_OFFSET_DATE,
+        DateTimeFormatter.ISO_DATE, DateTimeFormatter.ISO_LOCAL_TIME, DateTimeFormatter.ISO_OFFSET_TIME,
+        DateTimeFormatter.ISO_TIME, DateTimeFormatter.ISO_LOCAL_DATE_TIME, DateTimeFormatter.ISO_OFFSET_DATE_TIME,
+        DateTimeFormatter.ISO_ZONED_DATE_TIME, DateTimeFormatter.ISO_DATE_TIME, DateTimeFormatter.ISO_ORDINAL_DATE,
+        DateTimeFormatter.ISO_WEEK_DATE, DateTimeFormatter.ISO_INSTANT, DateTimeFormatter.RFC_1123_DATE_TIME };
+
+    private Optional<LocalDateTime> parsedDateTime;
+    private String input;
+    ParsedDateTime(String input) {
+        this.input = input;
+        parsedDateTime = Optional.empty();
+        for (DateTimeFormatter formatter : formatters) {
+            try {
+                parsedDateTime = Optional.of(LocalDateTime.parse(input, formatter));
+                break;
+            } catch (DateTimeParseException ex) {
+                // Just try another one
+            }
+        }
+    }
+
+    @Override
+    public String toString() {
+        return parsedDateTime.map((dateTime) -> {
+            return dateTime.format(DateTimeFormatter.ofPattern("dd MMM yyyy HHmm"));
+        }).orElse(input);
+    }
+}

From 1ed84f9eb227a522e013b2af819f8d2cd79a5a01 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 20 Aug 2022 22:00:06 +0800
Subject: [PATCH 11/67] Add Ui class to handle user interface outputs

---
 .gitignore                              |  1 +
 src/main/java/Duke.java                 | 47 +++++++------------------
 src/main/java/FileState.java            |  2 +-
 src/main/java/PrefixCommandMatcher.java |  4 +--
 src/main/java/TaskFactory.java          |  2 +-
 src/main/java/Ui.java                   | 39 ++++++++++++++++++++
 6 files changed, 56 insertions(+), 39 deletions(-)
 create mode 100644 src/main/java/Ui.java

diff --git a/.gitignore b/.gitignore
index f69985ef1f..7f4ac88c9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ bin/
 
 /text-ui-test/ACTUAL.txt
 text-ui-test/EXPECTED-UNIX.TXT
+duke.txt
\ No newline at end of file
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
index 592b113a05..7bf6ab446b 100644
--- a/src/main/java/Duke.java
+++ b/src/main/java/Duke.java
@@ -11,39 +11,16 @@ public class Duke {
     /** List of strings to remember */
     private static ArrayList<Task> list;
 
-    /**
-     * Styles and prints lines with a border.
-     * @param lines Lines to be printed
-     */
-    public static void messagePrint(String... lines) {
-        System.out.println(",----------------------------------------------------------------");
-        for (String str : lines) {
-            System.out.print("| ");
-            System.out.println(str);
-        }
-        System.out.println("'----------------------------------------------------------------");
-    }
-
-    private static void greet() {
-        Duke.messagePrint("...where is this again?",
-                "Oh, hello, I didn't see you there - I'm Anthea, a chatbot...",
-                "...or at least that's what they told me.");
-    }
-
-    private static void leave() {
-        Duke.messagePrint("It was nice to have you around, I'm going back to sleep...");
-    }
-
     private static Optional<Task> getTask(String index) {
         try {
             int idx = Integer.parseInt(index);
             Task task = list.get(idx - 1);
             return Optional.of(task);
         } catch (NumberFormatException ex) {
-            messagePrint("Sorry, I didn't understand " + index + ", please give me a number.");
+            Ui.messagePrint("Sorry, I didn't understand " + index + ", please give me a number.");
             return Optional.empty();
         } catch (IndexOutOfBoundsException ex) {
-            messagePrint("Sorry, the number " + index + ", wasn't in the range.");
+            Ui.messagePrint("Sorry, the number " + index + ", wasn't in the range.");
             return Optional.empty();
         }
     }
@@ -65,7 +42,7 @@ private static void initializeCommands() {
             for (int i = 0; i < list.size(); i++) {
                 output[i + 1] = (i + 1) + "." + list.get(i).toString();
             }
-            Duke.messagePrint(output);
+            Ui.messagePrint(output);
         }));
 
         commands.add(new PrefixCommandMatcher("mark", (str, map) -> {
@@ -75,14 +52,14 @@ private static void initializeCommands() {
                     "Marked your task as done:",
                     task.toString()
                 };
-                Duke.messagePrint(output);
+                Ui.messagePrint(output);
             });
         }));
 
         commands.add(new PrefixCommandMatcher("unmark", (str, map) -> {
             getTask(str).ifPresent((task) -> {
                 task.markAsNotDone();
-                Duke.messagePrint("Aw... it's not done yet:",
+                Ui.messagePrint("Aw... it's not done yet:",
                         task.toString());
             });
         }));
@@ -90,28 +67,28 @@ private static void initializeCommands() {
         commands.add(new PrefixCommandMatcher("deadline", (str, map) -> {
             Task task = new Deadline(str, map.getOrDefault("by", "[unknown]"));
             list.add(task);
-            Duke.messagePrint("Good luck with the deadline, here's the task:",
+            Ui.messagePrint("Good luck with the deadline, here's the task:",
                     task.toString());
         }));
 
         commands.add(new PrefixCommandMatcher("todo", (str, map) -> {
             Task task = new ToDo(str);
             list.add(task);
-            Duke.messagePrint("I've recorded this thing you need to do:",
+            Ui.messagePrint("I've recorded this thing you need to do:",
                     task.toString());
         }));
 
         commands.add(new PrefixCommandMatcher("event", (str, map) -> {
             Task task = new Event(str, map.getOrDefault("at", "[unknown]"));
             list.add(task);
-            Duke.messagePrint("That's going to happen at some time later:",
+            Ui.messagePrint("That's going to happen at some time later:",
                     task.toString());
         }));
 
         commands.add(new PrefixCommandMatcher("delete", (str, map) -> {
             getTask(str).ifPresent((task) -> {
                 list.remove(task);
-                Duke.messagePrint("It seems you didn't need this task anymore, so I removed it:",
+                Ui.messagePrint("It seems you didn't need this task anymore, so I removed it:",
                         task.toString(),
                         String.format("You have %d tasks left.", list.size()));
             });
@@ -119,7 +96,7 @@ private static void initializeCommands() {
 
         // default command matcher - add to list
         commands.add(new CommandMatcher((str) -> true, (str) -> {
-            Duke.messagePrint("(>.<') I'm sorry, I don't really know what that means.");
+            Ui.messagePrint("(>.<') I'm sorry, I don't really know what that means.");
         }));
     }
 
@@ -136,7 +113,7 @@ private static void handleCommand(String command) {
      * @param args Command line args which are not used.
      */
     public static void main(String[] args) {
-        greet();
+        Ui.greet();
         initializeTaskList();
         initializeCommands();
         Scanner input = new Scanner(System.in);
@@ -150,6 +127,6 @@ public static void main(String[] args) {
             }
         }
         finalizeTaskList();
-        leave();
+        Ui.leave();
     }
 }
diff --git a/src/main/java/FileState.java b/src/main/java/FileState.java
index e065d58739..01a06cf84b 100644
--- a/src/main/java/FileState.java
+++ b/src/main/java/FileState.java
@@ -105,7 +105,7 @@ public void saveLines(String[][] strings) {
             }
             writer.close();
         } catch (IOException ex) {
-            Duke.messagePrint("(>.<') I was unable to record your tasks...");
+            Ui.messagePrint("(>.<') I was unable to record your tasks...");
             ex.printStackTrace();
         }
     }
diff --git a/src/main/java/PrefixCommandMatcher.java b/src/main/java/PrefixCommandMatcher.java
index e72af6023e..2e42a0171a 100644
--- a/src/main/java/PrefixCommandMatcher.java
+++ b/src/main/java/PrefixCommandMatcher.java
@@ -16,7 +16,7 @@ public PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String
         super((cmd) -> cmd.strip().startsWith(prefix + " ") || cmd.strip().equals(prefix), (cmd) -> {
             cmd = cmd.strip();
             if (cmd.equals(prefix)) {
-                Duke.messagePrint("(>.<') Add a description to your " + prefix + ".");
+                Ui.messagePrint("(>.<') Add a description to your " + prefix + ".");
                 return;
             }
             String withoutPrefix = cmd.split(" ", 2)[1];
@@ -32,7 +32,7 @@ public PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String
             }
             commandParts[0] = commandParts[0].strip();
             if (commandParts[0].equals("")) {
-                Duke.messagePrint("(>.<') The description for " + prefix + " shouldn't be empty.");
+                Ui.messagePrint("(>.<') The description for " + prefix + " shouldn't be empty.");
                 return;
             }
             action.accept(commandParts[0].strip(), map);
diff --git a/src/main/java/TaskFactory.java b/src/main/java/TaskFactory.java
index bacbb01123..3b283b692e 100644
--- a/src/main/java/TaskFactory.java
+++ b/src/main/java/TaskFactory.java
@@ -38,7 +38,7 @@ public static Optional<Task> constructOptionalTask(String[] taskData) {
         try {
             return Optional.of(constructTask(taskData));
         } catch (IllegalArgumentException ex) {
-            Duke.messagePrint("(>.<') did not understand this task - dropping it",
+            Ui.messagePrint("(>.<') did not understand this task - dropping it",
                     String.join(", ", taskData));
             return Optional.empty();
         }
diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java
new file mode 100644
index 0000000000..e5163fbb29
--- /dev/null
+++ b/src/main/java/Ui.java
@@ -0,0 +1,39 @@
+import java.util.ArrayList;
+import java.util.Optional;
+import java.util.Scanner;
+
+public class Ui {
+    /** List of commands */
+    private static ArrayList<CommandMatcher> commands;
+    /** List of strings to remember */
+    private static ArrayList<Task> list;
+
+    /**
+     * Styles and prints lines with a border.
+     * @param lines Lines to be printed
+     */
+    public static void messagePrint(String... lines) {
+        System.out.println(",----------------------------------------------------------------");
+        for (String str : lines) {
+            System.out.print("| ");
+            System.out.println(str);
+        }
+        System.out.println("'----------------------------------------------------------------");
+    }
+
+    /**
+     * Greets user.
+     */
+    public static void greet() {
+        Ui.messagePrint("...where is this again?",
+                "Oh, hello, I didn't see you there - I'm Anthea, a chatbot...",
+                "...or at least that's what they told me.");
+    }
+
+    /**
+     * Leaves the user.
+     */
+    public static void leave() {
+        Ui.messagePrint("It was nice to have you around, I'm going back to sleep...");
+    }
+}

From bb7ed9ce9f866344816b51ac67778c81b3cc498f Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 20 Aug 2022 22:20:54 +0800
Subject: [PATCH 12/67] Extract Storage, Parser, TaskList classes

---
 src/main/java/Duke.java                       | 85 +------------------
 src/main/java/Parser.java                     | 75 ++++++++++++++++
 .../java/{FileState.java => Storage.java}     | 11 ++-
 src/main/java/TaskList.java                   | 39 +++++++++
 .../{TasksFileState.java => TaskStorage.java} | 10 +--
 5 files changed, 128 insertions(+), 92 deletions(-)
 create mode 100644 src/main/java/Parser.java
 rename src/main/java/{FileState.java => Storage.java} (88%)
 create mode 100644 src/main/java/TaskList.java
 rename src/main/java/{TasksFileState.java => TaskStorage.java} (68%)

diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
index 7bf6ab446b..7dd662bb87 100644
--- a/src/main/java/Duke.java
+++ b/src/main/java/Duke.java
@@ -8,13 +8,11 @@
 public class Duke {
     /** List of commands */
     private static ArrayList<CommandMatcher> commands;
-    /** List of strings to remember */
-    private static ArrayList<Task> list;
 
     private static Optional<Task> getTask(String index) {
         try {
             int idx = Integer.parseInt(index);
-            Task task = list.get(idx - 1);
+            Task task = TaskList.getTaskList().get(idx - 1);
             return Optional.of(task);
         } catch (NumberFormatException ex) {
             Ui.messagePrint("Sorry, I didn't understand " + index + ", please give me a number.");
@@ -25,81 +23,6 @@ private static Optional<Task> getTask(String index) {
         }
     }
 
-    private static void initializeTaskList() {
-        list = TasksFileState.getTasks();
-    }
-
-    private static void finalizeTaskList() {
-        TasksFileState.saveTasks(list);
-    }
-
-    private static void initializeCommands() {
-        commands = new ArrayList<>();
-
-        commands.add(new CommandMatcher((str) -> str.equals("list"), (str) -> {
-            String[] output = new String[list.size() + 1];
-            output[0] = "Here, your tasks:";
-            for (int i = 0; i < list.size(); i++) {
-                output[i + 1] = (i + 1) + "." + list.get(i).toString();
-            }
-            Ui.messagePrint(output);
-        }));
-
-        commands.add(new PrefixCommandMatcher("mark", (str, map) -> {
-            getTask(str).ifPresent((task) -> {
-                task.markAsDone();
-                String[] output = {
-                    "Marked your task as done:",
-                    task.toString()
-                };
-                Ui.messagePrint(output);
-            });
-        }));
-
-        commands.add(new PrefixCommandMatcher("unmark", (str, map) -> {
-            getTask(str).ifPresent((task) -> {
-                task.markAsNotDone();
-                Ui.messagePrint("Aw... it's not done yet:",
-                        task.toString());
-            });
-        }));
-
-        commands.add(new PrefixCommandMatcher("deadline", (str, map) -> {
-            Task task = new Deadline(str, map.getOrDefault("by", "[unknown]"));
-            list.add(task);
-            Ui.messagePrint("Good luck with the deadline, here's the task:",
-                    task.toString());
-        }));
-
-        commands.add(new PrefixCommandMatcher("todo", (str, map) -> {
-            Task task = new ToDo(str);
-            list.add(task);
-            Ui.messagePrint("I've recorded this thing you need to do:",
-                    task.toString());
-        }));
-
-        commands.add(new PrefixCommandMatcher("event", (str, map) -> {
-            Task task = new Event(str, map.getOrDefault("at", "[unknown]"));
-            list.add(task);
-            Ui.messagePrint("That's going to happen at some time later:",
-                    task.toString());
-        }));
-
-        commands.add(new PrefixCommandMatcher("delete", (str, map) -> {
-            getTask(str).ifPresent((task) -> {
-                list.remove(task);
-                Ui.messagePrint("It seems you didn't need this task anymore, so I removed it:",
-                        task.toString(),
-                        String.format("You have %d tasks left.", list.size()));
-            });
-        }));
-
-        // default command matcher - add to list
-        commands.add(new CommandMatcher((str) -> true, (str) -> {
-            Ui.messagePrint("(>.<') I'm sorry, I don't really know what that means.");
-        }));
-    }
-
     private static void handleCommand(String command) {
         for (CommandMatcher matcher : commands) {
             if (matcher.run(command)) {
@@ -114,8 +37,8 @@ private static void handleCommand(String command) {
      */
     public static void main(String[] args) {
         Ui.greet();
-        initializeTaskList();
-        initializeCommands();
+        TaskList.initializeTaskList();
+        commands = Parser.getCommands();
         Scanner input = new Scanner(System.in);
         boolean keepRunning = true;
         while (keepRunning) {
@@ -126,7 +49,7 @@ public static void main(String[] args) {
                 handleCommand(command);
             }
         }
-        finalizeTaskList();
+        TaskList.finalizeTaskList();
         Ui.leave();
     }
 }
diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java
new file mode 100644
index 0000000000..17d81c3d0a
--- /dev/null
+++ b/src/main/java/Parser.java
@@ -0,0 +1,75 @@
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Handles creating commands through CommandMatcher/PrefixCommandMatcher.
+ */
+public class Parser {
+
+    public static ArrayList<CommandMatcher> getCommands() {
+        ArrayList<CommandMatcher> commands = new ArrayList<>();
+
+        commands.add(new CommandMatcher((str) -> str.equals("list"), (str) -> {
+            List<Task> list = TaskList.getTaskList();
+            String[] output = new String[list.size() + 1];
+            output[0] = "Here, your tasks:";
+            for (int i = 0; i < list.size(); i++) {
+                output[i + 1] = (i + 1) + "." + list.get(i).toString();
+            }
+            Ui.messagePrint(output);
+        }));
+
+        commands.add(new PrefixCommandMatcher("mark", (str, map) -> {
+            TaskList.getTask(str).ifPresent((task) -> {
+                task.markAsDone();
+                Ui.messagePrint("Marked your task as done:",
+                        task.toString());
+            });
+        }));
+
+        commands.add(new PrefixCommandMatcher("unmark", (str, map) -> {
+            TaskList.getTask(str).ifPresent((task) -> {
+                task.markAsNotDone();
+                Ui.messagePrint("Aw... it's not done yet:",
+                        task.toString());
+            });
+        }));
+
+        commands.add(new PrefixCommandMatcher("deadline", (str, map) -> {
+            Task task = new Deadline(str, map.getOrDefault("by", "[unknown]"));
+            TaskList.getTaskList().add(task);
+            Ui.messagePrint("Good luck with the deadline, here's the task:",
+                    task.toString());
+        }));
+
+        commands.add(new PrefixCommandMatcher("todo", (str, map) -> {
+            Task task = new ToDo(str);
+            TaskList.getTaskList().add(task);
+            Ui.messagePrint("I've recorded this thing you need to do:",
+                    task.toString());
+        }));
+
+        commands.add(new PrefixCommandMatcher("event", (str, map) -> {
+            Task task = new Event(str, map.getOrDefault("at", "[unknown]"));
+            TaskList.getTaskList().add(task);
+            Ui.messagePrint("That's going to happen at some time later:",
+                    task.toString());
+        }));
+
+        commands.add(new PrefixCommandMatcher("delete", (str, map) -> {
+            TaskList.getTask(str).ifPresent((task) -> {
+                TaskList.getTaskList().remove(task);
+                Ui.messagePrint("It seems you didn't need this task anymore, so I removed it:",
+                        task.toString(),
+                        String.format("You have %d tasks left.", TaskList.getTaskList().size()));
+            });
+        }));
+
+        // default command matcher - add to list
+        commands.add(new CommandMatcher((str) -> true, (str) -> {
+            Ui.messagePrint("(>.<') I'm sorry, I don't really know what that means.");
+        }));
+
+        return commands;
+    }
+}
diff --git a/src/main/java/FileState.java b/src/main/java/Storage.java
similarity index 88%
rename from src/main/java/FileState.java
rename to src/main/java/Storage.java
index 01a06cf84b..e90157bee6 100644
--- a/src/main/java/FileState.java
+++ b/src/main/java/Storage.java
@@ -5,23 +5,22 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
-import java.util.stream.Stream;
 
 /**
  * Handles file state.
  */
-public class FileState {
-    private static Map<String, FileState> fileStates = new HashMap<>();
+public class Storage {
+    private static Map<String, Storage> fileStates = new HashMap<>();
     private String contents = null;
     private String fileName;
 
-    private FileState(String fileName) {
+    private Storage(String fileName) {
         this.fileName = fileName;
     }
 
-    public static FileState getFileState(String fileName) {
+    public static Storage getFileState(String fileName) {
         if (!fileStates.containsKey(fileName)) {
-            fileStates.put(fileName, new FileState(fileName));
+            fileStates.put(fileName, new Storage(fileName));
         }
         return fileStates.get(fileName);
     }
diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java
new file mode 100644
index 0000000000..1304f25630
--- /dev/null
+++ b/src/main/java/TaskList.java
@@ -0,0 +1,39 @@
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class TaskList {
+    /** List of tasks to remember */
+    private static ArrayList<Task> taskList = new ArrayList<>();
+
+    public static void initializeTaskList() {
+        taskList = TaskStorage.getTasks();
+    }
+
+    public static void finalizeTaskList() {
+        TaskStorage.saveTasks(taskList);
+    }
+
+    /**
+     * Get task from index as string
+     * @param index the index as a string
+     * @return Optional.of(task) if successful, else Optional.empty()
+     */
+    public static Optional<Task> getTask(String index) {
+        try {
+            int idx = Integer.parseInt(index);
+            Task task = taskList.get(idx - 1);
+            return Optional.of(task);
+        } catch (NumberFormatException ex) {
+            Ui.messagePrint("Sorry, I didn't understand " + index + ", please give me a number.");
+            return Optional.empty();
+        } catch (IndexOutOfBoundsException ex) {
+            Ui.messagePrint("Sorry, the number " + index + ", wasn't in the range.");
+            return Optional.empty();
+        }
+    }
+
+    public static List<Task> getTaskList() {
+        return taskList;
+    }
+}
diff --git a/src/main/java/TasksFileState.java b/src/main/java/TaskStorage.java
similarity index 68%
rename from src/main/java/TasksFileState.java
rename to src/main/java/TaskStorage.java
index de24a99bd0..d82db09e60 100644
--- a/src/main/java/TasksFileState.java
+++ b/src/main/java/TaskStorage.java
@@ -5,16 +5,16 @@
 /**
  * Accesses a file for tasks.
  */
-public class TasksFileState {
+public class TaskStorage {
 
     /**
      * Gets ArrayList of previously saved tasks.
      * @return ArrayList of tasks.
      */
     public static ArrayList<Task> getTasks() {
-        FileState fileState = FileState.getFileState("./duke.txt");
+        Storage storage = Storage.getFileState("./duke.txt");
         ArrayList<Task> tasks = new ArrayList<>();
-        for (String[] line : fileState.getLines()) {
+        for (String[] line : storage.getLines()) {
             TaskFactory.constructOptionalTask(line).ifPresent((task) -> tasks.add(task));
         }
         return tasks;
@@ -26,7 +26,7 @@ public static ArrayList<Task> getTasks() {
      */
     public static void saveTasks(List<Task> tasks) {
         List<String[]> lines = tasks.stream().map(Task::getAsStringArray).collect(Collectors.toList());
-        FileState fileState = FileState.getFileState("./duke.txt");
-        fileState.saveLines((String[][]) lines.toArray(new String[][]{}));
+        Storage storage = Storage.getFileState("./duke.txt");
+        storage.saveLines((String[][]) lines.toArray(new String[][]{}));
     }
 }

From 6e160d2d429baf493493ffb14361b918b5d5db24 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 20 Aug 2022 22:52:22 +0800
Subject: [PATCH 13/67] Move classes into packages

Packaging is good for organisation.

Another thing we need to do while packaging is to
update runtest.bat to compile code within the packages.
---
 README.md                                     |   4 +-
 src/main/java/{ => duke}/CommandMatcher.java  |   2 +
 src/main/java/{ => duke}/Duke.java            | 115 +++++++++---------
 src/main/java/{ => duke}/ParsedDateTime.java  |   9 +-
 src/main/java/{ => duke}/Parser.java          |   6 +-
 .../java/{ => duke}/PrefixCommandMatcher.java |   2 +
 src/main/java/{ => duke}/Storage.java         |   2 +
 src/main/java/{ => duke}/Ui.java              |   6 +-
 src/main/java/{ => duke/task}/Deadline.java   |  10 +-
 src/main/java/{ => duke/task}/Event.java      |   6 +-
 src/main/java/{ => duke/task}/Task.java       |  84 ++++++-------
 .../java/{ => duke/task}/TaskFactory.java     |  16 ++-
 src/main/java/{ => duke/task}/TaskList.java   |  13 +-
 .../java/{ => duke/task}/TaskStorage.java     |   4 +
 src/main/java/{ => duke/task}/ToDo.java       |   4 +-
 text-ui-test/duke.txt                         |  32 ++---
 text-ui-test/runtest.bat                      |   6 +-
 17 files changed, 186 insertions(+), 135 deletions(-)
 rename src/main/java/{ => duke}/CommandMatcher.java (95%)
 rename src/main/java/{ => duke}/Duke.java (93%)
 rename src/main/java/{ => duke}/ParsedDateTime.java (86%)
 rename src/main/java/{ => duke}/Parser.java (93%)
 rename src/main/java/{ => duke}/PrefixCommandMatcher.java (96%)
 rename src/main/java/{ => duke}/Storage.java (96%)
 rename src/main/java/{ => duke}/Ui.java (92%)
 rename src/main/java/{ => duke/task}/Deadline.java (78%)
 rename src/main/java/{ => duke/task}/Event.java (84%)
 rename src/main/java/{ => duke/task}/Task.java (86%)
 rename src/main/java/{ => duke/task}/TaskFactory.java (72%)
 rename src/main/java/{ => duke/task}/TaskList.java (84%)
 rename src/main/java/{ => duke/task}/TaskStorage.java (92%)
 rename src/main/java/{ => duke/task}/ToDo.java (86%)

diff --git a/README.md b/README.md
index 8715d4d915..0f2208ab64 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Duke project template
+# duke.Duke project template
 
 This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it.
 
@@ -13,7 +13,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version.
    1. If there are any further prompts, accept the defaults.
 1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).<br>
    In the same dialog, set the **Project language level** field to the `SDK default` option.
-3. After that, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output:
+3. After that, locate the `src/main/java/duke.Duke.java` file, right-click it, and choose `Run duke.Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output:
    ```
    Hello from
     ____        _        
diff --git a/src/main/java/CommandMatcher.java b/src/main/java/duke/CommandMatcher.java
similarity index 95%
rename from src/main/java/CommandMatcher.java
rename to src/main/java/duke/CommandMatcher.java
index bf3ce705bb..e69d884771 100644
--- a/src/main/java/CommandMatcher.java
+++ b/src/main/java/duke/CommandMatcher.java
@@ -1,3 +1,5 @@
+package duke;
+
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
diff --git a/src/main/java/Duke.java b/src/main/java/duke/Duke.java
similarity index 93%
rename from src/main/java/Duke.java
rename to src/main/java/duke/Duke.java
index 7dd662bb87..b7fc66fc24 100644
--- a/src/main/java/Duke.java
+++ b/src/main/java/duke/Duke.java
@@ -1,55 +1,60 @@
-import java.util.ArrayList;
-import java.util.Optional;
-import java.util.Scanner;
-
-/**
- * The main method of the chatbot, as well as its startup and teardown.
- */
-public class Duke {
-    /** List of commands */
-    private static ArrayList<CommandMatcher> commands;
-
-    private static Optional<Task> getTask(String index) {
-        try {
-            int idx = Integer.parseInt(index);
-            Task task = TaskList.getTaskList().get(idx - 1);
-            return Optional.of(task);
-        } catch (NumberFormatException ex) {
-            Ui.messagePrint("Sorry, I didn't understand " + index + ", please give me a number.");
-            return Optional.empty();
-        } catch (IndexOutOfBoundsException ex) {
-            Ui.messagePrint("Sorry, the number " + index + ", wasn't in the range.");
-            return Optional.empty();
-        }
-    }
-
-    private static void handleCommand(String command) {
-        for (CommandMatcher matcher : commands) {
-            if (matcher.run(command)) {
-                break;
-            }
-        }
-    }
-
-    /**
-     * Runs the chatbot execution.
-     * @param args Command line args which are not used.
-     */
-    public static void main(String[] args) {
-        Ui.greet();
-        TaskList.initializeTaskList();
-        commands = Parser.getCommands();
-        Scanner input = new Scanner(System.in);
-        boolean keepRunning = true;
-        while (keepRunning) {
-            String command = input.nextLine();
-            if (command.equals("bye")) {
-                keepRunning = false;
-            } else {
-                handleCommand(command);
-            }
-        }
-        TaskList.finalizeTaskList();
-        Ui.leave();
-    }
-}
+package duke;
+
+import duke.task.Task;
+import duke.task.TaskList;
+
+import java.util.ArrayList;
+import java.util.Optional;
+import java.util.Scanner;
+
+/**
+ * The main method of the chatbot, as well as its startup and teardown.
+ */
+public class Duke {
+    /** List of commands */
+    private static ArrayList<CommandMatcher> commands;
+
+    private static Optional<Task> getTask(String index) {
+        try {
+            int idx = Integer.parseInt(index);
+            Task task = TaskList.getTaskList().get(idx - 1);
+            return Optional.of(task);
+        } catch (NumberFormatException ex) {
+            Ui.messagePrint("Sorry, I didn't understand " + index + ", please give me a number.");
+            return Optional.empty();
+        } catch (IndexOutOfBoundsException ex) {
+            Ui.messagePrint("Sorry, the number " + index + ", wasn't in the range.");
+            return Optional.empty();
+        }
+    }
+
+    private static void handleCommand(String command) {
+        for (CommandMatcher matcher : commands) {
+            if (matcher.run(command)) {
+                break;
+            }
+        }
+    }
+
+    /**
+     * Runs the chatbot execution.
+     * @param args Command line args which are not used.
+     */
+    public static void main(String[] args) {
+        Ui.greet();
+        TaskList.initializeTaskList();
+        commands = Parser.getCommands();
+        Scanner input = new Scanner(System.in);
+        boolean keepRunning = true;
+        while (keepRunning) {
+            String command = input.nextLine();
+            if (command.equals("bye")) {
+                keepRunning = false;
+            } else {
+                handleCommand(command);
+            }
+        }
+        TaskList.finalizeTaskList();
+        Ui.leave();
+    }
+}
diff --git a/src/main/java/ParsedDateTime.java b/src/main/java/duke/ParsedDateTime.java
similarity index 86%
rename from src/main/java/ParsedDateTime.java
rename to src/main/java/duke/ParsedDateTime.java
index 131088e10d..8e6c43c7f0 100644
--- a/src/main/java/ParsedDateTime.java
+++ b/src/main/java/duke/ParsedDateTime.java
@@ -1,3 +1,5 @@
+package duke;
+
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
@@ -17,7 +19,12 @@ public class ParsedDateTime {
 
     private Optional<LocalDateTime> parsedDateTime;
     private String input;
-    ParsedDateTime(String input) {
+
+    /**
+     * Creates an object to handle if the date/time can be parsed.
+     * @param input String that may represent date/time.
+     */
+    public ParsedDateTime(String input) {
         this.input = input;
         parsedDateTime = Optional.empty();
         for (DateTimeFormatter formatter : formatters) {
diff --git a/src/main/java/Parser.java b/src/main/java/duke/Parser.java
similarity index 93%
rename from src/main/java/Parser.java
rename to src/main/java/duke/Parser.java
index 17d81c3d0a..dd90f3a8de 100644
--- a/src/main/java/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -1,8 +1,12 @@
+package duke;
+
+import duke.task.*;
+
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Handles creating commands through CommandMatcher/PrefixCommandMatcher.
+ * Handles creating commands through duke.CommandMatcher/duke.PrefixCommandMatcher.
  */
 public class Parser {
 
diff --git a/src/main/java/PrefixCommandMatcher.java b/src/main/java/duke/PrefixCommandMatcher.java
similarity index 96%
rename from src/main/java/PrefixCommandMatcher.java
rename to src/main/java/duke/PrefixCommandMatcher.java
index 2e42a0171a..0c90fe056c 100644
--- a/src/main/java/PrefixCommandMatcher.java
+++ b/src/main/java/duke/PrefixCommandMatcher.java
@@ -1,3 +1,5 @@
+package duke;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.BiConsumer;
diff --git a/src/main/java/Storage.java b/src/main/java/duke/Storage.java
similarity index 96%
rename from src/main/java/Storage.java
rename to src/main/java/duke/Storage.java
index e90157bee6..a16d70d212 100644
--- a/src/main/java/Storage.java
+++ b/src/main/java/duke/Storage.java
@@ -1,3 +1,5 @@
+package duke;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
diff --git a/src/main/java/Ui.java b/src/main/java/duke/Ui.java
similarity index 92%
rename from src/main/java/Ui.java
rename to src/main/java/duke/Ui.java
index e5163fbb29..8b66775451 100644
--- a/src/main/java/Ui.java
+++ b/src/main/java/duke/Ui.java
@@ -1,6 +1,8 @@
+package duke;
+
+import duke.task.Task;
+
 import java.util.ArrayList;
-import java.util.Optional;
-import java.util.Scanner;
 
 public class Ui {
     /** List of commands */
diff --git a/src/main/java/Deadline.java b/src/main/java/duke/task/Deadline.java
similarity index 78%
rename from src/main/java/Deadline.java
rename to src/main/java/duke/task/Deadline.java
index 5c6639918f..804bb2e82f 100644
--- a/src/main/java/Deadline.java
+++ b/src/main/java/duke/task/Deadline.java
@@ -1,3 +1,7 @@
+package duke.task;
+
+import duke.ParsedDateTime;
+
 /**
  * Handles a task with a deadline.
  */
@@ -5,7 +9,7 @@ public class Deadline extends Task {
     protected ParsedDateTime datetime;
 
     /**
-     * Creates a Deadline object.
+     * Creates a duke.tasks.Deadline object.
      * @param description Description of deadline.
      * @param by Time of deadline.
      */
@@ -14,7 +18,7 @@ public Deadline(String description, String by) {
     }
 
     /**
-     * Creates a Deadline object.
+     * Creates a duke.tasks.Deadline object.
      * @param description Description of deadline.
      * @param by Time of deadline.
      * @param done If the task is done.
@@ -36,6 +40,6 @@ public String toString() {
     @Override
     public String[] getAsStringArray() {
         String[] data = super.getAsStringArray();
-        return new String[]{ "Deadline", data[1], data[2], datetime.toString() };
+        return new String[]{ "duke.tasks.Deadline", data[1], data[2], datetime.toString() };
     }
 }
diff --git a/src/main/java/Event.java b/src/main/java/duke/task/Event.java
similarity index 84%
rename from src/main/java/Event.java
rename to src/main/java/duke/task/Event.java
index d3e436593e..23191272c1 100644
--- a/src/main/java/Event.java
+++ b/src/main/java/duke/task/Event.java
@@ -1,3 +1,7 @@
+package duke.task;
+
+import duke.ParsedDateTime;
+
 /**
  * Handles an event.
  */
@@ -36,6 +40,6 @@ public String toString() {
     @Override
     public String[] getAsStringArray() {
         String[] data = super.getAsStringArray();
-        return new String[]{ "Event", data[1], data[2], datetime.toString() };
+        return new String[]{ "duke.tasks.Event", data[1], data[2], datetime.toString() };
     }
 }
diff --git a/src/main/java/Task.java b/src/main/java/duke/task/Task.java
similarity index 86%
rename from src/main/java/Task.java
rename to src/main/java/duke/task/Task.java
index 6b22a6a06a..d0d1542af1 100644
--- a/src/main/java/Task.java
+++ b/src/main/java/duke/task/Task.java
@@ -1,41 +1,43 @@
-/**
- * A task stores the state and description of a task.
- */
-public class Task {
-    private static final char MARKER_DONE = 'X';
-    private static final char MARKER_NOT_DONE = ' ';
-    private String name;
-    private boolean done;
-    Task(String name) {
-        this(name, false);
-    }
-
-    Task(String name, boolean done) {
-        this.name = name;
-        this.done = done;
-    }
-
-    public void markAsDone() {
-        this.done = true;
-    }
-    public void markAsNotDone() {
-        this.done = false;
-    }
-
-    private char getDoneMarker() {
-        return this.done ? MARKER_DONE : MARKER_NOT_DONE;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("[%c] %s", getDoneMarker(), name);
-    }
-
-    /**
-     * Get a string array representation suitable for printing to files.
-     * @return String array representation.
-     */
-    public String[] getAsStringArray() {
-        return new String[]{ "Task", name, String.valueOf(done) };
-    }
-}
+package duke.task;
+
+/**
+ * A task stores the state and description of a task.
+ */
+public class Task {
+    private static final char MARKER_DONE = 'X';
+    private static final char MARKER_NOT_DONE = ' ';
+    private String name;
+    private boolean done;
+    Task(String name) {
+        this(name, false);
+    }
+
+    Task(String name, boolean done) {
+        this.name = name;
+        this.done = done;
+    }
+
+    public void markAsDone() {
+        this.done = true;
+    }
+    public void markAsNotDone() {
+        this.done = false;
+    }
+
+    private char getDoneMarker() {
+        return this.done ? MARKER_DONE : MARKER_NOT_DONE;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("[%c] %s", getDoneMarker(), name);
+    }
+
+    /**
+     * Get a string array representation suitable for printing to files.
+     * @return String array representation.
+     */
+    public String[] getAsStringArray() {
+        return new String[]{ "duke.tasks.Task", name, String.valueOf(done) };
+    }
+}
diff --git a/src/main/java/TaskFactory.java b/src/main/java/duke/task/TaskFactory.java
similarity index 72%
rename from src/main/java/TaskFactory.java
rename to src/main/java/duke/task/TaskFactory.java
index 3b283b692e..b43daa287b 100644
--- a/src/main/java/TaskFactory.java
+++ b/src/main/java/duke/task/TaskFactory.java
@@ -1,5 +1,9 @@
+package duke.task;
+
 import java.util.Optional;
 
+import duke.Ui;
+
 /**
  * Constructs tasks from strings
  */
@@ -7,23 +11,23 @@ public class TaskFactory {
     /**
      * Constructs the task.
      * @param taskData Data for the task.
-     * @return Task according to taskData.
+     * @return duke.tasks.Task according to taskData.
      * @throws IllegalArgumentException If taskData does not conform to the format.
      */
     public static Task constructTask(String[] taskData) throws IllegalArgumentException {
         if (taskData == null || taskData.length < 1) {
             throw new IllegalArgumentException("taskData cannot be null or of length 1");
         }
-        if (taskData[0].equals("Task") && taskData.length >= 3) {
+        if (taskData[0].equals("duke.tasks.Task") && taskData.length >= 3) {
             return new Task(taskData[1], taskData[2].equals("true"));
         }
-        if (taskData[0].equals("ToDo") && taskData.length >= 3) {
+        if (taskData[0].equals("duke.tasks.ToDo") && taskData.length >= 3) {
             return new ToDo(taskData[1], taskData[2].equals("true"));
         }
-        if (taskData[0].equals("Deadline") && taskData.length >= 4) {
+        if (taskData[0].equals("duke.tasks.Deadline") && taskData.length >= 4) {
             return new Deadline(taskData[1], taskData[3], taskData[2].equals("true"));
         }
-        if (taskData[0].equals("Event") && taskData.length >= 4) {
+        if (taskData[0].equals("duke.tasks.Event") && taskData.length >= 4) {
             return new Event(taskData[1], taskData[3], taskData[2].equals("true"));
         }
         throw new IllegalArgumentException("Unsupported task type or incorrect task data length");
@@ -32,7 +36,7 @@ public static Task constructTask(String[] taskData) throws IllegalArgumentExcept
     /**
      * Constructs the task.
      * @param taskData Data for the task.
-     * @return Optional of Task according to taskData, Optional.empty() if cannot construct.
+     * @return Optional of duke.tasks.Task according to taskData, Optional.empty() if cannot construct.
      */
     public static Optional<Task> constructOptionalTask(String[] taskData) {
         try {
diff --git a/src/main/java/TaskList.java b/src/main/java/duke/task/TaskList.java
similarity index 84%
rename from src/main/java/TaskList.java
rename to src/main/java/duke/task/TaskList.java
index 1304f25630..fc2ddbe736 100644
--- a/src/main/java/TaskList.java
+++ b/src/main/java/duke/task/TaskList.java
@@ -1,7 +1,14 @@
+package duke.task;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
+import duke.Ui;
+
+/**
+ * Holds the list of tasks
+ */
 public class TaskList {
     /** List of tasks to remember */
     private static ArrayList<Task> taskList = new ArrayList<>();
@@ -15,9 +22,9 @@ public static void finalizeTaskList() {
     }
 
     /**
-     * Get task from index as string
-     * @param index the index as a string
-     * @return Optional.of(task) if successful, else Optional.empty()
+     * Get task from index as string.
+     * @param index Index as a string.
+     * @return Optional.of(task) if successful, else Optional.empty().
      */
     public static Optional<Task> getTask(String index) {
         try {
diff --git a/src/main/java/TaskStorage.java b/src/main/java/duke/task/TaskStorage.java
similarity index 92%
rename from src/main/java/TaskStorage.java
rename to src/main/java/duke/task/TaskStorage.java
index d82db09e60..83e0f01fe9 100644
--- a/src/main/java/TaskStorage.java
+++ b/src/main/java/duke/task/TaskStorage.java
@@ -1,7 +1,11 @@
+package duke.task;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import duke.Storage;
+
 /**
  * Accesses a file for tasks.
  */
diff --git a/src/main/java/ToDo.java b/src/main/java/duke/task/ToDo.java
similarity index 86%
rename from src/main/java/ToDo.java
rename to src/main/java/duke/task/ToDo.java
index 584351dc7d..421605a6bc 100644
--- a/src/main/java/ToDo.java
+++ b/src/main/java/duke/task/ToDo.java
@@ -1,3 +1,5 @@
+package duke.task;
+
 /**
  * A class that stores something to do.
  */
@@ -32,6 +34,6 @@ public String toString() {
     @Override
     public String[] getAsStringArray() {
         String[] data = super.getAsStringArray();
-        return new String[]{ "ToDo", data[1], data[2] };
+        return new String[]{ "duke.tasks.ToDo", data[1], data[2] };
     }
 }
diff --git a/text-ui-test/duke.txt b/text-ui-test/duke.txt
index 78ee9ae569..c443f1bbad 100644
--- a/text-ui-test/duke.txt
+++ b/text-ui-test/duke.txt
@@ -1,16 +1,16 @@
-/v8AVABvAEQAbw==,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
-/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AdAByAHUAZQ==,/v8ANwA6ADEAMgBhAG0=
-/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
-/v8ARQB2AGUAbgB0,/v8AdwBvAHcAIAAgAG0AdQBjAGgAIAAgAHMAcABhAGMAZQ==,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
-/v8AVABvAEQAbw==,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
-/v8AVABvAEQAbw==,/v8AbwB0AGgAZQByACAAaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
-/v8AVABvAEQAbw==,/v8AcAByAG8AagBlAGMAdAAgADEAMg==,/v8AZgBhAGwAcwBl
-/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAGYAcgBpAGUAbgBkAHM=,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZABpAG4AbgBlAHI=,/v8AZgBhAGwAcwBl,/v8ANgA6ADIANQAgAHAAbQ==
-/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AZgBhAGwAcwBl,/v8ANwA6ADEAMgBhAG0=
-/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
-/v8ARQB2AGUAbgB0,/v8AdwBvAHcAIAAgAG0AdQBjAGgAIAAgAHMAcABhAGMAZQ==,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
\ No newline at end of file
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAFQAbwBEAG8=,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEUAdgBlAG4AdA==,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AdAByAHUAZQ==,/v8ANwA6ADEAMgBhAG0=
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEQAZQBhAGQAbABpAG4AZQ==,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEQAZQBhAGQAbABpAG4AZQ==,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEQAZQBhAGQAbABpAG4AZQ==,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEUAdgBlAG4AdA==,/v8AdwBvAHcAIAAgAG0AdQBjAGgAIAAgAHMAcABhAGMAZQ==,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAFQAbwBEAG8=,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAFQAbwBEAG8=,/v8AbwB0AGgAZQByACAAaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAFQAbwBEAG8=,/v8AcAByAG8AagBlAGMAdAAgADEAMg==,/v8AZgBhAGwAcwBl
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEUAdgBlAG4AdA==,/v8AbQBlAGUAdAAgAGYAcgBpAGUAbgBkAHM=,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEUAdgBlAG4AdA==,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZABpAG4AbgBlAHI=,/v8AZgBhAGwAcwBl,/v8ANgA6ADIANQAgAHAAbQ==
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEUAdgBlAG4AdA==,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AZgBhAGwAcwBl,/v8ANwA6ADEAMgBhAG0=
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEQAZQBhAGQAbABpAG4AZQ==,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEQAZQBhAGQAbABpAG4AZQ==,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEQAZQBhAGQAbABpAG4AZQ==,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
+/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEUAdgBlAG4AdA==,/v8AdwBvAHcAIAAgAG0AdQBjAGgAIAAgAHMAcABhAGMAZQ==,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
\ No newline at end of file
diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat
index 74c2478cc0..8f94108629 100644
--- a/text-ui-test/runtest.bat
+++ b/text-ui-test/runtest.bat
@@ -7,7 +7,7 @@ REM delete output from previous run
 if exist ACTUAL.TXT del ACTUAL.TXT
 
 REM compile the code into the bin folder
-javac  -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\*.java
+javac  -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\duke\*.java ..\src\main\java\duke\task\*.java
 IF ERRORLEVEL 1 (
     echo ********** BUILD FAILURE **********
     exit /b 1
@@ -18,7 +18,7 @@ REM delete data
 if exist duke.txt del duke.txt
 
 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
-java -classpath ..\bin Duke < input.txt > ACTUAL.TXT
+java -classpath ..\bin duke.Duke < input.txt > ACTUAL.TXT
 
 REM compare the output to the expected output
 FC ACTUAL.TXT EXPECTED.TXT
@@ -27,7 +27,7 @@ REM delete output from previous run
 if exist ACTUAL1.TXT del ACTUAL1.TXT
 
 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL1.TXT
-java -classpath ..\bin Duke < input.txt > ACTUAL1.TXT
+java -classpath ..\bin duke.Duke < input.txt > ACTUAL1.TXT
 
 REM compare the output to the expected output
 FC ACTUAL1.TXT EXPECTED1.TXT

From 9611cbd26b48caa21a208f6538855ea5dc86859f Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Wed, 24 Aug 2022 22:32:07 +0800
Subject: [PATCH 14/67] Add files in attempt to add Gradle

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 0 -> 58695 bytes
 gradle/wrapper/gradle-wrapper.properties |   5 +++++
 2 files changed, 5 insertions(+)
 create mode 100644 gradle/wrapper/gradle-wrapper.jar
 create mode 100644 gradle/wrapper/gradle-wrapper.properties

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070
GIT binary patch
literal 58695
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

literal 0
HcmV?d00001

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..c14115d7e0
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
\ No newline at end of file

From efb5c95a91d4f08071a3b99c1c49770bd31b1e52 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Wed, 24 Aug 2022 22:37:32 +0800
Subject: [PATCH 15/67] Add remaining files to add gradle support

---
 build.gradle |  41 ++++++++++++
 gradlew      | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++
 gradlew.bat  | 103 +++++++++++++++++++++++++++++
 3 files changed, 327 insertions(+)
 create mode 100644 build.gradle
 create mode 100644 gradlew
 create mode 100644 gradlew.bat

diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000000..8a747821a5
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,41 @@
+plugins {
+    id 'java'
+    id 'application'
+    id 'com.github.johnrengelman.shadow' version '5.1.0'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0'
+    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0'
+}
+
+test {
+    useJUnitPlatform()
+
+    testLogging {
+        events "passed", "skipped", "failed"
+
+        showExceptions true
+        exceptionFormat "full"
+        showCauses true
+        showStackTraces true
+        showStandardStreams = false
+    }
+}
+
+application {
+    mainClassName = "seedu.duke.Duke"
+}
+
+shadowJar {
+    archiveBaseName = "duke"
+    archiveClassifier = null
+}
+
+run{
+    standardInput = System.in
+}
\ No newline at end of file
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000000..645f6ca315
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,183 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
\ No newline at end of file
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000000..a14a3d051d
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,103 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
\ No newline at end of file

From f929e81e7b460067b9ec1e77f22a843318750129 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Wed, 24 Aug 2022 23:18:50 +0800
Subject: [PATCH 16/67] Change mainClassName to duke.Duke for Gradle to run
 project

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8a747821a5..c4e66ae0eb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ test {
 }
 
 application {
-    mainClassName = "seedu.duke.Duke"
+    mainClassName = "duke.Duke"
 }
 
 shadowJar {

From d2333f2116e306c9a815dd131fbc1871dcabad03 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Thu, 25 Aug 2022 09:30:54 +0800
Subject: [PATCH 17/67] Add some documentation and TaskTest

---
 src/main/java/duke/task/Deadline.java    |  2 +-
 src/main/java/duke/task/Event.java       |  2 +-
 src/main/java/duke/task/Task.java        | 15 ++++++-
 src/main/java/duke/task/TaskFactory.java |  4 +-
 src/test/java/duke/task/TaskTest.java    | 55 ++++++++++++++++++++++++
 5 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/duke/task/TaskTest.java

diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java
index 804bb2e82f..1f38b2e1cb 100644
--- a/src/main/java/duke/task/Deadline.java
+++ b/src/main/java/duke/task/Deadline.java
@@ -40,6 +40,6 @@ public String toString() {
     @Override
     public String[] getAsStringArray() {
         String[] data = super.getAsStringArray();
-        return new String[]{ "duke.tasks.Deadline", data[1], data[2], datetime.toString() };
+        return new String[]{ "Deadline", data[1], data[2], datetime.toString() };
     }
 }
diff --git a/src/main/java/duke/task/Event.java b/src/main/java/duke/task/Event.java
index 23191272c1..e16fb19e07 100644
--- a/src/main/java/duke/task/Event.java
+++ b/src/main/java/duke/task/Event.java
@@ -40,6 +40,6 @@ public String toString() {
     @Override
     public String[] getAsStringArray() {
         String[] data = super.getAsStringArray();
-        return new String[]{ "duke.tasks.Event", data[1], data[2], datetime.toString() };
+        return new String[]{ "Event", data[1], data[2], datetime.toString() };
     }
 }
diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java
index d0d1542af1..a30269e77d 100644
--- a/src/main/java/duke/task/Task.java
+++ b/src/main/java/duke/task/Task.java
@@ -17,9 +17,16 @@ public class Task {
         this.done = done;
     }
 
+    /**
+     * Marks the task as done.
+     */
     public void markAsDone() {
         this.done = true;
     }
+
+    /**
+     * Marks the task as not done.
+     */
     public void markAsNotDone() {
         this.done = false;
     }
@@ -28,16 +35,20 @@ private char getDoneMarker() {
         return this.done ? MARKER_DONE : MARKER_NOT_DONE;
     }
 
+    /**
+     * Creates a string representation suitable for printing to screen.
+     * @return String representation of task.
+     */
     @Override
     public String toString() {
         return String.format("[%c] %s", getDoneMarker(), name);
     }
 
     /**
-     * Get a string array representation suitable for printing to files.
+     * Creates a string array representation suitable for printing to files.
      * @return String array representation.
      */
     public String[] getAsStringArray() {
-        return new String[]{ "duke.tasks.Task", name, String.valueOf(done) };
+        return new String[]{ "Task", name, String.valueOf(done) };
     }
 }
diff --git a/src/main/java/duke/task/TaskFactory.java b/src/main/java/duke/task/TaskFactory.java
index b43daa287b..feac197cfe 100644
--- a/src/main/java/duke/task/TaskFactory.java
+++ b/src/main/java/duke/task/TaskFactory.java
@@ -11,7 +11,7 @@ public class TaskFactory {
     /**
      * Constructs the task.
      * @param taskData Data for the task.
-     * @return duke.tasks.Task according to taskData.
+     * @return Task according to taskData.
      * @throws IllegalArgumentException If taskData does not conform to the format.
      */
     public static Task constructTask(String[] taskData) throws IllegalArgumentException {
@@ -36,7 +36,7 @@ public static Task constructTask(String[] taskData) throws IllegalArgumentExcept
     /**
      * Constructs the task.
      * @param taskData Data for the task.
-     * @return Optional of duke.tasks.Task according to taskData, Optional.empty() if cannot construct.
+     * @return Optional of Task according to taskData, Optional.empty() if cannot construct.
      */
     public static Optional<Task> constructOptionalTask(String[] taskData) {
         try {
diff --git a/src/test/java/duke/task/TaskTest.java b/src/test/java/duke/task/TaskTest.java
new file mode 100644
index 0000000000..2f0acd6d6b
--- /dev/null
+++ b/src/test/java/duke/task/TaskTest.java
@@ -0,0 +1,55 @@
+package duke.task;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class TaskTest {
+    @Test
+    public void testDoneMarker() {
+        Task task1 = new Task("task one", false);
+        Task task2 = new Task("task two", true);
+        Task task3 = new Task("task three");
+
+        assertEquals("[ ] task one", task1.toString());
+        assertEquals("[X] task two", task2.toString());
+        assertEquals("[ ] task three", task3.toString());
+
+        task1.markAsDone();
+        task2.markAsNotDone();
+        task3.markAsNotDone();
+
+        assertEquals("[X] task one", task1.toString());
+        assertEquals("[ ] task two", task2.toString());
+        assertEquals("[ ] task three", task3.toString());
+
+        task1.markAsDone();
+        task2.markAsNotDone();
+        task3.markAsNotDone();
+
+        assertEquals("[X] task one", task1.toString());
+        assertEquals("[ ] task two", task2.toString());
+        assertEquals("[ ] task three", task3.toString());
+
+        task1.markAsNotDone();
+        task2.markAsDone();
+        task3.markAsDone();
+
+        assertEquals("[ ] task one", task1.toString());
+        assertEquals("[X] task two", task2.toString());
+        assertEquals("[X] task three", task3.toString());
+    }
+
+    @Test
+    public void testStringArray() {
+        Task task1 = new Task("task one", false);
+        Task task2 = new Task("task two", true);
+        Task task3 = new Task("task three");
+
+        assertArrayEquals(new String[] { "Task", "task one", "false" }, task1.getAsStringArray());
+        assertArrayEquals(new String[] { "Task", "task two", "true" }, task2.getAsStringArray());
+        assertArrayEquals(new String[] { "Task", "task three", "false" }, task3.getAsStringArray());
+    }
+}

From 8f0bdb2fd53fcc1132a847786ea3ee8abb441f33 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Fri, 26 Aug 2022 16:19:21 +0800
Subject: [PATCH 18/67] Add tests for Deadline; unroll import * s

---
 src/test/java/duke/task/DeadlineTest.java | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 src/test/java/duke/task/DeadlineTest.java

diff --git a/src/test/java/duke/task/DeadlineTest.java b/src/test/java/duke/task/DeadlineTest.java
new file mode 100644
index 0000000000..ac93dbcf15
--- /dev/null
+++ b/src/test/java/duke/task/DeadlineTest.java
@@ -0,0 +1,2 @@
+package duke.task;public class DeadlineTest {
+}

From 28ea520b47105c07b5bf17cdeac9d8364a1c657b Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Fri, 26 Aug 2022 16:20:48 +0800
Subject: [PATCH 19/67] Actually add DeadlineTest

---
 src/main/java/duke/Parser.java            |  6 +++++-
 src/main/java/duke/Storage.java           |  1 +
 src/test/java/duke/task/DeadlineTest.java | 23 ++++++++++++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index dd90f3a8de..5e2b811e38 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -1,6 +1,10 @@
 package duke;
 
-import duke.task.*;
+import duke.task.Deadline;
+import duke.task.Event;
+import duke.task.Task;
+import duke.task.TaskList;
+import duke.task.ToDo;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java
index a16d70d212..83bc5e1da9 100644
--- a/src/main/java/duke/Storage.java
+++ b/src/main/java/duke/Storage.java
@@ -8,6 +8,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
+
 /**
  * Handles file state.
  */
diff --git a/src/test/java/duke/task/DeadlineTest.java b/src/test/java/duke/task/DeadlineTest.java
index ac93dbcf15..ba3f65dfeb 100644
--- a/src/test/java/duke/task/DeadlineTest.java
+++ b/src/test/java/duke/task/DeadlineTest.java
@@ -1,2 +1,23 @@
-package duke.task;public class DeadlineTest {
+package duke.task;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class DeadlineTest {
+    @Test
+    public void testStringArray() {
+        Task task1 = new Deadline("task one", "1", false);
+        Task task2 = new Deadline("task two", "2", true);
+        Task task3 = new Deadline("task three", "3");
+
+        assertEquals("[D][ ] task one (by: 1)", task1.toString());
+        assertEquals("[D][X] task two (by: 2)", task2.toString());
+        assertEquals("[D][ ] task three (by: 3)", task3.toString());
+
+        assertArrayEquals(new String[] { "Deadline", "task one", "false", "1" }, task1.getAsStringArray());
+        assertArrayEquals(new String[] { "Deadline", "task two", "true", "2" }, task2.getAsStringArray());
+        assertArrayEquals(new String[] { "Deadline", "task three", "false", "3" }, task3.getAsStringArray());
+    }
 }

From cdf8c76b583bcd52bb5a2b34b07d6722ca449847 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Fri, 26 Aug 2022 20:34:47 +0800
Subject: [PATCH 20/67] Fix bugs related to package refactoring changing
 strings

---
 src/main/java/duke/task/TaskFactory.java |  8 +++---
 src/main/java/duke/task/ToDo.java        |  2 +-
 text-ui-test/duke.txt                    | 32 ++++++++++++------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/java/duke/task/TaskFactory.java b/src/main/java/duke/task/TaskFactory.java
index feac197cfe..c594c22414 100644
--- a/src/main/java/duke/task/TaskFactory.java
+++ b/src/main/java/duke/task/TaskFactory.java
@@ -18,16 +18,16 @@ public static Task constructTask(String[] taskData) throws IllegalArgumentExcept
         if (taskData == null || taskData.length < 1) {
             throw new IllegalArgumentException("taskData cannot be null or of length 1");
         }
-        if (taskData[0].equals("duke.tasks.Task") && taskData.length >= 3) {
+        if (taskData[0].equals("Task") && taskData.length >= 3) {
             return new Task(taskData[1], taskData[2].equals("true"));
         }
-        if (taskData[0].equals("duke.tasks.ToDo") && taskData.length >= 3) {
+        if (taskData[0].equals("ToDo") && taskData.length >= 3) {
             return new ToDo(taskData[1], taskData[2].equals("true"));
         }
-        if (taskData[0].equals("duke.tasks.Deadline") && taskData.length >= 4) {
+        if (taskData[0].equals("Deadline") && taskData.length >= 4) {
             return new Deadline(taskData[1], taskData[3], taskData[2].equals("true"));
         }
-        if (taskData[0].equals("duke.tasks.Event") && taskData.length >= 4) {
+        if (taskData[0].equals("Event") && taskData.length >= 4) {
             return new Event(taskData[1], taskData[3], taskData[2].equals("true"));
         }
         throw new IllegalArgumentException("Unsupported task type or incorrect task data length");
diff --git a/src/main/java/duke/task/ToDo.java b/src/main/java/duke/task/ToDo.java
index 421605a6bc..bf17b053ac 100644
--- a/src/main/java/duke/task/ToDo.java
+++ b/src/main/java/duke/task/ToDo.java
@@ -34,6 +34,6 @@ public String toString() {
     @Override
     public String[] getAsStringArray() {
         String[] data = super.getAsStringArray();
-        return new String[]{ "duke.tasks.ToDo", data[1], data[2] };
+        return new String[]{ "ToDo", data[1], data[2] };
     }
 }
diff --git a/text-ui-test/duke.txt b/text-ui-test/duke.txt
index c443f1bbad..78ee9ae569 100644
--- a/text-ui-test/duke.txt
+++ b/text-ui-test/duke.txt
@@ -1,16 +1,16 @@
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAFQAbwBEAG8=,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEUAdgBlAG4AdA==,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AdAByAHUAZQ==,/v8ANwA6ADEAMgBhAG0=
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEQAZQBhAGQAbABpAG4AZQ==,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEQAZQBhAGQAbABpAG4AZQ==,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEQAZQBhAGQAbABpAG4AZQ==,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEUAdgBlAG4AdA==,/v8AdwBvAHcAIAAgAG0AdQBjAGgAIAAgAHMAcABhAGMAZQ==,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAFQAbwBEAG8=,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAFQAbwBEAG8=,/v8AbwB0AGgAZQByACAAaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAFQAbwBEAG8=,/v8AcAByAG8AagBlAGMAdAAgADEAMg==,/v8AZgBhAGwAcwBl
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEUAdgBlAG4AdA==,/v8AbQBlAGUAdAAgAGYAcgBpAGUAbgBkAHM=,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEUAdgBlAG4AdA==,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZABpAG4AbgBlAHI=,/v8AZgBhAGwAcwBl,/v8ANgA6ADIANQAgAHAAbQ==
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEUAdgBlAG4AdA==,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AZgBhAGwAcwBl,/v8ANwA6ADEAMgBhAG0=
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEQAZQBhAGQAbABpAG4AZQ==,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEQAZQBhAGQAbABpAG4AZQ==,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEQAZQBhAGQAbABpAG4AZQ==,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
-/v8AZAB1AGsAZQAuAHQAYQBzAGsAcwAuAEUAdgBlAG4AdA==,/v8AdwBvAHcAIAAgAG0AdQBjAGgAIAAgAHMAcABhAGMAZQ==,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
\ No newline at end of file
+/v8AVABvAEQAbw==,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
+/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AdAByAHUAZQ==,/v8ANwA6ADEAMgBhAG0=
+/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
+/v8ARQB2AGUAbgB0,/v8AdwBvAHcAIAAgAG0AdQBjAGgAIAAgAHMAcABhAGMAZQ==,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
+/v8AVABvAEQAbw==,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
+/v8AVABvAEQAbw==,/v8AbwB0AGgAZQByACAAaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
+/v8AVABvAEQAbw==,/v8AcAByAG8AagBlAGMAdAAgADEAMg==,/v8AZgBhAGwAcwBl
+/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAGYAcgBpAGUAbgBkAHM=,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZABpAG4AbgBlAHI=,/v8AZgBhAGwAcwBl,/v8ANgA6ADIANQAgAHAAbQ==
+/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AZgBhAGwAcwBl,/v8ANwA6ADEAMgBhAG0=
+/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
+/v8ARQB2AGUAbgB0,/v8AdwBvAHcAIAAgAG0AdQBjAGgAIAAgAHMAcABhAGMAZQ==,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
\ No newline at end of file

From 7448407b79eebaecb82b41e7ffda9026f5ecf185 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Fri, 26 Aug 2022 22:00:26 +0800
Subject: [PATCH 21/67] Follow coding standard

---
 src/main/java/duke/Duke.java                 | 15 ++++++++++-----
 src/main/java/duke/Parser.java               | 16 ++++++++--------
 src/main/java/duke/PrefixCommandMatcher.java | 13 +++++++++++--
 src/main/java/duke/Storage.java              | 16 ++++++++++------
 src/main/java/duke/Ui.java                   | 10 +++-------
 src/main/java/duke/task/Deadline.java        |  6 +++---
 src/main/java/duke/task/Event.java           |  6 +++---
 src/main/java/duke/task/Task.java            | 14 +++++++-------
 src/main/java/duke/task/TaskFactory.java     |  2 +-
 src/main/java/duke/task/TaskList.java        |  4 ++--
 src/main/java/duke/task/ToDo.java            |  6 +++---
 src/test/java/duke/task/DeadlineTest.java    |  2 +-
 src/test/java/duke/task/TaskTest.java        |  4 ++--
 13 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
index b7fc66fc24..ff37da1c75 100644
--- a/src/main/java/duke/Duke.java
+++ b/src/main/java/duke/Duke.java
@@ -20,10 +20,10 @@ private static Optional<Task> getTask(String index) {
             Task task = TaskList.getTaskList().get(idx - 1);
             return Optional.of(task);
         } catch (NumberFormatException ex) {
-            Ui.messagePrint("Sorry, I didn't understand " + index + ", please give me a number.");
+            Ui.printStyledMessage("Sorry, I didn't understand " + index + ", please give me a number.");
             return Optional.empty();
         } catch (IndexOutOfBoundsException ex) {
-            Ui.messagePrint("Sorry, the number " + index + ", wasn't in the range.");
+            Ui.printStyledMessage("Sorry, the number " + index + ", wasn't in the range.");
             return Optional.empty();
         }
     }
@@ -41,19 +41,24 @@ private static void handleCommand(String command) {
      * @param args Command line args which are not used.
      */
     public static void main(String[] args) {
+        // initialization
         Ui.greet();
         TaskList.initializeTaskList();
         commands = Parser.getCommands();
         Scanner input = new Scanner(System.in);
-        boolean keepRunning = true;
-        while (keepRunning) {
+
+        // main application logic
+        boolean isStillRunning = true;
+        while (isStillRunning) {
             String command = input.nextLine();
             if (command.equals("bye")) {
-                keepRunning = false;
+                isStillRunning = false;
             } else {
                 handleCommand(command);
             }
         }
+
+        // finalization
         TaskList.finalizeTaskList();
         Ui.leave();
     }
diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index 5e2b811e38..ccb1b60830 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -24,13 +24,13 @@ public static ArrayList<CommandMatcher> getCommands() {
             for (int i = 0; i < list.size(); i++) {
                 output[i + 1] = (i + 1) + "." + list.get(i).toString();
             }
-            Ui.messagePrint(output);
+            Ui.printStyledMessage(output);
         }));
 
         commands.add(new PrefixCommandMatcher("mark", (str, map) -> {
             TaskList.getTask(str).ifPresent((task) -> {
                 task.markAsDone();
-                Ui.messagePrint("Marked your task as done:",
+                Ui.printStyledMessage("Marked your task as done:",
                         task.toString());
             });
         }));
@@ -38,7 +38,7 @@ public static ArrayList<CommandMatcher> getCommands() {
         commands.add(new PrefixCommandMatcher("unmark", (str, map) -> {
             TaskList.getTask(str).ifPresent((task) -> {
                 task.markAsNotDone();
-                Ui.messagePrint("Aw... it's not done yet:",
+                Ui.printStyledMessage("Aw... it's not done yet:",
                         task.toString());
             });
         }));
@@ -46,28 +46,28 @@ public static ArrayList<CommandMatcher> getCommands() {
         commands.add(new PrefixCommandMatcher("deadline", (str, map) -> {
             Task task = new Deadline(str, map.getOrDefault("by", "[unknown]"));
             TaskList.getTaskList().add(task);
-            Ui.messagePrint("Good luck with the deadline, here's the task:",
+            Ui.printStyledMessage("Good luck with the deadline, here's the task:",
                     task.toString());
         }));
 
         commands.add(new PrefixCommandMatcher("todo", (str, map) -> {
             Task task = new ToDo(str);
             TaskList.getTaskList().add(task);
-            Ui.messagePrint("I've recorded this thing you need to do:",
+            Ui.printStyledMessage("I've recorded this thing you need to do:",
                     task.toString());
         }));
 
         commands.add(new PrefixCommandMatcher("event", (str, map) -> {
             Task task = new Event(str, map.getOrDefault("at", "[unknown]"));
             TaskList.getTaskList().add(task);
-            Ui.messagePrint("That's going to happen at some time later:",
+            Ui.printStyledMessage("That's going to happen at some time later:",
                     task.toString());
         }));
 
         commands.add(new PrefixCommandMatcher("delete", (str, map) -> {
             TaskList.getTask(str).ifPresent((task) -> {
                 TaskList.getTaskList().remove(task);
-                Ui.messagePrint("It seems you didn't need this task anymore, so I removed it:",
+                Ui.printStyledMessage("It seems you didn't need this task anymore, so I removed it:",
                         task.toString(),
                         String.format("You have %d tasks left.", TaskList.getTaskList().size()));
             });
@@ -75,7 +75,7 @@ public static ArrayList<CommandMatcher> getCommands() {
 
         // default command matcher - add to list
         commands.add(new CommandMatcher((str) -> true, (str) -> {
-            Ui.messagePrint("(>.<') I'm sorry, I don't really know what that means.");
+            Ui.printStyledMessage("(>.<') I'm sorry, I don't really know what that means.");
         }));
 
         return commands;
diff --git a/src/main/java/duke/PrefixCommandMatcher.java b/src/main/java/duke/PrefixCommandMatcher.java
index 0c90fe056c..7a38569427 100644
--- a/src/main/java/duke/PrefixCommandMatcher.java
+++ b/src/main/java/duke/PrefixCommandMatcher.java
@@ -16,11 +16,16 @@ public class PrefixCommandMatcher extends CommandMatcher {
      */
     public PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String>> action) {
         super((cmd) -> cmd.strip().startsWith(prefix + " ") || cmd.strip().equals(prefix), (cmd) -> {
+            // preprocessing
             cmd = cmd.strip();
+
+            // corner case
             if (cmd.equals(prefix)) {
-                Ui.messagePrint("(>.<') Add a description to your " + prefix + ".");
+                Ui.printStyledMessage("(>.<') Add a description to your " + prefix + ".");
                 return;
             }
+
+            // map processing
             String withoutPrefix = cmd.split(" ", 2)[1];
             String[] commandParts = withoutPrefix.split(" /");
             Map<String, String> map = new HashMap<>();
@@ -33,10 +38,14 @@ public PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String
                 }
             }
             commandParts[0] = commandParts[0].strip();
+
+            // another corner case
             if (commandParts[0].equals("")) {
-                Ui.messagePrint("(>.<') The description for " + prefix + " shouldn't be empty.");
+                Ui.printStyledMessage("(>.<') The description for " + prefix + " shouldn't be empty.");
                 return;
             }
+
+            // accept
             action.accept(commandParts[0].strip(), map);
         });
     }
diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java
index 83bc5e1da9..86cd45d6de 100644
--- a/src/main/java/duke/Storage.java
+++ b/src/main/java/duke/Storage.java
@@ -6,7 +6,11 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Scanner;
 
 
 /**
@@ -61,11 +65,11 @@ public static Storage getFileState(String fileName) {
         // write to file TODO
     }*/
 
-    private static String toBase64(String input) {
+    private static String convertToBase64(String input) {
         return Base64.getEncoder().encodeToString(input.getBytes(StandardCharsets.UTF_16));
     }
 
-    private static String fromBase64(String input) {
+    private static String convertFromBase64(String input) {
         return StandardCharsets.UTF_16.decode(ByteBuffer.wrap(Base64.getDecoder().decode(input))).toString();
     }
 
@@ -77,7 +81,7 @@ public String[][] getLines() {
             while (sc.hasNext()) {
                 ArrayList<String> curLine = new ArrayList<>();
                 for (String str : sc.nextLine().split(",")) {
-                    curLine.add(fromBase64(str));
+                    curLine.add(convertFromBase64(str));
                 }
                 lines.add(curLine.toArray(new String[] {}));
             }
@@ -101,13 +105,13 @@ public void saveLines(String[][] strings) {
                 }
                 StringBuilder builder = new StringBuilder();
                 for (String s : strings[i]) {
-                    builder.append(',').append(toBase64(s));
+                    builder.append(',').append(convertToBase64(s));
                 }
                 writer.append(builder.substring(1));
             }
             writer.close();
         } catch (IOException ex) {
-            Ui.messagePrint("(>.<') I was unable to record your tasks...");
+            Ui.printStyledMessage("(>.<') I was unable to record your tasks...");
             ex.printStackTrace();
         }
     }
diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java
index 8b66775451..9137330b09 100644
--- a/src/main/java/duke/Ui.java
+++ b/src/main/java/duke/Ui.java
@@ -5,16 +5,12 @@
 import java.util.ArrayList;
 
 public class Ui {
-    /** List of commands */
-    private static ArrayList<CommandMatcher> commands;
-    /** List of strings to remember */
-    private static ArrayList<Task> list;
 
     /**
      * Styles and prints lines with a border.
      * @param lines Lines to be printed
      */
-    public static void messagePrint(String... lines) {
+    public static void printStyledMessage(String... lines) {
         System.out.println(",----------------------------------------------------------------");
         for (String str : lines) {
             System.out.print("| ");
@@ -27,7 +23,7 @@ public static void messagePrint(String... lines) {
      * Greets user.
      */
     public static void greet() {
-        Ui.messagePrint("...where is this again?",
+        Ui.printStyledMessage("...where is this again?",
                 "Oh, hello, I didn't see you there - I'm Anthea, a chatbot...",
                 "...or at least that's what they told me.");
     }
@@ -36,6 +32,6 @@ public static void greet() {
      * Leaves the user.
      */
     public static void leave() {
-        Ui.messagePrint("It was nice to have you around, I'm going back to sleep...");
+        Ui.printStyledMessage("It was nice to have you around, I'm going back to sleep...");
     }
 }
diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java
index 1f38b2e1cb..b7d8f7e2d1 100644
--- a/src/main/java/duke/task/Deadline.java
+++ b/src/main/java/duke/task/Deadline.java
@@ -21,10 +21,10 @@ public Deadline(String description, String by) {
      * Creates a duke.tasks.Deadline object.
      * @param description Description of deadline.
      * @param by Time of deadline.
-     * @param done If the task is done.
+     * @param isDone If the task is done.
      */
-    public Deadline(String description, String by, boolean done) {
-        super(description, done);
+    public Deadline(String description, String by, boolean isDone) {
+        super(description, isDone);
         datetime = new ParsedDateTime(by);
     }
 
diff --git a/src/main/java/duke/task/Event.java b/src/main/java/duke/task/Event.java
index e16fb19e07..52b476f942 100644
--- a/src/main/java/duke/task/Event.java
+++ b/src/main/java/duke/task/Event.java
@@ -21,10 +21,10 @@ public Event(String description, String at) {
      * Creates an event.
      * @param description Description of event.
      * @param at Time of event.
-     * @param done If the task is done.
+     * @param isDone If the task is done.
      */
-    public Event(String description, String at, boolean done) {
-        super(description, done);
+    public Event(String description, String at, boolean isDone) {
+        super(description, isDone);
         datetime = new ParsedDateTime(at);
     }
 
diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java
index a30269e77d..bdd85b689b 100644
--- a/src/main/java/duke/task/Task.java
+++ b/src/main/java/duke/task/Task.java
@@ -7,32 +7,32 @@ public class Task {
     private static final char MARKER_DONE = 'X';
     private static final char MARKER_NOT_DONE = ' ';
     private String name;
-    private boolean done;
+    private boolean isDone;
     Task(String name) {
         this(name, false);
     }
 
-    Task(String name, boolean done) {
+    Task(String name, boolean isDone) {
         this.name = name;
-        this.done = done;
+        this.isDone = isDone;
     }
 
     /**
      * Marks the task as done.
      */
     public void markAsDone() {
-        this.done = true;
+        this.isDone = true;
     }
 
     /**
      * Marks the task as not done.
      */
     public void markAsNotDone() {
-        this.done = false;
+        this.isDone = false;
     }
 
     private char getDoneMarker() {
-        return this.done ? MARKER_DONE : MARKER_NOT_DONE;
+        return this.isDone ? MARKER_DONE : MARKER_NOT_DONE;
     }
 
     /**
@@ -49,6 +49,6 @@ public String toString() {
      * @return String array representation.
      */
     public String[] getAsStringArray() {
-        return new String[]{ "Task", name, String.valueOf(done) };
+        return new String[]{ "Task", name, String.valueOf(isDone) };
     }
 }
diff --git a/src/main/java/duke/task/TaskFactory.java b/src/main/java/duke/task/TaskFactory.java
index c594c22414..a6799834f3 100644
--- a/src/main/java/duke/task/TaskFactory.java
+++ b/src/main/java/duke/task/TaskFactory.java
@@ -42,7 +42,7 @@ public static Optional<Task> constructOptionalTask(String[] taskData) {
         try {
             return Optional.of(constructTask(taskData));
         } catch (IllegalArgumentException ex) {
-            Ui.messagePrint("(>.<') did not understand this task - dropping it",
+            Ui.printStyledMessage("(>.<') did not understand this task - dropping it",
                     String.join(", ", taskData));
             return Optional.empty();
         }
diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java
index fc2ddbe736..b20a8846f1 100644
--- a/src/main/java/duke/task/TaskList.java
+++ b/src/main/java/duke/task/TaskList.java
@@ -32,10 +32,10 @@ public static Optional<Task> getTask(String index) {
             Task task = taskList.get(idx - 1);
             return Optional.of(task);
         } catch (NumberFormatException ex) {
-            Ui.messagePrint("Sorry, I didn't understand " + index + ", please give me a number.");
+            Ui.printStyledMessage("Sorry, I didn't understand " + index + ", please give me a number.");
             return Optional.empty();
         } catch (IndexOutOfBoundsException ex) {
-            Ui.messagePrint("Sorry, the number " + index + ", wasn't in the range.");
+            Ui.printStyledMessage("Sorry, the number " + index + ", wasn't in the range.");
             return Optional.empty();
         }
     }
diff --git a/src/main/java/duke/task/ToDo.java b/src/main/java/duke/task/ToDo.java
index bf17b053ac..09d4e8fe25 100644
--- a/src/main/java/duke/task/ToDo.java
+++ b/src/main/java/duke/task/ToDo.java
@@ -16,10 +16,10 @@ public ToDo(String description) {
     /**
      * Creates a task item.
      * @param description Description of task.
-     * @param done If the task is done.
+     * @param isDone If the task is done.
      */
-    public ToDo(String description, boolean done) {
-        super(description, done);
+    public ToDo(String description, boolean isDone) {
+        super(description, isDone);
     }
 
     @Override
diff --git a/src/test/java/duke/task/DeadlineTest.java b/src/test/java/duke/task/DeadlineTest.java
index ba3f65dfeb..cce58c8a1c 100644
--- a/src/test/java/duke/task/DeadlineTest.java
+++ b/src/test/java/duke/task/DeadlineTest.java
@@ -7,7 +7,7 @@
 
 public class DeadlineTest {
     @Test
-    public void testStringArray() {
+    public void getAsStringArray_makingObjects_normalBehavior() {
         Task task1 = new Deadline("task one", "1", false);
         Task task2 = new Deadline("task two", "2", true);
         Task task3 = new Deadline("task three", "3");
diff --git a/src/test/java/duke/task/TaskTest.java b/src/test/java/duke/task/TaskTest.java
index 2f0acd6d6b..d34aee8247 100644
--- a/src/test/java/duke/task/TaskTest.java
+++ b/src/test/java/duke/task/TaskTest.java
@@ -8,7 +8,7 @@
 
 public class TaskTest {
     @Test
-    public void testDoneMarker() {
+    public void markAsDone_togglingDoneAndNotDone_normalBehavior() {
         Task task1 = new Task("task one", false);
         Task task2 = new Task("task two", true);
         Task task3 = new Task("task three");
@@ -43,7 +43,7 @@ public void testDoneMarker() {
     }
 
     @Test
-    public void testStringArray() {
+    public void getAsStringArray_makingObjects_normalBehavior() {
         Task task1 = new Task("task one", false);
         Task task2 = new Task("task two", true);
         Task task3 = new Task("task three");

From 366007cec020cda13722040c93d071d828381f03 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Fri, 26 Aug 2022 22:09:02 +0800
Subject: [PATCH 22/67] Add JavaDoc for all public methods

---
 src/main/java/duke/ParsedDateTime.java |  4 ++++
 src/main/java/duke/Parser.java         |  4 ++++
 src/main/java/duke/Storage.java        | 13 +++++++++++--
 src/main/java/duke/task/Deadline.java  |  6 ++++--
 src/main/java/duke/task/Event.java     |  6 ++++--
 src/main/java/duke/task/TaskList.java  | 12 +++++++++++-
 6 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/main/java/duke/ParsedDateTime.java b/src/main/java/duke/ParsedDateTime.java
index 8e6c43c7f0..781838d862 100644
--- a/src/main/java/duke/ParsedDateTime.java
+++ b/src/main/java/duke/ParsedDateTime.java
@@ -37,6 +37,10 @@ public ParsedDateTime(String input) {
         }
     }
 
+    /**
+     * Gets a nicely-formatted date.
+     * @return The date if it parses, else the original string.
+     */
     @Override
     public String toString() {
         return parsedDateTime.map((dateTime) -> {
diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index 5e2b811e38..3bd416cabe 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -14,6 +14,10 @@
  */
 public class Parser {
 
+    /**
+     * Gets the chatbot commands in an ArrayList.
+     * @return ArrayList of chatbot commands.
+     */
     public static ArrayList<CommandMatcher> getCommands() {
         ArrayList<CommandMatcher> commands = new ArrayList<>();
 
diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java
index 83bc5e1da9..4ac5b98a95 100644
--- a/src/main/java/duke/Storage.java
+++ b/src/main/java/duke/Storage.java
@@ -21,6 +21,11 @@ private Storage(String fileName) {
         this.fileName = fileName;
     }
 
+    /**
+     * Gets a singleton object that manages a particular file.
+     * @param fileName File name to identify file.
+     * @return Object managing the file.
+     */
     public static Storage getFileState(String fileName) {
         if (!fileStates.containsKey(fileName)) {
             fileStates.put(fileName, new Storage(fileName));
@@ -69,6 +74,10 @@ private static String fromBase64(String input) {
         return StandardCharsets.UTF_16.decode(ByteBuffer.wrap(Base64.getDecoder().decode(input))).toString();
     }
 
+    /**
+     * Gets lines from file as a String[][].
+     * @return Array of String[], each storing comma-separated parts of a line.
+     */
     public String[][] getLines() {
         ArrayList<String[]> lines = new ArrayList<>();
         try {
@@ -79,9 +88,9 @@ public String[][] getLines() {
                 for (String str : sc.nextLine().split(",")) {
                     curLine.add(fromBase64(str));
                 }
-                lines.add(curLine.toArray(new String[] {}));
+                lines.add(curLine.toArray(new String[]{}));
             }
-            return (String[][]) lines.toArray(new String[][] {});
+            return (String[][]) lines.toArray(new String[][]{});
         } catch (FileNotFoundException ex) {
             // file not found or error
             return new String[][] {};
diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java
index 1f38b2e1cb..25e10623f0 100644
--- a/src/main/java/duke/task/Deadline.java
+++ b/src/main/java/duke/task/Deadline.java
@@ -28,14 +28,16 @@ public Deadline(String description, String by, boolean done) {
         datetime = new ParsedDateTime(by);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public String toString() {
         return String.format("[D]%s (by: %s)", super.toString(), datetime.toString());
     }
 
     /**
-     * Get a string array representation suitable for printing to files.
-     * @return String array representation.
+     * {@inheritDoc}
      */
     @Override
     public String[] getAsStringArray() {
diff --git a/src/main/java/duke/task/Event.java b/src/main/java/duke/task/Event.java
index e16fb19e07..6f65f519d2 100644
--- a/src/main/java/duke/task/Event.java
+++ b/src/main/java/duke/task/Event.java
@@ -28,14 +28,16 @@ public Event(String description, String at, boolean done) {
         datetime = new ParsedDateTime(at);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public String toString() {
         return String.format("[E]%s (at: %s)", super.toString(), datetime.toString());
     }
 
     /**
-     * Get a string array representation suitable for printing to files.
-     * @return String array representation.
+     * {@inheritDoc}
      */
     @Override
     public String[] getAsStringArray() {
diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java
index fc2ddbe736..2f0cba88d2 100644
--- a/src/main/java/duke/task/TaskList.java
+++ b/src/main/java/duke/task/TaskList.java
@@ -13,16 +13,22 @@ public class TaskList {
     /** List of tasks to remember */
     private static ArrayList<Task> taskList = new ArrayList<>();
 
+    /**
+     * Initializes the task list.
+     */
     public static void initializeTaskList() {
         taskList = TaskStorage.getTasks();
     }
 
+    /**
+     * Finalizes the task list.
+     */
     public static void finalizeTaskList() {
         TaskStorage.saveTasks(taskList);
     }
 
     /**
-     * Get task from index as string.
+     * Gets task from index as string.
      * @param index Index as a string.
      * @return Optional.of(task) if successful, else Optional.empty().
      */
@@ -40,6 +46,10 @@ public static Optional<Task> getTask(String index) {
         }
     }
 
+    /**
+     * Gets the task list for other classes to work on.
+     * @return The task list.
+     */
     public static List<Task> getTaskList() {
         return taskList;
     }

From fe22a6b209ce492f3139e4b3dc69d76395a39f94 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Fri, 26 Aug 2022 22:26:41 +0800
Subject: [PATCH 23/67] Add find feature

---
 src/main/java/duke/Parser.java        | 23 ++++++++++++++++-------
 src/main/java/duke/task/Task.java     |  9 +++++++++
 src/main/java/duke/task/TaskList.java | 12 ++++++++++++
 text-ui-test/ACTUAL1.TXT              | 23 +++++++++++++++++++++++
 text-ui-test/EXPECTED.TXT             | 19 +++++++++++++++++++
 text-ui-test/EXPECTED1.TXT            | 23 +++++++++++++++++++++++
 text-ui-test/input.txt                |  4 ++++
 7 files changed, 106 insertions(+), 7 deletions(-)

diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index 5e2b811e38..61171b8446 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -14,17 +14,21 @@
  */
 public class Parser {
 
+    private static String[] listTasks(String response, List<Task> tasks) {
+        String[] output = new String[tasks.size() + 1];
+        output[0] = response;
+        for (int i = 0; i < tasks.size(); i++) {
+            output[i + 1] = (i + 1) + "." + tasks.get(i).toString();
+        }
+        return output;
+    }
+
     public static ArrayList<CommandMatcher> getCommands() {
         ArrayList<CommandMatcher> commands = new ArrayList<>();
 
         commands.add(new CommandMatcher((str) -> str.equals("list"), (str) -> {
-            List<Task> list = TaskList.getTaskList();
-            String[] output = new String[list.size() + 1];
-            output[0] = "Here, your tasks:";
-            for (int i = 0; i < list.size(); i++) {
-                output[i + 1] = (i + 1) + "." + list.get(i).toString();
-            }
-            Ui.messagePrint(output);
+            List<Task> tasks = TaskList.getTaskList();
+            Ui.messagePrint(listTasks("Here, your tasks:", tasks));
         }));
 
         commands.add(new PrefixCommandMatcher("mark", (str, map) -> {
@@ -73,6 +77,11 @@ public static ArrayList<CommandMatcher> getCommands() {
             });
         }));
 
+        commands.add(new PrefixCommandMatcher("find", (str, map) -> {
+            List<Task> tasks = TaskList.filterTasks(str);
+            Ui.messagePrint(listTasks("Here are the tasks that you might be looking for:", tasks));
+        }));
+
         // default command matcher - add to list
         commands.add(new CommandMatcher((str) -> true, (str) -> {
             Ui.messagePrint("(>.<') I'm sorry, I don't really know what that means.");
diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java
index a30269e77d..f65c990891 100644
--- a/src/main/java/duke/task/Task.java
+++ b/src/main/java/duke/task/Task.java
@@ -31,6 +31,15 @@ public void markAsNotDone() {
         this.done = false;
     }
 
+    /**
+     * Checks if the task description matches the query.
+     * @param query Query for the task to check.
+     * @return True if the task description matches the query.
+     */
+    public boolean isMatchingQuery(String query) {
+        return name.contains(query);
+    }
+
     private char getDoneMarker() {
         return this.done ? MARKER_DONE : MARKER_NOT_DONE;
     }
diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java
index fc2ddbe736..05c733c5cc 100644
--- a/src/main/java/duke/task/TaskList.java
+++ b/src/main/java/duke/task/TaskList.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import duke.Ui;
 
@@ -40,6 +41,17 @@ public static Optional<Task> getTask(String index) {
         }
     }
 
+    /**
+     * Get tasks that match the search term.
+     * @param query Search term.
+     * @return List of tasks.
+     */
+    public static List<Task> filterTasks(String query) {
+        return taskList.stream()
+                .filter((task) -> task.isMatchingQuery(query))
+                .collect(Collectors.toList());
+    }
+
     public static List<Task> getTaskList() {
         return taskList;
     }
diff --git a/text-ui-test/ACTUAL1.TXT b/text-ui-test/ACTUAL1.TXT
index daa5869735..0ca8fc0ec9 100644
--- a/text-ui-test/ACTUAL1.TXT
+++ b/text-ui-test/ACTUAL1.TXT
@@ -300,5 +300,28 @@
 | 16.[E][ ] wow  much  space (at: 10am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
+| (>.<') Add a description to your find.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your find.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here are the tasks that you might be looking for:
+| 1.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here are the tasks that you might be looking for:
+| 1.[T][ ] homework
+| 2.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 3.[T][ ] homework
+| 4.[T][ ] other homework
+| 5.[E][ ] meet friends (at: [unknown])
+| 6.[E][ ] meet people at dinner (at: 6:25 pm)
+| 7.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
 | It was nice to have you around, I'm going back to sleep...
 '----------------------------------------------------------------
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index f8387f0ae7..86501ca8fa 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -209,5 +209,24 @@
 | 8.[E][ ] wow  much  space (at: 10am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
+| (>.<') Add a description to your find.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your find.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here are the tasks that you might be looking for:
+| 1.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet people at dinner (at: 6:25 pm)
+| 3.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here are the tasks that you might be looking for:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
 | It was nice to have you around, I'm going back to sleep...
 '----------------------------------------------------------------
diff --git a/text-ui-test/EXPECTED1.TXT b/text-ui-test/EXPECTED1.TXT
index daa5869735..0ca8fc0ec9 100644
--- a/text-ui-test/EXPECTED1.TXT
+++ b/text-ui-test/EXPECTED1.TXT
@@ -300,5 +300,28 @@
 | 16.[E][ ] wow  much  space (at: 10am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
+| (>.<') Add a description to your find.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| (>.<') Add a description to your find.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here are the tasks that you might be looking for:
+| 1.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here are the tasks that you might be looking for:
+| 1.[T][ ] homework
+| 2.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 3.[T][ ] homework
+| 4.[T][ ] other homework
+| 5.[E][ ] meet friends (at: [unknown])
+| 6.[E][ ] meet people at dinner (at: 6:25 pm)
+| 7.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
 | It was nice to have you around, I'm going back to sleep...
 '----------------------------------------------------------------
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
index 9c999d0633..8ea2993b78 100644
--- a/text-ui-test/input.txt
+++ b/text-ui-test/input.txt
@@ -44,4 +44,8 @@ delete nan
 delete 24
   event  wow  much  space / very /wow /at 10am
 list
+find
+find 
+find  meet
+find      me
 bye

From ee22800f4214284642efdd8de1ad509091b9617e Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 27 Aug 2022 11:03:28 +0800
Subject: [PATCH 24/67] Add checkstyle and prepare for JavaFX

---
 build.gradle                       |  20 ++
 config/checkstyle/checkstyle.xml   | 429 +++++++++++++++++++++++++++++
 config/checkstyle/suppressions.xml |  10 +
 3 files changed, 459 insertions(+)
 create mode 100644 config/checkstyle/checkstyle.xml
 create mode 100644 config/checkstyle/suppressions.xml

diff --git a/build.gradle b/build.gradle
index c4e66ae0eb..9210096bab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,11 @@ plugins {
     id 'java'
     id 'application'
     id 'com.github.johnrengelman.shadow' version '5.1.0'
+    id 'checkstyle'
+}
+
+checkstyle {
+    toolVersion = '10.2'
 }
 
 repositories {
@@ -11,6 +16,21 @@ repositories {
 dependencies {
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0'
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0'
+
+    String javaFxVersion = '11'
+
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
 }
 
 test {
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
new file mode 100644
index 0000000000..870acebdda
--- /dev/null
+++ b/config/checkstyle/checkstyle.xml
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<!--
+    This configuration file enforces rules for the coding standard at
+    https://se-education.org/guides/conventions/java/intermediate.html
+-->
+
+<module name="Checker">
+
+  <module name="FileTabCharacter">
+    <!-- Checks that there are no tab characters in the file. -->
+  </module>
+
+  <module name="NewlineAtEndOfFile">
+    <!-- Accept LF, CR or CRLF to accomodate devs who prefer different line endings -->
+    <property name="lineSeparator" value="lf_cr_crlf"/>
+  </module>
+
+  <module name="RegexpSingleline">
+    <!-- Checks that FIXME is not used in comments.  TODO is preferred. -->
+    <property name="format" value="((//.*)|(\*.*))FIXME" />
+    <property name="message" value='TODO is preferred to FIXME."' />
+  </module>
+
+  <module name="SuppressionFilter">
+    <property name="file" value="${config_loc}/suppressions.xml"/>
+  </module>
+
+  <module name="LineLength">
+    <!-- Checks if a line is too long. -->
+    <property name="max" value="120"/>
+  </module>
+
+  <!-- All Java AST specific tests live under TreeWalker module. -->
+  <module name="TreeWalker">
+
+    <!-- Required to allow exceptions in code style -->
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+      <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+      <property name="checkFormat" value="$1"/>
+    </module>
+
+    <!--
+    IMPORT CHECKS
+    -->
+
+    <!-- Checks the ordering of import statements follow the rules that the default Eclipse formatter uses.
+    The order rule "STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE" consists of:
+      1. STATIC: static imports
+      2. STANDARD_JAVA_PACKAGE: standard java/javax imports
+      3. SPECIAL_IMPORTS: defined as org imports
+      4. THIRD_PARTY_PACKAGE: defined as com imports
+    -->
+    <module name="CustomImportOrder">
+        <property name="customImportOrderRules"
+            value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
+        <property name="specialImportsRegExp" value="^org\."/>
+        <property name="thirdPartyPackageRegExp" value="^com\."/>
+        <property name="sortImportsInGroupAlphabetically" value="true"/>
+    </module>
+
+    <!-- Checks for redundant import statements.
+    An import statement is redundant if:
+      * It is a duplicate of another import. This is, when a class is imported more than once.
+      * The class non-statically imported is from the java.lang package, e.g. importing java.lang.String.
+      * The class non-statically imported is from the same package as the current package.
+    -->
+    <module name="RedundantImport"/>
+
+    <!-- Checks for unused import statements.
+    An import statement is unused if:
+      It's not referenced in the file.
+    -->
+    <module name="UnusedImports"/>
+
+    <module name="AvoidStarImport"/>
+
+    <!--
+    NAMING CHECKS
+    -->
+
+    <!-- Validate abbreviations (consecutive capital letters) length in identifier name -->
+    <module name="AbbreviationAsWordInName">
+      <property name="ignoreFinal" value="false"/>
+      <property name="allowedAbbreviationLength" value="1"/>
+    </module>
+
+    <module name="PackageName">
+      <!-- Validates identifiers for package names against the supplied expression. -->
+      <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]{1,})*$"/>
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="TypeName">
+      <!-- Validates static, final fields against the expression "^[A-Z][a-zA-Z0-9]*$". -->
+      <metadata name="altname" value="TypeName"/>
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="ConstantName">
+      <!-- Validates non-private, static, final fields against the expression "^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$". -->
+      <metadata name="altname" value="ConstantName"/>
+      <property name="applyToPrivate" value="false"/>
+      <message key="name.invalidPattern"
+               value="Variable ''{0}'' should be in ALL_CAPS (if it is a constant) or be private (otherwise)."/>
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="StaticVariableName">
+      <!-- Validates static, non-final fields against the supplied expression. -->
+      <metadata name="altname" value="StaticVariableName"/>
+      <property name="format" value="^[a-z][a-zA-Z0-9]*_?$"/>
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="MemberName">
+      <!-- Validates non-static members against the supplied expression. -->
+      <metadata name="altname" value="MemberName"/>
+      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="MethodName">
+      <!-- Validates identifiers for method names against the supplied expression. -->
+      <metadata name="altname" value="MethodName"/>
+      <property name="format" value="^[a-z][a-zA-Z0-9]*(_[a-z][a-zA-Z0-9]+){0,2}$"/>
+    </module>
+
+    <module name="ParameterName">
+      <!-- Validates identifiers for method parameters against the expression "^[a-z][a-zA-Z0-9]*$". -->
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="LocalFinalVariableName">
+      <!-- Validates identifiers for local final variables against the expression "^[a-z][a-zA-Z0-9]*$". -->
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="LocalVariableName">
+      <!-- Validates identifiers for local variables against the expression "^[a-z][a-zA-Z0-9]*$". -->
+      <property name="severity" value="warning"/>
+    </module>
+
+
+    <!--
+    LENGTH and CODING CHECKS
+    -->
+
+    <!-- Checks that array type declarations follow Java Style
+      Java style: public static void main(String[] args) // Allowed
+      C style:    public static void main(String args[]) // Not allowed
+    -->
+    <module name="ArrayTypeStyle"/>
+
+    <!-- Checks if a catch block is empty and does not contain any comments. -->
+    <module name="EmptyCatchBlock"/>
+
+    <module name="LeftCurly">
+      <!-- Checks for placement of the left curly brace ('{'). -->
+      <property name="severity" value="warning"/>
+    </module>
+
+    <module name="RightCurly">
+      <!-- Checks right curlies on CATCH, ELSE, and TRY blocks are on
+      the same line. e.g., the following example is fine:
+      <pre>
+        if {
+          ...
+        } else
+      </pre>
+      -->
+      <!-- This next example is not fine:
+      <pre>
+        if {
+          ...
+        }
+        else
+      </pre>
+      -->
+      <property name="severity" value="warning"/>
+    </module>
+
+    <!-- Checks for braces around loop blocks -->
+    <module name="NeedBraces">
+      <!--
+      if (true) return 1; // Not allowed
+      if (true) { return 1; } // Not allowed
+      else if {
+        return 1; // else if should always be multi line
+      }
+      if (true)
+        return 1; // Not allowed
+      -->
+      <property name="allowEmptyLoopBody" value="true"/>
+    </module>
+
+    <!-- Checks that each variable declaration is in its own statement and on its own line. -->
+    <module name="MultipleVariableDeclarations"/>
+
+    <module name="OneStatementPerLine"/>
+
+    <!-- Checks that long constants are defined with an upper ell.-->
+    <module name="UpperEll" />
+
+    <module name="FallThrough">
+      <!-- Warn about falling through to the next case statement.  Similar to
+      javac -Xlint:fallthrough, but the check is suppressed if a single-line comment
+      on the last non-blank line preceding the fallen-into case contains 'fall through' (or
+      some other variants which we don't publicized to promote consistency).
+      -->
+      <property name="reliefPattern"
+       value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
+    </module>
+
+    <module name="MissingSwitchDefault"/>
+
+    <!-- Checks that Class variables should never be declared public. -->
+    <module name="VisibilityModifier">
+      <property name="protectedAllowed" value="true"/>
+      <property name="allowPublicFinalFields" value="true"/>
+      <property name="ignoreAnnotationCanonicalNames" value="RegisterExtension, TempDir"/>
+    </module>
+
+    <!--
+    ORDER CHECKS
+    -->
+
+    <!-- Checks that the order of at-clauses follows the tagOrder default property value order.
+         @author, @version, @param, @return, @throws, @exception, @see, @since, @serial, @serialField, @serialData, @deprecated
+    -->
+    <module name="AtclauseOrder"/>
+
+    <!-- Checks if the Class and Interface declarations is organized in this order
+      1. Class (static) variables. Order: public, protected, package level (no access modifier), private.
+      2. Instance variables. Order: public, protected, package level (no access modifier), private.
+      3. Constructors
+      4. Methods
+    -->
+    <module name ="DeclarationOrder"/>
+
+    <!-- Checks that default is after all cases in a switch statement -->
+    <module name="DefaultComesLast"/>
+
+    <module name="ModifierOrder">
+      <!-- Warn if modifier order is inconsistent with JLS3 8.1.1, 8.3.1, and
+           8.4.3.  The prescribed order is:
+           public, protected, private, abstract, static, final, transient, volatile,
+           synchronized, native, strictfp
+        -->
+    </module>
+
+    <module name="OverloadMethodsDeclarationOrder"/>
+
+    <!--
+    WHITESPACE CHECKS
+    -->
+
+    <!-- Checks that comments are indented relative to their position in the code -->
+    <module name="CommentsIndentation"/>
+
+    <module name="WhitespaceAround">
+      <!-- Checks that various tokens are surrounded by whitespace.
+           This includes most binary operators and keywords followed
+           by regular or curly braces.
+      -->
+      <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR,
+        BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN,
+        EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
+        LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
+        LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
+        MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION,
+        RCURLY, SL, SLIST, SL_ASSIGN, SR_ASSIGN, STAR, STAR_ASSIGN"/>
+      <!-- Allow empty constructors e.g. MyClass() {} -->
+      <property name="allowEmptyConstructors" value="true" />
+      <!-- Allow empty methods e.g. void func() {} -->
+      <property name="allowEmptyMethods" value="true" />
+      <!-- Allow empty types e.g. class Foo {}, enum Foo {} -->
+      <property name="allowEmptyTypes" value="true" />
+      <!-- Allow empty loops e.g. for (int i = 1; i > 1; i++) {} -->
+      <property name="allowEmptyLoops" value="true" />
+      <!-- Allow empty lambdas e.g. () -> {} -->
+      <property name="allowEmptyLambdas" value="true" />
+    </module>
+
+    <module name="WhitespaceAfter">
+      <!-- Checks that commas, semicolons and typecasts are followed by whitespace. -->
+      <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
+    </module>
+
+    <module name="NoWhitespaceAfter">
+      <!-- Checks that there is no whitespace after various unary operators. Linebreaks are allowed. -->
+      <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS,
+        UNARY_PLUS"/>
+      <property name="allowLineBreaks" value="true"/>
+    </module>
+
+    <!-- No trailing whitespace -->
+    <module name="Regexp">
+      <property name="format" value="[ \t]+$"/>
+      <property name="illegalPattern" value="true"/>
+      <property name="message" value="Trailing whitespace"/>
+    </module>
+
+    <module name="OperatorWrap">
+      <!-- Checks that the non-assignment type operator is at the next line in a line wrap.
+           This includes "?", ":", "==", "!=", "/", "+", "-", "*", "%", ">>", ">>>",
+           ">=", ">", "<<", "<=", "<", "^", "|", "||", "&", "&&", "instanceof",
+           "&" when used in a generic upper or lower bounds constraints,
+             e.g. <T extends Foo & Bar>
+           "::" when used as a reference to a method or constructor without arguments.
+             e.g. String::compareToIgnoreCase
+      -->
+      <property name="tokens" value="QUESTION, COLON, EQUAL, NOT_EQUAL, DIV, PLUS, MINUS, STAR, MOD, SR, BSR,
+        GE, GT, SL, LE, LT, BXOR, BOR, LOR, BAND, LAND, LITERAL_INSTANCEOF, TYPE_EXTENSION_AND, METHOD_REF"/>
+      <property name="option" value="nl"/>
+    </module>
+    <module name="OperatorWrap">
+      <!-- Checks that the assignment type operator is at the previous end of line in a line wrap.
+           This includes "=", "/=", "+=", "-=", "*=", "%=", ">>=", ">>>=", "<<=", "^=", "&=".
+      -->
+      <property name="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN,
+        SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
+      <property name="option" value="eol"/>
+    </module>
+
+    <module name="SeparatorWrap">
+      <!-- Checks that the ".", "@" is at the next line in a line wrap. -->
+      <property name="tokens" value="DOT, AT"/>
+      <property name="option" value="nl"/>
+    </module>
+    <module name="SeparatorWrap">
+      <!-- Checks that the ",", "]", "[", "...", ";", "(" is at the previous end of line in a line wrap. -->
+      <property name="tokens" value="COMMA, RBRACK, ARRAY_DECLARATOR, ELLIPSIS, SEMI, LPAREN"/>
+      <property name="option" value="eol"/>
+    </module>
+
+    <module name="Indentation">
+      <property name="caseIndent" value="0" />
+      <property name="throwsIndent" value="8" />
+    </module>
+
+    <module name="NoWhitespaceBefore">
+      <!-- Checks that there is no whitespace before various unary operators. Linebreaks are allowed. -->
+      <property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/>
+      <property name="allowLineBreaks" value="true"/>
+    </module>
+
+    <module name="NoWhitespaceBeforeCaseDefaultColon"/>
+
+    <!-- Checks that there is no whitespace between method/constructor name and open parenthesis. -->
+    <module name="MethodParamPad"/>
+
+    <module name="ParenPad">
+      <!-- Checks that there is no whitespace before close parenthesis or after open parenthesis. -->
+      <property name="severity" value="warning"/>
+    </module>
+
+    <!-- Checks that non-whitespace characters are separated by no more than one whitespace character.
+         a = 1; // Allowed
+         a  = 1; // Not allowed (more than one space before =)
+    -->
+    <module name="SingleSpaceSeparator">
+      <!-- Validate whitespace surrounding comments as well.
+           a = 1; // Allowed (single space before start of comment)
+           a = 1; /* Allowed (single space before start of comment) */
+           /* Allowed (single space after end of comment) */ a = 1;
+           a = 1;  // Not allowed (more than one space before start of comment)
+           a = 1;  /* Not allowed (more than one space before start of comment) */
+           /* Not allowed (more than one space after end of comment) */  a = 1;
+           This doesn't validate whitespace within comments so a comment /* like  this */ is allowed.
+      -->
+      <property name="validateComments" value="true"/>
+    </module>
+
+    <!--
+    JAVADOC CHECKS
+    -->
+
+    <!-- Checks that all block-tags are ordered correctly. -->
+    <module name="AtclauseOrder"/>
+
+    <!-- Checks that Javadoc block tags appear only at the beginning of the line. -->
+    <module name="JavadocBlockTagLocation"/>
+
+    <!-- Checks that all Javadoc comments start from the second line. -->
+    <module name="JavadocContentLocationCheck" />
+
+    <!-- Checks that each line in Javadoc has leading asterisks. -->
+    <module name="JavadocMissingLeadingAsterisk"/>
+
+    <!-- Checks that each non-empty line in Javadoc has whitespace after leading asterisk. -->
+    <module name="JavadocMissingWhitespaceAfterAsterisk"/>
+
+    <!-- Checks that for block tags, indentation of continuation lines is at least 4 spaces. -->
+    <module name="JavadocTagContinuationIndentation"/>
+
+    <!-- Checks the Javadoc's format for every class, enumeration and interface. -->
+    <module name="JavadocType">
+      <property name="allowMissingParamTags" value="true"/>
+    </module>
+
+    <!-- Checks the Javadoc's format for every public method (excluding getters, setters and constructors). -->
+    <module name="JavadocMethod">
+      <property name="allowedAnnotations" value="Override, Test, BeforeAll, BeforeEach, AfterAll, AfterEach, Subscribe"/>
+      <property name="accessModifiers" value="public"/>
+      <property name="validateThrows" value="false"/>
+      <property name="allowMissingParamTags" value="true"/>
+      <property name="allowMissingReturnTag" value="true"/>
+      <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/>
+    </module>
+
+    <module name="InvalidJavadocPosition"/>
+
+    <!-- Checks that every public method (excluding getters, setters and constructors) has a header comment. -->
+    <module name="MissingJavadocMethodCheck">
+      <property name="minLineCount" value="1"/>
+      <property name="allowMissingPropertyJavadoc" value="true"/>
+      <property name="ignoreMethodNamesRegex" value="(set.*|get.*)"/>
+    </module>
+
+    <!-- Checks that every public class, enumeration and interface has a header comment. -->
+    <module name="MissingJavadocType"/>
+
+  </module>
+</module>
\ No newline at end of file
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
new file mode 100644
index 0000000000..dcaa1af3c3
--- /dev/null
+++ b/config/checkstyle/suppressions.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+
+<suppressions>
+  <suppress checks="JavadocType" files=".*Test\.java"/>
+  <suppress checks="MissingJavadocMethodCheck" files=".*Test\.java"/>
+</suppressions>
\ No newline at end of file

From 2ef6f93f26b723bade0280389e3452c966c38f08 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 27 Aug 2022 15:50:24 +0800
Subject: [PATCH 25/67] Refactor Predicate in CommandMatcher to
 shouldRunCommand

---
 src/main/java/duke/CommandMatcher.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/duke/CommandMatcher.java b/src/main/java/duke/CommandMatcher.java
index e69d884771..c123b362db 100644
--- a/src/main/java/duke/CommandMatcher.java
+++ b/src/main/java/duke/CommandMatcher.java
@@ -8,16 +8,16 @@
  * as a matching process and an action.
  */
 public class CommandMatcher {
-    private Predicate<String> check;
+    private Predicate<String> shouldRunAction;
     private Consumer<String> action;
 
     /**
      * Creates an object that handles checking and executing a command.
-     * @param check Predicate to check if the command should be run.
+     * @param shouldRunAction Predicate to check if the command should be run.
      * @param action Action to run.
      */
-    public CommandMatcher(Predicate<String> check, Consumer<String> action) {
-        this.check = check;
+    public CommandMatcher(Predicate<String> shouldRunAction, Consumer<String> action) {
+        this.shouldRunAction = shouldRunAction;
         this.action = action;
     }
 
@@ -27,7 +27,7 @@ public CommandMatcher(Predicate<String> check, Consumer<String> action) {
      * @param action Action to run.
      */
     public CommandMatcher(String prefix, Consumer<String> action) {
-        this.check = (cmd) -> cmd.strip().startsWith(prefix);
+        this.shouldRunAction = (cmd) -> cmd.strip().startsWith(prefix);
         this.action = action;
     }
 
@@ -38,7 +38,7 @@ public CommandMatcher(String prefix, Consumer<String> action) {
      * @return If the string matches.
      */
     public boolean run(String input) {
-        if (check.test(input)) {
+        if (shouldRunAction.test(input)) {
             action.accept(input);
             return true;
         }

From 7ba6ac32635fa24be7173e4f5022155c61161739 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 27 Aug 2022 15:53:38 +0800
Subject: [PATCH 26/67] Add more JUnit tests

---
 src/test/java/duke/task/EventTest.java | 23 +++++++++++++++++++++++
 src/test/java/duke/task/ToDoTest.java  | 23 +++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 src/test/java/duke/task/EventTest.java
 create mode 100644 src/test/java/duke/task/ToDoTest.java

diff --git a/src/test/java/duke/task/EventTest.java b/src/test/java/duke/task/EventTest.java
new file mode 100644
index 0000000000..6f017c68c6
--- /dev/null
+++ b/src/test/java/duke/task/EventTest.java
@@ -0,0 +1,23 @@
+package duke.task;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class EventTest {
+    @Test
+    public void getAsStringArray_makingObjects_normalBehavior() {
+        Task task1 = new Event("task one", "1", false);
+        Task task2 = new Event("task two", "2", true);
+        Task task3 = new Event("task three", "3");
+
+        assertEquals("[E][ ] task one (at: 1)", task1.toString());
+        assertEquals("[E][X] task two (at: 2)", task2.toString());
+        assertEquals("[E][ ] task three (at: 3)", task3.toString());
+
+        assertArrayEquals(new String[] { "Event", "task one", "false", "1" }, task1.getAsStringArray());
+        assertArrayEquals(new String[] { "Event", "task two", "true", "2" }, task2.getAsStringArray());
+        assertArrayEquals(new String[] { "Event", "task three", "false", "3" }, task3.getAsStringArray());
+    }
+}
diff --git a/src/test/java/duke/task/ToDoTest.java b/src/test/java/duke/task/ToDoTest.java
new file mode 100644
index 0000000000..88716b1f2a
--- /dev/null
+++ b/src/test/java/duke/task/ToDoTest.java
@@ -0,0 +1,23 @@
+package duke.task;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ToDoTest {
+    @Test
+    public void getAsStringArray_makingObjects_normalBehavior() {
+        Task task1 = new ToDo("task one", false);
+        Task task2 = new ToDo("task two", true);
+        Task task3 = new ToDo("task three");
+
+        assertEquals("[T][ ] task one", task1.toString());
+        assertEquals("[T][X] task two", task2.toString());
+        assertEquals("[T][ ] task three", task3.toString());
+
+        assertArrayEquals(new String[] { "ToDo", "task one", "false" }, task1.getAsStringArray());
+        assertArrayEquals(new String[] { "ToDo", "task two", "true" }, task2.getAsStringArray());
+        assertArrayEquals(new String[] { "ToDo", "task three", "false" }, task3.getAsStringArray());
+    }
+}

From 9a79557e67a15b1b645cf1999bed714e0c91e4fe Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sun, 28 Aug 2022 10:50:24 +0800
Subject: [PATCH 27/67] Remove unused commented out code

---
 src/main/java/duke/Storage.java | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java
index aac5b7a5fa..092bf0c16a 100644
--- a/src/main/java/duke/Storage.java
+++ b/src/main/java/duke/Storage.java
@@ -37,39 +37,6 @@ public static Storage getFileState(String fileName) {
         return fileStates.get(fileName);
     }
 
-    /*public String getContents() {
-        if (contents == null) {
-            try {
-                File f = new File(fileName);
-                Scanner s = new Scanner(f);
-                StringBuilder sb = new StringBuilder();
-                boolean isFirst = true;
-                while (s.hasNext()) {
-                    if (isFirst) {
-                        isFirst = false;
-                    } else {
-                        sb.append('\n');
-                    }
-                    sb.append(s.nextLine());
-                }
-                contents = sb.toString();
-            } catch (FileNotFoundException ex) {
-                // file not found or error
-                contents = "";
-            }
-        }
-        return contents;
-    }*/
-
-    ///**
-    // * Saves the string to the file on disk
-    // * @param str string to save
-    // */
-    /*public void saveContents(String str) {
-        contents = str;
-        // write to file TODO
-    }*/
-
     private static String convertToBase64(String input) {
         return Base64.getEncoder().encodeToString(input.getBytes(StandardCharsets.UTF_16));
     }

From 73bb0233ca340c6f8581b3be728fd0b54f0b4d3e Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Wed, 31 Aug 2022 15:43:31 +0800
Subject: [PATCH 28/67] Fix JavaDoc by adding the missing blank line in JavaDoc
 comment

---
 src/main/java/duke/CommandMatcher.java   | 3 +++
 src/main/java/duke/Duke.java             | 1 +
 src/main/java/duke/ParsedDateTime.java   | 2 ++
 src/main/java/duke/Parser.java           | 1 +
 src/main/java/duke/Storage.java          | 3 +++
 src/main/java/duke/Ui.java               | 3 ++-
 src/main/java/duke/task/Deadline.java    | 2 ++
 src/main/java/duke/task/Event.java       | 2 ++
 src/main/java/duke/task/Task.java        | 3 +++
 src/main/java/duke/task/TaskFactory.java | 2 ++
 src/main/java/duke/task/TaskList.java    | 3 +++
 src/main/java/duke/task/TaskStorage.java | 2 ++
 src/main/java/duke/task/ToDo.java        | 3 +++
 13 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/main/java/duke/CommandMatcher.java b/src/main/java/duke/CommandMatcher.java
index c123b362db..f8f106fb7c 100644
--- a/src/main/java/duke/CommandMatcher.java
+++ b/src/main/java/duke/CommandMatcher.java
@@ -13,6 +13,7 @@ public class CommandMatcher {
 
     /**
      * Creates an object that handles checking and executing a command.
+     *
      * @param shouldRunAction Predicate to check if the command should be run.
      * @param action Action to run.
      */
@@ -23,6 +24,7 @@ public CommandMatcher(Predicate<String> shouldRunAction, Consumer<String> action
 
     /**
      * Creates an object that handles checking and executing a command.
+     *
      * @param prefix Prefix of the command which is checked.
      * @param action Action to run.
      */
@@ -34,6 +36,7 @@ public CommandMatcher(String prefix, Consumer<String> action) {
     /**
      * Checks if the string matches.
      * If it does, it would execute the action.
+     *
      * @param input String to check if it is for this command.
      * @return If the string matches.
      */
diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
index ff37da1c75..84394d0883 100644
--- a/src/main/java/duke/Duke.java
+++ b/src/main/java/duke/Duke.java
@@ -38,6 +38,7 @@ private static void handleCommand(String command) {
 
     /**
      * Runs the chatbot execution.
+     *
      * @param args Command line args which are not used.
      */
     public static void main(String[] args) {
diff --git a/src/main/java/duke/ParsedDateTime.java b/src/main/java/duke/ParsedDateTime.java
index 781838d862..b3fc5d9c61 100644
--- a/src/main/java/duke/ParsedDateTime.java
+++ b/src/main/java/duke/ParsedDateTime.java
@@ -22,6 +22,7 @@ public class ParsedDateTime {
 
     /**
      * Creates an object to handle if the date/time can be parsed.
+     *
      * @param input String that may represent date/time.
      */
     public ParsedDateTime(String input) {
@@ -39,6 +40,7 @@ public ParsedDateTime(String input) {
 
     /**
      * Gets a nicely-formatted date.
+     *
      * @return The date if it parses, else the original string.
      */
     @Override
diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index 7d372a3bc9..50f6f04477 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -25,6 +25,7 @@ private static String[] listTasks(String response, List<Task> tasks) {
 
     /**
      * Gets the chatbot commands in an ArrayList.
+     *
      * @return ArrayList of chatbot commands.
      */
     public static ArrayList<CommandMatcher> getCommands() {
diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java
index 092bf0c16a..5021f19b0c 100644
--- a/src/main/java/duke/Storage.java
+++ b/src/main/java/duke/Storage.java
@@ -27,6 +27,7 @@ private Storage(String fileName) {
 
     /**
      * Gets a singleton object that manages a particular file.
+     *
      * @param fileName File name to identify file.
      * @return Object managing the file.
      */
@@ -47,6 +48,7 @@ private static String convertFromBase64(String input) {
 
     /**
      * Gets lines from file as a String[][].
+     *
      * @return Array of String[], each storing comma-separated parts of a line.
      */
     public String[][] getLines() {
@@ -70,6 +72,7 @@ public String[][] getLines() {
 
     /**
      * Saves the string to the file on disk.
+     *
      * @param strings Strings to save.
      */
     public void saveLines(String[][] strings) {
diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java
index 9137330b09..3017d778cd 100644
--- a/src/main/java/duke/Ui.java
+++ b/src/main/java/duke/Ui.java
@@ -8,7 +8,8 @@ public class Ui {
 
     /**
      * Styles and prints lines with a border.
-     * @param lines Lines to be printed
+     *
+     * @param lines Line to be printed
      */
     public static void printStyledMessage(String... lines) {
         System.out.println(",----------------------------------------------------------------");
diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java
index 5d37952b27..a29b0c5fdc 100644
--- a/src/main/java/duke/task/Deadline.java
+++ b/src/main/java/duke/task/Deadline.java
@@ -10,6 +10,7 @@ public class Deadline extends Task {
 
     /**
      * Creates a duke.tasks.Deadline object.
+     *
      * @param description Description of deadline.
      * @param by Time of deadline.
      */
@@ -19,6 +20,7 @@ public Deadline(String description, String by) {
 
     /**
      * Creates a duke.tasks.Deadline object.
+     *
      * @param description Description of deadline.
      * @param by Time of deadline.
      * @param isDone If the task is done.
diff --git a/src/main/java/duke/task/Event.java b/src/main/java/duke/task/Event.java
index 1992399bf4..42233ee4ac 100644
--- a/src/main/java/duke/task/Event.java
+++ b/src/main/java/duke/task/Event.java
@@ -10,6 +10,7 @@ public class Event extends Task {
 
     /**
      * Creates an event.
+     *
      * @param description Description of event.
      * @param at Time of event.
      */
@@ -19,6 +20,7 @@ public Event(String description, String at) {
 
     /**
      * Creates an event.
+     *
      * @param description Description of event.
      * @param at Time of event.
      * @param isDone If the task is done.
diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java
index 7061122802..dffc895d7c 100644
--- a/src/main/java/duke/task/Task.java
+++ b/src/main/java/duke/task/Task.java
@@ -33,6 +33,7 @@ public void markAsNotDone() {
 
     /**
      * Checks if the task description matches the query.
+     *
      * @param query Query for the task to check.
      * @return True if the task description matches the query.
      */
@@ -46,6 +47,7 @@ private char getDoneMarker() {
 
     /**
      * Creates a string representation suitable for printing to screen.
+     *
      * @return String representation of task.
      */
     @Override
@@ -55,6 +57,7 @@ public String toString() {
 
     /**
      * Creates a string array representation suitable for printing to files.
+     *
      * @return String array representation.
      */
     public String[] getAsStringArray() {
diff --git a/src/main/java/duke/task/TaskFactory.java b/src/main/java/duke/task/TaskFactory.java
index a6799834f3..bf8d882891 100644
--- a/src/main/java/duke/task/TaskFactory.java
+++ b/src/main/java/duke/task/TaskFactory.java
@@ -10,6 +10,7 @@
 public class TaskFactory {
     /**
      * Constructs the task.
+     *
      * @param taskData Data for the task.
      * @return Task according to taskData.
      * @throws IllegalArgumentException If taskData does not conform to the format.
@@ -35,6 +36,7 @@ public static Task constructTask(String[] taskData) throws IllegalArgumentExcept
 
     /**
      * Constructs the task.
+     *
      * @param taskData Data for the task.
      * @return Optional of Task according to taskData, Optional.empty() if cannot construct.
      */
diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java
index bc830e88e0..0c422cfb11 100644
--- a/src/main/java/duke/task/TaskList.java
+++ b/src/main/java/duke/task/TaskList.java
@@ -30,6 +30,7 @@ public static void finalizeTaskList() {
 
     /**
      * Gets task from index as string.
+     *
      * @param index Index as a string.
      * @return Optional.of(task) if successful, else Optional.empty().
      */
@@ -49,6 +50,7 @@ public static Optional<Task> getTask(String index) {
 
     /**
      * Get tasks that match the search term.
+     *
      * @param query Search term.
      * @return List of tasks.
      */
@@ -60,6 +62,7 @@ public static List<Task> filterTasks(String query) {
 
     /**
      * Gets the task list for other classes to work on.
+     *
      * @return The task list.
      */
     public static List<Task> getTaskList() {
diff --git a/src/main/java/duke/task/TaskStorage.java b/src/main/java/duke/task/TaskStorage.java
index 83e0f01fe9..b421c560a4 100644
--- a/src/main/java/duke/task/TaskStorage.java
+++ b/src/main/java/duke/task/TaskStorage.java
@@ -13,6 +13,7 @@ public class TaskStorage {
 
     /**
      * Gets ArrayList of previously saved tasks.
+     *
      * @return ArrayList of tasks.
      */
     public static ArrayList<Task> getTasks() {
@@ -26,6 +27,7 @@ public static ArrayList<Task> getTasks() {
 
     /**
      * Saves a list of tasks to the default file.
+     *
      * @param tasks List of tasks.
      */
     public static void saveTasks(List<Task> tasks) {
diff --git a/src/main/java/duke/task/ToDo.java b/src/main/java/duke/task/ToDo.java
index 09d4e8fe25..3c3596d9d4 100644
--- a/src/main/java/duke/task/ToDo.java
+++ b/src/main/java/duke/task/ToDo.java
@@ -7,6 +7,7 @@ public class ToDo extends Task {
 
     /**
      * Creates a task item.
+     *
      * @param description Description of task.
      */
     public ToDo(String description) {
@@ -15,6 +16,7 @@ public ToDo(String description) {
 
     /**
      * Creates a task item.
+     *
      * @param description Description of task.
      * @param isDone If the task is done.
      */
@@ -29,6 +31,7 @@ public String toString() {
 
     /**
      * Get a string array representation suitable for printing to files.
+     *
      * @return String array representation.
      */
     @Override

From 86b1cde714e0f7fcb22767745d33210c40fe4a91 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Fri, 2 Sep 2022 21:49:31 +0800
Subject: [PATCH 29/67] Add backwards compatible text-ui-test regression
 testing as integration tests

---
 src/main/java/duke/Duke.java                 | 25 ++++++++++---
 src/main/java/duke/GuiHandler.java           | 32 +++++++++++++++++
 src/main/java/duke/Parser.java               | 27 +++++++++-----
 src/main/java/duke/PrefixCommandMatcher.java | 10 +++---
 src/main/java/duke/Storage.java              |  3 +-
 src/main/java/duke/Ui.java                   | 30 ++++++++--------
 src/main/java/duke/UiInterface.java          | 23 ++++++++++++
 src/main/java/duke/task/TaskFactory.java     |  4 ++-
 src/main/java/duke/task/TaskList.java        |  7 ++--
 text-ui-test/ACTUAL1.TXT                     | 37 +++++++-------------
 text-ui-test/EXPECTED.TXT                    | 11 ++----
 text-ui-test/EXPECTED1.TXT                   | 37 +++++++-------------
 text-ui-test/duke.txt                        |  4 +--
 text-ui-test/runtest.bat                     |  4 +--
 14 files changed, 156 insertions(+), 98 deletions(-)
 create mode 100644 src/main/java/duke/GuiHandler.java
 create mode 100644 src/main/java/duke/UiInterface.java

diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
index 84394d0883..7ee68a1009 100644
--- a/src/main/java/duke/Duke.java
+++ b/src/main/java/duke/Duke.java
@@ -13,6 +13,16 @@
 public class Duke {
     /** List of commands */
     private static ArrayList<CommandMatcher> commands;
+    private static UiInterface ui;
+
+    /**
+     * Gets the current UiInterface for command line purposes.
+     *
+     * @return UiInterface that helps display text to screen.
+     */
+    public static UiInterface getCurrentUi() {
+        return ui;
+    }
 
     private static Optional<Task> getTask(String index) {
         try {
@@ -20,10 +30,10 @@ private static Optional<Task> getTask(String index) {
             Task task = TaskList.getTaskList().get(idx - 1);
             return Optional.of(task);
         } catch (NumberFormatException ex) {
-            Ui.printStyledMessage("Sorry, I didn't understand " + index + ", please give me a number.");
+            ui.printStyledMessage("Sorry, I didn't understand " + index + ", please give me a number.");
             return Optional.empty();
         } catch (IndexOutOfBoundsException ex) {
-            Ui.printStyledMessage("Sorry, the number " + index + ", wasn't in the range.");
+            ui.printStyledMessage("Sorry, the number " + index + ", wasn't in the range.");
             return Optional.empty();
         }
     }
@@ -42,8 +52,15 @@ private static void handleCommand(String command) {
      * @param args Command line args which are not used.
      */
     public static void main(String[] args) {
+        // allow for console tests to run
+        if (args.length >= 1 && args[0].equals("console-test")) {
+            ui = new Ui();
+        } else {
+            ui = new GuiHandler();
+        }
+
         // initialization
-        Ui.greet();
+        ui.greet();
         TaskList.initializeTaskList();
         commands = Parser.getCommands();
         Scanner input = new Scanner(System.in);
@@ -61,6 +78,6 @@ public static void main(String[] args) {
 
         // finalization
         TaskList.finalizeTaskList();
-        Ui.leave();
+        ui.leave();
     }
 }
diff --git a/src/main/java/duke/GuiHandler.java b/src/main/java/duke/GuiHandler.java
new file mode 100644
index 0000000000..edb652391c
--- /dev/null
+++ b/src/main/java/duke/GuiHandler.java
@@ -0,0 +1,32 @@
+package duke;
+
+/**
+ * Used for GUI.
+ */
+public class GuiHandler implements UiInterface {
+    /**
+     * Prints lines, when actually implemented.
+     *
+     * @param lines Line to be printed
+     */
+    @Override
+    public void printStyledMessage(String... lines) {
+        // stub
+    }
+
+    /**
+     * Greets user, when actually implemented.
+     */
+    @Override
+    public void greet() {
+        // stub
+    }
+
+    /**
+     * Leaves the user, when actually implemented.
+     */
+    @Override
+    public void leave() {
+        // stub
+    }
+}
diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index 50f6f04477..b176624af1 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -33,13 +33,15 @@ public static ArrayList<CommandMatcher> getCommands() {
 
         commands.add(new CommandMatcher((str) -> str.equals("list"), (str) -> {
             List<Task> tasks = TaskList.getTaskList();
-            Ui.printStyledMessage(listTasks("Here, your tasks:", tasks));
+            Duke.getCurrentUi().printStyledMessage(
+                    listTasks("Here, your tasks:", tasks));
         }));
 
         commands.add(new PrefixCommandMatcher("mark", (str, map) -> {
             TaskList.getTask(str).ifPresent((task) -> {
                 task.markAsDone();
-                Ui.printStyledMessage("Marked your task as done:",
+                Duke.getCurrentUi().printStyledMessage(
+                        "Marked your task as done:",
                         task.toString());
             });
         }));
@@ -47,7 +49,8 @@ public static ArrayList<CommandMatcher> getCommands() {
         commands.add(new PrefixCommandMatcher("unmark", (str, map) -> {
             TaskList.getTask(str).ifPresent((task) -> {
                 task.markAsNotDone();
-                Ui.printStyledMessage("Aw... it's not done yet:",
+                Duke.getCurrentUi().printStyledMessage(
+                        "Aw... it's not done yet:",
                         task.toString());
             });
         }));
@@ -55,28 +58,32 @@ public static ArrayList<CommandMatcher> getCommands() {
         commands.add(new PrefixCommandMatcher("deadline", (str, map) -> {
             Task task = new Deadline(str, map.getOrDefault("by", "[unknown]"));
             TaskList.getTaskList().add(task);
-            Ui.printStyledMessage("Good luck with the deadline, here's the task:",
+            Duke.getCurrentUi().printStyledMessage(
+                    "Good luck with the deadline, here's the task:",
                     task.toString());
         }));
 
         commands.add(new PrefixCommandMatcher("todo", (str, map) -> {
             Task task = new ToDo(str);
             TaskList.getTaskList().add(task);
-            Ui.printStyledMessage("I've recorded this thing you need to do:",
+            Duke.getCurrentUi().printStyledMessage(
+                    "I've recorded this thing you need to do:",
                     task.toString());
         }));
 
         commands.add(new PrefixCommandMatcher("event", (str, map) -> {
             Task task = new Event(str, map.getOrDefault("at", "[unknown]"));
             TaskList.getTaskList().add(task);
-            Ui.printStyledMessage("That's going to happen at some time later:",
+            Duke.getCurrentUi().printStyledMessage(
+                    "That's going to happen at some time later:",
                     task.toString());
         }));
 
         commands.add(new PrefixCommandMatcher("delete", (str, map) -> {
             TaskList.getTask(str).ifPresent((task) -> {
                 TaskList.getTaskList().remove(task);
-                Ui.printStyledMessage("It seems you didn't need this task anymore, so I removed it:",
+                Duke.getCurrentUi().printStyledMessage(
+                        "It seems you didn't need this task anymore, so I removed it:",
                         task.toString(),
                         String.format("You have %d tasks left.", TaskList.getTaskList().size()));
             });
@@ -84,12 +91,14 @@ public static ArrayList<CommandMatcher> getCommands() {
 
         commands.add(new PrefixCommandMatcher("find", (str, map) -> {
             List<Task> tasks = TaskList.filterTasks(str);
-            Ui.printStyledMessage(listTasks("Here are the tasks that you might be looking for:", tasks));
+            Duke.getCurrentUi().printStyledMessage(
+                    listTasks("Here are the tasks that you might be looking for:", tasks));
         }));
 
         // default command matcher - add to list
         commands.add(new CommandMatcher((str) -> true, (str) -> {
-            Ui.printStyledMessage("(>.<') I'm sorry, I don't really know what that means.");
+            Duke.getCurrentUi().printStyledMessage(
+                    "(>.<') I'm sorry, I don't really know what that means.");
         }));
 
         return commands;
diff --git a/src/main/java/duke/PrefixCommandMatcher.java b/src/main/java/duke/PrefixCommandMatcher.java
index 7a38569427..9c3fc0c506 100644
--- a/src/main/java/duke/PrefixCommandMatcher.java
+++ b/src/main/java/duke/PrefixCommandMatcher.java
@@ -21,7 +21,8 @@ public PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String
 
             // corner case
             if (cmd.equals(prefix)) {
-                Ui.printStyledMessage("(>.<') Add a description to your " + prefix + ".");
+                Duke.getCurrentUi().printStyledMessage(
+                        "(>.<') Add a description to your " + prefix + ".");
                 return;
             }
 
@@ -32,21 +33,20 @@ public PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String
             for (int i = 1; i < commandParts.length; i++) {
                 String[] keyAndValue = commandParts[i].split(" ", 2);
                 if (keyAndValue.length == 2) {
-                    map.put(keyAndValue[0].strip(), keyAndValue[1].strip());
+                    map.put(keyAndValue[0].strip(), keyAndValue[1]);
                 } else {
                     map.put(keyAndValue[0].strip(), "");
                 }
             }
-            commandParts[0] = commandParts[0].strip();
 
             // another corner case
             if (commandParts[0].equals("")) {
-                Ui.printStyledMessage("(>.<') The description for " + prefix + " shouldn't be empty.");
+                Duke.getCurrentUi().printStyledMessage("(>.<') The description for " + prefix + " shouldn't be empty.");
                 return;
             }
 
             // accept
-            action.accept(commandParts[0].strip(), map);
+            action.accept(commandParts[0], map);
         });
     }
 }
diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java
index 5021f19b0c..064f1e4266 100644
--- a/src/main/java/duke/Storage.java
+++ b/src/main/java/duke/Storage.java
@@ -90,7 +90,8 @@ public void saveLines(String[][] strings) {
             }
             writer.close();
         } catch (IOException ex) {
-            Ui.printStyledMessage("(>.<') I was unable to record your tasks...");
+            Duke.getCurrentUi().printStyledMessage(
+                    "(>.<') I was unable to record your tasks...");
             ex.printStackTrace();
         }
     }
diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java
index 3017d778cd..259851f862 100644
--- a/src/main/java/duke/Ui.java
+++ b/src/main/java/duke/Ui.java
@@ -1,17 +1,15 @@
 package duke;
 
-import duke.task.Task;
-
-import java.util.ArrayList;
-
-public class Ui {
 
+/**
+ * Handles console-based user interface. Used for sanity checks.
+ */
+public class Ui implements UiInterface {
     /**
-     * Styles and prints lines with a border.
-     *
-     * @param lines Line to be printed
+     * {@inheritDoc}
      */
-    public static void printStyledMessage(String... lines) {
+    @Override
+    public void printStyledMessage(String... lines) {
         System.out.println(",----------------------------------------------------------------");
         for (String str : lines) {
             System.out.print("| ");
@@ -21,18 +19,20 @@ public static void printStyledMessage(String... lines) {
     }
 
     /**
-     * Greets user.
+     * {@inheritDoc}
      */
-    public static void greet() {
-        Ui.printStyledMessage("...where is this again?",
+    @Override
+    public void greet() {
+        printStyledMessage("...where is this again?",
                 "Oh, hello, I didn't see you there - I'm Anthea, a chatbot...",
                 "...or at least that's what they told me.");
     }
 
     /**
-     * Leaves the user.
+     * {@inheritDoc}
      */
-    public static void leave() {
-        Ui.printStyledMessage("It was nice to have you around, I'm going back to sleep...");
+    @Override
+    public void leave() {
+        printStyledMessage("It was nice to have you around, I'm going back to sleep...");
     }
 }
diff --git a/src/main/java/duke/UiInterface.java b/src/main/java/duke/UiInterface.java
new file mode 100644
index 0000000000..8ee0e305f8
--- /dev/null
+++ b/src/main/java/duke/UiInterface.java
@@ -0,0 +1,23 @@
+package duke;
+
+/**
+ * Functions that a UI interface needs to implement.
+ */
+public interface UiInterface {
+    /**
+     * Styles and prints lines with a border.
+     *
+     * @param lines Lines to be printed
+     */
+    public void printStyledMessage(String... lines);
+
+    /**
+     * Greets user.
+     */
+    public void greet();
+
+    /**
+     * Leaves the user.
+     */
+    public void leave();
+}
diff --git a/src/main/java/duke/task/TaskFactory.java b/src/main/java/duke/task/TaskFactory.java
index bf8d882891..d6bb4c0d2e 100644
--- a/src/main/java/duke/task/TaskFactory.java
+++ b/src/main/java/duke/task/TaskFactory.java
@@ -2,6 +2,7 @@
 
 import java.util.Optional;
 
+import duke.Duke;
 import duke.Ui;
 
 /**
@@ -44,7 +45,8 @@ public static Optional<Task> constructOptionalTask(String[] taskData) {
         try {
             return Optional.of(constructTask(taskData));
         } catch (IllegalArgumentException ex) {
-            Ui.printStyledMessage("(>.<') did not understand this task - dropping it",
+            Duke.getCurrentUi().printStyledMessage(
+                    "(>.<') did not understand this task - dropping it",
                     String.join(", ", taskData));
             return Optional.empty();
         }
diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java
index 0c422cfb11..73eee897f2 100644
--- a/src/main/java/duke/task/TaskList.java
+++ b/src/main/java/duke/task/TaskList.java
@@ -5,6 +5,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import duke.Duke;
 import duke.Ui;
 
 /**
@@ -40,10 +41,12 @@ public static Optional<Task> getTask(String index) {
             Task task = taskList.get(idx - 1);
             return Optional.of(task);
         } catch (NumberFormatException ex) {
-            Ui.printStyledMessage("Sorry, I didn't understand " + index + ", please give me a number.");
+            Duke.getCurrentUi().printStyledMessage(
+                    "Sorry, I didn't understand " + index + ", please give me a number.");
             return Optional.empty();
         } catch (IndexOutOfBoundsException ex) {
-            Ui.printStyledMessage("Sorry, the number " + index + ", wasn't in the range.");
+            Duke.getCurrentUi().printStyledMessage(
+                    "Sorry, the number " + index + ", wasn't in the range.");
             return Optional.empty();
         }
     }
diff --git a/text-ui-test/ACTUAL1.TXT b/text-ui-test/ACTUAL1.TXT
index 0ca8fc0ec9..be3fb5a5bb 100644
--- a/text-ui-test/ACTUAL1.TXT
+++ b/text-ui-test/ACTUAL1.TXT
@@ -33,7 +33,7 @@
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | I've recorded this thing you need to do:
@@ -76,7 +76,7 @@
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -98,7 +98,7 @@
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -116,7 +116,7 @@
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -134,7 +134,7 @@
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -152,7 +152,7 @@
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -170,7 +170,7 @@
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -196,7 +196,7 @@
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -225,7 +225,7 @@
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -253,7 +253,7 @@
 | 3.[D][X] /at mysterious (by: [unknown])
 | 4.[D][X] /by mysterious number 2 (by: [unknown])
 | 5.[D][ ] rush this please (by: when?)
-| 6.[E][ ] wow  much  space (at: 10am)
+| 6.[E][ ]  wow  much  space (at: 10am)
 | 7.[T][ ] homework
 | 8.[T][ ] other homework
 | 9.[T][ ] project 12
@@ -278,7 +278,7 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | That's going to happen at some time later:
-| [E][ ] wow  much  space (at: 10am)
+| [E][ ]  wow  much  space (at: 10am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
@@ -287,7 +287,7 @@
 | 3.[D][X] /at mysterious (by: [unknown])
 | 4.[D][X] /by mysterious number 2 (by: [unknown])
 | 5.[D][ ] rush this please (by: when?)
-| 6.[E][ ] wow  much  space (at: 10am)
+| 6.[E][ ]  wow  much  space (at: 10am)
 | 7.[T][ ] homework
 | 8.[T][ ] other homework
 | 9.[T][ ] project 12
@@ -297,7 +297,7 @@
 | 13.[D][ ] /at mysterious (by: [unknown])
 | 14.[D][ ] /by mysterious number 2 (by: [unknown])
 | 15.[D][ ] rush this please (by: when?)
-| 16.[E][ ] wow  much  space (at: 10am)
+| 16.[E][ ]  wow  much  space (at: 10am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | (>.<') Add a description to your find.
@@ -307,20 +307,9 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here are the tasks that you might be looking for:
-| 1.[E][X] meet people at function x/y/z whatever (at: 7:12am)
-| 2.[E][ ] meet friends (at: [unknown])
-| 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here are the tasks that you might be looking for:
-| 1.[T][ ] homework
-| 2.[E][X] meet people at function x/y/z whatever (at: 7:12am)
-| 3.[T][ ] homework
-| 4.[T][ ] other homework
-| 5.[E][ ] meet friends (at: [unknown])
-| 6.[E][ ] meet people at dinner (at: 6:25 pm)
-| 7.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | It was nice to have you around, I'm going back to sleep...
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index 86501ca8fa..3bb4a2c8d7 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -195,7 +195,7 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | That's going to happen at some time later:
-| [E][ ] wow  much  space (at: 10am)
+| [E][ ]  wow  much  space (at: 10am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
@@ -206,7 +206,7 @@
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | (>.<') Add a description to your find.
@@ -216,16 +216,9 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here are the tasks that you might be looking for:
-| 1.[E][ ] meet friends (at: [unknown])
-| 2.[E][ ] meet people at dinner (at: 6:25 pm)
-| 3.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here are the tasks that you might be looking for:
-| 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
-| 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | It was nice to have you around, I'm going back to sleep...
diff --git a/text-ui-test/EXPECTED1.TXT b/text-ui-test/EXPECTED1.TXT
index 0ca8fc0ec9..be3fb5a5bb 100644
--- a/text-ui-test/EXPECTED1.TXT
+++ b/text-ui-test/EXPECTED1.TXT
@@ -33,7 +33,7 @@
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | I've recorded this thing you need to do:
@@ -76,7 +76,7 @@
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -98,7 +98,7 @@
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -116,7 +116,7 @@
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -134,7 +134,7 @@
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -152,7 +152,7 @@
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -170,7 +170,7 @@
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -196,7 +196,7 @@
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -225,7 +225,7 @@
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
-| 8.[E][ ] wow  much  space (at: 10am)
+| 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
 | 10.[T][ ] other homework
 | 11.[T][ ] project 12
@@ -253,7 +253,7 @@
 | 3.[D][X] /at mysterious (by: [unknown])
 | 4.[D][X] /by mysterious number 2 (by: [unknown])
 | 5.[D][ ] rush this please (by: when?)
-| 6.[E][ ] wow  much  space (at: 10am)
+| 6.[E][ ]  wow  much  space (at: 10am)
 | 7.[T][ ] homework
 | 8.[T][ ] other homework
 | 9.[T][ ] project 12
@@ -278,7 +278,7 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | That's going to happen at some time later:
-| [E][ ] wow  much  space (at: 10am)
+| [E][ ]  wow  much  space (at: 10am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
@@ -287,7 +287,7 @@
 | 3.[D][X] /at mysterious (by: [unknown])
 | 4.[D][X] /by mysterious number 2 (by: [unknown])
 | 5.[D][ ] rush this please (by: when?)
-| 6.[E][ ] wow  much  space (at: 10am)
+| 6.[E][ ]  wow  much  space (at: 10am)
 | 7.[T][ ] homework
 | 8.[T][ ] other homework
 | 9.[T][ ] project 12
@@ -297,7 +297,7 @@
 | 13.[D][ ] /at mysterious (by: [unknown])
 | 14.[D][ ] /by mysterious number 2 (by: [unknown])
 | 15.[D][ ] rush this please (by: when?)
-| 16.[E][ ] wow  much  space (at: 10am)
+| 16.[E][ ]  wow  much  space (at: 10am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | (>.<') Add a description to your find.
@@ -307,20 +307,9 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here are the tasks that you might be looking for:
-| 1.[E][X] meet people at function x/y/z whatever (at: 7:12am)
-| 2.[E][ ] meet friends (at: [unknown])
-| 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here are the tasks that you might be looking for:
-| 1.[T][ ] homework
-| 2.[E][X] meet people at function x/y/z whatever (at: 7:12am)
-| 3.[T][ ] homework
-| 4.[T][ ] other homework
-| 5.[E][ ] meet friends (at: [unknown])
-| 6.[E][ ] meet people at dinner (at: 6:25 pm)
-| 7.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | It was nice to have you around, I'm going back to sleep...
diff --git a/text-ui-test/duke.txt b/text-ui-test/duke.txt
index 78ee9ae569..8c67ce25ab 100644
--- a/text-ui-test/duke.txt
+++ b/text-ui-test/duke.txt
@@ -3,7 +3,7 @@
 /v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
 /v8ARABlAGEAZABsAGkAbgBl,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
 /v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
-/v8ARQB2AGUAbgB0,/v8AdwBvAHcAIAAgAG0AdQBjAGgAIAAgAHMAcABhAGMAZQ==,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
+/v8ARQB2AGUAbgB0,/v8AIAB3AG8AdwAgACAAbQB1AGMAaAAgACAAcwBwAGEAYwBl,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
 /v8AVABvAEQAbw==,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
 /v8AVABvAEQAbw==,/v8AbwB0AGgAZQByACAAaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
 /v8AVABvAEQAbw==,/v8AcAByAG8AagBlAGMAdAAgADEAMg==,/v8AZgBhAGwAcwBl
@@ -13,4 +13,4 @@
 /v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
 /v8ARABlAGEAZABsAGkAbgBl,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
 /v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
-/v8ARQB2AGUAbgB0,/v8AdwBvAHcAIAAgAG0AdQBjAGgAIAAgAHMAcABhAGMAZQ==,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
\ No newline at end of file
+/v8ARQB2AGUAbgB0,/v8AIAB3AG8AdwAgACAAbQB1AGMAaAAgACAAcwBwAGEAYwBl,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
\ No newline at end of file
diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat
index 8f94108629..e7eeab5370 100644
--- a/text-ui-test/runtest.bat
+++ b/text-ui-test/runtest.bat
@@ -18,7 +18,7 @@ REM delete data
 if exist duke.txt del duke.txt
 
 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
-java -classpath ..\bin duke.Duke < input.txt > ACTUAL.TXT
+java -classpath ..\bin duke.Duke console-test < input.txt > ACTUAL.TXT
 
 REM compare the output to the expected output
 FC ACTUAL.TXT EXPECTED.TXT
@@ -27,7 +27,7 @@ REM delete output from previous run
 if exist ACTUAL1.TXT del ACTUAL1.TXT
 
 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL1.TXT
-java -classpath ..\bin duke.Duke < input.txt > ACTUAL1.TXT
+java -classpath ..\bin duke.Duke console-test < input.txt > ACTUAL1.TXT
 
 REM compare the output to the expected output
 FC ACTUAL1.TXT EXPECTED1.TXT

From fee826fdf1ab8b9c867c23f847fe924da0dd7482 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 3 Sep 2022 16:32:40 +0800
Subject: [PATCH 30/67] Add GUI, still unsuccessful

---
 build.gradle                                  |   5 +-
 .../java/duke/{Ui.java => ConsoleUi.java}     |  12 ++-
 src/main/java/duke/Duke.java                  |  55 +++++-----
 src/main/java/duke/GuiHandler.java            |  32 ------
 src/main/java/duke/Parser.java                |  24 ++---
 src/main/java/duke/PrefixCommandMatcher.java  |   4 +-
 src/main/java/duke/Storage.java               |   2 +-
 src/main/java/duke/UiInterface.java           |  15 ++-
 src/main/java/duke/gui/DialogBox.java         |  61 +++++++++++
 src/main/java/duke/gui/GraphicUi.java         |  80 +++++++++++++++
 src/main/java/duke/gui/Launcher.java          |  12 +++
 src/main/java/duke/gui/Main.java              |  41 ++++++++
 src/main/java/duke/gui/MainWindow.java        |  97 ++++++++++++++++++
 src/main/java/duke/task/TaskFactory.java      |   3 +-
 src/main/java/duke/task/TaskList.java         |   5 +-
 src/main/resources/images/dukeImage.png       | Bin 0 -> 503 bytes
 src/main/resources/images/userImage.png       | Bin 0 -> 411 bytes
 src/main/resources/view/DialogBox.fxml        |  16 +++
 src/main/resources/view/MainWindow.fxml       |  19 ++++
 19 files changed, 395 insertions(+), 88 deletions(-)
 rename src/main/java/duke/{Ui.java => ConsoleUi.java} (76%)
 delete mode 100644 src/main/java/duke/GuiHandler.java
 create mode 100644 src/main/java/duke/gui/DialogBox.java
 create mode 100644 src/main/java/duke/gui/GraphicUi.java
 create mode 100644 src/main/java/duke/gui/Launcher.java
 create mode 100644 src/main/java/duke/gui/Main.java
 create mode 100644 src/main/java/duke/gui/MainWindow.java
 create mode 100644 src/main/resources/images/dukeImage.png
 create mode 100644 src/main/resources/images/userImage.png
 create mode 100644 src/main/resources/view/DialogBox.fxml
 create mode 100644 src/main/resources/view/MainWindow.fxml

diff --git a/build.gradle b/build.gradle
index 9210096bab..b11c3ab4db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,7 +48,7 @@ test {
 }
 
 application {
-    mainClassName = "duke.Duke"
+    mainClassName = "duke.gui.Launcher"
 }
 
 shadowJar {
@@ -56,6 +56,7 @@ shadowJar {
     archiveClassifier = null
 }
 
-run{
+run {
     standardInput = System.in
+    enableAssertions = true
 }
\ No newline at end of file
diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/ConsoleUi.java
similarity index 76%
rename from src/main/java/duke/Ui.java
rename to src/main/java/duke/ConsoleUi.java
index 259851f862..fd66fb1b5b 100644
--- a/src/main/java/duke/Ui.java
+++ b/src/main/java/duke/ConsoleUi.java
@@ -1,10 +1,20 @@
 package duke;
 
+import java.io.InputStreamReader;
+import java.io.Reader;
 
 /**
  * Handles console-based user interface. Used for sanity checks.
  */
-public class Ui implements UiInterface {
+public class ConsoleUi implements UiInterface {
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Reader getReader() {
+        return new InputStreamReader(System.in);
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
index 7ee68a1009..a95801c617 100644
--- a/src/main/java/duke/Duke.java
+++ b/src/main/java/duke/Duke.java
@@ -1,11 +1,12 @@
 package duke;
 
-import duke.task.Task;
-import duke.task.TaskList;
-
+import java.io.BufferedReader;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Optional;
-import java.util.Scanner;
+
+import duke.task.Task;
+import duke.task.TaskList;
 
 /**
  * The main method of the chatbot, as well as its startup and teardown.
@@ -13,29 +14,24 @@
 public class Duke {
     /** List of commands */
     private static ArrayList<CommandMatcher> commands;
-    private static UiInterface ui;
+    private static UiInterface ui = new ConsoleUi();
 
     /**
-     * Gets the current UiInterface for command line purposes.
+     * Sets the current UI.
      *
-     * @return UiInterface that helps display text to screen.
+     * @param ui The current UI to use.
      */
-    public static UiInterface getCurrentUi() {
-        return ui;
+    public static void setUi(UiInterface ui) {
+        Duke.ui = ui;
     }
 
-    private static Optional<Task> getTask(String index) {
-        try {
-            int idx = Integer.parseInt(index);
-            Task task = TaskList.getTaskList().get(idx - 1);
-            return Optional.of(task);
-        } catch (NumberFormatException ex) {
-            ui.printStyledMessage("Sorry, I didn't understand " + index + ", please give me a number.");
-            return Optional.empty();
-        } catch (IndexOutOfBoundsException ex) {
-            ui.printStyledMessage("Sorry, the number " + index + ", wasn't in the range.");
-            return Optional.empty();
-        }
+    /**
+     * Gets the current UI to interact with.
+     *
+     * @return UiInterface that helps display text to screen.
+     */
+    public static UiInterface getUi() {
+        return ui;
     }
 
     private static void handleCommand(String command) {
@@ -52,23 +48,22 @@ private static void handleCommand(String command) {
      * @param args Command line args which are not used.
      */
     public static void main(String[] args) {
-        // allow for console tests to run
-        if (args.length >= 1 && args[0].equals("console-test")) {
-            ui = new Ui();
-        } else {
-            ui = new GuiHandler();
-        }
-
         // initialization
         ui.greet();
         TaskList.initializeTaskList();
         commands = Parser.getCommands();
-        Scanner input = new Scanner(System.in);
+        BufferedReader input = new BufferedReader(ui.getReader());
 
         // main application logic
         boolean isStillRunning = true;
         while (isStillRunning) {
-            String command = input.nextLine();
+            String command;
+            try {
+                command = input.readLine();
+            } catch (IOException ex) {
+                System.out.println("IOException in application logic.");
+                throw new RuntimeException(ex);
+            }
             if (command.equals("bye")) {
                 isStillRunning = false;
             } else {
diff --git a/src/main/java/duke/GuiHandler.java b/src/main/java/duke/GuiHandler.java
deleted file mode 100644
index edb652391c..0000000000
--- a/src/main/java/duke/GuiHandler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package duke;
-
-/**
- * Used for GUI.
- */
-public class GuiHandler implements UiInterface {
-    /**
-     * Prints lines, when actually implemented.
-     *
-     * @param lines Line to be printed
-     */
-    @Override
-    public void printStyledMessage(String... lines) {
-        // stub
-    }
-
-    /**
-     * Greets user, when actually implemented.
-     */
-    @Override
-    public void greet() {
-        // stub
-    }
-
-    /**
-     * Leaves the user, when actually implemented.
-     */
-    @Override
-    public void leave() {
-        // stub
-    }
-}
diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index b176624af1..9bfa71fa0b 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -1,14 +1,14 @@
 package duke;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import duke.task.Deadline;
 import duke.task.Event;
 import duke.task.Task;
 import duke.task.TaskList;
 import duke.task.ToDo;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Handles creating commands through duke.CommandMatcher/duke.PrefixCommandMatcher.
  */
@@ -33,14 +33,14 @@ public static ArrayList<CommandMatcher> getCommands() {
 
         commands.add(new CommandMatcher((str) -> str.equals("list"), (str) -> {
             List<Task> tasks = TaskList.getTaskList();
-            Duke.getCurrentUi().printStyledMessage(
+            Duke.getUi().printStyledMessage(
                     listTasks("Here, your tasks:", tasks));
         }));
 
         commands.add(new PrefixCommandMatcher("mark", (str, map) -> {
             TaskList.getTask(str).ifPresent((task) -> {
                 task.markAsDone();
-                Duke.getCurrentUi().printStyledMessage(
+                Duke.getUi().printStyledMessage(
                         "Marked your task as done:",
                         task.toString());
             });
@@ -49,7 +49,7 @@ public static ArrayList<CommandMatcher> getCommands() {
         commands.add(new PrefixCommandMatcher("unmark", (str, map) -> {
             TaskList.getTask(str).ifPresent((task) -> {
                 task.markAsNotDone();
-                Duke.getCurrentUi().printStyledMessage(
+                Duke.getUi().printStyledMessage(
                         "Aw... it's not done yet:",
                         task.toString());
             });
@@ -58,7 +58,7 @@ public static ArrayList<CommandMatcher> getCommands() {
         commands.add(new PrefixCommandMatcher("deadline", (str, map) -> {
             Task task = new Deadline(str, map.getOrDefault("by", "[unknown]"));
             TaskList.getTaskList().add(task);
-            Duke.getCurrentUi().printStyledMessage(
+            Duke.getUi().printStyledMessage(
                     "Good luck with the deadline, here's the task:",
                     task.toString());
         }));
@@ -66,7 +66,7 @@ public static ArrayList<CommandMatcher> getCommands() {
         commands.add(new PrefixCommandMatcher("todo", (str, map) -> {
             Task task = new ToDo(str);
             TaskList.getTaskList().add(task);
-            Duke.getCurrentUi().printStyledMessage(
+            Duke.getUi().printStyledMessage(
                     "I've recorded this thing you need to do:",
                     task.toString());
         }));
@@ -74,7 +74,7 @@ public static ArrayList<CommandMatcher> getCommands() {
         commands.add(new PrefixCommandMatcher("event", (str, map) -> {
             Task task = new Event(str, map.getOrDefault("at", "[unknown]"));
             TaskList.getTaskList().add(task);
-            Duke.getCurrentUi().printStyledMessage(
+            Duke.getUi().printStyledMessage(
                     "That's going to happen at some time later:",
                     task.toString());
         }));
@@ -82,7 +82,7 @@ public static ArrayList<CommandMatcher> getCommands() {
         commands.add(new PrefixCommandMatcher("delete", (str, map) -> {
             TaskList.getTask(str).ifPresent((task) -> {
                 TaskList.getTaskList().remove(task);
-                Duke.getCurrentUi().printStyledMessage(
+                Duke.getUi().printStyledMessage(
                         "It seems you didn't need this task anymore, so I removed it:",
                         task.toString(),
                         String.format("You have %d tasks left.", TaskList.getTaskList().size()));
@@ -91,13 +91,13 @@ public static ArrayList<CommandMatcher> getCommands() {
 
         commands.add(new PrefixCommandMatcher("find", (str, map) -> {
             List<Task> tasks = TaskList.filterTasks(str);
-            Duke.getCurrentUi().printStyledMessage(
+            Duke.getUi().printStyledMessage(
                     listTasks("Here are the tasks that you might be looking for:", tasks));
         }));
 
         // default command matcher - add to list
         commands.add(new CommandMatcher((str) -> true, (str) -> {
-            Duke.getCurrentUi().printStyledMessage(
+            Duke.getUi().printStyledMessage(
                     "(>.<') I'm sorry, I don't really know what that means.");
         }));
 
diff --git a/src/main/java/duke/PrefixCommandMatcher.java b/src/main/java/duke/PrefixCommandMatcher.java
index 9c3fc0c506..705c0ba6e8 100644
--- a/src/main/java/duke/PrefixCommandMatcher.java
+++ b/src/main/java/duke/PrefixCommandMatcher.java
@@ -21,7 +21,7 @@ public PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String
 
             // corner case
             if (cmd.equals(prefix)) {
-                Duke.getCurrentUi().printStyledMessage(
+                Duke.getUi().printStyledMessage(
                         "(>.<') Add a description to your " + prefix + ".");
                 return;
             }
@@ -41,7 +41,7 @@ public PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String
 
             // another corner case
             if (commandParts[0].equals("")) {
-                Duke.getCurrentUi().printStyledMessage("(>.<') The description for " + prefix + " shouldn't be empty.");
+                Duke.getUi().printStyledMessage("(>.<') The description for " + prefix + " shouldn't be empty.");
                 return;
             }
 
diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java
index 064f1e4266..0700db4f00 100644
--- a/src/main/java/duke/Storage.java
+++ b/src/main/java/duke/Storage.java
@@ -90,7 +90,7 @@ public void saveLines(String[][] strings) {
             }
             writer.close();
         } catch (IOException ex) {
-            Duke.getCurrentUi().printStyledMessage(
+            Duke.getUi().printStyledMessage(
                     "(>.<') I was unable to record your tasks...");
             ex.printStackTrace();
         }
diff --git a/src/main/java/duke/UiInterface.java b/src/main/java/duke/UiInterface.java
index 8ee0e305f8..376ea33230 100644
--- a/src/main/java/duke/UiInterface.java
+++ b/src/main/java/duke/UiInterface.java
@@ -1,23 +1,32 @@
 package duke;
 
+import java.io.Reader;
+
 /**
  * Functions that a UI interface needs to implement.
  */
 public interface UiInterface {
+    /**
+     * Gives you the input stream to scan to interact with this interface.
+     *
+     * @return InputStream to scan.
+     */
+    Reader getReader();
+
     /**
      * Styles and prints lines with a border.
      *
      * @param lines Lines to be printed
      */
-    public void printStyledMessage(String... lines);
+    void printStyledMessage(String... lines);
 
     /**
      * Greets user.
      */
-    public void greet();
+    void greet();
 
     /**
      * Leaves the user.
      */
-    public void leave();
+    void leave();
 }
diff --git a/src/main/java/duke/gui/DialogBox.java b/src/main/java/duke/gui/DialogBox.java
new file mode 100644
index 0000000000..414d52690e
--- /dev/null
+++ b/src/main/java/duke/gui/DialogBox.java
@@ -0,0 +1,61 @@
+package duke.gui;
+
+import java.io.IOException;
+import java.util.Collections;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+
+/**
+ * An example of a custom control using FXML.
+ * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label
+ * containing text from the speaker.
+ */
+public class DialogBox extends HBox {
+    @FXML
+    private Label dialog;
+    @FXML
+    private ImageView displayPicture;
+
+    private DialogBox(String text, Image img) {
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml"));
+            fxmlLoader.setController(this);
+            fxmlLoader.setRoot(this);
+            fxmlLoader.load();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        dialog.setText(text);
+        displayPicture.setImage(img);
+    }
+
+    /**
+     * Flips the dialog box such that the ImageView is on the left and text on the right.
+     */
+    private void flip() {
+        ObservableList<Node> tmp = FXCollections.observableArrayList(this.getChildren());
+        Collections.reverse(tmp);
+        getChildren().setAll(tmp);
+        setAlignment(Pos.TOP_LEFT);
+    }
+
+    public static DialogBox getUserDialog(String text, Image img) {
+        return new DialogBox(text, img);
+    }
+
+    public static DialogBox getDukeDialog(String text, Image img) {
+        var db = new DialogBox(text, img);
+        db.flip();
+        return db;
+    }
+}
diff --git a/src/main/java/duke/gui/GraphicUi.java b/src/main/java/duke/gui/GraphicUi.java
new file mode 100644
index 0000000000..28e9740b2f
--- /dev/null
+++ b/src/main/java/duke/gui/GraphicUi.java
@@ -0,0 +1,80 @@
+package duke.gui;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.PipedReader;
+import java.io.PipedWriter;
+import java.io.Reader;
+
+import duke.UiInterface;
+
+/**
+ * Used for GUI.
+ */
+public class GraphicUi implements UiInterface {
+    private static PipedWriter writer = new PipedWriter();
+    private static final BufferedWriter bufferedWriter = new BufferedWriter(writer);
+
+    /**
+     * Gets writer that writes out of application logic into GUI.
+     *
+     * @return Writer from application logic.
+     */
+    public static PipedWriter getWriter() {
+        return writer;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Reader getReader() {
+        try {
+            return new PipedReader(MainWindow.getWriter());
+        } catch (IOException e) {
+            System.out.println("Error: Did not obtain GUI reader.");
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Prints lines.
+     *
+     * @param lines Line to be printed
+     */
+    @Override
+    public void printStyledMessage(String... lines) {
+        StringBuilder result = new StringBuilder();
+        for (String line : lines) {
+            result.append(line);
+            result.append('\n');
+        }
+        result.append('\n');
+        try {
+            bufferedWriter.write(result.toString(), 0, result.length());
+            bufferedWriter.flush();
+        } catch (IOException e) {
+            System.out.println("Error: Cannot write output.");
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void greet() {
+        printStyledMessage("...where is this again?",
+                "Oh, hello, I didn't see you there - I'm Anthea, a chatbot...",
+                "...or at least that's what they told me.");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void leave() {
+        printStyledMessage("It was nice to have you around, I'm going back to sleep...",
+                "(close the window yourself)");
+    }
+}
diff --git a/src/main/java/duke/gui/Launcher.java b/src/main/java/duke/gui/Launcher.java
new file mode 100644
index 0000000000..379b564819
--- /dev/null
+++ b/src/main/java/duke/gui/Launcher.java
@@ -0,0 +1,12 @@
+package duke.gui;
+
+import javafx.application.Application;
+
+/**
+ * A launcher class to workaround classpath issues.
+ */
+public class Launcher {
+    public static void main(String[] args) {
+        Application.launch(Main.class, args);
+    }
+}
diff --git a/src/main/java/duke/gui/Main.java b/src/main/java/duke/gui/Main.java
new file mode 100644
index 0000000000..aaf83d7a11
--- /dev/null
+++ b/src/main/java/duke/gui/Main.java
@@ -0,0 +1,41 @@
+package duke.gui;
+
+import java.io.IOException;
+
+import duke.Duke;
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.layout.AnchorPane;
+import javafx.stage.Stage;
+
+/**
+ * A GUI for Duke using FXML.
+ */
+public class Main extends Application {
+    /**
+     * Start the application and Duke logic.
+     *
+     * @param stage JavaFX stage.
+     */
+    @Override
+    public void start(Stage stage) {
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml"));
+            AnchorPane ap = fxmlLoader.load();
+            Scene scene = new Scene(ap);
+            stage.setScene(scene);
+            // Start application logic in thread
+            Thread appLogic = new Thread("appLogic") {
+                @Override
+                public void run() {
+                    Duke.main(new String[]{});
+                }
+            };
+            appLogic.start();
+            stage.show();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/java/duke/gui/MainWindow.java b/src/main/java/duke/gui/MainWindow.java
new file mode 100644
index 0000000000..a3f3344ebf
--- /dev/null
+++ b/src/main/java/duke/gui/MainWindow.java
@@ -0,0 +1,97 @@
+package duke.gui;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PipedReader;
+import java.io.PipedWriter;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.VBox;
+
+/**
+ * Controller for MainWindow. Provides the layout for the other controls.
+ */
+public class MainWindow extends AnchorPane {
+    /**
+     * GUI writes to here.
+     */
+    private static final PipedWriter writer = new PipedWriter();
+    /**
+     * GUI reads from here.
+     */
+    private static BufferedReader reader;
+
+    @FXML
+    private ScrollPane scrollPane;
+    @FXML
+    private VBox dialogContainer;
+    @FXML
+    private TextField userInput;
+    @FXML
+    private Button sendButton;
+
+    private final Image userImage = new Image(
+            this.getClass().getResourceAsStream("/images/userImage.png"),
+            96, 96, false, true);
+    private final Image dukeImage = new Image(
+            this.getClass().getResourceAsStream("/images/dukeImage.png"),
+            96, 96, false, true);
+
+    /**
+     * Get the writer that writes out GUI interactions.
+     *
+     * @return The writer that writes out GUI interactions.
+     */
+    public static PipedWriter getWriter() {
+        return writer;
+    }
+
+    @FXML
+    private void initialize() {
+        try {
+            reader = new BufferedReader(new PipedReader(GraphicUi.getWriter()));
+        } catch (IOException e) {
+            System.out.println("Cannot initialize GUI output reader.");
+            throw new RuntimeException(e);
+        }
+        scrollPane.vvalueProperty().bind(dialogContainer.heightProperty());
+    }
+
+    /**
+     * Creates two dialog boxes, one echoing user input and the other containing Duke's reply and then appends them to
+     * the dialog container. Clears the user input after processing.
+     */
+    @FXML
+    private void handleUserInput() {
+        String input = userInput.getText();
+        dialogContainer.getChildren().addAll(
+                DialogBox.getUserDialog(input, userImage)
+        );
+        userInput.clear();
+        try {
+            writer.write(input);
+            StringBuilder result = new StringBuilder();
+            while (true) {
+                String line = reader.readLine();
+                if (line.length() == 0) {
+                    break;
+                }
+                result.append(reader.readLine());
+                result.append('\n');
+            }
+            String response = result.substring(0, result.length() - 1);
+            dialogContainer.getChildren().addAll(
+                    DialogBox.getDukeDialog(response, dukeImage)
+            );
+        } catch (IOException ex) {
+            dialogContainer.getChildren().addAll(
+                    DialogBox.getDukeDialog(String.format("I did not manage to read that:\n%s", input), dukeImage)
+            );
+        }
+    }
+}
diff --git a/src/main/java/duke/task/TaskFactory.java b/src/main/java/duke/task/TaskFactory.java
index d6bb4c0d2e..26dd7a31c3 100644
--- a/src/main/java/duke/task/TaskFactory.java
+++ b/src/main/java/duke/task/TaskFactory.java
@@ -3,7 +3,6 @@
 import java.util.Optional;
 
 import duke.Duke;
-import duke.Ui;
 
 /**
  * Constructs tasks from strings
@@ -45,7 +44,7 @@ public static Optional<Task> constructOptionalTask(String[] taskData) {
         try {
             return Optional.of(constructTask(taskData));
         } catch (IllegalArgumentException ex) {
-            Duke.getCurrentUi().printStyledMessage(
+            Duke.getUi().printStyledMessage(
                     "(>.<') did not understand this task - dropping it",
                     String.join(", ", taskData));
             return Optional.empty();
diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java
index 73eee897f2..906dce4718 100644
--- a/src/main/java/duke/task/TaskList.java
+++ b/src/main/java/duke/task/TaskList.java
@@ -6,7 +6,6 @@
 import java.util.stream.Collectors;
 
 import duke.Duke;
-import duke.Ui;
 
 /**
  * Holds the list of tasks
@@ -41,11 +40,11 @@ public static Optional<Task> getTask(String index) {
             Task task = taskList.get(idx - 1);
             return Optional.of(task);
         } catch (NumberFormatException ex) {
-            Duke.getCurrentUi().printStyledMessage(
+            Duke.getUi().printStyledMessage(
                     "Sorry, I didn't understand " + index + ", please give me a number.");
             return Optional.empty();
         } catch (IndexOutOfBoundsException ex) {
-            Duke.getCurrentUi().printStyledMessage(
+            Duke.getUi().printStyledMessage(
                     "Sorry, the number " + index + ", wasn't in the range.");
             return Optional.empty();
         }
diff --git a/src/main/resources/images/dukeImage.png b/src/main/resources/images/dukeImage.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b1e1079ada4c64a7fc1dba5509ef0adea53d671
GIT binary patch
literal 503
zcmV<T0SNwyP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0gOpRK~z{r#g>hZ
zgD?z(VekLWck?zQW1O_Wq<vDgG|i7w;B@QXljVmzKEEaFx_+#4%;voWRKZu9lP;fU
z+YNXy_g9|~^O6Yly#!RjcVCZG*9Y5fK!aV#9drn94t6i09;p2dQgg5q02uJCThKab
zsNLUz)KrsZMRh~Ch)n>3t7h=~d51Uly1G9+0+7V`Ug;Xb_H$+T6)=!C3u!_11K%rN
zC&eDV0tBh838Ouz@>48`Ujc$yh<E`n&R=f=U-Faq4lr1g)Mi08rp*}j>u(|oa9EIN
zVHZJrmZ1QhETLz#Rj>+6l>d-;<5VOyB%WKenG?_zsF=-<kDyijJWEvm5x3ug3gl3f
z+RoHhKv=|!B|q%0F*yieVgi0HCHXz3;?xbCfs>DfToT~dI=W`wYKm(GREhL)`IJ>&
zV)_QW7#eUXNs#ZAX#ptGO@uQxXWS?U>;$kt1q-HyGv-!}lfS(ICa^HUUe_I_9s#FJ
tVgP&^gGG2&(F#B!r%a8VGqG=$<sS``d_6_&25|rY002ovPDHLkV1n#G(Cq*K

literal 0
HcmV?d00001

diff --git a/src/main/resources/images/userImage.png b/src/main/resources/images/userImage.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f7edd8f1d593ef3440e97d98b6fc0133b3c286d
GIT binary patch
literal 411
zcmV;M0c8G(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0We8KK~z{r#gst~
z!ypU<L;wHhww5}TvoYAtfsBMmBJga%>Ue)S9_00#w=l-|57-vKq;}X0LTn2#yXmc0
z0Gx)gJ%E=RkDP#KdjRc)N3OtA{v*<jO0mp^GyvjEP+g}iuYiuFXmko*Y$IB;Vj2KB
z=sT#i8zKyl$yLymdM*J}W>muX5S>724=_NB-xWjJ1B_}2h`vQkdw_XXWG1MJAq-$e
z{IG&iVgF5^tE4?(Xh97E8dBdQmH{HHp#EBwc33u{pCJ?I`ixTm+l;_w2Jp-}Wd6C!
z?JH3D)(vwC5N+0XFR#e5HQ@=^28I`AAgTm|O8|s6M{+IfWgRiJdccZDp(3hb!T`G2
zo-;Y?yQeTc0SaZ}73^DuT3&%|tjfJ)B~)5H(4iLmI6hcC5kz3tfu{ff002ovPDHLk
FV1n@<qACCY

literal 0
HcmV?d00001

diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml
new file mode 100644
index 0000000000..aa389b8a06
--- /dev/null
+++ b/src/main/resources/view/DialogBox.fxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.HBox?>
+
+<fx:root alignment="TOP_RIGHT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefWidth="400.0" type="javafx.scene.layout.HBox" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
+    <children>
+        <Label fx:id="dialog" text="Label" wrapText="true" />
+        <ImageView fx:id="displayPicture" fitHeight="96.0" fitWidth="96.0" pickOnBounds="true" preserveRatio="true" />
+    </children>
+    <padding>
+        <Insets bottom="15.0" left="5.0" right="5.0" top="15.0" />
+    </padding>
+</fx:root>
\ No newline at end of file
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
new file mode 100644
index 0000000000..de92974e28
--- /dev/null
+++ b/src/main/resources/view/MainWindow.fxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.VBox?>
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="duke.gui.MainWindow">
+    <children>
+        <TextField fx:id="userInput" layoutY="558.0" onAction="#handleUserInput" prefHeight="41.0" prefWidth="324.0" AnchorPane.bottomAnchor="1.0" />
+        <Button fx:id="sendButton" layoutX="324.0" layoutY="558.0" mnemonicParsing="false" onAction="#handleUserInput" prefHeight="41.0" prefWidth="76.0" text="Send" />
+        <ScrollPane fx:id="scrollPane" hbarPolicy="NEVER" hvalue="1.0" prefHeight="557.0" prefWidth="400.0" vvalue="1.0">
+            <content>
+                <VBox fx:id="dialogContainer" prefHeight="552.0" prefWidth="388.0" />
+            </content>
+        </ScrollPane>
+    </children>
+</AnchorPane>
\ No newline at end of file

From f8b09b244a8b4a75b5d78ce5c0c7d0de6f1ca667 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 3 Sep 2022 16:43:04 +0800
Subject: [PATCH 31/67] Add some modifications to see what is going on

Currently the text-ui-test is working, but running within IntelliJ fails.
---
 build.gradle                          | 1 -
 src/main/java/duke/Duke.java          | 2 --
 src/main/java/duke/gui/GraphicUi.java | 2 +-
 src/main/java/duke/gui/Main.java      | 1 +
 text-ui-test/runtest.bat              | 4 ++--
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index b11c3ab4db..e5350ece9d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,5 +58,4 @@ shadowJar {
 
 run {
     standardInput = System.in
-    enableAssertions = true
 }
\ No newline at end of file
diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
index a95801c617..0c351985c9 100644
--- a/src/main/java/duke/Duke.java
+++ b/src/main/java/duke/Duke.java
@@ -3,9 +3,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Optional;
 
-import duke.task.Task;
 import duke.task.TaskList;
 
 /**
diff --git a/src/main/java/duke/gui/GraphicUi.java b/src/main/java/duke/gui/GraphicUi.java
index 28e9740b2f..981a7e5441 100644
--- a/src/main/java/duke/gui/GraphicUi.java
+++ b/src/main/java/duke/gui/GraphicUi.java
@@ -12,7 +12,7 @@
  * Used for GUI.
  */
 public class GraphicUi implements UiInterface {
-    private static PipedWriter writer = new PipedWriter();
+    private static final PipedWriter writer = new PipedWriter();
     private static final BufferedWriter bufferedWriter = new BufferedWriter(writer);
 
     /**
diff --git a/src/main/java/duke/gui/Main.java b/src/main/java/duke/gui/Main.java
index aaf83d7a11..ecbcf8da6f 100644
--- a/src/main/java/duke/gui/Main.java
+++ b/src/main/java/duke/gui/Main.java
@@ -29,6 +29,7 @@ public void start(Stage stage) {
             Thread appLogic = new Thread("appLogic") {
                 @Override
                 public void run() {
+                    Duke.setUi(new GraphicUi());
                     Duke.main(new String[]{});
                 }
             };
diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat
index e7eeab5370..8f94108629 100644
--- a/text-ui-test/runtest.bat
+++ b/text-ui-test/runtest.bat
@@ -18,7 +18,7 @@ REM delete data
 if exist duke.txt del duke.txt
 
 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
-java -classpath ..\bin duke.Duke console-test < input.txt > ACTUAL.TXT
+java -classpath ..\bin duke.Duke < input.txt > ACTUAL.TXT
 
 REM compare the output to the expected output
 FC ACTUAL.TXT EXPECTED.TXT
@@ -27,7 +27,7 @@ REM delete output from previous run
 if exist ACTUAL1.TXT del ACTUAL1.TXT
 
 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL1.TXT
-java -classpath ..\bin duke.Duke console-test < input.txt > ACTUAL1.TXT
+java -classpath ..\bin duke.Duke < input.txt > ACTUAL1.TXT
 
 REM compare the output to the expected output
 FC ACTUAL1.TXT EXPECTED1.TXT

From eac0d68d42b31b7fc19a0d0d194a8e8570960be0 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 3 Sep 2022 18:17:14 +0800
Subject: [PATCH 32/67] Add GUI, this time it can run by directly running the
 Launcher class

---
 src/main/java/duke/Duke.java            |   2 ++
 src/main/java/duke/gui/GraphicUi.java   |   2 ++
 src/main/java/duke/gui/Main.java        |   2 ++
 src/main/java/duke/gui/MainWindow.java  |  28 +++++++++++++++++++++---
 src/main/resources/images/dukeImage.png | Bin 503 -> 510 bytes
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
index 0c351985c9..0bcdd7029c 100644
--- a/src/main/java/duke/Duke.java
+++ b/src/main/java/duke/Duke.java
@@ -57,7 +57,9 @@ public static void main(String[] args) {
         while (isStillRunning) {
             String command;
             try {
+                //System.out.println("Ready to read input");
                 command = input.readLine();
+                //System.out.printf("Read %s\n", command);
             } catch (IOException ex) {
                 System.out.println("IOException in application logic.");
                 throw new RuntimeException(ex);
diff --git a/src/main/java/duke/gui/GraphicUi.java b/src/main/java/duke/gui/GraphicUi.java
index 981a7e5441..a17139933a 100644
--- a/src/main/java/duke/gui/GraphicUi.java
+++ b/src/main/java/duke/gui/GraphicUi.java
@@ -51,8 +51,10 @@ public void printStyledMessage(String... lines) {
         }
         result.append('\n');
         try {
+            System.out.printf("Tried to write:\n%s\n", result);
             bufferedWriter.write(result.toString(), 0, result.length());
             bufferedWriter.flush();
+            System.out.println("Written.");
         } catch (IOException e) {
             System.out.println("Error: Cannot write output.");
             throw new RuntimeException(e);
diff --git a/src/main/java/duke/gui/Main.java b/src/main/java/duke/gui/Main.java
index ecbcf8da6f..5216aa6647 100644
--- a/src/main/java/duke/gui/Main.java
+++ b/src/main/java/duke/gui/Main.java
@@ -29,11 +29,13 @@ public void start(Stage stage) {
             Thread appLogic = new Thread("appLogic") {
                 @Override
                 public void run() {
+                    System.out.println("Starting app logic");
                     Duke.setUi(new GraphicUi());
                     Duke.main(new String[]{});
                 }
             };
             appLogic.start();
+            fxmlLoader.<MainWindow>getController().getOutput();
             stage.show();
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/src/main/java/duke/gui/MainWindow.java b/src/main/java/duke/gui/MainWindow.java
index a3f3344ebf..6f739a737f 100644
--- a/src/main/java/duke/gui/MainWindow.java
+++ b/src/main/java/duke/gui/MainWindow.java
@@ -1,6 +1,7 @@
 package duke.gui;
 
 import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.PipedReader;
 import java.io.PipedWriter;
@@ -21,6 +22,8 @@ public class MainWindow extends AnchorPane {
      * GUI writes to here.
      */
     private static final PipedWriter writer = new PipedWriter();
+
+    private static final BufferedWriter bufferedWriter = new BufferedWriter(writer);
     /**
      * GUI reads from here.
      */
@@ -73,15 +76,34 @@ private void handleUserInput() {
                 DialogBox.getUserDialog(input, userImage)
         );
         userInput.clear();
+        System.out.println("User input detected");
+        System.out.println(input);
+        try {
+            bufferedWriter.write(input);
+            bufferedWriter.newLine();
+            bufferedWriter.flush();
+        } catch (IOException ex) {
+            dialogContainer.getChildren().addAll(
+                    DialogBox.getDukeDialog(String.format(
+                            "I did not manage to send that to application logic:\n%s",
+                            input), dukeImage)
+            );
+        }
+        getOutput();
+    }
+
+    /**
+     * Gets output. Used for first message too.
+     */
+    public void getOutput() {
         try {
-            writer.write(input);
             StringBuilder result = new StringBuilder();
             while (true) {
                 String line = reader.readLine();
                 if (line.length() == 0) {
                     break;
                 }
-                result.append(reader.readLine());
+                result.append(line);
                 result.append('\n');
             }
             String response = result.substring(0, result.length() - 1);
@@ -90,7 +112,7 @@ private void handleUserInput() {
             );
         } catch (IOException ex) {
             dialogContainer.getChildren().addAll(
-                    DialogBox.getDukeDialog(String.format("I did not manage to read that:\n%s", input), dukeImage)
+                    DialogBox.getDukeDialog("I did not manage to read it...", dukeImage)
             );
         }
     }
diff --git a/src/main/resources/images/dukeImage.png b/src/main/resources/images/dukeImage.png
index 8b1e1079ada4c64a7fc1dba5509ef0adea53d671..771ef82dcebffddcb37686ca6706e4560b93a2d6 100644
GIT binary patch
delta 434
zcmV;j0Zsn*1O5Y$R)3R8L_t(oN5z(bj>8}fL)-iRf4-e}bLF}wfo{^Cga{#V0%Ozm
z-#@l5^7ER9?EC(*)|kzEHZTglTbxw++&gZ-gSo!@2{A7<p}uDWqu_U+N7D6!9XFuC
z-pD)XA-p&^Jwn}3`xB(%;M4$Mz^86Ob<&|uzXPeLCe1cg9e=``I2u6ks2KddU*Uya
zSJ#)10HkJotyBeJ`@VAe7BG-Dg;Y@ez}JfFq}a>106}VNLbnE^{1gk~w*bKuA}-+K
zoV^Hq$xq@NV6Y~sO+gl>%^3CToQMrL6eKF_P0*gDZ9q?!&^_APur`)x8&FXnr1E#f
ze?&-R=Q^*TIe%6D)EiJBmKgav$_DP99x&H!XXyqg;$q1Ud#3SA15ETH0DcZ7`DrH|
zW%&)v(iJAd2K<zYi&w><gMH3UdjlzvJ`Qh|KF>>(4XA*Np#X=H8uGO={RSXXod|m@
z&bTfIT>cX>N!+LPNKoT}Yxzvt8}I~xwT>A^aj^jeqbo3h&5?u{uY<UjGrR#NV&>>r
ciT!8W9zxHBN%Y&M>Hq)$07*qoM6N<$f?o#GZU6uP

delta 427
zcmV;c0aX6}1NQ@vR)361L_t(oN5z(nj)O1^gJJLg&Uf=RBV(Mjz@&XrwKUC-Q{Z&#
z-;?EsJU+iA>$-ldbIj(w1XRISo0Be|XWI>UF!xuV5c84<^}PgC!FOMeRM!XFZa{-w
z$Q^VDZw_`Zp&qFH4N`Nk695?Sty|DKX{g=bfz(u!W<_;FxPORE0D`M#@cVg(H}<-^
zKRg1E#Q0w68p8H-W%m^@kTwfxLG=UQD_$qX9=-wusjUg4J*e_iEQntLf?0@o0WZ#9
zZvtQPllTrWSd-LdK{lq%81?IKA_{O=kZ55SL3@^=0G%wMXS7wY3QLs#ka*)%BsC<S
zTeO)I&=shd&3})NpjG@lOH}?5x8H#Z<WQ8_&eT^xSj3AZKkTkCIS6240)8$f`8}rM
z)D4`0laGX465!W5x@O*LifaW_iS%*#lvQ40`Uboh8gMB|knfdg0VvW<gflj0+$aa^
z1h7B_3#NrL=2nf9zr6t_urR@1*Bz!F0jEr20DKyQMI?Au(F#B!r%a8VGqG=$<sS``
Vd_6_&25|rY002ovPDHLkV1hO}!@K|h


From 1b6800deb86eab38d3fdf6eaac5dcc82025cc0b9 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sun, 4 Sep 2022 06:45:48 +0800
Subject: [PATCH 33/67] Enable assertions

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index e5350ece9d..b11c3ab4db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,4 +58,5 @@ shadowJar {
 
 run {
     standardInput = System.in
+    enableAssertions = true
 }
\ No newline at end of file

From da207d2fbb3716ed2bb07b264361504b5f5e1449 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sun, 4 Sep 2022 11:04:19 +0800
Subject: [PATCH 34/67] Reorder classes for JUnit Tests

CheckStyle is important. However, CheckStyle seems to be giving warnings
on these class ordering. Gradle build seems to require these lines be
correctly ordered.

By changing these lines, Gradle is able to build .jar files.
---
 src/test/java/duke/task/DeadlineTest.java | 4 ++--
 src/test/java/duke/task/EventTest.java    | 4 ++--
 src/test/java/duke/task/TaskTest.java     | 5 ++---
 src/test/java/duke/task/ToDoTest.java     | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/test/java/duke/task/DeadlineTest.java b/src/test/java/duke/task/DeadlineTest.java
index cce58c8a1c..c5a7613cff 100644
--- a/src/test/java/duke/task/DeadlineTest.java
+++ b/src/test/java/duke/task/DeadlineTest.java
@@ -1,10 +1,10 @@
 package duke.task;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 public class DeadlineTest {
     @Test
     public void getAsStringArray_makingObjects_normalBehavior() {
diff --git a/src/test/java/duke/task/EventTest.java b/src/test/java/duke/task/EventTest.java
index 6f017c68c6..9e33fc7662 100644
--- a/src/test/java/duke/task/EventTest.java
+++ b/src/test/java/duke/task/EventTest.java
@@ -1,10 +1,10 @@
 package duke.task;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 public class EventTest {
     @Test
     public void getAsStringArray_makingObjects_normalBehavior() {
diff --git a/src/test/java/duke/task/TaskTest.java b/src/test/java/duke/task/TaskTest.java
index d34aee8247..5742d6685d 100644
--- a/src/test/java/duke/task/TaskTest.java
+++ b/src/test/java/duke/task/TaskTest.java
@@ -1,11 +1,10 @@
 package duke.task;
 
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 public class TaskTest {
     @Test
     public void markAsDone_togglingDoneAndNotDone_normalBehavior() {
diff --git a/src/test/java/duke/task/ToDoTest.java b/src/test/java/duke/task/ToDoTest.java
index 88716b1f2a..f2fb5cf69b 100644
--- a/src/test/java/duke/task/ToDoTest.java
+++ b/src/test/java/duke/task/ToDoTest.java
@@ -1,10 +1,10 @@
 package duke.task;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 public class ToDoTest {
     @Test
     public void getAsStringArray_makingObjects_normalBehavior() {

From 638bdb0376b079598f8642cf15627e70814ebc00 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sun, 4 Sep 2022 17:14:40 +0800
Subject: [PATCH 35/67] Add configuration in build.gradle

This aims to help make it run.
---
 build.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build.gradle b/build.gradle
index b11c3ab4db..aa513d9dbb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'application'
     id 'com.github.johnrengelman.shadow' version '5.1.0'
     id 'checkstyle'
+    id 'org.openjfx.javafxplugin' version '0.0.10'
 }
 
 checkstyle {
@@ -59,4 +60,9 @@ shadowJar {
 run {
     standardInput = System.in
     enableAssertions = true
+}
+
+javafx {
+    version = "11.0.2"
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
 }
\ No newline at end of file

From 8e185e6350da54daef159a1276326d2f012a4ebe Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sun, 4 Sep 2022 17:18:34 +0800
Subject: [PATCH 36/67] Standardize error messages and improve documentation

Currently error messages are not very standardized.

The console needs to be used for useful messages. The console can get
messy when adding more error messages to the console if error messages
are not standardized.

Let's standardize the error message by ending it with "- terminating"
and throwing a RuntimeException which is not caught so that it can
fail quickly.
---
 src/main/java/duke/Duke.java           | 4 +---
 src/main/java/duke/gui/GraphicUi.java  | 6 ++----
 src/main/java/duke/gui/Launcher.java   | 5 +++++
 src/main/java/duke/gui/Main.java       | 1 -
 src/main/java/duke/gui/MainWindow.java | 4 +---
 src/main/java/duke/task/Task.java      | 2 +-
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
index 0bcdd7029c..d25d922f45 100644
--- a/src/main/java/duke/Duke.java
+++ b/src/main/java/duke/Duke.java
@@ -57,11 +57,9 @@ public static void main(String[] args) {
         while (isStillRunning) {
             String command;
             try {
-                //System.out.println("Ready to read input");
                 command = input.readLine();
-                //System.out.printf("Read %s\n", command);
             } catch (IOException ex) {
-                System.out.println("IOException in application logic.");
+                System.out.println("IOException in application logic - terminating");
                 throw new RuntimeException(ex);
             }
             if (command.equals("bye")) {
diff --git a/src/main/java/duke/gui/GraphicUi.java b/src/main/java/duke/gui/GraphicUi.java
index a17139933a..571493f61f 100644
--- a/src/main/java/duke/gui/GraphicUi.java
+++ b/src/main/java/duke/gui/GraphicUi.java
@@ -32,7 +32,7 @@ public Reader getReader() {
         try {
             return new PipedReader(MainWindow.getWriter());
         } catch (IOException e) {
-            System.out.println("Error: Did not obtain GUI reader.");
+            System.out.println("Did not obtain GUI reader - terminating");
             throw new RuntimeException(e);
         }
     }
@@ -51,12 +51,10 @@ public void printStyledMessage(String... lines) {
         }
         result.append('\n');
         try {
-            System.out.printf("Tried to write:\n%s\n", result);
             bufferedWriter.write(result.toString(), 0, result.length());
             bufferedWriter.flush();
-            System.out.println("Written.");
         } catch (IOException e) {
-            System.out.println("Error: Cannot write output.");
+            System.out.println("Cannot write output - terminating");
             throw new RuntimeException(e);
         }
     }
diff --git a/src/main/java/duke/gui/Launcher.java b/src/main/java/duke/gui/Launcher.java
index 379b564819..11089230d1 100644
--- a/src/main/java/duke/gui/Launcher.java
+++ b/src/main/java/duke/gui/Launcher.java
@@ -6,6 +6,11 @@
  * A launcher class to workaround classpath issues.
  */
 public class Launcher {
+    /**
+     * Launches the GUI application.
+     *
+     * @param args Ignored arguments.
+     */
     public static void main(String[] args) {
         Application.launch(Main.class, args);
     }
diff --git a/src/main/java/duke/gui/Main.java b/src/main/java/duke/gui/Main.java
index 5216aa6647..ed34703a04 100644
--- a/src/main/java/duke/gui/Main.java
+++ b/src/main/java/duke/gui/Main.java
@@ -29,7 +29,6 @@ public void start(Stage stage) {
             Thread appLogic = new Thread("appLogic") {
                 @Override
                 public void run() {
-                    System.out.println("Starting app logic");
                     Duke.setUi(new GraphicUi());
                     Duke.main(new String[]{});
                 }
diff --git a/src/main/java/duke/gui/MainWindow.java b/src/main/java/duke/gui/MainWindow.java
index 6f739a737f..b97308cf90 100644
--- a/src/main/java/duke/gui/MainWindow.java
+++ b/src/main/java/duke/gui/MainWindow.java
@@ -59,7 +59,7 @@ private void initialize() {
         try {
             reader = new BufferedReader(new PipedReader(GraphicUi.getWriter()));
         } catch (IOException e) {
-            System.out.println("Cannot initialize GUI output reader.");
+            System.out.println("Cannot initialize GUI output reader - terminating");
             throw new RuntimeException(e);
         }
         scrollPane.vvalueProperty().bind(dialogContainer.heightProperty());
@@ -76,8 +76,6 @@ private void handleUserInput() {
                 DialogBox.getUserDialog(input, userImage)
         );
         userInput.clear();
-        System.out.println("User input detected");
-        System.out.println(input);
         try {
             bufferedWriter.write(input);
             bufferedWriter.newLine();
diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java
index dffc895d7c..80e63f222a 100644
--- a/src/main/java/duke/task/Task.java
+++ b/src/main/java/duke/task/Task.java
@@ -1,7 +1,7 @@
 package duke.task;
 
 /**
- * A task stores the state and description of a task.
+ * A task stores its state and description.
  */
 public class Task {
     private static final char MARKER_DONE = 'X';

From fc861dda7b481b6a4647ef3fc0b9d42ce1cbf3fa Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Fri, 9 Sep 2022 22:39:45 +0800
Subject: [PATCH 37/67] Add DukeException class and DukeResponse class

The code is messy. It is unclear if messages are only printed once to
the output of the chatbot.

A DukeResponse class is better designed because it would ensure the
output is only printed once. Also, it separates the Ui classes from the
commands.

Let's,
* add a DukeResponse class that handles outputs
* add a DukeException class that handles exceptional outputs
* modify all the commands to use DukeResponse and DukeException
* add lambda classes which throw DukeException to keep using lambdas
---
 src/main/java/duke/CommandMatcher.java        |  34 ++++--
 src/main/java/duke/Duke.java                  |  12 +-
 src/main/java/duke/DukeException.java         |  29 +++++
 .../java/duke/DukeExceptionBiFunction.java    |  47 ++++++++
 src/main/java/duke/DukeExceptionFunction.java |  46 ++++++++
 src/main/java/duke/DukeResponse.java          |  42 +++++++
 src/main/java/duke/Parser.java                | 110 ++++++++++++------
 src/main/java/duke/PrefixCommandMatcher.java  |  76 +++++++-----
 src/main/java/duke/Storage.java               |   2 +
 src/main/java/duke/task/Deadline.java         |   4 +-
 src/main/java/duke/task/TaskList.java         |  22 ++--
 11 files changed, 325 insertions(+), 99 deletions(-)
 create mode 100644 src/main/java/duke/DukeException.java
 create mode 100644 src/main/java/duke/DukeExceptionBiFunction.java
 create mode 100644 src/main/java/duke/DukeExceptionFunction.java
 create mode 100644 src/main/java/duke/DukeResponse.java

diff --git a/src/main/java/duke/CommandMatcher.java b/src/main/java/duke/CommandMatcher.java
index f8f106fb7c..3503f3c3bb 100644
--- a/src/main/java/duke/CommandMatcher.java
+++ b/src/main/java/duke/CommandMatcher.java
@@ -1,6 +1,7 @@
 package duke;
 
-import java.util.function.Consumer;
+import java.util.Optional;
+import java.util.function.Function;
 import java.util.function.Predicate;
 
 /**
@@ -9,7 +10,7 @@
  */
 public class CommandMatcher {
     private Predicate<String> shouldRunAction;
-    private Consumer<String> action;
+    private Function<String, DukeResponse> action;
 
     /**
      * Creates an object that handles checking and executing a command.
@@ -17,20 +18,32 @@ public class CommandMatcher {
      * @param shouldRunAction Predicate to check if the command should be run.
      * @param action Action to run.
      */
-    public CommandMatcher(Predicate<String> shouldRunAction, Consumer<String> action) {
+    public CommandMatcher(Predicate<String> shouldRunAction, Function<String, DukeResponse> action) {
         this.shouldRunAction = shouldRunAction;
         this.action = action;
     }
 
+    /**
+     * Creates an object that handles checking and executing a command.
+     *
+     * @param shouldRunAction Predicate to check if the command should be run.
+     * @param action Action to run.
+     * @return Constructed CommandMatcher.
+     */
+    public static CommandMatcher of(Predicate<String> shouldRunAction, DukeExceptionFunction<String> action) {
+        return new CommandMatcher(shouldRunAction, DukeExceptionFunction.toFunction(action));
+    }
+
     /**
      * Creates an object that handles checking and executing a command.
      *
      * @param prefix Prefix of the command which is checked.
      * @param action Action to run.
+     * @return Constructed CommandMatcher.
      */
-    public CommandMatcher(String prefix, Consumer<String> action) {
-        this.shouldRunAction = (cmd) -> cmd.strip().startsWith(prefix);
-        this.action = action;
+    public static CommandMatcher of(String prefix, DukeExceptionFunction<String> action) {
+        return new CommandMatcher((cmd) -> cmd.strip().startsWith(prefix),
+                DukeExceptionFunction.toFunction(action));
     }
 
     /**
@@ -38,13 +51,12 @@ public CommandMatcher(String prefix, Consumer<String> action) {
      * If it does, it would execute the action.
      *
      * @param input String to check if it is for this command.
-     * @return If the string matches.
+     * @return A DukeResponse if the string matches.
      */
-    public boolean run(String input) {
+    public Optional<DukeResponse> run(String input) {
         if (shouldRunAction.test(input)) {
-            action.accept(input);
-            return true;
+            return Optional.of(action.apply(input));
         }
-        return false;
+        return Optional.empty();
     }
 }
diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
index d25d922f45..f53fdd5248 100644
--- a/src/main/java/duke/Duke.java
+++ b/src/main/java/duke/Duke.java
@@ -3,6 +3,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Optional;
 
 import duke.task.TaskList;
 
@@ -32,12 +33,12 @@ public static UiInterface getUi() {
         return ui;
     }
 
-    private static void handleCommand(String command) {
+    private static DukeResponse handleCommand(String command) {
+        Optional<DukeResponse> response = Optional.empty();
         for (CommandMatcher matcher : commands) {
-            if (matcher.run(command)) {
-                break;
-            }
+            response = response.or(() -> matcher.run(command));
         }
+        return response.orElse(new DukeResponse("I cannot figure out this command..."));
     }
 
     /**
@@ -65,7 +66,8 @@ public static void main(String[] args) {
             if (command.equals("bye")) {
                 isStillRunning = false;
             } else {
-                handleCommand(command);
+                DukeResponse response = handleCommand(command);
+                response.print(ui); // ensure response is printed
             }
         }
 
diff --git a/src/main/java/duke/DukeException.java b/src/main/java/duke/DukeException.java
new file mode 100644
index 0000000000..ba975e129e
--- /dev/null
+++ b/src/main/java/duke/DukeException.java
@@ -0,0 +1,29 @@
+package duke;
+
+/**
+ * An exception class that comes with a DukeResponse
+ * so that the chatbot can show the message to the screen.
+ */
+public class DukeException extends Exception {
+    private DukeResponse response;
+
+    /**
+     * Constructs a DukeException such that it
+     * holds a DukeResponse.
+     *
+     * @param response Response which can be shown.
+     */
+    public DukeException(DukeResponse response) {
+        super("[DukeException]");
+        this.response = response;
+    }
+
+    /**
+     * Gets the available response.
+     *
+     * @return Single-use response.
+     */
+    public DukeResponse getResponse() {
+        return response;
+    }
+}
diff --git a/src/main/java/duke/DukeExceptionBiFunction.java b/src/main/java/duke/DukeExceptionBiFunction.java
new file mode 100644
index 0000000000..2c9146e408
--- /dev/null
+++ b/src/main/java/duke/DukeExceptionBiFunction.java
@@ -0,0 +1,47 @@
+package duke;
+
+import java.util.function.BiFunction;
+
+/**
+ * Defines an interface for functions that throw DukeException.
+ *
+ * @param <T> Input type.
+ */
+public interface DukeExceptionBiFunction<T, U> {
+    /**
+     * Constructs DukeExceptionBiFunction from BiFunction.
+     *
+     * @param lambda BiFunction.
+     * @param <A> Input type.
+     * @param <B> Input type.
+     * @return Constructed DukeExceptionBiFunction.
+     */
+    public static <A, B> DukeExceptionBiFunction<A, B> of(BiFunction<A, B, DukeResponse> lambda) {
+        return (a, b) -> lambda.apply(a, b);
+    }
+
+    /**
+     * Constructs BiFunction from DukeExceptionBiFunction.
+     *
+     * @param lambda DukeExceptionFunction.
+     * @param <A> Input type.
+     * @return Constructed Function.
+     */
+    public static <A, B> BiFunction<A, B, DukeResponse> toBiFunction(DukeExceptionBiFunction<A, B> lambda) {
+        return (a, b) -> {
+            try {
+                return lambda.apply(a, b);
+            } catch (DukeException exception) {
+                return exception.getResponse();
+            }
+        };
+    }
+
+    /**
+     * Applies on T, U such that it allows for throwing of DukeException.
+     *
+     * @return Single-use output DukeResponse.
+     * @throws DukeException Single-use output DukeException.
+     */
+    public DukeResponse apply(T t, U u) throws DukeException;
+}
diff --git a/src/main/java/duke/DukeExceptionFunction.java b/src/main/java/duke/DukeExceptionFunction.java
new file mode 100644
index 0000000000..44fef48bba
--- /dev/null
+++ b/src/main/java/duke/DukeExceptionFunction.java
@@ -0,0 +1,46 @@
+package duke;
+
+import java.util.function.Function;
+
+/**
+ * Defines an interface for functions that throw DukeException.
+ *
+ * @param <T> Input type.
+ */
+public interface DukeExceptionFunction<T> {
+    /**
+     * Constructs DukeExceptionFunction from Function.
+     *
+     * @param lambda Function.
+     * @param <A> Input type.
+     * @return Constructed DukeExceptionFunction.
+     */
+    public static <A> DukeExceptionFunction<A> of(Function<A, DukeResponse> lambda) {
+        return a -> lambda.apply(a);
+    }
+
+    /**
+     * Constructs Function from DukeExceptionFunction.
+     *
+     * @param lambda DukeExceptionFunction.
+     * @param <A> Input type.
+     * @return Constructed Function.
+     */
+    public static <A> Function<A, DukeResponse> toFunction(DukeExceptionFunction<A> lambda) {
+        return a -> {
+            try {
+                return lambda.apply(a);
+            } catch (DukeException exception) {
+                return exception.getResponse();
+            }
+        };
+    }
+
+    /**
+     * Applies on T such that it allows for throwing of DukeException.
+     *
+     * @return Single-use output DukeResponse.
+     * @throws DukeException Single-use output DukeException.
+     */
+    public DukeResponse apply(T t) throws DukeException;
+}
diff --git a/src/main/java/duke/DukeResponse.java b/src/main/java/duke/DukeResponse.java
new file mode 100644
index 0000000000..6d26d424ea
--- /dev/null
+++ b/src/main/java/duke/DukeResponse.java
@@ -0,0 +1,42 @@
+package duke;
+
+import java.util.function.Consumer;
+
+/**
+ * Stores an output to print once.
+ */
+public class DukeResponse {
+    private Consumer<UiInterface> responsePrinter;
+    private boolean hasPrinted = false;
+
+    /**
+     * Constructs a wrapper for the output,
+     * so it prints only once.
+     *
+     * @param output Output to print only once.
+     */
+    public DukeResponse(String... output) {
+        responsePrinter = (ui) -> ui.printStyledMessage(output);
+    }
+
+    /**
+     * Constructs a wrapper for the output,
+     * so it prints only once.
+     *
+     * @param printer Method to print only once.
+     */
+    public DukeResponse(Consumer<UiInterface> printer) {
+        this.responsePrinter = printer;
+    }
+
+    /**
+     * Prints the output if not printed yet.
+     */
+    public void print(UiInterface ui) {
+        if (hasPrinted) {
+            return;
+        }
+        responsePrinter.accept(ui);
+        hasPrinted = true;
+    }
+}
diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index 9bfa71fa0b..eab46930fe 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -31,34 +31,25 @@ private static String[] listTasks(String response, List<Task> tasks) {
     public static ArrayList<CommandMatcher> getCommands() {
         ArrayList<CommandMatcher> commands = new ArrayList<>();
 
-        commands.add(new CommandMatcher((str) -> str.equals("list"), (str) -> {
-            List<Task> tasks = TaskList.getTaskList();
-            Duke.getUi().printStyledMessage(
-                    listTasks("Here, your tasks:", tasks));
-        }));
+        commands = addTaskCommands(commands);
+        commands = addTaskModificationCommands(commands);
+        commands = addTaskViewingCommands(commands);
 
-        commands.add(new PrefixCommandMatcher("mark", (str, map) -> {
-            TaskList.getTask(str).ifPresent((task) -> {
-                task.markAsDone();
-                Duke.getUi().printStyledMessage(
-                        "Marked your task as done:",
-                        task.toString());
-            });
-        }));
+        commands = addCatchAllCommand(commands);
 
-        commands.add(new PrefixCommandMatcher("unmark", (str, map) -> {
-            TaskList.getTask(str).ifPresent((task) -> {
-                task.markAsNotDone();
-                Duke.getUi().printStyledMessage(
-                        "Aw... it's not done yet:",
-                        task.toString());
-            });
-        }));
+        return commands;
+    }
 
+    /**
+     * Adds adding task commands to an ArrayList.
+     *
+     * @return ArrayList of chatbot commands.
+     */
+    public static ArrayList<CommandMatcher> addTaskCommands(ArrayList<CommandMatcher> commands) {
         commands.add(new PrefixCommandMatcher("deadline", (str, map) -> {
             Task task = new Deadline(str, map.getOrDefault("by", "[unknown]"));
             TaskList.getTaskList().add(task);
-            Duke.getUi().printStyledMessage(
+            return new DukeResponse(
                     "Good luck with the deadline, here's the task:",
                     task.toString());
         }));
@@ -66,7 +57,7 @@ public static ArrayList<CommandMatcher> getCommands() {
         commands.add(new PrefixCommandMatcher("todo", (str, map) -> {
             Task task = new ToDo(str);
             TaskList.getTaskList().add(task);
-            Duke.getUi().printStyledMessage(
+            return new DukeResponse(
                     "I've recorded this thing you need to do:",
                     task.toString());
         }));
@@ -74,33 +65,76 @@ public static ArrayList<CommandMatcher> getCommands() {
         commands.add(new PrefixCommandMatcher("event", (str, map) -> {
             Task task = new Event(str, map.getOrDefault("at", "[unknown]"));
             TaskList.getTaskList().add(task);
-            Duke.getUi().printStyledMessage(
+            return new DukeResponse(
                     "That's going to happen at some time later:",
                     task.toString());
         }));
 
-        commands.add(new PrefixCommandMatcher("delete", (str, map) -> {
-            TaskList.getTask(str).ifPresent((task) -> {
-                TaskList.getTaskList().remove(task);
-                Duke.getUi().printStyledMessage(
-                        "It seems you didn't need this task anymore, so I removed it:",
-                        task.toString(),
-                        String.format("You have %d tasks left.", TaskList.getTaskList().size()));
-            });
+        return commands;
+    }
+
+    /**
+     * Adds task modification commands to an ArrayList.
+     *
+     * @return ArrayList of chatbot commands.
+     */
+    public static ArrayList<CommandMatcher> addTaskModificationCommands(ArrayList<CommandMatcher> commands) {
+        commands.add(PrefixCommandMatcher.of("mark", (str, map) -> {
+            Task task = TaskList.getTask(str);
+            return new DukeResponse(
+                    "Marked your task as done:",
+                    task.toString());
+        }));
+
+        commands.add(PrefixCommandMatcher.of("unmark", (str, map) -> {
+            Task task = TaskList.getTask(str);
+            return new DukeResponse(
+                    "Aw... it's not done yet:",
+                    task.toString());
+        }));
+
+        commands.add(PrefixCommandMatcher.of("delete", (str, map) -> {
+            Task task = TaskList.getTask(str);
+            return new DukeResponse(
+                    "It seems you didn't need this task anymore, so I removed it:",
+                    task.toString(),
+                    String.format("You have %d tasks left.", TaskList.getTaskList().size()));
+        }));
+
+        return commands;
+    }
+
+    /**
+     * Adds task viewing commands to an ArrayList.
+     *
+     * @return ArrayList of chatbot commands.
+     */
+    public static ArrayList<CommandMatcher> addTaskViewingCommands(ArrayList<CommandMatcher> commands) {
+        commands.add(new CommandMatcher((str) -> str.equals("list"), (str) -> {
+            List<Task> tasks = TaskList.getTaskList();
+            return new DukeResponse(
+                    listTasks("Here, your tasks:", tasks));
         }));
 
         commands.add(new PrefixCommandMatcher("find", (str, map) -> {
             List<Task> tasks = TaskList.filterTasks(str);
-            Duke.getUi().printStyledMessage(
+            return new DukeResponse(
                     listTasks("Here are the tasks that you might be looking for:", tasks));
         }));
 
-        // default command matcher - add to list
-        commands.add(new CommandMatcher((str) -> true, (str) -> {
-            Duke.getUi().printStyledMessage(
-                    "(>.<') I'm sorry, I don't really know what that means.");
-        }));
+        return commands;
+    }
 
+    /**
+     * Adds the command that runs otherwise
+     * to an ArrayList.
+     *
+     * @return ArrayList of chatbot commands.
+     */
+    public static ArrayList<CommandMatcher> addCatchAllCommand(ArrayList<CommandMatcher> commands) {
+        commands.add(
+                new CommandMatcher((str) -> true, (str) -> new DukeResponse(
+                "(>.<') I'm sorry, I don't really know what that means.")));
         return commands;
     }
 }
diff --git a/src/main/java/duke/PrefixCommandMatcher.java b/src/main/java/duke/PrefixCommandMatcher.java
index 705c0ba6e8..cfc9897269 100644
--- a/src/main/java/duke/PrefixCommandMatcher.java
+++ b/src/main/java/duke/PrefixCommandMatcher.java
@@ -2,7 +2,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
 
 /**
  * Makes a command matcher based on prefix.
@@ -13,40 +13,54 @@
 public class PrefixCommandMatcher extends CommandMatcher {
     /**
      * Creates a command matcher that tries to match a prefix.
+     *
+     * @param prefix Prefix to match.
+     * @param action Action to do.
      */
-    public PrefixCommandMatcher(String prefix, BiConsumer<String, Map<String, String>> action) {
-        super((cmd) -> cmd.strip().startsWith(prefix + " ") || cmd.strip().equals(prefix), (cmd) -> {
-            // preprocessing
-            cmd = cmd.strip();
+    public PrefixCommandMatcher(String prefix, BiFunction<String, Map<String, String>, DukeResponse> action) {
+        super((cmd) -> cmd.strip().startsWith(prefix + " ") || cmd.strip().equals(prefix),
+                DukeExceptionFunction.toFunction((cmd) -> {
+                    // preprocessing
+                    cmd = cmd.strip();
 
-            // corner case
-            if (cmd.equals(prefix)) {
-                Duke.getUi().printStyledMessage(
-                        "(>.<') Add a description to your " + prefix + ".");
-                return;
-            }
+                    // corner case
+                    if (cmd.equals(prefix)) {
+                        throw new DukeException(new DukeResponse(
+                                "(>.<') Add a description to your " + prefix + "."));
+                    }
 
-            // map processing
-            String withoutPrefix = cmd.split(" ", 2)[1];
-            String[] commandParts = withoutPrefix.split(" /");
-            Map<String, String> map = new HashMap<>();
-            for (int i = 1; i < commandParts.length; i++) {
-                String[] keyAndValue = commandParts[i].split(" ", 2);
-                if (keyAndValue.length == 2) {
-                    map.put(keyAndValue[0].strip(), keyAndValue[1]);
-                } else {
-                    map.put(keyAndValue[0].strip(), "");
-                }
-            }
+                    // map processing
+                    String withoutPrefix = cmd.split(" ", 2)[1];
+                    String[] commandParts = withoutPrefix.split(" /");
+                    Map<String, String> map = new HashMap<>();
+                    for (int i = 1; i < commandParts.length; i++) {
+                        String[] keyAndValue = commandParts[i].split(" ", 2);
+                        if (keyAndValue.length == 2) {
+                            map.put(keyAndValue[0].strip(), keyAndValue[1]);
+                        } else {
+                            map.put(keyAndValue[0].strip(), "");
+                        }
+                    }
 
-            // another corner case
-            if (commandParts[0].equals("")) {
-                Duke.getUi().printStyledMessage("(>.<') The description for " + prefix + " shouldn't be empty.");
-                return;
-            }
+                    // another corner case
+                    if (commandParts[0].equals("")) {
+                        throw new DukeException(new DukeResponse(
+                                "(>.<') The description for " + prefix + " shouldn't be empty."));
+                    }
 
-            // accept
-            action.accept(commandParts[0], map);
-        });
+                    // accept
+                    return action.apply(commandParts[0], map);
+                }));
+    }
+
+    /**
+     * Creates a command matcher that tries to match a prefix.
+     *
+     * @param prefix Prefix to match.
+     * @param action Action to do.
+     */
+    public static PrefixCommandMatcher of(String prefix, DukeExceptionBiFunction<String, Map<String, String>> action) {
+        return new PrefixCommandMatcher(prefix,
+                DukeExceptionBiFunction.toBiFunction(action));
     }
 }
diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java
index 0700db4f00..1dc2e24627 100644
--- a/src/main/java/duke/Storage.java
+++ b/src/main/java/duke/Storage.java
@@ -90,6 +90,8 @@ public void saveLines(String[][] strings) {
             }
             writer.close();
         } catch (IOException ex) {
+            /*throw new DukeException(new DukeResponse(
+                    "(>.<') I was unable to record your tasks...")));*/
             Duke.getUi().printStyledMessage(
                     "(>.<') I was unable to record your tasks...");
             ex.printStackTrace();
diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java
index a29b0c5fdc..ab329c1dd2 100644
--- a/src/main/java/duke/task/Deadline.java
+++ b/src/main/java/duke/task/Deadline.java
@@ -9,7 +9,7 @@ public class Deadline extends Task {
     protected ParsedDateTime datetime;
 
     /**
-     * Creates a duke.tasks.Deadline object.
+     * Creates a Deadline object.
      *
      * @param description Description of deadline.
      * @param by Time of deadline.
@@ -19,7 +19,7 @@ public Deadline(String description, String by) {
     }
 
     /**
-     * Creates a duke.tasks.Deadline object.
+     * Creates a Deadline object.
      *
      * @param description Description of deadline.
      * @param by Time of deadline.
diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java
index 906dce4718..2e49a82d7b 100644
--- a/src/main/java/duke/task/TaskList.java
+++ b/src/main/java/duke/task/TaskList.java
@@ -2,10 +2,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
-import duke.Duke;
+import duke.DukeException;
+import duke.DukeResponse;
 
 /**
  * Holds the list of tasks
@@ -32,21 +32,19 @@ public static void finalizeTaskList() {
      * Gets task from index as string.
      *
      * @param index Index as a string.
-     * @return Optional.of(task) if successful, else Optional.empty().
+     * @return Task if successful.
+     * @throws DukeException if not successful.
      */
-    public static Optional<Task> getTask(String index) {
+    public static Task getTask(String index) throws DukeException {
         try {
             int idx = Integer.parseInt(index);
-            Task task = taskList.get(idx - 1);
-            return Optional.of(task);
+            return taskList.get(idx - 1);
         } catch (NumberFormatException ex) {
-            Duke.getUi().printStyledMessage(
-                    "Sorry, I didn't understand " + index + ", please give me a number.");
-            return Optional.empty();
+            throw new DukeException(new DukeResponse(
+                    "Sorry, I didn't understand " + index + ", please give me a number."));
         } catch (IndexOutOfBoundsException ex) {
-            Duke.getUi().printStyledMessage(
-                    "Sorry, the number " + index + ", wasn't in the range.");
-            return Optional.empty();
+            throw new DukeException(new DukeResponse(
+                    "Sorry, the number " + index + ", wasn't in the range."));
         }
     }
 

From 734a8e6cc9cfa3f1f1f93903b3aa09dd2595c4d9 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Fri, 9 Sep 2022 22:45:31 +0800
Subject: [PATCH 38/67] Resolve regressions found via testing

The text-ui-test caught a bug.

Let's fix the code.
---
 src/main/java/duke/Parser.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index eab46930fe..0bd7f7a52e 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -81,6 +81,7 @@ public static ArrayList<CommandMatcher> addTaskCommands(ArrayList<CommandMatcher
     public static ArrayList<CommandMatcher> addTaskModificationCommands(ArrayList<CommandMatcher> commands) {
         commands.add(PrefixCommandMatcher.of("mark", (str, map) -> {
             Task task = TaskList.getTask(str);
+            task.markAsDone();
             return new DukeResponse(
                     "Marked your task as done:",
                     task.toString());
@@ -88,6 +89,7 @@ public static ArrayList<CommandMatcher> addTaskModificationCommands(ArrayList<Co
 
         commands.add(PrefixCommandMatcher.of("unmark", (str, map) -> {
             Task task = TaskList.getTask(str);
+            task.markAsNotDone();
             return new DukeResponse(
                     "Aw... it's not done yet:",
                     task.toString());
@@ -95,6 +97,7 @@ public static ArrayList<CommandMatcher> addTaskModificationCommands(ArrayList<Co
 
         commands.add(PrefixCommandMatcher.of("delete", (str, map) -> {
             Task task = TaskList.getTask(str);
+            TaskList.getTaskList().remove(task);
             return new DukeResponse(
                     "It seems you didn't need this task anymore, so I removed it:",
                     task.toString(),

From be3cdeb0d5ed046f9577cdd0640a169b905d2795 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Fri, 9 Sep 2022 23:04:51 +0800
Subject: [PATCH 39/67] Add null checking assertions

---
 src/main/java/duke/CommandMatcher.java        |  9 +++++++-
 src/main/java/duke/ConsoleUi.java             |  1 +
 src/main/java/duke/Duke.java                  |  2 ++
 src/main/java/duke/DukeException.java         |  1 +
 .../java/duke/DukeExceptionBiFunction.java    |  2 ++
 src/main/java/duke/DukeExceptionFunction.java |  2 ++
 src/main/java/duke/DukeResponse.java          |  2 ++
 src/main/java/duke/ParsedDateTime.java        |  2 ++
 src/main/java/duke/Parser.java                | 22 +++++++++++++++++++
 src/main/java/duke/PrefixCommandMatcher.java  |  4 ++++
 src/main/java/duke/Storage.java               |  2 ++
 src/main/java/duke/gui/DialogBox.java         |  2 ++
 src/main/java/duke/gui/GraphicUi.java         |  2 ++
 src/main/java/duke/task/Deadline.java         |  2 ++
 src/main/java/duke/task/Event.java            |  2 ++
 src/main/java/duke/task/Task.java             |  2 ++
 src/main/java/duke/task/TaskFactory.java      |  1 +
 src/main/java/duke/task/TaskStorage.java      |  1 +
 src/main/java/duke/task/ToDo.java             |  3 +++
 19 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/src/main/java/duke/CommandMatcher.java b/src/main/java/duke/CommandMatcher.java
index 3503f3c3bb..81896db587 100644
--- a/src/main/java/duke/CommandMatcher.java
+++ b/src/main/java/duke/CommandMatcher.java
@@ -19,6 +19,8 @@ public class CommandMatcher {
      * @param action Action to run.
      */
     public CommandMatcher(Predicate<String> shouldRunAction, Function<String, DukeResponse> action) {
+        assert shouldRunAction != null;
+        assert action != null;
         this.shouldRunAction = shouldRunAction;
         this.action = action;
     }
@@ -42,6 +44,8 @@ public static CommandMatcher of(Predicate<String> shouldRunAction, DukeException
      * @return Constructed CommandMatcher.
      */
     public static CommandMatcher of(String prefix, DukeExceptionFunction<String> action) {
+        assert prefix != null;
+        assert action != null;
         return new CommandMatcher((cmd) -> cmd.strip().startsWith(prefix),
                 DukeExceptionFunction.toFunction(action));
     }
@@ -54,8 +58,11 @@ public static CommandMatcher of(String prefix, DukeExceptionFunction<String> act
      * @return A DukeResponse if the string matches.
      */
     public Optional<DukeResponse> run(String input) {
+        assert input != null;
         if (shouldRunAction.test(input)) {
-            return Optional.of(action.apply(input));
+            DukeResponse result = action.apply(input);
+            assert result != null;
+            return Optional.of(result);
         }
         return Optional.empty();
     }
diff --git a/src/main/java/duke/ConsoleUi.java b/src/main/java/duke/ConsoleUi.java
index fd66fb1b5b..a3980e27fa 100644
--- a/src/main/java/duke/ConsoleUi.java
+++ b/src/main/java/duke/ConsoleUi.java
@@ -22,6 +22,7 @@ public Reader getReader() {
     public void printStyledMessage(String... lines) {
         System.out.println(",----------------------------------------------------------------");
         for (String str : lines) {
+            assert str != null;
             System.out.print("| ");
             System.out.println(str);
         }
diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
index f53fdd5248..79652e676c 100644
--- a/src/main/java/duke/Duke.java
+++ b/src/main/java/duke/Duke.java
@@ -21,6 +21,7 @@ public class Duke {
      * @param ui The current UI to use.
      */
     public static void setUi(UiInterface ui) {
+        assert ui != null;
         Duke.ui = ui;
     }
 
@@ -30,6 +31,7 @@ public static void setUi(UiInterface ui) {
      * @return UiInterface that helps display text to screen.
      */
     public static UiInterface getUi() {
+        assert ui != null;
         return ui;
     }
 
diff --git a/src/main/java/duke/DukeException.java b/src/main/java/duke/DukeException.java
index ba975e129e..aab292dbaa 100644
--- a/src/main/java/duke/DukeException.java
+++ b/src/main/java/duke/DukeException.java
@@ -15,6 +15,7 @@ public class DukeException extends Exception {
      */
     public DukeException(DukeResponse response) {
         super("[DukeException]");
+        assert response != null;
         this.response = response;
     }
 
diff --git a/src/main/java/duke/DukeExceptionBiFunction.java b/src/main/java/duke/DukeExceptionBiFunction.java
index 2c9146e408..2007537841 100644
--- a/src/main/java/duke/DukeExceptionBiFunction.java
+++ b/src/main/java/duke/DukeExceptionBiFunction.java
@@ -17,6 +17,7 @@ public interface DukeExceptionBiFunction<T, U> {
      * @return Constructed DukeExceptionBiFunction.
      */
     public static <A, B> DukeExceptionBiFunction<A, B> of(BiFunction<A, B, DukeResponse> lambda) {
+        assert lambda != null;
         return (a, b) -> lambda.apply(a, b);
     }
 
@@ -28,6 +29,7 @@ public static <A, B> DukeExceptionBiFunction<A, B> of(BiFunction<A, B, DukeRespo
      * @return Constructed Function.
      */
     public static <A, B> BiFunction<A, B, DukeResponse> toBiFunction(DukeExceptionBiFunction<A, B> lambda) {
+        assert lambda != null;
         return (a, b) -> {
             try {
                 return lambda.apply(a, b);
diff --git a/src/main/java/duke/DukeExceptionFunction.java b/src/main/java/duke/DukeExceptionFunction.java
index 44fef48bba..fe4ed22cbf 100644
--- a/src/main/java/duke/DukeExceptionFunction.java
+++ b/src/main/java/duke/DukeExceptionFunction.java
@@ -16,6 +16,7 @@ public interface DukeExceptionFunction<T> {
      * @return Constructed DukeExceptionFunction.
      */
     public static <A> DukeExceptionFunction<A> of(Function<A, DukeResponse> lambda) {
+        assert lambda != null;
         return a -> lambda.apply(a);
     }
 
@@ -27,6 +28,7 @@ public static <A> DukeExceptionFunction<A> of(Function<A, DukeResponse> lambda)
      * @return Constructed Function.
      */
     public static <A> Function<A, DukeResponse> toFunction(DukeExceptionFunction<A> lambda) {
+        assert lambda != null;
         return a -> {
             try {
                 return lambda.apply(a);
diff --git a/src/main/java/duke/DukeResponse.java b/src/main/java/duke/DukeResponse.java
index 6d26d424ea..4bbc33b91a 100644
--- a/src/main/java/duke/DukeResponse.java
+++ b/src/main/java/duke/DukeResponse.java
@@ -26,6 +26,7 @@ public DukeResponse(String... output) {
      * @param printer Method to print only once.
      */
     public DukeResponse(Consumer<UiInterface> printer) {
+        assert printer != null;
         this.responsePrinter = printer;
     }
 
@@ -33,6 +34,7 @@ public DukeResponse(Consumer<UiInterface> printer) {
      * Prints the output if not printed yet.
      */
     public void print(UiInterface ui) {
+        assert ui != null;
         if (hasPrinted) {
             return;
         }
diff --git a/src/main/java/duke/ParsedDateTime.java b/src/main/java/duke/ParsedDateTime.java
index b3fc5d9c61..6cbb3fa2b9 100644
--- a/src/main/java/duke/ParsedDateTime.java
+++ b/src/main/java/duke/ParsedDateTime.java
@@ -26,6 +26,7 @@ public class ParsedDateTime {
      * @param input String that may represent date/time.
      */
     public ParsedDateTime(String input) {
+        assert input != null;
         this.input = input;
         parsedDateTime = Optional.empty();
         for (DateTimeFormatter formatter : formatters) {
@@ -46,6 +47,7 @@ public ParsedDateTime(String input) {
     @Override
     public String toString() {
         return parsedDateTime.map((dateTime) -> {
+            assert dateTime != null;
             return dateTime.format(DateTimeFormatter.ofPattern("dd MMM yyyy HHmm"));
         }).orElse(input);
     }
diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index 0bd7f7a52e..a9055e18df 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -15,9 +15,12 @@
 public class Parser {
 
     private static String[] listTasks(String response, List<Task> tasks) {
+        assert response != null;
+        assert tasks != null;
         String[] output = new String[tasks.size() + 1];
         output[0] = response;
         for (int i = 0; i < tasks.size(); i++) {
+            assert tasks.get(i) != null;
             output[i + 1] = (i + 1) + "." + tasks.get(i).toString();
         }
         return output;
@@ -37,6 +40,7 @@ public static ArrayList<CommandMatcher> getCommands() {
 
         commands = addCatchAllCommand(commands);
 
+        assert commands != null;
         return commands;
     }
 
@@ -46,7 +50,10 @@ public static ArrayList<CommandMatcher> getCommands() {
      * @return ArrayList of chatbot commands.
      */
     public static ArrayList<CommandMatcher> addTaskCommands(ArrayList<CommandMatcher> commands) {
+        assert commands != null;
         commands.add(new PrefixCommandMatcher("deadline", (str, map) -> {
+            assert str != null;
+            assert map != null;
             Task task = new Deadline(str, map.getOrDefault("by", "[unknown]"));
             TaskList.getTaskList().add(task);
             return new DukeResponse(
@@ -55,6 +62,8 @@ public static ArrayList<CommandMatcher> addTaskCommands(ArrayList<CommandMatcher
         }));
 
         commands.add(new PrefixCommandMatcher("todo", (str, map) -> {
+            assert str != null;
+            assert map != null;
             Task task = new ToDo(str);
             TaskList.getTaskList().add(task);
             return new DukeResponse(
@@ -63,6 +72,8 @@ public static ArrayList<CommandMatcher> addTaskCommands(ArrayList<CommandMatcher
         }));
 
         commands.add(new PrefixCommandMatcher("event", (str, map) -> {
+            assert str != null;
+            assert map != null;
             Task task = new Event(str, map.getOrDefault("at", "[unknown]"));
             TaskList.getTaskList().add(task);
             return new DukeResponse(
@@ -79,7 +90,10 @@ public static ArrayList<CommandMatcher> addTaskCommands(ArrayList<CommandMatcher
      * @return ArrayList of chatbot commands.
      */
     public static ArrayList<CommandMatcher> addTaskModificationCommands(ArrayList<CommandMatcher> commands) {
+        assert commands != null;
         commands.add(PrefixCommandMatcher.of("mark", (str, map) -> {
+            assert str != null;
+            assert map != null;
             Task task = TaskList.getTask(str);
             task.markAsDone();
             return new DukeResponse(
@@ -88,6 +102,8 @@ public static ArrayList<CommandMatcher> addTaskModificationCommands(ArrayList<Co
         }));
 
         commands.add(PrefixCommandMatcher.of("unmark", (str, map) -> {
+            assert str != null;
+            assert map != null;
             Task task = TaskList.getTask(str);
             task.markAsNotDone();
             return new DukeResponse(
@@ -96,6 +112,8 @@ public static ArrayList<CommandMatcher> addTaskModificationCommands(ArrayList<Co
         }));
 
         commands.add(PrefixCommandMatcher.of("delete", (str, map) -> {
+            assert str != null;
+            assert map != null;
             Task task = TaskList.getTask(str);
             TaskList.getTaskList().remove(task);
             return new DukeResponse(
@@ -113,13 +131,17 @@ public static ArrayList<CommandMatcher> addTaskModificationCommands(ArrayList<Co
      * @return ArrayList of chatbot commands.
      */
     public static ArrayList<CommandMatcher> addTaskViewingCommands(ArrayList<CommandMatcher> commands) {
+        assert commands != null;
         commands.add(new CommandMatcher((str) -> str.equals("list"), (str) -> {
+            assert str != null;
             List<Task> tasks = TaskList.getTaskList();
             return new DukeResponse(
                     listTasks("Here, your tasks:", tasks));
         }));
 
         commands.add(new PrefixCommandMatcher("find", (str, map) -> {
+            assert str != null;
+            assert map != null;
             List<Task> tasks = TaskList.filterTasks(str);
             return new DukeResponse(
                     listTasks("Here are the tasks that you might be looking for:", tasks));
diff --git a/src/main/java/duke/PrefixCommandMatcher.java b/src/main/java/duke/PrefixCommandMatcher.java
index cfc9897269..8f4544be24 100644
--- a/src/main/java/duke/PrefixCommandMatcher.java
+++ b/src/main/java/duke/PrefixCommandMatcher.java
@@ -51,6 +51,8 @@ public PrefixCommandMatcher(String prefix, BiFunction<String, Map<String, String
                     // accept
                     return action.apply(commandParts[0], map);
                 }));
+        assert prefix != null;
+        assert action != null;
     }
 
     /**
@@ -60,6 +62,8 @@ public PrefixCommandMatcher(String prefix, BiFunction<String, Map<String, String
      * @param action Action to do.
      */
     public static PrefixCommandMatcher of(String prefix, DukeExceptionBiFunction<String, Map<String, String>> action) {
+        assert prefix != null;
+        assert action != null;
         return new PrefixCommandMatcher(prefix,
                 DukeExceptionBiFunction.toBiFunction(action));
     }
diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java
index 1dc2e24627..980715a826 100644
--- a/src/main/java/duke/Storage.java
+++ b/src/main/java/duke/Storage.java
@@ -76,9 +76,11 @@ public String[][] getLines() {
      * @param strings Strings to save.
      */
     public void saveLines(String[][] strings) {
+        assert strings != null;
         try {
             FileWriter writer = new FileWriter(fileName, false);
             for (int i = 0; i < strings.length; i++) {
+                assert strings[i] != null;
                 if (i > 0) {
                     writer.append('\n');
                 }
diff --git a/src/main/java/duke/gui/DialogBox.java b/src/main/java/duke/gui/DialogBox.java
index 414d52690e..80fe29fe16 100644
--- a/src/main/java/duke/gui/DialogBox.java
+++ b/src/main/java/duke/gui/DialogBox.java
@@ -50,10 +50,12 @@ private void flip() {
     }
 
     public static DialogBox getUserDialog(String text, Image img) {
+        assert text != null;
         return new DialogBox(text, img);
     }
 
     public static DialogBox getDukeDialog(String text, Image img) {
+        assert text != null;
         var db = new DialogBox(text, img);
         db.flip();
         return db;
diff --git a/src/main/java/duke/gui/GraphicUi.java b/src/main/java/duke/gui/GraphicUi.java
index 571493f61f..c7b09ae291 100644
--- a/src/main/java/duke/gui/GraphicUi.java
+++ b/src/main/java/duke/gui/GraphicUi.java
@@ -46,11 +46,13 @@ public Reader getReader() {
     public void printStyledMessage(String... lines) {
         StringBuilder result = new StringBuilder();
         for (String line : lines) {
+            assert line != null;
             result.append(line);
             result.append('\n');
         }
         result.append('\n');
         try {
+            assert bufferedWriter != null;
             bufferedWriter.write(result.toString(), 0, result.length());
             bufferedWriter.flush();
         } catch (IOException e) {
diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java
index ab329c1dd2..d6db2302da 100644
--- a/src/main/java/duke/task/Deadline.java
+++ b/src/main/java/duke/task/Deadline.java
@@ -28,6 +28,8 @@ public Deadline(String description, String by) {
     public Deadline(String description, String by, boolean isDone) {
         super(description, isDone);
         datetime = new ParsedDateTime(by);
+        assert description != null;
+        assert by != null;
     }
 
     /**
diff --git a/src/main/java/duke/task/Event.java b/src/main/java/duke/task/Event.java
index 42233ee4ac..26e73a533d 100644
--- a/src/main/java/duke/task/Event.java
+++ b/src/main/java/duke/task/Event.java
@@ -27,6 +27,8 @@ public Event(String description, String at) {
      */
     public Event(String description, String at, boolean isDone) {
         super(description, isDone);
+        assert description != null;
+        assert at != null;
         datetime = new ParsedDateTime(at);
     }
 
diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java
index 80e63f222a..3bb760847b 100644
--- a/src/main/java/duke/task/Task.java
+++ b/src/main/java/duke/task/Task.java
@@ -10,9 +10,11 @@ public class Task {
     private boolean isDone;
     Task(String name) {
         this(name, false);
+        assert name != null;
     }
 
     Task(String name, boolean isDone) {
+        assert name != null;
         this.name = name;
         this.isDone = isDone;
     }
diff --git a/src/main/java/duke/task/TaskFactory.java b/src/main/java/duke/task/TaskFactory.java
index 26dd7a31c3..04f29e49b3 100644
--- a/src/main/java/duke/task/TaskFactory.java
+++ b/src/main/java/duke/task/TaskFactory.java
@@ -41,6 +41,7 @@ public static Task constructTask(String[] taskData) throws IllegalArgumentExcept
      * @return Optional of Task according to taskData, Optional.empty() if cannot construct.
      */
     public static Optional<Task> constructOptionalTask(String[] taskData) {
+        assert taskData != null;
         try {
             return Optional.of(constructTask(taskData));
         } catch (IllegalArgumentException ex) {
diff --git a/src/main/java/duke/task/TaskStorage.java b/src/main/java/duke/task/TaskStorage.java
index b421c560a4..b8c55ac45f 100644
--- a/src/main/java/duke/task/TaskStorage.java
+++ b/src/main/java/duke/task/TaskStorage.java
@@ -20,6 +20,7 @@ public static ArrayList<Task> getTasks() {
         Storage storage = Storage.getFileState("./duke.txt");
         ArrayList<Task> tasks = new ArrayList<>();
         for (String[] line : storage.getLines()) {
+            assert line != null;
             TaskFactory.constructOptionalTask(line).ifPresent((task) -> tasks.add(task));
         }
         return tasks;
diff --git a/src/main/java/duke/task/ToDo.java b/src/main/java/duke/task/ToDo.java
index 3c3596d9d4..64918d5c32 100644
--- a/src/main/java/duke/task/ToDo.java
+++ b/src/main/java/duke/task/ToDo.java
@@ -12,6 +12,7 @@ public class ToDo extends Task {
      */
     public ToDo(String description) {
         this(description, false);
+        assert description != null;
     }
 
     /**
@@ -22,6 +23,7 @@ public ToDo(String description) {
      */
     public ToDo(String description, boolean isDone) {
         super(description, isDone);
+        assert description != null;
     }
 
     @Override
@@ -37,6 +39,7 @@ public String toString() {
     @Override
     public String[] getAsStringArray() {
         String[] data = super.getAsStringArray();
+        assert data != null;
         return new String[]{ "ToDo", data[1], data[2] };
     }
 }

From 7e7db1b05488827602ca3b8192484a500af86bef Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Fri, 9 Sep 2022 23:30:18 +0800
Subject: [PATCH 40/67] Add code quality improvements

---
 src/main/java/duke/ConsoleUi.java            | 10 +++++---
 src/main/java/duke/PrefixCommandMatcher.java |  7 +++++-
 src/main/java/duke/gui/MainWindow.java       |  4 ++--
 src/main/java/duke/task/Task.java            |  6 ++---
 src/main/java/duke/task/TaskFactory.java     | 24 +++++++++++++-------
 5 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/main/java/duke/ConsoleUi.java b/src/main/java/duke/ConsoleUi.java
index fd66fb1b5b..8644272f8f 100644
--- a/src/main/java/duke/ConsoleUi.java
+++ b/src/main/java/duke/ConsoleUi.java
@@ -7,6 +7,10 @@
  * Handles console-based user interface. Used for sanity checks.
  */
 public class ConsoleUi implements UiInterface {
+    private static String UPPER_BAR = ",----------------------------------------------------------------";
+    private static String LOWER_BAR = "\"'----------------------------------------------------------------\"";
+    private static String LEFT_BAR = "| ";
+
     /**
      * {@inheritDoc}
      */
@@ -20,12 +24,12 @@ public Reader getReader() {
      */
     @Override
     public void printStyledMessage(String... lines) {
-        System.out.println(",----------------------------------------------------------------");
+        System.out.println(UPPER_BAR);
         for (String str : lines) {
-            System.out.print("| ");
+            System.out.print(LEFT_BAR);
             System.out.println(str);
         }
-        System.out.println("'----------------------------------------------------------------");
+        System.out.println(LOWER_BAR);
     }
 
     /**
diff --git a/src/main/java/duke/PrefixCommandMatcher.java b/src/main/java/duke/PrefixCommandMatcher.java
index cfc9897269..f1f1b873bf 100644
--- a/src/main/java/duke/PrefixCommandMatcher.java
+++ b/src/main/java/duke/PrefixCommandMatcher.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.BiFunction;
+import java.util.function.Predicate;
 
 /**
  * Makes a command matcher based on prefix.
@@ -18,7 +19,7 @@ public class PrefixCommandMatcher extends CommandMatcher {
      * @param action Action to do.
      */
     public PrefixCommandMatcher(String prefix, BiFunction<String, Map<String, String>, DukeResponse> action) {
-        super((cmd) -> cmd.strip().startsWith(prefix + " ") || cmd.strip().equals(prefix),
+        super(makePrefixMatcher(prefix),
                 DukeExceptionFunction.toFunction((cmd) -> {
                     // preprocessing
                     cmd = cmd.strip();
@@ -53,6 +54,10 @@ public PrefixCommandMatcher(String prefix, BiFunction<String, Map<String, String
                 }));
     }
 
+    private static Predicate<String> makePrefixMatcher(String prefix) {
+        return (cmd) -> cmd.strip().startsWith(prefix + " ") || cmd.strip().equals(prefix);
+    }
+
     /**
      * Creates a command matcher that tries to match a prefix.
      *
diff --git a/src/main/java/duke/gui/MainWindow.java b/src/main/java/duke/gui/MainWindow.java
index b97308cf90..c2fa02e9bb 100644
--- a/src/main/java/duke/gui/MainWindow.java
+++ b/src/main/java/duke/gui/MainWindow.java
@@ -104,9 +104,9 @@ public void getOutput() {
                 result.append(line);
                 result.append('\n');
             }
-            String response = result.substring(0, result.length() - 1);
+            String responseWithoutTrailingNewline = result.substring(0, result.length() - 1);
             dialogContainer.getChildren().addAll(
-                    DialogBox.getDukeDialog(response, dukeImage)
+                    DialogBox.getDukeDialog(responseWithoutTrailingNewline, dukeImage)
             );
         } catch (IOException ex) {
             dialogContainer.getChildren().addAll(
diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java
index 80e63f222a..eb4bef2eb6 100644
--- a/src/main/java/duke/task/Task.java
+++ b/src/main/java/duke/task/Task.java
@@ -21,14 +21,14 @@ public class Task {
      * Marks the task as done.
      */
     public void markAsDone() {
-        this.isDone = true;
+        isDone = true;
     }
 
     /**
      * Marks the task as not done.
      */
     public void markAsNotDone() {
-        this.isDone = false;
+        isDone = false;
     }
 
     /**
@@ -42,7 +42,7 @@ public boolean isMatchingQuery(String query) {
     }
 
     private char getDoneMarker() {
-        return this.isDone ? MARKER_DONE : MARKER_NOT_DONE;
+        return isDone ? MARKER_DONE : MARKER_NOT_DONE;
     }
 
     /**
diff --git a/src/main/java/duke/task/TaskFactory.java b/src/main/java/duke/task/TaskFactory.java
index 26dd7a31c3..b96ef9b7c3 100644
--- a/src/main/java/duke/task/TaskFactory.java
+++ b/src/main/java/duke/task/TaskFactory.java
@@ -8,6 +8,10 @@
  * Constructs tasks from strings
  */
 public class TaskFactory {
+    private static boolean isTrue(String str) {
+        return str.equals("true");
+    }
+
     /**
      * Constructs the task.
      *
@@ -19,17 +23,21 @@ public static Task constructTask(String[] taskData) throws IllegalArgumentExcept
         if (taskData == null || taskData.length < 1) {
             throw new IllegalArgumentException("taskData cannot be null or of length 1");
         }
-        if (taskData[0].equals("Task") && taskData.length >= 3) {
-            return new Task(taskData[1], taskData[2].equals("true"));
+        boolean isTask = taskData[0].equals("Task") && taskData.length >= 3;
+        if (isTask) {
+            return new Task(taskData[1], isTrue(taskData[2]));
         }
-        if (taskData[0].equals("ToDo") && taskData.length >= 3) {
-            return new ToDo(taskData[1], taskData[2].equals("true"));
+        boolean isToDo = taskData[0].equals("ToDo") && taskData.length >= 3;
+        if (isToDo) {
+            return new ToDo(taskData[1], isTrue(taskData[2]));
         }
-        if (taskData[0].equals("Deadline") && taskData.length >= 4) {
-            return new Deadline(taskData[1], taskData[3], taskData[2].equals("true"));
+        boolean isDeadline = taskData[0].equals("Deadline") && taskData.length >= 4;
+        if (isDeadline) {
+            return new Deadline(taskData[1], taskData[3], isTrue(taskData[2]));
         }
-        if (taskData[0].equals("Event") && taskData.length >= 4) {
-            return new Event(taskData[1], taskData[3], taskData[2].equals("true"));
+        boolean isEvent = taskData[0].equals("Event") && taskData.length >= 4;
+        if (isEvent) {
+            return new Event(taskData[1], taskData[3], isTrue(taskData[2]));
         }
         throw new IllegalArgumentException("Unsupported task type or incorrect task data length");
     }

From 0f9833356633f59f6052f01f387b0203e0f514ee Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Fri, 9 Sep 2022 23:35:45 +0800
Subject: [PATCH 41/67] Improve JavaDoc

---
 src/main/java/duke/CommandMatcher.java |  6 +++---
 src/main/java/duke/DukeResponse.java   |  2 ++
 src/main/java/duke/ParsedDateTime.java |  2 +-
 src/main/java/duke/gui/DialogBox.java  | 14 ++++++++++++++
 src/main/java/duke/task/Deadline.java  |  4 ++--
 src/main/java/duke/task/Task.java      | 16 ++++++++++++++--
 src/main/java/duke/task/ToDo.java      |  2 +-
 7 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/main/java/duke/CommandMatcher.java b/src/main/java/duke/CommandMatcher.java
index 3503f3c3bb..34f3ec80ce 100644
--- a/src/main/java/duke/CommandMatcher.java
+++ b/src/main/java/duke/CommandMatcher.java
@@ -13,7 +13,7 @@ public class CommandMatcher {
     private Function<String, DukeResponse> action;
 
     /**
-     * Creates an object that handles checking and executing a command.
+     * Constructs an object that handles checking and executing a command.
      *
      * @param shouldRunAction Predicate to check if the command should be run.
      * @param action Action to run.
@@ -24,7 +24,7 @@ public CommandMatcher(Predicate<String> shouldRunAction, Function<String, DukeRe
     }
 
     /**
-     * Creates an object that handles checking and executing a command.
+     * Constructs an object that handles checking and executing a command.
      *
      * @param shouldRunAction Predicate to check if the command should be run.
      * @param action Action to run.
@@ -35,7 +35,7 @@ public static CommandMatcher of(Predicate<String> shouldRunAction, DukeException
     }
 
     /**
-     * Creates an object that handles checking and executing a command.
+     * Constructs an object that handles checking and executing a command.
      *
      * @param prefix Prefix of the command which is checked.
      * @param action Action to run.
diff --git a/src/main/java/duke/DukeResponse.java b/src/main/java/duke/DukeResponse.java
index 6d26d424ea..88f66643ce 100644
--- a/src/main/java/duke/DukeResponse.java
+++ b/src/main/java/duke/DukeResponse.java
@@ -31,6 +31,8 @@ public DukeResponse(Consumer<UiInterface> printer) {
 
     /**
      * Prints the output if not printed yet.
+     *
+     * @param ui User interface to use.
      */
     public void print(UiInterface ui) {
         if (hasPrinted) {
diff --git a/src/main/java/duke/ParsedDateTime.java b/src/main/java/duke/ParsedDateTime.java
index b3fc5d9c61..3595aab91e 100644
--- a/src/main/java/duke/ParsedDateTime.java
+++ b/src/main/java/duke/ParsedDateTime.java
@@ -21,7 +21,7 @@ public class ParsedDateTime {
     private String input;
 
     /**
-     * Creates an object to handle if the date/time can be parsed.
+     * Constructs an object to handle if the date/time can be parsed.
      *
      * @param input String that may represent date/time.
      */
diff --git a/src/main/java/duke/gui/DialogBox.java b/src/main/java/duke/gui/DialogBox.java
index 414d52690e..71ea4bab9b 100644
--- a/src/main/java/duke/gui/DialogBox.java
+++ b/src/main/java/duke/gui/DialogBox.java
@@ -49,10 +49,24 @@ private void flip() {
         setAlignment(Pos.TOP_LEFT);
     }
 
+    /**
+     * Gets a dialog box for the user.
+     *
+     * @param text User's text.
+     * @param img User's image.
+     * @return Dialog box.
+     */
     public static DialogBox getUserDialog(String text, Image img) {
         return new DialogBox(text, img);
     }
 
+    /**
+     * Gets a dialog box for Duke.
+     *
+     * @param text Duke's text.
+     * @param img Duke's image.
+     * @return Dialog box.
+     */
     public static DialogBox getDukeDialog(String text, Image img) {
         var db = new DialogBox(text, img);
         db.flip();
diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java
index ab329c1dd2..b65f0c87d6 100644
--- a/src/main/java/duke/task/Deadline.java
+++ b/src/main/java/duke/task/Deadline.java
@@ -9,7 +9,7 @@ public class Deadline extends Task {
     protected ParsedDateTime datetime;
 
     /**
-     * Creates a Deadline object.
+     * Constructs a Deadline object.
      *
      * @param description Description of deadline.
      * @param by Time of deadline.
@@ -19,7 +19,7 @@ public Deadline(String description, String by) {
     }
 
     /**
-     * Creates a Deadline object.
+     * Constructs a Deadline object.
      *
      * @param description Description of deadline.
      * @param by Time of deadline.
diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java
index eb4bef2eb6..ab66beec42 100644
--- a/src/main/java/duke/task/Task.java
+++ b/src/main/java/duke/task/Task.java
@@ -8,11 +8,23 @@ public class Task {
     private static final char MARKER_NOT_DONE = ' ';
     private String name;
     private boolean isDone;
-    Task(String name) {
+
+    /**
+     * Constructs a task which is not done.
+     *
+     * @param name Name of task.
+     */
+    public Task(String name) {
         this(name, false);
     }
 
-    Task(String name, boolean isDone) {
+    /**
+     * Constructs a task.
+     *
+     * @param name Name of task.
+     * @param isDone True if and only if the task is done.
+     */
+    public Task(String name, boolean isDone) {
         this.name = name;
         this.isDone = isDone;
     }
diff --git a/src/main/java/duke/task/ToDo.java b/src/main/java/duke/task/ToDo.java
index 3c3596d9d4..09b38d6813 100644
--- a/src/main/java/duke/task/ToDo.java
+++ b/src/main/java/duke/task/ToDo.java
@@ -30,7 +30,7 @@ public String toString() {
     }
 
     /**
-     * Get a string array representation suitable for printing to files.
+     * Gets a string array representation suitable for printing to files.
      *
      * @return String array representation.
      */

From f3f86d550bc54ffd23ec5a534222079d8559c62e Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 10 Sep 2022 00:00:24 +0800
Subject: [PATCH 42/67] Add Continuous Integration

---
 .github/workflows/tests.yml | 50 +++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 .github/workflows/tests.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000000..c6b7ee2b1e
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,50 @@
+name: Java CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.platform }}
+
+    steps:
+      - name: Set up repository
+        uses: actions/checkout@master
+
+      - name: Set up repository
+        uses: actions/checkout@master
+        with:
+          ref: master
+
+      - name: Merge to master
+        run: git checkout --progress --force ${{ github.sha }}
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Setup JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11'
+          java-package: jdk+fx
+
+      - name: Build and check with Gradle
+        run: ./gradlew check
+
+      - name: Perform IO redirection test (*NIX)
+        if: runner.os == 'Linux'
+        working-directory:  ${{ github.workspace }}/text-ui-test
+        run: ./runtest.sh
+
+      - name: Perform IO redirection test (MacOS)
+        if: always() && runner.os == 'macOS'
+        working-directory:  ${{ github.workspace }}/text-ui-test
+        run: ./runtest.sh
+
+      - name: Perform IO redirection test (Windows)
+        if: always() && runner.os == 'Windows'
+        working-directory:  ${{ github.workspace }}/text-ui-test
+        shell: cmd
+        run: runtest.bat

From 38a15dda21a52e1b8df3bea8c8badc2c1d25da38 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 10 Sep 2022 00:06:15 +0800
Subject: [PATCH 43/67] Make gradlew executable

---
 gradlew | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 gradlew

diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755

From 1ead7d44f73daba7f10baafe6613a108f83ec54a Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 10 Sep 2022 00:09:16 +0800
Subject: [PATCH 44/67] Make runtest.sh executable

---
 text-ui-test/runtest.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 text-ui-test/runtest.sh

diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh
old mode 100644
new mode 100755

From a13b5aaeef963054ce8b595c47814a8a7f183b3b Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 10 Sep 2022 00:16:28 +0800
Subject: [PATCH 45/67] Modify runtest.sh

---
 text-ui-test/runtest.sh | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh
index c9ec870033..b2311604c7 100755
--- a/text-ui-test/runtest.sh
+++ b/text-ui-test/runtest.sh
@@ -13,25 +13,52 @@ then
 fi
 
 # compile the code into the bin folder, terminates if error occurred
-if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/*.java
+if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/duke/*.java ../src/main/java/duke/task/*.java
 then
     echo "********** BUILD FAILURE **********"
     exit 1
 fi
 
+# delete data
+if [ -e "./duke.txt" ]
+then
+    rm duke.txt
+fi
+
 # run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
-java -classpath ../bin Duke < input.txt > ACTUAL.TXT
+java -classpath ../bin duke.Duke < input.txt > ACTUAL.TXT
 
 # convert to UNIX format
 cp EXPECTED.TXT EXPECTED-UNIX.TXT
 dos2unix ACTUAL.TXT EXPECTED-UNIX.TXT
 
+# delete output from previous run
+if [ -e "./ACTUAL1.TXT" ]
+then
+    rm ACTUAL1.TXT
+fi
+
+# run the program, feed commands from input.txt file and redirect the output to the ACTUAL1.TXT
+java -classpath ../bin duke.Duke < input.txt > ACTUAL1.TXT
+
+# convert to UNIX format
+cp EXPECTED1.TXT EXPECTED1-UNIX.TXT
+dos2unix ACTUAL1.TXT EXPECTED1-UNIX.TXT
+
 # compare the output to the expected output
 diff ACTUAL.TXT EXPECTED-UNIX.TXT
 if [ $? -eq 0 ]
 then
-    echo "Test result: PASSED"
-    exit 0
+    # compare the output to the expected output
+    diff ACTUAL1.TXT EXPECTED1-UNIX.TXT
+    if [ $? -eq 0 ]
+    then
+        echo "Test result: PASSED"
+        exit 0
+    else
+        echo "Test result: FAILED SECOND"
+        exit 1
+    fi
 else
     echo "Test result: FAILED"
     exit 1

From eb0dc25605d75e7963fff67a68d4548f3994cb05 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 10 Sep 2022 00:20:20 +0800
Subject: [PATCH 46/67] Fix regression caused by adding quotes to string
 constant

---
 src/main/java/duke/ConsoleUi.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/duke/ConsoleUi.java b/src/main/java/duke/ConsoleUi.java
index 3e36d42098..d019bbc7b6 100644
--- a/src/main/java/duke/ConsoleUi.java
+++ b/src/main/java/duke/ConsoleUi.java
@@ -8,7 +8,7 @@
  */
 public class ConsoleUi implements UiInterface {
     private static String UPPER_BAR = ",----------------------------------------------------------------";
-    private static String LOWER_BAR = "\"'----------------------------------------------------------------\"";
+    private static String LOWER_BAR = "'----------------------------------------------------------------";
     private static String LEFT_BAR = "| ";
 
     /**

From 316e6a80d52535420a29ae50c0ee8666da793b15 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Sat, 10 Sep 2022 13:44:06 +0800
Subject: [PATCH 47/67] Prepare by abstracting out StringMatcher from
 CommandMatcher

CommandMatcher is actually a subclass of StringMatcher<DukeResponse>.

By abstracting this out, more opportunities to use this pattern to parse
strings reveal themselves. This includes detecting keywords.

Let's take StringMatcher out of CommandMatcher and make it a superclass.
---
 src/main/java/duke/CommandMatcher.java | 22 ++------------
 src/main/java/duke/StringMatcher.java  | 42 ++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 20 deletions(-)
 create mode 100644 src/main/java/duke/StringMatcher.java

diff --git a/src/main/java/duke/CommandMatcher.java b/src/main/java/duke/CommandMatcher.java
index 51fadf1e1d..a544f7fca6 100644
--- a/src/main/java/duke/CommandMatcher.java
+++ b/src/main/java/duke/CommandMatcher.java
@@ -8,7 +8,7 @@
  * This class serves as a way to abstract the idea of making a command
  * as a matching process and an action.
  */
-public class CommandMatcher {
+public class CommandMatcher extends StringMatcher<DukeResponse> {
     private Predicate<String> shouldRunAction;
     private Function<String, DukeResponse> action;
 
@@ -19,10 +19,9 @@ public class CommandMatcher {
      * @param action Action to run.
      */
     public CommandMatcher(Predicate<String> shouldRunAction, Function<String, DukeResponse> action) {
+        super(shouldRunAction, action);
         assert shouldRunAction != null;
         assert action != null;
-        this.shouldRunAction = shouldRunAction;
-        this.action = action;
     }
 
     /**
@@ -49,21 +48,4 @@ public static CommandMatcher of(String prefix, DukeExceptionFunction<String> act
         return new CommandMatcher((cmd) -> cmd.strip().startsWith(prefix),
                 DukeExceptionFunction.toFunction(action));
     }
-
-    /**
-     * Checks if the string matches.
-     * If it does, it would execute the action.
-     *
-     * @param input String to check if it is for this command.
-     * @return A DukeResponse if the string matches.
-     */
-    public Optional<DukeResponse> run(String input) {
-        assert input != null;
-        if (shouldRunAction.test(input)) {
-            DukeResponse result = action.apply(input);
-            assert result != null;
-            return Optional.of(result);
-        }
-        return Optional.empty();
-    }
 }
diff --git a/src/main/java/duke/StringMatcher.java b/src/main/java/duke/StringMatcher.java
new file mode 100644
index 0000000000..de898e8362
--- /dev/null
+++ b/src/main/java/duke/StringMatcher.java
@@ -0,0 +1,42 @@
+package duke;
+
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+/**
+ * This class serves as a way to abstract the idea of getting a result
+ * from a string.
+ */
+public class StringMatcher<T> {
+    private Predicate<String> isMatch;
+    private Function<String, T> getResult;
+
+    /**
+     * Constructs an object that calculates a particular case.
+     *
+     * @param isMatch Checks if this function handles this case.
+     * @param getResult Function that calculates result.
+     */
+    public StringMatcher(Predicate<String> isMatch, Function<String, T> getResult) {
+        assert isMatch != null;
+        assert getResult != null;
+        this.isMatch = isMatch;
+        this.getResult = getResult;
+    }
+
+    /**
+     * Checks if the string matches.
+     * If it does, it would give the result.
+     *
+     * @param input String to check if it is for this command.
+     * @return An Optional of class T if the string matches.
+     */
+    public Optional<T> run(String input) {
+        assert input != null;
+        if (isMatch.test(input)) {
+            return Optional.of(getResult.apply(input));
+        }
+        return Optional.empty();
+    }
+}

From 206397805ab17b30f137c2759ad26a11f6993f13 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Mon, 12 Sep 2022 00:21:24 +0800
Subject: [PATCH 48/67] Add C-Natural Dates

The code previously only supported a small number of date formats.
However, some date formats may need some processing to understand.

Adding natural dates makes the application more user-friendly.

Let's
* Increase the scope of parsing of dates by building an entire parsing
tool, spanning days of the week, months, years, times, dates.
* Write tests for the parsing of dates.
---
 src/main/java/duke/CommandMatcher.java     |   1 -
 src/main/java/duke/ConsoleUi.java          |   6 +-
 src/main/java/duke/ParsedDateTime.java     | 669 +++++++++++++++++++++
 src/main/java/duke/StringMatcher.java      |  16 +
 src/main/java/duke/task/Deadline.java      |   2 +-
 src/main/java/duke/task/Event.java         |   2 +-
 src/main/java/duke/task/TaskList.java      |   2 +-
 src/test/java/duke/ParsedDateTimeTest.java |  44 ++
 src/test/java/duke/task/DeadlineTest.java  |  18 +-
 src/test/java/duke/task/EventTest.java     |  18 +-
 text-ui-test/ACTUAL1.TXT                   |  34 +-
 text-ui-test/EXPECTED.TXT                  |  10 +-
 text-ui-test/EXPECTED1.TXT                 |  34 +-
 text-ui-test/duke.txt                      |   4 +-
 text-ui-test/input.txt                     |   2 +-
 15 files changed, 795 insertions(+), 67 deletions(-)
 create mode 100644 src/test/java/duke/ParsedDateTimeTest.java

diff --git a/src/main/java/duke/CommandMatcher.java b/src/main/java/duke/CommandMatcher.java
index a544f7fca6..544566cf43 100644
--- a/src/main/java/duke/CommandMatcher.java
+++ b/src/main/java/duke/CommandMatcher.java
@@ -1,6 +1,5 @@
 package duke;
 
-import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
diff --git a/src/main/java/duke/ConsoleUi.java b/src/main/java/duke/ConsoleUi.java
index d019bbc7b6..55302baa41 100644
--- a/src/main/java/duke/ConsoleUi.java
+++ b/src/main/java/duke/ConsoleUi.java
@@ -7,9 +7,9 @@
  * Handles console-based user interface. Used for sanity checks.
  */
 public class ConsoleUi implements UiInterface {
-    private static String UPPER_BAR = ",----------------------------------------------------------------";
-    private static String LOWER_BAR = "'----------------------------------------------------------------";
-    private static String LEFT_BAR = "| ";
+    private static final String UPPER_BAR = ",----------------------------------------------------------------";
+    private static final String LOWER_BAR = "'----------------------------------------------------------------";
+    private static final String LEFT_BAR = "| ";
 
     /**
      * {@inheritDoc}
diff --git a/src/main/java/duke/ParsedDateTime.java b/src/main/java/duke/ParsedDateTime.java
index 38eda85d03..583148c3b0 100644
--- a/src/main/java/duke/ParsedDateTime.java
+++ b/src/main/java/duke/ParsedDateTime.java
@@ -1,21 +1,285 @@
 package duke;
 
+import java.time.DateTimeException;
+import java.time.DayOfWeek;
 import java.time.LocalDateTime;
+import java.time.Month;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoField;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalAdjuster;
+import java.time.temporal.TemporalAdjusters;
+import java.util.ArrayList;
 import java.util.Optional;
+import java.util.function.Predicate;
 
 /**
  * Helper class to parse date/time strings
  */
 public class ParsedDateTime {
     private static final DateTimeFormatter[] formatters = {
+        DateTimeFormatter.ofPattern("dd MMM yyyy HHmm"),
         DateTimeFormatter.ofPattern("yyyy-MM-dd"), DateTimeFormatter.ofPattern("d/M/yyyy HHmm"),
         DateTimeFormatter.BASIC_ISO_DATE, DateTimeFormatter.ISO_LOCAL_DATE, DateTimeFormatter.ISO_OFFSET_DATE,
         DateTimeFormatter.ISO_DATE, DateTimeFormatter.ISO_LOCAL_TIME, DateTimeFormatter.ISO_OFFSET_TIME,
         DateTimeFormatter.ISO_TIME, DateTimeFormatter.ISO_LOCAL_DATE_TIME, DateTimeFormatter.ISO_OFFSET_DATE_TIME,
         DateTimeFormatter.ISO_ZONED_DATE_TIME, DateTimeFormatter.ISO_DATE_TIME, DateTimeFormatter.ISO_ORDINAL_DATE,
         DateTimeFormatter.ISO_WEEK_DATE, DateTimeFormatter.ISO_INSTANT, DateTimeFormatter.RFC_1123_DATE_TIME };
+    private static final ArrayList<StringMatcher<TemporalAdjuster>> naturalDateParsers;
+    private static final ArrayList<StringMatcher<TemporalAdjuster>> naturalDateLatestTimeParsers;
+
+    private static final int BIG_NUMBER_OF_ITERATIONS = 1024;
+    private static final int HOURS_PER_DAY = 24;
+    private static final int MINUTES_PER_HOUR = 60;
+    private static final int DATE_29 = 29;
+    private static final int MONTH_FEB = 2;
+
+    static {
+        naturalDateParsers = new ArrayList<>();
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "mon", "monday" }),
+                s -> getDayOfWeekTemporalAdjuster(DayOfWeek.MONDAY)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "tue", "tuesday" }),
+                s -> getDayOfWeekTemporalAdjuster(DayOfWeek.TUESDAY)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "wed", "wednesday" }),
+                s -> getDayOfWeekTemporalAdjuster(DayOfWeek.WEDNESDAY)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "thur", "thursday" }),
+                s -> getDayOfWeekTemporalAdjuster(DayOfWeek.THURSDAY)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "fri", "friday" }),
+                s -> getDayOfWeekTemporalAdjuster(DayOfWeek.FRIDAY)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "sat", "saturday" }),
+                s -> getDayOfWeekTemporalAdjuster(DayOfWeek.SATURDAY)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "sun", "sunday" }),
+                s -> getDayOfWeekTemporalAdjuster(DayOfWeek.SUNDAY)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "jan", "january" }),
+                s -> getMonthTemporalAdjuster(Month.JANUARY)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "feb", "february" }),
+                s -> getMonthTemporalAdjuster(Month.FEBRUARY)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "mar", "march" }),
+                s -> getMonthTemporalAdjuster(Month.MARCH)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "apr", "april" }),
+                s -> getMonthTemporalAdjuster(Month.APRIL)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "may" }),
+                s -> getMonthTemporalAdjuster(Month.MAY)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "jun", "june" }),
+                s -> getMonthTemporalAdjuster(Month.JUNE)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "jul", "july" }),
+                s -> getMonthTemporalAdjuster(Month.JULY)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "aug", "august" }),
+                s -> getMonthTemporalAdjuster(Month.AUGUST)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "sep", "september" }),
+                s -> getMonthTemporalAdjuster(Month.SEPTEMBER)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "oct", "october" }),
+                s -> getMonthTemporalAdjuster(Month.OCTOBER)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "nov", "november" }),
+                s -> getMonthTemporalAdjuster(Month.NOVEMBER)));
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(new String[]{ "dec", "december" }),
+                s -> getMonthTemporalAdjuster(Month.DECEMBER)));
+        String[] dates = new String[38];
+        for (int i = 1; i <= 31; i++) {
+            // 1th included, this is a feature
+            dates[i - 1] = String.format("%dth", i);
+        }
+        // custom ordinals
+        dates[31] = "1st";
+        dates[32] = "2nd";
+        dates[33] = "3rd";
+        dates[34] = "21st";
+        dates[35] = "22nd";
+        dates[36] = "23rd";
+        dates[37] = "31st";
+        naturalDateParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(dates),
+                s -> {
+                    boolean isTwoDigit = '0' <= s.charAt(1) && s.charAt(1) <= '9';
+                    int date = Integer.parseInt(s.substring(0, 1));
+                    if (isTwoDigit) {
+                        date = Integer.parseInt(s.substring(0, 2));
+                    }
+                    return getDateTemporalAdjuster(date);
+                }));
+        Predicate<String> isDate = s -> {
+            String[] parts = s.split("/");
+            if (parts.length == 2 || parts.length == 3) {
+                for (String part : parts) {
+                    if (!isNumeric(part)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            parts = s.split("-");
+            if (parts.length == 2 || parts.length == 3) {
+                for (String part : parts) {
+                    if (!isNumeric(part)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            return false;
+        };
+        naturalDateParsers.add(new StringMatcher<>(
+                isDate,
+                s -> {
+                    try {
+                        int date = -1;
+                        int month = -1;
+                        int year = -1;
+                        String[] parts = s.split("/");
+                        if (parts.length == 2 || parts.length == 3) {
+                            date = Integer.parseInt(parts[0]);
+                            month = Integer.parseInt(parts[1]);
+                            if (parts.length == 3) {
+                                year = Integer.parseInt(parts[2]);
+                            }
+                        }
+                        parts = s.split("-");
+                        if (parts.length == 2 || parts.length == 3) {
+                            date = Integer.parseInt(parts[0]);
+                            month = Integer.parseInt(parts[1]);
+                            if (parts.length == 3) {
+                                year = Integer.parseInt(parts[2]);
+                            }
+                        }
+                        if (year == -1) {
+                            return getDateMonthTemporalAdjuster(date, month);
+                        }
+                        return getDateMonthYearTemporalAdjuster(date, month, year);
+                    } catch (NumberFormatException ex) {
+                        return temporal -> {
+                            throw new DateTimeException("Parse error for date");
+                        };
+                    }
+                }));
+        naturalDateParsers.add(new StringMatcher<>(
+                ParsedDateTime::isNumeric,
+                s -> {
+                    try {
+                        int year = Integer.parseInt(s);
+                        if (year < 1) {
+                            return temporal -> {
+                                throw new DateTimeException("No negative years");
+                            };
+                        }
+                        return getYearTemporalAdjuster(year);
+                    } catch (NumberFormatException ex) {
+                        return temporal -> {
+                            throw new DateTimeException("Parse error for year");
+                        };
+                    }
+                }));
+        Predicate<String> isTime = s -> {
+            String[] parts = s.split("[:.]");
+            if (parts.length != 2) {
+                return false;
+            }
+            if (!isNumeric(parts[0])) {
+                return false;
+            }
+            if (isNumeric(parts[1])) {
+                return true;
+            }
+            if (parts[1].length() < 3) {
+                return false;
+            }
+            if (!isNumeric(parts[1].substring(0, parts[1].length() - 2))) {
+                return false;
+            }
+            String suffix = parts[1].substring(parts[1].length() - 2)
+                    .toLowerCase();
+            return suffix.equals("am") || suffix.equals("pm");
+        };
+        naturalDateParsers.add(new StringMatcher<>(
+                isTime,
+                s -> {
+                    try {
+                        String[] parts = s.split("[:.]");
+                        int hour = Integer.parseInt(parts[0]);
+                        int minute;
+                        boolean invalidHour;
+                        if (isNumeric(parts[1])) {
+                            minute = Integer.parseInt(parts[1]);
+                            invalidHour = hour < 0 || hour >= HOURS_PER_DAY;
+                        } else {
+                            minute = Integer.parseInt(parts[1].substring(0, parts[1].length() - 2));
+                            String suffix = parts[1].substring(parts[1].length() - 2)
+                                    .toLowerCase();
+                            invalidHour = hour <= 0 || hour > 12;
+                            if (suffix.equals("am")) {
+                                if (hour == 12) {
+                                    hour = 0;
+                                }
+                            } else if (suffix.equals("pm")) {
+                                if (hour != 12) {
+                                    hour += 12;
+                                }
+                            }
+                        }
+                        boolean invalidMinute = minute < 0 || minute >= MINUTES_PER_HOUR;
+                        if (invalidHour || invalidMinute) {
+                            return temporal -> {
+                                throw new DateTimeException("Invalid hour/minute for time");
+                            };
+                        }
+                        return getTimeTemporalAdjuster(hour, minute);
+                    } catch (NumberFormatException ex) {
+                        return temporal -> {
+                            throw new DateTimeException("Parse error for time");
+                        };
+                    }
+                }));
+        TemporalAdjuster lastTimeOfDay = temporal ->
+                LocalDateTime.from(temporal).withHour(23).withMinute(59).withSecond(0).withNano(0);
+        TemporalAdjuster lastTimeOfMonth = temporal ->
+                LocalDateTime.from(temporal).with(TemporalAdjusters.lastDayOfMonth()).with(lastTimeOfDay);
+        TemporalAdjuster lastTimeOfYear = temporal ->
+                LocalDateTime.from(temporal).with(TemporalAdjusters.lastDayOfYear()).with(lastTimeOfDay);
+        naturalDateLatestTimeParsers = new ArrayList<>();
+        String[] weekdays = new String[]{
+            "mon", "monday", "tue", "tuesday", "wed", "wednesday", "thur", "thursday", "fri", "friday",
+            "sat", "saturday", "sun", "sunday" };
+        String[] months = new String[]{
+            "jan", "january", "feb", "february", "mar", "march",
+            "apr", "april", "may", "jun", "june",
+            "jul", "july", "aug", "august", "sep", "september",
+            "oct", "october", "nov", "november", "dec", "december" };
+        naturalDateLatestTimeParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(weekdays),
+                s -> lastTimeOfDay));
+        naturalDateLatestTimeParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(months),
+                s -> lastTimeOfMonth));
+        naturalDateLatestTimeParsers.add(new StringMatcher<>(
+                StringMatcher.getCaseInsensitiveMatcher(dates),
+                s -> lastTimeOfDay));
+        naturalDateLatestTimeParsers.add(new StringMatcher<>(
+                isDate, s -> lastTimeOfDay));
+        naturalDateLatestTimeParsers.add(new StringMatcher<>(
+                ParsedDateTime::isNumeric, s -> lastTimeOfYear));
+        naturalDateLatestTimeParsers.add(new StringMatcher<>(
+                isTime, s -> t -> t));
+    }
 
     private Optional<LocalDateTime> parsedDateTime;
     private String input;
@@ -39,6 +303,411 @@ public ParsedDateTime(String input) {
         }
     }
 
+    /**
+     * Constructs an object that handles an already parsed date/time.
+     *
+     * @param parsed Already parsed date/time.
+     */
+    public ParsedDateTime(LocalDateTime parsed) {
+        input = "";
+        parsedDateTime = Optional.of(parsed);
+    }
+
+    /**
+     * Finds the earliest time after now that matches the description of input. If no such
+     * time exists, it falls back on the earliest time before now. If no such time still
+     * exists, it just gives the input as a ParsedDateTime which stores a String.
+     *
+     * @param input Human-readable description of the time, which only contains
+     *              valid descriptors. Valid descriptors include:
+     *              * case insensitive Mon-Sun/Monday-Sunday
+     *              * an ordinal which specifies a date of the month, e.g. 3rd or 31st
+     *              * two or three numbers separated by a slashes or dashes which denote
+     *                a date, e.g. 3/7 for the next 3rd of July, 3/7/2012 for the 3rd
+     *                of July on 2012, and 1-2 for the next first of February.
+     *              * a single number, for a year, e.g. 2024 for year 2024
+     *              * a month name, or the abbreviation of a month name, e.g. Jan, July
+     *              * two numbers separated by colons or periods (with optional
+     *                AM/am/PM/pm after it) for a time
+     * @param latestTime If true, gives the latest time in the first block of time
+     *                   which matches the input description. Example: If today is not
+     *                   Monday, "Mon" gives the time as 23:59 on Monday if latestTime
+     *                   else 00:00.
+     * @return ParsedDateTime of the input. If input is not readable as a time, it
+     *         a ParsedDateTime instance that acts like a String.
+     */
+    public static ParsedDateTime of(String input, boolean latestTime) {
+        String[] tokens = input.split(" ");
+        try {
+            ArrayList<TemporalAdjuster> adjusters = getDateTimeAdjusters(naturalDateParsers, tokens);
+            ArrayList<TemporalAdjuster> latestTimeAdjusters = getDateTimeAdjusters(
+                    naturalDateLatestTimeParsers, tokens);
+            Optional<Temporal> result = Optional.empty();
+            Temporal now = LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES);
+            result = result.or(() -> findAfterTimeMatching(now, adjusters));
+            result = result.or(() -> findBeforeTimeMatching(now, adjusters));
+            return result.map(t -> {
+                if (!latestTime) {
+                    return t;
+                }
+                return applyLatestTimeAdjusters(latestTimeAdjusters, t);
+            })
+                    .map(LocalDateTime::from)
+                    .map(t -> new ParsedDateTime(t))
+                    .orElseGet(() -> new ParsedDateTime(input));
+        } catch (IllegalArgumentException ex) {
+            // thrown by getNaturalDateParsers if not all tokens are valid
+            return new ParsedDateTime(input);
+        }
+    }
+
+    /**
+     * Applies the latest time adjusters. Each adjuster gives the latest time the token would consider as part
+     * of the same length of time specified by the token, so this method finds the earliest time all the tokens
+     * would still consider as part of the same length of time.
+     *
+     * @param latestTimeAdjusters List of time adjusters which give the latest time considered.
+     * @param t The time which is specified by all tokens.
+     * @return Latest time considered by all tokens.
+     */
+    private static LocalDateTime applyLatestTimeAdjusters(ArrayList<TemporalAdjuster> latestTimeAdjusters, Temporal t) {
+        return latestTimeAdjusters.stream()
+                .map(adjuster -> LocalDateTime.from(t.with(adjuster)))
+                .min(LocalDateTime::compareTo)
+                .orElse(LocalDateTime.from(t));
+    }
+
+    /**
+     * Gets a time adjuster to set to the earliest time at or after the given time
+     * which is of the day of week specified.
+     *
+     * @param day Day of week.
+     * @return Time adjuster which sets to next or same time.
+     */
+    private static TemporalAdjuster getDayOfWeekTemporalAdjuster(DayOfWeek day) {
+        return temporal -> {
+            if (DayOfWeek.from(LocalDateTime.from(temporal)).equals(day)) {
+                return temporal;
+            }
+            Temporal result = TemporalAdjusters.next(day).adjustInto(temporal);
+            return LocalDateTime.from(result).truncatedTo(ChronoUnit.DAYS);
+        };
+    }
+
+    /**
+     * Checks if a string consists of digits.
+     *
+     * @param s A String.
+     * @return true if consisting only of ASCII digits, false otherwise.
+     */
+    private static boolean isNumeric(String s) {
+        for (int i = 0; i < s.length(); i++) {
+            if (s.charAt(i) < '0' || '9' < s.charAt(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Gets a time adjuster to set to the earliest time at or after the given time
+     * which is of the month specified.
+     *
+     * @param month Month.
+     * @return Time adjuster which sets to next or same time.
+     */
+    private static TemporalAdjuster getMonthTemporalAdjuster(Month month) {
+        return temporal -> {
+            if (Month.from(temporal).equals(month)) {
+                return temporal;
+            }
+            Temporal result = temporal;
+            while (!Month.from(result).equals(month)) {
+                result = TemporalAdjusters.firstDayOfNextMonth().adjustInto(result);
+            }
+            return LocalDateTime.from(result).truncatedTo(ChronoUnit.DAYS);
+        };
+    }
+
+    /**
+     * Gets a time adjuster to set to the earliest time at or after the given time
+     * which is of the date of the month specified.
+     *
+     * @param date Date of the month.
+     * @return Time adjuster which sets to next or same time.
+     */
+    private static TemporalAdjuster getDateTemporalAdjuster(int date) {
+        assert 1 <= date && date <= 31;
+        return temporal -> {
+            int temporalDayOfMonth = temporal.get(ChronoField.DAY_OF_MONTH);
+            if (temporalDayOfMonth == date) {
+                return temporal;
+            }
+            Temporal result = temporal;
+            while (true) {
+                int resultDayOfMonth = result.get(ChronoField.DAY_OF_MONTH);
+                if (resultDayOfMonth == date) {
+                    break;
+                }
+                if (resultDayOfMonth > date) {
+                    result = result.with(TemporalAdjusters.firstDayOfNextMonth());
+                    resultDayOfMonth = 1;
+                }
+                result = LocalDateTime.from(result).plusDays(date - resultDayOfMonth);
+            }
+            LocalDateTime startOfDay = LocalDateTime.from(result).truncatedTo(ChronoUnit.DAYS);
+            return startOfDay;
+        };
+    }
+
+    /**
+     * Gets a time adjuster to set to the earliest time at or after the given time
+     * which is of the time specified.
+     *
+     * @param hour Hour of day.
+     * @param minute Minute of hour.
+     * @return Time adjuster which sets to next or same time.
+     */
+    private static TemporalAdjuster getTimeTemporalAdjuster(int hour, int minute) {
+        boolean isValidHour = 0 <= hour && hour < HOURS_PER_DAY;
+        boolean isValidMinute = 0 <= minute && minute < MINUTES_PER_HOUR;
+        if (!isValidHour || !isValidMinute) {
+            return temporal -> {
+                throw new DateTimeException(
+                        String.format("Invalid time: Hour %d, Minute %d", hour, minute));
+            };
+        }
+        int minuteOfDay = minute + hour * MINUTES_PER_HOUR;
+        return temporal -> {
+            if (temporal.get(ChronoField.MINUTE_OF_DAY) <= minuteOfDay) {
+                return temporal.with(ChronoField.MINUTE_OF_DAY, minuteOfDay);
+            }
+            return temporal.plus(1, ChronoUnit.DAYS)
+                    .with(ChronoField.MINUTE_OF_DAY, minuteOfDay);
+        };
+    }
+
+    /**
+     * Gets a time adjuster to set to the earliest time at or after the given time
+     * which is of the date/month specified.
+     *
+     * @param date Date of month.
+     * @param month Month.
+     * @return Time adjuster which sets to next or same time.
+     */
+    private static TemporalAdjuster getDateMonthTemporalAdjuster(int date, int month) {
+        boolean isValidDate = 1 <= date && date <= 31;
+        boolean isValidMonth = 1 <= month && month <= 12;
+        int[] daysInMonth = new int[]{ 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+        boolean isValidCombination = isValidDate && isValidMonth && date <= daysInMonth[month];
+        if (!isValidCombination) {
+            return temporal -> {
+                throw new DateTimeException(
+                        String.format("Date does not exist: Date %d, Month %d", date, month));
+            };
+        }
+        return temporal -> {
+            int temporalDate = temporal.get(ChronoField.DAY_OF_MONTH);
+            int temporalMonth = temporal.get(ChronoField.MONTH_OF_YEAR);
+            boolean isDate = temporalDate == date;
+            boolean isMonth = temporalMonth == month;
+            if (isDate && isMonth) {
+                return temporal;
+            }
+            boolean isLaterOnSameMonth = temporalMonth == month && temporalDate > date;
+            int year = LocalDateTime.from(temporal).getYear();
+            if (temporalMonth > month || isLaterOnSameMonth) {
+                year++;
+            }
+            if (date == DATE_29 && month == MONTH_FEB) {
+                year = leapYearNextOrSame(year);
+            }
+            return LocalDateTime.of(year, month, date, 0, 0, 0);
+        };
+    }
+
+    /**
+     * Gets a time adjuster to set to the earliest time at or after the given time
+     * which is of the date/month/year specified.
+     *
+     * @param date Date of month.
+     * @param month Month.
+     * @param year Year.
+     * @return Time adjuster which sets to next or same time.
+     */
+    private static TemporalAdjuster getDateMonthYearTemporalAdjuster(int date, int month, int year) {
+        boolean isValidDate = 1 <= date && date <= 31;
+        boolean isValidMonth = 1 <= month && month <= 12;
+        boolean isValidYear = 1 <= year;
+        int[] daysInMonth = new int[]{
+            0, 31, isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+        boolean isValidCombination = isValidYear && isValidDate && isValidMonth && date <= daysInMonth[month];
+        if (!isValidCombination) {
+            return temporal -> {
+                throw new DateTimeException(String.format(
+                        "Date does not exist: Date %d, Month %d, Year %d", date, month, year));
+            };
+        }
+        return temporal -> {
+            int temporalDate = temporal.get(ChronoField.DAY_OF_MONTH);
+            int temporalMonth = temporal.get(ChronoField.MONTH_OF_YEAR);
+            int temporalYear = temporal.get(ChronoField.YEAR);
+            boolean isDate = temporalDate == date;
+            boolean isMonth = temporalMonth == month;
+            boolean isYear = temporalYear == year;
+            if (isDate && isMonth && isYear) {
+                return temporal;
+            }
+            boolean isLaterOnSameYear = isYear && temporalMonth > month;
+            boolean isLaterOnSameMonth = isYear && isMonth && temporalDate > date;
+            if (temporalYear > year || isLaterOnSameYear || isLaterOnSameMonth) {
+                throw new DateTimeException(String.format(
+                        "Later date does not exist: Date %d, Month %d, Year %d", date, month, year));
+            }
+            return LocalDateTime.of(year, month, date, 0, 0, 0);
+        };
+    }
+
+    /**
+     * Gets a time adjuster to set to the earliest time at or after the given time
+     * which is of the year specified.
+     *
+     * @param year Year.
+     * @return Time adjuster which sets to next or same time.
+     */
+    private static TemporalAdjuster getYearTemporalAdjuster(int year) {
+        boolean isValidYear = 1 <= year;
+        if (!isValidYear) {
+            return temporal -> {
+                throw new DateTimeException(String.format(
+                        "Date does not exist:Year %d", year));
+            };
+        }
+        return temporal -> {
+            int temporalYear = temporal.get(ChronoField.YEAR);
+            boolean isYear = temporalYear == year;
+            if (isYear) {
+                return temporal;
+            }
+            if (temporalYear > year) {
+                throw new DateTimeException(String.format(
+                        "Later date does not exist: Year %d", year));
+            }
+            return LocalDateTime.of(year, 1, 1, 0, 0, 0);
+        };
+    }
+
+    /**
+     * Gets the next or same year which is a leap year.
+     *
+     * @param year Year.
+     * @return Next or same year which is a leap year.
+     */
+    private static int leapYearNextOrSame(int year) {
+        while (!isLeapYear(year)) {
+            year++;
+        }
+        return year;
+    }
+
+    /**
+     * Checks if the input year is a leap year.
+     *
+     * @param year Year.
+     * @return true if it is a leap year, false otherwise.
+     */
+    private static boolean isLeapYear(int year) {
+        return year % 400 == 0 || (year % 4 == 0 && year % 100 != 0);
+    }
+
+    /**
+     * Gets TemporalAdjusters which match the tokens available from the matchers.
+     *
+     * @param matchers StringMatchers which check the tokens to give TemporalAdjusters.
+     * @param tokens Array of String tokens.
+     * @return ArrayList of TemporalAdjusters.
+     * @throws IllegalArgumentException If some token is not recognized by the StringMatchers.
+     */
+    private static ArrayList<TemporalAdjuster> getDateTimeAdjusters(
+            ArrayList<StringMatcher<TemporalAdjuster>> matchers, String[] tokens) {
+        ArrayList<TemporalAdjuster> adjusters = new ArrayList<>();
+        for (String token : tokens) {
+            if (token.equals("")) {
+                continue;
+            }
+            adjusters.add(parseToken(matchers, token));
+        }
+        return adjusters;
+    }
+
+    /**
+     * Gets TemporalAdjusters which match the token available from the matchers.
+     *
+     * @param matchers StringMatchers which check the tokens to give TemporalAdjusters.
+     * @param token Array of String tokens.
+     * @return TemporalAdjuster determined by StringMatchers.
+     * @throws IllegalArgumentException If the token is not recognized by the StringMatchers.
+     */
+    private static TemporalAdjuster parseToken(ArrayList<StringMatcher<TemporalAdjuster>> matchers, String token) {
+        Optional<TemporalAdjuster> adjuster = Optional.empty();
+        for (StringMatcher<TemporalAdjuster> matcher : matchers) {
+            adjuster = adjuster.or(() -> matcher.run(token));
+        }
+        return adjuster.orElseThrow(() -> new IllegalArgumentException("Unrecognised token"));
+    }
+
+    /**
+     * Finds the time after the given time which is a fixed point of all the adjusters.
+     * Warning: Imperfect practical implementation which stops an infinite loop.
+     *
+     * @param time Starting time.
+     * @param adjusters Adjusters which find the next time that works according to their description.
+     * @return Time which satisfies all adjusters' descriptions.
+     */
+    private static Optional<Temporal> findAfterTimeMatching(Temporal time, ArrayList<TemporalAdjuster> adjusters) {
+        try {
+            Temporal result = time;
+            for (int i = 0; i < BIG_NUMBER_OF_ITERATIONS; i++) {
+                Temporal originalTime = result;
+                for (TemporalAdjuster adjuster : adjusters) {
+                    result = adjuster.adjustInto(result);
+                }
+                if (originalTime.equals(result)) {
+                    return Optional.of(result);
+                }
+            }
+            return Optional.empty();
+        } catch (DateTimeException ex) {
+            return Optional.empty();
+        }
+    }
+
+    /**
+     * Finds the time before the given time which is a fixed point of all the adjusters.
+     *
+     * @param time Ending time.
+     * @param adjusters Adjusters which find the next time that works according to their description.
+     * @return Time which satisfies all adjusters' descriptions.
+     */
+    private static Optional<Temporal> findBeforeTimeMatching(Temporal time, ArrayList<TemporalAdjuster> adjusters) {
+        try {
+            Temporal result = LocalDateTime.of(1, 1, 1, 0, 0, 0);
+            LocalDateTime endingTime = LocalDateTime.from(time);
+            while (LocalDateTime.from(result).compareTo(endingTime) <= 0) {
+                Temporal originalTime = result;
+                for (TemporalAdjuster adjuster : adjusters) {
+                    result = adjuster.adjustInto(result);
+                }
+                if (originalTime.equals(result)) {
+                    return Optional.of(result);
+                }
+            }
+            return Optional.empty();
+        } catch (DateTimeException ex) {
+            return Optional.empty();
+        }
+    }
+
     /**
      * Gets a nicely-formatted date.
      *
diff --git a/src/main/java/duke/StringMatcher.java b/src/main/java/duke/StringMatcher.java
index de898e8362..d15e447c93 100644
--- a/src/main/java/duke/StringMatcher.java
+++ b/src/main/java/duke/StringMatcher.java
@@ -25,6 +25,22 @@ public StringMatcher(Predicate<String> isMatch, Function<String, T> getResult) {
         this.getResult = getResult;
     }
 
+    public static Predicate<String> getCaseInsensitiveMatcher(String[] matches) {
+        String[] copy = new String[matches.length];
+        for (int i = 0; i < matches.length; i++) {
+            copy[i] = matches[i].toLowerCase();
+        }
+        return s -> {
+            String lowercase = s.toLowerCase();
+            for (String candidate : copy) {
+                if (lowercase.equals(candidate)) {
+                    return true;
+                }
+            }
+            return false;
+        };
+    }
+
     /**
      * Checks if the string matches.
      * If it does, it would give the result.
diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java
index 4a695ba653..0e2a8f757a 100644
--- a/src/main/java/duke/task/Deadline.java
+++ b/src/main/java/duke/task/Deadline.java
@@ -27,7 +27,7 @@ public Deadline(String description, String by) {
      */
     public Deadline(String description, String by, boolean isDone) {
         super(description, isDone);
-        datetime = new ParsedDateTime(by);
+        datetime = ParsedDateTime.of(by, true);
         assert description != null;
         assert by != null;
     }
diff --git a/src/main/java/duke/task/Event.java b/src/main/java/duke/task/Event.java
index 26e73a533d..bbe42f286b 100644
--- a/src/main/java/duke/task/Event.java
+++ b/src/main/java/duke/task/Event.java
@@ -29,7 +29,7 @@ public Event(String description, String at, boolean isDone) {
         super(description, isDone);
         assert description != null;
         assert at != null;
-        datetime = new ParsedDateTime(at);
+        datetime = ParsedDateTime.of(at, true);
     }
 
     /**
diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java
index 2e49a82d7b..fca4ce48e0 100644
--- a/src/main/java/duke/task/TaskList.java
+++ b/src/main/java/duke/task/TaskList.java
@@ -49,7 +49,7 @@ public static Task getTask(String index) throws DukeException {
     }
 
     /**
-     * Get tasks that match the search term.
+     * Gets tasks that match the search term.
      *
      * @param query Search term.
      * @return List of tasks.
diff --git a/src/test/java/duke/ParsedDateTimeTest.java b/src/test/java/duke/ParsedDateTimeTest.java
new file mode 100644
index 0000000000..8fc98676b1
--- /dev/null
+++ b/src/test/java/duke/ParsedDateTimeTest.java
@@ -0,0 +1,44 @@
+package duke;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+public class ParsedDateTimeTest {
+    @Test
+    @Timeout(1)
+    public void of_makingObjects_normalBehavior() {
+        assertEquals(ParsedDateTime.of("345", true).toString(), "31 Dec 0345 2359");
+        assertEquals(ParsedDateTime.of("345", false).toString(), "01 Jan 0345 0000");
+        assertEquals(ParsedDateTime.of("29/2/1984", false).toString(), "29 Feb 1984 0000");
+        assertEquals(ParsedDateTime.of("29-2-1984", true).toString(), "29 Feb 1984 2359");
+        assertEquals(ParsedDateTime.of("Friday 13th 1985", true).toString(), "13 Sep 1985 2359");
+        assertEquals(ParsedDateTime.of("Friday 13th 1985", false).toString(), "13 Sep 1985 0000");
+        assertEquals(ParsedDateTime.of("January 1984", true).toString(), "31 Jan 1984 2359");
+        assertEquals(ParsedDateTime.of("Jan 1984", false).toString(), "01 Jan 1984 0000");
+        assertEquals(ParsedDateTime.of("Friday MAY 1984", true).toString(), "04 May 1984 2359");
+        assertEquals(ParsedDateTime.of("Friday MAY 1984", false).toString(), "04 May 1984 0000");
+        assertEquals(ParsedDateTime.of("12:34", true).toString(), ParsedDateTime.of("12:34", false).toString());
+        assertEquals(ParsedDateTime.of("12:34pm", true).toString(), ParsedDateTime.of("12:34", false).toString());
+        assertEquals(ParsedDateTime.of("11:34am", true).toString(), ParsedDateTime.of("11:34", false).toString());
+        assertEquals(ParsedDateTime.of("11:34pm", true).toString(), ParsedDateTime.of("23:34", false).toString());
+        assertEquals(ParsedDateTime.of("12:34am", true).toString(), ParsedDateTime.of("00:34", false).toString());
+        assertEquals(ParsedDateTime.of("12:34Am", true).toString(), ParsedDateTime.of("12:34aM", false).toString());
+        assertEquals(ParsedDateTime.of("1st 1th 1St 1/1/1950 January Jan jan 1950", true).toString(), "01 Jan 1950 2359");
+    }
+
+    @Test
+    @Timeout(1)
+    public void of_makingObjects_cannotConstruct() {
+        String[] testCases = new String[]{
+            "2022 fri 31st", "29/2 2100", "29-2-2100", "12/12-12", "23rd 14/5", "34/56", "-3",
+            "Jan Jul", "2030 2040", "Monday Tuesday", "1st 2nd",
+            "13.00am", "0.00am", "13.0pm", "0.0pm", "-3:-3", "26.26"
+        };
+        for (String s : testCases) {
+            assertEquals(ParsedDateTime.of(s, true).toString(), s);
+            assertEquals(ParsedDateTime.of(s, false).toString(), s);
+        }
+    }
+}
diff --git a/src/test/java/duke/task/DeadlineTest.java b/src/test/java/duke/task/DeadlineTest.java
index c5a7613cff..dc8b5ebd25 100644
--- a/src/test/java/duke/task/DeadlineTest.java
+++ b/src/test/java/duke/task/DeadlineTest.java
@@ -8,16 +8,16 @@
 public class DeadlineTest {
     @Test
     public void getAsStringArray_makingObjects_normalBehavior() {
-        Task task1 = new Deadline("task one", "1", false);
-        Task task2 = new Deadline("task two", "2", true);
-        Task task3 = new Deadline("task three", "3");
+        Task task1 = new Deadline("task one", "not-date-1", false);
+        Task task2 = new Deadline("task two", "not-date-2", true);
+        Task task3 = new Deadline("task three", "not-date-3");
 
-        assertEquals("[D][ ] task one (by: 1)", task1.toString());
-        assertEquals("[D][X] task two (by: 2)", task2.toString());
-        assertEquals("[D][ ] task three (by: 3)", task3.toString());
+        assertEquals("[D][ ] task one (by: not-date-1)", task1.toString());
+        assertEquals("[D][X] task two (by: not-date-2)", task2.toString());
+        assertEquals("[D][ ] task three (by: not-date-3)", task3.toString());
 
-        assertArrayEquals(new String[] { "Deadline", "task one", "false", "1" }, task1.getAsStringArray());
-        assertArrayEquals(new String[] { "Deadline", "task two", "true", "2" }, task2.getAsStringArray());
-        assertArrayEquals(new String[] { "Deadline", "task three", "false", "3" }, task3.getAsStringArray());
+        assertArrayEquals(new String[] { "Deadline", "task one", "false", "not-date-1" }, task1.getAsStringArray());
+        assertArrayEquals(new String[] { "Deadline", "task two", "true", "not-date-2" }, task2.getAsStringArray());
+        assertArrayEquals(new String[] { "Deadline", "task three", "false", "not-date-3" }, task3.getAsStringArray());
     }
 }
diff --git a/src/test/java/duke/task/EventTest.java b/src/test/java/duke/task/EventTest.java
index 9e33fc7662..32ce400c9e 100644
--- a/src/test/java/duke/task/EventTest.java
+++ b/src/test/java/duke/task/EventTest.java
@@ -8,16 +8,16 @@
 public class EventTest {
     @Test
     public void getAsStringArray_makingObjects_normalBehavior() {
-        Task task1 = new Event("task one", "1", false);
-        Task task2 = new Event("task two", "2", true);
-        Task task3 = new Event("task three", "3");
+        Task task1 = new Event("task one", "not-date-1", false);
+        Task task2 = new Event("task two", "not-date-2", true);
+        Task task3 = new Event("task three", "not-date-3");
 
-        assertEquals("[E][ ] task one (at: 1)", task1.toString());
-        assertEquals("[E][X] task two (at: 2)", task2.toString());
-        assertEquals("[E][ ] task three (at: 3)", task3.toString());
+        assertEquals("[E][ ] task one (at: not-date-1)", task1.toString());
+        assertEquals("[E][X] task two (at: not-date-2)", task2.toString());
+        assertEquals("[E][ ] task three (at: not-date-3)", task3.toString());
 
-        assertArrayEquals(new String[] { "Event", "task one", "false", "1" }, task1.getAsStringArray());
-        assertArrayEquals(new String[] { "Event", "task two", "true", "2" }, task2.getAsStringArray());
-        assertArrayEquals(new String[] { "Event", "task three", "false", "3" }, task3.getAsStringArray());
+        assertArrayEquals(new String[] { "Event", "task one", "false", "not-date-1" }, task1.getAsStringArray());
+        assertArrayEquals(new String[] { "Event", "task two", "true", "not-date-2" }, task2.getAsStringArray());
+        assertArrayEquals(new String[] { "Event", "task three", "false", "not-date-3" }, task3.getAsStringArray());
     }
 }
diff --git a/text-ui-test/ACTUAL1.TXT b/text-ui-test/ACTUAL1.TXT
index be3fb5a5bb..8113bbdebf 100644
--- a/text-ui-test/ACTUAL1.TXT
+++ b/text-ui-test/ACTUAL1.TXT
@@ -29,7 +29,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -72,7 +72,7 @@
 | 1.[T][X] homework
 | 2.[E][X] meet friends (at: [unknown])
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -94,7 +94,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -112,7 +112,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -123,14 +123,14 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Marked your task as done:
-| [E][X] meet people at function x/y/z whatever (at: 7:12am)
+| [E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -148,7 +148,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -166,7 +166,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -185,14 +185,14 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | That's going to happen at some time later:
-| [E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| [E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -202,7 +202,7 @@
 | 11.[T][ ] project 12
 | 12.[E][ ] meet friends (at: [unknown])
 | 13.[E][ ] meet people at dinner (at: 6:25 pm)
-| 14.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 14.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Good luck with the deadline, here's the task:
@@ -221,7 +221,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -231,7 +231,7 @@
 | 11.[T][ ] project 12
 | 12.[E][ ] meet friends (at: [unknown])
 | 13.[E][ ] meet people at dinner (at: 6:25 pm)
-| 14.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 14.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 15.[D][ ] /at mysterious (by: [unknown])
 | 16.[D][ ] /by mysterious number 2 (by: [unknown])
 | 17.[D][ ] rush this please (by: when?)
@@ -249,7 +249,7 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 3.[D][X] /at mysterious (by: [unknown])
 | 4.[D][X] /by mysterious number 2 (by: [unknown])
 | 5.[D][ ] rush this please (by: when?)
@@ -259,7 +259,7 @@
 | 9.[T][ ] project 12
 | 10.[E][ ] meet friends (at: [unknown])
 | 11.[E][ ] meet people at dinner (at: 6:25 pm)
-| 12.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 13.[D][ ] /at mysterious (by: [unknown])
 | 14.[D][ ] /by mysterious number 2 (by: [unknown])
 | 15.[D][ ] rush this please (by: when?)
@@ -283,7 +283,7 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 3.[D][X] /at mysterious (by: [unknown])
 | 4.[D][X] /by mysterious number 2 (by: [unknown])
 | 5.[D][ ] rush this please (by: when?)
@@ -293,7 +293,7 @@
 | 9.[T][ ] project 12
 | 10.[E][ ] meet friends (at: [unknown])
 | 11.[E][ ] meet people at dinner (at: 6:25 pm)
-| 12.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 13.[D][ ] /at mysterious (by: [unknown])
 | 14.[D][ ] /by mysterious number 2 (by: [unknown])
 | 15.[D][ ] rush this please (by: when?)
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index 3bb4a2c8d7..abc5fd0e8a 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -126,7 +126,7 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | That's going to happen at some time later:
-| [E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| [E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
@@ -135,7 +135,7 @@
 | 3.[T][X] project 12
 | 4.[E][ ] meet friends (at: [unknown])
 | 5.[E][ ] meet people at dinner (at: 6:25 pm)
-| 6.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 6.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Good luck with the deadline, here's the task:
@@ -156,7 +156,7 @@
 | 3.[T][X] project 12
 | 4.[E][ ] meet friends (at: [unknown])
 | 5.[E][ ] meet people at dinner (at: 6:25 pm)
-| 6.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 6.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 7.[D][ ] /at mysterious (by: [unknown])
 | 8.[D][ ] /by mysterious number 2 (by: [unknown])
 | 9.[D][ ] rush this please (by: when?)
@@ -176,7 +176,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -202,7 +202,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
diff --git a/text-ui-test/EXPECTED1.TXT b/text-ui-test/EXPECTED1.TXT
index be3fb5a5bb..8113bbdebf 100644
--- a/text-ui-test/EXPECTED1.TXT
+++ b/text-ui-test/EXPECTED1.TXT
@@ -29,7 +29,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -72,7 +72,7 @@
 | 1.[T][X] homework
 | 2.[E][X] meet friends (at: [unknown])
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -94,7 +94,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -112,7 +112,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -123,14 +123,14 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Marked your task as done:
-| [E][X] meet people at function x/y/z whatever (at: 7:12am)
+| [E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][ ] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -148,7 +148,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -166,7 +166,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -185,14 +185,14 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | That's going to happen at some time later:
-| [E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| [E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -202,7 +202,7 @@
 | 11.[T][ ] project 12
 | 12.[E][ ] meet friends (at: [unknown])
 | 13.[E][ ] meet people at dinner (at: 6:25 pm)
-| 14.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 14.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Good luck with the deadline, here's the task:
@@ -221,7 +221,7 @@
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: [unknown])
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 5.[D][X] /at mysterious (by: [unknown])
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
@@ -231,7 +231,7 @@
 | 11.[T][ ] project 12
 | 12.[E][ ] meet friends (at: [unknown])
 | 13.[E][ ] meet people at dinner (at: 6:25 pm)
-| 14.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 14.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 15.[D][ ] /at mysterious (by: [unknown])
 | 16.[D][ ] /by mysterious number 2 (by: [unknown])
 | 17.[D][ ] rush this please (by: when?)
@@ -249,7 +249,7 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 3.[D][X] /at mysterious (by: [unknown])
 | 4.[D][X] /by mysterious number 2 (by: [unknown])
 | 5.[D][ ] rush this please (by: when?)
@@ -259,7 +259,7 @@
 | 9.[T][ ] project 12
 | 10.[E][ ] meet friends (at: [unknown])
 | 11.[E][ ] meet people at dinner (at: 6:25 pm)
-| 12.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 13.[D][ ] /at mysterious (by: [unknown])
 | 14.[D][ ] /by mysterious number 2 (by: [unknown])
 | 15.[D][ ] rush this please (by: when?)
@@ -283,7 +283,7 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][X] meet people at function x/y/z whatever (at: 7:12am)
+| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 3.[D][X] /at mysterious (by: [unknown])
 | 4.[D][X] /by mysterious number 2 (by: [unknown])
 | 5.[D][ ] rush this please (by: when?)
@@ -293,7 +293,7 @@
 | 9.[T][ ] project 12
 | 10.[E][ ] meet friends (at: [unknown])
 | 11.[E][ ] meet people at dinner (at: 6:25 pm)
-| 12.[E][ ] meet people at function x/y/z whatever (at: 7:12am)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
 | 13.[D][ ] /at mysterious (by: [unknown])
 | 14.[D][ ] /by mysterious number 2 (by: [unknown])
 | 15.[D][ ] rush this please (by: when?)
diff --git a/text-ui-test/duke.txt b/text-ui-test/duke.txt
index 8c67ce25ab..da40954a5a 100644
--- a/text-ui-test/duke.txt
+++ b/text-ui-test/duke.txt
@@ -1,5 +1,5 @@
 /v8AVABvAEQAbw==,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
-/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AdAByAHUAZQ==,/v8ANwA6ADEAMgBhAG0=
+/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AdAByAHUAZQ==,/v8AMAA3ACAATgBvAHYAIAAxADUAMgA0ACAAMAA3ADEAMg==
 /v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
 /v8ARABlAGEAZABsAGkAbgBl,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
 /v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
@@ -9,7 +9,7 @@
 /v8AVABvAEQAbw==,/v8AcAByAG8AagBlAGMAdAAgADEAMg==,/v8AZgBhAGwAcwBl
 /v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAGYAcgBpAGUAbgBkAHM=,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
 /v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZABpAG4AbgBlAHI=,/v8AZgBhAGwAcwBl,/v8ANgA6ADIANQAgAHAAbQ==
-/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AZgBhAGwAcwBl,/v8ANwA6ADEAMgBhAG0=
+/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AZgBhAGwAcwBl,/v8AMAA3ACAATgBvAHYAIAAxADUAMgA0ACAAMAA3ADEAMg==
 /v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
 /v8ARABlAGEAZABsAGkAbgBl,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
 /v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
index 8ea2993b78..f0f3744dbf 100644
--- a/text-ui-test/input.txt
+++ b/text-ui-test/input.txt
@@ -29,7 +29,7 @@ mark 6
 list
 event meet friends
 event meet people at dinner /at 6:25 pm
-event meet people at function x/y/z whatever /at oh no not this /by /at 7:12am
+event meet people at function x/y/z whatever /at oh no not this /by /at 7:12am 1524 Fri NOV
 list
 deadline /at mysterious
 deadline /by mysterious number 2

From 3091fd3eeda115fa26492e78ff5941ff09ee6019 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Mon, 12 Sep 2022 00:38:43 +0800
Subject: [PATCH 49/67] Add B-Snooze

---
 src/main/java/duke/Parser.java    | 28 ++++++++++++++++++++++++++++
 src/main/java/duke/task/Task.java | 18 ++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index a9055e18df..eaf4eda5ee 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -122,6 +122,34 @@ public static ArrayList<CommandMatcher> addTaskModificationCommands(ArrayList<Co
                     String.format("You have %d tasks left.", TaskList.getTaskList().size()));
         }));
 
+        commands.add(PrefixCommandMatcher.of("reschedule", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Task task = TaskList.getTask(str);
+            if (task instanceof ToDo) {
+                return new DukeResponse("That's a todo, it doesn't have a date.");
+            }
+            Task newTask;
+            if (task instanceof Event) {
+                if (!map.containsKey("at")) {
+                    return new DukeResponse("Do specify /at for events.");
+                }
+                newTask = new Event(task.getDescription(), map.get("at"), task.isTaskDone());
+            } else if (task instanceof Deadline) {
+                if (!map.containsKey("at")) {
+                    return new DukeResponse("Do specify /by for events.");
+                }
+                newTask = new Deadline(task.getDescription(), map.get("by"), task.isTaskDone());
+            } else {
+                return new DukeResponse("This is a strange task - I don't recognise it.");
+            }
+            List<Task> tasks = TaskList.getTaskList();
+            tasks.set(tasks.indexOf(task), newTask);
+            return new DukeResponse(
+                    "I have rescheduled your task!",
+                    newTask.toString());
+        }));
+
         return commands;
     }
 
diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java
index a7e4326132..1c881ffd98 100644
--- a/src/main/java/duke/task/Task.java
+++ b/src/main/java/duke/task/Task.java
@@ -59,6 +59,24 @@ private char getDoneMarker() {
         return isDone ? MARKER_DONE : MARKER_NOT_DONE;
     }
 
+    /**
+     * Gets the task description.
+     *
+     * @return Task description.
+     */
+    public String getDescription() {
+        return name;
+    }
+
+    /**
+     * Gets if the task is done.
+     *
+     * @return true if the task is done, false otherwise.
+     */
+    public boolean isTaskDone() {
+        return isDone;
+    }
+
     /**
      * Creates a string representation suitable for printing to screen.
      *

From f0b49ccc1e148e4ca2220c01ded9d2225cef9675 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Mon, 12 Sep 2022 16:47:12 +0800
Subject: [PATCH 50/67] Add D-Notes

Notes are great to have.

To also ensure the code is cleaned, let's also
* Package exceptions
* Package notes
* Add tests to integration tests
* Maintain the same note/task numbers to aid in modification and
  deletion
---
 src/main/java/duke/CommandMatcher.java        |   2 +
 src/main/java/duke/Duke.java                  |   3 +
 src/main/java/duke/Pair.java                  |  41 +++++
 src/main/java/duke/Parser.java                | 117 ++++++++++++--
 src/main/java/duke/PrefixCommandMatcher.java  |   6 +-
 .../duke/{ => exception}/DukeException.java   |   4 +-
 .../DukeExceptionBiFunction.java              | 100 ++++++------
 .../DukeExceptionFunction.java                |   4 +-
 src/main/java/duke/note/Note.java             |  67 ++++++++
 src/main/java/duke/note/NoteList.java         |  76 +++++++++
 src/main/java/duke/note/NoteStorage.java      |  39 +++++
 src/main/java/duke/task/TaskList.java         |  19 ++-
 src/test/java/duke/ParsedDateTimeTest.java    |  21 ++-
 text-ui-test/ACTUAL1.TXT                      | 148 +++++++++++++++---
 text-ui-test/EXPECTED.TXT                     |  86 ++++++++++
 text-ui-test/EXPECTED1.TXT                    | 148 +++++++++++++++---
 text-ui-test/duke.txt                         |   6 +-
 text-ui-test/dukeNotes.txt                    |   4 +
 text-ui-test/input.txt                        |  20 +++
 text-ui-test/runtest.bat                      |   1 +
 20 files changed, 784 insertions(+), 128 deletions(-)
 create mode 100644 src/main/java/duke/Pair.java
 rename src/main/java/duke/{ => exception}/DukeException.java (89%)
 rename src/main/java/duke/{ => exception}/DukeExceptionBiFunction.java (91%)
 rename src/main/java/duke/{ => exception}/DukeExceptionFunction.java (92%)
 create mode 100644 src/main/java/duke/note/Note.java
 create mode 100644 src/main/java/duke/note/NoteList.java
 create mode 100644 src/main/java/duke/note/NoteStorage.java
 create mode 100644 text-ui-test/dukeNotes.txt

diff --git a/src/main/java/duke/CommandMatcher.java b/src/main/java/duke/CommandMatcher.java
index 544566cf43..06a5e317ea 100644
--- a/src/main/java/duke/CommandMatcher.java
+++ b/src/main/java/duke/CommandMatcher.java
@@ -3,6 +3,8 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import duke.exception.DukeExceptionFunction;
+
 /**
  * This class serves as a way to abstract the idea of making a command
  * as a matching process and an action.
diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
index 79652e676c..be2cd697d2 100644
--- a/src/main/java/duke/Duke.java
+++ b/src/main/java/duke/Duke.java
@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.Optional;
 
+import duke.note.NoteList;
 import duke.task.TaskList;
 
 /**
@@ -52,6 +53,7 @@ public static void main(String[] args) {
         // initialization
         ui.greet();
         TaskList.initializeTaskList();
+        NoteList.initializeNoteList();
         commands = Parser.getCommands();
         BufferedReader input = new BufferedReader(ui.getReader());
 
@@ -75,6 +77,7 @@ public static void main(String[] args) {
 
         // finalization
         TaskList.finalizeTaskList();
+        NoteList.finalizeNoteList();
         ui.leave();
     }
 }
diff --git a/src/main/java/duke/Pair.java b/src/main/java/duke/Pair.java
new file mode 100644
index 0000000000..8de13a097a
--- /dev/null
+++ b/src/main/java/duke/Pair.java
@@ -0,0 +1,41 @@
+package duke;
+
+/**
+ * Stores a pair.
+ *
+ * @param <U> Type of first member of pair.
+ * @param <V> Type of second member of pair.
+ */
+public class Pair<U, V> {
+    private U u;
+    private V v;
+
+    /**
+     * Constructs a pair.
+     *
+     * @param u First member of the pair.
+     * @param v Second member of the pair.
+     */
+    public Pair(U u, V v) {
+        this.u = u;
+        this.v = v;
+    }
+
+    /**
+     * Gets the first member of the pair.
+     *
+     * @return First member of the pair.
+     */
+    public U getFirst() {
+        return this.u;
+    }
+
+    /**
+     * Gets the second member of the pair.
+     *
+     * @return Second member of the pair.
+     */
+    public V getSecond() {
+        return this.v;
+    }
+}
diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index eaf4eda5ee..c33eed38a4 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -3,6 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import duke.note.Note;
+import duke.note.NoteList;
 import duke.task.Deadline;
 import duke.task.Event;
 import duke.task.Task;
@@ -14,14 +16,45 @@
  */
 public class Parser {
 
-    private static String[] listTasks(String response, List<Task> tasks) {
+    /**
+     * Lists objects in a String[].
+     *
+     * @param response String that describes the objects.
+     * @param objects List of objects.
+     * @param <T> Type of objects.
+     * @return String[] of objects.
+     */
+    public static <T> String[] listObjects(String response, List<T> objects) {
+        assert response != null;
+        assert objects != null;
+        String[] output = new String[objects.size() + 1];
+        output[0] = response;
+        for (int i = 0; i < objects.size(); i++) {
+            assert objects.get(i) != null;
+            output[i + 1] = (i + 1) + "." + objects.get(i).toString();
+        }
+        return output;
+    }
+
+    /**
+     * Lists numbered objects in a String[].
+     *
+     * @param response String that describes the objects.
+     * @param objects List of numbered objects.
+     * @param <T> Type of objects.
+     * @return String[] of objects.
+     */
+    public static <T> String[] listNumberedObjects(String response, List<Pair<Integer, T>> objects) {
         assert response != null;
-        assert tasks != null;
-        String[] output = new String[tasks.size() + 1];
+        assert objects != null;
+        String[] output = new String[objects.size() + 1];
         output[0] = response;
-        for (int i = 0; i < tasks.size(); i++) {
-            assert tasks.get(i) != null;
-            output[i + 1] = (i + 1) + "." + tasks.get(i).toString();
+        for (int i = 0; i < objects.size(); i++) {
+            Pair<Integer, T> pair = objects.get(i);
+            assert pair != null;
+            assert pair.getFirst() != null;
+            assert pair.getSecond() != null;
+            output[i + 1] = (pair.getFirst() + 1) + "." + pair.getSecond().toString();
         }
         return output;
     }
@@ -34,13 +67,14 @@ private static String[] listTasks(String response, List<Task> tasks) {
     public static ArrayList<CommandMatcher> getCommands() {
         ArrayList<CommandMatcher> commands = new ArrayList<>();
 
+        commands = addNoteCommands(commands);
+
         commands = addTaskCommands(commands);
         commands = addTaskModificationCommands(commands);
         commands = addTaskViewingCommands(commands);
 
         commands = addCatchAllCommand(commands);
 
-        assert commands != null;
         return commands;
     }
 
@@ -160,19 +194,80 @@ public static ArrayList<CommandMatcher> addTaskModificationCommands(ArrayList<Co
      */
     public static ArrayList<CommandMatcher> addTaskViewingCommands(ArrayList<CommandMatcher> commands) {
         assert commands != null;
-        commands.add(new CommandMatcher((str) -> str.equals("list"), (str) -> {
+        commands.add(new CommandMatcher(str -> str.equals("list"), (str) -> {
             assert str != null;
             List<Task> tasks = TaskList.getTaskList();
             return new DukeResponse(
-                    listTasks("Here, your tasks:", tasks));
+                    listObjects("Here, your tasks:", tasks));
         }));
 
         commands.add(new PrefixCommandMatcher("find", (str, map) -> {
             assert str != null;
             assert map != null;
-            List<Task> tasks = TaskList.filterTasks(str);
+            List<Pair<Integer, Task>> tasks = TaskList.filterTasks(str);
             return new DukeResponse(
-                    listTasks("Here are the tasks that you might be looking for:", tasks));
+                    listNumberedObjects("Here are the tasks that you might be looking for:", tasks));
+        }));
+
+        commands.add(PrefixCommandMatcher.of("delete", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Task task = TaskList.getTask(str);
+            TaskList.getTaskList().remove(task);
+            return new DukeResponse(
+                    "It seems you didn't need this task anymore, so I removed it:",
+                    task.toString(),
+                    String.format("You have %d tasks left.", TaskList.getTaskList().size()));
+        }));
+
+        return commands;
+    }
+
+    /**
+     * Adds note commands to an ArrayList.
+     *
+     * @return ArrayList of chatbot commands.
+     */
+    public static ArrayList<CommandMatcher> addNoteCommands(ArrayList<CommandMatcher> commands) {
+        assert commands != null;
+        commands.add(new CommandMatcher(str -> str.equals("list notes"), (str) -> {
+            assert str != null;
+            List<Note> notes = NoteList.getNoteList();
+            return new DukeResponse(
+                    listObjects("Here, your notes:", notes));
+        }));
+
+        commands.add(new PrefixCommandMatcher("find notes", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            List<Pair<Integer, Note>> notes = NoteList.filterNotes(str);
+            return new DukeResponse(
+                    listNumberedObjects("These notes match your query:", notes));
+        }));
+
+        commands.add(PrefixCommandMatcher.of("view note", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Note note = NoteList.getNote(str);
+            return new DukeResponse("Here's the note:", note.getTitle(), note.getContent());
+        }));
+
+        commands.add(PrefixCommandMatcher.of("delete note", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Note note = NoteList.getNote(str);
+            NoteList.getNoteList().remove(note);
+            return new DukeResponse(
+                    "I removed this note:",
+                    note.toString());
+        }));
+
+        commands.add(PrefixCommandMatcher.of("note", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Note note = new Note(str, map.getOrDefault("content", "[EMPTY]"));
+            NoteList.getNoteList().add(note);
+            return new DukeResponse(String.format("Added your note about %s.", str));
         }));
 
         return commands;
diff --git a/src/main/java/duke/PrefixCommandMatcher.java b/src/main/java/duke/PrefixCommandMatcher.java
index 137a6c1d97..168cf4b175 100644
--- a/src/main/java/duke/PrefixCommandMatcher.java
+++ b/src/main/java/duke/PrefixCommandMatcher.java
@@ -5,6 +5,10 @@
 import java.util.function.BiFunction;
 import java.util.function.Predicate;
 
+import duke.exception.DukeException;
+import duke.exception.DukeExceptionBiFunction;
+import duke.exception.DukeExceptionFunction;
+
 /**
  * Makes a command matcher based on prefix.
  * It splits the slash options "/by /at" and other parts as a Map&lt;String, String&gt;
@@ -31,7 +35,7 @@ public PrefixCommandMatcher(String prefix, BiFunction<String, Map<String, String
                     }
 
                     // map processing
-                    String withoutPrefix = cmd.split(" ", 2)[1];
+                    String withoutPrefix = cmd.substring(prefix.length() + 1);
                     String[] commandParts = withoutPrefix.split(" /");
                     Map<String, String> map = new HashMap<>();
                     for (int i = 1; i < commandParts.length; i++) {
diff --git a/src/main/java/duke/DukeException.java b/src/main/java/duke/exception/DukeException.java
similarity index 89%
rename from src/main/java/duke/DukeException.java
rename to src/main/java/duke/exception/DukeException.java
index aab292dbaa..b8995b4a76 100644
--- a/src/main/java/duke/DukeException.java
+++ b/src/main/java/duke/exception/DukeException.java
@@ -1,4 +1,6 @@
-package duke;
+package duke.exception;
+
+import duke.DukeResponse;
 
 /**
  * An exception class that comes with a DukeResponse
diff --git a/src/main/java/duke/DukeExceptionBiFunction.java b/src/main/java/duke/exception/DukeExceptionBiFunction.java
similarity index 91%
rename from src/main/java/duke/DukeExceptionBiFunction.java
rename to src/main/java/duke/exception/DukeExceptionBiFunction.java
index 2007537841..88af3a9c4a 100644
--- a/src/main/java/duke/DukeExceptionBiFunction.java
+++ b/src/main/java/duke/exception/DukeExceptionBiFunction.java
@@ -1,49 +1,51 @@
-package duke;
-
-import java.util.function.BiFunction;
-
-/**
- * Defines an interface for functions that throw DukeException.
- *
- * @param <T> Input type.
- */
-public interface DukeExceptionBiFunction<T, U> {
-    /**
-     * Constructs DukeExceptionBiFunction from BiFunction.
-     *
-     * @param lambda BiFunction.
-     * @param <A> Input type.
-     * @param <B> Input type.
-     * @return Constructed DukeExceptionBiFunction.
-     */
-    public static <A, B> DukeExceptionBiFunction<A, B> of(BiFunction<A, B, DukeResponse> lambda) {
-        assert lambda != null;
-        return (a, b) -> lambda.apply(a, b);
-    }
-
-    /**
-     * Constructs BiFunction from DukeExceptionBiFunction.
-     *
-     * @param lambda DukeExceptionFunction.
-     * @param <A> Input type.
-     * @return Constructed Function.
-     */
-    public static <A, B> BiFunction<A, B, DukeResponse> toBiFunction(DukeExceptionBiFunction<A, B> lambda) {
-        assert lambda != null;
-        return (a, b) -> {
-            try {
-                return lambda.apply(a, b);
-            } catch (DukeException exception) {
-                return exception.getResponse();
-            }
-        };
-    }
-
-    /**
-     * Applies on T, U such that it allows for throwing of DukeException.
-     *
-     * @return Single-use output DukeResponse.
-     * @throws DukeException Single-use output DukeException.
-     */
-    public DukeResponse apply(T t, U u) throws DukeException;
-}
+package duke.exception;
+
+import java.util.function.BiFunction;
+
+import duke.DukeResponse;
+
+/**
+ * Defines an interface for functions that throw DukeException.
+ *
+ * @param <T> Input type.
+ */
+public interface DukeExceptionBiFunction<T, U> {
+    /**
+     * Constructs DukeExceptionBiFunction from BiFunction.
+     *
+     * @param lambda BiFunction.
+     * @param <A> Input type.
+     * @param <B> Input type.
+     * @return Constructed DukeExceptionBiFunction.
+     */
+    public static <A, B> DukeExceptionBiFunction<A, B> of(BiFunction<A, B, DukeResponse> lambda) {
+        assert lambda != null;
+        return lambda::apply;
+    }
+
+    /**
+     * Constructs BiFunction from DukeExceptionBiFunction.
+     *
+     * @param lambda DukeExceptionFunction.
+     * @param <A> Input type.
+     * @return Constructed Function.
+     */
+    public static <A, B> BiFunction<A, B, DukeResponse> toBiFunction(DukeExceptionBiFunction<A, B> lambda) {
+        assert lambda != null;
+        return (a, b) -> {
+            try {
+                return lambda.apply(a, b);
+            } catch (DukeException exception) {
+                return exception.getResponse();
+            }
+        };
+    }
+
+    /**
+     * Applies on T, U such that it allows for throwing of DukeException.
+     *
+     * @return Single-use output DukeResponse.
+     * @throws DukeException Single-use output DukeException.
+     */
+    public DukeResponse apply(T t, U u) throws DukeException;
+}
diff --git a/src/main/java/duke/DukeExceptionFunction.java b/src/main/java/duke/exception/DukeExceptionFunction.java
similarity index 92%
rename from src/main/java/duke/DukeExceptionFunction.java
rename to src/main/java/duke/exception/DukeExceptionFunction.java
index fe4ed22cbf..5196ee168b 100644
--- a/src/main/java/duke/DukeExceptionFunction.java
+++ b/src/main/java/duke/exception/DukeExceptionFunction.java
@@ -1,7 +1,9 @@
-package duke;
+package duke.exception;
 
 import java.util.function.Function;
 
+import duke.DukeResponse;
+
 /**
  * Defines an interface for functions that throw DukeException.
  *
diff --git a/src/main/java/duke/note/Note.java b/src/main/java/duke/note/Note.java
new file mode 100644
index 0000000000..4281f5d942
--- /dev/null
+++ b/src/main/java/duke/note/Note.java
@@ -0,0 +1,67 @@
+package duke.note;
+
+/**
+ * Stores a note which has title and content.
+ */
+public class Note {
+    private String title;
+    private String content;
+
+    /**
+     * Constructs a note.
+     *
+     * @param title Title of note.
+     * @param content Content of note.
+     */
+    public Note(String title, String content) {
+        this.title = title;
+        this.content = content;
+    }
+
+    /**
+     * Gets the title of the note.
+     *
+     * @return Title of the note.
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Gets the content of the note.
+     *
+     * @return Content of the note.
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * Checks if the note title matches the query.
+     *
+     * @param query Query for the note to check.
+     * @return True if the note description matches the query.
+     */
+    public boolean isMatchingQuery(String query) {
+        return title.contains(query);
+    }
+
+    /**
+     * Gets a String array format of the note to save to file.
+     *
+     * @return String array.
+     */
+    public String[] getAsStringArray() {
+        return new String[]{ title, content };
+    }
+
+    /**
+     * Get String for printing to the screen.
+     *
+     * @return String for printing.
+     */
+    @Override
+    public String toString() {
+        return title;
+    }
+}
diff --git a/src/main/java/duke/note/NoteList.java b/src/main/java/duke/note/NoteList.java
new file mode 100644
index 0000000000..331dc552fc
--- /dev/null
+++ b/src/main/java/duke/note/NoteList.java
@@ -0,0 +1,76 @@
+package duke.note;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import duke.DukeResponse;
+import duke.Pair;
+import duke.exception.DukeException;
+
+/**
+ * Holds the list of tasks.
+ */
+public class NoteList {
+    /** List of tasks to remember */
+    private static ArrayList<Note> noteList = new ArrayList<>();
+
+    /**
+     * Initializes the task list.
+     */
+    public static void initializeNoteList() {
+        noteList = NoteStorage.getNotes();
+    }
+
+    /**
+     * Finalizes the note list.
+     */
+    public static void finalizeNoteList() {
+        NoteStorage.saveNotes(noteList);
+    }
+
+    /**
+     * Gets note from index as string.
+     *
+     * @param index Index as a string.
+     * @return Note if successful.
+     * @throws DukeException if not successful.
+     */
+    public static Note getNote(String index) throws DukeException {
+        try {
+            int idx = Integer.parseInt(index);
+            return noteList.get(idx - 1);
+        } catch (NumberFormatException ex) {
+            throw new DukeException(new DukeResponse(
+                    "Sorry, I didn't understand " + index + ", please give me a number."));
+        } catch (IndexOutOfBoundsException ex) {
+            throw new DukeException(new DukeResponse(
+                    "Sorry, the number " + index + ", wasn't in the range."));
+        }
+    }
+
+    /**
+     * Gets notes that match the search term.
+     *
+     * @param query Search term.
+     * @return List of indices and notes.
+     */
+    public static ArrayList<Pair<Integer, Note>> filterNotes(String query) {
+        ArrayList<Pair<Integer, Note>> result = new ArrayList<>();
+        for (int i = 0; i < noteList.size(); i++) {
+            Note note = noteList.get(i);
+            if (note.isMatchingQuery(query)) {
+                result.add(new Pair<>(i, note));
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Gets the task list for other classes to work on.
+     *
+     * @return The task list.
+     */
+    public static List<Note> getNoteList() {
+        return noteList;
+    }
+}
diff --git a/src/main/java/duke/note/NoteStorage.java b/src/main/java/duke/note/NoteStorage.java
new file mode 100644
index 0000000000..f9db81ae1f
--- /dev/null
+++ b/src/main/java/duke/note/NoteStorage.java
@@ -0,0 +1,39 @@
+package duke.note;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import duke.Storage;
+
+/**
+ * Accesses a file for notes.
+ */
+public class NoteStorage {
+
+    /**
+     * Gets ArrayList of previously saved notes.
+     *
+     * @return ArrayList of notes.
+     */
+    public static ArrayList<Note> getNotes() {
+        Storage storage = Storage.getFileState("./dukeNotes.txt");
+        ArrayList<Note> notes = new ArrayList<>();
+        for (String[] line : storage.getLines()) {
+            assert line != null;
+            notes.add(new Note(line[0], line[1]));
+        }
+        return notes;
+    }
+
+    /**
+     * Saves a list of notes to the default file.
+     *
+     * @param notes List of notes.
+     */
+    public static void saveNotes(List<Note> notes) {
+        List<String[]> lines = notes.stream().map(Note::getAsStringArray).collect(Collectors.toList());
+        Storage storage = Storage.getFileState("./dukeNotes.txt");
+        storage.saveLines((String[][]) lines.toArray(new String[][]{}));
+    }
+}
diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java
index fca4ce48e0..62bd475009 100644
--- a/src/main/java/duke/task/TaskList.java
+++ b/src/main/java/duke/task/TaskList.java
@@ -2,10 +2,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
-import duke.DukeException;
 import duke.DukeResponse;
+import duke.Pair;
+import duke.exception.DukeException;
 
 /**
  * Holds the list of tasks
@@ -52,12 +52,17 @@ public static Task getTask(String index) throws DukeException {
      * Gets tasks that match the search term.
      *
      * @param query Search term.
-     * @return List of tasks.
+     * @return List of indices and tasks.
      */
-    public static List<Task> filterTasks(String query) {
-        return taskList.stream()
-                .filter((task) -> task.isMatchingQuery(query))
-                .collect(Collectors.toList());
+    public static ArrayList<Pair<Integer, Task>> filterTasks(String query) {
+        ArrayList<Pair<Integer, Task>> result = new ArrayList<>();
+        for (int i = 0; i < taskList.size(); i++) {
+            Task task = taskList.get(i);
+            if (task.isMatchingQuery(query)) {
+                result.add(new Pair<>(i, task));
+            }
+        }
+        return result;
     }
 
     /**
diff --git a/src/test/java/duke/ParsedDateTimeTest.java b/src/test/java/duke/ParsedDateTimeTest.java
index 8fc98676b1..65775afb96 100644
--- a/src/test/java/duke/ParsedDateTimeTest.java
+++ b/src/test/java/duke/ParsedDateTimeTest.java
@@ -19,13 +19,20 @@ public void of_makingObjects_normalBehavior() {
         assertEquals(ParsedDateTime.of("Jan 1984", false).toString(), "01 Jan 1984 0000");
         assertEquals(ParsedDateTime.of("Friday MAY 1984", true).toString(), "04 May 1984 2359");
         assertEquals(ParsedDateTime.of("Friday MAY 1984", false).toString(), "04 May 1984 0000");
-        assertEquals(ParsedDateTime.of("12:34", true).toString(), ParsedDateTime.of("12:34", false).toString());
-        assertEquals(ParsedDateTime.of("12:34pm", true).toString(), ParsedDateTime.of("12:34", false).toString());
-        assertEquals(ParsedDateTime.of("11:34am", true).toString(), ParsedDateTime.of("11:34", false).toString());
-        assertEquals(ParsedDateTime.of("11:34pm", true).toString(), ParsedDateTime.of("23:34", false).toString());
-        assertEquals(ParsedDateTime.of("12:34am", true).toString(), ParsedDateTime.of("00:34", false).toString());
-        assertEquals(ParsedDateTime.of("12:34Am", true).toString(), ParsedDateTime.of("12:34aM", false).toString());
-        assertEquals(ParsedDateTime.of("1st 1th 1St 1/1/1950 January Jan jan 1950", true).toString(), "01 Jan 1950 2359");
+        assertEquals(ParsedDateTime.of("12:34", true).toString(),
+                ParsedDateTime.of("12:34", false).toString());
+        assertEquals(ParsedDateTime.of("12:34pm", true).toString(),
+                ParsedDateTime.of("12:34", false).toString());
+        assertEquals(ParsedDateTime.of("11:34am", true).toString(),
+                ParsedDateTime.of("11:34", false).toString());
+        assertEquals(ParsedDateTime.of("11:34pm", true).toString(),
+                ParsedDateTime.of("23:34", false).toString());
+        assertEquals(ParsedDateTime.of("12:34am", true).toString(),
+                ParsedDateTime.of("00:34", false).toString());
+        assertEquals(ParsedDateTime.of("12:34Am", true).toString(),
+                ParsedDateTime.of("12:34aM", false).toString());
+        assertEquals(ParsedDateTime.of("1st 1th 1St 1/1/1950 January Jan jan 1950", true).toString(),
+                "01 Jan 1950 2359");
     }
 
     @Test
diff --git a/text-ui-test/ACTUAL1.TXT b/text-ui-test/ACTUAL1.TXT
index 8113bbdebf..bfd8539c5d 100644
--- a/text-ui-test/ACTUAL1.TXT
+++ b/text-ui-test/ACTUAL1.TXT
@@ -27,10 +27,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
 | 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][ ] /at mysterious (by: [unknown])
+| 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -53,7 +53,7 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Marked your task as done:
-| [E][X] meet friends (at: [unknown])
+| [E][X] meet friends (at: 31 Dec 1950 2359)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Sorry, the number 0, wasn't in the range.
@@ -70,10 +70,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][X] homework
-| 2.[E][X] meet friends (at: [unknown])
+| 2.[E][X] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
 | 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][ ] /at mysterious (by: [unknown])
+| 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -87,15 +87,15 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Aw... it's not done yet:
-| [E][ ] meet friends (at: [unknown])
+| [E][ ] meet friends (at: 31 Dec 1950 2359)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
 | 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][ ] /at mysterious (by: [unknown])
+| 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -110,10 +110,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
 | 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][ ] /at mysterious (by: [unknown])
+| 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -128,10 +128,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
 | 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][ ] /at mysterious (by: [unknown])
+| 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -141,15 +141,15 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Marked your task as done:
-| [D][X] /at mysterious (by: [unknown])
+| [D][X] /at mysterious (by: 31 Dec 1960 2359)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
 | 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][X] /at mysterious (by: [unknown])
+| 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -164,10 +164,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
 | 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][X] /at mysterious (by: [unknown])
+| 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -190,10 +190,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
 | 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][X] /at mysterious (by: [unknown])
+| 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -219,10 +219,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
 | 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][X] /at mysterious (by: [unknown])
+| 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -238,7 +238,7 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | It seems you didn't need this task anymore, so I removed it:
-| [E][ ] meet friends (at: [unknown])
+| [E][ ] meet friends (at: 31 Dec 1950 2359)
 | You have 16 tasks left.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
@@ -250,7 +250,7 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 3.[D][X] /at mysterious (by: [unknown])
+| 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
 | 4.[D][X] /by mysterious number 2 (by: [unknown])
 | 5.[D][ ] rush this please (by: when?)
 | 6.[E][ ]  wow  much  space (at: 10am)
@@ -284,7 +284,7 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 3.[D][X] /at mysterious (by: [unknown])
+| 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
 | 4.[D][X] /by mysterious number 2 (by: [unknown])
 | 5.[D][ ] rush this please (by: when?)
 | 6.[E][ ]  wow  much  space (at: 10am)
@@ -312,5 +312,105 @@
 | Here are the tasks that you might be looking for:
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
+| Here are the tasks that you might be looking for:
+| 1.[T][ ] homework
+| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 7.[T][ ] homework
+| 8.[T][ ] other homework
+| 10.[E][ ] meet friends (at: [unknown])
+| 11.[E][ ] meet people at dinner (at: 6:25 pm)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here are the tasks that you might be looking for:
+| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
+| 4.[D][X] /by mysterious number 2 (by: [unknown])
+| 5.[D][ ] rush this please (by: when?)
+| 8.[T][ ] other homework
+| 9.[T][ ] project 12
+| 10.[E][ ] meet friends (at: [unknown])
+| 11.[E][ ] meet people at dinner (at: 6:25 pm)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 13.[D][ ] /at mysterious (by: [unknown])
+| 14.[D][ ] /by mysterious number 2 (by: [unknown])
+| 15.[D][ ] rush this please (by: when?)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Added your note about hello.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Added your note about pi.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Added your note about hello.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your notes:
+| 1.hello
+| 2.pi
+| 3.hello
+| 4.pi
+| 5.hello
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand fails, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| These notes match your query:
+| 1.hello
+| 3.hello
+| 5.hello
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here's the note:
+| hello
+| this is a great note
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here's the note:
+| pi
+| 3.14159265358979323
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here's the note:
+| hello
+| this is a great note
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 12389, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand okay, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1950 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [D][ ] rush this please (by: 31 Dec 1960 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I removed this note:
+| hello
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your notes:
+| 1.hello
+| 2.pi
+| 3.pi
+| 4.hello
+'----------------------------------------------------------------
+,----------------------------------------------------------------
 | It was nice to have you around, I'm going back to sleep...
 '----------------------------------------------------------------
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index abc5fd0e8a..c0b0ae25e6 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -221,5 +221,91 @@
 | Here are the tasks that you might be looking for:
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
+| Here are the tasks that you might be looking for:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here are the tasks that you might be looking for:
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Added your note about hello.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Added your note about pi.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Added your note about hello.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your notes:
+| 1.hello
+| 2.pi
+| 3.hello
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand fails, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| These notes match your query:
+| 1.hello
+| 3.hello
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here's the note:
+| hello
+| this is a great note
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here's the note:
+| pi
+| 3.14159265358979323
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here's the note:
+| hello
+| repeated title
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 12389, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand okay, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][ ] meet friends (at: 31 Dec 1950 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [D][ ] /at mysterious (by: 31 Dec 1960 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I removed this note:
+| hello
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your notes:
+| 1.hello
+| 2.pi
+'----------------------------------------------------------------
+,----------------------------------------------------------------
 | It was nice to have you around, I'm going back to sleep...
 '----------------------------------------------------------------
diff --git a/text-ui-test/EXPECTED1.TXT b/text-ui-test/EXPECTED1.TXT
index 8113bbdebf..bfd8539c5d 100644
--- a/text-ui-test/EXPECTED1.TXT
+++ b/text-ui-test/EXPECTED1.TXT
@@ -27,10 +27,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
 | 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][ ] /at mysterious (by: [unknown])
+| 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -53,7 +53,7 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Marked your task as done:
-| [E][X] meet friends (at: [unknown])
+| [E][X] meet friends (at: 31 Dec 1950 2359)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Sorry, the number 0, wasn't in the range.
@@ -70,10 +70,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][X] homework
-| 2.[E][X] meet friends (at: [unknown])
+| 2.[E][X] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
 | 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][ ] /at mysterious (by: [unknown])
+| 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -87,15 +87,15 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Aw... it's not done yet:
-| [E][ ] meet friends (at: [unknown])
+| [E][ ] meet friends (at: 31 Dec 1950 2359)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][ ] meet people at dinner (at: 6:25 pm)
 | 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][ ] /at mysterious (by: [unknown])
+| 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -110,10 +110,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
 | 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][ ] /at mysterious (by: [unknown])
+| 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -128,10 +128,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
 | 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][ ] /at mysterious (by: [unknown])
+| 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -141,15 +141,15 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Marked your task as done:
-| [D][X] /at mysterious (by: [unknown])
+| [D][X] /at mysterious (by: 31 Dec 1960 2359)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
 | 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][X] /at mysterious (by: [unknown])
+| 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][ ] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -164,10 +164,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
 | 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][X] /at mysterious (by: [unknown])
+| 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -190,10 +190,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
 | 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][X] /at mysterious (by: [unknown])
+| 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -219,10 +219,10 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][ ] meet friends (at: [unknown])
+| 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
 | 3.[E][X] meet people at dinner (at: 6:25 pm)
 | 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 5.[D][X] /at mysterious (by: [unknown])
+| 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
 | 6.[D][X] /by mysterious number 2 (by: [unknown])
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
@@ -238,7 +238,7 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | It seems you didn't need this task anymore, so I removed it:
-| [E][ ] meet friends (at: [unknown])
+| [E][ ] meet friends (at: 31 Dec 1950 2359)
 | You have 16 tasks left.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
@@ -250,7 +250,7 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 3.[D][X] /at mysterious (by: [unknown])
+| 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
 | 4.[D][X] /by mysterious number 2 (by: [unknown])
 | 5.[D][ ] rush this please (by: when?)
 | 6.[E][ ]  wow  much  space (at: 10am)
@@ -284,7 +284,7 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
-| 3.[D][X] /at mysterious (by: [unknown])
+| 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
 | 4.[D][X] /by mysterious number 2 (by: [unknown])
 | 5.[D][ ] rush this please (by: when?)
 | 6.[E][ ]  wow  much  space (at: 10am)
@@ -312,5 +312,105 @@
 | Here are the tasks that you might be looking for:
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
+| Here are the tasks that you might be looking for:
+| 1.[T][ ] homework
+| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 7.[T][ ] homework
+| 8.[T][ ] other homework
+| 10.[E][ ] meet friends (at: [unknown])
+| 11.[E][ ] meet people at dinner (at: 6:25 pm)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here are the tasks that you might be looking for:
+| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
+| 4.[D][X] /by mysterious number 2 (by: [unknown])
+| 5.[D][ ] rush this please (by: when?)
+| 8.[T][ ] other homework
+| 9.[T][ ] project 12
+| 10.[E][ ] meet friends (at: [unknown])
+| 11.[E][ ] meet people at dinner (at: 6:25 pm)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 13.[D][ ] /at mysterious (by: [unknown])
+| 14.[D][ ] /by mysterious number 2 (by: [unknown])
+| 15.[D][ ] rush this please (by: when?)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Added your note about hello.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Added your note about pi.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Added your note about hello.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your notes:
+| 1.hello
+| 2.pi
+| 3.hello
+| 4.pi
+| 5.hello
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand fails, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| These notes match your query:
+| 1.hello
+| 3.hello
+| 5.hello
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here's the note:
+| hello
+| this is a great note
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here's the note:
+| pi
+| 3.14159265358979323
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here's the note:
+| hello
+| this is a great note
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 12389, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand okay, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1950 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [D][ ] rush this please (by: 31 Dec 1960 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I removed this note:
+| hello
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Here, your notes:
+| 1.hello
+| 2.pi
+| 3.pi
+| 4.hello
+'----------------------------------------------------------------
+,----------------------------------------------------------------
 | It was nice to have you around, I'm going back to sleep...
 '----------------------------------------------------------------
diff --git a/text-ui-test/duke.txt b/text-ui-test/duke.txt
index da40954a5a..5bcf129218 100644
--- a/text-ui-test/duke.txt
+++ b/text-ui-test/duke.txt
@@ -1,8 +1,8 @@
 /v8AVABvAEQAbw==,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
-/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AdAByAHUAZQ==,/v8AMAA3ACAATgBvAHYAIAAxADUAMgA0ACAAMAA3ADEAMg==
-/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
+/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AdAByAHUAZQ==,/v8AMwAxACAARABlAGMAIAAxADkANQAwACAAMgAzADUAOQ==
+/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AdAByAHUAZQ==,/v8AMwAxACAARABlAGMAIAAxADkANgAwACAAMgAzADUAOQ==
 /v8ARABlAGEAZABsAGkAbgBl,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
+/v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AMwAxACAARABlAGMAIAAxADkANgAwACAAMgAzADUAOQ==
 /v8ARQB2AGUAbgB0,/v8AIAB3AG8AdwAgACAAbQB1AGMAaAAgACAAcwBwAGEAYwBl,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
 /v8AVABvAEQAbw==,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
 /v8AVABvAEQAbw==,/v8AbwB0AGgAZQByACAAaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
diff --git a/text-ui-test/dukeNotes.txt b/text-ui-test/dukeNotes.txt
new file mode 100644
index 0000000000..0c083b7429
--- /dev/null
+++ b/text-ui-test/dukeNotes.txt
@@ -0,0 +1,4 @@
+/v8AaABlAGwAbABv,/v8AdABoAGkAcwAgAGkAcwAgAGEAIABnAHIAZQBhAHQAIABuAG8AdABl
+/v8AcABp,/v8AMwAuADEANAAxADUAOQAyADYANQAzADUAOAA5ADcAOQAzADIAMw==
+/v8AcABp,/v8AMwAuADEANAAxADUAOQAyADYANQAzADUAOAA5ADcAOQAzADIAMw==
+/v8AaABlAGwAbABv,/v8AcgBlAHAAZQBhAHQAZQBkACAAdABpAHQAbABl
\ No newline at end of file
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
index f0f3744dbf..d15cc0c634 100644
--- a/text-ui-test/input.txt
+++ b/text-ui-test/input.txt
@@ -48,4 +48,24 @@ find
 find 
 find  meet
 find      me
+find me
+find t
+note hello /content this is a great note
+note pi /content 3.14159265358979323
+note hello /content repeated title
+list notes
+delete note fails
+find notes he
+view note 1
+view note 2
+view note 3
+view note 0
+view note -1
+view note 12389
+view note okay
+reschedule 1 /at hi1 /by hi2
+reschedule 2 /at 1950 /by 1960
+reschedule 5 /at 1950 /by 1960
+delete note 3
+list notes
 bye
diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat
index 8f94108629..1480bb9e2c 100644
--- a/text-ui-test/runtest.bat
+++ b/text-ui-test/runtest.bat
@@ -16,6 +16,7 @@ REM no error here, errorlevel == 0
 
 REM delete data
 if exist duke.txt del duke.txt
+if exist dukeNotes.txt del dukeNotes.txt
 
 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
 java -classpath ..\bin duke.Duke < input.txt > ACTUAL.TXT

From b51cfc08c54cf7aaaa7d122a91db8dc2126c2937 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Mon, 12 Sep 2022 16:50:41 +0800
Subject: [PATCH 51/67] Add the deletion of dukeNotes in runtest.sh to run *nix
 CI test

---
 text-ui-test/runtest.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh
index b2311604c7..bc274dd070 100755
--- a/text-ui-test/runtest.sh
+++ b/text-ui-test/runtest.sh
@@ -24,6 +24,10 @@ if [ -e "./duke.txt" ]
 then
     rm duke.txt
 fi
+if [ -e "./dukeNotes.txt" ]
+then
+    rm dukeNotes.txt
+fi
 
 # run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
 java -classpath ../bin duke.Duke < input.txt > ACTUAL.TXT

From 1d66f50390eb5a5118c116501c82434897f54de9 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Mon, 12 Sep 2022 17:23:54 +0800
Subject: [PATCH 52/67] Add border to DialogBox

---
 .gitignore                             | 3 ++-
 src/main/java/duke/gui/DialogBox.java  | 1 +
 src/main/resources/view/DialogBox.fxml | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f4ac88c9b..7ec4e6189a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@ bin/
 
 /text-ui-test/ACTUAL.txt
 text-ui-test/EXPECTED-UNIX.TXT
-duke.txt
\ No newline at end of file
+duke.txt
+dukeNotes.txt
\ No newline at end of file
diff --git a/src/main/java/duke/gui/DialogBox.java b/src/main/java/duke/gui/DialogBox.java
index bd4ccb858d..a315aed7e6 100644
--- a/src/main/java/duke/gui/DialogBox.java
+++ b/src/main/java/duke/gui/DialogBox.java
@@ -37,6 +37,7 @@ private DialogBox(String text, Image img) {
 
         dialog.setText(text);
         displayPicture.setImage(img);
+        setMinHeight(dialog.getPrefHeight());
     }
 
     /**
diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml
index aa389b8a06..02cac458ee 100644
--- a/src/main/resources/view/DialogBox.fxml
+++ b/src/main/resources/view/DialogBox.fxml
@@ -5,12 +5,12 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.HBox?>
 
-<fx:root alignment="TOP_RIGHT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefWidth="400.0" type="javafx.scene.layout.HBox" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root alignment="TOP_RIGHT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefWidth="400.0" style="-fx-border-width: 1; -fx-border-color: #7f7f7f; -fx-border-radius: 5; -fx-border-insets: 5;" type="javafx.scene.layout.HBox" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Label fx:id="dialog" text="Label" wrapText="true" />
-        <ImageView fx:id="displayPicture" fitHeight="96.0" fitWidth="96.0" pickOnBounds="true" preserveRatio="true" />
+        <ImageView fx:id="displayPicture" fitHeight="32.0" fitWidth="32.0" pickOnBounds="true" preserveRatio="true" />
     </children>
     <padding>
         <Insets bottom="15.0" left="5.0" right="5.0" top="15.0" />
     </padding>
-</fx:root>
\ No newline at end of file
+</fx:root>

From b27e7fcb669139ad9587f82b44107d5de4cae501 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Tue, 13 Sep 2022 12:28:38 +0800
Subject: [PATCH 53/67] Remove repeated "delete" command from Parser

The code has two "delete" commands. It isn't deleterious, since the
command detection is via running a Predicate to check, but it would be
nice to remove it to make the code cleaner.

Let's delete the delete for cleaner code.
---
 src/main/java/duke/Parser.java | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index c33eed38a4..86f0e6d475 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -209,17 +209,6 @@ public static ArrayList<CommandMatcher> addTaskViewingCommands(ArrayList<Command
                     listNumberedObjects("Here are the tasks that you might be looking for:", tasks));
         }));
 
-        commands.add(PrefixCommandMatcher.of("delete", (str, map) -> {
-            assert str != null;
-            assert map != null;
-            Task task = TaskList.getTask(str);
-            TaskList.getTaskList().remove(task);
-            return new DukeResponse(
-                    "It seems you didn't need this task anymore, so I removed it:",
-                    task.toString(),
-                    String.format("You have %d tasks left.", TaskList.getTaskList().size()));
-        }));
-
         return commands;
     }
 

From 036a20b0bdd14ed19290f341902e21ae97b8457d Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Tue, 13 Sep 2022 12:53:59 +0800
Subject: [PATCH 54/67] Give credit in the code to SE-EDU tutorial

---
 src/main/java/duke/gui/DialogBox.java  | 7 +++++++
 src/main/java/duke/gui/GraphicUi.java  | 7 +++++++
 src/main/java/duke/gui/Launcher.java   | 7 +++++++
 src/main/java/duke/gui/Main.java       | 7 +++++++
 src/main/java/duke/gui/MainWindow.java | 7 +++++++
 5 files changed, 35 insertions(+)

diff --git a/src/main/java/duke/gui/DialogBox.java b/src/main/java/duke/gui/DialogBox.java
index a315aed7e6..19c24a4d6a 100644
--- a/src/main/java/duke/gui/DialogBox.java
+++ b/src/main/java/duke/gui/DialogBox.java
@@ -14,6 +14,11 @@
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 
+//@@author clarence-chew-reused
+// Reused from this tutorial
+// https://se-education.org/guides/tutorials/javaFx.html
+// with minor modifications at most
+
 /**
  * An example of a custom control using FXML.
  * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label
@@ -76,3 +81,5 @@ public static DialogBox getDukeDialog(String text, Image img) {
         return db;
     }
 }
+
+//@@author
diff --git a/src/main/java/duke/gui/GraphicUi.java b/src/main/java/duke/gui/GraphicUi.java
index c7b09ae291..24bacdcfe2 100644
--- a/src/main/java/duke/gui/GraphicUi.java
+++ b/src/main/java/duke/gui/GraphicUi.java
@@ -8,6 +8,11 @@
 
 import duke.UiInterface;
 
+//@@author clarence-chew-reused
+// Reused from this tutorial
+// https://se-education.org/guides/tutorials/javaFx.html
+// with minor modifications at most
+
 /**
  * Used for GUI.
  */
@@ -80,3 +85,5 @@ public void leave() {
                 "(close the window yourself)");
     }
 }
+
+//@@author
diff --git a/src/main/java/duke/gui/Launcher.java b/src/main/java/duke/gui/Launcher.java
index 11089230d1..e71a0ca787 100644
--- a/src/main/java/duke/gui/Launcher.java
+++ b/src/main/java/duke/gui/Launcher.java
@@ -2,6 +2,11 @@
 
 import javafx.application.Application;
 
+//@@author clarence-chew-reused
+// Reused from this tutorial
+// https://se-education.org/guides/tutorials/javaFx.html
+// with minor modifications at most
+
 /**
  * A launcher class to workaround classpath issues.
  */
@@ -15,3 +20,5 @@ public static void main(String[] args) {
         Application.launch(Main.class, args);
     }
 }
+
+//@@author
diff --git a/src/main/java/duke/gui/Main.java b/src/main/java/duke/gui/Main.java
index ed34703a04..82eb260153 100644
--- a/src/main/java/duke/gui/Main.java
+++ b/src/main/java/duke/gui/Main.java
@@ -9,6 +9,11 @@
 import javafx.scene.layout.AnchorPane;
 import javafx.stage.Stage;
 
+//@@author clarence-chew-reused
+// Reused from this tutorial
+// https://se-education.org/guides/tutorials/javaFx.html
+// with minor modifications at most
+
 /**
  * A GUI for Duke using FXML.
  */
@@ -41,3 +46,5 @@ public void run() {
         }
     }
 }
+
+//@@author
diff --git a/src/main/java/duke/gui/MainWindow.java b/src/main/java/duke/gui/MainWindow.java
index c2fa02e9bb..2841e3bc24 100644
--- a/src/main/java/duke/gui/MainWindow.java
+++ b/src/main/java/duke/gui/MainWindow.java
@@ -14,6 +14,11 @@
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.VBox;
 
+//@@author clarence-chew-reused
+// Reused from this tutorial
+// https://se-education.org/guides/tutorials/javaFx.html
+// with minor modifications at most
+
 /**
  * Controller for MainWindow. Provides the layout for the other controls.
  */
@@ -115,3 +120,5 @@ public void getOutput() {
         }
     }
 }
+
+//@@author

From 5c95f36cce015b692fe9dd5fe3bcc5b54ff19abf Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Thu, 15 Sep 2022 07:47:39 +0800
Subject: [PATCH 55/67] Update documentation and testing

The code needs better testing and documentation.

Let's
* update the files compiled for runtest
* add console mode option to Launcher
* clean up the documentation for one function in ParsedDateTime
---
 src/main/java/duke/ParsedDateTime.java | 29 +++++++++++++-------------
 src/main/java/duke/gui/Launcher.java   |  5 +++++
 text-ui-test/runtest.bat               |  2 +-
 text-ui-test/runtest.sh                |  2 +-
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/main/java/duke/ParsedDateTime.java b/src/main/java/duke/ParsedDateTime.java
index 583148c3b0..234cb472c4 100644
--- a/src/main/java/duke/ParsedDateTime.java
+++ b/src/main/java/duke/ParsedDateTime.java
@@ -318,25 +318,24 @@ public ParsedDateTime(LocalDateTime parsed) {
      * time exists, it falls back on the earliest time before now. If no such time still
      * exists, it just gives the input as a ParsedDateTime which stores a String.
      *
-     * @param input Human-readable description of the time, which only contains
-     *              valid descriptors. Valid descriptors include:
-     *              * case insensitive Mon-Sun/Monday-Sunday
-     *              * an ordinal which specifies a date of the month, e.g. 3rd or 31st
+     * @param input Human-readable description of the time, which only contains valid
+     *              descriptors. Valid descriptors include:
+     *              * case-insensitive Mon-Sun/Monday-Sunday,
+     *              * an ordinal which specifies a date of the month, e.g. 3rd or 31st,
      *              * two or three numbers separated by a slashes or dashes which denote
      *                a date, e.g. 3/7 for the next 3rd of July, 3/7/2012 for the 3rd
-     *                of July on 2012, and 1-2 for the next first of February.
-     *              * a single number, for a year, e.g. 2024 for year 2024
-     *              * a month name, or the abbreviation of a month name, e.g. Jan, July
-     *              * two numbers separated by colons or periods (with optional
-     *                AM/am/PM/pm after it) for a time
-     * @param latestTime If true, gives the latest time in the first block of time
-     *                   which matches the input description. Example: If today is not
-     *                   Monday, "Mon" gives the time as 23:59 on Monday if latestTime
-     *                   else 00:00.
+     *                of July on 2012, and 1-2 for the next first of February,
+     *              * a single number, for a year, e.g. 2024 for year 2024,
+     *              * case-insensitive month name, or the abbreviation of a month name, e.g. Jan, July
+     *              * two numbers separated by colons or periods (with optional AM/am/PM/pm
+     *                after it) for a time, e.g. 23:45, 03.16pm.
+     * @param isLatestTime If true, gives the latest time in the first block of time which matches
+     *                     the input description. Example: If today is not Monday, "Mon" gives the
+     *                     time as 23:59 on Monday if isLatestTime, else 00:00.
      * @return ParsedDateTime of the input. If input is not readable as a time, it
      *         a ParsedDateTime instance that acts like a String.
      */
-    public static ParsedDateTime of(String input, boolean latestTime) {
+    public static ParsedDateTime of(String input, boolean isLatestTime) {
         String[] tokens = input.split(" ");
         try {
             ArrayList<TemporalAdjuster> adjusters = getDateTimeAdjusters(naturalDateParsers, tokens);
@@ -347,7 +346,7 @@ public static ParsedDateTime of(String input, boolean latestTime) {
             result = result.or(() -> findAfterTimeMatching(now, adjusters));
             result = result.or(() -> findBeforeTimeMatching(now, adjusters));
             return result.map(t -> {
-                if (!latestTime) {
+                if (!isLatestTime) {
                     return t;
                 }
                 return applyLatestTimeAdjusters(latestTimeAdjusters, t);
diff --git a/src/main/java/duke/gui/Launcher.java b/src/main/java/duke/gui/Launcher.java
index e71a0ca787..a3b90526e1 100644
--- a/src/main/java/duke/gui/Launcher.java
+++ b/src/main/java/duke/gui/Launcher.java
@@ -1,5 +1,6 @@
 package duke.gui;
 
+import duke.Duke;
 import javafx.application.Application;
 
 //@@author clarence-chew-reused
@@ -17,6 +18,10 @@ public class Launcher {
      * @param args Ignored arguments.
      */
     public static void main(String[] args) {
+        if (args.length > 0 && args[0].equals("console")) {
+            Duke.main(new String[]{});
+            return;
+        }
         Application.launch(Main.class, args);
     }
 }
diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat
index 1480bb9e2c..06c0620ec4 100644
--- a/text-ui-test/runtest.bat
+++ b/text-ui-test/runtest.bat
@@ -7,7 +7,7 @@ REM delete output from previous run
 if exist ACTUAL.TXT del ACTUAL.TXT
 
 REM compile the code into the bin folder
-javac  -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\duke\*.java ..\src\main\java\duke\task\*.java
+javac  -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\duke\*.java ..\src\main\java\duke\note\*.java ..\src\main\java\duke\task\*.java
 IF ERRORLEVEL 1 (
     echo ********** BUILD FAILURE **********
     exit /b 1
diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh
index bc274dd070..2ea5421d20 100755
--- a/text-ui-test/runtest.sh
+++ b/text-ui-test/runtest.sh
@@ -13,7 +13,7 @@ then
 fi
 
 # compile the code into the bin folder, terminates if error occurred
-if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/duke/*.java ../src/main/java/duke/task/*.java
+if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/duke/*.java ../src/main/java/duke/note/*.java ../src/main/java/duke/task/*.java
 then
     echo "********** BUILD FAILURE **********"
     exit 1

From c41a8770bf7e8cd1f0a095720d3a4abe39193879 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Thu, 15 Sep 2022 08:35:13 +0800
Subject: [PATCH 56/67] Add user guide and screenshot

---
 docs/README.md | 279 ++++++++++++++++++++++++++++++++++++++++++++++---
 docs/Ui.png    | Bin 0 -> 33865 bytes
 2 files changed, 267 insertions(+), 12 deletions(-)
 create mode 100644 docs/Ui.png

diff --git a/docs/README.md b/docs/README.md
index 8077118ebe..17622d7840 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,29 +1,284 @@
 # User Guide
 
-## Features 
+## Features
 
-### Feature-ABC
+### Chatbot
 
-Description of the feature.
+Anthea is chatbot-styled, where the commands are with specified words.
 
-### Feature-XYZ
+### Tasks/Notes
 
-Description of the feature.
+You can track your tasks, be them events, todos or deadlines. You can add notes too!
 
 ## Usage
 
-### `Keyword` - Describe action
+### Task Commands
 
-Describe the action and its outcome.
+#### Making tasks
 
-Example of usage: 
+##### `deadline DESCRIPTION [/by TIME]`
 
-`keyword (optional arguments)`
+Adds a deadline to track that has to be done by a certain `TIME`.
 
-Expected outcome:
+**Example of usage:** `deadline Rush the holiday homework... /by 8-9 2018`
 
-Description of the outcome.
+This would make the deadline:
 
 ```
-expected output
+Good luck with the deadline, here's the task:
+[D][ ] Rush the holiday homework... (by: 08 Sep 2018 2359)
 ```
+
+##### `event DESCRIPTION [/at TIME]`
+
+Adds an event to track that happens at a certain `TIME`.
+
+**Example of usage:** `event Prepare for the holiday season dinner /at 21st dec 2012`
+
+This would make the event:
+```
+That's going to happen at some time later:
+[E][ ] Prepare for the holiday season dinner (at: 21 Dec 2012 2359)
+```
+
+##### `todo DESCRIPTION`
+
+Adds a todo to track.
+
+**Example of usage:** `todo Plan holiday dinner`
+
+This would make the todo:
+```
+I've recorded this thing you need to do:
+[T][ ] Plan holiday dinner
+```
+
+#### Modifying tasks
+
+##### `delete INDEX`
+
+Delete task with index `INDEX`.
+
+**Example of usage:**
+```
+event Prepare for the holiday season dinner /at 21st dec 2012
+delete 1
+```
+
+This would delete the task:
+```
+It seems you didn't need this task anymore, so I removed it:
+[E][ ] Prepare for the holiday season dinner (at: 21 Dec 2012 2359)
+You have 0 tasks left.
+```
+
+##### `mark INDEX`
+
+Mark the task with index `INDEX` as completed.
+
+**Example of usage:**
+```
+event Prepare for the holiday season dinner /at 21st dec 2012
+mark 1
+```
+
+This will mark the task as done:
+```
+Marked your task as done:
+[E][X] Prepare for the holiday season dinner (at: 21 Dec 2012 2359)
+```
+
+##### `reschedule INDEX [/at TIME] [/by TIME]`
+
+Reschedule the task. If the task is a deadline, `/by TIME` is used to reschedule. If the task is an event, `/at TIME` is used to reschedule. If the task is a todo, it doesn't have a time, so it cannot be rescheduled. You cannot reschedule your notes.
+
+**Example of usage:**
+```
+event Prepare for the holiday season dinner /at 21st dec 2012
+reschedule 1 /at 2012 20/12
+```
+
+This would reschedule the task:
+```
+I have rescheduled your task!
+[E][ ] Prepare for the holiday season dinner (at: 20 Dec 2012 2359)
+```
+
+##### `unmark INDEX`
+
+Unmark the task with index `INDEX`.
+
+**Example of usage:**
+```
+event Prepare for the holiday season dinner /at 21st dec 2012
+unmark 1
+```
+
+This would unmark the task:
+```
+Aw... it's not done yet:
+| [E][ ] Prepare for the holiday season dinne. (at: 21 Dec 2012 2359)
+```
+
+#### Viewing tasks
+
+##### `find DESCRIPTION`
+
+Find all tasks matching `DESCRIPTION`. The number next to the task is preserved.
+
+**Example of usage:**
+```
+event Prepare for the holiday season dinner /at 21st dec 2012
+find holiday
+```
+
+This would find these tasks:
+```
+Here are the tasks that you might be looking for:
+1.[E][X] Prepare for the holiday season dinner (at: 21 Dec 2012 2359)
+```
+
+##### `list`
+
+List all tasks.
+
+**Example of usage:**
+```
+event Prepare for the holiday season dinner /at 21st dec 2012
+list
+```
+
+This would list all tasks:
+```
+Here, your tasks:
+1.[E][X] Prepare for the holiday season dinner (at: 20 Dec 2012 2359)
+```
+
+### Note commands
+
+##### `delete note INDEX`
+
+Delete note with index `INDEX`.
+
+**Example of usage:**
+```
+note Delete this /content Something to forget.
+delete note 1
+```
+
+This would delete the note:
+```
+I removed this note:
+Delete this
+```
+
+##### `find notes DESCRIPTION`
+
+Find all notes where the title matches `DESCSRIPTION`. The number next to the note is preserved.
+
+**Example of usage:**
+```
+note Find this /content Something to find.
+find notes Find
+```
+
+This would find the note:
+```
+These notes match your query:
+1.Find this
+```
+
+##### `list notes`
+
+List all notes.
+
+**Example of usage:**
+```
+note Find this /content Something to find.
+list notes
+```
+
+This would list your notes:
+```
+Here, your notes:
+1.Find this
+```
+
+##### `note DESCRIPTION [/content CONTENT]`
+
+Adds a note titled `DESCRIPTION` with content `CONTENT`.
+
+**Example of usage:**
+```
+note Find this /content Something to find.
+```
+
+This would add a note:
+```
+Added your note about Find this.
+```
+
+##### `view note INDEX`
+
+View note with index `INDEX`. This shows the title and content.
+
+**Example of usage:**
+```
+note Find this /content Something to find.
+view note 1
+```
+
+This would view the note:
+```
+Here's the note:
+Find this
+Something to find.
+```
+
+### Other commands
+
+##### `bye`
+Close the application.
+
+### Command Glossary
+
+`CONTENT`/`DESCRIPTION`: Any ASCII string works, but ensure none of the words start with a forward slash, else it would be interpreted as a command modifier. Example: `grocery list` is fine but `groceries meat /fish` is not.
+
+`INDEX`: Any number works, as long it is the index of a task/note. Deleting a task/note will not preserve the index of other tasks/note behind it.
+
+`TIME`: Any string which contains the following keywords would be interpreted as a time if Anthea can resolve the time.
+* A time written as HH:MM (24 hours) or HH:MMam or HH:MMpm, or with a period instead of a colon.
+* A day of the week, full or abbreviated.
+* An ordinal, interpreted as the day of a month (e.g. 1st, 23rd).
+* A month name, full or abbreviated.
+* A date, written as D/M/Y or D-M-Y.
+* A year, written as Y.
+
+Time resolution proceeds as follows:
+* A time at or after the present is attempted to be found which matches all the keywords
+* If no such time exists, a time before the present but after 1st Jan 1AD 00:00
+* If no such time exists, the string is left intact for the benefit of the user.
+
+### Command Summary
+
+|Command|Description|
+|-|-|
+|`bye`|Close the application.|
+|`deadline DESCRIPTION [/by TIME]`|Adds a deadline.|
+|`delete INDEX`|Delete task.|
+|`delete note INDEX`|Delete note.|
+|`event DESCRIPTION [/at TIME]`|Adds an event.|
+|`find DESCRIPTION`|Find tasks.|
+|`find notes DESCRIPTION`|Find notes.|
+|`list`|List all tasks.|
+|`list notes`|List all notes.|
+|`todo DESCRIPTION`|Adds a todo to track.|
+|`mark INDEX`|Mark task as completed.|
+|`note DESCRIPTION [/content CONTENT]`|Adds a note.|
+|`reschedule INDEX [/at TIME] [/by TIME]`|Reschedule the task.|
+|`unmark INDEX`|Unmark task.|
+|`view note INDEX`|View note.|
+
+
+### Data
+The data for the application is stored in `duke.txt` and `dukeNotes.txt` in CSV using base64. They may be deleted to purge data, or backups may be made of them.
diff --git a/docs/Ui.png b/docs/Ui.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6293dc2e60a9a2b11686a9821fcd4435ab628db
GIT binary patch
literal 33865
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
D$&tR(

literal 0
HcmV?d00001


From 18a94eacdbda04741d1bf3d5912bcfe7cb0c9533 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Thu, 15 Sep 2022 08:35:56 +0800
Subject: [PATCH 57/67] Update testing

---
 text-ui-test/runtest.bat | 2 +-
 text-ui-test/runtest.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat
index 06c0620ec4..9a8a2a63c9 100644
--- a/text-ui-test/runtest.bat
+++ b/text-ui-test/runtest.bat
@@ -7,7 +7,7 @@ REM delete output from previous run
 if exist ACTUAL.TXT del ACTUAL.TXT
 
 REM compile the code into the bin folder
-javac  -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\duke\*.java ..\src\main\java\duke\note\*.java ..\src\main\java\duke\task\*.java
+javac  -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\duke\*.java ..\src\main\java\duke\exception\*.java ..\src\main\java\duke\note\*.java ..\src\main\java\duke\task\*.java
 IF ERRORLEVEL 1 (
     echo ********** BUILD FAILURE **********
     exit /b 1
diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh
index 2ea5421d20..e43be2797c 100755
--- a/text-ui-test/runtest.sh
+++ b/text-ui-test/runtest.sh
@@ -13,7 +13,7 @@ then
 fi
 
 # compile the code into the bin folder, terminates if error occurred
-if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/duke/*.java ../src/main/java/duke/note/*.java ../src/main/java/duke/task/*.java
+if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/duke/*.java ../src/main/java/duke/exception/*.java ../src/main/java/duke/note/*.java ../src/main/java/duke/task/*.java
 then
     echo "********** BUILD FAILURE **********"
     exit 1

From 3fa8062834a0883beaab42b9d8e43650a83c39af Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Thu, 15 Sep 2022 08:47:41 +0800
Subject: [PATCH 58/67] Set shadowJar name to Anthea

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index aa513d9dbb..2dc54fb561 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,7 +53,7 @@ application {
 }
 
 shadowJar {
-    archiveBaseName = "duke"
+    archiveBaseName = "Anthea"
     archiveClassifier = null
 }
 

From 35d0667f884d4620f5d44a89212dfdc2eccc23b3 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Thu, 15 Sep 2022 08:50:18 +0800
Subject: [PATCH 59/67] Update .gitignore to ignore testing files

---
 .gitignore                 |  8 ++++++--
 text-ui-test/duke.txt      | 16 ----------------
 text-ui-test/dukeNotes.txt |  4 ----
 3 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 text-ui-test/duke.txt
 delete mode 100644 text-ui-test/dukeNotes.txt

diff --git a/.gitignore b/.gitignore
index 7ec4e6189a..8d0b0a5317 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,11 @@ src/main/resources/docs/
 *.iml
 bin/
 
+# Testing files
+duke.txt
+dukeNotes.txt
 /text-ui-test/ACTUAL.txt
+/text-ui-test/ACTUAL1.txt
 text-ui-test/EXPECTED-UNIX.TXT
-duke.txt
-dukeNotes.txt
\ No newline at end of file
+/text-ui-test/duke.txt
+/text-ui-test/dukeNotes.txt
\ No newline at end of file
diff --git a/text-ui-test/duke.txt b/text-ui-test/duke.txt
deleted file mode 100644
index 5bcf129218..0000000000
--- a/text-ui-test/duke.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-/v8AVABvAEQAbw==,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
-/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AdAByAHUAZQ==,/v8AMwAxACAARABlAGMAIAAxADkANQAwACAAMgAzADUAOQ==
-/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AdAByAHUAZQ==,/v8AMwAxACAARABlAGMAIAAxADkANgAwACAAMgAzADUAOQ==
-/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AdAByAHUAZQ==,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AMwAxACAARABlAGMAIAAxADkANgAwACAAMgAzADUAOQ==
-/v8ARQB2AGUAbgB0,/v8AIAB3AG8AdwAgACAAbQB1AGMAaAAgACAAcwBwAGEAYwBl,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
-/v8AVABvAEQAbw==,/v8AaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
-/v8AVABvAEQAbw==,/v8AbwB0AGgAZQByACAAaABvAG0AZQB3AG8AcgBr,/v8AZgBhAGwAcwBl
-/v8AVABvAEQAbw==,/v8AcAByAG8AagBlAGMAdAAgADEAMg==,/v8AZgBhAGwAcwBl
-/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAGYAcgBpAGUAbgBkAHM=,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZABpAG4AbgBlAHI=,/v8AZgBhAGwAcwBl,/v8ANgA6ADIANQAgAHAAbQ==
-/v8ARQB2AGUAbgB0,/v8AbQBlAGUAdAAgAHAAZQBvAHAAbABlACAAYQB0ACAAZgB1AG4AYwB0AGkAbwBuACAAeAAvAHkALwB6ACAAdwBoAGEAdABlAHYAZQBy,/v8AZgBhAGwAcwBl,/v8AMAA3ACAATgBvAHYAIAAxADUAMgA0ACAAMAA3ADEAMg==
-/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBhAHQAIABtAHkAcwB0AGUAcgBpAG8AdQBz,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8ARABlAGEAZABsAGkAbgBl,/v8ALwBiAHkAIABtAHkAcwB0AGUAcgBpAG8AdQBzACAAbgB1AG0AYgBlAHIAIAAy,/v8AZgBhAGwAcwBl,/v8AWwB1AG4AawBuAG8AdwBuAF0=
-/v8ARABlAGEAZABsAGkAbgBl,/v8AcgB1AHMAaAAgAHQAaABpAHMAIABwAGwAZQBhAHMAZQ==,/v8AZgBhAGwAcwBl,/v8AdwBoAGUAbgA/
-/v8ARQB2AGUAbgB0,/v8AIAB3AG8AdwAgACAAbQB1AGMAaAAgACAAcwBwAGEAYwBl,/v8AZgBhAGwAcwBl,/v8AMQAwAGEAbQ==
\ No newline at end of file
diff --git a/text-ui-test/dukeNotes.txt b/text-ui-test/dukeNotes.txt
deleted file mode 100644
index 0c083b7429..0000000000
--- a/text-ui-test/dukeNotes.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-/v8AaABlAGwAbABv,/v8AdABoAGkAcwAgAGkAcwAgAGEAIABnAHIAZQBhAHQAIABuAG8AdABl
-/v8AcABp,/v8AMwAuADEANAAxADUAOQAyADYANQAzADUAOAA5ADcAOQAzADIAMw==
-/v8AcABp,/v8AMwAuADEANAAxADUAOQAyADYANQAzADUAOAA5ADcAOQAzADIAMw==
-/v8AaABlAGwAbABv,/v8AcgBlAHAAZQBhAHQAZQBkACAAdABpAHQAbABl
\ No newline at end of file

From c53209905f7937004e40e81708f4acc0b67568cb Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Thu, 15 Sep 2022 09:04:25 +0800
Subject: [PATCH 60/67] Add quickstart section to the user guide

---
 docs/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/README.md b/docs/README.md
index 17622d7840..967c86b316 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,5 +1,11 @@
 # User Guide
 
+## Quick Start
+
+Get the JAR file, and place it in the directory of your choice. Run the JAR and you are set! On Windows and Mac, you may double-click the JAR to run it.
+
+Console mode is also provided. You may run `java -jar ./duke.jar console` in Windows if you prefer using the console.
+
 ## Features
 
 ### Chatbot

From 4cc60d71b340296759f9e2f03031e397e76e49f8 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Mon, 19 Sep 2022 10:54:06 +0800
Subject: [PATCH 61/67] Update user guide to handle issues with Mac

Mac has this issue where double-clicked apps cannot make files in the
same directory. By changing instructions of how Mac users are to use the
application, this would improve user experience.
---
 docs/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 967c86b316..25f578b1b7 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,9 +2,9 @@
 
 ## Quick Start
 
-Get the JAR file, and place it in the directory of your choice. Run the JAR and you are set! On Windows and Mac, you may double-click the JAR to run it.
+Get the JAR file, and place it in the directory of your choice. Run the JAR and you are set! On Windows, you may double-click the JAR to run it. On Mac, you can run `java -jar ./Anthea.jar` to avoid issues with saving data.
 
-Console mode is also provided. You may run `java -jar ./duke.jar console` in Windows if you prefer using the console.
+Console mode is also provided. You may run `java -jar ./Anthea.jar console` in Windows if you prefer using the console.
 
 ## Features
 

From 9c9a5ad68474a42d9946618beb90cd2c61b5a9a9 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Tue, 20 Sep 2022 21:08:24 +0800
Subject: [PATCH 62/67] Remove javafx block from build.gradle file

This may be the cause of why it failed automated smoke tests.

Let's remove it to check if it is the issue.
---
 build.gradle | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2dc54fb561..ea3797469d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -61,8 +61,3 @@ run {
     standardInput = System.in
     enableAssertions = true
 }
-
-javafx {
-    version = "11.0.2"
-    modules = [ 'javafx.controls', 'javafx.fxml' ]
-}
\ No newline at end of file

From 9cce6ca4721962069c465ad18d1e135fd4aade6b Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Tue, 11 Oct 2022 06:32:42 +0800
Subject: [PATCH 63/67] Fix bug which involves rescheduling Deadline

This resolves #3.
---
 src/main/java/duke/CommandMatcher.java |   2 -
 src/main/java/duke/Parser.java         |   4 +-
 text-ui-test/EXPECTED.TXT              | 117 ++++++++++++++
 text-ui-test/EXPECTED1.TXT             | 201 ++++++++++++++++++++-----
 text-ui-test/input.txt                 |  33 ++++
 5 files changed, 315 insertions(+), 42 deletions(-)

diff --git a/src/main/java/duke/CommandMatcher.java b/src/main/java/duke/CommandMatcher.java
index 06a5e317ea..e799b54e0f 100644
--- a/src/main/java/duke/CommandMatcher.java
+++ b/src/main/java/duke/CommandMatcher.java
@@ -10,8 +10,6 @@
  * as a matching process and an action.
  */
 public class CommandMatcher extends StringMatcher<DukeResponse> {
-    private Predicate<String> shouldRunAction;
-    private Function<String, DukeResponse> action;
 
     /**
      * Constructs an object that handles checking and executing a command.
diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index 86f0e6d475..8805c5b765 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -170,8 +170,8 @@ public static ArrayList<CommandMatcher> addTaskModificationCommands(ArrayList<Co
                 }
                 newTask = new Event(task.getDescription(), map.get("at"), task.isTaskDone());
             } else if (task instanceof Deadline) {
-                if (!map.containsKey("at")) {
-                    return new DukeResponse("Do specify /by for events.");
+                if (!map.containsKey("by")) {
+                    return new DukeResponse("Do specify /by for deadlines.");
                 }
                 newTask = new Deadline(task.getDescription(), map.get("by"), task.isTaskDone());
             } else {
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index c0b0ae25e6..7c2761df4b 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -237,6 +237,123 @@
 | 7.[D][ ] rush this please (by: when?)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][ ] meet friends (at: [unknown])
+| 3.[E][ ] meet people at dinner (at: 6:25 pm)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 5.[D][ ] /at mysterious (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 7.[D][ ] rush this please (by: when?)
+| 8.[E][ ]  wow  much  space (at: 10am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand a, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand a, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand a, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand a, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][ ] meet friends (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /at for events.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][ ] meet friends (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][ ] meet friends (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][ ] meet friends (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /at for events.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][ ] meet friends (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][ ] meet friends (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][ ] meet people at dinner (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /at for events.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][ ] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /at for events.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /by for deadlines.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [D][ ] /at mysterious (by: 31 Dec 1000 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /by for deadlines.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [D][ ] /by mysterious number 2 (by: 31 Dec 1000 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
 | Added your note about hello.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
diff --git a/text-ui-test/EXPECTED1.TXT b/text-ui-test/EXPECTED1.TXT
index bfd8539c5d..b84ba99a9b 100644
--- a/text-ui-test/EXPECTED1.TXT
+++ b/text-ui-test/EXPECTED1.TXT
@@ -28,10 +28,10 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][ ] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 '----------------------------------------------------------------
@@ -71,10 +71,10 @@
 | Here, your tasks:
 | 1.[T][X] homework
 | 2.[E][X] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][ ] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -93,10 +93,10 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][ ] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -105,16 +105,16 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Marked your task as done:
-| [E][X] meet people at dinner (at: 6:25 pm)
+| [E][X] meet people at dinner (at: 31 Dec 1200 2359)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][X] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -123,16 +123,16 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Marked your task as done:
-| [E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][X] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -147,10 +147,10 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][X] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -159,16 +159,16 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Marked your task as done:
-| [D][X] /by mysterious number 2 (by: [unknown])
+| [D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][X] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][X] /by mysterious number 2 (by: [unknown])
+| 6.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -191,10 +191,10 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][X] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][X] /by mysterious number 2 (by: [unknown])
+| 6.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -220,10 +220,10 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][X] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][X] /by mysterious number 2 (by: [unknown])
+| 6.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -243,15 +243,15 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | It seems you didn't need this task anymore, so I removed it:
-| [E][X] meet people at dinner (at: 6:25 pm)
+| [E][X] meet people at dinner (at: 31 Dec 1200 2359)
 | You have 15 tasks left.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 2.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 4.[D][X] /by mysterious number 2 (by: [unknown])
+| 4.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 5.[D][ ] rush this please (by: when?)
 | 6.[E][ ]  wow  much  space (at: 10am)
 | 7.[T][ ] homework
@@ -283,9 +283,9 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 2.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 4.[D][X] /by mysterious number 2 (by: [unknown])
+| 4.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 5.[D][ ] rush this please (by: when?)
 | 6.[E][ ]  wow  much  space (at: 10am)
 | 7.[T][ ] homework
@@ -314,7 +314,7 @@
 ,----------------------------------------------------------------
 | Here are the tasks that you might be looking for:
 | 1.[T][ ] homework
-| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 2.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 7.[T][ ] homework
 | 8.[T][ ] other homework
 | 10.[E][ ] meet friends (at: [unknown])
@@ -323,9 +323,9 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here are the tasks that you might be looking for:
-| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 2.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 4.[D][X] /by mysterious number 2 (by: [unknown])
+| 4.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 5.[D][ ] rush this please (by: when?)
 | 8.[T][ ] other homework
 | 9.[T][ ] project 12
@@ -337,6 +337,131 @@
 | 15.[D][ ] rush this please (by: when?)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+| 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
+| 4.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
+| 5.[D][ ] rush this please (by: when?)
+| 6.[E][ ]  wow  much  space (at: 10am)
+| 7.[T][ ] homework
+| 8.[T][ ] other homework
+| 9.[T][ ] project 12
+| 10.[E][ ] meet friends (at: [unknown])
+| 11.[E][ ] meet people at dinner (at: 6:25 pm)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 13.[D][ ] /at mysterious (by: [unknown])
+| 14.[D][ ] /by mysterious number 2 (by: [unknown])
+| 15.[D][ ] rush this please (by: when?)
+| 16.[E][ ]  wow  much  space (at: 10am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand a, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand a, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand a, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand a, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /at for events.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /at for events.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /by for deadlines.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [D][X] /at mysterious (by: 31 Dec 1000 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /by for deadlines.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /by for deadlines.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [D][ ] rush this please (by: 31 Dec 1000 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][ ]  wow  much  space (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /at for events.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
 | Added your note about hello.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
index d15cc0c634..0a24fcb230 100644
--- a/text-ui-test/input.txt
+++ b/text-ui-test/input.txt
@@ -50,6 +50,39 @@ find  meet
 find      me
 find me
 find t
+list
+reschedule -1 /at 1200
+reschedule -1 /by 1000
+reschedule -1 /at 1200 /by 1000
+reschedule -1 /by 1000 /at 1200
+reschedule a /at 1200
+reschedule a /by 1000
+reschedule a /at 1200 /by 1000
+reschedule a /by 1000 /at 1200
+reschedule 0 /at 1200
+reschedule 0 /by 1000
+reschedule 0 /at 1200 /by 1000
+reschedule 0 /by 1000 /at 1200
+reschedule 01 /at 1200
+reschedule 01 /by 1000
+reschedule 01 /at 1200 /by 1000
+reschedule 01 /by 1000 /at 1200
+reschedule 2 /at 1200
+reschedule 2 /by 1000
+reschedule 2 /at 1200 /by 1000
+reschedule 2 /by 1000 /at 1200
+reschedule 02 /at 1200
+reschedule 02 /by 1000
+reschedule 02 /at 1200 /by 1000
+reschedule 02 /by 1000 /at 1200
+reschedule 3 /at 1200
+reschedule 3 /by 1000
+reschedule 4 /at 1200
+reschedule 4 /by 1000
+reschedule 5 /at 1200
+reschedule 5 /by 1000
+reschedule 6 /at 1200
+reschedule 6 /by 1000
 note hello /content this is a great note
 note pi /content 3.14159265358979323
 note hello /content repeated title

From 0be51ddd987f91c9bfa9067b321b20e61f84215d Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Mon, 18 Sep 2023 14:05:05 +0800
Subject: [PATCH 64/67] Fix code quality issues

Some Booleans in ParsedDateTime are replaced with better names. Methods
in Parser are shortened by writing individual methods in Commands to
create each command separately. The other files have documentation
updates.

As a side effect, the test cases available only reschedule to years
instead of times.
---
 src/main/java/duke/Commands.java              | 244 ++++++++++++++++++
 src/main/java/duke/ParsedDateTime.java        |  10 +-
 src/main/java/duke/Parser.java                | 167 ++----------
 .../exception/DukeExceptionBiFunction.java    |   1 +
 src/main/java/duke/gui/MainWindow.java        |   2 +-
 text-ui-test/ACTUAL1.TXT                      | 201 ++++++++++++---
 6 files changed, 429 insertions(+), 196 deletions(-)
 create mode 100644 src/main/java/duke/Commands.java

diff --git a/src/main/java/duke/Commands.java b/src/main/java/duke/Commands.java
new file mode 100644
index 0000000000..fce2f93127
--- /dev/null
+++ b/src/main/java/duke/Commands.java
@@ -0,0 +1,244 @@
+package duke;
+
+import java.util.List;
+
+import duke.note.Note;
+import duke.note.NoteList;
+import duke.task.Deadline;
+import duke.task.Event;
+import duke.task.Task;
+import duke.task.TaskList;
+import duke.task.ToDo;
+
+/**
+ * Creates the command to reschedule.
+ */
+public class Commands {
+    /**
+     * Creates the command to add deadlines.
+     * @return Command for adding deadlines.
+     */
+    public static CommandMatcher getAddDeadlineCommand() {
+        return new PrefixCommandMatcher("deadline", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Task task = new Deadline(str, map.getOrDefault("by", "[unknown]"));
+            TaskList.getTaskList().add(task);
+            return new DukeResponse(
+                    "Good luck with the deadline, here's the task:",
+                    task.toString());
+        });
+    }
+
+    /**
+     * Creates the command to add events.
+     * @return Command for adding events.
+     */
+    public static CommandMatcher getAddEventCommand() {
+        return new PrefixCommandMatcher("event", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Task task = new Event(str, map.getOrDefault("at", "[unknown]"));
+            TaskList.getTaskList().add(task);
+            return new DukeResponse(
+                    "That's going to happen at some time later:",
+                    task.toString());
+        });
+    }
+
+    /**
+     * Creates the command to add tasks.
+     * @return Command for adding tasks.
+     */
+    public static CommandMatcher getAddToDoCommand() {
+        return new PrefixCommandMatcher("todo", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Task task = new ToDo(str);
+            TaskList.getTaskList().add(task);
+            return new DukeResponse(
+                    "I've recorded this thing you need to do:",
+                    task.toString());
+        });
+    }
+
+    /**
+     * Creates the command to mark tasks as done.
+     * @return Command for marking tasks as done.
+     */
+    public static CommandMatcher getMarkCommand() {
+        return PrefixCommandMatcher.of("mark", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Task task = TaskList.getTask(str);
+            task.markAsDone();
+            return new DukeResponse(
+                    "Marked your task as done:",
+                    task.toString());
+        });
+    }
+
+    /**
+     * Creates the command to unmark tasks as done.
+     * @return Command for unmarking tasks as done.
+     */
+    public static CommandMatcher getUnmarkCommand() {
+        return PrefixCommandMatcher.of("unmark", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Task task = TaskList.getTask(str);
+            task.markAsNotDone();
+            return new DukeResponse(
+                    "Aw... it's not done yet:",
+                    task.toString());
+        });
+    }
+
+    /**
+     * Creates the command to delete tasks.
+     * @return Command for deleting tasks.
+     */
+    public static CommandMatcher getDeleteCommand() {
+        return PrefixCommandMatcher.of("delete", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Task task = TaskList.getTask(str);
+            TaskList.getTaskList().remove(task);
+            return new DukeResponse(
+                    "It seems you didn't need this task anymore, so I removed it:",
+                    task.toString(),
+                    String.format("You have %d tasks left.", TaskList.getTaskList().size()));
+        });
+    }
+
+    /**
+     * Creates the command to reschedule.
+     * @return Command for rescheduling.
+     */
+    public static CommandMatcher getRescheduleCommand() {
+        return PrefixCommandMatcher.of("reschedule", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Task task = TaskList.getTask(str);
+            if (task instanceof ToDo) {
+                return new DukeResponse("That's a todo, it doesn't have a date.");
+            }
+            Task newTask;
+            if (task instanceof Event) {
+                if (!map.containsKey("at")) {
+                    return new DukeResponse("Do specify /at for events.");
+                }
+                newTask = new Event(task.getDescription(), map.get("at"), task.isTaskDone());
+            } else if (task instanceof Deadline) {
+                if (!map.containsKey("by")) {
+                    return new DukeResponse("Do specify /by for deadlines.");
+                }
+                newTask = new Deadline(task.getDescription(), map.get("by"), task.isTaskDone());
+            } else {
+                return new DukeResponse("This is a strange task - I don't recognise it.");
+            }
+            List<Task> tasks = TaskList.getTaskList();
+            tasks.set(tasks.indexOf(task), newTask);
+            return new DukeResponse(
+                    "I have rescheduled your task!",
+                    newTask.toString());
+        });
+    }
+
+    /**
+     * Creates the command to list tasks.
+     * @return Command for listing tasks.
+     */
+    public static CommandMatcher getListTasksCommand() {
+        return new CommandMatcher(str -> str.equals("list"), (str) -> {
+            assert str != null;
+            List<Task> tasks = TaskList.getTaskList();
+            return new DukeResponse(
+                    Parser.listObjects("Here, your tasks:", tasks));
+        });
+    }
+
+    /**
+     * Creates the command to find tasks.
+     * @return Command for finding tasks.
+     */
+    public static CommandMatcher getFindTasksCommand() {
+        return new PrefixCommandMatcher("find", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            List<Pair<Integer, Task>> tasks = TaskList.filterTasks(str);
+            return new DukeResponse(
+                    Parser.listNumberedObjects("Here are the tasks that you might be looking for:", tasks));
+        });
+    }
+
+    /**
+     * Creates the command to list notes.
+     * @return Command for listing notes.
+     */
+    public static CommandMatcher getListNotesCommand() {
+        return new CommandMatcher(str -> str.equals("list notes"), (str) -> {
+            assert str != null;
+            List<Note> notes = NoteList.getNoteList();
+            return new DukeResponse(
+                    Parser.listObjects("Here, your notes:", notes));
+        });
+    }
+
+    /**
+     * Creates the command to find notes.
+     * @return Command for finding notes.
+     */
+    public static CommandMatcher getFindNotesCommand() {
+        return new PrefixCommandMatcher("find notes", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            List<Pair<Integer, Note>> notes = NoteList.filterNotes(str);
+            return new DukeResponse(
+                    Parser.listNumberedObjects("These notes match your query:", notes));
+        });
+    }
+
+    /**
+     * Creates the command to view notes.
+     * @return Command for viewing notes.
+     */
+    public static CommandMatcher getViewNoteCommand() {
+        return PrefixCommandMatcher.of("view note", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Note note = NoteList.getNote(str);
+            return new DukeResponse("Here's the note:", note.getTitle(), note.getContent());
+        });
+    }
+
+    /**
+     * Creates the command to delete notes.
+     * @return Command for deleting notes.
+     */
+    public static CommandMatcher getDeleteNoteCommand() {
+        return PrefixCommandMatcher.of("delete note", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Note note = NoteList.getNote(str);
+            NoteList.getNoteList().remove(note);
+            return new DukeResponse(
+                    "I removed this note:",
+                    note.toString());
+        });
+    }
+
+    /**
+     * Creates the command to add notes.
+     * @return Command for add notes.
+     */
+    public static CommandMatcher getAddNoteCommand() {
+        return PrefixCommandMatcher.of("note", (str, map) -> {
+            assert str != null;
+            assert map != null;
+            Note note = new Note(str, map.getOrDefault("content", "[EMPTY]"));
+            NoteList.getNoteList().add(note);
+            return new DukeResponse(String.format("Added your note about %s.", str));
+        });
+    }
+}
diff --git a/src/main/java/duke/ParsedDateTime.java b/src/main/java/duke/ParsedDateTime.java
index 234cb472c4..5e03b8a0fb 100644
--- a/src/main/java/duke/ParsedDateTime.java
+++ b/src/main/java/duke/ParsedDateTime.java
@@ -217,15 +217,15 @@ public class ParsedDateTime {
                         String[] parts = s.split("[:.]");
                         int hour = Integer.parseInt(parts[0]);
                         int minute;
-                        boolean invalidHour;
+                        boolean isInvalidHour;
                         if (isNumeric(parts[1])) {
                             minute = Integer.parseInt(parts[1]);
-                            invalidHour = hour < 0 || hour >= HOURS_PER_DAY;
+                            isInvalidHour = hour < 0 || hour >= HOURS_PER_DAY;
                         } else {
                             minute = Integer.parseInt(parts[1].substring(0, parts[1].length() - 2));
                             String suffix = parts[1].substring(parts[1].length() - 2)
                                     .toLowerCase();
-                            invalidHour = hour <= 0 || hour > 12;
+                            isInvalidHour = hour <= 0 || hour > 12;
                             if (suffix.equals("am")) {
                                 if (hour == 12) {
                                     hour = 0;
@@ -236,8 +236,8 @@ public class ParsedDateTime {
                                 }
                             }
                         }
-                        boolean invalidMinute = minute < 0 || minute >= MINUTES_PER_HOUR;
-                        if (invalidHour || invalidMinute) {
+                        boolean isInvalidMinute = minute < 0 || minute >= MINUTES_PER_HOUR;
+                        if (isInvalidHour || isInvalidMinute) {
                             return temporal -> {
                                 throw new DateTimeException("Invalid hour/minute for time");
                             };
diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
index 8805c5b765..b47eefee5b 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/duke/Parser.java
@@ -3,14 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import duke.note.Note;
-import duke.note.NoteList;
-import duke.task.Deadline;
-import duke.task.Event;
-import duke.task.Task;
-import duke.task.TaskList;
-import duke.task.ToDo;
-
 /**
  * Handles creating commands through duke.CommandMatcher/duke.PrefixCommandMatcher.
  */
@@ -67,6 +59,7 @@ public static <T> String[] listNumberedObjects(String response, List<Pair<Intege
     public static ArrayList<CommandMatcher> getCommands() {
         ArrayList<CommandMatcher> commands = new ArrayList<>();
 
+        // This has to be before since the commands are more specific.
         commands = addNoteCommands(commands);
 
         commands = addTaskCommands(commands);
@@ -85,36 +78,9 @@ public static ArrayList<CommandMatcher> getCommands() {
      */
     public static ArrayList<CommandMatcher> addTaskCommands(ArrayList<CommandMatcher> commands) {
         assert commands != null;
-        commands.add(new PrefixCommandMatcher("deadline", (str, map) -> {
-            assert str != null;
-            assert map != null;
-            Task task = new Deadline(str, map.getOrDefault("by", "[unknown]"));
-            TaskList.getTaskList().add(task);
-            return new DukeResponse(
-                    "Good luck with the deadline, here's the task:",
-                    task.toString());
-        }));
-
-        commands.add(new PrefixCommandMatcher("todo", (str, map) -> {
-            assert str != null;
-            assert map != null;
-            Task task = new ToDo(str);
-            TaskList.getTaskList().add(task);
-            return new DukeResponse(
-                    "I've recorded this thing you need to do:",
-                    task.toString());
-        }));
-
-        commands.add(new PrefixCommandMatcher("event", (str, map) -> {
-            assert str != null;
-            assert map != null;
-            Task task = new Event(str, map.getOrDefault("at", "[unknown]"));
-            TaskList.getTaskList().add(task);
-            return new DukeResponse(
-                    "That's going to happen at some time later:",
-                    task.toString());
-        }));
-
+        commands.add(Commands.getAddDeadlineCommand());
+        commands.add(Commands.getAddEventCommand());
+        commands.add(Commands.getAddToDoCommand());
         return commands;
     }
 
@@ -125,65 +91,10 @@ public static ArrayList<CommandMatcher> addTaskCommands(ArrayList<CommandMatcher
      */
     public static ArrayList<CommandMatcher> addTaskModificationCommands(ArrayList<CommandMatcher> commands) {
         assert commands != null;
-        commands.add(PrefixCommandMatcher.of("mark", (str, map) -> {
-            assert str != null;
-            assert map != null;
-            Task task = TaskList.getTask(str);
-            task.markAsDone();
-            return new DukeResponse(
-                    "Marked your task as done:",
-                    task.toString());
-        }));
-
-        commands.add(PrefixCommandMatcher.of("unmark", (str, map) -> {
-            assert str != null;
-            assert map != null;
-            Task task = TaskList.getTask(str);
-            task.markAsNotDone();
-            return new DukeResponse(
-                    "Aw... it's not done yet:",
-                    task.toString());
-        }));
-
-        commands.add(PrefixCommandMatcher.of("delete", (str, map) -> {
-            assert str != null;
-            assert map != null;
-            Task task = TaskList.getTask(str);
-            TaskList.getTaskList().remove(task);
-            return new DukeResponse(
-                    "It seems you didn't need this task anymore, so I removed it:",
-                    task.toString(),
-                    String.format("You have %d tasks left.", TaskList.getTaskList().size()));
-        }));
-
-        commands.add(PrefixCommandMatcher.of("reschedule", (str, map) -> {
-            assert str != null;
-            assert map != null;
-            Task task = TaskList.getTask(str);
-            if (task instanceof ToDo) {
-                return new DukeResponse("That's a todo, it doesn't have a date.");
-            }
-            Task newTask;
-            if (task instanceof Event) {
-                if (!map.containsKey("at")) {
-                    return new DukeResponse("Do specify /at for events.");
-                }
-                newTask = new Event(task.getDescription(), map.get("at"), task.isTaskDone());
-            } else if (task instanceof Deadline) {
-                if (!map.containsKey("by")) {
-                    return new DukeResponse("Do specify /by for deadlines.");
-                }
-                newTask = new Deadline(task.getDescription(), map.get("by"), task.isTaskDone());
-            } else {
-                return new DukeResponse("This is a strange task - I don't recognise it.");
-            }
-            List<Task> tasks = TaskList.getTaskList();
-            tasks.set(tasks.indexOf(task), newTask);
-            return new DukeResponse(
-                    "I have rescheduled your task!",
-                    newTask.toString());
-        }));
-
+        commands.add(Commands.getMarkCommand());
+        commands.add(Commands.getUnmarkCommand());
+        commands.add(Commands.getDeleteCommand());
+        commands.add(Commands.getRescheduleCommand());
         return commands;
     }
 
@@ -194,21 +105,8 @@ public static ArrayList<CommandMatcher> addTaskModificationCommands(ArrayList<Co
      */
     public static ArrayList<CommandMatcher> addTaskViewingCommands(ArrayList<CommandMatcher> commands) {
         assert commands != null;
-        commands.add(new CommandMatcher(str -> str.equals("list"), (str) -> {
-            assert str != null;
-            List<Task> tasks = TaskList.getTaskList();
-            return new DukeResponse(
-                    listObjects("Here, your tasks:", tasks));
-        }));
-
-        commands.add(new PrefixCommandMatcher("find", (str, map) -> {
-            assert str != null;
-            assert map != null;
-            List<Pair<Integer, Task>> tasks = TaskList.filterTasks(str);
-            return new DukeResponse(
-                    listNumberedObjects("Here are the tasks that you might be looking for:", tasks));
-        }));
-
+        commands.add(Commands.getListTasksCommand());
+        commands.add(Commands.getFindTasksCommand());
         return commands;
     }
 
@@ -219,46 +117,11 @@ public static ArrayList<CommandMatcher> addTaskViewingCommands(ArrayList<Command
      */
     public static ArrayList<CommandMatcher> addNoteCommands(ArrayList<CommandMatcher> commands) {
         assert commands != null;
-        commands.add(new CommandMatcher(str -> str.equals("list notes"), (str) -> {
-            assert str != null;
-            List<Note> notes = NoteList.getNoteList();
-            return new DukeResponse(
-                    listObjects("Here, your notes:", notes));
-        }));
-
-        commands.add(new PrefixCommandMatcher("find notes", (str, map) -> {
-            assert str != null;
-            assert map != null;
-            List<Pair<Integer, Note>> notes = NoteList.filterNotes(str);
-            return new DukeResponse(
-                    listNumberedObjects("These notes match your query:", notes));
-        }));
-
-        commands.add(PrefixCommandMatcher.of("view note", (str, map) -> {
-            assert str != null;
-            assert map != null;
-            Note note = NoteList.getNote(str);
-            return new DukeResponse("Here's the note:", note.getTitle(), note.getContent());
-        }));
-
-        commands.add(PrefixCommandMatcher.of("delete note", (str, map) -> {
-            assert str != null;
-            assert map != null;
-            Note note = NoteList.getNote(str);
-            NoteList.getNoteList().remove(note);
-            return new DukeResponse(
-                    "I removed this note:",
-                    note.toString());
-        }));
-
-        commands.add(PrefixCommandMatcher.of("note", (str, map) -> {
-            assert str != null;
-            assert map != null;
-            Note note = new Note(str, map.getOrDefault("content", "[EMPTY]"));
-            NoteList.getNoteList().add(note);
-            return new DukeResponse(String.format("Added your note about %s.", str));
-        }));
-
+        commands.add(Commands.getListNotesCommand());
+        commands.add(Commands.getFindNotesCommand());
+        commands.add(Commands.getViewNoteCommand());
+        commands.add(Commands.getDeleteNoteCommand());
+        commands.add(Commands.getAddNoteCommand());
         return commands;
     }
 
diff --git a/src/main/java/duke/exception/DukeExceptionBiFunction.java b/src/main/java/duke/exception/DukeExceptionBiFunction.java
index 88af3a9c4a..30959cb31f 100644
--- a/src/main/java/duke/exception/DukeExceptionBiFunction.java
+++ b/src/main/java/duke/exception/DukeExceptionBiFunction.java
@@ -8,6 +8,7 @@
  * Defines an interface for functions that throw DukeException.
  *
  * @param <T> Input type.
+ * @param <U> Input type.
  */
 public interface DukeExceptionBiFunction<T, U> {
     /**
diff --git a/src/main/java/duke/gui/MainWindow.java b/src/main/java/duke/gui/MainWindow.java
index 2841e3bc24..478d369be5 100644
--- a/src/main/java/duke/gui/MainWindow.java
+++ b/src/main/java/duke/gui/MainWindow.java
@@ -51,7 +51,7 @@ public class MainWindow extends AnchorPane {
             96, 96, false, true);
 
     /**
-     * Get the writer that writes out GUI interactions.
+     * Gets the writer that writes out GUI interactions.
      *
      * @return The writer that writes out GUI interactions.
      */
diff --git a/text-ui-test/ACTUAL1.TXT b/text-ui-test/ACTUAL1.TXT
index bfd8539c5d..b84ba99a9b 100644
--- a/text-ui-test/ACTUAL1.TXT
+++ b/text-ui-test/ACTUAL1.TXT
@@ -28,10 +28,10 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][ ] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 '----------------------------------------------------------------
@@ -71,10 +71,10 @@
 | Here, your tasks:
 | 1.[T][X] homework
 | 2.[E][X] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][ ] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -93,10 +93,10 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][ ] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][ ] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -105,16 +105,16 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Marked your task as done:
-| [E][X] meet people at dinner (at: 6:25 pm)
+| [E][X] meet people at dinner (at: 31 Dec 1200 2359)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][X] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][ ] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -123,16 +123,16 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Marked your task as done:
-| [E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][X] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][ ] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -147,10 +147,10 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][X] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][ ] /by mysterious number 2 (by: [unknown])
+| 6.[D][ ] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -159,16 +159,16 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Marked your task as done:
-| [D][X] /by mysterious number 2 (by: [unknown])
+| [D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][X] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][X] /by mysterious number 2 (by: [unknown])
+| 6.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -191,10 +191,10 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][X] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][X] /by mysterious number 2 (by: [unknown])
+| 6.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -220,10 +220,10 @@
 | Here, your tasks:
 | 1.[T][ ] homework
 | 2.[E][ ] meet friends (at: 31 Dec 1950 2359)
-| 3.[E][X] meet people at dinner (at: 6:25 pm)
-| 4.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 3.[E][X] meet people at dinner (at: 31 Dec 1200 2359)
+| 4.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 5.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 6.[D][X] /by mysterious number 2 (by: [unknown])
+| 6.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 7.[D][ ] rush this please (by: when?)
 | 8.[E][ ]  wow  much  space (at: 10am)
 | 9.[T][ ] homework
@@ -243,15 +243,15 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | It seems you didn't need this task anymore, so I removed it:
-| [E][X] meet people at dinner (at: 6:25 pm)
+| [E][X] meet people at dinner (at: 31 Dec 1200 2359)
 | You have 15 tasks left.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 2.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 4.[D][X] /by mysterious number 2 (by: [unknown])
+| 4.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 5.[D][ ] rush this please (by: when?)
 | 6.[E][ ]  wow  much  space (at: 10am)
 | 7.[T][ ] homework
@@ -283,9 +283,9 @@
 ,----------------------------------------------------------------
 | Here, your tasks:
 | 1.[T][ ] homework
-| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 2.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 4.[D][X] /by mysterious number 2 (by: [unknown])
+| 4.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 5.[D][ ] rush this please (by: when?)
 | 6.[E][ ]  wow  much  space (at: 10am)
 | 7.[T][ ] homework
@@ -314,7 +314,7 @@
 ,----------------------------------------------------------------
 | Here are the tasks that you might be looking for:
 | 1.[T][ ] homework
-| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 2.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 7.[T][ ] homework
 | 8.[T][ ] other homework
 | 10.[E][ ] meet friends (at: [unknown])
@@ -323,9 +323,9 @@
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
 | Here are the tasks that you might be looking for:
-| 2.[E][X] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 2.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
 | 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
-| 4.[D][X] /by mysterious number 2 (by: [unknown])
+| 4.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
 | 5.[D][ ] rush this please (by: when?)
 | 8.[T][ ] other homework
 | 9.[T][ ] project 12
@@ -337,6 +337,131 @@
 | 15.[D][ ] rush this please (by: when?)
 '----------------------------------------------------------------
 ,----------------------------------------------------------------
+| Here, your tasks:
+| 1.[T][ ] homework
+| 2.[E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+| 3.[D][X] /at mysterious (by: 31 Dec 1960 2359)
+| 4.[D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
+| 5.[D][ ] rush this please (by: when?)
+| 6.[E][ ]  wow  much  space (at: 10am)
+| 7.[T][ ] homework
+| 8.[T][ ] other homework
+| 9.[T][ ] project 12
+| 10.[E][ ] meet friends (at: [unknown])
+| 11.[E][ ] meet people at dinner (at: 6:25 pm)
+| 12.[E][ ] meet people at function x/y/z whatever (at: 07 Nov 1524 0712)
+| 13.[D][ ] /at mysterious (by: [unknown])
+| 14.[D][ ] /by mysterious number 2 (by: [unknown])
+| 15.[D][ ] rush this please (by: when?)
+| 16.[E][ ]  wow  much  space (at: 10am)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number -1, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand a, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand a, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand a, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, I didn't understand a, please give me a number.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Sorry, the number 0, wasn't in the range.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| That's a todo, it doesn't have a date.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /at for events.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /at for events.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][X] meet people at function x/y/z whatever (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /by for deadlines.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [D][X] /at mysterious (by: 31 Dec 1000 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /by for deadlines.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [D][X] /by mysterious number 2 (by: 31 Dec 1000 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /by for deadlines.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [D][ ] rush this please (by: 31 Dec 1000 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| I have rescheduled your task!
+| [E][ ]  wow  much  space (at: 31 Dec 1200 2359)
+'----------------------------------------------------------------
+,----------------------------------------------------------------
+| Do specify /at for events.
+'----------------------------------------------------------------
+,----------------------------------------------------------------
 | Added your note about hello.
 '----------------------------------------------------------------
 ,----------------------------------------------------------------

From 46538d3e074a7c311ba3d9c4c02e98895baf0152 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Tue, 19 Sep 2023 10:05:37 +0800
Subject: [PATCH 65/67] Make UI show text properly

The UI squashes and hides the text, making it unusable.

Removing the prefHeight property here helps make the UI usable.
---
 src/main/resources/view/MainWindow.fxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
index de92974e28..04f63aa726 100644
--- a/src/main/resources/view/MainWindow.fxml
+++ b/src/main/resources/view/MainWindow.fxml
@@ -12,7 +12,7 @@
         <Button fx:id="sendButton" layoutX="324.0" layoutY="558.0" mnemonicParsing="false" onAction="#handleUserInput" prefHeight="41.0" prefWidth="76.0" text="Send" />
         <ScrollPane fx:id="scrollPane" hbarPolicy="NEVER" hvalue="1.0" prefHeight="557.0" prefWidth="400.0" vvalue="1.0">
             <content>
-                <VBox fx:id="dialogContainer" prefHeight="552.0" prefWidth="388.0" />
+                <VBox fx:id="dialogContainer" prefWidth="388.0" />
             </content>
         </ScrollPane>
     </children>

From 8120cf309fdcbb224e6ab990eaeefc6e50202415 Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Thu, 21 Sep 2023 10:13:07 +0800
Subject: [PATCH 66/67] Finish chatbot renaming

There are lots of extra references to Duke.

Let's replace them with more generic names/Anthea depending on which is
more appropriate.
---
 .gitignore                                    |   8 +-
 README.md                                     |  25 +----
 build.gradle                                  |   2 +-
 docs/README.md                                |   2 +-
 .../{duke/Duke.java => anthea/Anthea.java}    |  18 ++--
 .../ChatbotResponse.java}                     |   8 +-
 .../java/{duke => anthea}/CommandMatcher.java |  16 +--
 src/main/java/{duke => anthea}/Commands.java  |  54 +++++-----
 src/main/java/{duke => anthea}/ConsoleUi.java |   2 +-
 src/main/java/{duke => anthea}/Pair.java      |  82 +++++++-------
 .../java/{duke => anthea}/ParsedDateTime.java |   2 +-
 src/main/java/{duke => anthea}/Parser.java    |   6 +-
 .../PrefixCommandMatcher.java                 |  20 ++--
 src/main/java/{duke => anthea}/Storage.java   |   6 +-
 .../java/{duke => anthea}/StringMatcher.java  |   2 +-
 .../java/{duke => anthea}/UiInterface.java    |   2 +-
 .../anthea/exception/ChatbotException.java    |  32 ++++++
 .../exception/ChatbotExceptionBiFunction.java |  52 +++++++++
 .../exception/ChatbotExceptionFunction.java   |  50 +++++++++
 .../java/{duke => anthea}/gui/DialogBox.java  |  10 +-
 .../java/{duke => anthea}/gui/GraphicUi.java  |   4 +-
 .../java/{duke => anthea}/gui/Launcher.java   |   6 +-
 src/main/java/{duke => anthea}/gui/Main.java  |  12 +--
 .../java/{duke => anthea}/gui/MainWindow.java |  16 +--
 src/main/java/{duke => anthea}/note/Note.java |   2 +-
 .../java/{duke => anthea}/note/NoteList.java  |  16 +--
 .../{duke => anthea}/note/NoteStorage.java    |  10 +-
 .../java/{duke => anthea}/task/Deadline.java  |   4 +-
 .../java/{duke => anthea}/task/Event.java     |   4 +-
 src/main/java/{duke => anthea}/task/Task.java |   2 +-
 .../{duke => anthea}/task/TaskFactory.java    |   6 +-
 .../java/{duke => anthea}/task/TaskList.java  |  16 +--
 .../{duke => anthea}/task/TaskStorage.java    |  10 +-
 src/main/java/{duke => anthea}/task/ToDo.java |   2 +-
 .../java/duke/exception/DukeException.java    |  32 ------
 .../exception/DukeExceptionBiFunction.java    |  52 ---------
 .../duke/exception/DukeExceptionFunction.java |  50 ---------
 .../images/{dukeImage.png => antheaImage.png} | Bin
 src/main/resources/view/MainWindow.fxml       |   2 +-
 .../{duke => anthea}/ParsedDateTimeTest.java  | 102 +++++++++---------
 .../{duke => anthea}/task/DeadlineTest.java   |   2 +-
 .../java/{duke => anthea}/task/EventTest.java |   2 +-
 .../java/{duke => anthea}/task/TaskTest.java  |   2 +-
 .../java/{duke => anthea}/task/ToDoTest.java  |   2 +-
 text-ui-test/runtest.bat                      |  10 +-
 text-ui-test/runtest.sh                       |  14 +--
 46 files changed, 381 insertions(+), 398 deletions(-)
 rename src/main/java/{duke/Duke.java => anthea/Anthea.java} (79%)
 rename src/main/java/{duke/DukeResponse.java => anthea/ChatbotResponse.java} (82%)
 rename src/main/java/{duke => anthea}/CommandMatcher.java (71%)
 rename src/main/java/{duke => anthea}/Commands.java (85%)
 rename src/main/java/{duke => anthea}/ConsoleUi.java (95%)
 rename src/main/java/{duke => anthea}/Pair.java (92%)
 rename src/main/java/{duke => anthea}/ParsedDateTime.java (97%)
 rename src/main/java/{duke => anthea}/Parser.java (93%)
 rename src/main/java/{duke => anthea}/PrefixCommandMatcher.java (78%)
 rename src/main/java/{duke => anthea}/Storage.java (93%)
 rename src/main/java/{duke => anthea}/StringMatcher.java (95%)
 rename src/main/java/{duke => anthea}/UiInterface.java (91%)
 create mode 100644 src/main/java/anthea/exception/ChatbotException.java
 create mode 100644 src/main/java/anthea/exception/ChatbotExceptionBiFunction.java
 create mode 100644 src/main/java/anthea/exception/ChatbotExceptionFunction.java
 rename src/main/java/{duke => anthea}/gui/DialogBox.java (88%)
 rename src/main/java/{duke => anthea}/gui/GraphicUi.java (94%)
 rename src/main/java/{duke => anthea}/gui/Launcher.java (83%)
 rename src/main/java/{duke => anthea}/gui/Main.java (81%)
 rename src/main/java/{duke => anthea}/gui/MainWindow.java (84%)
 rename src/main/java/{duke => anthea}/note/Note.java (93%)
 rename src/main/java/{duke => anthea}/note/NoteList.java (80%)
 rename src/main/java/{duke => anthea}/note/NoteStorage.java (75%)
 rename src/main/java/{duke => anthea}/task/Deadline.java (92%)
 rename src/main/java/{duke => anthea}/task/Event.java (91%)
 rename src/main/java/{duke => anthea}/task/Task.java (94%)
 rename src/main/java/{duke => anthea}/task/TaskFactory.java (93%)
 rename src/main/java/{duke => anthea}/task/TaskList.java (80%)
 rename src/main/java/{duke => anthea}/task/TaskStorage.java (76%)
 rename src/main/java/{duke => anthea}/task/ToDo.java (93%)
 delete mode 100644 src/main/java/duke/exception/DukeException.java
 delete mode 100644 src/main/java/duke/exception/DukeExceptionBiFunction.java
 delete mode 100644 src/main/java/duke/exception/DukeExceptionFunction.java
 rename src/main/resources/images/{dukeImage.png => antheaImage.png} (100%)
 rename src/test/java/{duke => anthea}/ParsedDateTimeTest.java (97%)
 rename src/test/java/{duke => anthea}/task/DeadlineTest.java (96%)
 rename src/test/java/{duke => anthea}/task/EventTest.java (95%)
 rename src/test/java/{duke => anthea}/task/TaskTest.java (96%)
 rename src/test/java/{duke => anthea}/task/ToDoTest.java (95%)

diff --git a/.gitignore b/.gitignore
index 8d0b0a5317..0aad6ee8af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,10 +14,10 @@ src/main/resources/docs/
 bin/
 
 # Testing files
-duke.txt
-dukeNotes.txt
+anthea.txt
+antheaNotes.txt
 /text-ui-test/ACTUAL.txt
 /text-ui-test/ACTUAL1.txt
 text-ui-test/EXPECTED-UNIX.TXT
-/text-ui-test/duke.txt
-/text-ui-test/dukeNotes.txt
\ No newline at end of file
+/text-ui-test/anthea.txt
+/text-ui-test/antheaNotes.txt
\ No newline at end of file
diff --git a/README.md b/README.md
index 0f2208ab64..d2b690e1f9 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,3 @@
-# duke.Duke project template
+# Anthea - Chatbot Task Organiser
 
-This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it.
-
-## Setting up in Intellij
-
-Prerequisites: JDK 11, update Intellij to the most recent version.
-
-1. Open Intellij (if you are not in the welcome screen, click `File` > `Close Project` to close the existing project first)
-1. Open the project into Intellij as follows:
-   1. Click `Open`.
-   1. Select the project directory, and click `OK`.
-   1. If there are any further prompts, accept the defaults.
-1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).<br>
-   In the same dialog, set the **Project language level** field to the `SDK default` option.
-3. After that, locate the `src/main/java/duke.Duke.java` file, right-click it, and choose `Run duke.Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output:
-   ```
-   Hello from
-    ____        _        
-   |  _ \ _   _| | _____ 
-   | | | | | | | |/ / _ \
-   | |_| | |_| |   <  __/
-   |____/ \__,_|_|\_\___|
-   ```
+This is an implementation extending a project template for a greenfield Java project. It's named after the Java mascot _Duke_.
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ea3797469d..b0d88e2e39 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,7 +49,7 @@ test {
 }
 
 application {
-    mainClassName = "duke.gui.Launcher"
+    mainClassName = "anthea.gui.Launcher"
 }
 
 shadowJar {
diff --git a/docs/README.md b/docs/README.md
index 25f578b1b7..f3c77494ff 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -287,4 +287,4 @@ Time resolution proceeds as follows:
 
 
 ### Data
-The data for the application is stored in `duke.txt` and `dukeNotes.txt` in CSV using base64. They may be deleted to purge data, or backups may be made of them.
+The data for the application is stored in `anthea.txt` and `antheaNotes.txt` in CSV using base64. They may be deleted to purge data, or backups may be made of them.
diff --git a/src/main/java/duke/Duke.java b/src/main/java/anthea/Anthea.java
similarity index 79%
rename from src/main/java/duke/Duke.java
rename to src/main/java/anthea/Anthea.java
index be2cd697d2..051dae291c 100644
--- a/src/main/java/duke/Duke.java
+++ b/src/main/java/anthea/Anthea.java
@@ -1,17 +1,17 @@
-package duke;
+package anthea;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Optional;
 
-import duke.note.NoteList;
-import duke.task.TaskList;
+import anthea.note.NoteList;
+import anthea.task.TaskList;
 
 /**
  * The main method of the chatbot, as well as its startup and teardown.
  */
-public class Duke {
+public class Anthea {
     /** List of commands */
     private static ArrayList<CommandMatcher> commands;
     private static UiInterface ui = new ConsoleUi();
@@ -23,7 +23,7 @@ public class Duke {
      */
     public static void setUi(UiInterface ui) {
         assert ui != null;
-        Duke.ui = ui;
+        Anthea.ui = ui;
     }
 
     /**
@@ -36,12 +36,12 @@ public static UiInterface getUi() {
         return ui;
     }
 
-    private static DukeResponse handleCommand(String command) {
-        Optional<DukeResponse> response = Optional.empty();
+    private static ChatbotResponse handleCommand(String command) {
+        Optional<ChatbotResponse> response = Optional.empty();
         for (CommandMatcher matcher : commands) {
             response = response.or(() -> matcher.run(command));
         }
-        return response.orElse(new DukeResponse("I cannot figure out this command..."));
+        return response.orElse(new ChatbotResponse("I cannot figure out this command..."));
     }
 
     /**
@@ -70,7 +70,7 @@ public static void main(String[] args) {
             if (command.equals("bye")) {
                 isStillRunning = false;
             } else {
-                DukeResponse response = handleCommand(command);
+                ChatbotResponse response = handleCommand(command);
                 response.print(ui); // ensure response is printed
             }
         }
diff --git a/src/main/java/duke/DukeResponse.java b/src/main/java/anthea/ChatbotResponse.java
similarity index 82%
rename from src/main/java/duke/DukeResponse.java
rename to src/main/java/anthea/ChatbotResponse.java
index 367e61f61f..3201d7844e 100644
--- a/src/main/java/duke/DukeResponse.java
+++ b/src/main/java/anthea/ChatbotResponse.java
@@ -1,11 +1,11 @@
-package duke;
+package anthea;
 
 import java.util.function.Consumer;
 
 /**
  * Stores an output to print once.
  */
-public class DukeResponse {
+public class ChatbotResponse {
     private Consumer<UiInterface> responsePrinter;
     private boolean hasPrinted = false;
 
@@ -15,7 +15,7 @@ public class DukeResponse {
      *
      * @param output Output to print only once.
      */
-    public DukeResponse(String... output) {
+    public ChatbotResponse(String... output) {
         responsePrinter = (ui) -> ui.printStyledMessage(output);
     }
 
@@ -25,7 +25,7 @@ public DukeResponse(String... output) {
      *
      * @param printer Method to print only once.
      */
-    public DukeResponse(Consumer<UiInterface> printer) {
+    public ChatbotResponse(Consumer<UiInterface> printer) {
         assert printer != null;
         this.responsePrinter = printer;
     }
diff --git a/src/main/java/duke/CommandMatcher.java b/src/main/java/anthea/CommandMatcher.java
similarity index 71%
rename from src/main/java/duke/CommandMatcher.java
rename to src/main/java/anthea/CommandMatcher.java
index e799b54e0f..68e34e9720 100644
--- a/src/main/java/duke/CommandMatcher.java
+++ b/src/main/java/anthea/CommandMatcher.java
@@ -1,15 +1,15 @@
-package duke;
+package anthea;
 
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import duke.exception.DukeExceptionFunction;
+import anthea.exception.ChatbotExceptionFunction;
 
 /**
  * This class serves as a way to abstract the idea of making a command
  * as a matching process and an action.
  */
-public class CommandMatcher extends StringMatcher<DukeResponse> {
+public class CommandMatcher extends StringMatcher<ChatbotResponse> {
 
     /**
      * Constructs an object that handles checking and executing a command.
@@ -17,7 +17,7 @@ public class CommandMatcher extends StringMatcher<DukeResponse> {
      * @param shouldRunAction Predicate to check if the command should be run.
      * @param action Action to run.
      */
-    public CommandMatcher(Predicate<String> shouldRunAction, Function<String, DukeResponse> action) {
+    public CommandMatcher(Predicate<String> shouldRunAction, Function<String, ChatbotResponse> action) {
         super(shouldRunAction, action);
         assert shouldRunAction != null;
         assert action != null;
@@ -30,8 +30,8 @@ public CommandMatcher(Predicate<String> shouldRunAction, Function<String, DukeRe
      * @param action Action to run.
      * @return Constructed CommandMatcher.
      */
-    public static CommandMatcher of(Predicate<String> shouldRunAction, DukeExceptionFunction<String> action) {
-        return new CommandMatcher(shouldRunAction, DukeExceptionFunction.toFunction(action));
+    public static CommandMatcher of(Predicate<String> shouldRunAction, ChatbotExceptionFunction<String> action) {
+        return new CommandMatcher(shouldRunAction, ChatbotExceptionFunction.toFunction(action));
     }
 
     /**
@@ -41,10 +41,10 @@ public static CommandMatcher of(Predicate<String> shouldRunAction, DukeException
      * @param action Action to run.
      * @return Constructed CommandMatcher.
      */
-    public static CommandMatcher of(String prefix, DukeExceptionFunction<String> action) {
+    public static CommandMatcher of(String prefix, ChatbotExceptionFunction<String> action) {
         assert prefix != null;
         assert action != null;
         return new CommandMatcher((cmd) -> cmd.strip().startsWith(prefix),
-                DukeExceptionFunction.toFunction(action));
+                ChatbotExceptionFunction.toFunction(action));
     }
 }
diff --git a/src/main/java/duke/Commands.java b/src/main/java/anthea/Commands.java
similarity index 85%
rename from src/main/java/duke/Commands.java
rename to src/main/java/anthea/Commands.java
index fce2f93127..1d5a2cb6a6 100644
--- a/src/main/java/duke/Commands.java
+++ b/src/main/java/anthea/Commands.java
@@ -1,17 +1,17 @@
-package duke;
+package anthea;
 
 import java.util.List;
 
-import duke.note.Note;
-import duke.note.NoteList;
-import duke.task.Deadline;
-import duke.task.Event;
-import duke.task.Task;
-import duke.task.TaskList;
-import duke.task.ToDo;
+import anthea.note.Note;
+import anthea.note.NoteList;
+import anthea.task.Deadline;
+import anthea.task.Event;
+import anthea.task.Task;
+import anthea.task.TaskList;
+import anthea.task.ToDo;
 
 /**
- * Creates the command to reschedule.
+ * Creates commands.
  */
 public class Commands {
     /**
@@ -24,7 +24,7 @@ public static CommandMatcher getAddDeadlineCommand() {
             assert map != null;
             Task task = new Deadline(str, map.getOrDefault("by", "[unknown]"));
             TaskList.getTaskList().add(task);
-            return new DukeResponse(
+            return new ChatbotResponse(
                     "Good luck with the deadline, here's the task:",
                     task.toString());
         });
@@ -40,7 +40,7 @@ public static CommandMatcher getAddEventCommand() {
             assert map != null;
             Task task = new Event(str, map.getOrDefault("at", "[unknown]"));
             TaskList.getTaskList().add(task);
-            return new DukeResponse(
+            return new ChatbotResponse(
                     "That's going to happen at some time later:",
                     task.toString());
         });
@@ -56,7 +56,7 @@ public static CommandMatcher getAddToDoCommand() {
             assert map != null;
             Task task = new ToDo(str);
             TaskList.getTaskList().add(task);
-            return new DukeResponse(
+            return new ChatbotResponse(
                     "I've recorded this thing you need to do:",
                     task.toString());
         });
@@ -72,7 +72,7 @@ public static CommandMatcher getMarkCommand() {
             assert map != null;
             Task task = TaskList.getTask(str);
             task.markAsDone();
-            return new DukeResponse(
+            return new ChatbotResponse(
                     "Marked your task as done:",
                     task.toString());
         });
@@ -88,7 +88,7 @@ public static CommandMatcher getUnmarkCommand() {
             assert map != null;
             Task task = TaskList.getTask(str);
             task.markAsNotDone();
-            return new DukeResponse(
+            return new ChatbotResponse(
                     "Aw... it's not done yet:",
                     task.toString());
         });
@@ -104,7 +104,7 @@ public static CommandMatcher getDeleteCommand() {
             assert map != null;
             Task task = TaskList.getTask(str);
             TaskList.getTaskList().remove(task);
-            return new DukeResponse(
+            return new ChatbotResponse(
                     "It seems you didn't need this task anymore, so I removed it:",
                     task.toString(),
                     String.format("You have %d tasks left.", TaskList.getTaskList().size()));
@@ -121,25 +121,25 @@ public static CommandMatcher getRescheduleCommand() {
             assert map != null;
             Task task = TaskList.getTask(str);
             if (task instanceof ToDo) {
-                return new DukeResponse("That's a todo, it doesn't have a date.");
+                return new ChatbotResponse("That's a todo, it doesn't have a date.");
             }
             Task newTask;
             if (task instanceof Event) {
                 if (!map.containsKey("at")) {
-                    return new DukeResponse("Do specify /at for events.");
+                    return new ChatbotResponse("Do specify /at for events.");
                 }
                 newTask = new Event(task.getDescription(), map.get("at"), task.isTaskDone());
             } else if (task instanceof Deadline) {
                 if (!map.containsKey("by")) {
-                    return new DukeResponse("Do specify /by for deadlines.");
+                    return new ChatbotResponse("Do specify /by for deadlines.");
                 }
                 newTask = new Deadline(task.getDescription(), map.get("by"), task.isTaskDone());
             } else {
-                return new DukeResponse("This is a strange task - I don't recognise it.");
+                return new ChatbotResponse("This is a strange task - I don't recognise it.");
             }
             List<Task> tasks = TaskList.getTaskList();
             tasks.set(tasks.indexOf(task), newTask);
-            return new DukeResponse(
+            return new ChatbotResponse(
                     "I have rescheduled your task!",
                     newTask.toString());
         });
@@ -153,7 +153,7 @@ public static CommandMatcher getListTasksCommand() {
         return new CommandMatcher(str -> str.equals("list"), (str) -> {
             assert str != null;
             List<Task> tasks = TaskList.getTaskList();
-            return new DukeResponse(
+            return new ChatbotResponse(
                     Parser.listObjects("Here, your tasks:", tasks));
         });
     }
@@ -167,7 +167,7 @@ public static CommandMatcher getFindTasksCommand() {
             assert str != null;
             assert map != null;
             List<Pair<Integer, Task>> tasks = TaskList.filterTasks(str);
-            return new DukeResponse(
+            return new ChatbotResponse(
                     Parser.listNumberedObjects("Here are the tasks that you might be looking for:", tasks));
         });
     }
@@ -180,7 +180,7 @@ public static CommandMatcher getListNotesCommand() {
         return new CommandMatcher(str -> str.equals("list notes"), (str) -> {
             assert str != null;
             List<Note> notes = NoteList.getNoteList();
-            return new DukeResponse(
+            return new ChatbotResponse(
                     Parser.listObjects("Here, your notes:", notes));
         });
     }
@@ -194,7 +194,7 @@ public static CommandMatcher getFindNotesCommand() {
             assert str != null;
             assert map != null;
             List<Pair<Integer, Note>> notes = NoteList.filterNotes(str);
-            return new DukeResponse(
+            return new ChatbotResponse(
                     Parser.listNumberedObjects("These notes match your query:", notes));
         });
     }
@@ -208,7 +208,7 @@ public static CommandMatcher getViewNoteCommand() {
             assert str != null;
             assert map != null;
             Note note = NoteList.getNote(str);
-            return new DukeResponse("Here's the note:", note.getTitle(), note.getContent());
+            return new ChatbotResponse("Here's the note:", note.getTitle(), note.getContent());
         });
     }
 
@@ -222,7 +222,7 @@ public static CommandMatcher getDeleteNoteCommand() {
             assert map != null;
             Note note = NoteList.getNote(str);
             NoteList.getNoteList().remove(note);
-            return new DukeResponse(
+            return new ChatbotResponse(
                     "I removed this note:",
                     note.toString());
         });
@@ -238,7 +238,7 @@ public static CommandMatcher getAddNoteCommand() {
             assert map != null;
             Note note = new Note(str, map.getOrDefault("content", "[EMPTY]"));
             NoteList.getNoteList().add(note);
-            return new DukeResponse(String.format("Added your note about %s.", str));
+            return new ChatbotResponse(String.format("Added your note about %s.", str));
         });
     }
 }
diff --git a/src/main/java/duke/ConsoleUi.java b/src/main/java/anthea/ConsoleUi.java
similarity index 95%
rename from src/main/java/duke/ConsoleUi.java
rename to src/main/java/anthea/ConsoleUi.java
index 55302baa41..d7e3bbb792 100644
--- a/src/main/java/duke/ConsoleUi.java
+++ b/src/main/java/anthea/ConsoleUi.java
@@ -1,4 +1,4 @@
-package duke;
+package anthea;
 
 import java.io.InputStreamReader;
 import java.io.Reader;
diff --git a/src/main/java/duke/Pair.java b/src/main/java/anthea/Pair.java
similarity index 92%
rename from src/main/java/duke/Pair.java
rename to src/main/java/anthea/Pair.java
index 8de13a097a..aa4110923e 100644
--- a/src/main/java/duke/Pair.java
+++ b/src/main/java/anthea/Pair.java
@@ -1,41 +1,41 @@
-package duke;
-
-/**
- * Stores a pair.
- *
- * @param <U> Type of first member of pair.
- * @param <V> Type of second member of pair.
- */
-public class Pair<U, V> {
-    private U u;
-    private V v;
-
-    /**
-     * Constructs a pair.
-     *
-     * @param u First member of the pair.
-     * @param v Second member of the pair.
-     */
-    public Pair(U u, V v) {
-        this.u = u;
-        this.v = v;
-    }
-
-    /**
-     * Gets the first member of the pair.
-     *
-     * @return First member of the pair.
-     */
-    public U getFirst() {
-        return this.u;
-    }
-
-    /**
-     * Gets the second member of the pair.
-     *
-     * @return Second member of the pair.
-     */
-    public V getSecond() {
-        return this.v;
-    }
-}
+package anthea;
+
+/**
+ * Stores a pair.
+ *
+ * @param <U> Type of first member of pair.
+ * @param <V> Type of second member of pair.
+ */
+public class Pair<U, V> {
+    private U u;
+    private V v;
+
+    /**
+     * Constructs a pair.
+     *
+     * @param u First member of the pair.
+     * @param v Second member of the pair.
+     */
+    public Pair(U u, V v) {
+        this.u = u;
+        this.v = v;
+    }
+
+    /**
+     * Gets the first member of the pair.
+     *
+     * @return First member of the pair.
+     */
+    public U getFirst() {
+        return this.u;
+    }
+
+    /**
+     * Gets the second member of the pair.
+     *
+     * @return Second member of the pair.
+     */
+    public V getSecond() {
+        return this.v;
+    }
+}
diff --git a/src/main/java/duke/ParsedDateTime.java b/src/main/java/anthea/ParsedDateTime.java
similarity index 97%
rename from src/main/java/duke/ParsedDateTime.java
rename to src/main/java/anthea/ParsedDateTime.java
index 5e03b8a0fb..a7ade9d55e 100644
--- a/src/main/java/duke/ParsedDateTime.java
+++ b/src/main/java/anthea/ParsedDateTime.java
@@ -1,4 +1,4 @@
-package duke;
+package anthea;
 
 import java.time.DateTimeException;
 import java.time.DayOfWeek;
diff --git a/src/main/java/duke/Parser.java b/src/main/java/anthea/Parser.java
similarity index 93%
rename from src/main/java/duke/Parser.java
rename to src/main/java/anthea/Parser.java
index b47eefee5b..6c42239f35 100644
--- a/src/main/java/duke/Parser.java
+++ b/src/main/java/anthea/Parser.java
@@ -1,10 +1,10 @@
-package duke;
+package anthea;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Handles creating commands through duke.CommandMatcher/duke.PrefixCommandMatcher.
+ * Handles gathering commands.
  */
 public class Parser {
 
@@ -133,7 +133,7 @@ public static ArrayList<CommandMatcher> addNoteCommands(ArrayList<CommandMatcher
      */
     public static ArrayList<CommandMatcher> addCatchAllCommand(ArrayList<CommandMatcher> commands) {
         commands.add(
-                new CommandMatcher((str) -> true, (str) -> new DukeResponse(
+                new CommandMatcher((str) -> true, (str) -> new ChatbotResponse(
                 "(>.<') I'm sorry, I don't really know what that means.")));
         return commands;
     }
diff --git a/src/main/java/duke/PrefixCommandMatcher.java b/src/main/java/anthea/PrefixCommandMatcher.java
similarity index 78%
rename from src/main/java/duke/PrefixCommandMatcher.java
rename to src/main/java/anthea/PrefixCommandMatcher.java
index 168cf4b175..d45c2bb7d7 100644
--- a/src/main/java/duke/PrefixCommandMatcher.java
+++ b/src/main/java/anthea/PrefixCommandMatcher.java
@@ -1,13 +1,13 @@
-package duke;
+package anthea;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Predicate;
 
-import duke.exception.DukeException;
-import duke.exception.DukeExceptionBiFunction;
-import duke.exception.DukeExceptionFunction;
+import anthea.exception.ChatbotException;
+import anthea.exception.ChatbotExceptionBiFunction;
+import anthea.exception.ChatbotExceptionFunction;
 
 /**
  * Makes a command matcher based on prefix.
@@ -22,15 +22,15 @@ public class PrefixCommandMatcher extends CommandMatcher {
      * @param prefix Prefix to match.
      * @param action Action to do.
      */
-    public PrefixCommandMatcher(String prefix, BiFunction<String, Map<String, String>, DukeResponse> action) {
+    public PrefixCommandMatcher(String prefix, BiFunction<String, Map<String, String>, ChatbotResponse> action) {
         super(makePrefixMatcher(prefix),
-                DukeExceptionFunction.toFunction((cmd) -> {
+                ChatbotExceptionFunction.toFunction((cmd) -> {
                     // preprocessing
                     cmd = cmd.strip();
 
                     // corner case
                     if (cmd.equals(prefix)) {
-                        throw new DukeException(new DukeResponse(
+                        throw new ChatbotException(new ChatbotResponse(
                                 "(>.<') Add a description to your " + prefix + "."));
                     }
 
@@ -49,7 +49,7 @@ public PrefixCommandMatcher(String prefix, BiFunction<String, Map<String, String
 
                     // another corner case
                     if (commandParts[0].equals("")) {
-                        throw new DukeException(new DukeResponse(
+                        throw new ChatbotException(new ChatbotResponse(
                                 "(>.<') The description for " + prefix + " shouldn't be empty."));
                     }
 
@@ -70,10 +70,10 @@ private static Predicate<String> makePrefixMatcher(String prefix) {
      * @param prefix Prefix to match.
      * @param action Action to do.
      */
-    public static PrefixCommandMatcher of(String prefix, DukeExceptionBiFunction<String, Map<String, String>> action) {
+    public static PrefixCommandMatcher of(String prefix, ChatbotExceptionBiFunction<String, Map<String, String>> action) {
         assert prefix != null;
         assert action != null;
         return new PrefixCommandMatcher(prefix,
-                DukeExceptionBiFunction.toBiFunction(action));
+                ChatbotExceptionBiFunction.toBiFunction(action));
     }
 }
diff --git a/src/main/java/duke/Storage.java b/src/main/java/anthea/Storage.java
similarity index 93%
rename from src/main/java/duke/Storage.java
rename to src/main/java/anthea/Storage.java
index 980715a826..2e0bc45f9c 100644
--- a/src/main/java/duke/Storage.java
+++ b/src/main/java/anthea/Storage.java
@@ -1,4 +1,4 @@
-package duke;
+package anthea;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -92,9 +92,9 @@ public void saveLines(String[][] strings) {
             }
             writer.close();
         } catch (IOException ex) {
-            /*throw new DukeException(new DukeResponse(
+            /*throw new ChatbotException(new ChatbotResponse(
                     "(>.<') I was unable to record your tasks...")));*/
-            Duke.getUi().printStyledMessage(
+            Anthea.getUi().printStyledMessage(
                     "(>.<') I was unable to record your tasks...");
             ex.printStackTrace();
         }
diff --git a/src/main/java/duke/StringMatcher.java b/src/main/java/anthea/StringMatcher.java
similarity index 95%
rename from src/main/java/duke/StringMatcher.java
rename to src/main/java/anthea/StringMatcher.java
index d15e447c93..0e98fa035d 100644
--- a/src/main/java/duke/StringMatcher.java
+++ b/src/main/java/anthea/StringMatcher.java
@@ -1,4 +1,4 @@
-package duke;
+package anthea;
 
 import java.util.Optional;
 import java.util.function.Function;
diff --git a/src/main/java/duke/UiInterface.java b/src/main/java/anthea/UiInterface.java
similarity index 91%
rename from src/main/java/duke/UiInterface.java
rename to src/main/java/anthea/UiInterface.java
index 376ea33230..479519d75e 100644
--- a/src/main/java/duke/UiInterface.java
+++ b/src/main/java/anthea/UiInterface.java
@@ -1,4 +1,4 @@
-package duke;
+package anthea;
 
 import java.io.Reader;
 
diff --git a/src/main/java/anthea/exception/ChatbotException.java b/src/main/java/anthea/exception/ChatbotException.java
new file mode 100644
index 0000000000..e38a6c4cd8
--- /dev/null
+++ b/src/main/java/anthea/exception/ChatbotException.java
@@ -0,0 +1,32 @@
+package anthea.exception;
+
+import anthea.ChatbotResponse;
+
+/**
+ * An exception class that comes with a ChatbotResponse
+ * so that the chatbot can show the message to the screen.
+ */
+public class ChatbotException extends Exception {
+    private ChatbotResponse response;
+
+    /**
+     * Constructs a ChatbotException such that it
+     * holds a ChatbotResponse.
+     *
+     * @param response Response which can be shown.
+     */
+    public ChatbotException(ChatbotResponse response) {
+        super("[Exception]");
+        assert response != null;
+        this.response = response;
+    }
+
+    /**
+     * Gets the available response.
+     *
+     * @return Single-use response.
+     */
+    public ChatbotResponse getResponse() {
+        return response;
+    }
+}
diff --git a/src/main/java/anthea/exception/ChatbotExceptionBiFunction.java b/src/main/java/anthea/exception/ChatbotExceptionBiFunction.java
new file mode 100644
index 0000000000..3cbd1a0378
--- /dev/null
+++ b/src/main/java/anthea/exception/ChatbotExceptionBiFunction.java
@@ -0,0 +1,52 @@
+package anthea.exception;
+
+import java.util.function.BiFunction;
+
+import anthea.ChatbotResponse;
+
+/**
+ * Defines an interface for functions that throw ChatbotException.
+ *
+ * @param <T> Input type.
+ * @param <U> Input type.
+ */
+public interface ChatbotExceptionBiFunction<T, U> {
+    /**
+     * Constructs ChatbotExceptionBiFunction from BiFunction.
+     *
+     * @param lambda BiFunction.
+     * @param <A> Input type.
+     * @param <B> Input type.
+     * @return Constructed ChatbotExceptionBiFunction.
+     */
+    public static <A, B> ChatbotExceptionBiFunction<A, B> of(BiFunction<A, B, ChatbotResponse> lambda) {
+        assert lambda != null;
+        return lambda::apply;
+    }
+
+    /**
+     * Constructs BiFunction from ChatbotExceptionBiFunction.
+     *
+     * @param lambda ChatbotExceptionFunction.
+     * @param <A> Input type.
+     * @return Constructed Function.
+     */
+    public static <A, B> BiFunction<A, B, ChatbotResponse> toBiFunction(ChatbotExceptionBiFunction<A, B> lambda) {
+        assert lambda != null;
+        return (a, b) -> {
+            try {
+                return lambda.apply(a, b);
+            } catch (ChatbotException exception) {
+                return exception.getResponse();
+            }
+        };
+    }
+
+    /**
+     * Applies on T, U such that it allows for throwing of ChatbotException.
+     *
+     * @return Single-use output ChatbotResponse.
+     * @throws ChatbotException Single-use output ChatbotException.
+     */
+    public ChatbotResponse apply(T t, U u) throws ChatbotException;
+}
diff --git a/src/main/java/anthea/exception/ChatbotExceptionFunction.java b/src/main/java/anthea/exception/ChatbotExceptionFunction.java
new file mode 100644
index 0000000000..0f5a6fdc63
--- /dev/null
+++ b/src/main/java/anthea/exception/ChatbotExceptionFunction.java
@@ -0,0 +1,50 @@
+package anthea.exception;
+
+import java.util.function.Function;
+
+import anthea.ChatbotResponse;
+
+/**
+ * Defines an interface for functions that throw ChatbotException.
+ *
+ * @param <T> Input type.
+ */
+public interface ChatbotExceptionFunction<T> {
+    /**
+     * Constructs ChatbotExceptionFunction from Function.
+     *
+     * @param lambda Function.
+     * @param <A> Input type.
+     * @return Constructed ChatbotExceptionFunction.
+     */
+    public static <A> ChatbotExceptionFunction<A> of(Function<A, ChatbotResponse> lambda) {
+        assert lambda != null;
+        return a -> lambda.apply(a);
+    }
+
+    /**
+     * Constructs Function from ChatbotExceptionFunction.
+     *
+     * @param lambda ChatbotExceptionFunction.
+     * @param <A> Input type.
+     * @return Constructed Function.
+     */
+    public static <A> Function<A, ChatbotResponse> toFunction(ChatbotExceptionFunction<A> lambda) {
+        assert lambda != null;
+        return a -> {
+            try {
+                return lambda.apply(a);
+            } catch (ChatbotException exception) {
+                return exception.getResponse();
+            }
+        };
+    }
+
+    /**
+     * Applies on T such that it allows for throwing of ChatbotException.
+     *
+     * @return Single-use output ChatbotResponse.
+     * @throws ChatbotException Single-use output ChatbotException.
+     */
+    public ChatbotResponse apply(T t) throws ChatbotException;
+}
diff --git a/src/main/java/duke/gui/DialogBox.java b/src/main/java/anthea/gui/DialogBox.java
similarity index 88%
rename from src/main/java/duke/gui/DialogBox.java
rename to src/main/java/anthea/gui/DialogBox.java
index 19c24a4d6a..6e26f97951 100644
--- a/src/main/java/duke/gui/DialogBox.java
+++ b/src/main/java/anthea/gui/DialogBox.java
@@ -1,4 +1,4 @@
-package duke.gui;
+package anthea.gui;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -68,13 +68,13 @@ public static DialogBox getUserDialog(String text, Image img) {
     }
 
     /**
-     * Gets a dialog box for Duke.
+     * Gets a dialog box for Anthea.
      *
-     * @param text Duke's text.
-     * @param img Duke's image.
+     * @param text Anthea's text.
+     * @param img Anthea's image.
      * @return Dialog box.
      */
-    public static DialogBox getDukeDialog(String text, Image img) {
+    public static DialogBox getChatbotDialog(String text, Image img) {
         assert text != null;
         var db = new DialogBox(text, img);
         db.flip();
diff --git a/src/main/java/duke/gui/GraphicUi.java b/src/main/java/anthea/gui/GraphicUi.java
similarity index 94%
rename from src/main/java/duke/gui/GraphicUi.java
rename to src/main/java/anthea/gui/GraphicUi.java
index 24bacdcfe2..cb52a81524 100644
--- a/src/main/java/duke/gui/GraphicUi.java
+++ b/src/main/java/anthea/gui/GraphicUi.java
@@ -1,4 +1,4 @@
-package duke.gui;
+package anthea.gui;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -6,7 +6,7 @@
 import java.io.PipedWriter;
 import java.io.Reader;
 
-import duke.UiInterface;
+import anthea.UiInterface;
 
 //@@author clarence-chew-reused
 // Reused from this tutorial
diff --git a/src/main/java/duke/gui/Launcher.java b/src/main/java/anthea/gui/Launcher.java
similarity index 83%
rename from src/main/java/duke/gui/Launcher.java
rename to src/main/java/anthea/gui/Launcher.java
index a3b90526e1..26ddb7e783 100644
--- a/src/main/java/duke/gui/Launcher.java
+++ b/src/main/java/anthea/gui/Launcher.java
@@ -1,6 +1,6 @@
-package duke.gui;
+package anthea.gui;
 
-import duke.Duke;
+import anthea.Anthea;
 import javafx.application.Application;
 
 //@@author clarence-chew-reused
@@ -19,7 +19,7 @@ public class Launcher {
      */
     public static void main(String[] args) {
         if (args.length > 0 && args[0].equals("console")) {
-            Duke.main(new String[]{});
+            Anthea.main(new String[]{});
             return;
         }
         Application.launch(Main.class, args);
diff --git a/src/main/java/duke/gui/Main.java b/src/main/java/anthea/gui/Main.java
similarity index 81%
rename from src/main/java/duke/gui/Main.java
rename to src/main/java/anthea/gui/Main.java
index 82eb260153..cc570c4f98 100644
--- a/src/main/java/duke/gui/Main.java
+++ b/src/main/java/anthea/gui/Main.java
@@ -1,8 +1,8 @@
-package duke.gui;
+package anthea.gui;
 
 import java.io.IOException;
 
-import duke.Duke;
+import anthea.Anthea;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
@@ -15,11 +15,11 @@
 // with minor modifications at most
 
 /**
- * A GUI for Duke using FXML.
+ * A GUI for Anthea using FXML.
  */
 public class Main extends Application {
     /**
-     * Start the application and Duke logic.
+     * Start the application and Anthea logic.
      *
      * @param stage JavaFX stage.
      */
@@ -34,8 +34,8 @@ public void start(Stage stage) {
             Thread appLogic = new Thread("appLogic") {
                 @Override
                 public void run() {
-                    Duke.setUi(new GraphicUi());
-                    Duke.main(new String[]{});
+                    Anthea.setUi(new GraphicUi());
+                    Anthea.main(new String[]{});
                 }
             };
             appLogic.start();
diff --git a/src/main/java/duke/gui/MainWindow.java b/src/main/java/anthea/gui/MainWindow.java
similarity index 84%
rename from src/main/java/duke/gui/MainWindow.java
rename to src/main/java/anthea/gui/MainWindow.java
index 478d369be5..26ec6a3b91 100644
--- a/src/main/java/duke/gui/MainWindow.java
+++ b/src/main/java/anthea/gui/MainWindow.java
@@ -1,4 +1,4 @@
-package duke.gui;
+package anthea.gui;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -46,8 +46,8 @@ public class MainWindow extends AnchorPane {
     private final Image userImage = new Image(
             this.getClass().getResourceAsStream("/images/userImage.png"),
             96, 96, false, true);
-    private final Image dukeImage = new Image(
-            this.getClass().getResourceAsStream("/images/dukeImage.png"),
+    private final Image antheaImage = new Image(
+            this.getClass().getResourceAsStream("/images/antheaImage.png"),
             96, 96, false, true);
 
     /**
@@ -71,7 +71,7 @@ private void initialize() {
     }
 
     /**
-     * Creates two dialog boxes, one echoing user input and the other containing Duke's reply and then appends them to
+     * Creates two dialog boxes, one echoing user input and the other containing Anthea's reply and then appends them to
      * the dialog container. Clears the user input after processing.
      */
     @FXML
@@ -87,9 +87,9 @@ private void handleUserInput() {
             bufferedWriter.flush();
         } catch (IOException ex) {
             dialogContainer.getChildren().addAll(
-                    DialogBox.getDukeDialog(String.format(
+                    DialogBox.getChatbotDialog(String.format(
                             "I did not manage to send that to application logic:\n%s",
-                            input), dukeImage)
+                            input), antheaImage)
             );
         }
         getOutput();
@@ -111,11 +111,11 @@ public void getOutput() {
             }
             String responseWithoutTrailingNewline = result.substring(0, result.length() - 1);
             dialogContainer.getChildren().addAll(
-                    DialogBox.getDukeDialog(responseWithoutTrailingNewline, dukeImage)
+                    DialogBox.getChatbotDialog(responseWithoutTrailingNewline, antheaImage)
             );
         } catch (IOException ex) {
             dialogContainer.getChildren().addAll(
-                    DialogBox.getDukeDialog("I did not manage to read it...", dukeImage)
+                    DialogBox.getChatbotDialog("I did not manage to read it...", antheaImage)
             );
         }
     }
diff --git a/src/main/java/duke/note/Note.java b/src/main/java/anthea/note/Note.java
similarity index 93%
rename from src/main/java/duke/note/Note.java
rename to src/main/java/anthea/note/Note.java
index 4281f5d942..977162ac79 100644
--- a/src/main/java/duke/note/Note.java
+++ b/src/main/java/anthea/note/Note.java
@@ -1,4 +1,4 @@
-package duke.note;
+package anthea.note;
 
 /**
  * Stores a note which has title and content.
diff --git a/src/main/java/duke/note/NoteList.java b/src/main/java/anthea/note/NoteList.java
similarity index 80%
rename from src/main/java/duke/note/NoteList.java
rename to src/main/java/anthea/note/NoteList.java
index 331dc552fc..5454d95655 100644
--- a/src/main/java/duke/note/NoteList.java
+++ b/src/main/java/anthea/note/NoteList.java
@@ -1,11 +1,11 @@
-package duke.note;
+package anthea.note;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import duke.DukeResponse;
-import duke.Pair;
-import duke.exception.DukeException;
+import anthea.ChatbotResponse;
+import anthea.Pair;
+import anthea.exception.ChatbotException;
 
 /**
  * Holds the list of tasks.
@@ -33,17 +33,17 @@ public static void finalizeNoteList() {
      *
      * @param index Index as a string.
      * @return Note if successful.
-     * @throws DukeException if not successful.
+     * @throws ChatbotException if not successful.
      */
-    public static Note getNote(String index) throws DukeException {
+    public static Note getNote(String index) throws ChatbotException {
         try {
             int idx = Integer.parseInt(index);
             return noteList.get(idx - 1);
         } catch (NumberFormatException ex) {
-            throw new DukeException(new DukeResponse(
+            throw new ChatbotException(new ChatbotResponse(
                     "Sorry, I didn't understand " + index + ", please give me a number."));
         } catch (IndexOutOfBoundsException ex) {
-            throw new DukeException(new DukeResponse(
+            throw new ChatbotException(new ChatbotResponse(
                     "Sorry, the number " + index + ", wasn't in the range."));
         }
     }
diff --git a/src/main/java/duke/note/NoteStorage.java b/src/main/java/anthea/note/NoteStorage.java
similarity index 75%
rename from src/main/java/duke/note/NoteStorage.java
rename to src/main/java/anthea/note/NoteStorage.java
index f9db81ae1f..99dc3d4679 100644
--- a/src/main/java/duke/note/NoteStorage.java
+++ b/src/main/java/anthea/note/NoteStorage.java
@@ -1,23 +1,25 @@
-package duke.note;
+package anthea.note;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import duke.Storage;
+import anthea.Storage;
 
 /**
  * Accesses a file for notes.
  */
 public class NoteStorage {
 
+    private static String noteStorageFileName = "./antheaNotes.txt";
+
     /**
      * Gets ArrayList of previously saved notes.
      *
      * @return ArrayList of notes.
      */
     public static ArrayList<Note> getNotes() {
-        Storage storage = Storage.getFileState("./dukeNotes.txt");
+        Storage storage = Storage.getFileState(noteStorageFileName);
         ArrayList<Note> notes = new ArrayList<>();
         for (String[] line : storage.getLines()) {
             assert line != null;
@@ -33,7 +35,7 @@ public static ArrayList<Note> getNotes() {
      */
     public static void saveNotes(List<Note> notes) {
         List<String[]> lines = notes.stream().map(Note::getAsStringArray).collect(Collectors.toList());
-        Storage storage = Storage.getFileState("./dukeNotes.txt");
+        Storage storage = Storage.getFileState(noteStorageFileName);
         storage.saveLines((String[][]) lines.toArray(new String[][]{}));
     }
 }
diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/anthea/task/Deadline.java
similarity index 92%
rename from src/main/java/duke/task/Deadline.java
rename to src/main/java/anthea/task/Deadline.java
index 0e2a8f757a..3cbf43f0c4 100644
--- a/src/main/java/duke/task/Deadline.java
+++ b/src/main/java/anthea/task/Deadline.java
@@ -1,6 +1,6 @@
-package duke.task;
+package anthea.task;
 
-import duke.ParsedDateTime;
+import anthea.ParsedDateTime;
 
 /**
  * Handles a task with a deadline.
diff --git a/src/main/java/duke/task/Event.java b/src/main/java/anthea/task/Event.java
similarity index 91%
rename from src/main/java/duke/task/Event.java
rename to src/main/java/anthea/task/Event.java
index bbe42f286b..68fad3d8ac 100644
--- a/src/main/java/duke/task/Event.java
+++ b/src/main/java/anthea/task/Event.java
@@ -1,6 +1,6 @@
-package duke.task;
+package anthea.task;
 
-import duke.ParsedDateTime;
+import anthea.ParsedDateTime;
 
 /**
  * Handles an event.
diff --git a/src/main/java/duke/task/Task.java b/src/main/java/anthea/task/Task.java
similarity index 94%
rename from src/main/java/duke/task/Task.java
rename to src/main/java/anthea/task/Task.java
index 1c881ffd98..223363d762 100644
--- a/src/main/java/duke/task/Task.java
+++ b/src/main/java/anthea/task/Task.java
@@ -1,4 +1,4 @@
-package duke.task;
+package anthea.task;
 
 /**
  * A task stores its state and description.
diff --git a/src/main/java/duke/task/TaskFactory.java b/src/main/java/anthea/task/TaskFactory.java
similarity index 93%
rename from src/main/java/duke/task/TaskFactory.java
rename to src/main/java/anthea/task/TaskFactory.java
index cf51dbd342..0f859ccdd5 100644
--- a/src/main/java/duke/task/TaskFactory.java
+++ b/src/main/java/anthea/task/TaskFactory.java
@@ -1,8 +1,8 @@
-package duke.task;
+package anthea.task;
 
 import java.util.Optional;
 
-import duke.Duke;
+import anthea.Anthea;
 
 /**
  * Constructs tasks from strings
@@ -53,7 +53,7 @@ public static Optional<Task> constructOptionalTask(String[] taskData) {
         try {
             return Optional.of(constructTask(taskData));
         } catch (IllegalArgumentException ex) {
-            Duke.getUi().printStyledMessage(
+            Anthea.getUi().printStyledMessage(
                     "(>.<') did not understand this task - dropping it",
                     String.join(", ", taskData));
             return Optional.empty();
diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/anthea/task/TaskList.java
similarity index 80%
rename from src/main/java/duke/task/TaskList.java
rename to src/main/java/anthea/task/TaskList.java
index 62bd475009..ac3c9864d4 100644
--- a/src/main/java/duke/task/TaskList.java
+++ b/src/main/java/anthea/task/TaskList.java
@@ -1,11 +1,11 @@
-package duke.task;
+package anthea.task;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import duke.DukeResponse;
-import duke.Pair;
-import duke.exception.DukeException;
+import anthea.ChatbotResponse;
+import anthea.Pair;
+import anthea.exception.ChatbotException;
 
 /**
  * Holds the list of tasks
@@ -33,17 +33,17 @@ public static void finalizeTaskList() {
      *
      * @param index Index as a string.
      * @return Task if successful.
-     * @throws DukeException if not successful.
+     * @throws ChatbotException if not successful.
      */
-    public static Task getTask(String index) throws DukeException {
+    public static Task getTask(String index) throws ChatbotException {
         try {
             int idx = Integer.parseInt(index);
             return taskList.get(idx - 1);
         } catch (NumberFormatException ex) {
-            throw new DukeException(new DukeResponse(
+            throw new ChatbotException(new ChatbotResponse(
                     "Sorry, I didn't understand " + index + ", please give me a number."));
         } catch (IndexOutOfBoundsException ex) {
-            throw new DukeException(new DukeResponse(
+            throw new ChatbotException(new ChatbotResponse(
                     "Sorry, the number " + index + ", wasn't in the range."));
         }
     }
diff --git a/src/main/java/duke/task/TaskStorage.java b/src/main/java/anthea/task/TaskStorage.java
similarity index 76%
rename from src/main/java/duke/task/TaskStorage.java
rename to src/main/java/anthea/task/TaskStorage.java
index b8c55ac45f..843488c515 100644
--- a/src/main/java/duke/task/TaskStorage.java
+++ b/src/main/java/anthea/task/TaskStorage.java
@@ -1,23 +1,25 @@
-package duke.task;
+package anthea.task;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import duke.Storage;
+import anthea.Storage;
 
 /**
  * Accesses a file for tasks.
  */
 public class TaskStorage {
 
+    private static String taskStorageFileName = "./anthea.txt";
+
     /**
      * Gets ArrayList of previously saved tasks.
      *
      * @return ArrayList of tasks.
      */
     public static ArrayList<Task> getTasks() {
-        Storage storage = Storage.getFileState("./duke.txt");
+        Storage storage = Storage.getFileState(taskStorageFileName);
         ArrayList<Task> tasks = new ArrayList<>();
         for (String[] line : storage.getLines()) {
             assert line != null;
@@ -33,7 +35,7 @@ public static ArrayList<Task> getTasks() {
      */
     public static void saveTasks(List<Task> tasks) {
         List<String[]> lines = tasks.stream().map(Task::getAsStringArray).collect(Collectors.toList());
-        Storage storage = Storage.getFileState("./duke.txt");
+        Storage storage = Storage.getFileState(taskStorageFileName);
         storage.saveLines((String[][]) lines.toArray(new String[][]{}));
     }
 }
diff --git a/src/main/java/duke/task/ToDo.java b/src/main/java/anthea/task/ToDo.java
similarity index 93%
rename from src/main/java/duke/task/ToDo.java
rename to src/main/java/anthea/task/ToDo.java
index 9b2170801e..32fd5940d5 100644
--- a/src/main/java/duke/task/ToDo.java
+++ b/src/main/java/anthea/task/ToDo.java
@@ -1,4 +1,4 @@
-package duke.task;
+package anthea.task;
 
 /**
  * A class that stores something to do.
diff --git a/src/main/java/duke/exception/DukeException.java b/src/main/java/duke/exception/DukeException.java
deleted file mode 100644
index b8995b4a76..0000000000
--- a/src/main/java/duke/exception/DukeException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package duke.exception;
-
-import duke.DukeResponse;
-
-/**
- * An exception class that comes with a DukeResponse
- * so that the chatbot can show the message to the screen.
- */
-public class DukeException extends Exception {
-    private DukeResponse response;
-
-    /**
-     * Constructs a DukeException such that it
-     * holds a DukeResponse.
-     *
-     * @param response Response which can be shown.
-     */
-    public DukeException(DukeResponse response) {
-        super("[DukeException]");
-        assert response != null;
-        this.response = response;
-    }
-
-    /**
-     * Gets the available response.
-     *
-     * @return Single-use response.
-     */
-    public DukeResponse getResponse() {
-        return response;
-    }
-}
diff --git a/src/main/java/duke/exception/DukeExceptionBiFunction.java b/src/main/java/duke/exception/DukeExceptionBiFunction.java
deleted file mode 100644
index 30959cb31f..0000000000
--- a/src/main/java/duke/exception/DukeExceptionBiFunction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package duke.exception;
-
-import java.util.function.BiFunction;
-
-import duke.DukeResponse;
-
-/**
- * Defines an interface for functions that throw DukeException.
- *
- * @param <T> Input type.
- * @param <U> Input type.
- */
-public interface DukeExceptionBiFunction<T, U> {
-    /**
-     * Constructs DukeExceptionBiFunction from BiFunction.
-     *
-     * @param lambda BiFunction.
-     * @param <A> Input type.
-     * @param <B> Input type.
-     * @return Constructed DukeExceptionBiFunction.
-     */
-    public static <A, B> DukeExceptionBiFunction<A, B> of(BiFunction<A, B, DukeResponse> lambda) {
-        assert lambda != null;
-        return lambda::apply;
-    }
-
-    /**
-     * Constructs BiFunction from DukeExceptionBiFunction.
-     *
-     * @param lambda DukeExceptionFunction.
-     * @param <A> Input type.
-     * @return Constructed Function.
-     */
-    public static <A, B> BiFunction<A, B, DukeResponse> toBiFunction(DukeExceptionBiFunction<A, B> lambda) {
-        assert lambda != null;
-        return (a, b) -> {
-            try {
-                return lambda.apply(a, b);
-            } catch (DukeException exception) {
-                return exception.getResponse();
-            }
-        };
-    }
-
-    /**
-     * Applies on T, U such that it allows for throwing of DukeException.
-     *
-     * @return Single-use output DukeResponse.
-     * @throws DukeException Single-use output DukeException.
-     */
-    public DukeResponse apply(T t, U u) throws DukeException;
-}
diff --git a/src/main/java/duke/exception/DukeExceptionFunction.java b/src/main/java/duke/exception/DukeExceptionFunction.java
deleted file mode 100644
index 5196ee168b..0000000000
--- a/src/main/java/duke/exception/DukeExceptionFunction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package duke.exception;
-
-import java.util.function.Function;
-
-import duke.DukeResponse;
-
-/**
- * Defines an interface for functions that throw DukeException.
- *
- * @param <T> Input type.
- */
-public interface DukeExceptionFunction<T> {
-    /**
-     * Constructs DukeExceptionFunction from Function.
-     *
-     * @param lambda Function.
-     * @param <A> Input type.
-     * @return Constructed DukeExceptionFunction.
-     */
-    public static <A> DukeExceptionFunction<A> of(Function<A, DukeResponse> lambda) {
-        assert lambda != null;
-        return a -> lambda.apply(a);
-    }
-
-    /**
-     * Constructs Function from DukeExceptionFunction.
-     *
-     * @param lambda DukeExceptionFunction.
-     * @param <A> Input type.
-     * @return Constructed Function.
-     */
-    public static <A> Function<A, DukeResponse> toFunction(DukeExceptionFunction<A> lambda) {
-        assert lambda != null;
-        return a -> {
-            try {
-                return lambda.apply(a);
-            } catch (DukeException exception) {
-                return exception.getResponse();
-            }
-        };
-    }
-
-    /**
-     * Applies on T such that it allows for throwing of DukeException.
-     *
-     * @return Single-use output DukeResponse.
-     * @throws DukeException Single-use output DukeException.
-     */
-    public DukeResponse apply(T t) throws DukeException;
-}
diff --git a/src/main/resources/images/dukeImage.png b/src/main/resources/images/antheaImage.png
similarity index 100%
rename from src/main/resources/images/dukeImage.png
rename to src/main/resources/images/antheaImage.png
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
index 04f63aa726..15c7040985 100644
--- a/src/main/resources/view/MainWindow.fxml
+++ b/src/main/resources/view/MainWindow.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="duke.gui.MainWindow">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="anthea.gui.MainWindow">
     <children>
         <TextField fx:id="userInput" layoutY="558.0" onAction="#handleUserInput" prefHeight="41.0" prefWidth="324.0" AnchorPane.bottomAnchor="1.0" />
         <Button fx:id="sendButton" layoutX="324.0" layoutY="558.0" mnemonicParsing="false" onAction="#handleUserInput" prefHeight="41.0" prefWidth="76.0" text="Send" />
diff --git a/src/test/java/duke/ParsedDateTimeTest.java b/src/test/java/anthea/ParsedDateTimeTest.java
similarity index 97%
rename from src/test/java/duke/ParsedDateTimeTest.java
rename to src/test/java/anthea/ParsedDateTimeTest.java
index 65775afb96..0e0c250fd6 100644
--- a/src/test/java/duke/ParsedDateTimeTest.java
+++ b/src/test/java/anthea/ParsedDateTimeTest.java
@@ -1,51 +1,51 @@
-package duke;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-
-public class ParsedDateTimeTest {
-    @Test
-    @Timeout(1)
-    public void of_makingObjects_normalBehavior() {
-        assertEquals(ParsedDateTime.of("345", true).toString(), "31 Dec 0345 2359");
-        assertEquals(ParsedDateTime.of("345", false).toString(), "01 Jan 0345 0000");
-        assertEquals(ParsedDateTime.of("29/2/1984", false).toString(), "29 Feb 1984 0000");
-        assertEquals(ParsedDateTime.of("29-2-1984", true).toString(), "29 Feb 1984 2359");
-        assertEquals(ParsedDateTime.of("Friday 13th 1985", true).toString(), "13 Sep 1985 2359");
-        assertEquals(ParsedDateTime.of("Friday 13th 1985", false).toString(), "13 Sep 1985 0000");
-        assertEquals(ParsedDateTime.of("January 1984", true).toString(), "31 Jan 1984 2359");
-        assertEquals(ParsedDateTime.of("Jan 1984", false).toString(), "01 Jan 1984 0000");
-        assertEquals(ParsedDateTime.of("Friday MAY 1984", true).toString(), "04 May 1984 2359");
-        assertEquals(ParsedDateTime.of("Friday MAY 1984", false).toString(), "04 May 1984 0000");
-        assertEquals(ParsedDateTime.of("12:34", true).toString(),
-                ParsedDateTime.of("12:34", false).toString());
-        assertEquals(ParsedDateTime.of("12:34pm", true).toString(),
-                ParsedDateTime.of("12:34", false).toString());
-        assertEquals(ParsedDateTime.of("11:34am", true).toString(),
-                ParsedDateTime.of("11:34", false).toString());
-        assertEquals(ParsedDateTime.of("11:34pm", true).toString(),
-                ParsedDateTime.of("23:34", false).toString());
-        assertEquals(ParsedDateTime.of("12:34am", true).toString(),
-                ParsedDateTime.of("00:34", false).toString());
-        assertEquals(ParsedDateTime.of("12:34Am", true).toString(),
-                ParsedDateTime.of("12:34aM", false).toString());
-        assertEquals(ParsedDateTime.of("1st 1th 1St 1/1/1950 January Jan jan 1950", true).toString(),
-                "01 Jan 1950 2359");
-    }
-
-    @Test
-    @Timeout(1)
-    public void of_makingObjects_cannotConstruct() {
-        String[] testCases = new String[]{
-            "2022 fri 31st", "29/2 2100", "29-2-2100", "12/12-12", "23rd 14/5", "34/56", "-3",
-            "Jan Jul", "2030 2040", "Monday Tuesday", "1st 2nd",
-            "13.00am", "0.00am", "13.0pm", "0.0pm", "-3:-3", "26.26"
-        };
-        for (String s : testCases) {
-            assertEquals(ParsedDateTime.of(s, true).toString(), s);
-            assertEquals(ParsedDateTime.of(s, false).toString(), s);
-        }
-    }
-}
+package anthea;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+public class ParsedDateTimeTest {
+    @Test
+    @Timeout(1)
+    public void of_makingObjects_normalBehavior() {
+        assertEquals(ParsedDateTime.of("345", true).toString(), "31 Dec 0345 2359");
+        assertEquals(ParsedDateTime.of("345", false).toString(), "01 Jan 0345 0000");
+        assertEquals(ParsedDateTime.of("29/2/1984", false).toString(), "29 Feb 1984 0000");
+        assertEquals(ParsedDateTime.of("29-2-1984", true).toString(), "29 Feb 1984 2359");
+        assertEquals(ParsedDateTime.of("Friday 13th 1985", true).toString(), "13 Sep 1985 2359");
+        assertEquals(ParsedDateTime.of("Friday 13th 1985", false).toString(), "13 Sep 1985 0000");
+        assertEquals(ParsedDateTime.of("January 1984", true).toString(), "31 Jan 1984 2359");
+        assertEquals(ParsedDateTime.of("Jan 1984", false).toString(), "01 Jan 1984 0000");
+        assertEquals(ParsedDateTime.of("Friday MAY 1984", true).toString(), "04 May 1984 2359");
+        assertEquals(ParsedDateTime.of("Friday MAY 1984", false).toString(), "04 May 1984 0000");
+        assertEquals(ParsedDateTime.of("12:34", true).toString(),
+                ParsedDateTime.of("12:34", false).toString());
+        assertEquals(ParsedDateTime.of("12:34pm", true).toString(),
+                ParsedDateTime.of("12:34", false).toString());
+        assertEquals(ParsedDateTime.of("11:34am", true).toString(),
+                ParsedDateTime.of("11:34", false).toString());
+        assertEquals(ParsedDateTime.of("11:34pm", true).toString(),
+                ParsedDateTime.of("23:34", false).toString());
+        assertEquals(ParsedDateTime.of("12:34am", true).toString(),
+                ParsedDateTime.of("00:34", false).toString());
+        assertEquals(ParsedDateTime.of("12:34Am", true).toString(),
+                ParsedDateTime.of("12:34aM", false).toString());
+        assertEquals(ParsedDateTime.of("1st 1th 1St 1/1/1950 January Jan jan 1950", true).toString(),
+                "01 Jan 1950 2359");
+    }
+
+    @Test
+    @Timeout(1)
+    public void of_makingObjects_cannotConstruct() {
+        String[] testCases = new String[]{
+            "2022 fri 31st", "29/2 2100", "29-2-2100", "12/12-12", "23rd 14/5", "34/56", "-3",
+            "Jan Jul", "2030 2040", "Monday Tuesday", "1st 2nd",
+            "13.00am", "0.00am", "13.0pm", "0.0pm", "-3:-3", "26.26"
+        };
+        for (String s : testCases) {
+            assertEquals(ParsedDateTime.of(s, true).toString(), s);
+            assertEquals(ParsedDateTime.of(s, false).toString(), s);
+        }
+    }
+}
diff --git a/src/test/java/duke/task/DeadlineTest.java b/src/test/java/anthea/task/DeadlineTest.java
similarity index 96%
rename from src/test/java/duke/task/DeadlineTest.java
rename to src/test/java/anthea/task/DeadlineTest.java
index dc8b5ebd25..863e70bf49 100644
--- a/src/test/java/duke/task/DeadlineTest.java
+++ b/src/test/java/anthea/task/DeadlineTest.java
@@ -1,4 +1,4 @@
-package duke.task;
+package anthea.task;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/duke/task/EventTest.java b/src/test/java/anthea/task/EventTest.java
similarity index 95%
rename from src/test/java/duke/task/EventTest.java
rename to src/test/java/anthea/task/EventTest.java
index 32ce400c9e..8bc5ac81e7 100644
--- a/src/test/java/duke/task/EventTest.java
+++ b/src/test/java/anthea/task/EventTest.java
@@ -1,4 +1,4 @@
-package duke.task;
+package anthea.task;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/duke/task/TaskTest.java b/src/test/java/anthea/task/TaskTest.java
similarity index 96%
rename from src/test/java/duke/task/TaskTest.java
rename to src/test/java/anthea/task/TaskTest.java
index 5742d6685d..a8e79beae8 100644
--- a/src/test/java/duke/task/TaskTest.java
+++ b/src/test/java/anthea/task/TaskTest.java
@@ -1,4 +1,4 @@
-package duke.task;
+package anthea.task;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/duke/task/ToDoTest.java b/src/test/java/anthea/task/ToDoTest.java
similarity index 95%
rename from src/test/java/duke/task/ToDoTest.java
rename to src/test/java/anthea/task/ToDoTest.java
index f2fb5cf69b..ec25316334 100644
--- a/src/test/java/duke/task/ToDoTest.java
+++ b/src/test/java/anthea/task/ToDoTest.java
@@ -1,4 +1,4 @@
-package duke.task;
+package anthea.task;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat
index 9a8a2a63c9..5792655923 100644
--- a/text-ui-test/runtest.bat
+++ b/text-ui-test/runtest.bat
@@ -7,7 +7,7 @@ REM delete output from previous run
 if exist ACTUAL.TXT del ACTUAL.TXT
 
 REM compile the code into the bin folder
-javac  -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\duke\*.java ..\src\main\java\duke\exception\*.java ..\src\main\java\duke\note\*.java ..\src\main\java\duke\task\*.java
+javac  -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\anthea\*.java ..\src\main\java\anthea\exception\*.java ..\src\main\java\anthea\note\*.java ..\src\main\java\anthea\task\*.java
 IF ERRORLEVEL 1 (
     echo ********** BUILD FAILURE **********
     exit /b 1
@@ -15,11 +15,11 @@ IF ERRORLEVEL 1 (
 REM no error here, errorlevel == 0
 
 REM delete data
-if exist duke.txt del duke.txt
-if exist dukeNotes.txt del dukeNotes.txt
+if exist anthea.txt del anthea.txt
+if exist antheaNotes.txt del antheaNotes.txt
 
 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
-java -classpath ..\bin duke.Duke < input.txt > ACTUAL.TXT
+java -classpath ..\bin anthea.Anthea < input.txt > ACTUAL.TXT
 
 REM compare the output to the expected output
 FC ACTUAL.TXT EXPECTED.TXT
@@ -28,7 +28,7 @@ REM delete output from previous run
 if exist ACTUAL1.TXT del ACTUAL1.TXT
 
 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL1.TXT
-java -classpath ..\bin duke.Duke < input.txt > ACTUAL1.TXT
+java -classpath ..\bin anthea.Anthea < input.txt > ACTUAL1.TXT
 
 REM compare the output to the expected output
 FC ACTUAL1.TXT EXPECTED1.TXT
diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh
index e43be2797c..a01717f0af 100755
--- a/text-ui-test/runtest.sh
+++ b/text-ui-test/runtest.sh
@@ -13,24 +13,24 @@ then
 fi
 
 # compile the code into the bin folder, terminates if error occurred
-if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/duke/*.java ../src/main/java/duke/exception/*.java ../src/main/java/duke/note/*.java ../src/main/java/duke/task/*.java
+if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/anthea/*.java ../src/main/java/anthea/exception/*.java ../src/main/java/anthea/note/*.java ../src/main/java/anthea/task/*.java
 then
     echo "********** BUILD FAILURE **********"
     exit 1
 fi
 
 # delete data
-if [ -e "./duke.txt" ]
+if [ -e "./anthea.txt" ]
 then
-    rm duke.txt
+    rm anthea.txt
 fi
-if [ -e "./dukeNotes.txt" ]
+if [ -e "./antheaNotes.txt" ]
 then
-    rm dukeNotes.txt
+    rm antheaNotes.txt
 fi
 
 # run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
-java -classpath ../bin duke.Duke < input.txt > ACTUAL.TXT
+java -classpath ../bin anthea.Anthea < input.txt > ACTUAL.TXT
 
 # convert to UNIX format
 cp EXPECTED.TXT EXPECTED-UNIX.TXT
@@ -43,7 +43,7 @@ then
 fi
 
 # run the program, feed commands from input.txt file and redirect the output to the ACTUAL1.TXT
-java -classpath ../bin duke.Duke < input.txt > ACTUAL1.TXT
+java -classpath ../bin anthea.Anthea < input.txt > ACTUAL1.TXT
 
 # convert to UNIX format
 cp EXPECTED1.TXT EXPECTED1-UNIX.TXT

From ec4896d07778ade966c91e31d5ff3087386c4b5d Mon Sep 17 00:00:00 2001
From: Clarence Chew <62918570+clarence-chew@users.noreply.github.com>
Date: Thu, 21 Sep 2023 10:32:02 +0800
Subject: [PATCH 67/67] Fix checkstyle issue

---
 src/main/java/anthea/PrefixCommandMatcher.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/anthea/PrefixCommandMatcher.java b/src/main/java/anthea/PrefixCommandMatcher.java
index d45c2bb7d7..fd2e4ecdbe 100644
--- a/src/main/java/anthea/PrefixCommandMatcher.java
+++ b/src/main/java/anthea/PrefixCommandMatcher.java
@@ -70,7 +70,8 @@ private static Predicate<String> makePrefixMatcher(String prefix) {
      * @param prefix Prefix to match.
      * @param action Action to do.
      */
-    public static PrefixCommandMatcher of(String prefix, ChatbotExceptionBiFunction<String, Map<String, String>> action) {
+    public static PrefixCommandMatcher of(String prefix, ChatbotExceptionBiFunction<String,
+            Map<String, String>> action) {
         assert prefix != null;
         assert action != null;
         return new PrefixCommandMatcher(prefix,