Fix behaviour for Bye command

jacobkwan · Oct 16, 2022 · d86fb8c · d86fb8c
1 parent 6c8087b
commit d86fb8c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/main/java/duke/command/ExitCommand.java b/src/main/java/duke/command/ExitCommand.java
@@ -8,6 +8,8 @@
  * Encapsulates a command to terminate Duke.
  */
 public class ExitCommand extends Command {
+    public static final String EXIT_RESPONSE = "bye...";
+
     /**
      * Executes the ExitCommand to terminate Duke.
      *
@@ -17,7 +19,7 @@ public class ExitCommand extends Command {
      */
     @Override
     public String execute(TaskList tasks, Ui ui, Storage storage) {
-        return "bye...";
+        return EXIT_RESPONSE;
     }
 
     /**

diff --git a/src/main/java/duke/ui/MainWindow.java b/src/main/java/duke/ui/MainWindow.java
@@ -3,6 +3,8 @@
 import java.io.IOException;
 
 import duke.Duke;
+import duke.command.ExitCommand;
+import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.Button;
@@ -66,5 +68,8 @@ private void handleUserInput() {
         dialogContainer.getChildren().addAll(DialogBox.getUserDialog(input, userImage),
                 DialogBox.getDukeDialog(response, dukeImage));
         userInput.clear();
+        if (response == ExitCommand.EXIT_RESPONSE) {
+            Platform.exit();
+        }
     }
 }