Merge branch 'branch-Level-10'

dlathyun · Sep 6, 2023 · 39010dd · 39010dd
2 parents dac359d + bc4afde
commit 39010dd
Show file tree

Hide file tree

Showing 27 changed files with 387 additions and 31 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,12 @@ plugins {
     id 'application'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'checkstyle'
+    id 'org.openjfx.javafxplugin' version '0.0.13'
+}
+
+javafx {
+    version = "17.0.8"
+    modules = [ 'javafx.controls' ]
 }
 
 checkstyle {
@@ -16,8 +22,24 @@ repositories {
 dependencies {
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0'
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0'
+
+    String javaFxVersion = '17.0.8'
+
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
 }
 
+
 test {
     useJUnitPlatform()
 
@@ -33,7 +55,7 @@ test {
 }
 
 application {
-    mainClass.set("duke.Duke")
+    mainClass.set("duke.gui.Launcher")
 }
 
 shadowJar {

diff --git a/data/savedtask.txt b/data/savedtask.txt
@@ -1 +1,2 @@
-E / [ ] / hw / 2022-08-05 21:29/ 2022-08-07 12:11
+
+T / [ ] / lecture
diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
@@ -7,23 +7,29 @@
 import duke.task.TaskList;
 import duke.ui.Ui;
 
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+
+
 /**
  * Main class of Kora Chatbot Program.
  */
 public class Duke {
+
     private TaskList taskList;
     private Storage storage;
     private Ui ui;
     private boolean isExit = false;
 
+
+
+
     /**
      * Class constructor of Duke.
-     *
-     * @param filePath path of file in user's hard disk.
      */
-    public Duke(String filePath) {
+    public Duke() {
         ui = new Ui();
-        storage = new Storage(filePath);
+        storage = new Storage("./data/savedtask.txt");
         taskList = new TaskList();
         try {
             storage.loadTask(taskList);
@@ -40,7 +46,7 @@ public Duke(String filePath) {
     public Command getResponse(String userInput) {
         try {
             Command command = Parser.parse(userInput);
-            command.execute(taskList);
+            command.execute(taskList, storage);
             command.printOutput(command.getCommandMessage());
             return command;
         } catch (KoraException e) {
@@ -66,12 +72,22 @@ public void run() {
         ui.closeScanner();
     }
 
+    public String getGreeting() {
+        return ui.getGreetMessage();
+    }
+
+
     /**
      * Runs the main programme.
      * @param args The command-line arguments
      */
     public static void main(String[] args) {
-        Duke kora = new Duke("./data/savedtask.txt");
-        kora.run();
+        try {
+            Duke kora = new Duke();
+            kora.run();
+        } catch (Exception e) {
+            System.out.println("haha,,");
+        }
+
     }
 }
diff --git a/src/main/java/duke/command/ByeCommand.java b/src/main/java/duke/command/ByeCommand.java
@@ -1,5 +1,6 @@
 package duke.command;
 
+import duke.storage.Storage;
 import duke.task.TaskList;
 
 public class ByeCommand extends Command {
@@ -12,7 +13,7 @@ public String getCommandMessage() {
         return commandMessage;
     }
     @Override
-    public void execute(TaskList taskList) {
+    public void execute(TaskList taskList, Storage storage) {
 
         commandMessage = "Byebye. See you again!";
     }

diff --git a/src/main/java/duke/command/Command.java b/src/main/java/duke/command/Command.java
@@ -1,6 +1,7 @@
 package duke.command;
 
 import duke.exception.KoraException;
+import duke.storage.Storage;
 import duke.task.TaskList;
 
 /**
@@ -34,7 +35,7 @@ public void printOutput(String output) {
      * @param taskList List with tasks.
      * @throws KoraException From its child class.
      */
-    public abstract void execute(TaskList taskList) throws KoraException;
+    public abstract void execute(TaskList taskList, Storage storage) throws KoraException;
 
     /**
      * Returns false for all the commands except ByeCommand.

diff --git a/src/main/java/duke/command/DeadlineCommand.java b/src/main/java/duke/command/DeadlineCommand.java
@@ -1,6 +1,7 @@
 package duke.command;
 
 import duke.exception.KoraException;
+import duke.storage.Storage;
 import duke.task.Deadline;
 import duke.task.Task;
 import duke.task.TaskList;
@@ -25,9 +26,10 @@ public String getCommandMessage() {
     }
 
     @Override
-    public void execute(TaskList taskList) throws KoraException {
+    public void execute(TaskList taskList, Storage storage) throws KoraException {
         Task currentTask = new Deadline(taskDetails, timeDetails);
         taskList.addTask(currentTask);
+        storage.saveTask(taskList);
         commandMessage = "Okay! I have added this task" + "\n"
                 + currentTask.toString() + "\n"
                 + String.format("Now you have %d tasks!", taskList.getLength());

diff --git a/src/main/java/duke/command/DeleteCommand.java b/src/main/java/duke/command/DeleteCommand.java
@@ -1,5 +1,7 @@
 package duke.command;
 
+import duke.exception.KoraException;
+import duke.storage.Storage;
 import duke.task.Task;
 import duke.task.TaskList;
 
@@ -17,10 +19,11 @@ public String getCommandMessage() {
     }
 
     @Override
-    public void execute(TaskList taskList) {
+    public void execute(TaskList taskList, Storage storage) throws KoraException {
         Task currentTask = taskList.getTask(taskIndex);
         String taskDetails = currentTask.toString();
         taskList.removeTask(taskIndex);
+        storage.saveTask(taskList);
         commandMessage = "Okay. I have removed this task" + "\n"
                 + taskDetails + "\n" + String.format("Now you have %d tasks!", taskList.getLength());
     }

diff --git a/src/main/java/duke/command/EventCommand.java b/src/main/java/duke/command/EventCommand.java
@@ -1,6 +1,7 @@
 package duke.command;
 
 import duke.exception.KoraException;
+import duke.storage.Storage;
 import duke.task.Event;
 import duke.task.Task;
 import duke.task.TaskList;
@@ -30,9 +31,10 @@ public String getCommandMessage() {
     }
 
     @Override
-    public void execute(TaskList taskList) throws KoraException {
+    public void execute(TaskList taskList, Storage storage) throws KoraException {
         currentTask = new Event(taskDetails, startTimeDetails, endTimeDetails);
         taskList.addTask(currentTask);
+        storage.saveTask(taskList);
         commandMessage = "Okay! I have added this task" + "\n"
                 + currentTask.toString() + "\n"
                 + String.format("Now you have %d tasks!", taskList.getLength());

diff --git a/src/main/java/duke/command/FindCommand.java b/src/main/java/duke/command/FindCommand.java
@@ -1,6 +1,7 @@
 package duke.command;
 
 import duke.exception.KoraException;
+import duke.storage.Storage;
 import duke.task.Task;
 import duke.task.TaskList;
 
@@ -22,7 +23,7 @@ public String getCommandMessage() {
     }
 
     @Override
-    public void execute(TaskList taskList) throws KoraException {
+    public void execute(TaskList taskList, Storage storage) throws KoraException {
         int taskListSize = taskList.getLength();
         for (int i = 0; i < taskListSize; i++) {
             Task task = taskList.getTask(i + 1);

diff --git a/src/main/java/duke/command/InvalidCommand.java b/src/main/java/duke/command/InvalidCommand.java
@@ -0,0 +1,21 @@
+package duke.command;
+
+import duke.storage.Storage;
+import duke.task.TaskList;
+
+public class InvalidCommand extends Command {
+    private String commandMessage = "";
+    public InvalidCommand() {
+    }
+
+    @Override
+    public String getCommandMessage() {
+        return commandMessage;
+    }
+
+    @Override
+    public void execute(TaskList taskList, Storage storage) {
+
+        commandMessage = "I do not understand";
+    }
+}
diff --git a/src/main/java/duke/command/ListCommand.java b/src/main/java/duke/command/ListCommand.java
@@ -1,5 +1,6 @@
 package duke.command;
 
+import duke.storage.Storage;
 import duke.task.TaskList;
 
 public class ListCommand extends Command {
@@ -14,7 +15,7 @@ public String getCommandMessage() {
     }
 
     @Override
-    public void execute(TaskList taskList) {
+    public void execute(TaskList taskList, Storage storage) {
         if (taskList.getLength() == 0) {
             commandMessage = "Wow! You have no tasks!";
         } else {

diff --git a/src/main/java/duke/command/MarkCommand.java b/src/main/java/duke/command/MarkCommand.java
@@ -1,5 +1,7 @@
 package duke.command;
 
+import duke.exception.KoraException;
+import duke.storage.Storage;
 import duke.task.Task;
 import duke.task.TaskList;
 
@@ -18,9 +20,10 @@ public String getCommandMessage() {
     }
 
     @Override
-    public void execute(TaskList taskList) {
+    public void execute(TaskList taskList, Storage storage) throws KoraException {
         Task currentTask = taskList.getTask(taskIndex);
         currentTask.setMarked();
+        storage.saveTask(taskList);
         commandMessage = "Wow you are done!" + "\n" + currentTask.toString();
     }
 }
diff --git a/src/main/java/duke/command/ToDoCommand.java b/src/main/java/duke/command/ToDoCommand.java
@@ -1,6 +1,7 @@
 package duke.command;
 
 import duke.exception.KoraException;
+import duke.storage.Storage;
 import duke.task.Task;
 import duke.task.TaskList;
 import duke.task.ToDo;
@@ -23,9 +24,10 @@ public String getCommandMessage() {
     }
 
     @Override
-    public void execute(TaskList taskList) {
+    public void execute(TaskList taskList, Storage storage) throws KoraException {
         Task currentTask = new ToDo(taskDetails);
         taskList.addTask(currentTask);
+        storage.saveTask(taskList);
         commandMessage = "Okay! I have added this task" + "\n"
                 + currentTask.toString() + "\n" + String.format("Now you have %d tasks!", taskList.getLength());
     }

diff --git a/src/main/java/duke/command/UnmarkCommand.java b/src/main/java/duke/command/UnmarkCommand.java
@@ -1,5 +1,7 @@
 package duke.command;
 
+import duke.exception.KoraException;
+import duke.storage.Storage;
 import duke.task.Task;
 import duke.task.TaskList;
 
@@ -18,9 +20,10 @@ public String getCommandMessage() {
     }
 
     @Override
-    public void execute(TaskList taskList) {
+    public void execute(TaskList taskList, Storage storage) throws KoraException {
         Task currentTask = taskList.getTask(taskIndex);
         currentTask.setUnmarked();
+        storage.saveTask(taskList);
         commandMessage = "Wow you are not done!" + "\n" + currentTask.toString();
     }
 }