[Hong Jiancheng] iP

src/main/java/Parser.java

@@ -17,7 +17,7 @@ public void getCommand(String input,Storage store, Ui ui){
                 ui.printLine();
                 ui.indentPrint("Here are the tasks in your list:");
                 for(int i=0;i<store.getSize();i++){
-                    ui.indentPrint((i+1)+". "+ui.taskToString(store.getTask(i)));
+                    ui.indentPrint((i+1)+". "+store.getTask(i).toString());
                 }
                 ui.printLine();
                 break;
@@ -26,14 +26,38 @@ public void getCommand(String input,Storage store, Ui ui){
                 store.setDoneAt(index-1);
                 ui.printLine();
                 ui.indentPrint("Nice! I've marked this task as done: ");
-                ui.indentPrint("  "+ui.taskToString(store.getTask(index-1)));
+                ui.indentPrint("  "+store.getTask(index-1).toString());
+                ui.printLine();
+                break;
+            case "todo":
+                store.addToDoToTemp(others);
+                ui.printLine();
+                ui.indentPrint("Got it. I've added this task: ");
+                ui.indentPrint("  "+store.getTask(store.getSize()-1).toString());
+                ui.indentPrint( "Now you have "+store.getSize()+" tasks in the list.");
+                ui.printLine();
+                break;
+            case "deadline":
+                store.addDeadlineToTemp(others);
+                ui.printLine();
+                ui.indentPrint("Got it. I've added this task: ");
+                ui.indentPrint("  "+store.getTask(store.getSize()-1).toString());
+                ui.indentPrint( "Now you have "+store.getSize()+" tasks in the list.");
+                ui.printLine();
+                break;
+            case "event":
+                store.addEventToTemp(others);
+                ui.printLine();
+                ui.indentPrint("Got it. I've added this task: ");
+                ui.indentPrint("  "+store.getTask(store.getSize()-1).toString());
+                ui.indentPrint( "Now you have "+store.getSize()+" tasks in the list.");
                 ui.printLine();
                 break;
             default:
                 ui.printLine();
-                store.addToTemp(input);
-                ui.indentPrint("added: "+input);
+                ui.indentPrint("unknown command, please try again");
                 ui.printLine();
+                break;
         }
     }
 }

src/main/java/Storage.java

@@ -1,15 +1,33 @@
+import Tasks.Deadline;
+import Tasks.Event;
+import Tasks.Task;
+import Tasks.Todo;
+
 import java.util.ArrayList;
 
 public class Storage {
     private ArrayList<Task> tempStorage;
     private boolean isExit;
     Storage(){
-        tempStorage = new ArrayList<Task>(100);
+        tempStorage = new ArrayList<>(100);
         isExit = false;
     }
-    public void addToTemp(String toAdd){
+    public void addTaskToTemp(String toAdd){
         tempStorage.add(new Task(toAdd));
     }
+    public void addToDoToTemp(String toAdd){
+        tempStorage.add(new Todo(toAdd));
+    }
+    public void addDeadlineToTemp(String toAdd){
+        String description = toAdd.split(" /by ")[0];
+        String by = toAdd.split(" /by ")[1];
+        tempStorage.add(new Deadline(description,by));
+    }
+    public void addEventToTemp(String toAdd){
+        String description = toAdd.split(" /at ")[0];
+        String at = toAdd.split(" /at ")[1];
+        tempStorage.add(new Event(description,at));
+    }
     public int getSize(){
         return tempStorage.size();
     }

src/main/java/Tasks/Deadline.java

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

src/main/java/Tasks/Event.java

@@ -0,0 +1,12 @@
+package Tasks;
+
+public class Event extends Task {
+    protected String at;
+    public Event(String description, String at){
+        super(description);
+        this.at = at;
+    }
+    public String toString(){
+        return "[E]" + super.toString() + " (at: " + at + ")";
+    }
+}

src/main/java/Task.java → src/main/java/Tasks/Task.java

@@ -1,3 +1,5 @@
+package Tasks;
+
 public class Task {
     protected String description;
     protected boolean isDone;
@@ -22,4 +24,7 @@ public void setNotDone(){
     public String getDescription(){
         return this.description;
     }
+    public String toString(){
+        return "["+getStatusIcon()+"]"+" "+getDescription();
+    }
 }

src/main/java/Tasks/Todo.java

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

src/main/java/Ui.java

@@ -13,9 +13,6 @@ public void greetUser(){
         indentPrint("What can I do for you?");
         printLine();
     }
-    public String taskToString(Task toPrint){
-        return "["+toPrint.getStatusIcon()+"]"+" "+toPrint.getDescription();
-    }
     public void byeToUser(){
         printLine();
         indentPrint("Bye. Hope to see you again soon!");