[Lim Yee Kian] iP

src/main/java/main/List.java

@@ -1,5 +1,6 @@
 package main;
 
+import exception.EmptyDescriptionException;
 import task.*;
 
 import java.util.ArrayList;
@@ -99,4 +100,31 @@ public String getFormattedTasks() {
         }
         return outputString;
     }
+
+    public void findItem(String line) {
+        try {
+            String findDescription = Parser.extractFindDescription(line);
+            ArrayList<Task> matchedArrayList = new ArrayList<>(itemArrayList); // Safe copy of the original list
+
+            int i = 0;
+            while (i < matchedArrayList.size()) {
+                Task t = matchedArrayList.get(i);
+
+                if (!t.getDescription().contains(findDescription)) {
+                    matchedArrayList.remove(t);
+                } else {
+                    i += 1;
+                }
+            }
+
+            System.out.println("\tHere are the matching tasks in your list:");
+            int j = 0;
+            for (Task a: matchedArrayList) {
+                System.out.println("\t" + (j + 1) + "." + a);
+                j += 1;
+            }
+        } catch (EmptyDescriptionException e) {
+            Ui.printFindDescriptionEmptyMessage();
+        }
+    }
 }

src/main/java/main/Parser.java

@@ -44,6 +44,9 @@ public static void getUserInput(Scanner in, String listFilePath, List userList)
                 Ui.printHorizontalLine();
                 Storage.saveListToFile(listFilePath, userList);
 
+            } else if (isFind(line)) {
+                userList.findItem(line);
+                Ui.printHorizontalLine();
             } else {
                 userList.addItem(line);
                 Ui.printHorizontalLine();
@@ -69,30 +72,34 @@ private static boolean isBye(String line) {
         return line.equals("bye");
     }
 
-    private static boolean isMark(String line) {
-        return line.length() >= (MARK_WORD_LEN + INPUT_SPACE_BUFFER) && line.substring(0, 4).equals("mark");
+    public static boolean isMark(String line) {
+        return line.startsWith("mark ");
+    }
+
+    public static boolean isUnmark(String line) {
+        return line.startsWith("unmark ");
     }
 
-    private static boolean isUnmark(String line) {
-        return line.length() >= (UNMARK_WORD_LEN + INPUT_SPACE_BUFFER) && line.substring(0, 6).equals("unmark");
+    public static boolean isDelete(String line) {
+        return line.startsWith("delete ");
     }
 
-    private static boolean isDelete(String line) {
-        return line.length() >= (DELETE_WORD_LEN + INPUT_SPACE_BUFFER) && line.substring(0, 6).equals("delete");
+    public static boolean isFind(String line) {
+        return line.startsWith("find ");
     }
 
     public static boolean isValidEvent(String line) {
-        return line.startsWith("event") &&
+        return line.startsWith("event ") &&
                 line.contains(EVENT_FROM_KEYWORD) &&
                 line.contains(EVENT_TO_KEYWORD);
     }
 
     public static boolean isValidDeadline(String line) {
-        return line.startsWith("deadline") && line.contains(DEADLINE_BY_KEYWORD);
+        return line.startsWith("deadline ") && line.contains(DEADLINE_BY_KEYWORD);
     }
 
     public static boolean isTodo(String line) {
-        return line.startsWith("todo");
+        return line.startsWith("todo ");
     }
 
     public static String extractTodoDescription(String line) throws EmptyDescriptionException {
@@ -104,6 +111,15 @@ public static String extractTodoDescription(String line) throws EmptyDescription
         return todoDescription;
     }
 
+    public static String extractFindDescription(String line) throws EmptyDescriptionException {
+        String findDescription;
+        findDescription = line.replaceFirst("find", "").trim();
+
+        taskDescriptionNotEmpty(findDescription);
+
+        return findDescription;
+    }
+
     public static String extractDeadlineDescription(String line) throws EmptyDescriptionException {
         String deadlineDescription;
         final int indexOfDeadlinePrefix = line.indexOf("/by");

src/main/java/main/TaskList.java

@@ -76,7 +76,6 @@ public static LocalDateTime convertDeadlineDateAsLocalDateTime(String deadlineDa
             return LocalDateTime.parse(deadlineDate, inputFormatter);
     }
 
-
     public static LocalDateTime getDeadlineDateAsLocalDateTimeFromFile(String deadlineDate) {
         DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("MMM dd yyyy, h:mm a");
         return LocalDateTime.parse(deadlineDate, inputFormatter);

src/main/java/main/Ui.java

@@ -48,6 +48,10 @@ public static void printTaskDescriptionEmptyMessage() {
         System.out.println("\tError: The task description cannot be empty.");
     }
 
+    public static void printFindDescriptionEmptyMessage() {
+        System.out.println("\tError: The find description cannot be empty.");
+    }
+
     public static void printAddedMessage(ArrayList<Task> itemArrayList, Task task) {
         System.out.println("\tGot it. I've added this task:");
         System.out.println("\t  " + task);

text-ui-test/EXPECTED.TXT

@@ -103,7 +103,13 @@
 	________________________________________
 
 	________________________________________
-	Error: The task description cannot be empty.
+	Invalid command format:
+		todo <task name>
+		deadline <deadline name> /by <deadline>
+		event <event name> /from <start date/time> /end <end date/time>
+		mark <task index>
+		unmark <task index>
+		delete <task index>
 	________________________________________
 
 	________________________________________