refactor code (add TaskBank, Parser, User class)

src/main/java/Action.java

@@ -4,32 +4,30 @@ public class Action {
 
     Action() {}
 
-    void greet() {
-        String greet = "Hello! I'm JiaMing\nWhat can I do for you?\n";
+    public static void greet() {
+        String logo  = " ____        _        \n"
+                + "|  _ \\ _   _| | _____ \n"
+                + "| | | | | | | |/ / _ \\\n"
+                + "| |_| | |_| |   <  __/\n"
+                + "|____/ \\__,_|_|\\_\\___|\n";
+        String greet = "Hello! I'm JiaMing aka\n"+ logo + "\nWhat can I do for you?\nTip: use 'help' for help\n";
         System.out.println(greet);
     }
 
-    void echo(String phrase) {
+    public static void echo(String phrase) {
         System.out.println(phrase);
     }
 
-    void bye() {
+    public static void bye() {
         String bye = "Bye. Hope to see you again soon!\n";
         System.out.println(bye);
     }
 
-    void showList(ArrayList<Task> arrlst) {
+    public static void showList(ArrayList<Task> arrlst) {
         System.out.println("Here are the tasks in your list:");
         for (int i =  0; i < arrlst.size(); i++) {
-            String output = String.format("%d.[%s][%s]%s\n", i + 1, arrlst.get(i).sym,
-                                             arrlst.get(i).getStatusIcon(), arrlst.get(i).description);
+            String output = String.format("%d.%s\n", i + 1, arrlst.get(i));
             System.out.println(output);
         }
     }
-
-    @Override
-    public String toString() {
-        return "this is an Action (Parent)";
-    }
-
 }

src/main/java/Deadline.java

@@ -1,20 +1,18 @@
 public class Deadline extends Task {
-    protected final String sym = "D";
-    protected String day;
+    private final String sym = "D";
+    private String day;
 
     Deadline (String description, String day) {
         super(description);
         this.day = day;
     }
 
-    @Override
     String getSym() {
         return this.sym;
     }
 
     @Override
     public String toString() {
-        return String.format("[%s][%s]%s (by:%s)", sym, super.getStatusIcon(), super.description, this.day);
+        return String.format("[%s][%s]%s (by:%s)", sym, super.getStatusIcon(), super.getDescription(), this.day);
     }
-
 }

src/main/java/Duke.java

@@ -1,107 +1,7 @@
 // enums not applicable
 
-import java.util.Scanner;
-import java.util.ArrayList;
-
 public class Duke {
     public static void main(String[] args) {
-        Scanner sc = new Scanner(System.in);
-        ArrayList<Task> arrlst = new ArrayList<>();
-        String DASH = "____________________________________________________________";
-        Action act = new Action();
-
-        act.greet();
-
-        while (sc.hasNext()) {
-            String phrase = sc.nextLine();
-            System.out.println(DASH);
-
-            if (phrase.equals("list")) {
-                act.showList(arrlst);
-            } else if (phrase.equals("bye")) {
-                act.bye();
-                System.out.println(DASH);
-                break;
-            } else {
-                String[] arrWords = phrase.split(" ");
-                try { // mark or unmark
-                    int num = Integer.valueOf(arrWords[1]);
-                    if (arrWords[0].equals("mark")) {
-                        arrlst.get(num - 1).markAsDone();
-                    } else if (arrWords[0].equals("unmark")) {
-                        arrlst.get(num - 1).markAsNotDone();
-                    } else if (arrWords[0].equals("delete")) {
-                        System.out.println("Noted. I've removed this task:");
-                        Task t = arrlst.get(num - 1);
-                        String output = String.format("[%s][%s]%s", t.getSym(), t.getStatusIcon(), t.description);
-                        System.out.println(output);
-                        System.out.println("Now you have 4 tasks in the list.");
-                        arrlst.remove(num - 1);
-                    } else {
-                        System.out.println("siao eh");
-                    }
-                } catch (NumberFormatException nfe) { // add new task like read book, return book
-                    String gotIt = "Got it. I've added this task:";
-
-                    if (arrWords[0].equals("todo")) {
-                        String remainingWords = "";
-                        for (int i = 1; i < arrWords.length; i++) {
-                            remainingWords = remainingWords + " " + arrWords[i];
-                        }
-                        Todo t = new Todo(remainingWords);
-                        arrlst.add(new Task(t.description, t.sym));
-                        System.out.println(gotIt);
-                        System.out.println(t);
-                        String noOfTask = String.format("Now you have %d tasks in the list.", arrlst.size());
-                        System.out.println(noOfTask);
-                    } else if (arrWords[0].equals("deadline")) {
-                        String remainingWords = "";
-                        String dLine = "";
-                        for (int i = 1; i < arrWords.length; i++) {
-                            if (arrWords[i].equals("/by")) {
-                                for (int j = i + 1; j < arrWords.length; j++) {
-                                    dLine = dLine + " " + arrWords[j];
-                                }
-                                break;
-                            } else {
-                                remainingWords = remainingWords + " " + arrWords[i];
-                            }
-                        }
-                        Deadline t = new Deadline(remainingWords, dLine);
-                        arrlst.add(new Task(t.description, t.sym));
-                        System.out.println(gotIt);
-                        System.out.println(t);
-                        String noOfTask = String.format("Now you have %d tasks in the list.", arrlst.size());
-                        System.out.println(noOfTask);
-                    } else if (arrWords[0].equals("event")) {
-                        String remainingWords = "";
-                        String dayAndTime = "";
-                        for (int i = 1; i < arrWords.length; i++) {
-                            if (arrWords[i].equals("/at")) {
-                                for (int j = i + 1; j < arrWords.length; j++) {
-                                    dayAndTime = dayAndTime + " " + arrWords[j];
-                                }
-                                break;
-                            } else {
-                                remainingWords = remainingWords + " " + arrWords[i];
-                            }
-                        }
-                        Event t = new Event(remainingWords, dayAndTime);
-                        arrlst.add(new Task(t.description, t.sym));
-                        System.out.println(gotIt);
-                        System.out.println(t);
-                        String noOfTask = String.format("Now you have %d tasks in the list.", arrlst.size());
-                        System.out.println(noOfTask);
-                    }
-                } catch (ArrayIndexOutOfBoundsException aioobe) { // echo
-                    if (arrWords[0].equals("todo")) {
-                        System.out.println("OOPS!!! The description of a todo cannot be empty.");
-                    } else {
-                        System.out.println("OOPS!!! I'm sorry, but I don't know what that means :-(");
-                    }
-                }
-            }
-            System.out.println(DASH);
-        }
+        User.start();
     }
 }

src/main/java/Event.java

@@ -1,21 +1,18 @@
 public class Event extends Task {
-    protected final String sym = "E";
+    private final String sym = "E";
     private String dayAndTime;
 
     Event (String description, String dayAndTime) {
         super(description);
         this.dayAndTime = dayAndTime;
     }
 
-    @Override
     String getSym() {
         return this.sym;
     }
 
     @Override
     public String toString() {
-        return String.format("[%s][%s]%s (at:%s)", sym, super.getStatusIcon(), super.description, this.dayAndTime);
+        return String.format("[%s][%s] %s (at:%s)", sym, super.getStatusIcon(), super.getDescription(), this.dayAndTime);
     }
-
-
 }

src/main/java/Parser.java

@@ -0,0 +1,123 @@
+import java.util.ArrayList;
+
+public class Parser {
+    Parser() {}
+
+    public String parse(String input) {
+        String DASH = "____________________________________________________________";
+        String[] inputArr = input.split(" ");
+        String output = "";
+        String command = inputArr[0];
+        ArrayList<Task> taskList = TaskBank.getBank();
+
+        switch(command) {
+            case "list":
+                Action.showList(taskList);
+                break;
+            case "bye":
+                Action.bye();
+                System.out.println(DASH);
+                break;
+            case "mark":
+                try {
+                    int num = Integer.valueOf(inputArr[1]) - 1;
+                    taskList.get(num).markAsDone();
+                    output = String.format("Nice! I've marked this task as done: %s\n", taskList.get(num));
+                } catch (NumberFormatException error) {
+                    output = "The index you have entered is not a number.\n";
+                } catch (ArrayIndexOutOfBoundsException error) {
+                    output = "The index you have entered is out of range.\n";
+                }
+                break;
+            case "unmark":
+                try {
+                    int num = Integer.valueOf(inputArr[1]) - 1;
+                    taskList.get(num).markAsNotDone();
+                    output = String.format("OK, I've marked this task as not done yet: %s\n", taskList.get(num));
+                } catch (NumberFormatException error) {
+                    output = "The index you have entered is not a number.\n";
+                } catch (ArrayIndexOutOfBoundsException error) {
+                    output = "The index you have entered is out of range.\n";
+                }
+                break;
+            case "todo":
+                String remainingWordsTodo = "";
+                for (int i = 1; i < inputArr.length; i++) {
+                    remainingWordsTodo = remainingWordsTodo + " " + inputArr[i];
+                }
+                Todo td = new Todo(remainingWordsTodo);
+                taskList.add(td);
+                output = String.format("Got it. I've added this task:\n %s\n", td);
+                String noOfTaskTodo = String.format("Now you have %d tasks in the list.\n", taskList.size());
+                output = output + noOfTaskTodo;
+                break;
+            case "deadline":
+                String remainingWordsDeadline = "";
+                String deadline = "";
+                for (int i = 1; i < inputArr.length; i++) {
+                    if (inputArr[i].equals("/by")) {
+                        for (int j = i + 1; j < inputArr.length; j++) {
+                            deadline = deadline + " " + inputArr[j];
+                        }
+                        break;
+                    } else {
+                        remainingWordsDeadline = remainingWordsDeadline + " " + inputArr[i];
+                    }
+                }
+                Deadline dl = new Deadline(remainingWordsDeadline, deadline);
+                taskList.add(dl);
+                output = String.format("Got it. I've added this task:\n %s\n", dl);
+                String noOfTaskDeadline = String.format("Now you have %d tasks in the list.\n", taskList.size());
+                output = output + noOfTaskDeadline;
+                break;
+            case "event":
+                String remainingWordsEvent = "";
+                String dayAndTime = "";
+                for (int i = 1; i < inputArr.length; i++) {
+                    if (inputArr[i].equals("/at")) {
+                        for (int j = i + 1; j < inputArr.length; j++) {
+                            dayAndTime = dayAndTime + " " + inputArr[j];
+                        }
+                        break;
+                    } else {
+                        remainingWordsEvent = remainingWordsEvent + " " + inputArr[i];
+                    }
+                }
+                Event e = new Event(remainingWordsEvent, dayAndTime);
+                taskList.add(e);
+                output = String.format("Got it. I've added this task:\n %s\n", e);
+                String noOfTaskEvent = String.format("Now you have %d tasks in the list.\n", taskList.size());
+                output = output + noOfTaskEvent;
+                break;
+            case "delete":
+                int num = Integer.valueOf(inputArr[1]) - 1;
+                try {
+                    Task d = taskList.get(num);
+                    taskList.remove(num);
+                    output = String.format("Noted. I've removed this task:\n %s\n", d);
+                    String noOfTaskDelete = String.format("Now you have %d tasks in the list.\n", taskList.size());
+                    output = output + noOfTaskDelete;
+                } catch (NumberFormatException error) {
+                    output = "The index you have entered is not a number.\n";
+                } catch (ArrayIndexOutOfBoundsException error) {
+                    output = "The index you have entered is out of range.\n";
+                }
+                break;
+            case "help":
+                output = "Here are all the commands available:\n"
+                        + "list - to list out all the task\n"
+                        + "bye - to end program\n"
+                        + "todo <input something you want to do> - to add something you want to tasks\n"
+                        + "deadline <input what is going be due> /by <input date> - to add a deadline to tasks\n"
+                        + "event <input event description> /at <input date>\n - to add an event to tasks"
+                        + "mark <input task number> - to mark task as done\n"
+                        + "unmark <input task number> - to mark task as not done\n"
+                        + "delete <input task number> - to delete task from tasks\n";
+                break;
+            default:
+                output = "invalid command! Use 'help' for help";
+        }
+
+        return output;
+    }
+}

src/main/java/Task.java

@@ -1,45 +1,30 @@
 public class Task {
-    protected String description;
-    protected boolean isDone;
-    protected String sym;
+    private String description;
+    private boolean isDone;
 
     public Task(String description) {
         this.description = description;
         this.isDone = false;
-        this.sym = " ";
     }
 
-    public Task(String description, String sym) {
-        this.description = description;
-        this.isDone = false;
-        this.sym = sym;
+    public String getStatusIcon() {
+        return isDone ? "X" : " ";
     }
 
-    public String getStatusIcon() {
-        return (isDone ? "X" : " "); // mark done task with X
+    public String getDescription() {
+        return this.description;
     }
 
     public void markAsDone() {
         this.isDone = true;
-        System.out.println("Nice! I've marked this task as done:");
-        String output = String.format(" [%s][%s] %s", this.sym, this.getStatusIcon(), this.description);
-        System.out.println(output);
     }
 
     public void markAsNotDone() {
         this.isDone = false;
-        System.out.println("OK, I've marked this task as not done yet:");
-        String output = String.format("  [%s] %s", this.getStatusIcon(), this.description);
-        System.out.println(output);
-    }
-
-    String getSym() {
-        return this.sym;
     }
 
     @Override
     public String toString() {
-        return String.format("added: %s", description);
+        return String.format("[%s] added: %s", this.getStatusIcon(), this.getDescription());
     }
-
 }

src/main/java/TaskBank.java

@@ -0,0 +1,19 @@
+import java.util.ArrayList;
+
+public class TaskBank {
+    private static ArrayList<Task> bank = new ArrayList<Task>();
+
+    public TaskBank() {}
+
+    public static void addTask(Task task) {
+        bank.add(task);
+    }
+
+    public static void deleteTask(int index) {
+        bank.remove(index);
+    }
+
+    public static ArrayList<Task> getBank() {
+        return bank;
+    }
+}