Merge branch 'branch-C-Tagging'

hhdqirui · Sep 8, 2020 · a0bf474 · a0bf474
2 parents 71cd662 + 461a4ef
commit a0bf474
Show file tree

Hide file tree

Showing 22 changed files with 460 additions and 225 deletions.
diff --git a/data/main.java.duke.txt b/data/main.java.duke.txt
@@ -1,3 +1,6 @@
-T|0|alkdsj
-T|0|abc
-T|1|def
+T|0|abc|
+E|1|abcd|1111-11-11 11:11|
+D|0|bcde|1212-12-12 12:12|
+T|0|123 |#11
+E|0|123|123|#23423
+D|0|sadf|123|#321
diff --git a/src/main/java/duke/AppParser.java b/src/main/java/duke/AppParser.java
@@ -4,7 +4,6 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.ArrayList;
 
 public class AppParser extends Parser {
 

diff --git a/src/main/java/duke/AppUi.java b/src/main/java/duke/AppUi.java
@@ -1,5 +1,7 @@
 package duke;
 
+import duke.task.*;
+
 import java.util.ArrayList;
 import java.util.function.Supplier;
 
@@ -119,6 +121,13 @@ public String getAfterAddMsg(Task task, int type, int listSize) {
         }
     }
 
+    /**
+     * Returns message after add multiple tasks
+     * @param type type of the task
+     * @param overallListSize the overall list size
+     * @param list list of tasks
+     * @return message after add multiple tasks
+     */
     public String getAfterAddMsgVarargs(int type, int overallListSize, Task ... list){
         String res = "Got it. I've added this task:\n";
         for (int i = 0; i < list.length; i++) {

diff --git a/src/main/java/duke/Checker.java b/src/main/java/duke/Checker.java
@@ -1,5 +1,7 @@
 package duke;
 
+import duke.task.*;
+
 import java.time.LocalDate;
 
 public class Checker {

diff --git a/src/main/java/duke/Command/DeadlineCommand.java b/src/main/java/duke/Command/DeadlineCommand.java
@@ -1,7 +1,7 @@
 package duke.Command;
 
 import duke.AppUi;
-import duke.Deadline;
+import duke.task.Deadline;
 import duke.TaskList;
 
 public class DeadlineCommand extends Command {

diff --git a/src/main/java/duke/Command/DeleteCommand.java b/src/main/java/duke/Command/DeleteCommand.java
@@ -1,7 +1,7 @@
 package duke.Command;
 
 import duke.AppUi;
-import duke.Task;
+import duke.task.Task;
 import duke.TaskList;
 
 public class DeleteCommand extends Command {

diff --git a/src/main/java/duke/Command/DoneCommand.java b/src/main/java/duke/Command/DoneCommand.java
@@ -1,7 +1,7 @@
 package duke.Command;
 
 import duke.AppUi;
-import duke.Task;
+import duke.task.Task;
 import duke.TaskList;
 
 public class DoneCommand extends Command {

diff --git a/src/main/java/duke/Command/EventCommand.java b/src/main/java/duke/Command/EventCommand.java
@@ -1,7 +1,7 @@
 package duke.Command;
 
 import duke.AppUi;
-import duke.Event;
+import duke.task.Event;
 import duke.TaskList;
 
 public class EventCommand extends Command {

diff --git a/src/main/java/duke/Command/TodoCommand.java b/src/main/java/duke/Command/TodoCommand.java
@@ -1,9 +1,8 @@
 package duke.Command;
 
 import duke.AppUi;
-import duke.Task;
 import duke.TaskList;
-import duke.Todo;
+import duke.task.*;
 
 import java.util.ArrayList;
 

diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
@@ -54,6 +54,7 @@ public Duke() throws FileNotFoundException {
             tasks = new TaskList(TaskList.readTextFile2List(storage.load()));
             isTextFileExist = true;
         } catch (Exception e) {
+            e.printStackTrace();
             tasks = new TaskList();
             isTextFileExist = false;
         }

diff --git a/src/main/java/duke/Finder.java b/src/main/java/duke/Finder.java
@@ -1,5 +1,7 @@
 package duke;
 
+import duke.task.*;
+
 import java.util.ArrayList;
 
 public class Finder {

diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
@@ -1,5 +1,7 @@
 package duke;
 
+import duke.task.*;
+
 import java.util.ArrayList;
 
 public class Parser {

diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java
@@ -1,5 +1,7 @@
 package duke;
 
+import duke.task.*;
+
 import java.io.*;
 
 public class Storage {
@@ -32,15 +34,16 @@ public static void writeArrayList2file(TaskList list, FileWriter fileWriter) {
             for (int i = 0; i < list.getSize(); i++) {
                 if (list.get(i) instanceof Todo) {
                     Todo todo = (Todo) list.get(i);
-                    fileWriter.write("T|" + (todo.isDone ? "1" : "0") + "|" + todo.getDescription() + "\n");
+                    fileWriter.write("T|" + (todo.getDone() ? "1" : "0") + "|" + todo.getDescription()
+                            + "|" + todo.getTagList().fileToString() + "\n");
                 } else if (list.get(i) instanceof Deadline) {
                     Deadline ddl = (Deadline) list.get(i);
-                    fileWriter.write("D|" + (ddl.isDone ? "1" : "0") + "|" + ddl.getDescription()
-                            + "|" + ddl.getBy() + "\n");
+                    fileWriter.write("D|" + (ddl.getDone() ? "1" : "0") + "|" + ddl.getDescription()
+                            + "|" + ddl.getBy() + "|" + ddl.getTagList().fileToString() + "\n");
                 } else {
                     Event event = (Event) list.get(i);
-                    fileWriter.write("E|" + (event.isDone ? "1" : "0") + "|" + event.getDescription()
-                            + "|" + event.getAt() + "\n");
+                    fileWriter.write("E|" + (event.getDone() ? "1" : "0") + "|" + event.getDescription()
+                            + "|" + event.getAt() + "|" + event.getTagList().fileToString() + "\n");
                 }
             }
             fileWriter.close();

diff --git a/src/main/java/duke/Task.java b/src/main/java/duke/Task.java
diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java
@@ -1,10 +1,13 @@
 package duke;
 
+import duke.task.*;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.ArrayList;
 
 public class TaskList {
+
     protected ArrayList<Task> list;
 
     /**
@@ -48,11 +51,23 @@ public static ArrayList<Task> readTextFile2List(BufferedReader reader) throws IO
         while ((line = reader.readLine()) != null) {
             String[] part = line.split("\\|");
             if (part[0].equals("T")) {
-                list.add(new Todo(part[2], part[1].equals("1")));
+                if (part.length > 3) {
+                    list.add(new Todo(part[2], part[1].equals("1"), part[3]));
+                } else {
+                    list.add(new Todo(part[2], part[1].equals("1")));
+                }
             } else if (part[0].equals("D")) {
-                list.add(Deadline.of(part[2], part[3], part[1].equals("1")));
+                if (part.length > 4) {
+                    list.add(Deadline.of(part[2], part[3], part[1].equals("1"), part[4]));
+                } else {
+                    list.add(Deadline.of(part[2], part[3], part[1].equals("1")));
+                }
             } else {
-                list.add(Event.of(part[2], part[3], part[1].equals("1")));
+                if (part.length > 4) {
+                    list.add(Event.of(part[2], part[3], part[1].equals("1"), part[4]));
+                } else {
+                    list.add(Event.of(part[2], part[3], part[1].equals("1")));
+                }
             }
         }
         return list;
@@ -104,7 +119,7 @@ public int getSize() {
      * @return the removed Task
      */
     public Task delete(int index) {
-        if (index > 0 && index < list.size()) {
+        if (index > 0 && index <= list.size()) {
             return list.remove(index - 1);
         } else {
             return null;

diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java
@@ -1,5 +1,7 @@
 package duke;
 
+import duke.task.*;
+
 import java.util.ArrayList;
 
 public class Ui {