Update

jackgugz · Sep 11, 2021 · 0ce5a90 · 0ce5a90
1 parent 2eb08a4
commit 0ce5a90
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -43,12 +43,12 @@ test {
 }
 
 application {
-    mainClassName = "duke.Duke"
+    mainClassName = "jackie.Launcher"
 }
 
 shadowJar {
-    archiveBaseName = "duke"
-    archiveVersion = "0.2"
+    archiveBaseName = "Jackie"
+    archiveVersion = "1.0"
     archiveClassifier = null
 }
 

diff --git a/src/main/java/jackie/command/AddCommand.java b/src/main/java/jackie/command/AddCommand.java
@@ -20,13 +20,13 @@ public class AddCommand extends Command {
     public AddCommand(String... command) throws jackie.JackieException {
         if (command.length == 1) {
             // guard clause
-            throw new jackie.JackieException(" ☹ OOPS!!! The description of a task cannot be empty.");
+            throw new jackie.JackieException(" D: OOPS!!! The description of a task cannot be empty.");
         } else if (command[0].equals("todo")) {
             task = new jackie.task.Todo(command);
-        } else if (Arrays.asList(command).contains("/") || command.length <= 3) {
+        } else if (Arrays.asList(command).contains("/") && command.length <= 3) {
             // guard clause
             throw new jackie.JackieException(
-                    " ☹ HEY DEAR! Please enter a date after / following the task description");
+                    " D: HEY DEAR! Please enter a date after / following the task description");
         } else if (command[0].equals("deadline")) {
             task = new jackie.task.Deadline(command);
         } else if (command[0].equals("event")) {

diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.text.Font?>
 
-<fx:root alignment="TOP_RIGHT" fillHeight="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="42.0" prefWidth="400.0" style="-fx-spacing: 10;" type="javafx.scene.layout.HBox" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root alignment="TOP_RIGHT" fillHeight="false" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="42.0" prefWidth="400.0" style="-fx-spacing: 10;" type="javafx.scene.layout.HBox" xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Label fx:id="dialog" alignment="TOP_RIGHT" maxHeight="1.7976931348623157E308" minHeight="-Infinity" style="-fx-background-color: rgba(98, 252, 147,0.7); -fx-max-width: 1000; -fx-min-width: 0; -fx-max-height: 1000; -fx-min-height: 0;" text="Label" wrapText="true">
          <font>

diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jackie.MainWindow">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1" fx:controller="jackie.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" />