Update printUpdatedTask, derived classes of Task, which is Todo, Dead…

…line and Event
alextang809 · Feb 13, 2023 · ec8f9d9 · ec8f9d9
1 parent fd5d0f9
commit ec8f9d9
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 23 deletions.
diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java
@@ -1,2 +1,18 @@
-package PACKAGE_NAME;public class Deadline {
-}
+public class Deadline extends Task {
+
+    protected String by;
+
+    public Deadline(String description, String by) {
+        super(description);
+        this.by = by;
+    }
+
+    public String getBy() {
+        return by;
+    }
+
+    @Override
+    public String toString() {
+        return "[D]" + super.toString() + " (by: " + by + ")";
+    }
+}
diff --git a/src/main/java/Duke.class b/src/main/java/Duke.class
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
@@ -29,35 +29,57 @@ public static void main(String[] args) {
                 Task.printHorizontalLine();
                 System.out.println("Here are the tasks in your list:");
                 for (int i = 0; i < Task.getTotalNumberOfTask(); i++) {
-                    taskList[i].printTask();
+                    taskList[i].printTaskList(taskList);
                 }
                 Task.printHorizontalLine();
             } else if (Objects.equals(msgDescription, "blah")) {
-                Task.printHorizontalLine();
-                System.out.println("     blah");
-                Task.printHorizontalLine();
+                printBlahMessage();
             } else if (Objects.equals(msgDescription, "bye")) {
                 Duke.printByeMessage();
                 break request;
             } else if (Objects.equals(msgDescription.split(" ")[0], "mark")) {
                 int id = Integer.parseInt(msgDescription.split(" ")[1]) - 1;
                 taskList[id].setDone();
-                Task.printHorizontalLine();
-                System.out.println("     Nice! I've marked this task as done:");
-                System.out.println("       [X] " + taskList[id].getDescription());
-                Task.printHorizontalLine();
+                taskList[id].printMark();
+//                Task.printHorizontalLine();
+//                System.out.println("     Nice! I've marked this task as done:");
+//                System.out.println("       [X] " + taskList[id].getDescription());
+//                Task.printHorizontalLine();
             } else if (Objects.equals(msgDescription.split(" ")[0], "unmark")) {
                 int id = Integer.parseInt(msgDescription.split(" ")[1]) - 1;
                 taskList[id].setNotDone();
-                Task.printHorizontalLine();
-                System.out.println("     OK, I've marked this task as not done yet:");
-                System.out.println("       [] " + taskList[id].getDescription());
-                Task.printHorizontalLine();
+                taskList[id].printUnmark();
+//                Task.printHorizontalLine();
+//                System.out.println("     OK, I've marked this task as not done yet:");
+//                System.out.println("       [] " + taskList[id].getDescription());
+//                Task.printHorizontalLine();
+            } else if (Objects.equals(msgDescription.split(" ")[0], "todo")) {
+                String description = msgDescription.replaceFirst("todo ", "");
+                taskList[Todo.getTotalNumberOfTask()] = new Todo(description);
+                int id = Todo.getTotalNumberOfTask() - 1;
+                taskList[id].printUpdatedTask();
+            } else if (Objects.equals(msgDescription.split(" ")[0], "deadline")) {
+                String[] DescriptionBy = msgDescription.replaceFirst("deadline ", "").split(" /by ");
+                String description = DescriptionBy[0];
+                String by = DescriptionBy[1];
+                taskList[Deadline.getTotalNumberOfTask()] = new Deadline(description, by);
+                int id = Task.getTotalNumberOfTask() - 1;
+                taskList[id].printUpdatedTask();
+            } else if (Objects.equals(msgDescription.split(" ")[0], "event")) {
+                String[] DescriptionAt = msgDescription.replaceFirst("event ", "").split(" /at ");
+                String description = DescriptionAt[0];
+                String at = DescriptionAt[1];
+                taskList[Event.getTotalNumberOfTask()] = new Event(description, at);
+                int id = Task.getTotalNumberOfTask() - 1;
+                taskList[id].printUpdatedTask();
             } else {
+//                taskList[Task.getTotalNumberOfTask()] = new Task(msgDescription);
+//                System.out.println("    ____________________________________________________________");
+//                System.out.println("     added: " + msgDescription);
+//                System.out.println("    ____________________________________________________________");
                 taskList[Task.getTotalNumberOfTask()] = new Task(msgDescription);
-                System.out.println("    ____________________________________________________________");
-                System.out.println("     added: " + msgDescription);
-                System.out.println("    ____________________________________________________________");
+                int id = Task.getTotalNumberOfTask() - 1;
+                taskList[id].printUpdatedTask();
             }
 
         }
@@ -77,6 +99,12 @@ private static void printWelcomeMessage() {
         Task.printHorizontalLine();
     }
 
+    public static void printBlahMessage() {
+        Task.printHorizontalLine();
+        System.out.println("     blah");
+        Task.printHorizontalLine();
+    }
+
     public static void printMessage(String msgDescription){
         Task.printHorizontalLine();
         System.out.println("     added: " + msgDescription);

diff --git a/src/main/java/Event.java b/src/main/java/Event.java
@@ -1,2 +1,18 @@
-package PACKAGE_NAME;public class Event {
-}
+public class Event extends Task {
+
+    protected String at;
+
+    public Event(String description, String at) {
+        super(description);
+        this.at = at;
+    }
+
+    public String getAt() {
+        return at;
+    }
+
+    @Override
+    public String toString() {
+        return "[E]" + super.toString()+ " (at: " + at + ")";
+    }
+}
diff --git a/src/main/java/Task.class b/src/main/java/Task.class
diff --git a/src/main/java/Task.java b/src/main/java/Task.java
@@ -52,8 +52,12 @@ public void printUnmark() {
         Task.printHorizontalLine();
     }
 
-    public void printTask() {
-        System.out.println(this.id + ".[" + this.getStatusIcon() + "] " + this.description);
+    public void printUpdatedTask() {
+        printHorizontalLine();
+        System.out.println("     Got it. I've added this task:");
+        System.out.println("       " + this);
+        System.out.println("     Now you have " + Task.getTotalNumberOfTask() + " tasks in the list.");
+        printHorizontalLine();
     }
 
     public String getStatusIcon() {

diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java
@@ -1,2 +1,11 @@
-package PACKAGE_NAME;public class Todo {
-}
+public class Todo extends Task {
+
+    public Todo(String description) {
+        super(description);
+    }
+
+    @Override
+    public String toString() {
+        return "[T]" + super.toString();
+    }
+}