[Tan Gee Teng] iP

data/duke.txt

@@ -1 +1,3 @@
-T#false#borrow book
+T#true#borrow book
+D#false#return book #2021-02-02
+T#false#play

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Wed Feb 02 12:10:36 MYT 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

src/main/java/seedu/duke/Parser.java

@@ -10,7 +10,15 @@ public class Parser {
     private static final int MARK = 4;
     private static final int UNMARK = 5;
     private static final int DELETE = 6;
-
+    private static final int FIND = 7;
+
+    /**
+     * Reads the String input and determines the type of command to execute and returns it as an integer
+     *
+     * @param input User input for the <code>Duke</code> program
+     * @return An integer to represent the type of command to execute
+     * @throws DukeException When String input doesn't match any type of command
+     */
     public static int getCommand(String input) throws DukeException {
         String str = input.split(" ", 2)[0];
 
@@ -28,7 +36,9 @@ public static int getCommand(String input) throws DukeException {
             return UNMARK;
         } else if (str.equals("delete")) {
             return DELETE;
-        } else {
+        } else if (str.equals("find")) {
+            return FIND;
+        }else {
             throw new DukeException("OOPS!!! I don't understand what that means");
         }
 

src/main/java/seedu/duke/Storage.java

@@ -43,7 +43,7 @@ public void save(TaskList tasks) {
             if (t instanceof ToDo) {
                 saveFormat += "T#";
                 saveFormat += t.isDone ? "true" : "false";
-                saveFormat += "#" + t.description;
+                saveFormat += "#" + t.description + "\n";
                 continue;
             } else if (t instanceof Deadline) {
                 saveFormat += "D";

src/main/java/seedu/duke/TaskList.java

@@ -85,4 +85,25 @@ public String count() {
         return "\n    Now you have " + tasks.size() + " task" + isSingular + " in your list.";
     }
 
+    public String find(String keyword) {
+        String resultStr = "";
+        boolean keywordFound = false;
+        int i = 1;
+
+        for (Task t : this.tasks) {
+            if (t.description.contains(keyword)) {
+                keywordFound = true;
+                resultStr += i++ + ". " + t + "\n      ";
+            }
+        }
+
+        if (keywordFound) {
+            resultStr = "Here are the matching tasks in your list:\n      " + resultStr;
+        } else {
+            resultStr = "No matching results found in the list.";
+        }
+
+        return resultStr;
+    }
+
 }

src/main/java/seedu/duke/Ui.java

@@ -9,7 +9,11 @@ public class Ui {
     private static final int MARK = 4;
     private static final int UNMARK = 5;
     private static final int DELETE = 6;
-
+    private static final int FIND = 7;
+
+    /**
+     * Prints an error message for failure in loading files
+     */
     public void showLoadingError() {
         System.out.println("Failed to retrieve data from storage");
     }
@@ -40,6 +44,9 @@ public void nextInput(String input, TaskList tasks) {
             case DELETE:
                 myPrint(tasks.delete(Parser.getIndex(input)));
                 break;
+            case FIND:
+                myPrint(tasks.find(Parser.getDescription(input)));
+                break;
             }
         } catch (DukeException e) {
             myPrint(e.toString());