[Lyu Xingyu] iP

src/main/java/Deadline.java

@@ -0,0 +1,23 @@
+public class Deadline extends Task {
+
+    protected String by;
+
+    public static Deadline toDeadline(String instruction){
+        int contentIdx = instruction.indexOf("/by");
+
+        if (contentIdx == -1) return null;
+        String deadlineContent = instruction.substring(0, contentIdx);
+        String deadlineBy = instruction.substring(contentIdx + "/by ".length());
+        return new Deadline(deadlineContent, deadlineBy);
+    }
+
+    public Deadline(String description, String by) {
+        super(description, 'D');
+        this.by = by;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + "(by: " + by + ")";
+    }
+}

src/main/java/Duke.java

@@ -1,6 +1,12 @@
 import java.util.Scanner;
 
 public class Duke {
+    public static void printError(String errMsg){
+        String printContent = "    ____________________________________________________________\n"
+        + "     " + "ERROR: " + errMsg + "!\n"
+        + "    ____________________________________________________________\n";
+        System.out.println(printContent);
+    }
     public static void main(String[] args) {
         String logo = " ____        _        \n"
                 + "|  _ \\ _   _| | _____ \n"
@@ -25,11 +31,20 @@ public static void main(String[] args) {
                 System.out.println(exitPrompt);
                 break;
             }else{
+                // parse input
                 int funcIdx = line.indexOf(" ");
                 if(funcIdx == -1){
                     funcIdx = line.length();
                 }
                 String func = line.substring(0, funcIdx);
+                String instruction;
+                if(funcIdx == line.length()){
+                    instruction = "";
+                }else{
+                    instruction = line.substring(funcIdx+1);
+                }
+
+                // do instructions
                 if(line.equals("list")){
                     // show to-do list
                     todoList.showList();
@@ -51,14 +66,31 @@ public static void main(String[] args) {
                         index = -1;
                     }
                     todoList.markItem(index, false);
+                }else if(func.equals("todo")){
+                    Todo todo = Todo.toTodo(instruction);
+                    if(todo == null){
+                        printError("Wrong todo format");
+                        continue;
+                    }
+                    todoList.addItem(todo);
+                }else if(func.equals("deadline")){
+                    Deadline deadline = Deadline.toDeadline(instruction);
+                    if(deadline == null){
+                        printError("Wrong deadline format");
+                        continue;
+                    }
+                    todoList.addItem(deadline);
+                }else if(func.equals("event")){
+                    Event event = Event.toEvent(instruction);
+                    if(event == null){
+                        printError("Wrong event format");
+                        continue;
+                    }
+                    todoList.addItem(Event.toEvent(instruction));
                 }else{
                     // add item to to-do list
-                    todoList.addItem(line);
-                // }else{
-                //     String repeatInput = "    ____________________________________________________________\n"
-                //                        + "    " + line + "\n"
-                //                        + "    ____________________________________________________________\n";
-                //     System.out.println(repeatInput);
+                    Task todo = new Todo(line);
+                    todoList.addItem(todo);
                 }
             }
         }

src/main/java/Event.java

@@ -0,0 +1,27 @@
+public class Event extends Task {
+    protected String from;
+    protected String to;
+
+    public static Event toEvent(String instruction){
+        int contentIdx = instruction.indexOf("/from");
+        int fromIdx = instruction.indexOf("/to");
+
+        if(contentIdx == -1 || fromIdx == -1) return null;
+
+        String eventContent = instruction.substring(0, contentIdx);
+        String eventFrom = instruction.substring(contentIdx + "/from ".length(), fromIdx);
+        String eventTo = instruction.substring(fromIdx + "/to ".length());
+        return new Event(eventContent, eventFrom, eventTo);
+    }
+
+    public Event(String description, String from, String to){
+        super(description, 'E');
+        this.from = from;
+        this.to = to;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + "(from: " + from + "to: " + to + ")";
+    }
+}

src/main/java/Task.java

@@ -1,10 +1,12 @@
 public class Task {
     protected String description;
     protected boolean isDone;
+    protected char type;
 
-    public Task(String description) {
+    public Task(String description, char type) {
         this.description = description;
         this.isDone = false;
+        this.type = type;
     }
 
     public void setDescription(String description){
@@ -27,7 +29,16 @@ public String getStatusIcon() {
         return (isDone ? "X" : " "); // mark done task with X
     }
 
+    public char getTypeIcon(){
+        return type;
+    }
+
     public void mark(boolean done){
         isDone = done;
     }
+
+    @Override
+    public String toString(){
+        return ("[" + getTypeIcon() + "] " + "[" + getStatusIcon() + "] " + getDescription());
+    }
 }

src/main/java/Todo.java

@@ -0,0 +1,10 @@
+public class Todo extends Task {
+
+    public static Todo toTodo(String instruction){
+        return new Todo(instruction);
+    }
+
+    public Todo(String description){
+        super(description, 'T');
+    }
+}

src/main/java/TodoList.java

@@ -12,51 +12,49 @@ public int getListnum(){
         return listnum;
     }
 
-    public int addItem(String line){
+    public int addItem(Task task){
         if(listnum < MAXLISTNUM){
-            // todoList[listnum++] = line;
-            tasks[listnum++] = new Task(line);
+            tasks[listnum++] = task;
             System.out.println(SPLITTER);
-            System.out.println("    added: " + line);
+            System.out.println("    " + "Got it. I've added this task:");
+            System.out.println("      " + task);
+            System.out.println("    " + "Now you have " + listnum + " task" + ((listnum>1) ? "s" : "") + " in the list.");
             System.out.println(SPLITTER);
             System.out.println();
             return 1;
         }else{
-            System.out.println("    ERROR: List overflow!");
-            System.out.println();
+            Duke.printError("List overflow");
             return 0;
         }
     }
 
     public int markItem(int num, boolean mark){
-        System.out.println(SPLITTER);
         if(num < listnum && num >= 0){
             // marks[num] = mark;
             tasks[num].mark(mark);
             if(mark){
-                System.out.println("    Nice! I've marked this task as done:");
+            System.out.println(SPLITTER);
+            System.out.println("    Nice! I've marked this task as done:");
                 System.out.print("      [X] ");
             }else{
-                System.out.println("    OK, I've marked this task as not done yet:");
+            System.out.println(SPLITTER);
+            System.out.println("    OK, I've marked this task as not done yet:");
                 System.out.print("      [ ] ");
             }
             System.out.println(tasks[num].getDescription());
             System.out.println(SPLITTER);
             System.out.println();
             return 1;
         }else{
-            System.out.println("    ERROR: Index wrong!");
-            System.out.println(SPLITTER);
-            System.out.println();
+            Duke.printError("Wrong index");
             return 0;
         }
     }
 
     public void showList(){
         System.out.println(SPLITTER);
         for(int i = 0; i < listnum; i++){
-            System.out.println("    " + (i + 1) + ". ["
-                               + tasks[i].getStatusIcon() + "] " + tasks[i].getDescription());
+            System.out.println("    " + (i + 1) + ". " + tasks[i]);
         }
         System.out.println(SPLITTER);
         System.out.println();