Merge branch 'branch-Level-9'

Author: car155

src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: duke.Duke
+

src/main/java/duke/Parser.java

@@ -3,6 +3,7 @@
 import duke.command.Command;
 import duke.command.AddCommand;
 import duke.command.CheckCommand;
+import duke.command.FindCommand;
 import duke.command.DeleteCommand;
 import duke.command.DoneCommand;
 import duke.command.ExitCommand;
@@ -59,6 +60,12 @@ public static Command parse(String input) throws DukeException{
                     throw new DukeException("Please enter the date to check!");
                 }
                 return getCheckCommand(splitInput[1]);
+            
+            case "find":
+                if (splitInput.length < 2) {
+                    throw new DukeException("Please enter the keyword(s) to find!");
+                }
+                return new FindCommand(splitInput[1].strip());
 
             case "todo":
                 if (splitInput.length < 2) {

src/main/java/duke/command/AddCommand.java

@@ -21,10 +21,12 @@ public AddCommand(Task task) {
         this.taskToAdd = task;
     }
 
+    @Override
     public boolean isExit() {
         return false;
     }
 
+    @Override
     public void execute(TaskList tasks, Ui ui, Storage storage) {
         tasks.add(this.taskToAdd);
         String numOfTasks = tasks.size() + (tasks.size() > 1 ? " tasks" : " task");

src/main/java/duke/command/CheckCommand.java

@@ -22,11 +22,13 @@ public CheckCommand(LocalDate date) {
         this.date = date;
     }
 
+    @Override
     public boolean isExit() {
         return false;
     }
 
     /** */
+    @Override
     public void execute(TaskList tasks, Ui ui, Storage storage) {
         TaskList filteredList = new TaskList();
 

src/main/java/duke/command/DeleteCommand.java

@@ -22,10 +22,12 @@ public DeleteCommand(int taskNum) {
         this.taskNum = taskNum;
     }
 
+    @Override
     public boolean isExit() {
         return false;
     }
 
+    @Override
     public void execute(TaskList tasks, Ui ui, Storage storage) {
         if (this.taskNum > tasks.size()) {
             throw new DukeException("No such task exists!");

src/main/java/duke/command/DoneCommand.java

@@ -21,10 +21,12 @@ public DoneCommand(int taskNum) {
         this.taskNum = taskNum;
     }
 
+    @Override
     public boolean isExit() {
         return false;
     }
 
+    @Override
     public void execute(TaskList tasks, Ui ui, Storage storage) {
         if (this.taskNum > tasks.size()) {
             throw new DukeException("No such task exists!");

src/main/java/duke/command/ExitCommand.java

@@ -13,10 +13,12 @@
  */
 public class ExitCommand implements Command {
 
+    @Override
     public boolean isExit() {
         return true;
     }
 
+    @Override
     public void execute(TaskList tasks, Ui ui, Storage storage) {
         ui.showGoodbye();
 

src/main/java/duke/command/FindCommand.java

@@ -0,0 +1,34 @@
+package duke.command;
+
+import duke.Storage;
+import duke.Ui;
+import duke.task.Task;
+import duke.task.TaskList;
+
+public class FindCommand implements Command {
+    private String searchString;
+
+    public FindCommand(String searchString) {
+        this.searchString = searchString;
+    }
+
+    @Override
+    public boolean isExit() {
+        return false;
+    }
+
+    @Override
+    public void execute(TaskList tasks, Ui ui, Storage storage) {
+        TaskList filteredList = new TaskList();
+
+        for (int i = 1; i <= tasks.size(); i++) {
+            Task currTask = tasks.get(i);
+            if (currTask.getDetail().indexOf(this.searchString) >= 0) {
+                filteredList.add(currTask);
+            }
+        }
+
+        ui.printMessage(filteredList.toString());
+    }
+    
+}

src/main/java/duke/command/ListCommand.java

@@ -10,10 +10,12 @@
  */
 public class ListCommand implements Command{
 
+    @Override
     public boolean isExit() {
         return false;
     }
 
+    @Override
     public void execute(TaskList tasks, Ui ui, Storage storage) {
         ui.printMessage(tasks.toString());
     }

src/main/java/duke/task/TaskList.java

@@ -1,7 +1,6 @@
 package duke.task;
 
 import java.util.ArrayList;
-import java.time.LocalDate;
 
 /**
  * Represents a list of tasks
@@ -63,23 +62,6 @@ public int size() {
         return this.tasks.size();
     }
 
-    /**
-     * Filters tasks that are associated with a specified date
-     * 
-     * @param date Date to filter for
-     * @return Filtered task list
-     */
-    public TaskList getTasksOnDate(LocalDate date) {
-        TaskList tasksOnDate = new TaskList();
-        for (int i = 1; i <= this.size(); i++) {
-            Task currTask = this.get(i);
-            if (date.equals(currTask.getDate())) {
-                tasksOnDate.add(currTask);
-            }
-        }
-        return tasksOnDate;
-    }
-
     @Override
     public String toString() {
         StringBuilder taskListString = new StringBuilder();