Merge branch 'branch-Level-8'

sgn00 · Aug 23, 2020 · c32afad · c32afad
2 parents ca0fa80 + ab142c9
commit c32afad
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java
@@ -1,14 +1,19 @@
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
 public class Deadline extends Task {
 
-    private String date;
+    private LocalDate date;
 
-    public Deadline(String name, String date) {
+    public Deadline(String name, LocalDate date) {
         super(name);
         this.date = date;
     }
 
     @Override
     public String toString() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd yyyy");
+        String date = formatter.format(this.date);
         return String.format("[D]%s (by: %s)", super.toString(), date);
     }
 }
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
@@ -1,4 +1,5 @@
 import java.io.*;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Scanner;
@@ -71,8 +72,11 @@ public void addTaskToList(Task task) {
         System.out.println(String.format("Now you have %d tasks in the list", store.size()));
     }
 
+
+
     public void addTask(String command, String description) throws InvalidEventException, InvalidDeadlineException {
         String splitted[];
+        LocalDate date;
         switch (command) {
             case "todo":
                 addTaskToList(new Todo(description));
@@ -82,14 +86,16 @@ public void addTask(String command, String description) throws InvalidEventExcep
                 if (splitted.length == 1) {
                     throw new InvalidDeadlineException();
                 }
-                addTaskToList(new Deadline(splitted[0], splitted[1]));
+                date = LocalDate.parse(splitted[1]);
+                addTaskToList(new Deadline(splitted[0], date));
                 break;
             case "event":
                 splitted = description.split(" /at ", 2);
                 if (splitted.length == 1) {
                     throw new InvalidEventException();
                 }
-                addTaskToList(new Event(splitted[0], splitted[1]));
+                date = LocalDate.parse(splitted[1]);
+                addTaskToList(new Event(splitted[0], date));
                 break;
             default:
                 break;

diff --git a/src/main/java/Event.java b/src/main/java/Event.java
@@ -1,14 +1,19 @@
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
 public class Event extends Task {
 
-    private String date;
+    private LocalDate date;
 
-    public Event(String name, String date) {
+    public Event(String name, LocalDate date) {
         super(name);
         this.date = date;
     }
 
     @Override
     public String toString() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd yyyy");
+        String date = formatter.format(this.date);
         return String.format("[E]%s (at: %s)", super.toString(), date);
     }
 }