[Qiu Qianhui] iP

src/main/java/Deadline.java

@@ -0,0 +1,13 @@
+public class Deadline extends Task {
+    protected String by;
+
+    public Deadline(String description, String by) {
+        super(description);
+        this.by = by;
+    }
+
+    @Override
+    public String toString() {
+        return "[D]" + super.toString() + " (by: " + by + ")";
+    }
+}

src/main/java/Duke.java

@@ -4,7 +4,7 @@ public class Duke {
 
     private Scanner input = new Scanner(System.in);
     private Task tasks[] = new Task[100];
-    private int size = 0;
+    private int taskIndex = 0;
 
     public void start() {
         String logo = "\t  ____        _        \n"
@@ -14,43 +14,88 @@ public void start() {
                 + "\t |____/ \\__,_|_|\\_\\___|\n";
         System.out.println(logo);
         System.out.println("\t Hello! I'm Duke");
-        System.out.println("\t What can I do for you?");
+        System.out.println("\t What can I do for you?\n");
+    }
+
+    public void display() {
+        System.out.println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n");
     }
 
     public void mark(String command) {
-        int taskindex = Integer.parseInt(command.split(" ")[1]) - 1;
-        tasks[taskindex].mark();
+        int index = Integer.parseInt(command.split(" ")[1]) - 1;
+        tasks[index].mark();
     }
 
     public void unmark(String command) {
-        int taskindex = Integer.parseInt(command.split(" ")[1]) - 1;
-        tasks[taskindex].unmark();
+        int index = Integer.parseInt(command.split(" ")[1]) - 1;
+        tasks[index].unmark();
     }
 
     public void list() {
-        for (int i = 0; i < size; i++) {
-            System.out.print("\t " + (i + 1) + ".");
-            tasks[i].showTask();
+        for (int i = 0; i < taskIndex; i++) {
+            System.out.print("\t " + (i + 1) + "." + tasks[i].toString() + "\n");
         }
+        System.out.print("\n");
+    }
+
+    public void addTask(Task task) {
+        tasks[taskIndex] = task;
+        taskIndex++;
+        System.out.println("\t Got it. I've added this task:\n"
+                + "\t\t "+ tasks[taskIndex - 1].toString()
+                + "\n\t Now you have " + taskIndex + " tasks in the list.\n");
+    }
+    public void todo(String command) {
+        String description = command.split(" ", 2)[1];
+        Todo todo = new Todo(description);
+        addTask(todo);
+    }
+
+    public void deadline(String command) {
+        String info[] = command.split(" ", 2)[1].split(" /by ");
+        String description = info[0];
+        String by = info[1];
+        Deadline deadline = new Deadline(description, by);
+        addTask(deadline);
+    }
+
+    public void event(String command) {
+        String info[] = command.split(" ", 2)[1].split(" /from ");
+        String description = info[0];
+        String dates[] = info[1].split(" /to ");
+        String from = dates[0];
+        String to = dates[1];
+
+        Event event = new Event(description, from, to);
+        addTask(event);
     }
 
     public void run() {
         start();
         while (true) {
             String command = input.nextLine();
             if (command.equals("bye")) {
+                display();
                 System.out.println("\t Bye. Hope to see you again soon!");
                 break;
             } else if (command.equals("list")) {
+                display();
                 list();
             } else if (command.startsWith("mark")) {
+                display();
                 mark(command);
             } else if (command.startsWith("unmark")) {
+                display();
                 unmark(command);
-            } else {
-                tasks[size] = new Task(command);
-                size++;
-                System.out.println("\t added: " + command);
+            } else if (command.startsWith("todo")) {
+                display();
+                todo(command);
+            } else if (command.startsWith("deadline")) {
+                display();
+                deadline(command);
+            } else if(command.startsWith("event")) {
+                display();
+                event(command);
             }
         }
     }
@@ -60,5 +105,3 @@ public static void main(String[] args) {
         duke.run();
     }
 }
-
-

src/main/java/Event.java

@@ -0,0 +1,14 @@
+public class Event extends Task{
+    protected String from;
+    protected String to;
+
+    public Event(String description, String from, String to) {
+        super(description);
+        this.from = from;
+        this.to = to;
+    }
+    @Override
+    public String toString() {
+        return "[E]" + super.toString() + " (from: " + from + " to: " + to + ")";
+    }
+}

src/main/java/Task.java

@@ -14,16 +14,17 @@ public String getStatusIcon() {
     public void mark() {
         this.isDone = true;
         System.out.println("\t Nice! I've marked this task as done:\n"
-                + "\t\t [X] " + this.description);
+                + "\t\t [X] " + this.description + "\n");
     }
 
     public void unmark() {
         this.isDone = false;
         System.out.println("\t OK, I've marked this task as not done yet:\n"
-                + "\t\t [ ] " + this.description);
+                + "\t\t [ ] " + this.description + "\n");
     }
 
-    public void showTask() {
-        System.out.println(" [" + getStatusIcon() + "] " + this.description);
+    @Override
+    public String toString() {
+        return " [" + getStatusIcon() + "] " + this.description;
     }
 }

src/main/java/Todo.java

@@ -0,0 +1,10 @@
+public class Todo extends Task{
+    public Todo(String description) {
+        super(description);
+    }
+
+    @Override
+    public String toString() {
+        return "[T]" + super.toString();
+    }
+}