Fix exceptions bug in isValidCommand() and clean up code

Author: BenjoBurger

.gitignore

@@ -16,3 +16,4 @@ bin/
 
 /text-ui-test/ACTUAL.TXT
 text-ui-test/EXPECTED-UNIX.TXT
+*.class

src/main/java/burger/Burger.java

@@ -8,7 +8,7 @@ public class Burger {
     static final String CHATBOT_NAME = "Burger";
     static final String HORIZONTAL_LINE = "---------------------------------";
 
-    public static void main(String[] args) throws BurgerException {
+    public static void main(String[] args) {
         welcomeMessage();
         Scanner input = new Scanner(System.in);
         List myList = new List();
@@ -22,7 +22,7 @@ public static void main(String[] args) throws BurgerException {
                     isPolling = false;
                     break;
                 case "list":
-                    myList.printTodoList();
+                    myList.printTaskList();
                     break;
                 default:
                     wakeUp();
@@ -43,18 +43,14 @@ private static void welcomeMessage() {
     public static void printLine() {
         System.out.println(HORIZONTAL_LINE);
     }
+
     /**
-     * Prints error message when user provides invalid input
+     * Prints error message when user provides unknown input
      */
     private static void wakeUp() {
-        try {
-            throw new BurgerException();
-        } catch (BurgerException e) {
-            printLine();
-            System.out.println("Wake Up!!! Key in something that makes sense!");
-            printLine();
-        }
-
+        printLine();
+        System.out.println("Wake Up!!! Key in something that makes sense!");
+        printLine();
     }
 
     public static void goodbye() {

src/main/java/burger/BurgerException.java

@@ -3,5 +3,30 @@
 import static burger.Burger.printLine;
 
 public class BurgerException extends Exception{
-    public BurgerException() {}
+    public static void printInvalidDeadlineInputMessage() {
+        printLine();
+        System.out.println("Oi, the input is wrong!");
+        System.out.println("Format: deadline {deadline task} /by {date}");
+        printLine();
+    }
+
+    public static void printInvalidEventInputMessage() {
+        printLine();
+        System.out.println("Oi, the input is wrong!");
+        System.out.println("Format: event {event task} /from {date} /to {date}");
+        printLine();
+    }
+
+    public static void printEmptyDescription() {
+        printLine();
+        System.out.println("UwU~ Where is your description?");
+        System.out.println("Format: {command} {description}");
+        printLine();
+    }
+
+    public static void printOutOfIndexMessage() {
+        printLine();
+        System.out.println("Tsk... Out of index, do you know how to count?");
+        printLine();
+    }
 }

src/main/java/burger/list/List.java

@@ -1,7 +1,6 @@
 package burger.list;
 
 import java.util.ArrayList;
-import java.util.IllegalFormatException;
 
 import burger.BurgerException;
 import burger.task.Deadline;
@@ -10,46 +9,55 @@
 import burger.task.Todo;
 
 import static burger.Burger.printLine;
+import static burger.BurgerException.*;
 
 public class List {
 
-    private final ArrayList<Task> todoList;
+    private final ArrayList<Task> taskList;
 
     public int totalTasks;
     public List() {
-        todoList = new ArrayList<>();
+        taskList = new ArrayList<>();
         totalTasks = 0;
     }
     /**
      * Returns boolean value base on whether the input matches one of the commands.
      *
+     *
      * @param textArray user input in array type.
      * @return true if it's a valid command and false otherwise.
+     * @throws ArrayIndexOutOfBoundsException when the description after the command is empty.
      */
     public boolean isValidCommand(String[] textArray) {
         boolean isValid = true;
-        String command = textArray[0];
-        switch (command) { // assume inputs for commands are correct
-        case "mark":
-            // fallthrough
-        case "unmark":
-            int idx = Integer.parseInt(textArray[1]) - 1;
-            getMark(idx, command);
-            break;
-        case "todo":
-            addTodo(textArray);
-            break;
-        case "deadline":
-            addDeadline(textArray);
-            break;
-        case "event":
-            addEvent(textArray);
-            break;
-        default:
-            isValid = false;
-            break;
+        try {
+            String command = textArray[0];
+            switch (command) {
+            case "mark":
+                // fallthrough
+            case "unmark":
+                int idx = Integer.parseInt(textArray[1]) - 1;
+                getMark(idx, command);
+                break;
+            case "todo":
+                addTodo(textArray);
+                break;
+            case "deadline":
+                addDeadline(textArray);
+                break;
+            case "event":
+                addEvent(textArray);
+                break;
+            default:
+                isValid = false;
+                break;
+            }
+            return isValid;
+        } catch (ArrayIndexOutOfBoundsException e) {
+            printEmptyDescription();
+            return isValid;
         }
-        return isValid;
+
     }
 
     /**
@@ -58,15 +66,12 @@ public boolean isValidCommand(String[] textArray) {
      *
      * @param idx index of task.
      * @return task.
-     * @throws ArrayIndexOutOfBoundsException idx is out of bounds.
+     * @throws IndexOutOfBoundsException idx is out of bounds.
      */
     public Task getTask(int idx) {
         try {
-            return this.todoList.get(idx);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            printLine();
-            System.out.println("UwU? Do you know how to count?");
-            printLine();
+            return this.taskList.get(idx);
+        } catch (IndexOutOfBoundsException e) {
             return null;
         }
     }
@@ -76,68 +81,56 @@ public Task getTask(int idx) {
      * @param todo the todo input by the user.
      */
     public void addTodo(String[] todo) {
-        try {
-            if (todo.length == 1) {
-                throw new BurgerException();
-            }
-            StringBuilder todoText = new StringBuilder(todo[1]);
-            for (int i = 2; i < todo.length; i++) {
-                todoText.append(' ').append(todo[i]);
-            }
-            Task newTodo = new Todo(todoText.toString());
-            addTask(newTodo);
-        } catch (BurgerException e) {
-            printEmptyDescription();
+        StringBuilder todoText = new StringBuilder(todo[1]);
+        for (int i = 2; i < todo.length; i++) {
+            todoText.append(' ').append(todo[i]);
         }
+        Task newTodo = new Todo(todoText.toString());
+        addTask(newTodo);
     }
 
     /**
      * Adds a new event to the list.
      *
      * @param event the event input by the user.
-     * @throws ArrayIndexOutOfBoundsException if text is empty after the "event" command.
-     * @throws IllegalFormatException if event format is not followed.
+     * @throws ArrayIndexOutOfBoundsException if deadline format is not followed.
      */
     public void addEvent(String[] event) {
         try {
-            if (event.length == 1) {
-                throw new BurgerException();
-            }
             StringBuilder eventText = new StringBuilder(event[1]);
             int i = 2;
-            while (!event[i].startsWith("/")) {
+            while (!event[i].startsWith("/from")) {
                 eventText.append(' ').append(event[i]);
                 i++;
             }
             eventText.append(' ').append("(from: ");
             i++;
-            while (!event[i].startsWith("/")) {
-                eventText.append(' ').append(event[i]);
+            while (!event[i].startsWith("/to")) {
+                eventText.append(event[i]).append(' ');
                 i++;
             }
+            eventText.append("to: ");
             i++;
-            eventText.append(' ').append("to: ").append(event[i]).append(')');
+            while (i < event.length - 1) {
+                eventText.append(event[i]).append(' ');
+                i++;
+            }
+            eventText.append(event[i]).append(')');
             Task newEvent = new Event(eventText.toString());
             addTask(newEvent);
         } catch (ArrayIndexOutOfBoundsException e) {
-            printInvalidInputMessage();
-        } catch (BurgerException e) {
-            printEmptyDescription();
+            printInvalidEventInputMessage();
         }
     }
 
     /**
      * Adds a new deadline to the list.
      *
      * @param deadline the deadline input by the user.
-     * @throws ArrayIndexOutOfBoundsException if text is empty after the "deadline" command.
-     * @throws IllegalFormatException if deadline format is not followed.
+     * @throws ArrayIndexOutOfBoundsException if deadline format is not followed.
      */
     public void addDeadline(String[] deadline) {
         try {
-            if (deadline.length == 1) {
-                throw new BurgerException();
-            }
             StringBuilder deadlineText = new StringBuilder(deadline[1]);
             int i = 2;
             while (!deadline[i].startsWith("/")) {
@@ -154,34 +147,20 @@ public void addDeadline(String[] deadline) {
             Task newDeadline = new Deadline(deadlineText.toString());
             addTask(newDeadline);
         } catch (ArrayIndexOutOfBoundsException e) {
-            printInvalidInputMessage();
-        } catch (BurgerException e) {
-            printEmptyDescription();
+            printInvalidDeadlineInputMessage();
         }
     }
 
-    private static void printInvalidInputMessage() {
-        printLine();
-        System.out.println("Oi, the input is wrong!");
-        printLine();
-    }
-
-    private void printEmptyDescription() {
-        printLine();
-        System.out.println("UwU~ Where is your description?");
-        printLine();
-    }
-
     /**
      * Adds task to the list and prints out a message.
      *
      * @param task Task that is being added.
      */
     public void addTask(Task task) {
-        this.todoList.add(task);
+        this.taskList.add(task);
         printLine();
         System.out.println("Got it. I've added this task:");
-        this.todoList.get(totalTasks).printTask();
+        this.taskList.get(totalTasks).printTask();
         this.totalTasks++;
         System.out.println();
         System.out.println("Now you have " + totalTasks + " tasks in the list.");
@@ -192,36 +171,51 @@ public void addTask(Task task) {
      *
      * @param idx the index of the task.
      * @param command Command to "mark" or "unmark" the task.
+     * @throws BurgerException if index input is out of the range of list of tasks.
      */
     public void getMark(int idx, String command) {
-        Task currTask = getTask(idx);
-        if (command.equals("mark")) {
-            System.out.println("Nice! I've marked this task as done:");
-            currTask.markDone();
-        } else {
-            System.out.println("OK, I've marked this task as not done yet:");
-            currTask.unmarkDone();
+        try {
+            Task currTask = getTask(idx);
+            if (currTask == null) {
+                throw new BurgerException();
+            }
+            if (command.equals("mark")) {
+                System.out.println("Nice! I've marked this task as done:");
+                currTask.markDone();
+            } else {
+                System.out.println("OK, I've marked this task as not done yet:");
+                currTask.unmarkDone();
+            }
             printTaskWithLine(idx);
+        } catch (BurgerException e) {
+            printOutOfIndexMessage();
         }
-        printTaskWithLine(idx);
+
     }
+
     /**
      * Prints the task with a horizontal line.
      *
      * @param idx Index of the task.
      */
     public void printTaskWithLine(int idx) {
-        this.todoList.get(idx).printTask();
+        this.taskList.get(idx).printTask();
         System.out.println();
         printLine();
     }
 
-    public void printTodoList() {
+    /**
+     * Prints task list.
+     */
+    public void printTaskList() {
         printLine();
         System.out.println("Here are the tasks in your list:");
-        for (int i = 0; i < todoList.size(); i++) {
+        if (taskList.isEmpty()) {
+            System.out.println("Don't be lazy... start doing something");
+        }
+        for (int i = 0; i < taskList.size(); i++) {
             System.out.print(i+1 + ". ");
-            todoList.get(i).printTask();
+            taskList.get(i).printTask();
             System.out.println();
         }
         printLine();