Merge branch 'branch-Level-9'

patricktan6 · Aug 26, 2020 · bc0c6e7 · bc0c6e7
2 parents bc5e327 + 23f113d
commit bc0c6e7
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/data/duke.txt b/data/duke.txt
@@ -0,0 +1 @@
+T | ✗ | read book
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
@@ -105,12 +105,12 @@ public static void main(String[] args) throws FileNotFoundException {
                                 } catch (ArrayIndexOutOfBoundsException e) {
                                     throw new MissingDeadlineException();
                                 }
-                            }    
+                            }
                         } catch (ArrayIndexOutOfBoundsException e) {
                             MissingDescriptionException realError = new MissingDescriptionException("a deadline");
                             Response msg = new Response(new String[]{String.valueOf(realError)});
                             System.out.println(msg.getResponse());
-                        } catch (MissingDeadlineException e){
+                        } catch (MissingDeadlineException e) {
                             Response msg = new Response(new String[]{String.valueOf(e)});
                             System.out.println(msg.getResponse());
                         }
@@ -133,6 +133,23 @@ public static void main(String[] args) throws FileNotFoundException {
                             Response msg = new Response(new String[]{"Please select the task that you want to delete!"});
                             System.out.println(msg.getResponse());
                         }
+                    } else if (test[0].equals("find")) {
+                        try {
+                            if (test.length == 1) {
+                                throw new DukeException();
+                            }
+                            ArrayList<Task> satisfiedTasks = new ArrayList<>();
+                            for (int i = 0; i < lists.size(); i++) {
+                                if (lists.get(i).task.contains(test[1])) {
+                                    satisfiedTasks.add(lists.get(i));
+                                }
+                            }
+                            Response msg = new Response(satisfiedTasks.toArray(new Task[0]), Response.Tag.FIND);
+                            System.out.println(msg.getResponse());
+                        } catch (DukeException e) {
+                            Response msg = new Response(new String[]{"Please include the keyword!"});
+                            System.out.println(msg.getResponse());
+                        }
                     } else {
                         if (test[0].equals("todo")) {
                             try {

diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java
@@ -0,0 +1,5 @@
+public class DukeException extends Exception {
+    public DukeException() {
+        super();
+    }
+}
diff --git a/src/main/java/Response.java b/src/main/java/Response.java
@@ -3,7 +3,8 @@ enum Tag {
         LIST,
         ADD,
         REMOVE,
-        NORMAL
+        NORMAL,
+        FIND
     }
     public Task[] tasks;
     public String[] texts;
@@ -72,6 +73,14 @@ public String getResponse() {
                         + "     "
                         + String.format("Now you have %d tasks in the list. \n", numOfTasks);
             }
+        } else if (this.tag == Tag.FIND ) {
+            for (int i = 0; i < this.tasks.length; i++) {
+                linesOfText += "     "
+                        + "Here are the matching tasks in your list: \n"
+                        + "       "
+                        + this.tasks[i]
+                        + "\n";
+            }
         } else {
             for (int i = 0; i < this.texts.length; i++) {
                 linesOfText += "     "