[Andrea Tan] iP

src/com/jetbrains/Deadline.java

@@ -1,18 +1,29 @@
 package com.jetbrains;
 
+import java.lang.Throwable;
 public class Deadline extends Task {
-    String dueDate;
+    String by;
 
-    Deadline(String input) {
-        String[] inputs = input.trim().split("/by ");
-        this.task = inputs[0].substring(9);
+    Deadline(String input) throws DukeIncompleteCommandException {
+        input = input.substring(8).trim();
+
+        if (input.equals("")) {
+            throw new DukeIncompleteCommandException();
+        }
+
+        String[] inputs = input.split("/by");
+
+        if (!input.contains("/by") || inputs.length < 2) {
+            throw new DukeIncompleteCommandException("Oh no! Please enter an due date. :P");
+        }
+        this.task = inputs[0];
         this.isDone = false;
-        this.dueDate = inputs[1];
+        this.by = inputs[1].trim();
     }
 
     @Override
     public String toString() {
         return String.format("DDLN%s (by: %s)" ,
-                super.toString(), dueDate);
+                super.toString(), by);
     }
 }

src/com/jetbrains/Duke.java

@@ -2,6 +2,7 @@
 
 import java.util.Scanner;
 import java.util.ArrayList;
+import java.lang.Throwable;
 
 public class Duke {
     public static void main(String[] args) {
@@ -18,17 +19,21 @@ public static void main(String[] args) {
         Scanner sc = new Scanner(System.in);
         String input = sc.nextLine();
         while (!input.equals("bye")) {
+            Task task;
+            try {
             if (input.equals("list")) {
                 displayList(list);
                 System.out.println("\n");
             } else if (input.contains("done")) {
                 String[] doneCommand = input.split(" ");
-                Task task = list.get(Integer.parseInt(doneCommand[1]) - 1);
+                task = list.get(Integer.parseInt(doneCommand[1]) - 1);
                 System.out.println("Good job! I've marked this task as done:\n    " +
                         task.markDone() +
                         "\n");
-            } else {
-                Task task;
+            } else if (input.contains("todo") ||
+                    input.contains("deadline") ||
+                    input.contains("event")) {
+
                 if (input.contains("todo")) {
                     task = new ToDo(input);
                 } else if (input.contains("deadline")) {
@@ -39,10 +44,16 @@ public static void main(String[] args) {
                 list.add(task);
                 System.out.println("I'll take note! \n  added: " +
                         task + "\nNow you have " + list.size() +
-                        " task(s) in the list. \n" );
+                        " task(s) in the list. \n");
+                } else {
+                    throw new DukeInvalidCommandException();
+                }
+                } catch (Exception e) {
+                    System.out.println(e.getMessage());
+                }
+                input = sc.nextLine();
             }
-            input = sc.nextLine();
-        }
+
         sc.close();
         System.out.println("Bye! Stay on task!");
     }

src/com/jetbrains/DukeIncompleteCommandException.java

@@ -0,0 +1,18 @@
+package com.jetbrains;
+
+public class DukeIncompleteCommandException extends Exception {
+    public String message;
+    DukeIncompleteCommandException() {
+        this.message = "Oh no! Task cannot be empty. ):";
+    }
+    DukeIncompleteCommandException(String message) {
+        this.message = message;
+    }
+    @Override
+    public String getMessage() {
+        return message;
+    }
+    public String toString() {
+        return message;
+    }
+}

src/com/jetbrains/DukeInvalidCommandException.java

@@ -0,0 +1,16 @@
+package com.jetbrains;
+
+public class DukeInvalidCommandException extends Exception {
+    public String message = "Oh no! I don't know what that means. ):";
+    DukeInvalidCommandException() {
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    public String toString() {
+        return message;
+    }
+}

src/com/jetbrains/Event.java

@@ -1,18 +1,31 @@
 package com.jetbrains;
 
+import java.lang.Throwable;
 public class Event extends Task {
-    String eventDate;
+    String at;
 
-    Event(String input) {
-        String[] inputs = input.trim().split("/at ");
-        this.task = inputs[0].substring(6);
+    Event(String input) throws DukeIncompleteCommandException {
+        input = input.substring(5).trim();
+
+        if (input.equals("")) {
+            throw new DukeIncompleteCommandException();
+        }
+
+        String[] inputs = input.split("/at");
+
+        if (!input.contains("/at") || inputs.length < 2) {
+            throw new DukeIncompleteCommandException("Oh no! Please enter an event date. :P");
+        }
+
+        this.task = inputs[0];
         this.isDone = false;
-        this.eventDate = inputs[1];
+        this.at = inputs[1].trim();
     }
 
+
     @Override
     public String toString() {
         return String.format("EVNT%s (at: %s)" ,
-                super.toString(), eventDate);
+                super.toString(), at);
     }
 }

src/com/jetbrains/ToDo.java

@@ -1,10 +1,16 @@
 package com.jetbrains;
 
+import java.lang.Throwable;
 public class ToDo extends Task {
-    ToDo(String input) {
-        this.task = input.trim().substring(5);
+    ToDo(String input) throws DukeIncompleteCommandException {
+        input = input.substring(4).trim();
+        if (input.equals("")) {
+            throw new DukeIncompleteCommandException();
+        }
+        this.task = input;
         this.isDone = false;
     }
+
     @Override
     public String toString() {
         return "TODO" + super.toString();