From 3b19ba1790d6035a9e246f5d4ae627bf68778606 Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 01/31] Add Gradle support --- build.gradle | 46 ++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 +++++++++++++++++++++++ gradlew.bat | 103 +++++++++++++ text-ui-test/runtest.sh | 0 6 files changed, 337 insertions(+) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat mode change 100644 => 100755 text-ui-test/runtest.sh diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..b0c5528fb5 --- /dev/null +++ b/build.gradle @@ -0,0 +1,46 @@ +plugins { + id 'java' + id 'application' + id 'checkstyle' + id 'com.github.johnrengelman.shadow' version '5.1.0' +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' +} + +test { + useJUnitPlatform() + + testLogging { + events "passed", "skipped", "failed" + + showExceptions true + exceptionFormat "full" + showCauses true + showStackTraces true + showStandardStreams = false + } +} + +application { + mainClassName = "seedu.duke.Duke" +} + +shadowJar { + archiveBaseName = "duke" + archiveClassifier = null +} + +checkstyle { + toolVersion = '8.23' +} + +run{ + standardInput = System.in +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..b7c8c5dbf5 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000000..2fe81a7d95 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..62bd9b9cce --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh old mode 100644 new mode 100755 From a75fceeb74708da6ac524c08ef526d38e60ee56b Mon Sep 17 00:00:00 2001 From: damithc <> Date: Sun, 30 Aug 2020 00:37:24 +0800 Subject: [PATCH 02/31] build.gradle: Update version to 8.29 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b0c5528fb5..20c0521cc7 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ shadowJar { } checkstyle { - toolVersion = '8.23' + toolVersion = '8.29' } run{ From 44763c2df39b93548d2bbe9c6da33e5b5fa3e18b Mon Sep 17 00:00:00 2001 From: jingxue-datature Date: Thu, 21 Jan 2021 18:49:57 +0800 Subject: [PATCH 03/31] Add function to greet user and echo user input --- src/main/java/Duke.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..49195811d7 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,10 +1,23 @@ +import java.util.Scanner; + public class Duke { public static void main(String[] args) { + Scanner sc = new Scanner (System.in); String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); + + System.out.println("Hello! I'm Duke \n What can I do for you?"); + String input = sc.next(); + while (input != "bye") { + System.out.println(input); + input = sc.next(); + } + + System.out.println("Bye. Hope to see you again!"); + } } From 8588ce3cc602684f87ba0879313b6aaf4b0d0634 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Thu, 21 Jan 2021 18:52:36 +0800 Subject: [PATCH 04/31] Revert "Add function to greet user and echo user input" This reverts commit 44763c2df39b93548d2bbe9c6da33e5b5fa3e18b. --- src/main/java/Duke.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 49195811d7..5d313334cc 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,23 +1,10 @@ -import java.util.Scanner; - public class Duke { public static void main(String[] args) { - Scanner sc = new Scanner (System.in); String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); - - System.out.println("Hello! I'm Duke \n What can I do for you?"); - String input = sc.next(); - while (input != "bye") { - System.out.println(input); - input = sc.next(); - } - - System.out.println("Bye. Hope to see you again!"); - } } From 56655dbfa246e75ad717b79ec3434c3e45404c15 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Thu, 21 Jan 2021 19:04:18 +0800 Subject: [PATCH 05/31] Add function to greet user and echo user input --- src/main/java/Duke.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..98d07dd2c9 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,10 +1,23 @@ +import java.util.Scanner; public class Duke { public static void main(String[] args) { + Scanner sc = new Scanner (System.in); String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); + + System.out.println("Hello! What can I do for you:>"); + + String input = sc.next(); + + while (!input.equals("bye")) { + System.out.println(input); + input = sc.next(); + } + + System.out.println("Bye. See you again!"); } } From ed93930e0c376517a60fa088eecd24b20f8d8bf1 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Fri, 22 Jan 2021 14:17:33 +0800 Subject: [PATCH 06/31] Add functionality to store user input and display in a list when requested --- src/main/java/Duke.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 98d07dd2c9..5a5e934a5a 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,6 +1,8 @@ import java.util.Scanner; +import java.util.ArrayList; public class Duke { public static void main(String[] args) { + ArrayList list = new ArrayList<>(); Scanner sc = new Scanner (System.in); String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" @@ -11,11 +13,18 @@ public static void main(String[] args) { System.out.println("Hello! What can I do for you:>"); - String input = sc.next(); + String input = sc.nextLine(); while (!input.equals("bye")) { - System.out.println(input); - input = sc.next(); + if (input.equals("list")) { + for (int i = 0; i < list.size(); i++) { + System.out.println((i+1) + "." + list.get(i)); + } + } else { + list.add(input); + System.out.println("added: " + input); + } + input = sc.nextLine(); } System.out.println("Bye. See you again!"); From c25f3b831941080f0b88cd38fbaadedc5a867489 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Fri, 22 Jan 2021 14:39:47 +0800 Subject: [PATCH 07/31] Add functionality to mark task as done --- src/main/java/Duke.java | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5a5e934a5a..bdac88ad5d 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -2,7 +2,7 @@ import java.util.ArrayList; public class Duke { public static void main(String[] args) { - ArrayList list = new ArrayList<>(); + ArrayList list = new ArrayList<>(); Scanner sc = new Scanner (System.in); String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" @@ -14,15 +14,22 @@ public static void main(String[] args) { System.out.println("Hello! What can I do for you:>"); String input = sc.nextLine(); - while (!input.equals("bye")) { if (input.equals("list")) { for (int i = 0; i < list.size(); i++) { - System.out.println((i+1) + "." + list.get(i)); + System.out.println((i + 1) + "." + list.get(i)); } } else { - list.add(input); - System.out.println("added: " + input); + String[] inputSplit = input.split(" "); + if (inputSplit[0].equals("done")) { + int value = Integer.valueOf(inputSplit[1]); + list.get(value - 1).setDone(); + System.out.println("Nice, I have set this task as done!"); + System.out.println(list.get(value - 1).toString()); + } else { + list.add(new Event(false, input)); + System.out.println("added: " + input); + } } input = sc.nextLine(); } @@ -30,3 +37,25 @@ public static void main(String[] args) { System.out.println("Bye. See you again!"); } } + +class Event { + public boolean done = false; + public String eventName = ""; + + Event(boolean done, String eventName) { + this.done = done; + this.eventName = eventName; + } + public void setDone() { + this.done = true; + } + + @Override + public String toString() { + if (this.done == true) { + return "[X] " + eventName; + } else { + return "[ ] " + eventName; + } + } +} From 495fbeea31e94ea7eec8ba5e697675e5dd6ca20e Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Fri, 22 Jan 2021 17:22:46 +0800 Subject: [PATCH 08/31] Add support for tracking three types of tasks: 1. ToDos: tasks without any date/time attached to it e.g., visit new theme park 2. Deadlines: tasks that need to be done before a specific date/time e.g., submit report by 11/10/2019 5pm 3. Events: tasks that start at a specific time and ends at a specific time e.g., team project meeting on 2/10/2019 2-4pm --- src/main/java/Deadlines.java | 15 +++++++ src/main/java/Duke.java | 76 +++++++++++++++--------------------- src/main/java/Events.java | 15 +++++++ src/main/java/Task.java | 21 ++++++++++ src/main/java/ToDos.java | 11 ++++++ 5 files changed, 94 insertions(+), 44 deletions(-) create mode 100644 src/main/java/Deadlines.java create mode 100644 src/main/java/Events.java create mode 100644 src/main/java/Task.java create mode 100644 src/main/java/ToDos.java diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java new file mode 100644 index 0000000000..fc4dea383b --- /dev/null +++ b/src/main/java/Deadlines.java @@ -0,0 +1,15 @@ +public class Deadlines extends Task { + String deadLine; + + public Deadlines(String eventName, String deadLine) { + + super(false, eventName); + this.deadLine = deadLine; + } + + @Override + public String toString() { + + return "[D] " + super.toString() + "(by: " + deadLine + ")"; + } +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index bdac88ad5d..39a650aec4 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,61 +1,49 @@ import java.util.Scanner; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; public class Duke { public static void main(String[] args) { - ArrayList list = new ArrayList<>(); + ArrayList list = new ArrayList<>(); Scanner sc = new Scanner (System.in); - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); - System.out.println("Hello! What can I do for you:>"); - - String input = sc.nextLine(); - while (!input.equals("bye")) { + String input; + do { + input = sc.nextLine(); if (input.equals("list")) { for (int i = 0; i < list.size(); i++) { System.out.println((i + 1) + "." + list.get(i)); } } else { String[] inputSplit = input.split(" "); - if (inputSplit[0].equals("done")) { - int value = Integer.valueOf(inputSplit[1]); - list.get(value - 1).setDone(); - System.out.println("Nice, I have set this task as done!"); - System.out.println(list.get(value - 1).toString()); - } else { - list.add(new Event(false, input)); - System.out.println("added: " + input); + switch (inputSplit[0]){ + case "done": + int value = Integer.valueOf(inputSplit[1]); + list.get(value - 1).setDone(); + System.out.println("Nice, I have set this task as done!"); + System.out.println(list.get(value - 1).toString()); + break; + case "todo": + String name = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); + list.add(new ToDos(name)); + System.out.println("added: " + name); + break; + case "deadline": + String deadlineName = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); + String[] deadlineSplit = deadlineName.split("/by "); + list.add(new Deadlines(deadlineSplit[0], deadlineSplit[1])); + System.out.println("added: " + deadlineSplit[0]); + break; + case "event": + String event = String.join(" ",Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); + String[] eventSplit = event.split("/at "); + list.add(new Events(eventSplit[0], eventSplit[1])); + System.out.println("added: " + eventSplit[0]); + break; } } - input = sc.nextLine(); - } + } while (!input.equals("bye")); System.out.println("Bye. See you again!"); } -} - -class Event { - public boolean done = false; - public String eventName = ""; - - Event(boolean done, String eventName) { - this.done = done; - this.eventName = eventName; - } - public void setDone() { - this.done = true; - } - - @Override - public String toString() { - if (this.done == true) { - return "[X] " + eventName; - } else { - return "[ ] " + eventName; - } - } -} +} \ No newline at end of file diff --git a/src/main/java/Events.java b/src/main/java/Events.java new file mode 100644 index 0000000000..dcd950ec76 --- /dev/null +++ b/src/main/java/Events.java @@ -0,0 +1,15 @@ +public class Events extends Task { + String time; + + public Events(String eventName, String time) { + + super(false, eventName); + this.time = time; + } + + @Override + public String toString() { + + return "[E] " + super.toString() + "(at: " + time + ")"; + } +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 0000000000..cbc2a91c47 --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,21 @@ +public class Task { + public boolean done = false; + public String eventName = ""; + + public Task(boolean done, String eventName) { + this.done = done; + this.eventName = eventName; + } + public void setDone() { + this.done = true; + } + + @Override + public String toString() { + if (this.done == true) { + return "[X] " + eventName; + } else { + return "[ ] " + eventName; + } + } +} diff --git a/src/main/java/ToDos.java b/src/main/java/ToDos.java new file mode 100644 index 0000000000..b02f2dd49d --- /dev/null +++ b/src/main/java/ToDos.java @@ -0,0 +1,11 @@ +public class ToDos extends Task { + + public ToDos(String eventName) { + super(false, eventName); + } + + @Override + public String toString() { + return "[T] " + super.toString(); + } +} From ff0cc4c42f6a0170f228bea3a517485d7cc15e47 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Fri, 22 Jan 2021 21:32:43 +0800 Subject: [PATCH 09/31] Add input and output for automated text UI testing --- src/main/java/Duke.java | 21 ++++++++++++++++++--- text-ui-test/EXPECTED.TXT | 22 +++++++++++++++------- text-ui-test/input.txt | 6 ++++++ 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 39a650aec4..4e6182024f 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -4,12 +4,16 @@ import java.util.List; public class Duke { public static void main(String[] args) { + int counter = 0; ArrayList list = new ArrayList<>(); Scanner sc = new Scanner (System.in); System.out.println("Hello! What can I do for you:>"); String input; do { input = sc.nextLine(); + if (input.equals("bye")){ + break; + } if (input.equals("list")) { for (int i = 0; i < list.size(); i++) { System.out.println((i + 1) + "." + list.get(i)); @@ -24,22 +28,33 @@ public static void main(String[] args) { System.out.println(list.get(value - 1).toString()); break; case "todo": + counter++; String name = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); list.add(new ToDos(name)); - System.out.println("added: " + name); + System.out.println("Got it. I have added this task:"); + System.out.println(list.get(counter - 1)); + System.out.println("You now have " + counter + " task(s) in the list!"); break; case "deadline": + counter++; String deadlineName = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); String[] deadlineSplit = deadlineName.split("/by "); list.add(new Deadlines(deadlineSplit[0], deadlineSplit[1])); - System.out.println("added: " + deadlineSplit[0]); + System.out.println("Got it. I have added this task:"); + System.out.println(list.get(counter - 1)); + System.out.println("You now have " + counter + " task(s) in the list!"); break; case "event": + counter++; String event = String.join(" ",Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); String[] eventSplit = event.split("/at "); list.add(new Events(eventSplit[0], eventSplit[1])); - System.out.println("added: " + eventSplit[0]); + System.out.println("Got it. I have added this task:"); + System.out.println(list.get(counter - 1)); + System.out.println("You now have " + counter + " task(s) in the list!"); break; + default: + System.out.println("You have entered invalid commands, please try again!"); } } } while (!input.equals("bye")); diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 657e74f6e7..efe6887092 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,7 +1,15 @@ -Hello from - ____ _ -| _ \ _ _| | _____ -| | | | | | | |/ / _ \ -| |_| | |_| | < __/ -|____/ \__,_|_|\_\___| - +Hello! What can I do for you:> +You have entered invalid commands, please try again! +Got it. I have added this task: +[T] [ ] borrow book +You now have 1 task(s) in the list! +Got it. I have added this task: +[D] [ ] return book (by: Sunday) +You now have 2 task(s) in the list! +Got it. I have added this task: +[E] [ ] project meeting (at: Mon 2-4pm) +You now have 3 task(s) in the list! +1.[T] [ ] borrow book +2.[D] [ ] return book (by: Sunday) +3.[E] [ ] project meeting (at: Mon 2-4pm) +Bye. See you again! \ No newline at end of file diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index e69de29bb2..230e131ffe 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -0,0 +1,6 @@ +hello +todo borrow book +deadline return book /by Sunday +event project meeting /at Mon 2-4pm +list +bye \ No newline at end of file From bf603b1dcb112f9bd6f5db818f07eb75bc46e4e3 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Fri, 22 Jan 2021 21:36:57 +0800 Subject: [PATCH 10/31] Added error handling capability if the user input is invalid --- src/main/java/Duke.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 4e6182024f..af51ff6417 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -22,12 +22,20 @@ public static void main(String[] args) { String[] inputSplit = input.split(" "); switch (inputSplit[0]){ case "done": + if (inputSplit.length < 2){ + System.out.println("You have entered too little arguments, please include the task number"); + break; + } int value = Integer.valueOf(inputSplit[1]); list.get(value - 1).setDone(); System.out.println("Nice, I have set this task as done!"); System.out.println(list.get(value - 1).toString()); break; case "todo": + if (inputSplit.length < 2){ + System.out.println("You have entered too little arguments, please include the task description"); + break; + } counter++; String name = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); list.add(new ToDos(name)); @@ -36,6 +44,10 @@ public static void main(String[] args) { System.out.println("You now have " + counter + " task(s) in the list!"); break; case "deadline": + if (inputSplit.length < 2){ + System.out.println("You have entered too little arguments, please include the task description"); + break; + } counter++; String deadlineName = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); String[] deadlineSplit = deadlineName.split("/by "); @@ -45,6 +57,10 @@ public static void main(String[] args) { System.out.println("You now have " + counter + " task(s) in the list!"); break; case "event": + if (inputSplit.length < 2){ + System.out.println("You have entered too little arguments, please include the task description"); + break; + } counter++; String event = String.join(" ",Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); String[] eventSplit = event.split("/at "); From 20cc0993487ec6990def8ab2ff0bf59d0a2639c3 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Fri, 22 Jan 2021 21:40:16 +0800 Subject: [PATCH 11/31] Add support for deleting tasks from the list. --- src/main/java/Duke.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index af51ff6417..bf06c3c273 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -31,6 +31,19 @@ public static void main(String[] args) { System.out.println("Nice, I have set this task as done!"); System.out.println(list.get(value - 1).toString()); break; + case "delete": + if (inputSplit.length < 2){ + System.out.println("You have entered too little arguments, please include the task number"); + break; + } + counter--; + int valueToDelete = Integer.valueOf(inputSplit[1]); + Task task = list.get(valueToDelete - 1); + list.remove(valueToDelete - 1); + System.out.println("Noted. I have deleted this task:"); + System.out.println(task.toString()); + System.out.println("You now have " + counter + " task(s) in the list!"); + break; case "todo": if (inputSplit.length < 2){ System.out.println("You have entered too little arguments, please include the task description"); From c2bb7179601358e052cebb3b63d06230321c013c Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Fri, 29 Jan 2021 22:21:31 +0800 Subject: [PATCH 12/31] - Add ability to save the tasks in the hard disk automatically whenever the task list changes - Add ability to load the data from the hard disk when Duke starts up --- src/main/java/Deadlines.java | 6 +-- src/main/java/Duke.java | 75 +++++++++++++++++++++++++++++------- src/main/java/Events.java | 6 +-- src/main/java/Task.java | 18 ++++++--- src/main/java/ToDos.java | 4 +- 5 files changed, 83 insertions(+), 26 deletions(-) diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java index fc4dea383b..a210871f8d 100644 --- a/src/main/java/Deadlines.java +++ b/src/main/java/Deadlines.java @@ -1,15 +1,15 @@ public class Deadlines extends Task { String deadLine; - public Deadlines(String eventName, String deadLine) { + public Deadlines(boolean isDone, String eventName, String deadLine) { - super(false, eventName); + super(isDone, eventName, "D"); this.deadLine = deadLine; } @Override public String toString() { - return "[D] " + super.toString() + "(by: " + deadLine + ")"; + return "[D] " + super.toString() + " (by: " + deadLine + ")"; } } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index bf06c3c273..b22953d23a 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,19 +1,51 @@ import java.util.Scanner; import java.util.ArrayList; import java.util.Arrays; -import java.util.List; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; + public class Duke { public static void main(String[] args) { int counter = 0; ArrayList list = new ArrayList<>(); + + File tasks = new File("./data/duke.txt"); + try { + if (tasks.exists()) { + Scanner sc1 = new Scanner(tasks); + String data; + while (sc1.hasNextLine()) { + data = sc1.nextLine(); + String[] dataSplit = data.split(" \\| "); + switch (dataSplit[0]) { + case "T": + list.add(new ToDos(Boolean.parseBoolean(dataSplit[1]), dataSplit[2])); + break; + case "D": + list.add(new Deadlines(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3])); + break; + case "E": + list.add(new Events(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3])); + } + counter++; + } + sc1.close(); + } else { + File directory = new File("./data"); + if (!directory.exists()) { + directory.mkdir(); + } + tasks.createNewFile(); + } + } catch (IOException e) { + System.out.println("An error has occurred while reading duke.txt"); + } + Scanner sc = new Scanner (System.in); System.out.println("Hello! What can I do for you:>"); - String input; - do { - input = sc.nextLine(); - if (input.equals("bye")){ - break; - } + String input = sc.nextLine(); + while (!input.equals("bye")) { if (input.equals("list")) { for (int i = 0; i < list.size(); i++) { System.out.println((i + 1) + "." + list.get(i)); @@ -51,7 +83,7 @@ public static void main(String[] args) { } counter++; String name = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); - list.add(new ToDos(name)); + list.add(new ToDos(false, name)); System.out.println("Got it. I have added this task:"); System.out.println(list.get(counter - 1)); System.out.println("You now have " + counter + " task(s) in the list!"); @@ -63,8 +95,8 @@ public static void main(String[] args) { } counter++; String deadlineName = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); - String[] deadlineSplit = deadlineName.split("/by "); - list.add(new Deadlines(deadlineSplit[0], deadlineSplit[1])); + String[] deadlineSplit = deadlineName.split(" /by "); + list.add(new Deadlines(false, deadlineSplit[0], deadlineSplit[1])); System.out.println("Got it. I have added this task:"); System.out.println(list.get(counter - 1)); System.out.println("You now have " + counter + " task(s) in the list!"); @@ -76,8 +108,8 @@ public static void main(String[] args) { } counter++; String event = String.join(" ",Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); - String[] eventSplit = event.split("/at "); - list.add(new Events(eventSplit[0], eventSplit[1])); + String[] eventSplit = event.split(" /at "); + list.add(new Events(false, eventSplit[0], eventSplit[1])); System.out.println("Got it. I have added this task:"); System.out.println(list.get(counter - 1)); System.out.println("You now have " + counter + " task(s) in the list!"); @@ -86,7 +118,24 @@ public static void main(String[] args) { System.out.println("You have entered invalid commands, please try again!"); } } - } while (!input.equals("bye")); + input = sc.nextLine(); + } + + try { + FileWriter writer = new FileWriter("./data/duke.txt", false); + for (Task task : list) { + writer.write(task.eventType + " | " + task.isDone + " | " + task.eventName); + if (task instanceof Deadlines) { + writer.write(" | " + ((Deadlines) task).deadLine); + } else if (task instanceof Events) { + writer.write(" | " + ((Events) task).time); + } + writer.write(System.lineSeparator()); + } + writer.close(); + } catch (IOException e) { + System.out.println("Error occurred while writer to file."); + } System.out.println("Bye. See you again!"); } diff --git a/src/main/java/Events.java b/src/main/java/Events.java index dcd950ec76..939dc5329d 100644 --- a/src/main/java/Events.java +++ b/src/main/java/Events.java @@ -1,15 +1,15 @@ public class Events extends Task { String time; - public Events(String eventName, String time) { + public Events(boolean isDone, String eventName, String time) { - super(false, eventName); + super(isDone, eventName, "E"); this.time = time; } @Override public String toString() { - return "[E] " + super.toString() + "(at: " + time + ")"; + return "[E] " + super.toString() + " (at: " + time + ")"; } } diff --git a/src/main/java/Task.java b/src/main/java/Task.java index cbc2a91c47..7732335d77 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,18 +1,26 @@ public class Task { - public boolean done = false; - public String eventName = ""; + public boolean isDone; + public String eventName; + public String eventType; public Task(boolean done, String eventName) { - this.done = done; + this.isDone = done; this.eventName = eventName; + this.eventType = "T"; + } + + public Task(boolean done, String eventName, String eventType) { + this.isDone = done; + this.eventName = eventName; + this.eventType = eventType; } public void setDone() { - this.done = true; + this.isDone = true; } @Override public String toString() { - if (this.done == true) { + if (this.isDone == true) { return "[X] " + eventName; } else { return "[ ] " + eventName; diff --git a/src/main/java/ToDos.java b/src/main/java/ToDos.java index b02f2dd49d..36e6060a0a 100644 --- a/src/main/java/ToDos.java +++ b/src/main/java/ToDos.java @@ -1,7 +1,7 @@ public class ToDos extends Task { - public ToDos(String eventName) { - super(false, eventName); + public ToDos(boolean isDone, String eventName) { + super(isDone, eventName, "T"); } @Override From 5fb34bd15e26643714a16f8017a17691730d1718 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Sat, 30 Jan 2021 00:34:24 +0800 Subject: [PATCH 13/31] - Add ability to recognise date as LocalDate instead of just string - Add print statement if the list is empty --- src/main/java/Deadlines.java | 10 ++++++---- src/main/java/Duke.java | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java index fc4dea383b..a489c665c5 100644 --- a/src/main/java/Deadlines.java +++ b/src/main/java/Deadlines.java @@ -1,15 +1,17 @@ +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + public class Deadlines extends Task { - String deadLine; + LocalDate deadLine; public Deadlines(String eventName, String deadLine) { - super(false, eventName); - this.deadLine = deadLine; + this.deadLine = LocalDate.parse(deadLine); } @Override public String toString() { - return "[D] " + super.toString() + "(by: " + deadLine + ")"; + return "[D] " + super.toString() + "(by: " + deadLine.format(DateTimeFormatter.ofPattern("MMM d yyyy")) + ")"; } } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index bf06c3c273..cf0672c5b4 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -15,6 +15,9 @@ public static void main(String[] args) { break; } if (input.equals("list")) { + if (list.size() == 0) { + System.out.println("You have no tasks in the list!"); + } for (int i = 0; i < list.size(); i++) { System.out.println((i + 1) + "." + list.get(i)); } From e7d46e50c628d6a773b36fe65ab85bd7fef9ffb5 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Sat, 30 Jan 2021 00:49:18 +0800 Subject: [PATCH 14/31] Resolve conflict between branch-Level-7 and branch-Level-8 --- src/main/java/Deadlines.java | 4 ++-- src/main/java/Duke.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java index a489c665c5..6a82e72645 100644 --- a/src/main/java/Deadlines.java +++ b/src/main/java/Deadlines.java @@ -4,8 +4,8 @@ public class Deadlines extends Task { LocalDate deadLine; - public Deadlines(String eventName, String deadLine) { - super(false, eventName); + public Deadlines(boolean isDone, String eventName, String deadLine) { + super(isDone, eventName); this.deadLine = LocalDate.parse(deadLine); } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index cf0672c5b4..9653667f77 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -67,7 +67,7 @@ public static void main(String[] args) { counter++; String deadlineName = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); String[] deadlineSplit = deadlineName.split("/by "); - list.add(new Deadlines(deadlineSplit[0], deadlineSplit[1])); + list.add(new Deadlines(false, deadlineSplit[0], deadlineSplit[1])); System.out.println("Got it. I have added this task:"); System.out.println(list.get(counter - 1)); System.out.println("You now have " + counter + " task(s) in the list!"); From 21cb4aebec9a82d5c30e6bc7b05052fdc9653e24 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Thu, 11 Feb 2021 21:26:47 +0800 Subject: [PATCH 15/31] Refactor the code to push the design to more OOP approach --- src/main/java/Duke.java | 164 +++++++------------------------ src/main/java/DukeException.java | 9 ++ src/main/java/Parser.java | 59 +++++++++++ src/main/java/Storage.java | 66 +++++++++++++ src/main/java/TaskList.java | 36 +++++++ src/main/java/Ui.java | 67 +++++++++++++ 6 files changed, 271 insertions(+), 130 deletions(-) create mode 100644 src/main/java/DukeException.java create mode 100644 src/main/java/Parser.java create mode 100644 src/main/java/Storage.java create mode 100644 src/main/java/TaskList.java create mode 100644 src/main/java/Ui.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index fb86ec4521..ef047cc52d 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,145 +1,49 @@ -import java.util.Scanner; -import java.util.ArrayList; -import java.util.Arrays; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; public class Duke { + private Storage storage; + private TaskList taskList; + private Ui ui; + public static void main(String[] args) { - int counter = 0; - ArrayList list = new ArrayList<>(); + new Duke("data/tasks.txt").run(); + } - File tasks = new File("./data/duke.txt"); + public Duke(String filePath) { + ui = new Ui(); + storage = new Storage(filePath); try { - if (tasks.exists()) { - Scanner sc1 = new Scanner(tasks); - String data; - while (sc1.hasNextLine()) { - data = sc1.nextLine(); - String[] dataSplit = data.split(" \\| "); - switch (dataSplit[0]) { - case "T": - list.add(new ToDos(Boolean.parseBoolean(dataSplit[1]), dataSplit[2])); - break; - case "D": - list.add(new Deadlines(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3])); - break; - case "E": - list.add(new Events(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3])); - } - counter++; - } - sc1.close(); - } else { - File directory = new File("./data"); - if (!directory.exists()) { - directory.mkdir(); - } - tasks.createNewFile(); - } - } catch (IOException e) { - System.out.println("An error has occurred while reading duke.txt"); + taskList = new TaskList(storage.load()); + } catch (DukeException e) { + ui.showLoadingError(); + taskList = new TaskList(); } + } - Scanner sc = new Scanner (System.in); - System.out.println("Hello! What can I do for you:>"); - String input = sc.nextLine(); - while (!input.equals("bye")) { - if (input.equals("list")) { - if (list.size() == 0) { - System.out.println("You have no tasks in the list!"); - } - for (int i = 0; i < list.size(); i++) { - System.out.println((i + 1) + "." + list.get(i)); - } - } else { - String[] inputSplit = input.split(" "); - switch (inputSplit[0]){ - case "done": - if (inputSplit.length < 2){ - System.out.println("You have entered too little arguments, please include the task number"); - break; - } - int value = Integer.valueOf(inputSplit[1]); - list.get(value - 1).setDone(); - System.out.println("Nice, I have set this task as done!"); - System.out.println(list.get(value - 1).toString()); - break; - case "delete": - if (inputSplit.length < 2){ - System.out.println("You have entered too little arguments, please include the task number"); - break; - } - counter--; - int valueToDelete = Integer.valueOf(inputSplit[1]); - Task task = list.get(valueToDelete - 1); - list.remove(valueToDelete - 1); - System.out.println("Noted. I have deleted this task:"); - System.out.println(task.toString()); - System.out.println("You now have " + counter + " task(s) in the list!"); - break; - case "todo": - if (inputSplit.length < 2){ - System.out.println("You have entered too little arguments, please include the task description"); - break; - } - counter++; - String name = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); - list.add(new ToDos(false, name)); - System.out.println("Got it. I have added this task:"); - System.out.println(list.get(counter - 1)); - System.out.println("You now have " + counter + " task(s) in the list!"); - break; - case "deadline": - if (inputSplit.length < 2){ - System.out.println("You have entered too little arguments, please include the task description"); - break; - } - counter++; - String deadlineName = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); - String[] deadlineSplit = deadlineName.split(" /by "); - list.add(new Deadlines(false, deadlineSplit[0], deadlineSplit[1])); - System.out.println("Got it. I have added this task:"); - System.out.println(list.get(counter - 1)); - System.out.println("You now have " + counter + " task(s) in the list!"); - break; - case "event": - if (inputSplit.length < 2){ - System.out.println("You have entered too little arguments, please include the task description"); - break; - } - counter++; - String event = String.join(" ",Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); - String[] eventSplit = event.split(" /at "); - list.add(new Events(false, eventSplit[0], eventSplit[1])); - System.out.println("Got it. I have added this task:"); - System.out.println(list.get(counter - 1)); - System.out.println("You now have " + counter + " task(s) in the list!"); - break; - default: - System.out.println("You have entered invalid commands, please try again!"); + public void run() { + ui.greet(); + String input = ui.getInput(); + try { + while (!input.equals("bye")) { + if (input.equals("list")) { + if (taskList.getSize() == 0) { + ui.printEmptyList(); + } else { + ui.printList(); + } + } else { + taskList = Parser.parseInput(input, taskList); } + input = ui.getInput(); } - input = sc.nextLine(); + ui.end(); + } catch (DukeException e) { + ui.showError(e); } try { - FileWriter writer = new FileWriter("./data/duke.txt", false); - for (Task task : list) { - writer.write(task.eventType + " | " + task.isDone + " | " + task.eventName); - if (task instanceof Deadlines) { - writer.write(" | " + ((Deadlines) task).deadLine); - } else if (task instanceof Events) { - writer.write(" | " + ((Events) task).time); - } - writer.write(System.lineSeparator()); - } - writer.close(); - } catch (IOException e) { - System.out.println("Error occurred while writer to file."); + storage.writeToFile(taskList, "./data/duke.txt"); + } catch (DukeException e) { + ui.showWritingError(); } - - System.out.println("Bye. See you again!"); } } \ No newline at end of file diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java new file mode 100644 index 0000000000..f066c57ec6 --- /dev/null +++ b/src/main/java/DukeException.java @@ -0,0 +1,9 @@ + +public class DukeException extends Exception { + public DukeException(String message) { + super(message); + } + public DukeException() { + super(); + } +} diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java new file mode 100644 index 0000000000..d591cb1514 --- /dev/null +++ b/src/main/java/Parser.java @@ -0,0 +1,59 @@ +import java.util.Arrays; + +public class Parser { + private static Ui ui = new Ui(); + + public static Task parseFile(String data) throws DukeException { + String[] dataSplit = data.split(" \\| "); + switch (dataSplit[0]) { + case "T": + return new ToDos(Boolean.parseBoolean(dataSplit[1]), dataSplit[2]); + case "D": + return new Deadlines(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3]); + case "E": + return new Events(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3]); + default: + throw new DukeException("Error while reading file"); + } + } + + public static TaskList parseInput(String input, TaskList tasks) throws DukeException { + String[] inputSplit = input.split(" "); + if (inputSplit.length < 2){ + throw new DukeException("You have entered too little arguments!"); + } + Task task; + switch (inputSplit[0]){ + case "done": + ui.printSetDone(tasks.setDone(Integer.valueOf(inputSplit[1]) - 1)); + break; + case "delete": + task = tasks.deleteTask(Integer.valueOf(inputSplit[1]) - 1); + ui.printDeleteTask(task); + break; + case "todo": + String name = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); + task = new ToDos(false, name); + tasks.addTask(task); + ui.printAddTask(task); + break; + case "deadline": + String deadlineName = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); + String[] deadlineSplit = deadlineName.split(" /by "); + task = new Deadlines(false, deadlineSplit[0], deadlineSplit[1]); + tasks.addTask(task); + ui.printAddTask(task); + break; + case "event": + String event = String.join(" ",Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); + String[] eventSplit = event.split(" /at "); + task = new Events(false, eventSplit[0], eventSplit[1]); + tasks.addTask(task); + ui.printAddTask(task); + break; + default: + throw new DukeException("You have entered invalid commands, please try again!"); + } + return tasks; + } +} diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java new file mode 100644 index 0000000000..b66f1ffa62 --- /dev/null +++ b/src/main/java/Storage.java @@ -0,0 +1,66 @@ +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Scanner; + +public class Storage { + private String filePath; + private Ui ui = new Ui(); + + public Storage(String filePath) { + this.filePath = filePath; + } + + public ArrayList load() throws DukeException { + ArrayList list = new ArrayList<>(); + File tasks = new File(filePath); + try { + if (tasks.exists()) { + Scanner sc1 = new Scanner(tasks); + String data; + while (sc1.hasNextLine()) { + data = sc1.nextLine(); + list.add(Parser.parseFile(data)); + } + sc1.close(); + } else { + File directory = new File("./data"); + if (!directory.exists()) { + directory.mkdir(); + } + tasks.createNewFile(); + } + } catch (FileNotFoundException e){ + throw new DukeException("File not found."); + } catch (IOException e) { + throw new DukeException("Error occurred when creating file."); + } catch (DukeException e) { + throw e; + } + return list; + } + + public void writeToFile(TaskList tasks, String filePath) throws DukeException { + try { + FileWriter writer = new FileWriter(filePath, false); + int size = tasks.getSize(); + Task task; + + for (int i = 0; i < size; i++) { + task = tasks.getTask(i); + writer.write(task.eventType + " | " + task.isDone + " | " + task.eventName); + if (task instanceof Deadlines) { + writer.write(" | " + ((Deadlines) task).deadLine); + } else if (task instanceof Events) { + writer.write(" | " + ((Events) task).time); + } + writer.write(System.lineSeparator()); + } + writer.close(); + } catch (IOException e) { + throw new DukeException(); + } + } +} diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java new file mode 100644 index 0000000000..349824cd24 --- /dev/null +++ b/src/main/java/TaskList.java @@ -0,0 +1,36 @@ +import java.util.ArrayList; +public class TaskList { + private ArrayList tasks; + + TaskList(ArrayList tasks) { + this.tasks = tasks; + } + + TaskList() { + this.tasks = new ArrayList<>(); + } + + public void addTask(Task task) { + tasks.add(task); + } + + public Task getTask(int index) { + return tasks.get(index); + } + + + public Task deleteTask(int index) { + Task task = tasks.get(index); + tasks.remove(index); + return task; + } + + public Task setDone(int index) { + tasks.get(index).setDone(); + return tasks.get(index); + } + + public int getSize() { + return tasks.size(); + } +} diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java new file mode 100644 index 0000000000..c4f87068aa --- /dev/null +++ b/src/main/java/Ui.java @@ -0,0 +1,67 @@ +import java.util.Scanner; + +public class Ui { + Scanner sc; + + public Ui() { + this.sc = new Scanner(System.in); + } + + public void greet() { + System.out.println("Hello! What can I do for you:>"); + } + + public void end() { + this.sc.close(); + System.out.println("Bye. See you again!"); + } + + public void printSetDone(Task task) { + System.out.println("Nice, I have set this task as done!"); + printTask(task); + } + + public void printDeleteTask(Task task) { + System.out.println("Noted. I have deleted this task:"); + printTask(task); + } + + public void printAddTask(Task task) { + System.out.println("Got it. I have added this task:"); + printTask(task); + } + + public void printTask(Task task) { + System.out.println(task.toString()); + } + + + public void printList() { + + } + + public void printEmptyList() { + System.out.println("You have no tasks in the list!"); + } + + public String getInput() { + while (sc.hasNextLine()) { + return sc.nextLine(); + } + + return "null"; + } + + public void showLoadingError() { + System.out.println("An error has occurred while reading duke.txt"); + } + + public void showWritingError() { + System.out.println("Error occurred while writer to file."); + } + + public void showError(Exception e) { + System.out.println(e.getMessage()); + } + +} From 5426211ce52b32bf65a35b930d76fa5684c61362 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Thu, 11 Feb 2021 21:57:30 +0800 Subject: [PATCH 16/31] Debug --- src/main/java/Duke.java | 24 ++++++++++-------------- src/main/java/Parser.java | 7 ++++--- src/main/java/Ui.java | 12 ++++++++++-- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index ef047cc52d..412d10cadd 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -15,30 +15,26 @@ public Duke(String filePath) { taskList = new TaskList(storage.load()); } catch (DukeException e) { ui.showLoadingError(); - taskList = new TaskList(); + ui.showError(e); } } public void run() { ui.greet(); String input = ui.getInput(); - try { - while (!input.equals("bye")) { - if (input.equals("list")) { - if (taskList.getSize() == 0) { - ui.printEmptyList(); - } else { - ui.printList(); - } + while (!input.equals("bye")) { + if (input.equals("list")) { + if (taskList.getSize() == 0) { + ui.printEmptyList(); } else { - taskList = Parser.parseInput(input, taskList); + ui.printList(taskList); } - input = ui.getInput(); + } else { + taskList = Parser.parseInput(input, taskList); } - ui.end(); - } catch (DukeException e) { - ui.showError(e); + input = ui.getInput(); } + ui.end(); try { storage.writeToFile(taskList, "./data/duke.txt"); diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index d591cb1514..857184828f 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -17,10 +17,11 @@ public static Task parseFile(String data) throws DukeException { } } - public static TaskList parseInput(String input, TaskList tasks) throws DukeException { + public static TaskList parseInput(String input, TaskList tasks) { String[] inputSplit = input.split(" "); if (inputSplit.length < 2){ - throw new DukeException("You have entered too little arguments!"); + ui.showInvalidCommandError(); + return tasks; } Task task; switch (inputSplit[0]){ @@ -52,7 +53,7 @@ public static TaskList parseInput(String input, TaskList tasks) throws DukeExcep ui.printAddTask(task); break; default: - throw new DukeException("You have entered invalid commands, please try again!"); + ui.showInvalidCommandError(); } return tasks; } diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index c4f87068aa..6a2bbbaa33 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -36,8 +36,12 @@ public void printTask(Task task) { } - public void printList() { + public void printList(TaskList tasks) { + int size = tasks.getSize(); + for (int i = 0; i < size; i++) { + printTask(tasks.getTask(i)); + } } public void printEmptyList() { @@ -57,7 +61,11 @@ public void showLoadingError() { } public void showWritingError() { - System.out.println("Error occurred while writer to file."); + System.out.println("Error occurred while writing to file."); + } + + public void showInvalidCommandError() { + System.out.println("You have entered invalid commands, please try again!"); } public void showError(Exception e) { From 665108edcb5154867637354f069d771f7154180b Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Thu, 11 Feb 2021 23:29:59 +0800 Subject: [PATCH 17/31] Consolidate file into duke package --- src/main/java/Parser.java | 60 -------------------- src/main/java/{ => duke}/Deadlines.java | 4 +- src/main/java/{ => duke}/Duke.java | 1 + src/main/java/{ => duke}/DukeException.java | 1 + src/main/java/{ => duke}/Events.java | 2 + src/main/java/duke/Parser.java | 62 +++++++++++++++++++++ src/main/java/{ => duke}/Storage.java | 2 + src/main/java/{ => duke}/Task.java | 2 + src/main/java/{ => duke}/TaskList.java | 2 + src/main/java/{ => duke}/ToDos.java | 2 + src/main/java/{ => duke}/Ui.java | 2 + 11 files changed, 79 insertions(+), 61 deletions(-) delete mode 100644 src/main/java/Parser.java rename src/main/java/{ => duke}/Deadlines.java (90%) rename src/main/java/{ => duke}/Duke.java (98%) rename src/main/java/{ => duke}/DukeException.java (92%) rename src/main/java/{ => duke}/Events.java (95%) create mode 100644 src/main/java/duke/Parser.java rename src/main/java/{ => duke}/Storage.java (99%) rename src/main/java/{ => duke}/Task.java (97%) rename src/main/java/{ => duke}/TaskList.java (97%) rename src/main/java/{ => duke}/ToDos.java (93%) rename src/main/java/{ => duke}/Ui.java (99%) diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java deleted file mode 100644 index 857184828f..0000000000 --- a/src/main/java/Parser.java +++ /dev/null @@ -1,60 +0,0 @@ -import java.util.Arrays; - -public class Parser { - private static Ui ui = new Ui(); - - public static Task parseFile(String data) throws DukeException { - String[] dataSplit = data.split(" \\| "); - switch (dataSplit[0]) { - case "T": - return new ToDos(Boolean.parseBoolean(dataSplit[1]), dataSplit[2]); - case "D": - return new Deadlines(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3]); - case "E": - return new Events(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3]); - default: - throw new DukeException("Error while reading file"); - } - } - - public static TaskList parseInput(String input, TaskList tasks) { - String[] inputSplit = input.split(" "); - if (inputSplit.length < 2){ - ui.showInvalidCommandError(); - return tasks; - } - Task task; - switch (inputSplit[0]){ - case "done": - ui.printSetDone(tasks.setDone(Integer.valueOf(inputSplit[1]) - 1)); - break; - case "delete": - task = tasks.deleteTask(Integer.valueOf(inputSplit[1]) - 1); - ui.printDeleteTask(task); - break; - case "todo": - String name = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); - task = new ToDos(false, name); - tasks.addTask(task); - ui.printAddTask(task); - break; - case "deadline": - String deadlineName = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); - String[] deadlineSplit = deadlineName.split(" /by "); - task = new Deadlines(false, deadlineSplit[0], deadlineSplit[1]); - tasks.addTask(task); - ui.printAddTask(task); - break; - case "event": - String event = String.join(" ",Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); - String[] eventSplit = event.split(" /at "); - task = new Events(false, eventSplit[0], eventSplit[1]); - tasks.addTask(task); - ui.printAddTask(task); - break; - default: - ui.showInvalidCommandError(); - } - return tasks; - } -} diff --git a/src/main/java/Deadlines.java b/src/main/java/duke/Deadlines.java similarity index 90% rename from src/main/java/Deadlines.java rename to src/main/java/duke/Deadlines.java index b662ed5ebe..e71e96f0f6 100644 --- a/src/main/java/Deadlines.java +++ b/src/main/java/duke/Deadlines.java @@ -1,8 +1,10 @@ +package duke; + import java.time.LocalDate; import java.time.format.DateTimeFormatter; public class Deadlines extends Task { - LocalDate deadLine; + protected LocalDate deadLine; public Deadlines(boolean isDone, String eventName, String deadLine) { super(isDone, eventName, "D"); diff --git a/src/main/java/Duke.java b/src/main/java/duke/Duke.java similarity index 98% rename from src/main/java/Duke.java rename to src/main/java/duke/Duke.java index 412d10cadd..9f818d302e 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/duke/Duke.java @@ -1,3 +1,4 @@ +package duke; public class Duke { private Storage storage; diff --git a/src/main/java/DukeException.java b/src/main/java/duke/DukeException.java similarity index 92% rename from src/main/java/DukeException.java rename to src/main/java/duke/DukeException.java index f066c57ec6..45455d0576 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/duke/DukeException.java @@ -1,3 +1,4 @@ +package duke; public class DukeException extends Exception { public DukeException(String message) { diff --git a/src/main/java/Events.java b/src/main/java/duke/Events.java similarity index 95% rename from src/main/java/Events.java rename to src/main/java/duke/Events.java index 939dc5329d..8003f010b5 100644 --- a/src/main/java/Events.java +++ b/src/main/java/duke/Events.java @@ -1,3 +1,5 @@ +package duke; + public class Events extends Task { String time; diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java new file mode 100644 index 0000000000..bc3ec7e12c --- /dev/null +++ b/src/main/java/duke/Parser.java @@ -0,0 +1,62 @@ +package duke; + +import java.util.Arrays; + +public class Parser { + private static Ui ui = new Ui(); + + public static Task parseFile(String data) throws DukeException { + String[] dataSplit = data.split(" \\| "); + switch (dataSplit[0]) { + case "T": + return new ToDos(Boolean.parseBoolean(dataSplit[1]), dataSplit[2]); + case "D": + return new Deadlines(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3]); + case "E": + return new Events(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3]); + default: + throw new DukeException("Error while reading file"); + } + } + + public static TaskList parseInput(String input, TaskList tasks) { + String[] inputSplit = input.split(" "); + if (inputSplit.length < 2) { + ui.showInvalidCommandError(); + return tasks; + } + Task task; + switch (inputSplit[0]) { + case "done": + ui.printSetDone(tasks.setDone(Integer.valueOf(inputSplit[1]) - 1)); + break; + case "delete": + task = tasks.deleteTask(Integer.valueOf(inputSplit[1]) - 1); + ui.printDeleteTask(task); + break; + case "todo": + String name = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); + task = new ToDos(false, name); + tasks.addTask(task); + ui.printAddTask(task); + break; + case "deadline": + String deadlineName = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); + String[] deadlineSplit = deadlineName.split(" /by "); + task = new Deadlines(false, deadlineSplit[0], deadlineSplit[1]); + tasks.addTask(task); + ui.printAddTask(task); + break; + case "event": + String event = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); + String[] eventSplit = event.split(" /at "); + task = new Events(false, eventSplit[0], eventSplit[1]); + tasks.addTask(task); + ui.printAddTask(task); + break; + default: + ui.showInvalidCommandError(); + } + return tasks; + } +} diff --git a/src/main/java/Storage.java b/src/main/java/duke/Storage.java similarity index 99% rename from src/main/java/Storage.java rename to src/main/java/duke/Storage.java index b66f1ffa62..e95d0defe6 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/duke/Storage.java @@ -1,3 +1,5 @@ +package duke; + import java.io.File; import java.io.FileNotFoundException; import java.io.FileWriter; diff --git a/src/main/java/Task.java b/src/main/java/duke/Task.java similarity index 97% rename from src/main/java/Task.java rename to src/main/java/duke/Task.java index 7732335d77..287e67d037 100644 --- a/src/main/java/Task.java +++ b/src/main/java/duke/Task.java @@ -1,3 +1,5 @@ +package duke; + public class Task { public boolean isDone; public String eventName; diff --git a/src/main/java/TaskList.java b/src/main/java/duke/TaskList.java similarity index 97% rename from src/main/java/TaskList.java rename to src/main/java/duke/TaskList.java index 349824cd24..efe1d264d2 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -1,3 +1,5 @@ +package duke; + import java.util.ArrayList; public class TaskList { private ArrayList tasks; diff --git a/src/main/java/ToDos.java b/src/main/java/duke/ToDos.java similarity index 93% rename from src/main/java/ToDos.java rename to src/main/java/duke/ToDos.java index 36e6060a0a..f900f9c407 100644 --- a/src/main/java/ToDos.java +++ b/src/main/java/duke/ToDos.java @@ -1,3 +1,5 @@ +package duke; + public class ToDos extends Task { public ToDos(boolean isDone, String eventName) { diff --git a/src/main/java/Ui.java b/src/main/java/duke/Ui.java similarity index 99% rename from src/main/java/Ui.java rename to src/main/java/duke/Ui.java index 6a2bbbaa33..aa78de9b65 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/duke/Ui.java @@ -1,3 +1,5 @@ +package duke; + import java.util.Scanner; public class Ui { From c575129b7b32ebd4422cca3320ebaf30cc58d959 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Tue, 16 Feb 2021 16:03:02 +0800 Subject: [PATCH 18/31] Add JUnit Test --- src/main/java/duke/Task.java | 6 ------ src/main/java/duke/TaskList.java | 4 ---- src/test/java/duke/DukeTest.java | 12 ++++++++++++ src/test/java/duke/ToDosTest.java | 12 ++++++++++++ 4 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 src/test/java/duke/DukeTest.java create mode 100644 src/test/java/duke/ToDosTest.java diff --git a/src/main/java/duke/Task.java b/src/main/java/duke/Task.java index 287e67d037..10f92612cd 100644 --- a/src/main/java/duke/Task.java +++ b/src/main/java/duke/Task.java @@ -5,12 +5,6 @@ public class Task { public String eventName; public String eventType; - public Task(boolean done, String eventName) { - this.isDone = done; - this.eventName = eventName; - this.eventType = "T"; - } - public Task(boolean done, String eventName, String eventType) { this.isDone = done; this.eventName = eventName; diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java index efe1d264d2..0bfaebbf88 100644 --- a/src/main/java/duke/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -8,10 +8,6 @@ public class TaskList { this.tasks = tasks; } - TaskList() { - this.tasks = new ArrayList<>(); - } - public void addTask(Task task) { tasks.add(task); } diff --git a/src/test/java/duke/DukeTest.java b/src/test/java/duke/DukeTest.java new file mode 100644 index 0000000000..cb907ae4a8 --- /dev/null +++ b/src/test/java/duke/DukeTest.java @@ -0,0 +1,12 @@ +package duke; + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; + +public class DukeTest { + + @Test + public void dukeConstructor() { + assertDoesNotThrow(() -> new Duke("./data/duke.txt") ); + } +} diff --git a/src/test/java/duke/ToDosTest.java b/src/test/java/duke/ToDosTest.java new file mode 100644 index 0000000000..d3f81e6168 --- /dev/null +++ b/src/test/java/duke/ToDosTest.java @@ -0,0 +1,12 @@ +package duke; + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class ToDosTest { + @Test + public void createTodos(){ + Task test = new ToDos(false, "test"); + assertEquals("[T] [ ] test", test.toString()); + } +} From 0b4293ca7a93fa44c5e51f0a72cd7d395dbb6f37 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Tue, 16 Feb 2021 17:37:32 +0800 Subject: [PATCH 19/31] Add Java Doc --- src/main/java/META-INF/MANIFEST.MF | 3 ++ src/main/java/duke/Deadlines.java | 7 ++++ src/main/java/duke/Duke.java | 6 ++++ src/main/java/duke/DukeException.java | 5 +++ src/main/java/duke/Events.java | 7 ++++ src/main/java/duke/Parser.java | 12 +++++++ src/main/java/duke/Storage.java | 11 +++++++ src/main/java/duke/Task.java | 4 +++ src/main/java/duke/TaskList.java | 29 +++++++++++++++-- src/main/java/duke/Ui.java | 47 ++++++++++++++++++++++++++- 10 files changed, 128 insertions(+), 3 deletions(-) create mode 100644 src/main/java/META-INF/MANIFEST.MF diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..6e864153e8 --- /dev/null +++ b/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: duke.Duke + diff --git a/src/main/java/duke/Deadlines.java b/src/main/java/duke/Deadlines.java index e71e96f0f6..b25a8dd87d 100644 --- a/src/main/java/duke/Deadlines.java +++ b/src/main/java/duke/Deadlines.java @@ -6,6 +6,13 @@ public class Deadlines extends Task { protected LocalDate deadLine; + /** + * This constructor create a Task which is of type Deadlines + * @param isDone whether the task is already completed + * @param eventName description of the event + * @param deadLine the deadline for the task + * @return return the task object + */ public Deadlines(boolean isDone, String eventName, String deadLine) { super(isDone, eventName, "D"); this.deadLine = LocalDate.parse(deadLine); diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index 9f818d302e..ffdb0cf867 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -9,12 +9,18 @@ public static void main(String[] args) { new Duke("data/tasks.txt").run(); } + /** + * This constructor create a duke class after loading the tasks from a given file path + * @param filePath path of the file which stores the list of tasks from last time + * @return a Duke object with all of its variables initialised + */ public Duke(String filePath) { ui = new Ui(); storage = new Storage(filePath); try { taskList = new TaskList(storage.load()); } catch (DukeException e) { + taskList = new TaskList(); ui.showLoadingError(); ui.showError(e); } diff --git a/src/main/java/duke/DukeException.java b/src/main/java/duke/DukeException.java index 45455d0576..56247a759d 100644 --- a/src/main/java/duke/DukeException.java +++ b/src/main/java/duke/DukeException.java @@ -1,6 +1,11 @@ package duke; public class DukeException extends Exception { + /** + * This constructor returns a Duke Exception + * @param message Error Message + * @return a Duke Exception + */ public DukeException(String message) { super(message); } diff --git a/src/main/java/duke/Events.java b/src/main/java/duke/Events.java index 8003f010b5..4b4b998fef 100644 --- a/src/main/java/duke/Events.java +++ b/src/main/java/duke/Events.java @@ -3,6 +3,13 @@ public class Events extends Task { String time; + /** + * This constructor create a Task which is of type Events + * @param isDone whether the task is already completed + * @param eventName description of the event + * @param time the time of which the Event will take place + * @return return the task object + */ public Events(boolean isDone, String eventName, String time) { super(isDone, eventName, "E"); diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index bc3ec7e12c..02abf3bf4e 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -5,6 +5,12 @@ public class Parser { private static Ui ui = new Ui(); + /** + * This function returns a Task object after parsing the data from the file + * @param data line data from the file + * @return Task object of various types, e.g. Deadlines, ToDos, Events + * @throws DukeException + */ public static Task parseFile(String data) throws DukeException { String[] dataSplit = data.split(" \\| "); switch (dataSplit[0]) { @@ -19,6 +25,12 @@ public static Task parseFile(String data) throws DukeException { } } + /** + * This function returns the TaskList object after passing the commands from user + * @param input User input + * @param tasks TaskList object + * @return TaskList after adding the new task from the user input + */ public static TaskList parseInput(String input, TaskList tasks) { String[] inputSplit = input.split(" "); if (inputSplit.length < 2) { diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java index e95d0defe6..d2b3193b62 100644 --- a/src/main/java/duke/Storage.java +++ b/src/main/java/duke/Storage.java @@ -15,6 +15,11 @@ public Storage(String filePath) { this.filePath = filePath; } + /** + * This function loads the tasks from the file which is specified by the file path + * @return an arraylist of Tasks + * @throws DukeException + */ public ArrayList load() throws DukeException { ArrayList list = new ArrayList<>(); File tasks = new File(filePath); @@ -44,6 +49,12 @@ public ArrayList load() throws DukeException { return list; } + /** + * This function writes and save the taskList to a file + * @param tasks TaskList object containing a list of tasks + * @param filePath The path to save the file + * @throws DukeException + */ public void writeToFile(TaskList tasks, String filePath) throws DukeException { try { FileWriter writer = new FileWriter(filePath, false); diff --git a/src/main/java/duke/Task.java b/src/main/java/duke/Task.java index 10f92612cd..61c2f597e8 100644 --- a/src/main/java/duke/Task.java +++ b/src/main/java/duke/Task.java @@ -10,6 +10,10 @@ public Task(boolean done, String eventName, String eventType) { this.eventName = eventName; this.eventType = eventType; } + + /** + * This function sets a task to be done + */ public void setDone() { this.isDone = true; } diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java index 0bfaebbf88..9df63f3954 100644 --- a/src/main/java/duke/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -4,30 +4,55 @@ public class TaskList { private ArrayList tasks; - TaskList(ArrayList tasks) { + public TaskList(ArrayList tasks) { this.tasks = tasks; } + public TaskList() { + this.tasks = new ArrayList<>(); + } + /** + * This function adds a task in the task list + * @param task task to be added + */ public void addTask(Task task) { tasks.add(task); } + /** + * This function returns the task at a specified index + * @param index the index of the task to be returned + * @return Task object in the given position + */ public Task getTask(int index) { return tasks.get(index); } - + /** + * This function deletes the task at a specified index + * @param index the index of the task to be deleted + * @return return the deleted task + */ public Task deleteTask(int index) { Task task = tasks.get(index); tasks.remove(index); return task; } + /** + * This function sets a task in the TaskList to be done + * @param index index of the task to be set done + * @return return the task after setting it to be done + */ public Task setDone(int index) { tasks.get(index).setDone(); return tasks.get(index); } + /** + * This function returns the number of tasks in the list + * @return the size of the task list + */ public int getSize() { return tasks.size(); } diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java index aa78de9b65..78c777cb01 100644 --- a/src/main/java/duke/Ui.java +++ b/src/main/java/duke/Ui.java @@ -9,35 +9,60 @@ public Ui() { this.sc = new Scanner(System.in); } + /** + * This function prints the greeting message to the console + */ public void greet() { System.out.println("Hello! What can I do for you:>"); } + /** + * This function prints the goodbye message to the console + */ public void end() { this.sc.close(); System.out.println("Bye. See you again!"); } + /** + * This function prints the task which had just been set to be done + * @param task task to be printed + */ public void printSetDone(Task task) { System.out.println("Nice, I have set this task as done!"); printTask(task); } + /** + * This function prints the task which had just been deleted + * @param task task to be printed + */ public void printDeleteTask(Task task) { System.out.println("Noted. I have deleted this task:"); printTask(task); } + /** + * This function prints the task which had just been added to the TaskList + * @param task task to be printed + */ public void printAddTask(Task task) { System.out.println("Got it. I have added this task:"); printTask(task); } + /** + * This function prints a given task + * @param task task to be printed + */ public void printTask(Task task) { System.out.println(task.toString()); } - + /** + * This function prints out the tasks in the TaskList + * @param tasks TaskList to be printed + */ public void printList(TaskList tasks) { int size = tasks.getSize(); @@ -46,10 +71,17 @@ public void printList(TaskList tasks) { } } + /** + * This function prints the message if the TaskList is empty + */ public void printEmptyList() { System.out.println("You have no tasks in the list!"); } + /** + * This function gets one line of input from the user + * @return a string which is the user input + */ public String getInput() { while (sc.hasNextLine()) { return sc.nextLine(); @@ -58,18 +90,31 @@ public String getInput() { return "null"; } + /** + * This function prints the error message when there is a reading error + */ public void showLoadingError() { System.out.println("An error has occurred while reading duke.txt"); } + /** + * This function prints the error message when there is an error writing the final taskList to the file + */ public void showWritingError() { System.out.println("Error occurred while writing to file."); } + /** + * This function prints the error message when the user has entered an invalid command + */ public void showInvalidCommandError() { System.out.println("You have entered invalid commands, please try again!"); } + /** + * This function prints the error message + * @param e which is the exception to be printed + */ public void showError(Exception e) { System.out.println(e.getMessage()); } From 37d77b3fe3fb8d1bd12a10117cb5696eac67fa9b Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Tue, 16 Feb 2021 17:47:52 +0800 Subject: [PATCH 20/31] Tweak the code to comply with a coding standard --- src/main/java/duke/Deadlines.java | 3 ++- src/main/java/duke/Duke.java | 2 ++ src/main/java/duke/DukeException.java | 2 ++ src/main/java/duke/Events.java | 1 - src/main/java/duke/Parser.java | 2 ++ src/main/java/duke/Storage.java | 4 ++++ src/main/java/duke/Task.java | 1 + src/main/java/duke/TaskList.java | 5 +++++ src/main/java/duke/ToDos.java | 1 + src/main/java/duke/Ui.java | 7 +++++++ 10 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/main/java/duke/Deadlines.java b/src/main/java/duke/Deadlines.java index b25a8dd87d..5073272e16 100644 --- a/src/main/java/duke/Deadlines.java +++ b/src/main/java/duke/Deadlines.java @@ -20,6 +20,7 @@ public Deadlines(boolean isDone, String eventName, String deadLine) { @Override public String toString() { - return "[D] " + super.toString() + "(by: " + deadLine.format(DateTimeFormatter.ofPattern("MMM d yyyy")) + ")"; + return "[D] " + super.toString() + "(by: " + + deadLine.format(DateTimeFormatter.ofPattern("MMM d yyyy")) + ")"; } } diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index ffdb0cf867..02b7c4b8e8 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -28,6 +28,7 @@ public Duke(String filePath) { public void run() { ui.greet(); + String input = ui.getInput(); while (!input.equals("bye")) { if (input.equals("list")) { @@ -41,6 +42,7 @@ public void run() { } input = ui.getInput(); } + ui.end(); try { diff --git a/src/main/java/duke/DukeException.java b/src/main/java/duke/DukeException.java index 56247a759d..620605f96b 100644 --- a/src/main/java/duke/DukeException.java +++ b/src/main/java/duke/DukeException.java @@ -7,9 +7,11 @@ public class DukeException extends Exception { * @return a Duke Exception */ public DukeException(String message) { + super(message); } public DukeException() { + super(); } } diff --git a/src/main/java/duke/Events.java b/src/main/java/duke/Events.java index 4b4b998fef..5de4213bae 100644 --- a/src/main/java/duke/Events.java +++ b/src/main/java/duke/Events.java @@ -18,7 +18,6 @@ public Events(boolean isDone, String eventName, String time) { @Override public String toString() { - return "[E] " + super.toString() + " (at: " + time + ")"; } } diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index 02abf3bf4e..b032ff1b6f 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -38,6 +38,7 @@ public static TaskList parseInput(String input, TaskList tasks) { return tasks; } Task task; + switch (inputSplit[0]) { case "done": ui.printSetDone(tasks.setDone(Integer.valueOf(inputSplit[1]) - 1)); @@ -69,6 +70,7 @@ public static TaskList parseInput(String input, TaskList tasks) { default: ui.showInvalidCommandError(); } + return tasks; } } diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java index d2b3193b62..797339da6b 100644 --- a/src/main/java/duke/Storage.java +++ b/src/main/java/duke/Storage.java @@ -12,6 +12,7 @@ public class Storage { private Ui ui = new Ui(); public Storage(String filePath) { + this.filePath = filePath; } @@ -23,6 +24,7 @@ public Storage(String filePath) { public ArrayList load() throws DukeException { ArrayList list = new ArrayList<>(); File tasks = new File(filePath); + try { if (tasks.exists()) { Scanner sc1 = new Scanner(tasks); @@ -46,6 +48,7 @@ public ArrayList load() throws DukeException { } catch (DukeException e) { throw e; } + return list; } @@ -71,6 +74,7 @@ public void writeToFile(TaskList tasks, String filePath) throws DukeException { } writer.write(System.lineSeparator()); } + writer.close(); } catch (IOException e) { throw new DukeException(); diff --git a/src/main/java/duke/Task.java b/src/main/java/duke/Task.java index 61c2f597e8..b8276c4a61 100644 --- a/src/main/java/duke/Task.java +++ b/src/main/java/duke/Task.java @@ -15,6 +15,7 @@ public Task(boolean done, String eventName, String eventType) { * This function sets a task to be done */ public void setDone() { + this.isDone = true; } diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java index 9df63f3954..ecff8d5d47 100644 --- a/src/main/java/duke/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -5,9 +5,11 @@ public class TaskList { private ArrayList tasks; public TaskList(ArrayList tasks) { + this.tasks = tasks; } public TaskList() { + this.tasks = new ArrayList<>(); } @@ -16,6 +18,7 @@ public TaskList() { * @param task task to be added */ public void addTask(Task task) { + tasks.add(task); } @@ -25,6 +28,7 @@ public void addTask(Task task) { * @return Task object in the given position */ public Task getTask(int index) { + return tasks.get(index); } @@ -54,6 +58,7 @@ public Task setDone(int index) { * @return the size of the task list */ public int getSize() { + return tasks.size(); } } diff --git a/src/main/java/duke/ToDos.java b/src/main/java/duke/ToDos.java index f900f9c407..6df4656a01 100644 --- a/src/main/java/duke/ToDos.java +++ b/src/main/java/duke/ToDos.java @@ -3,6 +3,7 @@ public class ToDos extends Task { public ToDos(boolean isDone, String eventName) { + super(isDone, eventName, "T"); } diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java index 78c777cb01..5d35fd00aa 100644 --- a/src/main/java/duke/Ui.java +++ b/src/main/java/duke/Ui.java @@ -6,6 +6,7 @@ public class Ui { Scanner sc; public Ui() { + this.sc = new Scanner(System.in); } @@ -13,6 +14,7 @@ public Ui() { * This function prints the greeting message to the console */ public void greet() { + System.out.println("Hello! What can I do for you:>"); } @@ -56,6 +58,7 @@ public void printAddTask(Task task) { * @param task task to be printed */ public void printTask(Task task) { + System.out.println(task.toString()); } @@ -75,6 +78,7 @@ public void printList(TaskList tasks) { * This function prints the message if the TaskList is empty */ public void printEmptyList() { + System.out.println("You have no tasks in the list!"); } @@ -94,6 +98,7 @@ public String getInput() { * This function prints the error message when there is a reading error */ public void showLoadingError() { + System.out.println("An error has occurred while reading duke.txt"); } @@ -101,6 +106,7 @@ public void showLoadingError() { * This function prints the error message when there is an error writing the final taskList to the file */ public void showWritingError() { + System.out.println("Error occurred while writing to file."); } @@ -116,6 +122,7 @@ public void showInvalidCommandError() { * @param e which is the exception to be printed */ public void showError(Exception e) { + System.out.println(e.getMessage()); } From 4f25391dfd73dd5b2a5e91ee4c507250d3376fab Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Tue, 16 Feb 2021 18:02:10 +0800 Subject: [PATCH 21/31] Add functionality to find tasks according to user keyword --- src/main/java/duke/Parser.java | 80 +++++++++++++++++--------------- src/main/java/duke/TaskList.java | 11 +++++ src/main/java/duke/Ui.java | 5 ++ 3 files changed, 59 insertions(+), 37 deletions(-) diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index b032ff1b6f..11a88eeefc 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -1,5 +1,6 @@ package duke; +import java.util.ArrayList; import java.util.Arrays; public class Parser { @@ -14,14 +15,14 @@ public class Parser { public static Task parseFile(String data) throws DukeException { String[] dataSplit = data.split(" \\| "); switch (dataSplit[0]) { - case "T": - return new ToDos(Boolean.parseBoolean(dataSplit[1]), dataSplit[2]); - case "D": - return new Deadlines(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3]); - case "E": - return new Events(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3]); - default: - throw new DukeException("Error while reading file"); + case "T": + return new ToDos(Boolean.parseBoolean(dataSplit[1]), dataSplit[2]); + case "D": + return new Deadlines(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3]); + case "E": + return new Events(Boolean.parseBoolean(dataSplit[1]), dataSplit[2], dataSplit[3]); + default: + throw new DukeException("Error while reading file"); } } @@ -40,35 +41,40 @@ public static TaskList parseInput(String input, TaskList tasks) { Task task; switch (inputSplit[0]) { - case "done": - ui.printSetDone(tasks.setDone(Integer.valueOf(inputSplit[1]) - 1)); - break; - case "delete": - task = tasks.deleteTask(Integer.valueOf(inputSplit[1]) - 1); - ui.printDeleteTask(task); - break; - case "todo": - String name = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); - task = new ToDos(false, name); - tasks.addTask(task); - ui.printAddTask(task); - break; - case "deadline": - String deadlineName = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); - String[] deadlineSplit = deadlineName.split(" /by "); - task = new Deadlines(false, deadlineSplit[0], deadlineSplit[1]); - tasks.addTask(task); - ui.printAddTask(task); - break; - case "event": - String event = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); - String[] eventSplit = event.split(" /at "); - task = new Events(false, eventSplit[0], eventSplit[1]); - tasks.addTask(task); - ui.printAddTask(task); - break; - default: - ui.showInvalidCommandError(); + case "find": + String keyword = inputSplit[1]; + TaskList result = tasks.findTask(keyword); + ui.printFoundTasks(result); + break; + case "done": + ui.printSetDone(tasks.setDone(Integer.valueOf(inputSplit[1]) - 1)); + break; + case "delete": + task = tasks.deleteTask(Integer.valueOf(inputSplit[1]) - 1); + ui.printDeleteTask(task); + break; + case "todo": + String name = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); + task = new ToDos(false, name); + tasks.addTask(task); + ui.printAddTask(task); + break; + case "deadline": + String deadlineName = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); + String[] deadlineSplit = deadlineName.split(" /by "); + task = new Deadlines(false, deadlineSplit[0], deadlineSplit[1]); + tasks.addTask(task); + ui.printAddTask(task); + break; + case "event": + String event = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); + String[] eventSplit = event.split(" /at "); + task = new Events(false, eventSplit[0], eventSplit[1]); + tasks.addTask(task); + ui.printAddTask(task); + break; + default: + ui.showInvalidCommandError(); } return tasks; diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java index ecff8d5d47..8eb545d4a5 100644 --- a/src/main/java/duke/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -53,6 +53,17 @@ public Task setDone(int index) { return tasks.get(index); } + public TaskList findTask(String keyword) { + ArrayList result = new ArrayList<>(); + for (Task task : tasks) { + if (task.eventName.contains(keyword)) { + result.add(task); + } + } + + return new TaskList(result); + } + /** * This function returns the number of tasks in the list * @return the size of the task list diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java index 5d35fd00aa..1f5c2bf172 100644 --- a/src/main/java/duke/Ui.java +++ b/src/main/java/duke/Ui.java @@ -74,6 +74,11 @@ public void printList(TaskList tasks) { } } + public void printFoundTasks(TaskList tasks) { + System.out.println("Here are the matching tasks in your list:"); + printList(tasks); + } + /** * This function prints the message if the TaskList is empty */ From c0ddad61927e1f5cd7ef91c05b7e681e4a7e5e84 Mon Sep 17 00:00:00 2001 From: jingxueguo Date: Thu, 18 Feb 2021 01:57:55 +0800 Subject: [PATCH 22/31] Add GUI for Duke --- build.gradle | 14 +++ src/main/java/duke/Deadlines.java | 2 +- src/main/java/duke/DialogBox.java | 44 ++++++++++ src/main/java/duke/Duke.java | 59 +++++++------ src/main/java/duke/DukeApp.java | 111 ++++++++++++++++++++++++ src/main/java/duke/Events.java | 2 +- src/main/java/duke/Launcher.java | 8 ++ src/main/java/duke/Pair.java | 19 ++++ src/main/java/duke/Parser.java | 28 +++--- src/main/java/duke/Storage.java | 1 - src/main/java/duke/Task.java | 4 +- src/main/java/duke/Ui.java | 134 ----------------------------- src/main/resources/images/Duke.JPG | Bin 0 -> 16912 bytes src/main/resources/images/User.JPG | Bin 0 -> 33258 bytes 14 files changed, 246 insertions(+), 180 deletions(-) create mode 100644 src/main/java/duke/DialogBox.java create mode 100644 src/main/java/duke/DukeApp.java create mode 100644 src/main/java/duke/Launcher.java create mode 100644 src/main/java/duke/Pair.java delete mode 100644 src/main/java/duke/Ui.java create mode 100644 src/main/resources/images/Duke.JPG create mode 100644 src/main/resources/images/User.JPG diff --git a/build.gradle b/build.gradle index 20c0521cc7..1ce991c762 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,20 @@ repositories { } dependencies { + String javaFxVersion = '11' + + 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' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' } diff --git a/src/main/java/duke/Deadlines.java b/src/main/java/duke/Deadlines.java index 5073272e16..c0567da63f 100644 --- a/src/main/java/duke/Deadlines.java +++ b/src/main/java/duke/Deadlines.java @@ -21,6 +21,6 @@ public Deadlines(boolean isDone, String eventName, String deadLine) { @Override public String toString() { return "[D] " + super.toString() + "(by: " + - deadLine.format(DateTimeFormatter.ofPattern("MMM d yyyy")) + ")"; + deadLine.format(DateTimeFormatter.ofPattern("MMM d yyyy")) + ")\n"; } } diff --git a/src/main/java/duke/DialogBox.java b/src/main/java/duke/DialogBox.java new file mode 100644 index 0000000000..c6c6c8ea08 --- /dev/null +++ b/src/main/java/duke/DialogBox.java @@ -0,0 +1,44 @@ +package duke; +import javafx.geometry.Pos; +import javafx.scene.control.Label; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.scene.Node; + +public class DialogBox extends HBox { + private Label text; + private ImageView displayPicture; + + public DialogBox(Label l, ImageView iv) { + text = l; + displayPicture = iv; + + text.setWrapText(true); + displayPicture.setFitWidth(100.0); + displayPicture.setFitHeight(100.0); + + this.setAlignment(Pos.TOP_RIGHT); + this.getChildren().addAll(text, displayPicture); + } + /** + * Flips the dialog box such that the ImageView is on the left and text on the right. + */ + private void flip() { + this.setAlignment(Pos.TOP_LEFT); + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + FXCollections.reverse(tmp); + this.getChildren().setAll(tmp); + } + + public static DialogBox getUserDialog(Label l, ImageView iv) { + return new DialogBox(l, iv); + } + + public static DialogBox getDukeDialog(Label l, ImageView iv) { + var db = new DialogBox(l, iv); + db.flip(); + return db; + } +} diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index 02b7c4b8e8..a92f8f5e50 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -3,11 +3,7 @@ public class Duke { private Storage storage; private TaskList taskList; - private Ui ui; - public static void main(String[] args) { - new Duke("data/tasks.txt").run(); - } /** * This constructor create a duke class after loading the tasks from a given file path @@ -15,40 +11,47 @@ public static void main(String[] args) { * @return a Duke object with all of its variables initialised */ public Duke(String filePath) { - ui = new Ui(); storage = new Storage(filePath); try { taskList = new TaskList(storage.load()); } catch (DukeException e) { + this.showError(e); taskList = new TaskList(); - ui.showLoadingError(); - ui.showError(e); } } - public void run() { - ui.greet(); - - String input = ui.getInput(); - while (!input.equals("bye")) { - if (input.equals("list")) { - if (taskList.getSize() == 0) { - ui.printEmptyList(); - } else { - ui.printList(taskList); - } - } else { - taskList = Parser.parseInput(input, taskList); + + public String greet() { + return "Hello! What can I do for you:>"; + } + + + public String getResponse(String string) { + switch (string) { + case "bye": + try { + storage.writeToFile(taskList, "./data/duke.txt"); + } catch (DukeException e) { + showError(e); + } + return "Bye. See you again!"; + case "list": + String output = ""; + if (taskList.getSize() == 0) { + return "You have no tasks in the list!"; } - input = ui.getInput(); + for (int i = 0; i < taskList.getSize(); i++) { + output += taskList.getTask(i).toString(); + } + return output; + default: + Pair result = Parser.parseInput(string, taskList); + taskList = result.getTaskList(); + return result.getMessage(); } - - ui.end(); + } - try { - storage.writeToFile(taskList, "./data/duke.txt"); - } catch (DukeException e) { - ui.showWritingError(); - } + public String showError(Exception e) { + return e.getMessage(); } } \ No newline at end of file diff --git a/src/main/java/duke/DukeApp.java b/src/main/java/duke/DukeApp.java new file mode 100644 index 0000000000..dff2026884 --- /dev/null +++ b/src/main/java/duke/DukeApp.java @@ -0,0 +1,111 @@ +package duke; +import javafx.application.Application; +import javafx.scene.Scene; +import javafx.scene.control.Label; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; +import javafx.scene.layout.Region; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; + +public class DukeApp extends Application { + private ScrollPane scrollPane; + private VBox dialogContainer; + private TextField userInput; + private Button sendButton; + private Scene scene; + private Image userImg = new Image(this.getClass().getResourceAsStream("/images/User.jpg")); + private Image dukeImg = new Image(this.getClass().getResourceAsStream("/images/Duke.jpg")); + private static Duke duke = new Duke("data/duke.txt"); + + public static void main(String[] args) { + // ... + } + + @Override + public void start(Stage stage) { + //Step 1. Setting up required components + + //The container for the content of the chat to scroll. + scrollPane = new ScrollPane(); + dialogContainer = new VBox(); + scrollPane.setContent(dialogContainer); + + userInput = new TextField(); + sendButton = new Button("Send"); + + AnchorPane mainLayout = new AnchorPane(); + mainLayout.getChildren().addAll(scrollPane, userInput, sendButton); + + scene = new Scene(mainLayout); + + stage.setScene(scene); + stage.show(); + + //Step 2. Formatting the window to look as expected + stage.setTitle("Duke"); + stage.setResizable(false); + stage.setMinHeight(600.0); + stage.setMinWidth(400.0); + + mainLayout.setPrefSize(400.0, 600.0); + + scrollPane.setPrefSize(385, 535); + scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); + scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS); + + scrollPane.setVvalue(1.0); + scrollPane.setFitToWidth(true); + + // You will need to import `javafx.scene.layout.Region` for this. + dialogContainer.setPrefHeight(Region.USE_COMPUTED_SIZE); + + userInput.setPrefWidth(325.0); + + sendButton.setPrefWidth(55.0); + + AnchorPane.setTopAnchor(scrollPane, 1.0); + + AnchorPane.setBottomAnchor(sendButton, 1.0); + AnchorPane.setRightAnchor(sendButton, 1.0); + + AnchorPane.setLeftAnchor(userInput , 1.0); + AnchorPane.setBottomAnchor(userInput, 1.0); + + dialogContainer.getChildren().addAll( + DialogBox.getDukeDialog(new Label(duke.greet()), new ImageView(dukeImg)) + ); + + sendButton.setOnMouseClicked((event) -> { + handleUserInput(); + }); + + userInput.setOnAction((event) -> { + handleUserInput(); + }); + + //Scroll down to the end every time dialogContainer's height changes. + dialogContainer.heightProperty().addListener((observable) -> scrollPane.setVvalue(1.0)); + + // more code to be added here later + } + + private void handleUserInput() { + Label userText = new Label(userInput.getText()); + Label dukeText = new Label(getResponse(userInput.getText())); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(userText, new ImageView(userImg)), + DialogBox.getDukeDialog(dukeText, new ImageView(dukeImg)) + ); + userInput.clear(); + } + + private String getResponse(String input) { + String message = duke.getResponse(input); + return message; + } +} diff --git a/src/main/java/duke/Events.java b/src/main/java/duke/Events.java index 5de4213bae..314dee9d1a 100644 --- a/src/main/java/duke/Events.java +++ b/src/main/java/duke/Events.java @@ -18,6 +18,6 @@ public Events(boolean isDone, String eventName, String time) { @Override public String toString() { - return "[E] " + super.toString() + " (at: " + time + ")"; + return "[E] " + super.toString() + " (at: " + time + ")" + "\n"; } } diff --git a/src/main/java/duke/Launcher.java b/src/main/java/duke/Launcher.java new file mode 100644 index 0000000000..fe0dd67b6b --- /dev/null +++ b/src/main/java/duke/Launcher.java @@ -0,0 +1,8 @@ +package duke; +import javafx.application.Application; + +public class Launcher { + public static void main(String[] args) { + Application.launch(DukeApp.class, args); + } +} diff --git a/src/main/java/duke/Pair.java b/src/main/java/duke/Pair.java new file mode 100644 index 0000000000..1740a030c9 --- /dev/null +++ b/src/main/java/duke/Pair.java @@ -0,0 +1,19 @@ +package duke; + +public class Pair { + private final TaskList taskList; + private final String message; + + public Pair(TaskList taskList, String message) { + this.taskList = taskList; + this.message = message; + } + + public TaskList getTaskList() { + return this.taskList; + } + + public String getMessage() { + return this.message; + } +} diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index 11a88eeefc..41298e29f7 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -1,10 +1,8 @@ package duke; -import java.util.ArrayList; import java.util.Arrays; public class Parser { - private static Ui ui = new Ui(); /** * This function returns a Task object after parsing the data from the file @@ -32,51 +30,55 @@ public static Task parseFile(String data) throws DukeException { * @param tasks TaskList object * @return TaskList after adding the new task from the user input */ - public static TaskList parseInput(String input, TaskList tasks) { + public static Pair parseInput(String input, TaskList tasks) { String[] inputSplit = input.split(" "); if (inputSplit.length < 2) { - ui.showInvalidCommandError(); - return tasks; + return new Pair(tasks, "You have entered invalid command!"); } Task task; + String message; switch (inputSplit[0]) { case "find": String keyword = inputSplit[1]; TaskList result = tasks.findTask(keyword); - ui.printFoundTasks(result); + message = "Here are the matching tasks in your list:"; + for (int i = 0; i < result.getSize(); i++) { + message += result.getTask(i).toString(); + } break; case "done": - ui.printSetDone(tasks.setDone(Integer.valueOf(inputSplit[1]) - 1)); + message = "Nice, I have set this task as done!" + + tasks.setDone(Integer.valueOf(inputSplit[1]) - 1).toString(); break; case "delete": task = tasks.deleteTask(Integer.valueOf(inputSplit[1]) - 1); - ui.printDeleteTask(task); + message = "Noted. I have deleted this task:" + task.toString(); break; case "todo": String name = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); task = new ToDos(false, name); tasks.addTask(task); - ui.printAddTask(task); + message = "Got it. I have added this task:" + task.toString(); break; case "deadline": String deadlineName = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); String[] deadlineSplit = deadlineName.split(" /by "); task = new Deadlines(false, deadlineSplit[0], deadlineSplit[1]); tasks.addTask(task); - ui.printAddTask(task); + message = "Got it. I have added this task:" + task.toString(); break; case "event": String event = String.join(" ", Arrays.copyOfRange(inputSplit, 1, inputSplit.length)); String[] eventSplit = event.split(" /at "); task = new Events(false, eventSplit[0], eventSplit[1]); tasks.addTask(task); - ui.printAddTask(task); + message = "Got it. I have added this task:" + task.toString(); break; default: - ui.showInvalidCommandError(); + message = "You have entered invalid commands!"; } - return tasks; + return new Pair(tasks, message); } } diff --git a/src/main/java/duke/Storage.java b/src/main/java/duke/Storage.java index 797339da6b..8903170bab 100644 --- a/src/main/java/duke/Storage.java +++ b/src/main/java/duke/Storage.java @@ -9,7 +9,6 @@ public class Storage { private String filePath; - private Ui ui = new Ui(); public Storage(String filePath) { diff --git a/src/main/java/duke/Task.java b/src/main/java/duke/Task.java index b8276c4a61..1d0e3921b7 100644 --- a/src/main/java/duke/Task.java +++ b/src/main/java/duke/Task.java @@ -22,9 +22,9 @@ public void setDone() { @Override public String toString() { if (this.isDone == true) { - return "[X] " + eventName; + return "[X] " + eventName + "\n"; } else { - return "[ ] " + eventName; + return "[ ] " + eventName + "\n"; } } } diff --git a/src/main/java/duke/Ui.java b/src/main/java/duke/Ui.java deleted file mode 100644 index 1f5c2bf172..0000000000 --- a/src/main/java/duke/Ui.java +++ /dev/null @@ -1,134 +0,0 @@ -package duke; - -import java.util.Scanner; - -public class Ui { - Scanner sc; - - public Ui() { - - this.sc = new Scanner(System.in); - } - - /** - * This function prints the greeting message to the console - */ - public void greet() { - - System.out.println("Hello! What can I do for you:>"); - } - - /** - * This function prints the goodbye message to the console - */ - public void end() { - this.sc.close(); - System.out.println("Bye. See you again!"); - } - - /** - * This function prints the task which had just been set to be done - * @param task task to be printed - */ - public void printSetDone(Task task) { - System.out.println("Nice, I have set this task as done!"); - printTask(task); - } - - /** - * This function prints the task which had just been deleted - * @param task task to be printed - */ - public void printDeleteTask(Task task) { - System.out.println("Noted. I have deleted this task:"); - printTask(task); - } - - /** - * This function prints the task which had just been added to the TaskList - * @param task task to be printed - */ - public void printAddTask(Task task) { - System.out.println("Got it. I have added this task:"); - printTask(task); - } - - /** - * This function prints a given task - * @param task task to be printed - */ - public void printTask(Task task) { - - System.out.println(task.toString()); - } - - /** - * This function prints out the tasks in the TaskList - * @param tasks TaskList to be printed - */ - public void printList(TaskList tasks) { - int size = tasks.getSize(); - - for (int i = 0; i < size; i++) { - printTask(tasks.getTask(i)); - } - } - - public void printFoundTasks(TaskList tasks) { - System.out.println("Here are the matching tasks in your list:"); - printList(tasks); - } - - /** - * This function prints the message if the TaskList is empty - */ - public void printEmptyList() { - - System.out.println("You have no tasks in the list!"); - } - - /** - * This function gets one line of input from the user - * @return a string which is the user input - */ - public String getInput() { - while (sc.hasNextLine()) { - return sc.nextLine(); - } - - return "null"; - } - - /** - * This function prints the error message when there is a reading error - */ - public void showLoadingError() { - - System.out.println("An error has occurred while reading duke.txt"); - } - - /** - * This function prints the error message when there is an error writing the final taskList to the file - */ - public void showWritingError() { - - System.out.println("Error occurred while writing to file."); - } - - /** - * This function prints the error message when the user has entered an invalid command - */ - public void showInvalidCommandError() { - System.out.println("You have entered invalid commands, please try again!"); - } - - /** - * This function prints the error message - * @param e which is the exception to be printed - */ - public void showError(Exception e) { - - System.out.println(e.getMessage()); - } - -} diff --git a/src/main/resources/images/Duke.JPG b/src/main/resources/images/Duke.JPG new file mode 100644 index 0000000000000000000000000000000000000000..9af26bae00889d2be0d9b2d42011e327f3b2f310 GIT binary patch literal 16912 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 Date: Thu, 18 Feb 2021 21:59:22 +0800 Subject: [PATCH 23/31] Add GUI for Duke using FXML --- src/main/java/duke/DialogBox.java | 58 ++++++++----- src/main/java/duke/Duke.java | 4 - src/main/java/duke/DukeApp.java | 111 ------------------------ src/main/java/duke/Launcher.java | 2 +- src/main/java/duke/Main.java | 32 +++++++ src/main/java/duke/MainWindow.java | 55 ++++++++++++ src/main/resources/view/DialogBox.fxml | 16 ++++ src/main/resources/view/MainWindow.fxml | 19 ++++ 8 files changed, 160 insertions(+), 137 deletions(-) delete mode 100644 src/main/java/duke/DukeApp.java create mode 100644 src/main/java/duke/Main.java create mode 100644 src/main/java/duke/MainWindow.java create mode 100644 src/main/resources/view/DialogBox.fxml create mode 100644 src/main/resources/view/MainWindow.fxml diff --git a/src/main/java/duke/DialogBox.java b/src/main/java/duke/DialogBox.java index c6c6c8ea08..a6df79da71 100644 --- a/src/main/java/duke/DialogBox.java +++ b/src/main/java/duke/DialogBox.java @@ -1,44 +1,60 @@ package duke; +import java.io.IOException; +import java.util.Collections; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; import javafx.geometry.Pos; +import javafx.scene.Node; import javafx.scene.control.Label; +import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.layout.HBox; -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; -import javafx.scene.Node; +/** + * An example of a custom control using FXML. + * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label + * containing text from the speaker. + */ public class DialogBox extends HBox { - private Label text; + @FXML + private Label dialog; + @FXML private ImageView displayPicture; - public DialogBox(Label l, ImageView iv) { - text = l; - displayPicture = iv; + private DialogBox(String text, Image img) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml")); + fxmlLoader.setController(this); + fxmlLoader.setRoot(this); + fxmlLoader.load(); + } catch (IOException e) { + e.printStackTrace(); + } - text.setWrapText(true); - displayPicture.setFitWidth(100.0); - displayPicture.setFitHeight(100.0); - - this.setAlignment(Pos.TOP_RIGHT); - this.getChildren().addAll(text, displayPicture); + dialog.setText(text); + displayPicture.setImage(img); } + /** * Flips the dialog box such that the ImageView is on the left and text on the right. */ private void flip() { - this.setAlignment(Pos.TOP_LEFT); ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); - FXCollections.reverse(tmp); - this.getChildren().setAll(tmp); + Collections.reverse(tmp); + getChildren().setAll(tmp); + setAlignment(Pos.TOP_LEFT); } - public static DialogBox getUserDialog(Label l, ImageView iv) { - return new DialogBox(l, iv); + public static DialogBox getUserDialog(String text, Image img) { + return new DialogBox(text, img); } - public static DialogBox getDukeDialog(Label l, ImageView iv) { - var db = new DialogBox(l, iv); + public static DialogBox getDukeDialog(String text, Image img) { + var db = new DialogBox(text, img); db.flip(); return db; } -} +} \ No newline at end of file diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index a92f8f5e50..40a83fbe1d 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -21,10 +21,6 @@ public Duke(String filePath) { } - public String greet() { - return "Hello! What can I do for you:>"; - } - public String getResponse(String string) { switch (string) { diff --git a/src/main/java/duke/DukeApp.java b/src/main/java/duke/DukeApp.java deleted file mode 100644 index dff2026884..0000000000 --- a/src/main/java/duke/DukeApp.java +++ /dev/null @@ -1,111 +0,0 @@ -package duke; -import javafx.application.Application; -import javafx.scene.Scene; -import javafx.scene.control.Label; -import javafx.scene.control.Button; -import javafx.scene.control.ScrollPane; -import javafx.scene.control.TextField; -import javafx.scene.layout.AnchorPane; -import javafx.scene.layout.VBox; -import javafx.stage.Stage; -import javafx.scene.layout.Region; -import javafx.scene.image.Image; -import javafx.scene.image.ImageView; - -public class DukeApp extends Application { - private ScrollPane scrollPane; - private VBox dialogContainer; - private TextField userInput; - private Button sendButton; - private Scene scene; - private Image userImg = new Image(this.getClass().getResourceAsStream("/images/User.jpg")); - private Image dukeImg = new Image(this.getClass().getResourceAsStream("/images/Duke.jpg")); - private static Duke duke = new Duke("data/duke.txt"); - - public static void main(String[] args) { - // ... - } - - @Override - public void start(Stage stage) { - //Step 1. Setting up required components - - //The container for the content of the chat to scroll. - scrollPane = new ScrollPane(); - dialogContainer = new VBox(); - scrollPane.setContent(dialogContainer); - - userInput = new TextField(); - sendButton = new Button("Send"); - - AnchorPane mainLayout = new AnchorPane(); - mainLayout.getChildren().addAll(scrollPane, userInput, sendButton); - - scene = new Scene(mainLayout); - - stage.setScene(scene); - stage.show(); - - //Step 2. Formatting the window to look as expected - stage.setTitle("Duke"); - stage.setResizable(false); - stage.setMinHeight(600.0); - stage.setMinWidth(400.0); - - mainLayout.setPrefSize(400.0, 600.0); - - scrollPane.setPrefSize(385, 535); - scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); - scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS); - - scrollPane.setVvalue(1.0); - scrollPane.setFitToWidth(true); - - // You will need to import `javafx.scene.layout.Region` for this. - dialogContainer.setPrefHeight(Region.USE_COMPUTED_SIZE); - - userInput.setPrefWidth(325.0); - - sendButton.setPrefWidth(55.0); - - AnchorPane.setTopAnchor(scrollPane, 1.0); - - AnchorPane.setBottomAnchor(sendButton, 1.0); - AnchorPane.setRightAnchor(sendButton, 1.0); - - AnchorPane.setLeftAnchor(userInput , 1.0); - AnchorPane.setBottomAnchor(userInput, 1.0); - - dialogContainer.getChildren().addAll( - DialogBox.getDukeDialog(new Label(duke.greet()), new ImageView(dukeImg)) - ); - - sendButton.setOnMouseClicked((event) -> { - handleUserInput(); - }); - - userInput.setOnAction((event) -> { - handleUserInput(); - }); - - //Scroll down to the end every time dialogContainer's height changes. - dialogContainer.heightProperty().addListener((observable) -> scrollPane.setVvalue(1.0)); - - // more code to be added here later - } - - private void handleUserInput() { - Label userText = new Label(userInput.getText()); - Label dukeText = new Label(getResponse(userInput.getText())); - dialogContainer.getChildren().addAll( - DialogBox.getUserDialog(userText, new ImageView(userImg)), - DialogBox.getDukeDialog(dukeText, new ImageView(dukeImg)) - ); - userInput.clear(); - } - - private String getResponse(String input) { - String message = duke.getResponse(input); - return message; - } -} diff --git a/src/main/java/duke/Launcher.java b/src/main/java/duke/Launcher.java index fe0dd67b6b..756e70af9c 100644 --- a/src/main/java/duke/Launcher.java +++ b/src/main/java/duke/Launcher.java @@ -3,6 +3,6 @@ public class Launcher { public static void main(String[] args) { - Application.launch(DukeApp.class, args); + Application.launch(Main.class, args); } } diff --git a/src/main/java/duke/Main.java b/src/main/java/duke/Main.java new file mode 100644 index 0000000000..8409e20dda --- /dev/null +++ b/src/main/java/duke/Main.java @@ -0,0 +1,32 @@ +package duke; + +import java.io.IOException; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.layout.AnchorPane; +import javafx.stage.Stage; + +/** + * A GUI for Duke using FXML. + */ +public class Main extends Application { + + private Duke duke = new Duke("data/duke.txt"); + + @Override + public void start(Stage stage) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml")); + AnchorPane ap = fxmlLoader.load(); + Scene scene = new Scene(ap); + stage.setScene(scene); + fxmlLoader.getController().setDuke(duke); + fxmlLoader.getController().greet(); + stage.show(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/src/main/java/duke/MainWindow.java b/src/main/java/duke/MainWindow.java new file mode 100644 index 0000000000..4512b5ddcd --- /dev/null +++ b/src/main/java/duke/MainWindow.java @@ -0,0 +1,55 @@ +package duke; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.image.Image; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.VBox; + +/** + * Controller for MainWindow. Provides the layout for the other controls. + */ +public class MainWindow extends AnchorPane { + @FXML + private ScrollPane scrollPane; + @FXML + private VBox dialogContainer; + @FXML + private TextField userInput; + @FXML + private Button sendButton; + + private Duke duke; + + private Image userImage = new Image(this.getClass().getResourceAsStream("/images/User.jpg")); + private Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/Duke.jpg")); + + @FXML + public void initialize() { + scrollPane.vvalueProperty().bind(dialogContainer.heightProperty()); + } + + public void setDuke(Duke d) { + duke = d; + } + + public void greet() { + dialogContainer.getChildren().add(DialogBox.getDukeDialog("Hello! What can I do for you:>", dukeImage)); + } + + /** + * Creates two dialog boxes, one echoing user input and the other containing Duke's reply and then appends them to + * the dialog container. Clears the user input after processing. + */ + @FXML + private void handleUserInput() { + String input = userInput.getText(); + String response = duke.getResponse(input); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(input, userImage), + DialogBox.getDukeDialog(response, dukeImage) + ); + userInput.clear(); + } +} diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml new file mode 100644 index 0000000000..e433809947 --- /dev/null +++ b/src/main/resources/view/DialogBox.fxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml new file mode 100644 index 0000000000..832f84382e --- /dev/null +++ b/src/main/resources/view/MainWindow.fxml @@ -0,0 +1,19 @@ + + + + + + + + + + + +