Fix fxml version

teoks0199 · Sep 21, 2023 · 3a26e6f · 3a26e6f
1 parent bd3dec1
commit 3a26e6f
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 31 deletions.
diff --git a/build.gradle b/build.gradle
@@ -47,7 +47,7 @@ test {
 }
 
 application {
-    mainClass.set("duke.Duke")
+    mainClass.set("duke.Launcher")
 }
 
 shadowJar {

diff --git a/data/duke.txt b/data/duke.txt
@@ -1,3 +1,2 @@
-D | N | return book | 2020-09-20
-E | N | fun carnival | 2023-11-08 | 2020-09-21
-T | N | read book
+T | N | sf
+T | N | wibf
diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
@@ -19,7 +19,7 @@ public class Duke {
      */
     public Duke() {
         storage = new Storage(FILEPATH);
-        assert storage != null;
+        assert storage != null : "Storage should not be null";
         tasks = new TaskList(storage.loadTaskList());
     }
 
@@ -31,7 +31,7 @@ public void run() {
         Scanner scanner = new Scanner(System.in);
         String input = scanner.nextLine();
         Parser parser = new Parser(tasks);
-        assert input != null;
+        assert input != null : "Input should not be null";
         parser.parse(input);
         while (!parser.isDone()) {
             input = scanner.nextLine();
@@ -56,7 +56,7 @@ public void updateTaskList() {
     public String getResponse(String input) {
         Parser parser = new Parser(tasks);
         String response = parser.parse(input);
-        assert response != null;
+        assert response != null : "Response should not be null";
         return response;
     }
 

diff --git a/src/main/java/duke/MainWindow.java b/src/main/java/duke/MainWindow.java
@@ -34,10 +34,10 @@ public void initialize() {
     /**
      * Sets the duke object.
      *
-     * @param d The duke object.
+     * @param duke The duke object.
      */
-    public void setDuke(Duke d) {
-        duke = d;
+    public void setDuke(Duke duke) {
+        this.duke = duke;
     }
 
     /**

diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java
@@ -1,6 +1,8 @@
 package duke;
 
+import javafx.animation.PauseTransition;
 import javafx.application.Platform;
+import javafx.util.Duration;
 
 /**
  * Used to parse user input into appropriate commands.
@@ -63,13 +65,15 @@ public String parse(String s) {
         case "bye":
             this.isFinished = true;
             output = Ui.bye();
-            Platform.exit();
+            PauseTransition delay = new PauseTransition(Duration.seconds(1));
+            delay.setOnFinished(event -> Platform.exit());
+            delay.play();
             break;
         default:
             output = Ui.unknownCommandErrorMessage();
         }
         Ui.horizontalLine();
-        assert output != null;
+        assert output != null : "Output should not be null";
         return output;
     }
 

diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java
@@ -43,13 +43,11 @@ public ArrayList<Task> loadTaskList() {
             Path parentDirectory = filePath.getParent();
             if (!Files.exists(parentDirectory)) {
                 Files.createDirectories(parentDirectory);
-                System.out.println("Parent directories created: " + parentDirectory.toAbsolutePath());
             }
 
             // Create the file if it doesn't exist
             if (!Files.exists(filePath)) {
                 Files.createFile(filePath);
-                System.out.println("File created: " + filePath);
             }
 
             // Read the existing content from the file
@@ -80,12 +78,10 @@ public void updateTaskList() {
             Path parentDirectory = filePath.getParent();
             if (!Files.exists(parentDirectory)) {
                 Files.createDirectories(parentDirectory);
-                System.out.println("Parent directories created: " + parentDirectory.toAbsolutePath());
             }
             // Create the file if it doesn't exist
             if (!Files.exists(filePath)) {
                 Files.createFile(filePath);
-                System.out.println("File created: " + filePath);
             }
             // Write new content to the file
             StringBuilder toWrite = new StringBuilder();

diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml
@@ -5,9 +5,8 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.text.Text?>
 
-<fx:root alignment="TOP_RIGHT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefWidth="400.0" style="-fx-background-color: grey; -fx-border-color: black;" type="javafx.scene.layout.HBox" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root alignment="TOP_RIGHT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefWidth="400.0" style="-fx-background-color: grey; -fx-border-color: black;" type="javafx.scene.layout.HBox" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
     <children>
-<!--        <Label fx:id="dialog" text="Label" wrapText="true" />-->
         <Text fx:id="dialog" layoutX="-0.0" text="Label" textAlignment="RIGHT" wrappingWidth="300.0">
          <HBox.margin>
             <Insets left="10.0" right="10.0" />

diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -6,19 +6,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
 
-<!--<fx:root type="javafx.scene.layout.AnchorPane" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="duke.MainWindow">-->
-<!--    <children>-->
-<!--        <TextField fx:id="userInput" layoutY="558.0" onAction="#handleUserInput" prefHeight="41.0" prefWidth="324.0" AnchorPane.bottomAnchor="1.0" />-->
-<!--        <Button fx:id="sendButton" layoutX="324.0" layoutY="558.0" mnemonicParsing="false" onAction="#handleUserInput" prefHeight="41.0" prefWidth="76.0" text="SEND" />-->
-<!--        <ScrollPane fx:id="scrollPane" hbarPolicy="NEVER" hvalue="1.0" prefHeight="557.0" prefWidth="400.0" vvalue="1.0">-->
-<!--            <content>-->
-<!--                <VBox fx:id="dialogContainer" prefHeight="552.0" prefWidth="388.0" />-->
-<!--            </content>-->
-<!--        </ScrollPane>-->
-<!--    </children>-->
-<!--</fx:root>-->
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="500.0" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="duke.MainWindow">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="500.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="duke.MainWindow">
     <children>
         <TextField fx:id="userInput" layoutY="558.0" onAction="#handleUserInput" prefHeight="41.0" prefWidth="500.0" AnchorPane.bottomAnchor="1.0" />
         <Button fx:id="sendButton" layoutX="423.0" layoutY="558.0" mnemonicParsing="false" onAction="#handleUserInput" prefHeight="41.0" prefWidth="76.0" text="SEND" />