Refactored the Ui class' methods to be static

Author: weixue123

src/main/java/duke/Duke.java

@@ -5,15 +5,13 @@
 import duke.tasks.Storage;
 import duke.tasks.TaskList;
 import duke.ui.Parser;
-import duke.ui.Ui;
 
 public class Duke {
     private final TaskList tasks;
     private final Storage storage;
-    private final Ui ui;
 
     /**
-     * Initializes an instance of the Duke chatbot/todo list.
+     * Initializes an instance of Duke to handle ALL the logic of the application.
      *
      * @param filepath Path to text file from which tasks are loaded when the app starts, and to
      *                 which tasks are saved when the app terminates.
@@ -22,22 +20,53 @@ public class Duke {
      *                 corresponding to the input path will be created, to which existing tasks are saved.
      */
     public Duke(String filepath) {
-        this.ui = new Ui();
         this.storage = new Storage(filepath);
         this.tasks = this.storage.loadTasks();
     }
 
     /**
-     * Get response
+     * Executes the command w.r.t. the users' input.
+     *
+     * @param input A line of raw user input.
      */
-    public String getResponse(String input) {
-        Command c = Parser.parse(input);
-        c.execute(this.tasks);
+    public void execute(String input) {
+        Command command = this.getCommand(input);
+        command.execute(this.tasks);
 
-        if (c instanceof ByeCommand) {
-            storage.saveTasks(this.tasks);
+        if (command instanceof ByeCommand) {
+            this.storage.saveTasks(this.tasks);
         }
+    }
+
+    /**
+     * Computes a response to display to the users w.r.t. the users' input.
+     *
+     * @param input A line of raw user input.
+     * @return A <code>String</code> of response.
+     */
+    public String getResponse(String input) {
+        Command command = this.getCommand(input);
+        return command.getResponse(this.tasks);
+    }
 
-        return c.getResponse(this.tasks, this.ui);
+    /**
+     * Determines if the application should be exited w.r.t the users' input.
+     *
+     * @param input A line of raw user input.
+     * @return true if the application should be terminated, and false otherwise.
+     */
+    public boolean isExit(String input) {
+        Command command = this.getCommand(input);
+        return command.isExit();
+    }
+
+    /**
+     * Gets the <code>Command</code> object w.r.t the users' input.
+     *
+     * @param input A line or raw user input.
+     * @return A <code>Command</code> object corresponding to the input.
+     */
+    private Command getCommand(String input) {
+        return Parser.parse(input);
     }
 }

src/main/java/duke/Main.java

@@ -14,7 +14,7 @@
  */
 public class Main extends Application {
 
-    private Duke duke = new Duke("data/tasks.txt");
+    private final Duke duke = new Duke("data/tasks.txt");
 
     @Override
     public void start(Stage stage) {

src/main/java/duke/commands/AddDeadlineCommand.java

@@ -44,10 +44,9 @@ public void execute(TaskList tasks) {
      * Computes a response to notify the users the adding of the <code>Deadline</code>.
      *
      * @param tasks A collection of <code>Task</code> objects representing the application's state.
-     * @param ui    A handler to manage the application's user-interface layer.
      * @return A <code>String</code> to respond to the adding of the <code>Deadline</code>.
      */
-    public String getResponse(TaskList tasks, Ui ui) {
-        return ui.handleAddTask(tasks, this.deadline);
+    public String getResponse(TaskList tasks) {
+        return Ui.getAddTaskResponse(tasks, this.deadline);
     }
 }

src/main/java/duke/commands/AddEventCommand.java

@@ -44,10 +44,9 @@ public void execute(TaskList tasks) {
      * Computes a response to notify the users the adding of the <code>Event</code>.
      *
      * @param tasks A collection of <code>Task</code> objects representing the application's state.
-     * @param ui    A handler to manage the application's user-interface layer.
      * @return A <code>String</code> to respond to the adding of the <code>Event</code>.
      */
-    public String getResponse(TaskList tasks, Ui ui) {
-        return ui.handleAddTask(tasks, this.event);
+    public String getResponse(TaskList tasks) {
+        return Ui.getAddTaskResponse(tasks, this.event);
     }
 }

src/main/java/duke/commands/AddToDoCommand.java

@@ -41,10 +41,9 @@ public void execute(TaskList tasks) {
      * Computes a response to notify the users the adding of the <code>ToDo</code>.
      *
      * @param tasks A collection of <code>Task</code> objects representing the application's state.
-     * @param ui    A handler to manage the application's user-interface layer.
      * @return A <code>String</code> to respond to the adding of the <code>ToDo</code>.
      */
-    public String getResponse(TaskList tasks, Ui ui) {
-        return ui.handleAddTask(tasks, this.toDo);
+    public String getResponse(TaskList tasks) {
+        return Ui.getAddTaskResponse(tasks, this.toDo);
     }
 }

src/main/java/duke/commands/ByeCommand.java

@@ -29,10 +29,9 @@ public void execute(TaskList tasks) {
      * Creates a response to notify the users that the application is shutting down.
      *
      * @param tasks A collection of <code>Task</code> objects representing the application's state.
-     * @param ui    A handler to manage the application's user-interface layer.
      * @return A <code>String</code> to respond to the closing of the application.
      */
-    public String getResponse(TaskList tasks, Ui ui) {
-        return ui.handleBye();
+    public String getResponse(TaskList tasks) {
+        return Ui.getByeResponse();
     }
 }

src/main/java/duke/commands/Command.java

@@ -1,7 +1,6 @@
 package duke.commands;
 
 import duke.tasks.TaskList;
-import duke.ui.Ui;
 
 /**
  * Handles the logic of the application.
@@ -19,10 +18,9 @@ public abstract class Command {
      * Computes a feedback or response to the users' input.
      *
      * @param tasks A collection of <code>Task</code> objects representing the application's state.
-     * @param ui    A handler to manage the application's user-interface layer.
      * @return A <code>String</code> of response.
      */
-    public abstract String getResponse(TaskList tasks, Ui ui);
+    public abstract String getResponse(TaskList tasks);
 
     /**
      * Determines whether or not to terminate the application.

src/main/java/duke/commands/DeleteCommand.java

@@ -45,10 +45,9 @@ public void execute(TaskList tasks) {
      * Computes a response to notify the users if a <code>Task</code> is deleted.
      *
      * @param tasks A collection of <code>Task</code> objects representing the application's state.
-     * @param ui    A handler to manage the application's user-interface layer.
      * @return A <code>String</code> to respond to the deletion of a <code>Task</code> (if any).
      */
-    public String getResponse(TaskList tasks, Ui ui) {
-        return ui.handleDelete(this.deletedTask, this.index);
+    public String getResponse(TaskList tasks) {
+        return Ui.getDeleteResponse(this.deletedTask, this.index);
     }
 }

src/main/java/duke/commands/DoNothingCommand.java

@@ -25,10 +25,9 @@ public void execute(TaskList tasks) {
      * Computes a feedback or response to the users' input.
      *
      * @param tasks A collection of <code>Task</code> objects representing the application's state.
-     * @param ui    A handler to manage the application's user-interface layer.
      * @return Error message
      */
-    public String getResponse(TaskList tasks, Ui ui) {
+    public String getResponse(TaskList tasks) {
         return this.exceptionMessage;
     }
 

src/main/java/duke/commands/DoneCommand.java

@@ -47,10 +47,9 @@ public void execute(TaskList tasks) {
      * Computes a response to notify the users if a <code>Task</code> is marked as done.
      *
      * @param tasks A collection of <code>Task</code> objects representing the application's state.
-     * @param ui    A handler to manage the application's user-interface layer.
      * @return A <code>String</code> to respond to marking a <code>Task</code> as done.
      */
-    public String getResponse(TaskList tasks, Ui ui) {
-        return ui.handleDone(this.doneTask, this.index);
+    public String getResponse(TaskList tasks) {
+        return Ui.getDoneResponse(this.doneTask, this.index);
     }
 }