[randallnhr] iP

src/main/java/Deadline.java

@@ -0,0 +1,12 @@
+class Deadline extends Task {
+    public Deadline(String name, String start) {
+        super(name, start, null);
+    }
+
+    @Override
+    public String toString() {
+        return this.isDone
+                ? "[D][X] " + this.name + " (by: " + this.startDate + ")"
+                : "[D][ ] " + this.name + " (by: " + this.startDate + ")";
+    }
+}

src/main/java/Duke.java

@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 
+
 public class Duke {
     public static void main(String[] args) throws IOException {
 
@@ -12,8 +13,9 @@ public static void main(String[] args) throws IOException {
 
         BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
 
-        String[] word = br.readLine().split(" ");
+        String[] word = br.readLine().split(" ",2);
         ArrayList<Task> lst = new ArrayList<>();
+        int count = 0;
 
         while (!word[0].equals("bye")) {
             if (word[0].equals("list")) {
@@ -23,40 +25,45 @@ public static void main(String[] args) throws IOException {
                     System.out.println(curr + " " + iter.next());
                     curr++;
                 }
-                word = br.readLine().split(" ");
+                word = br.readLine().split(" ",2);
             } else if (word[0].equals("mark")) {
                 Task t = lst.get(Integer.parseInt(word[1]) - 1);
                 t.isDone = true;
                 System.out.println("Task has been marked as done:\n " + t);
-                word = br.readLine().split(" ");
+                word = br.readLine().split(" ",2);
             } else if (word[0].equals("unmark")) {
                 Task t = lst.get(Integer.parseInt(word[1]) - 1);
                 t.isDone = false;
                 System.out.println("Task has been marked as not done:\n " + t);
-                word = br.readLine().split(" ");
+                word = br.readLine().split(" ",2);
+            } else if (word[0].equals("todo")) {
+                Task t = new Todo(word[1]);
+                lst.add(t);
+                count++;
+                System.out.println("Added new todo:\n  " + t + "\nNumber of tasks: " + count);
+                word = br.readLine().split(" ",2);
+            } else if (word[0].equals("deadline")) {
+                String[] tempWord = word[1].split("/by ");
+                Task t = new Deadline(tempWord[0], tempWord[1].strip());
+                lst.add(t);
+                count++;
+                System.out.println("Added new deadline:\n  " + t + "\nNumber of tasks: " + count);
+                word = br.readLine().split(" ",2);
+            } else if (word[0].equals("event")) {
+                String[] tempWord = word[1].split("/");
+                Task t = new Event(tempWord[0], tempWord[1].split(" ",2)[1].strip(), tempWord[2].split(" ")[1].strip());
+                lst.add(t);
+                count++;
+                System.out.println("Added new event:\n  " + t + "\nNumber of tasks: " + count);
+                word = br.readLine().split(" ",2);
             } else {
-                System.out.println("Added task: " + word[0]);
-                lst.add(new Task(word[0]));
-                word = br.readLine().split(" ");
+                System.out.println("Error");
+                word = br.readLine().split(" ",2);
             }
         }
         System.out.println("Duke: Goodbye");
     }
 }
 
-class Task {
-    protected String name;
-    protected boolean isDone;
 
-    public Task(String name) {
-        this.name = name;
-        this.isDone = false;
-    }
 
-    @Override
-    public String toString() {
-        return isDone
-                ? "[X] " + this.name
-                : "[ ] " + this.name;
-    }
-}

src/main/java/Event.java

@@ -0,0 +1,12 @@
+class Event extends Task {
+    public Event(String name, String start, String end) {
+        super(name, start, end);
+    }
+
+    @Override
+    public String toString() {
+        return this.isDone
+                ? "[E][X] " + this.name + " (from: " + this.startDate + " to: " + this.endDate + ")"
+                : "[E][ ] " + this.name + " (from: " + this.startDate + " to: " + this.endDate + ")";
+    }
+}

src/main/java/Task.java

@@ -0,0 +1,20 @@
+public class Task {
+    protected String name;
+    protected boolean isDone;
+    protected String startDate;
+    protected String endDate;
+
+    public Task(String name, String date1, String date2) {
+        this.name = name;
+        this.isDone = false;
+        this.startDate = date1;
+        this.endDate = date2;
+    }
+
+    @Override
+    public String toString() {
+        return this.isDone
+                ? "[X] " + this.name
+                : "[ ] " + this.name;
+    }
+}

src/main/java/Todo.java

@@ -0,0 +1,12 @@
+public class Todo extends Task {
+    public Todo(String name) {
+        super(name, null, null);
+    }
+
+    @Override
+    public String toString() {
+        return this.isDone
+                ? "[T][X] " + this.name
+                : "[T][ ] " + this.name;
+    }
+}