From 28ad2b878f1a21d03879e81cd441d0175d89e6b1 Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 01/70] Add Gradle support --- build.gradle | 41 +++++ 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, 332 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..885198fcfa --- /dev/null +++ b/build.gradle @@ -0,0 +1,41 @@ +plugins { + id 'java' + id 'application' + 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 +} + +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 ed6d4d25bd4e34461919ffe785a6f10f4c087552 Mon Sep 17 00:00:00 2001 From: lzq Date: Sat, 5 Aug 2023 15:24:02 +0800 Subject: [PATCH 02/70] Bump gradle and lib version --- build.gradle | 9 +- gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 63375 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 281 ++++++++++++++--------- gradlew.bat | 195 ++++++++-------- 5 files changed, 273 insertions(+), 216 deletions(-) diff --git a/build.gradle b/build.gradle index 885198fcfa..a388517ae1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'application' - id 'com.github.johnrengelman.shadow' version '5.1.0' + id 'com.github.johnrengelman.shadow' version '7.1.2' } repositories { @@ -9,8 +9,8 @@ repositories { } 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' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0' } test { @@ -28,12 +28,13 @@ test { } application { - mainClassName = "seedu.duke.Duke" + mainClass.set("seedu.duke.Duke") } shadowJar { archiveBaseName = "duke" archiveClassifier = null + dependsOn("distZip", "distTar") } run{ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f3d88b1c2faf2fc91d853cd5d4242b5547257070..033e24c4cdf41af1ab109bc7f253b2b887023340 100644 GIT binary patch delta 43723 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 delta 38942 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b7c8c5dbf5..66c01cfeba 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7d95..fcb6fca147 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,78 +17,110 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # 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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac 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"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # 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 - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,87 +129,120 @@ 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. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + 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 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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac 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 +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # 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 +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # 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\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg 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" +# 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"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 62bd9b9cce..6689b85bee 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,103 +1,92 @@ -@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 +@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=. +@rem This is normally unused +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% equ 0 goto execute + +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 execute + +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 + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From eb4d5ff8bd8dcf98d123f531be430a6e1a749aab Mon Sep 17 00:00:00 2001 From: You Wei Date: Sun, 20 Aug 2023 20:00:32 +0800 Subject: [PATCH 03/70] Added Rename, Greet, Exit --- src/main/java/Duke.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..45c472f5b9 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,10 +1,12 @@ public class Duke { public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); + String section = "\n________________________________________"; + //Print intro + System.out.println(section + + "\nHello! I'm Evan" + + "\nWhat can I do for you?" + + section); + //Print outro + System.out.println("Bye. Hope to see you again soon!" + section); } } From efc93d5c74a77d7bca48b8dfde6b6d34b4d44063 Mon Sep 17 00:00:00 2001 From: You Wei Date: Sun, 20 Aug 2023 20:46:23 +0800 Subject: [PATCH 04/70] Added Echo --- .gitignore | 3 +++ src/main/java/Duke.java | 32 +++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2873e189e1..c797d81b7e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,6 @@ bin/ /text-ui-test/ACTUAL.TXT text-ui-test/EXPECTED-UNIX.TXT + +# Class files +src/main/java/*.class diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 45c472f5b9..91e9d3f1df 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,12 +1,34 @@ +import java.util.Scanner; + public class Duke { + private static String indent = " "; + private static String section = indent + "________________________________________\n"; public static void main(String[] args) { - String section = "\n________________________________________"; + //Print intro System.out.println(section - + "\nHello! I'm Evan" - + "\nWhat can I do for you?" + + indent + "Hello! I'm Evan\n" + + indent + "What can I do for you?\n" + section); - //Print outro - System.out.println("Bye. Hope to see you again soon!" + section); + + //Start user interaction + application(); + } + + public static void application() { + Scanner scanner = new Scanner(System.in); + while(true) { + String input = scanner.nextLine(); + if (input.equals("bye")) { + printDialog("Bye. Hope to see you again soon!"); + return; + } else { + printDialog(input); + } + } + } + + public static void printDialog(String dialog) { + System.out.println(section + indent + dialog + "\n" + section); } } From e4b6b1b248f6c8ce060a9960c50643e31c7c7522 Mon Sep 17 00:00:00 2001 From: You Wei Date: Sun, 20 Aug 2023 21:28:23 +0800 Subject: [PATCH 05/70] Added Add, List --- src/main/java/Duke.java | 26 +++++++------------------- src/main/java/Reply.java | 26 ++++++++++++++++++++++++++ src/main/java/Todo.java | 28 ++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 19 deletions(-) create mode 100644 src/main/java/Reply.java create mode 100644 src/main/java/Todo.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 91e9d3f1df..5ff8cb7fcf 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,34 +1,22 @@ import java.util.Scanner; public class Duke { - private static String indent = " "; - private static String section = indent + "________________________________________\n"; public static void main(String[] args) { - - //Print intro - System.out.println(section - + indent + "Hello! I'm Evan\n" - + indent + "What can I do for you?\n" - + section); - //Start user interaction - application(); - } - - public static void application() { Scanner scanner = new Scanner(System.in); + Todo tasks = new Todo(); + Reply reply = Reply.init(); while(true) { String input = scanner.nextLine(); if (input.equals("bye")) { - printDialog("Bye. Hope to see you again soon!"); + reply.printDialog("Bye. Hope to see you again soon!"); return; + } else if (input.equals("list")) { + tasks.printTasks(); } else { - printDialog(input); + tasks.addTask(input); + reply.printDialog("added: " + input); } } } - - public static void printDialog(String dialog) { - System.out.println(section + indent + dialog + "\n" + section); - } } diff --git a/src/main/java/Reply.java b/src/main/java/Reply.java new file mode 100644 index 0000000000..9eba2188e0 --- /dev/null +++ b/src/main/java/Reply.java @@ -0,0 +1,26 @@ +import java.awt.*; + +public class Reply { + private String indent = " "; + private String section = indent + "________________________________________\n"; + private static Reply reply = null; + + private Reply() { + //Print intro + System.out.println(section + + indent + "Hello! I'm Evan\n" + + indent + "What can I do for you?\n" + + section); + } + + public static Reply init() { + if (reply == null) { + reply = new Reply(); + } + return reply; + } + + public void printDialog(String dialog) { + System.out.println(section + indent + dialog + "\n" + section); + } +} diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 0000000000..ca2a3f4e78 --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,28 @@ +import java.util.ArrayList; + +public class Todo { + private ArrayList list; + + public Todo() { + list = new ArrayList<>(); + } + + public void addTask(String task) { + list.add(task); + } + + public void printTasks() { + String[] tasks = list.toArray(String[]::new); + Reply reply = Reply.init(); + String dialog = ""; + for (int i = 0; i < tasks.length; i++) { + int listIndex = i + 1; + if (i < tasks.length - 1) { + dialog = dialog + listIndex + ". " + tasks[i] + "\n "; + } else { + dialog = dialog + listIndex + ". " + tasks[i]; + } + } + reply.printDialog(dialog); + } +} From 8d6ed5258cdfa9ec5656f83c82d07f76b5de2951 Mon Sep 17 00:00:00 2001 From: You Wei Date: Mon, 21 Aug 2023 00:04:07 +0800 Subject: [PATCH 06/70] Added Mark as Done --- src/main/java/Duke.java | 27 +++++++++++++++++++++-- src/main/java/Task.java | 21 ++++++++++++++++++ src/main/java/Todo.java | 47 ++++++++++++++++++++++++++++++++++------- 3 files changed, 85 insertions(+), 10 deletions(-) create mode 100644 src/main/java/Task.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5ff8cb7fcf..c9f5a35caf 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,11 +1,11 @@ import java.util.Scanner; public class Duke { + private static Todo tasks = new Todo(); + private static Reply reply = Reply.init(); public static void main(String[] args) { //Start user interaction Scanner scanner = new Scanner(System.in); - Todo tasks = new Todo(); - Reply reply = Reply.init(); while(true) { String input = scanner.nextLine(); if (input.equals("bye")) { @@ -13,10 +13,33 @@ public static void main(String[] args) { return; } else if (input.equals("list")) { tasks.printTasks(); + } else if (input.startsWith("mark")) { + markTask(input, true); + } else if (input.startsWith("unmark")) { + markTask(input, false); } else { tasks.addTask(input); reply.printDialog("added: " + input); } } } + + public static void markTask(String input, boolean mark) { + String[] split = input.split(" "); + if (split.length > 2) { + reply.printDialog("Invalid input"); + } else { + try { + if (mark) { + tasks.markDone(Integer.parseInt(split[1])); + } else { + tasks.unmarkDone(Integer.parseInt(split[1])); + } + } catch (NumberFormatException e ) { + reply.printDialog("Invalid number"); + } catch (IndexOutOfBoundsException e) { + reply.printDialog("Index number does not exist"); + } + } + } } diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 0000000000..d99873cafe --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,21 @@ +public class Task { + protected String description; + protected boolean isDone; + + public Task(String description) { + this.description = description; + this.isDone = false; + } + + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + + public void markAsDone() { + this.isDone = true; + } + + public void markAsNotDone() { + this.isDone = false; + } +} diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index ca2a3f4e78..32d508fcbf 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -1,28 +1,59 @@ import java.util.ArrayList; public class Todo { - private ArrayList list; + private ArrayList list; + private final Reply reply = Reply.init(); public Todo() { list = new ArrayList<>(); } public void addTask(String task) { - list.add(task); + list.add(new Task(task)); } public void printTasks() { - String[] tasks = list.toArray(String[]::new); - Reply reply = Reply.init(); - String dialog = ""; + Task[] tasks = list.toArray(Task[]::new); + StringBuilder dialog = new StringBuilder("Here are the tasks in your list:\n "); for (int i = 0; i < tasks.length; i++) { int listIndex = i + 1; + Task task = tasks[i]; + String desc = task.description; + dialog.append(listIndex) + .append(".").append("[") + .append(task.getStatusIcon()) + .append("] "); + if (i < tasks.length - 1) { - dialog = dialog + listIndex + ". " + tasks[i] + "\n "; + dialog.append(desc).append("\n "); } else { - dialog = dialog + listIndex + ". " + tasks[i]; + dialog.append(desc); } } - reply.printDialog(dialog); + reply.printDialog(dialog.toString()); + } + + public void markDone(int index) { + StringBuilder dialog = new StringBuilder(); + Task element = list.get(index - 1); + element.markAsDone(); + dialog.append("Nice! I've marked this task as done:\n") + .append(" [") + .append(element.getStatusIcon()) + .append("] ") + .append(element.description); + reply.printDialog(dialog.toString()); + } + + public void unmarkDone(int index) { + StringBuilder dialog = new StringBuilder(); + Task element = list.get(index - 1); + element.markAsNotDone(); + dialog.append("OK! I've marked this task as not done yet:\n") + .append(" [") + .append(element.getStatusIcon()) + .append("] ") + .append(element.description); + reply.printDialog(dialog.toString()); } } From 0d0a528eb58b1ad3b06bbd7e30897afed60d33a7 Mon Sep 17 00:00:00 2001 From: You Wei Date: Mon, 21 Aug 2023 01:36:41 +0800 Subject: [PATCH 07/70] Added ToDos, Events, Deadlines --- src/main/java/Deadlines.java | 13 ++++ src/main/java/Duke.java | 80 +++++++++++++++++----- src/main/java/Events.java | 14 ++++ src/main/java/InvalidInputException.java | 2 + src/main/java/Task.java | 5 ++ src/main/java/{Todo.java => TaskList.java} | 37 +++++----- src/main/java/ToDo.java | 10 +++ 7 files changed, 127 insertions(+), 34 deletions(-) create mode 100644 src/main/java/Deadlines.java create mode 100644 src/main/java/Events.java create mode 100644 src/main/java/InvalidInputException.java rename src/main/java/{Todo.java => TaskList.java} (62%) create mode 100644 src/main/java/ToDo.java diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java new file mode 100644 index 0000000000..93fa032afb --- /dev/null +++ b/src/main/java/Deadlines.java @@ -0,0 +1,13 @@ +public class Deadlines extends Task{ + protected String by; + + public Deadlines(String description, String by) { + super(description); + this.by = by; + } + + @Override + public String toString() { + return "[D]" + super.toString() + " (by: " + by + ")"; + } +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index c9f5a35caf..0e6d9396bb 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,33 +1,43 @@ import java.util.Scanner; public class Duke { - private static Todo tasks = new Todo(); + private static TaskList tasks = new TaskList(); private static Reply reply = Reply.init(); public static void main(String[] args) { //Start user interaction Scanner scanner = new Scanner(System.in); while(true) { - String input = scanner.nextLine(); - if (input.equals("bye")) { - reply.printDialog("Bye. Hope to see you again soon!"); - return; - } else if (input.equals("list")) { - tasks.printTasks(); - } else if (input.startsWith("mark")) { - markTask(input, true); - } else if (input.startsWith("unmark")) { - markTask(input, false); - } else { - tasks.addTask(input); - reply.printDialog("added: " + input); + try { + String input = scanner.nextLine(); + if (input.equals("bye")) { + reply.printDialog("Bye. Hope to see you again soon!"); + return; + } else if (input.equals("list")) { + tasks.printTasks(); + } else if (input.startsWith("mark")) { + markTask(input, true); + } else if (input.startsWith("unmark")) { + markTask(input, false); + } else if (input.startsWith("todo")) { + handleToDo(input); + } else if (input.startsWith("deadline")) { + handleDeadline(input); + } else if (input.startsWith("event")) { + handleEvent(input); + } else { + throw new InvalidInputException(); + } + } catch (InvalidInputException e) { + reply.printDialog("Invalid input"); } } + } - public static void markTask(String input, boolean mark) { + public static void markTask(String input, boolean mark) throws InvalidInputException { String[] split = input.split(" "); if (split.length > 2) { - reply.printDialog("Invalid input"); + throw new InvalidInputException(); } else { try { if (mark) { @@ -42,4 +52,42 @@ public static void markTask(String input, boolean mark) { } } } + + private static void handleToDo(String input) { + String todo = input.substring(4); + tasks.addTask(new ToDo(todo)); + } + + private static void handleDeadline(String input) throws InvalidInputException { + String deadline = input.substring(8); + String[] slice = deadline.split("/"); + if (slice.length != 2) { + throw new InvalidInputException(); + } else { + if (!slice[1].startsWith("by")) { + throw new InvalidInputException(); + } + + String desc = slice[0]; + String date = slice[1].substring(3); + tasks.addTask(new Deadlines(desc, date)); + } + } + + private static void handleEvent(String input) throws InvalidInputException { + String event = input.substring(5); + String[] slice = event.split("/"); + if (slice.length != 3) { + throw new InvalidInputException(); + } else { + if (!slice[1].startsWith("from") || !slice[2].startsWith("to")) { + throw new InvalidInputException(); + } + + String desc = slice[0]; + String from = slice[1].substring(4); + String to = slice[2].substring(2); + tasks.addTask(new Events(desc, from, to)); + } + } } diff --git a/src/main/java/Events.java b/src/main/java/Events.java new file mode 100644 index 0000000000..765801d7e7 --- /dev/null +++ b/src/main/java/Events.java @@ -0,0 +1,14 @@ +public class Events extends Task{ + protected String from; + protected String to; + public Events(String description, String from, String to) { + super(description); + this.from = from; + this.to = to; + } + + @Override + public String toString() { + return "[E]" + super.toString() + " (from:" + from + "to:" + to + ")"; + } +} diff --git a/src/main/java/InvalidInputException.java b/src/main/java/InvalidInputException.java new file mode 100644 index 0000000000..142a402f88 --- /dev/null +++ b/src/main/java/InvalidInputException.java @@ -0,0 +1,2 @@ +public class InvalidInputException extends Exception{ +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java index d99873cafe..41553d47ba 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -18,4 +18,9 @@ public void markAsDone() { public void markAsNotDone() { this.isDone = false; } + + @Override + public String toString() { + return "[" + getStatusIcon() + "]" + description; + } } diff --git a/src/main/java/Todo.java b/src/main/java/TaskList.java similarity index 62% rename from src/main/java/Todo.java rename to src/main/java/TaskList.java index 32d508fcbf..c1571a24af 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/TaskList.java @@ -1,15 +1,22 @@ import java.util.ArrayList; -public class Todo { +public class TaskList { private ArrayList list; private final Reply reply = Reply.init(); - public Todo() { + public TaskList() { list = new ArrayList<>(); } - public void addTask(String task) { - list.add(new Task(task)); + public void addTask(Task task) { + list.add(task); + StringBuilder dialog = new StringBuilder("Got it. I've added this task:\n ") + .append(task) + .append("\n ") + .append("Now you have ") + .append(list.size()) + .append(" tasks in the list."); + reply.printDialog(dialog.toString()); } public void printTasks() { @@ -18,16 +25,14 @@ public void printTasks() { for (int i = 0; i < tasks.length; i++) { int listIndex = i + 1; Task task = tasks[i]; - String desc = task.description; dialog.append(listIndex) - .append(".").append("[") - .append(task.getStatusIcon()) - .append("] "); + .append("."); if (i < tasks.length - 1) { - dialog.append(desc).append("\n "); + dialog.append(task) + .append("\n "); } else { - dialog.append(desc); + dialog.append(task); } } reply.printDialog(dialog.toString()); @@ -38,10 +43,8 @@ public void markDone(int index) { Task element = list.get(index - 1); element.markAsDone(); dialog.append("Nice! I've marked this task as done:\n") - .append(" [") - .append(element.getStatusIcon()) - .append("] ") - .append(element.description); + .append(" ") + .append(element); reply.printDialog(dialog.toString()); } @@ -50,10 +53,8 @@ public void unmarkDone(int index) { Task element = list.get(index - 1); element.markAsNotDone(); dialog.append("OK! I've marked this task as not done yet:\n") - .append(" [") - .append(element.getStatusIcon()) - .append("] ") - .append(element.description); + .append(" ") + .append(element); reply.printDialog(dialog.toString()); } } diff --git a/src/main/java/ToDo.java b/src/main/java/ToDo.java new file mode 100644 index 0000000000..023c97b369 --- /dev/null +++ b/src/main/java/ToDo.java @@ -0,0 +1,10 @@ +public class ToDo extends Task{ + public ToDo(String description) { + super(description); + } + + @Override + public String toString() { + return "[T]" + super.toString(); + } +} From 5b3dc87eb2acf7c31b56812275a40cc90c61022d Mon Sep 17 00:00:00 2001 From: You Wei Date: Mon, 21 Aug 2023 21:21:04 +0800 Subject: [PATCH 08/70] Added Automated text UI testing and fixed some input bugs --- src/main/java/Duke.java | 8 +-- text-ui-test/EXPECTED.TXT | 140 ++++++++++++++++++++++++++++++++++++-- text-ui-test/input.txt | 24 +++++++ 3 files changed, 162 insertions(+), 10 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 0e6d9396bb..a23bc4aef9 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -14,13 +14,13 @@ public static void main(String[] args) { return; } else if (input.equals("list")) { tasks.printTasks(); - } else if (input.startsWith("mark")) { + } else if (input.startsWith("mark ")) { markTask(input, true); - } else if (input.startsWith("unmark")) { + } else if (input.startsWith("unmark ")) { markTask(input, false); - } else if (input.startsWith("todo")) { + } else if (input.startsWith("todo ")) { handleToDo(input); - } else if (input.startsWith("deadline")) { + } else if (input.startsWith("deadline ")) { handleDeadline(input); } else if (input.startsWith("event")) { handleEvent(input); diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 657e74f6e7..edd87b7906 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,7 +1,135 @@ -Hello from - ____ _ -| _ \ _ _| | _____ -| | | | | | | |/ / _ \ -| |_| | |_| | < __/ -|____/ \__,_|_|\_\___| + ________________________________________ + Hello! I'm Evan + What can I do for you? + ________________________________________ + ________________________________________ + Got it. I've added this task: + [T][ ] read book + Now you have 1 tasks in the list. + ________________________________________ + + ________________________________________ + Got it. I've added this task: + [D][ ] return book (by: June 6th) + Now you have 2 tasks in the list. + ________________________________________ + + ________________________________________ + Got it. I've added this task: + [E][ ] project meeting (from: Aug 6th 2pm to: 4pm) + Now you have 3 tasks in the list. + ________________________________________ + + ________________________________________ + Got it. I've added this task: + [T][ ] join sports club + Now you have 4 tasks in the list. + ________________________________________ + + ________________________________________ + Got it. I've added this task: + [T][ ] borrow book + Now you have 5 tasks in the list. + ________________________________________ + + ________________________________________ + Invalid input + ________________________________________ + + ________________________________________ + Invalid input + ________________________________________ + + ________________________________________ + Invalid input + ________________________________________ + + ________________________________________ + Invalid input + ________________________________________ + + ________________________________________ + Invalid input + ________________________________________ + + ________________________________________ + Invalid input + ________________________________________ + + ________________________________________ + Invalid input + ________________________________________ + + ________________________________________ + Invalid input + ________________________________________ + + ________________________________________ + Nice! I've marked this task as done: + [T][X] read book + ________________________________________ + + ________________________________________ + Nice! I've marked this task as done: + [T][X] join sports club + ________________________________________ + + ________________________________________ + Here are the tasks in your list: + 1.[T][X] read book + 2.[D][ ] return book (by: June 6th) + 3.[E][ ] project meeting (from: Aug 6th 2pm to: 4pm) + 4.[T][X] join sports club + 5.[T][ ] borrow book + ________________________________________ + + ________________________________________ + Nice! I've marked this task as done: + [D][X] return book (by: June 6th) + ________________________________________ + + ________________________________________ + Here are the tasks in your list: + 1.[T][X] read book + 2.[D][X] return book (by: June 6th) + 3.[E][ ] project meeting (from: Aug 6th 2pm to: 4pm) + 4.[T][X] join sports club + 5.[T][ ] borrow book + ________________________________________ + + ________________________________________ + OK! I've marked this task as not done yet: + [D][ ] return book (by: June 6th) + ________________________________________ + + ________________________________________ + Here are the tasks in your list: + 1.[T][X] read book + 2.[D][ ] return book (by: June 6th) + 3.[E][ ] project meeting (from: Aug 6th 2pm to: 4pm) + 4.[T][X] join sports club + 5.[T][ ] borrow book + ________________________________________ + + ________________________________________ + OK! I've marked this task as not done yet: + [E][ ] project meeting (from: Aug 6th 2pm to: 4pm) + ________________________________________ + + ________________________________________ + Here are the tasks in your list: + 1.[T][X] read book + 2.[D][ ] return book (by: June 6th) + 3.[E][ ] project meeting (from: Aug 6th 2pm to: 4pm) + 4.[T][X] join sports club + 5.[T][ ] borrow book + ________________________________________ + + ________________________________________ + Invalid input + ________________________________________ + + ________________________________________ + Bye. Hope to see you again soon! + ________________________________________ \ No newline at end of file diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index e69de29bb2..31f4a103e1 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -0,0 +1,24 @@ +todo read book +deadline return book /by June 6th +event project meeting /from Aug 6th 2pm /to 4pm +todo join sports club +todo borrow book +%%%%% +aldkgfkjhwabfrk +todooo +de3dline +3v3nt +todo +deadline +event +mark 1 +mark 4 +list +mark 2 +list +unmark 2 +list +unmark 3 +list + +bye \ No newline at end of file From 03baad67623e4dc87b55f3829d65ca84c0d7e958 Mon Sep 17 00:00:00 2001 From: You Wei Date: Tue, 22 Aug 2023 00:52:12 +0800 Subject: [PATCH 09/70] Added error handles --- src/main/java/Duke.java | 88 +++++++++++++------ src/main/java/Events.java | 2 +- src/main/java/InvalidInputException.java | 4 + src/main/java/MissingArgumentException.java | 4 + .../java/MissingDateArgumentException.java | 11 +++ .../java/MissingTaskArgumentException.java | 11 +++ src/main/java/Task.java | 2 +- text-ui-test/EXPECTED.TXT | 42 +++++++-- text-ui-test/input.txt | 6 ++ 9 files changed, 134 insertions(+), 36 deletions(-) create mode 100644 src/main/java/MissingArgumentException.java create mode 100644 src/main/java/MissingDateArgumentException.java create mode 100644 src/main/java/MissingTaskArgumentException.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index a23bc4aef9..b6addf08f8 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -14,13 +14,13 @@ public static void main(String[] args) { return; } else if (input.equals("list")) { tasks.printTasks(); - } else if (input.startsWith("mark ")) { + } else if (input.startsWith("mark")) { markTask(input, true); - } else if (input.startsWith("unmark ")) { + } else if (input.startsWith("unmark")) { markTask(input, false); - } else if (input.startsWith("todo ")) { + } else if (input.startsWith("todo")) { handleToDo(input); - } else if (input.startsWith("deadline ")) { + } else if (input.startsWith("deadline")) { handleDeadline(input); } else if (input.startsWith("event")) { handleEvent(input); @@ -28,7 +28,9 @@ public static void main(String[] args) { throw new InvalidInputException(); } } catch (InvalidInputException e) { - reply.printDialog("Invalid input"); + reply.printDialog(e.toString()); + } catch (MissingArgumentException e) { + reply.printDialog(e.toString()); } } @@ -46,48 +48,84 @@ public static void markTask(String input, boolean mark) throws InvalidInputExcep tasks.unmarkDone(Integer.parseInt(split[1])); } } catch (NumberFormatException e ) { - reply.printDialog("Invalid number"); + reply.printDialog(" I can only understand numbers"); } catch (IndexOutOfBoundsException e) { - reply.printDialog("Index number does not exist"); + reply.printDialog(" Index number does not exist in our list"); } } } - private static void handleToDo(String input) { - String todo = input.substring(4); + private static void handleToDo(String input) throws MissingArgumentException, InvalidInputException { + String todo = getCommandArguments(input, "todo"); + if (todo.isEmpty()) { + throw new MissingTaskArgumentException("todo"); + } tasks.addTask(new ToDo(todo)); } - private static void handleDeadline(String input) throws InvalidInputException { - String deadline = input.substring(8); + private static void handleDeadline(String input) throws InvalidInputException, MissingArgumentException { + String deadline = getCommandArguments(input, "deadline"); String[] slice = deadline.split("/"); - if (slice.length != 2) { + if (slice.length > 2) { throw new InvalidInputException(); + } else if (slice.length == 1) { + throw new MissingDateArgumentException("by"); } else { - if (!slice[1].startsWith("by")) { - throw new InvalidInputException(); + String desc = slice[0]; + String date; + if (slice[1].startsWith("by")) { + date = getCommandArguments(slice[1], "by"); + } else { + throw new MissingDateArgumentException("by"); } - String desc = slice[0]; - String date = slice[1].substring(3); tasks.addTask(new Deadlines(desc, date)); } } - private static void handleEvent(String input) throws InvalidInputException { - String event = input.substring(5); + private static void handleEvent(String input) throws InvalidInputException, MissingArgumentException { + String event = getCommandArguments(input, "event"); String[] slice = event.split("/"); - if (slice.length != 3) { + + if (slice.length > 3) { throw new InvalidInputException(); + } else if (slice.length < 3) { + throw new MissingDateArgumentException("from and /to"); } else { - if (!slice[1].startsWith("from") || !slice[2].startsWith("to")) { - throw new InvalidInputException(); + String desc = slice[0]; + String from; + String to; + + if (slice[1].startsWith("from")) { + from = getCommandArguments(slice[1], "from"); + } else { + throw new MissingDateArgumentException("from"); + } + + if (slice[2].startsWith("to")) { + to = getCommandArguments(slice[2], "to"); + } else { + throw new MissingDateArgumentException("to"); } - String desc = slice[0]; - String from = slice[1].substring(4); - String to = slice[2].substring(2); tasks.addTask(new Events(desc, from, to)); } } -} + + private static String getCommandArguments(String input, String command) throws InvalidInputException, MissingArgumentException { + int cmdLength = command.length(); + String args = input.substring(cmdLength); + + if (args.isBlank()) { + if (command.equals("todo") || command.equals("event") || command.equals("deadline")) { + throw new MissingTaskArgumentException(command); + } else { + throw new MissingDateArgumentException(command); + } + } else if (args.startsWith(" ")){ + return args.substring(1); + } else { + throw new InvalidInputException(); + } + } +} \ No newline at end of file diff --git a/src/main/java/Events.java b/src/main/java/Events.java index 765801d7e7..2a279d0462 100644 --- a/src/main/java/Events.java +++ b/src/main/java/Events.java @@ -9,6 +9,6 @@ public Events(String description, String from, String to) { @Override public String toString() { - return "[E]" + super.toString() + " (from:" + from + "to:" + to + ")"; + return "[E]" + super.toString() + " (from: " + from + "to: " + to + ")"; } } diff --git a/src/main/java/InvalidInputException.java b/src/main/java/InvalidInputException.java index 142a402f88..c0b6dbbfb2 100644 --- a/src/main/java/InvalidInputException.java +++ b/src/main/java/InvalidInputException.java @@ -1,2 +1,6 @@ public class InvalidInputException extends Exception{ + @Override + public String toString() { + return " ☹ OOPS!!! I'm sorry, but I don't know what that means :-("; + } } diff --git a/src/main/java/MissingArgumentException.java b/src/main/java/MissingArgumentException.java new file mode 100644 index 0000000000..795abd7f93 --- /dev/null +++ b/src/main/java/MissingArgumentException.java @@ -0,0 +1,4 @@ +public abstract class MissingArgumentException extends Exception{ + @Override + public abstract String toString(); +} diff --git a/src/main/java/MissingDateArgumentException.java b/src/main/java/MissingDateArgumentException.java new file mode 100644 index 0000000000..4c266e88dd --- /dev/null +++ b/src/main/java/MissingDateArgumentException.java @@ -0,0 +1,11 @@ +public class MissingDateArgumentException extends MissingArgumentException { + private String string; + MissingDateArgumentException(String string) { + this.string = string; + } + + @Override + public String toString() { + return " ☹ OOPS!!! Please type the command: '/" + this.string + "' followed by the specified date in any format."; + } +} diff --git a/src/main/java/MissingTaskArgumentException.java b/src/main/java/MissingTaskArgumentException.java new file mode 100644 index 0000000000..29ecd01d65 --- /dev/null +++ b/src/main/java/MissingTaskArgumentException.java @@ -0,0 +1,11 @@ +public class MissingTaskArgumentException extends MissingArgumentException { + private String task; + MissingTaskArgumentException(String task) { + this.task = task; + } + + @Override + public String toString() { + return " ☹ OOPS!!! The description of a " + this.task + " cannot be empty."; + } +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 41553d47ba..e55899d0e5 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -21,6 +21,6 @@ public void markAsNotDone() { @Override public String toString() { - return "[" + getStatusIcon() + "]" + description; + return "[" + getStatusIcon() + "] " + description; } } diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index edd87b7906..08d9059191 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -34,35 +34,35 @@ ________________________________________ ________________________________________ - Invalid input + ☹ OOPS!!! I'm sorry, but I don't know what that means :-( ________________________________________ ________________________________________ - Invalid input + ☹ OOPS!!! I'm sorry, but I don't know what that means :-( ________________________________________ ________________________________________ - Invalid input + ☹ OOPS!!! I'm sorry, but I don't know what that means :-( ________________________________________ ________________________________________ - Invalid input + ☹ OOPS!!! I'm sorry, but I don't know what that means :-( ________________________________________ ________________________________________ - Invalid input + ☹ OOPS!!! I'm sorry, but I don't know what that means :-( ________________________________________ ________________________________________ - Invalid input + ☹ OOPS!!! The description of a todo cannot be empty. ________________________________________ ________________________________________ - Invalid input + ☹ OOPS!!! The description of a deadline cannot be empty. ________________________________________ ________________________________________ - Invalid input + ☹ OOPS!!! The description of a event cannot be empty. ________________________________________ ________________________________________ @@ -127,7 +127,31 @@ ________________________________________ ________________________________________ - Invalid input + ☹ OOPS!!! I'm sorry, but I don't know what that means :-( + ________________________________________ + + ________________________________________ + ☹ OOPS!!! Please type the command: '/by' followed by the specified date in any format. + ________________________________________ + + ________________________________________ + ☹ OOPS!!! Please type the command: '/from and /to' followed by the specified date in any format. + ________________________________________ + + ________________________________________ + ☹ OOPS!!! Please type the command: '/from and /to' followed by the specified date in any format. + ________________________________________ + + ________________________________________ + ☹ OOPS!!! Please type the command: '/from and /to' followed by the specified date in any format. + ________________________________________ + + ________________________________________ + ☹ OOPS!!! Please type the command: '/from' followed by the specified date in any format. + ________________________________________ + + ________________________________________ + ☹ OOPS!!! Please type the command: '/to' followed by the specified date in any format. ________________________________________ ________________________________________ diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 31f4a103e1..bb53193a39 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -21,4 +21,10 @@ list unmark 3 list +deadline task without by +event task without argument +event task /from with one argument +event task /to with one argument +event task /by with wrong argument /to to +event task /from without from and to but uses /by bye \ No newline at end of file From 8c2b3773abc7931f9adf2668528f955da37d9ff1 Mon Sep 17 00:00:00 2001 From: You Wei Date: Tue, 22 Aug 2023 01:30:56 +0800 Subject: [PATCH 10/70] Added delete --- src/main/java/Duke.java | 41 ++++++++++++++++++++++--------------- src/main/java/TaskList.java | 14 +++++++++++++ text-ui-test/EXPECTED.TXT | 14 +++++++++++++ text-ui-test/input.txt | 2 ++ 4 files changed, 55 insertions(+), 16 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index b6addf08f8..e887005ea6 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -24,6 +24,8 @@ public static void main(String[] args) { handleDeadline(input); } else if (input.startsWith("event")) { handleEvent(input); + } else if (input.startsWith("delete")) { + deleteTask(input); } else { throw new InvalidInputException(); } @@ -36,22 +38,19 @@ public static void main(String[] args) { } - public static void markTask(String input, boolean mark) throws InvalidInputException { - String[] split = input.split(" "); - if (split.length > 2) { - throw new InvalidInputException(); - } else { - try { - if (mark) { - tasks.markDone(Integer.parseInt(split[1])); - } else { - tasks.unmarkDone(Integer.parseInt(split[1])); - } - } catch (NumberFormatException e ) { - reply.printDialog(" I can only understand numbers"); - } catch (IndexOutOfBoundsException e) { - reply.printDialog(" Index number does not exist in our list"); + public static void markTask(String input, boolean mark) throws InvalidInputException, MissingArgumentException { + String command = mark ? "mark" : "unmark"; + String number = getCommandArguments(input, command); + try { + if (mark) { + tasks.markDone(Integer.parseInt(number)); + } else { + tasks.unmarkDone(Integer.parseInt(number)); } + } catch (NumberFormatException e ) { + reply.printDialog(" Strictly type 1 number only"); + } catch (IndexOutOfBoundsException e) { + reply.printDialog(" Index number does not exist in our list"); } } @@ -107,11 +106,21 @@ private static void handleEvent(String input) throws InvalidInputException, Miss } else { throw new MissingDateArgumentException("to"); } - tasks.addTask(new Events(desc, from, to)); } } + private static void deleteTask(String input) throws InvalidInputException, MissingArgumentException { + String number = getCommandArguments(input,"delete"); + try { + tasks.deleteTask(Integer.parseInt(number)); + } catch (NumberFormatException e ) { + reply.printDialog(" Strictly type 1 number only"); + } catch (IndexOutOfBoundsException e) { + reply.printDialog(" Index number does not exist in our list"); + } + } + private static String getCommandArguments(String input, String command) throws InvalidInputException, MissingArgumentException { int cmdLength = command.length(); String args = input.substring(cmdLength); diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index c1571a24af..52e1346538 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -57,4 +57,18 @@ public void unmarkDone(int index) { .append(element); reply.printDialog(dialog.toString()); } + + public void deleteTask(int index) { + StringBuilder dialog = new StringBuilder(); + Task element = list.get(index - 1); + list.remove(index - 1); + dialog.append("Noted. I've removed this task:\n") + .append(" ") + .append(element) + .append("\n") + .append(" Now you have ") + .append(list.size()) + .append(" tasks in the list."); + reply.printDialog(dialog.toString()); + } } diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 08d9059191..bc95021040 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -154,6 +154,20 @@ ☹ OOPS!!! Please type the command: '/to' followed by the specified date in any format. ________________________________________ + ________________________________________ + Noted. I've removed this task: + [T][X] read book + Now you have 4 tasks in the list. + ________________________________________ + + ________________________________________ + Here are the tasks in your list: + 1.[D][ ] return book (by: June 6th) + 2.[E][ ] project meeting (from: Aug 6th 2pm to: 4pm) + 3.[T][X] join sports club + 4.[T][ ] borrow book + ________________________________________ + ________________________________________ Bye. Hope to see you again soon! ________________________________________ \ No newline at end of file diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index bb53193a39..53a1562e18 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -27,4 +27,6 @@ event task /from with one argument event task /to with one argument event task /by with wrong argument /to to event task /from without from and to but uses /by +delete 1 +list bye \ No newline at end of file From 76606d428a543c2721e38fae6c779948abdbeeaa Mon Sep 17 00:00:00 2001 From: You Wei Date: Tue, 22 Aug 2023 02:15:51 +0800 Subject: [PATCH 11/70] Use Enums --- src/main/java/Duke.java | 96 +++++++++++++++++++++++++++------------ text-ui-test/EXPECTED.TXT | 8 ++++ text-ui-test/input.txt | 2 + 3 files changed, 76 insertions(+), 30 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index e887005ea6..baabb09710 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,6 +1,35 @@ import java.util.Scanner; public class Duke { + public enum COMMAND { + BYE("bye"), + LIST("list"), + MARK("mark"), + UNMARK("unmark"), + DELETE("delete"), + DEADLINE("deadline"), + TODO("todo"), + EVENT("event"), + BY("by"), + FROM("from"), + TO("to"); + + private String cmd; + private int strLength; + + COMMAND(String cmd) { + this.cmd = cmd; + this.strLength = cmd.length(); + } + + public String getCommand() { + return this.cmd; + } + + public int getCommandStringLength() { + return this.strLength; + } + } private static TaskList tasks = new TaskList(); private static Reply reply = Reply.init(); public static void main(String[] args) { @@ -9,22 +38,22 @@ public static void main(String[] args) { while(true) { try { String input = scanner.nextLine(); - if (input.equals("bye")) { + if (input.equals(COMMAND.BYE.getCommand())) { reply.printDialog("Bye. Hope to see you again soon!"); return; - } else if (input.equals("list")) { + } else if (input.equals(COMMAND.LIST.getCommand())) { tasks.printTasks(); - } else if (input.startsWith("mark")) { + } else if (input.startsWith(COMMAND.MARK.getCommand())) { markTask(input, true); - } else if (input.startsWith("unmark")) { + } else if (input.startsWith(COMMAND.UNMARK.getCommand())) { markTask(input, false); - } else if (input.startsWith("todo")) { + } else if (input.startsWith(COMMAND.TODO.getCommand())) { handleToDo(input); - } else if (input.startsWith("deadline")) { + } else if (input.startsWith(COMMAND.DEADLINE.getCommand())) { handleDeadline(input); - } else if (input.startsWith("event")) { + } else if (input.startsWith(COMMAND.EVENT.getCommand())) { handleEvent(input); - } else if (input.startsWith("delete")) { + } else if (input.startsWith(COMMAND.DELETE.getCommand())) { deleteTask(input); } else { throw new InvalidInputException(); @@ -39,7 +68,7 @@ public static void main(String[] args) { } public static void markTask(String input, boolean mark) throws InvalidInputException, MissingArgumentException { - String command = mark ? "mark" : "unmark"; + COMMAND command = mark ? COMMAND.MARK : COMMAND.UNMARK; String number = getCommandArguments(input, command); try { if (mark) { @@ -55,27 +84,27 @@ public static void markTask(String input, boolean mark) throws InvalidInputExcep } private static void handleToDo(String input) throws MissingArgumentException, InvalidInputException { - String todo = getCommandArguments(input, "todo"); + String todo = getCommandArguments(input, COMMAND.TODO); if (todo.isEmpty()) { - throw new MissingTaskArgumentException("todo"); + throw new MissingTaskArgumentException(COMMAND.TODO.getCommand()); } tasks.addTask(new ToDo(todo)); } private static void handleDeadline(String input) throws InvalidInputException, MissingArgumentException { - String deadline = getCommandArguments(input, "deadline"); + String deadline = getCommandArguments(input, COMMAND.DEADLINE); String[] slice = deadline.split("/"); if (slice.length > 2) { throw new InvalidInputException(); } else if (slice.length == 1) { - throw new MissingDateArgumentException("by"); + throw new MissingDateArgumentException(COMMAND.BY.getCommand()); } else { String desc = slice[0]; String date; - if (slice[1].startsWith("by")) { - date = getCommandArguments(slice[1], "by"); + if (slice[1].startsWith(COMMAND.BY.getCommand())) { + date = getCommandArguments(slice[1], COMMAND.BY); } else { - throw new MissingDateArgumentException("by"); + throw new MissingDateArgumentException(COMMAND.BY.getCommand()); } tasks.addTask(new Deadlines(desc, date)); @@ -83,7 +112,7 @@ private static void handleDeadline(String input) throws InvalidInputException, M } private static void handleEvent(String input) throws InvalidInputException, MissingArgumentException { - String event = getCommandArguments(input, "event"); + String event = getCommandArguments(input, COMMAND.EVENT); String[] slice = event.split("/"); if (slice.length > 3) { @@ -95,23 +124,23 @@ private static void handleEvent(String input) throws InvalidInputException, Miss String from; String to; - if (slice[1].startsWith("from")) { - from = getCommandArguments(slice[1], "from"); + if (slice[1].startsWith(COMMAND.FROM.getCommand())) { + from = getCommandArguments(slice[1], COMMAND.FROM); } else { - throw new MissingDateArgumentException("from"); + throw new MissingDateArgumentException(COMMAND.FROM.getCommand()); } - if (slice[2].startsWith("to")) { - to = getCommandArguments(slice[2], "to"); + if (slice[2].startsWith(COMMAND.TO.getCommand())) { + to = getCommandArguments(slice[2], COMMAND.TO); } else { - throw new MissingDateArgumentException("to"); + throw new MissingDateArgumentException(COMMAND.TO.getCommand()); } tasks.addTask(new Events(desc, from, to)); } } private static void deleteTask(String input) throws InvalidInputException, MissingArgumentException { - String number = getCommandArguments(input,"delete"); + String number = getCommandArguments(input,COMMAND.DELETE); try { tasks.deleteTask(Integer.parseInt(number)); } catch (NumberFormatException e ) { @@ -121,15 +150,22 @@ private static void deleteTask(String input) throws InvalidInputException, Missi } } - private static String getCommandArguments(String input, String command) throws InvalidInputException, MissingArgumentException { - int cmdLength = command.length(); + private static String getCommandArguments(String input, COMMAND command) throws InvalidInputException, MissingArgumentException { + int cmdLength = command.getCommandStringLength(); String args = input.substring(cmdLength); if (args.isBlank()) { - if (command.equals("todo") || command.equals("event") || command.equals("deadline")) { - throw new MissingTaskArgumentException(command); - } else { - throw new MissingDateArgumentException(command); + switch (command) { + case TODO: + case EVENT: + case DEADLINE: + throw new MissingTaskArgumentException(command.getCommand()); + case BY: + case TO: + case FROM: + throw new MissingDateArgumentException(command.getCommand()); + default: + throw new InvalidInputException(); } } else if (args.startsWith(" ")){ return args.substring(1); diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index bc95021040..1a2435ebb5 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -168,6 +168,14 @@ 4.[T][ ] borrow book ________________________________________ + ________________________________________ + Index number does not exist in our list + ________________________________________ + + ________________________________________ + Strictly type 1 number only + ________________________________________ + ________________________________________ Bye. Hope to see you again soon! ________________________________________ \ No newline at end of file diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 53a1562e18..0e2115deee 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -29,4 +29,6 @@ event task /by with wrong argument /to to event task /from without from and to but uses /by delete 1 list +mark 10 +mark 1 2 bye \ No newline at end of file From c47583d7fbf280c074f81bb24570356801df0d3d Mon Sep 17 00:00:00 2001 From: You Wei Date: Sun, 27 Aug 2023 23:09:03 +0800 Subject: [PATCH 12/70] Add Save --- .gitignore | 2 + data/tasklist.txt | 1 + src/main/java/Command.java | 29 +++++++++++++ src/main/java/Database.java | 58 ++++++++++++++++++++++++++ src/main/java/Deadlines.java | 15 ++++++- src/main/java/Duke.java | 80 ++++++++++++------------------------ src/main/java/Events.java | 17 +++++++- src/main/java/Reply.java | 2 - src/main/java/Task.java | 11 ++++- src/main/java/TaskList.java | 17 +++++++- src/main/java/ToDo.java | 13 +++++- text-ui-test/runtest.bat | 2 +- 12 files changed, 183 insertions(+), 64 deletions(-) create mode 100644 data/tasklist.txt create mode 100644 src/main/java/Command.java create mode 100644 src/main/java/Database.java diff --git a/.gitignore b/.gitignore index c797d81b7e..8008db6f1e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,7 @@ bin/ /text-ui-test/ACTUAL.TXT text-ui-test/EXPECTED-UNIX.TXT +/data/tasklist.txt + # Class files src/main/java/*.class diff --git a/data/tasklist.txt b/data/tasklist.txt new file mode 100644 index 0000000000..79e50b9b68 --- /dev/null +++ b/data/tasklist.txt @@ -0,0 +1 @@ +todo/false/read book diff --git a/src/main/java/Command.java b/src/main/java/Command.java new file mode 100644 index 0000000000..1a7a8bf76c --- /dev/null +++ b/src/main/java/Command.java @@ -0,0 +1,29 @@ +public enum Command { + BYE("bye"), + LIST("list"), + MARK("mark"), + UNMARK("unmark"), + DELETE("delete"), + DEADLINE("deadline"), + TODO("todo"), + EVENT("event"), + BY("by"), + FROM("from"), + TO("to"); + + private String cmd; + private int strLength; + + Command(String cmd) { + this.cmd = cmd; + this.strLength = cmd.length(); + } + + public String getCommand() { + return this.cmd; + } + + public int getCommandStringLength() { + return this.strLength; + } +} diff --git a/src/main/java/Database.java b/src/main/java/Database.java new file mode 100644 index 0000000000..ea6499b2f9 --- /dev/null +++ b/src/main/java/Database.java @@ -0,0 +1,58 @@ +import java.io.*; +import java.util.ArrayList; + +public class Database { + public static void save(ArrayList list) { + File file = new File("data/tasklist.txt"); + try { + FileWriter fileToWrite = new FileWriter(file); + Task[] tasks = list.toArray(Task[]::new); + + for (int i = 0; i < tasks.length; i++) { + fileToWrite.write(tasks[i].dataFormat()); + fileToWrite.write(System.lineSeparator()); + } + + fileToWrite.close(); + } catch (IOException e) { + Reply reply = Reply.init(); + reply.printDialog("Oops! Sorry! There is an issue with the file database. " + + "You are required to delete the file and recreate one with the same name"); + } + } + + public static ArrayList loadData() { + File file = new File("data/tasklist.txt"); + ArrayList list = new ArrayList<>(); + try { + FileReader fileReader = new FileReader(file); + BufferedReader fileToRead = new BufferedReader(fileReader); + String nextLine = fileToRead.readLine(); + + while (nextLine != null) { + String[] data = nextLine.split("/"); + String taskType = data[0]; + boolean status = data[1].equals("true"); + if (taskType.equals(Command.TODO.getCommand())) { + list.add(new ToDo(status, data[2])); + } else if (taskType.equals(Command.DEADLINE.getCommand())) { + list.add(new Deadlines(status, data[2], data[3])); + } else if (taskType.equals(Command.EVENT.getCommand())) { + list.add(new Events(status, data[2], data[3], data[4])); + } + nextLine = fileToRead.readLine(); + } + fileReader.close(); + fileToRead.close(); + + } catch (IOException e) { + Reply reply = Reply.init(); + reply.printDialog("Oops! Sorry! There is an issue with the file database. " + + "You are required to delete the file and recreate one with the same name."); + } catch (ArrayIndexOutOfBoundsException e) { + Reply reply = Reply.init(); + reply.printDialog("Oops! Sorry! There is an issue with the data formatting in the database."); + } + return list; + } +} diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java index 93fa032afb..6b795f91af 100644 --- a/src/main/java/Deadlines.java +++ b/src/main/java/Deadlines.java @@ -1,4 +1,4 @@ -public class Deadlines extends Task{ +public class Deadlines extends Task { protected String by; public Deadlines(String description, String by) { @@ -6,8 +6,21 @@ public Deadlines(String description, String by) { this.by = by; } + public Deadlines(boolean status, String description, String by) { + super(status, description); + this.by = by; + } + @Override public String toString() { return "[D]" + super.toString() + " (by: " + by + ")"; } + + @Override + public String dataFormat() { + return "deadline/" + + super.isDone.toString() + "/" + + super.description + "/" + + this.by; + } } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index baabb09710..1e30c34864 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,36 +1,8 @@ import java.util.Scanner; public class Duke { - public enum COMMAND { - BYE("bye"), - LIST("list"), - MARK("mark"), - UNMARK("unmark"), - DELETE("delete"), - DEADLINE("deadline"), - TODO("todo"), - EVENT("event"), - BY("by"), - FROM("from"), - TO("to"); - private String cmd; - private int strLength; - - COMMAND(String cmd) { - this.cmd = cmd; - this.strLength = cmd.length(); - } - - public String getCommand() { - return this.cmd; - } - - public int getCommandStringLength() { - return this.strLength; - } - } - private static TaskList tasks = new TaskList(); + private static TaskList tasks = TaskList.init(); private static Reply reply = Reply.init(); public static void main(String[] args) { //Start user interaction @@ -38,22 +10,22 @@ public static void main(String[] args) { while(true) { try { String input = scanner.nextLine(); - if (input.equals(COMMAND.BYE.getCommand())) { + if (input.equals(Command.BYE.getCommand())) { reply.printDialog("Bye. Hope to see you again soon!"); return; - } else if (input.equals(COMMAND.LIST.getCommand())) { + } else if (input.equals(Command.LIST.getCommand())) { tasks.printTasks(); - } else if (input.startsWith(COMMAND.MARK.getCommand())) { + } else if (input.startsWith(Command.MARK.getCommand())) { markTask(input, true); - } else if (input.startsWith(COMMAND.UNMARK.getCommand())) { + } else if (input.startsWith(Command.UNMARK.getCommand())) { markTask(input, false); - } else if (input.startsWith(COMMAND.TODO.getCommand())) { + } else if (input.startsWith(Command.TODO.getCommand())) { handleToDo(input); - } else if (input.startsWith(COMMAND.DEADLINE.getCommand())) { + } else if (input.startsWith(Command.DEADLINE.getCommand())) { handleDeadline(input); - } else if (input.startsWith(COMMAND.EVENT.getCommand())) { + } else if (input.startsWith(Command.EVENT.getCommand())) { handleEvent(input); - } else if (input.startsWith(COMMAND.DELETE.getCommand())) { + } else if (input.startsWith(Command.DELETE.getCommand())) { deleteTask(input); } else { throw new InvalidInputException(); @@ -68,7 +40,7 @@ public static void main(String[] args) { } public static void markTask(String input, boolean mark) throws InvalidInputException, MissingArgumentException { - COMMAND command = mark ? COMMAND.MARK : COMMAND.UNMARK; + Command command = mark ? Command.MARK : Command.UNMARK; String number = getCommandArguments(input, command); try { if (mark) { @@ -84,27 +56,27 @@ public static void markTask(String input, boolean mark) throws InvalidInputExcep } private static void handleToDo(String input) throws MissingArgumentException, InvalidInputException { - String todo = getCommandArguments(input, COMMAND.TODO); + String todo = getCommandArguments(input, Command.TODO); if (todo.isEmpty()) { - throw new MissingTaskArgumentException(COMMAND.TODO.getCommand()); + throw new MissingTaskArgumentException(Command.TODO.getCommand()); } tasks.addTask(new ToDo(todo)); } private static void handleDeadline(String input) throws InvalidInputException, MissingArgumentException { - String deadline = getCommandArguments(input, COMMAND.DEADLINE); + String deadline = getCommandArguments(input, Command.DEADLINE); String[] slice = deadline.split("/"); if (slice.length > 2) { throw new InvalidInputException(); } else if (slice.length == 1) { - throw new MissingDateArgumentException(COMMAND.BY.getCommand()); + throw new MissingDateArgumentException(Command.BY.getCommand()); } else { String desc = slice[0]; String date; - if (slice[1].startsWith(COMMAND.BY.getCommand())) { - date = getCommandArguments(slice[1], COMMAND.BY); + if (slice[1].startsWith(Command.BY.getCommand())) { + date = getCommandArguments(slice[1], Command.BY); } else { - throw new MissingDateArgumentException(COMMAND.BY.getCommand()); + throw new MissingDateArgumentException(Command.BY.getCommand()); } tasks.addTask(new Deadlines(desc, date)); @@ -112,7 +84,7 @@ private static void handleDeadline(String input) throws InvalidInputException, M } private static void handleEvent(String input) throws InvalidInputException, MissingArgumentException { - String event = getCommandArguments(input, COMMAND.EVENT); + String event = getCommandArguments(input, Command.EVENT); String[] slice = event.split("/"); if (slice.length > 3) { @@ -124,23 +96,23 @@ private static void handleEvent(String input) throws InvalidInputException, Miss String from; String to; - if (slice[1].startsWith(COMMAND.FROM.getCommand())) { - from = getCommandArguments(slice[1], COMMAND.FROM); + if (slice[1].startsWith(Command.FROM.getCommand())) { + from = getCommandArguments(slice[1], Command.FROM); } else { - throw new MissingDateArgumentException(COMMAND.FROM.getCommand()); + throw new MissingDateArgumentException(Command.FROM.getCommand()); } - if (slice[2].startsWith(COMMAND.TO.getCommand())) { - to = getCommandArguments(slice[2], COMMAND.TO); + if (slice[2].startsWith(Command.TO.getCommand())) { + to = getCommandArguments(slice[2], Command.TO); } else { - throw new MissingDateArgumentException(COMMAND.TO.getCommand()); + throw new MissingDateArgumentException(Command.TO.getCommand()); } tasks.addTask(new Events(desc, from, to)); } } private static void deleteTask(String input) throws InvalidInputException, MissingArgumentException { - String number = getCommandArguments(input,COMMAND.DELETE); + String number = getCommandArguments(input,Command.DELETE); try { tasks.deleteTask(Integer.parseInt(number)); } catch (NumberFormatException e ) { @@ -150,7 +122,7 @@ private static void deleteTask(String input) throws InvalidInputException, Missi } } - private static String getCommandArguments(String input, COMMAND command) throws InvalidInputException, MissingArgumentException { + private static String getCommandArguments(String input, Command command) throws InvalidInputException, MissingArgumentException { int cmdLength = command.getCommandStringLength(); String args = input.substring(cmdLength); diff --git a/src/main/java/Events.java b/src/main/java/Events.java index 2a279d0462..0f24274f16 100644 --- a/src/main/java/Events.java +++ b/src/main/java/Events.java @@ -1,4 +1,4 @@ -public class Events extends Task{ +public class Events extends Task { protected String from; protected String to; public Events(String description, String from, String to) { @@ -7,8 +7,23 @@ public Events(String description, String from, String to) { this.to = to; } + public Events(boolean status, String description, String from, String to) { + super(status, description); + this.from = from; + this.to = to; + } + @Override public String toString() { return "[E]" + super.toString() + " (from: " + from + "to: " + to + ")"; } + + @Override + public String dataFormat() { + return "event/" + + super.isDone.toString() + "/" + + super.description + "/" + + this.from + "/" + + this.to; + } } diff --git a/src/main/java/Reply.java b/src/main/java/Reply.java index 9eba2188e0..a3a0715fd6 100644 --- a/src/main/java/Reply.java +++ b/src/main/java/Reply.java @@ -1,5 +1,3 @@ -import java.awt.*; - public class Reply { private String indent = " "; private String section = indent + "________________________________________\n"; diff --git a/src/main/java/Task.java b/src/main/java/Task.java index e55899d0e5..4d494bc430 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,12 +1,17 @@ -public class Task { +public abstract class Task { protected String description; - protected boolean isDone; + protected Boolean isDone; public Task(String description) { this.description = description; this.isDone = false; } + public Task(boolean done, String description) { + this.description = description; + this.isDone = done; + } + public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } @@ -23,4 +28,6 @@ public void markAsNotDone() { public String toString() { return "[" + getStatusIcon() + "] " + description; } + + public abstract String dataFormat(); } diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 52e1346538..51e4074977 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -1,15 +1,25 @@ import java.util.ArrayList; public class TaskList { + private static TaskList obj; private ArrayList list; private final Reply reply = Reply.init(); - public TaskList() { - list = new ArrayList<>(); + private TaskList() { + list = Database.loadData(); + } + + public static TaskList init() { + if (obj == null) { + obj = new TaskList(); + } + return obj; } public void addTask(Task task) { list.add(task); + Database.save(this.list); + StringBuilder dialog = new StringBuilder("Got it. I've added this task:\n ") .append(task) .append("\n ") @@ -42,6 +52,7 @@ public void markDone(int index) { StringBuilder dialog = new StringBuilder(); Task element = list.get(index - 1); element.markAsDone(); + Database.save(list); dialog.append("Nice! I've marked this task as done:\n") .append(" ") .append(element); @@ -52,6 +63,7 @@ public void unmarkDone(int index) { StringBuilder dialog = new StringBuilder(); Task element = list.get(index - 1); element.markAsNotDone(); + Database.save(list); dialog.append("OK! I've marked this task as not done yet:\n") .append(" ") .append(element); @@ -62,6 +74,7 @@ public void deleteTask(int index) { StringBuilder dialog = new StringBuilder(); Task element = list.get(index - 1); list.remove(index - 1); + Database.save(list); dialog.append("Noted. I've removed this task:\n") .append(" ") .append(element) diff --git a/src/main/java/ToDo.java b/src/main/java/ToDo.java index 023c97b369..a5cc69b609 100644 --- a/src/main/java/ToDo.java +++ b/src/main/java/ToDo.java @@ -1,10 +1,21 @@ -public class ToDo extends Task{ +public class ToDo extends Task { public ToDo(String description) { super(description); } + public ToDo(boolean done, String description) { + super(done, description); + } + @Override public String toString() { return "[T]" + super.toString(); } + + @Override + public String dataFormat() { + return "todo/" + + isDone.toString() + "/" + + description; + } } diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 0873744649..ae6cc9ff89 100644 --- a/text-ui-test/runtest.bat +++ b/text-ui-test/runtest.bat @@ -18,4 +18,4 @@ REM run the program, feed commands from input.txt file and redirect the output t java -classpath ..\bin Duke < input.txt > ACTUAL.TXT REM compare the output to the expected output -FC ACTUAL.TXT EXPECTED.TXT +FC ACTUAL.TXT EXPECTED.TXT \ No newline at end of file From 6e93a9d890120065b528b5c997a6f6a6f531c744 Mon Sep 17 00:00:00 2001 From: You Wei Date: Sun, 27 Aug 2023 23:36:23 +0800 Subject: [PATCH 13/70] Organise packages --- .gitignore | 2 +- src/main/java/Database.java | 8 +++++++- src/main/java/Duke.java | 9 +++++++++ src/main/java/{ => Enums}/Command.java | 2 ++ src/main/java/{ => Exception}/InvalidInputException.java | 2 ++ .../java/{ => Exception}/MissingArgumentException.java | 2 ++ .../{ => Exception}/MissingDateArgumentException.java | 4 +++- .../{ => Exception}/MissingTaskArgumentException.java | 4 +++- src/main/java/{ => Task}/Deadlines.java | 4 ++++ src/main/java/{ => Task}/Events.java | 4 ++++ src/main/java/{ => Task}/Task.java | 2 ++ src/main/java/{ => Task}/ToDo.java | 4 ++++ src/main/java/TaskList.java | 4 +++- src/main/java/Time.java | 2 ++ 14 files changed, 48 insertions(+), 5 deletions(-) rename src/main/java/{ => Enums}/Command.java (97%) rename src/main/java/{ => Exception}/InvalidInputException.java (90%) rename src/main/java/{ => Exception}/MissingArgumentException.java (85%) rename src/main/java/{ => Exception}/MissingDateArgumentException.java (80%) rename src/main/java/{ => Exception}/MissingTaskArgumentException.java (78%) rename src/main/java/{ => Task}/Deadlines.java (94%) rename src/main/java/{ => Task}/Events.java (95%) rename src/main/java/{ => Task}/Task.java (97%) rename src/main/java/{ => Task}/ToDo.java (92%) create mode 100644 src/main/java/Time.java diff --git a/.gitignore b/.gitignore index 8008db6f1e..88ea822527 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ bin/ /text-ui-test/ACTUAL.TXT text-ui-test/EXPECTED-UNIX.TXT -/data/tasklist.txt +data/tasklist.txt # Class files src/main/java/*.class diff --git a/src/main/java/Database.java b/src/main/java/Database.java index ea6499b2f9..724bc7c434 100644 --- a/src/main/java/Database.java +++ b/src/main/java/Database.java @@ -1,3 +1,9 @@ +import Enums.Command; +import Task.Task; +import Task.Deadlines; +import Task.ToDo; +import Task.Events; + import java.io.*; import java.util.ArrayList; @@ -6,7 +12,7 @@ public static void save(ArrayList list) { File file = new File("data/tasklist.txt"); try { FileWriter fileToWrite = new FileWriter(file); - Task[] tasks = list.toArray(Task[]::new); + Task[] tasks = list.toArray(new Task[0]); for (int i = 0; i < tasks.length; i++) { fileToWrite.write(tasks[i].dataFormat()); diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 1e30c34864..9bec27a9c8 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,5 +1,14 @@ import java.util.Scanner; +import Enums.Command; +import Exception.InvalidInputException; +import Exception.MissingArgumentException; +import Exception.MissingDateArgumentException; +import Exception.MissingTaskArgumentException; +import Task.Deadlines; +import Task.Events; +import Task.ToDo; + public class Duke { private static TaskList tasks = TaskList.init(); diff --git a/src/main/java/Command.java b/src/main/java/Enums/Command.java similarity index 97% rename from src/main/java/Command.java rename to src/main/java/Enums/Command.java index 1a7a8bf76c..8c052375f9 100644 --- a/src/main/java/Command.java +++ b/src/main/java/Enums/Command.java @@ -1,3 +1,5 @@ +package Enums; + public enum Command { BYE("bye"), LIST("list"), diff --git a/src/main/java/InvalidInputException.java b/src/main/java/Exception/InvalidInputException.java similarity index 90% rename from src/main/java/InvalidInputException.java rename to src/main/java/Exception/InvalidInputException.java index c0b6dbbfb2..5bab1e113f 100644 --- a/src/main/java/InvalidInputException.java +++ b/src/main/java/Exception/InvalidInputException.java @@ -1,3 +1,5 @@ +package Exception; + public class InvalidInputException extends Exception{ @Override public String toString() { diff --git a/src/main/java/MissingArgumentException.java b/src/main/java/Exception/MissingArgumentException.java similarity index 85% rename from src/main/java/MissingArgumentException.java rename to src/main/java/Exception/MissingArgumentException.java index 795abd7f93..f54dde131b 100644 --- a/src/main/java/MissingArgumentException.java +++ b/src/main/java/Exception/MissingArgumentException.java @@ -1,3 +1,5 @@ +package Exception; + public abstract class MissingArgumentException extends Exception{ @Override public abstract String toString(); diff --git a/src/main/java/MissingDateArgumentException.java b/src/main/java/Exception/MissingDateArgumentException.java similarity index 80% rename from src/main/java/MissingDateArgumentException.java rename to src/main/java/Exception/MissingDateArgumentException.java index 4c266e88dd..0ebc63ced0 100644 --- a/src/main/java/MissingDateArgumentException.java +++ b/src/main/java/Exception/MissingDateArgumentException.java @@ -1,6 +1,8 @@ +package Exception; + public class MissingDateArgumentException extends MissingArgumentException { private String string; - MissingDateArgumentException(String string) { + public MissingDateArgumentException(String string) { this.string = string; } diff --git a/src/main/java/MissingTaskArgumentException.java b/src/main/java/Exception/MissingTaskArgumentException.java similarity index 78% rename from src/main/java/MissingTaskArgumentException.java rename to src/main/java/Exception/MissingTaskArgumentException.java index 29ecd01d65..fc307ab486 100644 --- a/src/main/java/MissingTaskArgumentException.java +++ b/src/main/java/Exception/MissingTaskArgumentException.java @@ -1,6 +1,8 @@ +package Exception; + public class MissingTaskArgumentException extends MissingArgumentException { private String task; - MissingTaskArgumentException(String task) { + public MissingTaskArgumentException(String task) { this.task = task; } diff --git a/src/main/java/Deadlines.java b/src/main/java/Task/Deadlines.java similarity index 94% rename from src/main/java/Deadlines.java rename to src/main/java/Task/Deadlines.java index 6b795f91af..17cc67bee1 100644 --- a/src/main/java/Deadlines.java +++ b/src/main/java/Task/Deadlines.java @@ -1,3 +1,7 @@ +package Task; + +import Task.Task; + public class Deadlines extends Task { protected String by; diff --git a/src/main/java/Events.java b/src/main/java/Task/Events.java similarity index 95% rename from src/main/java/Events.java rename to src/main/java/Task/Events.java index 0f24274f16..45825270f8 100644 --- a/src/main/java/Events.java +++ b/src/main/java/Task/Events.java @@ -1,3 +1,7 @@ +package Task; + +import Task.Task; + public class Events extends Task { protected String from; protected String to; diff --git a/src/main/java/Task.java b/src/main/java/Task/Task.java similarity index 97% rename from src/main/java/Task.java rename to src/main/java/Task/Task.java index 4d494bc430..9d328a68d0 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task/Task.java @@ -1,3 +1,5 @@ +package Task; + public abstract class Task { protected String description; protected Boolean isDone; diff --git a/src/main/java/ToDo.java b/src/main/java/Task/ToDo.java similarity index 92% rename from src/main/java/ToDo.java rename to src/main/java/Task/ToDo.java index a5cc69b609..c7cb79a82f 100644 --- a/src/main/java/ToDo.java +++ b/src/main/java/Task/ToDo.java @@ -1,3 +1,7 @@ +package Task; + +import Task.Task; + public class ToDo extends Task { public ToDo(String description) { super(description); diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 51e4074977..20d8c682d4 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -1,3 +1,5 @@ +import Task.Task; + import java.util.ArrayList; public class TaskList { @@ -30,7 +32,7 @@ public void addTask(Task task) { } public void printTasks() { - Task[] tasks = list.toArray(Task[]::new); + Task[] tasks = list.toArray(new Task[0]); StringBuilder dialog = new StringBuilder("Here are the tasks in your list:\n "); for (int i = 0; i < tasks.length; i++) { int listIndex = i + 1; diff --git a/src/main/java/Time.java b/src/main/java/Time.java new file mode 100644 index 0000000000..fc14a2e013 --- /dev/null +++ b/src/main/java/Time.java @@ -0,0 +1,2 @@ +public class Time { +} From 6fe56b1540e6414a0281313173f914902e70fc6b Mon Sep 17 00:00:00 2001 From: You Wei Date: Mon, 28 Aug 2023 02:47:08 +0800 Subject: [PATCH 14/70] Add Date Time --- src/main/java/Duke.java | 32 +++++-- .../java/Exception/InvalidDateException.java | 8 ++ .../Exception/TooManyCommandException.java | 9 ++ src/main/java/Time.java | 92 +++++++++++++++++++ 4 files changed, 134 insertions(+), 7 deletions(-) create mode 100644 src/main/java/Exception/InvalidDateException.java create mode 100644 src/main/java/Exception/TooManyCommandException.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 9bec27a9c8..a673842a9d 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,7 +1,9 @@ +import Exception.InvalidDateException; import java.util.Scanner; import Enums.Command; import Exception.InvalidInputException; +import Exception.TooManyCommandException; import Exception.MissingArgumentException; import Exception.MissingDateArgumentException; import Exception.MissingTaskArgumentException; @@ -43,6 +45,8 @@ public static void main(String[] args) { reply.printDialog(e.toString()); } catch (MissingArgumentException e) { reply.printDialog(e.toString()); + } catch (TooManyCommandException e) { + reply.printDialog(e.toString()); } } @@ -72,11 +76,13 @@ private static void handleToDo(String input) throws MissingArgumentException, In tasks.addTask(new ToDo(todo)); } - private static void handleDeadline(String input) throws InvalidInputException, MissingArgumentException { + private static void handleDeadline(String input) throws InvalidInputException, + MissingArgumentException, + TooManyCommandException { String deadline = getCommandArguments(input, Command.DEADLINE); String[] slice = deadline.split("/"); if (slice.length > 2) { - throw new InvalidInputException(); + throw new TooManyCommandException(); } else if (slice.length == 1) { throw new MissingDateArgumentException(Command.BY.getCommand()); } else { @@ -87,17 +93,23 @@ private static void handleDeadline(String input) throws InvalidInputException, M } else { throw new MissingDateArgumentException(Command.BY.getCommand()); } - - tasks.addTask(new Deadlines(desc, date)); + try { + date = Time.FormatDate(date); + tasks.addTask(new Deadlines(desc, date)); + } catch (InvalidDateException e) { + reply.printDialog(e.toString()); + } } } - private static void handleEvent(String input) throws InvalidInputException, MissingArgumentException { + private static void handleEvent(String input) throws InvalidInputException, + MissingArgumentException, + TooManyCommandException { String event = getCommandArguments(input, Command.EVENT); String[] slice = event.split("/"); if (slice.length > 3) { - throw new InvalidInputException(); + throw new TooManyCommandException(); } else if (slice.length < 3) { throw new MissingDateArgumentException("from and /to"); } else { @@ -116,7 +128,13 @@ private static void handleEvent(String input) throws InvalidInputException, Miss } else { throw new MissingDateArgumentException(Command.TO.getCommand()); } - tasks.addTask(new Events(desc, from, to)); + try { + to = Time.FormatDate(to); + from = Time.FormatDate(from); + tasks.addTask(new Events(desc, from, to)); + } catch (InvalidDateException e) { + reply.printDialog(e.toString()); + } } } diff --git a/src/main/java/Exception/InvalidDateException.java b/src/main/java/Exception/InvalidDateException.java new file mode 100644 index 0000000000..39a425f82c --- /dev/null +++ b/src/main/java/Exception/InvalidDateException.java @@ -0,0 +1,8 @@ +package Exception; + +public class InvalidDateException extends Exception { + @Override + public String toString() { + return " ☹ OOPS!!! Please fill in a valid date!"; + } +} diff --git a/src/main/java/Exception/TooManyCommandException.java b/src/main/java/Exception/TooManyCommandException.java new file mode 100644 index 0000000000..5969e43fda --- /dev/null +++ b/src/main/java/Exception/TooManyCommandException.java @@ -0,0 +1,9 @@ +package Exception; + +public class TooManyCommandException extends Exception { + @Override + public String toString() { + return " There are too many commands in your input. Please note that slashes are specially reserved for commands." + + " You may use dashes or spaces for date inputs instead"; + } +} diff --git a/src/main/java/Time.java b/src/main/java/Time.java index fc14a2e013..73ca01f76b 100644 --- a/src/main/java/Time.java +++ b/src/main/java/Time.java @@ -1,2 +1,94 @@ +import Exception.InvalidDateException; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; + public class Time { + private static DateTimeFormatter findDateFormat(String date) throws InvalidDateException { + DateTimeFormatter[] formats = new DateTimeFormatter[]{ + DateTimeFormatter.ofPattern("MMM-d-yyyy"), + DateTimeFormatter.ofPattern("MMM-dd-yyyy"), + DateTimeFormatter.ofPattern("d-MMM-yyyy"), + DateTimeFormatter.ofPattern("dd-MM-yyyy"), + DateTimeFormatter.ofPattern("d-MM-yyyy"), + DateTimeFormatter.ofPattern("MM-dd-yyyy"), + DateTimeFormatter.ofPattern("MM-d-yyyy"), + DateTimeFormatter.ofPattern("yyyy-MM-dd"), + DateTimeFormatter.ofPattern("yyyy-MM-d"), + DateTimeFormatter.ofPattern("yyyy-MM-dd"), + DateTimeFormatter.ofPattern("MMM-d-yyyy HHmm"), + DateTimeFormatter.ofPattern("MMM-dd-yyyy HHmm"), + DateTimeFormatter.ofPattern("d-MMM-yyyy HHmm"), + DateTimeFormatter.ofPattern("dd-MM-yyyy HHmm"), + DateTimeFormatter.ofPattern("d-MM-yyyy HHmm"), + DateTimeFormatter.ofPattern("MM-dd-yyyy HHmm"), + DateTimeFormatter.ofPattern("MM-d-yyyy HHmm"), + DateTimeFormatter.ofPattern("yyyy-MM-dd HHmm"), + DateTimeFormatter.ofPattern("yyyy-MM-d HHmm"), + DateTimeFormatter.ofPattern("yyyy-MM-dd HHmm"), + DateTimeFormatter.ofPattern("HHmm MMM-d-yyyy"), + DateTimeFormatter.ofPattern("HHmm MMM-dd-yyyy"), + DateTimeFormatter.ofPattern("HHmm d-MMM-yyyy"), + DateTimeFormatter.ofPattern("HHmm dd-MM-yyyy"), + DateTimeFormatter.ofPattern("HHmm d-MM-yyyy"), + DateTimeFormatter.ofPattern("HHmm MM-dd-yyyy"), + DateTimeFormatter.ofPattern("HHmm MM-d-yyyy"), + DateTimeFormatter.ofPattern("HHmm yyyy-MM-dd"), + DateTimeFormatter.ofPattern("HHmm yyyy-MM-d"), + DateTimeFormatter.ofPattern("HHmm yyyy-MM-dd"), + DateTimeFormatter.ofPattern("MMM d yyyy"), + DateTimeFormatter.ofPattern("MMM dd yyyy"), + DateTimeFormatter.ofPattern("d MMM yyyy"), + DateTimeFormatter.ofPattern("dd MM yyyy"), + DateTimeFormatter.ofPattern("d MM yyyy"), + DateTimeFormatter.ofPattern("MM dd yyyy"), + DateTimeFormatter.ofPattern("MM d yyyy"), + DateTimeFormatter.ofPattern("yyyy MM dd"), + DateTimeFormatter.ofPattern("yyyy MM d"), + DateTimeFormatter.ofPattern("yyyy MM dd"), + DateTimeFormatter.ofPattern("MMM d yyyy HHmm"), + DateTimeFormatter.ofPattern("MMM dd yyyy HHmm"), + DateTimeFormatter.ofPattern("d MMM yyyy HHmm"), + DateTimeFormatter.ofPattern("dd MM yyyy HHmm"), + DateTimeFormatter.ofPattern("d MM yyyy HHmm"), + DateTimeFormatter.ofPattern("MM dd yyyy HHmm"), + DateTimeFormatter.ofPattern("MM d yyyy HHmm"), + DateTimeFormatter.ofPattern("yyyy MM dd HHmm"), + DateTimeFormatter.ofPattern("yyyy MM d HHmm"), + DateTimeFormatter.ofPattern("yyyy MM dd HHmm"), + DateTimeFormatter.ofPattern("HHmm MMM d yyyy"), + DateTimeFormatter.ofPattern("HHmm MMM dd yyyy"), + DateTimeFormatter.ofPattern("HHmm d MMM yyyy"), + DateTimeFormatter.ofPattern("HHmm dd MM yyyy"), + DateTimeFormatter.ofPattern("HHmm d MM yyyy"), + DateTimeFormatter.ofPattern("HHmm MM dd yyyy"), + DateTimeFormatter.ofPattern("HHmm MM d yyyy"), + DateTimeFormatter.ofPattern("HHmm yyyy MM dd"), + DateTimeFormatter.ofPattern("HHmm yyyy MM d"), + DateTimeFormatter.ofPattern("HHmm yyyy MM dd"), + }; + + for (DateTimeFormatter format: formats) { + if (hasSameDateFormat(date, format)) { + return format; + } + } + throw new InvalidDateException(); + } + + private static boolean hasSameDateFormat(String date, DateTimeFormatter formatter) { + try { + LocalDate.parse(date, formatter); + } catch (DateTimeParseException e) { + return false; + } + return true; + } + + public static String FormatDate(String date) throws InvalidDateException { + DateTimeFormatter stdFormat = DateTimeFormatter.ofPattern("d-MMM-yyyy"); + DateTimeFormatter currentFormat = findDateFormat(date); + return LocalDate.parse(date, currentFormat).format(stdFormat); + } } From 012cb35d92af7af6da87123d52a578bd21b8ea4f Mon Sep 17 00:00:00 2001 From: You Wei Date: Mon, 28 Aug 2023 03:36:17 +0800 Subject: [PATCH 15/70] Chatbot revamp --- .../java/Exception/InvalidCommandException.java | 2 ++ .../Exception/MissingDateArgumentException.java | 13 ------------- .../java/Exception/TooManyCommandException.java | 9 --------- 3 files changed, 2 insertions(+), 22 deletions(-) create mode 100644 src/main/java/Exception/InvalidCommandException.java delete mode 100644 src/main/java/Exception/MissingDateArgumentException.java delete mode 100644 src/main/java/Exception/TooManyCommandException.java diff --git a/src/main/java/Exception/InvalidCommandException.java b/src/main/java/Exception/InvalidCommandException.java new file mode 100644 index 0000000000..f5e3ff0021 --- /dev/null +++ b/src/main/java/Exception/InvalidCommandException.java @@ -0,0 +1,2 @@ +package Exception;public class InvalidCommandException { +} diff --git a/src/main/java/Exception/MissingDateArgumentException.java b/src/main/java/Exception/MissingDateArgumentException.java deleted file mode 100644 index 0ebc63ced0..0000000000 --- a/src/main/java/Exception/MissingDateArgumentException.java +++ /dev/null @@ -1,13 +0,0 @@ -package Exception; - -public class MissingDateArgumentException extends MissingArgumentException { - private String string; - public MissingDateArgumentException(String string) { - this.string = string; - } - - @Override - public String toString() { - return " ☹ OOPS!!! Please type the command: '/" + this.string + "' followed by the specified date in any format."; - } -} diff --git a/src/main/java/Exception/TooManyCommandException.java b/src/main/java/Exception/TooManyCommandException.java deleted file mode 100644 index 5969e43fda..0000000000 --- a/src/main/java/Exception/TooManyCommandException.java +++ /dev/null @@ -1,9 +0,0 @@ -package Exception; - -public class TooManyCommandException extends Exception { - @Override - public String toString() { - return " There are too many commands in your input. Please note that slashes are specially reserved for commands." + - " You may use dashes or spaces for date inputs instead"; - } -} From 0d7c4e4d89133317be03463c25b4825255b8dd68 Mon Sep 17 00:00:00 2001 From: You Wei Date: Mon, 28 Aug 2023 03:36:24 +0800 Subject: [PATCH 16/70] Chatbot revamp --- src/main/java/Duke.java | 164 ++++++++---------- .../Exception/InvalidCommandException.java | 4 +- .../java/Exception/InvalidDateException.java | 2 +- .../java/Exception/InvalidInputException.java | 2 +- .../MissingTaskArgumentException.java | 7 +- src/main/java/Reply.java | 11 +- 6 files changed, 84 insertions(+), 106 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index a673842a9d..150cfc4658 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -3,9 +3,8 @@ import Enums.Command; import Exception.InvalidInputException; -import Exception.TooManyCommandException; +import Exception.InvalidCommandException; import Exception.MissingArgumentException; -import Exception.MissingDateArgumentException; import Exception.MissingTaskArgumentException; import Task.Deadlines; import Task.Events; @@ -21,124 +20,99 @@ public static void main(String[] args) { while(true) { try { String input = scanner.nextLine(); - if (input.equals(Command.BYE.getCommand())) { + if (input.toLowerCase().equals(Command.BYE.getCommand())) { reply.printDialog("Bye. Hope to see you again soon!"); return; - } else if (input.equals(Command.LIST.getCommand())) { + } else if (input.toLowerCase().equals(Command.LIST.getCommand())) { tasks.printTasks(); } else if (input.startsWith(Command.MARK.getCommand())) { markTask(input, true); } else if (input.startsWith(Command.UNMARK.getCommand())) { markTask(input, false); - } else if (input.startsWith(Command.TODO.getCommand())) { - handleToDo(input); - } else if (input.startsWith(Command.DEADLINE.getCommand())) { - handleDeadline(input); - } else if (input.startsWith(Command.EVENT.getCommand())) { - handleEvent(input); + } else if (input.toLowerCase().equals(Command.TODO.getCommand())) { + handleToDo(scanner); + } else if (input.toLowerCase().equals(Command.DEADLINE.getCommand())) { + handleDeadline(scanner); + } else if (input.toLowerCase().equals(Command.EVENT.getCommand())) { + handleEvent(scanner); } else if (input.startsWith(Command.DELETE.getCommand())) { deleteTask(input); } else { - throw new InvalidInputException(); + throw new InvalidCommandException(); } } catch (InvalidInputException e) { reply.printDialog(e.toString()); } catch (MissingArgumentException e) { reply.printDialog(e.toString()); - } catch (TooManyCommandException e) { + } catch (InvalidCommandException e) { reply.printDialog(e.toString()); } } } - public static void markTask(String input, boolean mark) throws InvalidInputException, MissingArgumentException { - Command command = mark ? Command.MARK : Command.UNMARK; - String number = getCommandArguments(input, command); - try { - if (mark) { - tasks.markDone(Integer.parseInt(number)); - } else { - tasks.unmarkDone(Integer.parseInt(number)); - } - } catch (NumberFormatException e ) { - reply.printDialog(" Strictly type 1 number only"); - } catch (IndexOutOfBoundsException e) { - reply.printDialog(" Index number does not exist in our list"); - } + private static void handleToDo(Scanner scanner) { + reply.printDialog("So you want to add a ToDo task. Tell me what's the task."); + String desc = scanner.nextLine(); + tasks.addTask(new ToDo(desc)); } - private static void handleToDo(String input) throws MissingArgumentException, InvalidInputException { - String todo = getCommandArguments(input, Command.TODO); - if (todo.isEmpty()) { - throw new MissingTaskArgumentException(Command.TODO.getCommand()); + private static void handleDeadline(Scanner scanner) { + + reply.printDialog("So you want to add a task with deadline. Tell me what's the task."); + String desc = scanner.nextLine(); + reply.printDialog("Now indicate the deadline date."); + String date = scanner.nextLine(); + + try { + date = Time.FormatDate(date); + tasks.addTask(new Deadlines(desc, date)); + } catch (InvalidDateException e) { + reply.printDialog(e.toString()); } - tasks.addTask(new ToDo(todo)); } - private static void handleDeadline(String input) throws InvalidInputException, - MissingArgumentException, - TooManyCommandException { - String deadline = getCommandArguments(input, Command.DEADLINE); - String[] slice = deadline.split("/"); - if (slice.length > 2) { - throw new TooManyCommandException(); - } else if (slice.length == 1) { - throw new MissingDateArgumentException(Command.BY.getCommand()); - } else { - String desc = slice[0]; - String date; - if (slice[1].startsWith(Command.BY.getCommand())) { - date = getCommandArguments(slice[1], Command.BY); - } else { - throw new MissingDateArgumentException(Command.BY.getCommand()); - } - try { - date = Time.FormatDate(date); - tasks.addTask(new Deadlines(desc, date)); - } catch (InvalidDateException e) { - reply.printDialog(e.toString()); - } + private static void handleEvent(Scanner scanner) { + + reply.printDialog("So you want to add a event task. Tell me what's the task."); + String desc = scanner.nextLine(); + reply.printDialog("Now indicate the start date."); + String from = scanner.nextLine(); + reply.printDialog("Now indicate the end date."); + String to = scanner.nextLine(); + + try { + from = Time.FormatDate(from); + to = Time.FormatDate(to); + tasks.addTask(new Events(desc, from, to)); + } catch (InvalidDateException e) { + reply.printDialog(e.toString()); } } - - private static void handleEvent(String input) throws InvalidInputException, + public static void markTask(String input, boolean mark) throws + InvalidInputException, MissingArgumentException, - TooManyCommandException { - String event = getCommandArguments(input, Command.EVENT); - String[] slice = event.split("/"); - - if (slice.length > 3) { - throw new TooManyCommandException(); - } else if (slice.length < 3) { - throw new MissingDateArgumentException("from and /to"); - } else { - String desc = slice[0]; - String from; - String to; + InvalidCommandException { - if (slice[1].startsWith(Command.FROM.getCommand())) { - from = getCommandArguments(slice[1], Command.FROM); - } else { - throw new MissingDateArgumentException(Command.FROM.getCommand()); - } - - if (slice[2].startsWith(Command.TO.getCommand())) { - to = getCommandArguments(slice[2], Command.TO); + Command command = mark ? Command.MARK : Command.UNMARK; + String number = getCommandArguments(input, command); + try { + if (mark) { + tasks.markDone(Integer.parseInt(number)); } else { - throw new MissingDateArgumentException(Command.TO.getCommand()); - } - try { - to = Time.FormatDate(to); - from = Time.FormatDate(from); - tasks.addTask(new Events(desc, from, to)); - } catch (InvalidDateException e) { - reply.printDialog(e.toString()); + tasks.unmarkDone(Integer.parseInt(number)); } + } catch (NumberFormatException e ) { + reply.printDialog("Strictly type 1 number only"); + } catch (IndexOutOfBoundsException e) { + reply.printDialog("Index number does not exist in our list"); } } + private static void deleteTask(String input) throws + InvalidInputException, + MissingArgumentException, + InvalidCommandException { - private static void deleteTask(String input) throws InvalidInputException, MissingArgumentException { String number = getCommandArguments(input,Command.DELETE); try { tasks.deleteTask(Integer.parseInt(number)); @@ -149,22 +123,22 @@ private static void deleteTask(String input) throws InvalidInputException, Missi } } - private static String getCommandArguments(String input, Command command) throws InvalidInputException, MissingArgumentException { + private static String getCommandArguments(String input, Command command) throws + InvalidInputException, + MissingArgumentException, + InvalidCommandException { + int cmdLength = command.getCommandStringLength(); String args = input.substring(cmdLength); if (args.isBlank()) { switch (command) { - case TODO: - case EVENT: - case DEADLINE: - throw new MissingTaskArgumentException(command.getCommand()); - case BY: - case TO: - case FROM: - throw new MissingDateArgumentException(command.getCommand()); + case MARK: + case UNMARK: + case DELETE: + throw new MissingTaskArgumentException(); default: - throw new InvalidInputException(); + throw new InvalidCommandException(); } } else if (args.startsWith(" ")){ return args.substring(1); diff --git a/src/main/java/Exception/InvalidCommandException.java b/src/main/java/Exception/InvalidCommandException.java index f5e3ff0021..605a11e10a 100644 --- a/src/main/java/Exception/InvalidCommandException.java +++ b/src/main/java/Exception/InvalidCommandException.java @@ -1,2 +1,4 @@ -package Exception;public class InvalidCommandException { +package Exception; + +public class InvalidCommandException extends Exception { } diff --git a/src/main/java/Exception/InvalidDateException.java b/src/main/java/Exception/InvalidDateException.java index 39a425f82c..0dfc6b43d2 100644 --- a/src/main/java/Exception/InvalidDateException.java +++ b/src/main/java/Exception/InvalidDateException.java @@ -3,6 +3,6 @@ public class InvalidDateException extends Exception { @Override public String toString() { - return " ☹ OOPS!!! Please fill in a valid date!"; + return "The given date is invalid. Returning to homepage..."; } } diff --git a/src/main/java/Exception/InvalidInputException.java b/src/main/java/Exception/InvalidInputException.java index 5bab1e113f..fecd3e8498 100644 --- a/src/main/java/Exception/InvalidInputException.java +++ b/src/main/java/Exception/InvalidInputException.java @@ -3,6 +3,6 @@ public class InvalidInputException extends Exception{ @Override public String toString() { - return " ☹ OOPS!!! I'm sorry, but I don't know what that means :-("; + return "You given input or command is invalid. Returning to homepage..."; } } diff --git a/src/main/java/Exception/MissingTaskArgumentException.java b/src/main/java/Exception/MissingTaskArgumentException.java index fc307ab486..56ae79e131 100644 --- a/src/main/java/Exception/MissingTaskArgumentException.java +++ b/src/main/java/Exception/MissingTaskArgumentException.java @@ -1,13 +1,8 @@ package Exception; public class MissingTaskArgumentException extends MissingArgumentException { - private String task; - public MissingTaskArgumentException(String task) { - this.task = task; - } - @Override public String toString() { - return " ☹ OOPS!!! The description of a " + this.task + " cannot be empty."; + return " ☹ OOPS!!! You forgot to add the index number right after the command"; } } diff --git a/src/main/java/Reply.java b/src/main/java/Reply.java index a3a0715fd6..d865763ed1 100644 --- a/src/main/java/Reply.java +++ b/src/main/java/Reply.java @@ -6,8 +6,15 @@ public class Reply { private Reply() { //Print intro System.out.println(section - + indent + "Hello! I'm Evan\n" - + indent + "What can I do for you?\n" + + indent + "Hello! I'm Evan, your personal task planning assistant\n" + + indent + "What can I do for you?\n\n" + + indent + "List of available commands:\n" + + indent + "todo: create a new todo task\n" + + indent + "deadline: create a new deadline task\n" + + indent + "event: create a new event task\n" + + indent + "mark: mark a task as complete\n" + + indent + "unmark: mark a task as incomplete\n" + + indent + "delete: delete a task from the list\n" + section); } From 55a8bc48a9ce32d9f27838ffa253e183b7ffe93a Mon Sep 17 00:00:00 2001 From: You Wei Date: Mon, 28 Aug 2023 04:07:52 +0800 Subject: [PATCH 17/70] Add Time --- src/main/java/Duke.java | 43 +++++++++++++++-- .../java/Exception/InvalidTimeException.java | 8 ++++ src/main/java/Task/Events.java | 2 +- src/main/java/Time.java | 47 ++++++++++++++++++- 4 files changed, 92 insertions(+), 8 deletions(-) create mode 100644 src/main/java/Exception/InvalidTimeException.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 150cfc4658..497e1c917d 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -3,6 +3,8 @@ import Enums.Command; import Exception.InvalidInputException; +import Exception.InvalidTimeException; +import Exception.InvalidDateException; import Exception.InvalidCommandException; import Exception.MissingArgumentException; import Exception.MissingTaskArgumentException; @@ -65,11 +67,21 @@ private static void handleDeadline(Scanner scanner) { String date = scanner.nextLine(); try { - date = Time.FormatDate(date); + date = Time.formatDate(date); tasks.addTask(new Deadlines(desc, date)); } catch (InvalidDateException e) { reply.printDialog(e.toString()); } + reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); + String time = scanner.nextLine(); + if (!time.toLowerCase().equals("skip")) { + try { + date = Time.formatTime(date, time); + tasks.addTask(new Deadlines(desc, date)); + } catch (InvalidTimeException | InvalidDateException e) { + reply.printDialog(e.toString()); + } + } } private static void handleEvent(Scanner scanner) { @@ -78,16 +90,37 @@ private static void handleEvent(Scanner scanner) { String desc = scanner.nextLine(); reply.printDialog("Now indicate the start date."); String from = scanner.nextLine(); + try { + from = Time.formatDate(from); + } catch (InvalidDateException e) { + reply.printDialog(e.toString()); + } + reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); + String fromTime = scanner.nextLine(); + if (!fromTime.toLowerCase().equals("skip")) { + try { + from = Time.formatTime(from, fromTime); + } catch (InvalidTimeException | InvalidDateException e) { + reply.printDialog(e.toString()); + } + } reply.printDialog("Now indicate the end date."); String to = scanner.nextLine(); - try { - from = Time.FormatDate(from); - to = Time.FormatDate(to); - tasks.addTask(new Events(desc, from, to)); + to = Time.formatDate(to); } catch (InvalidDateException e) { reply.printDialog(e.toString()); } + reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); + String toTime = scanner.nextLine(); + if (!toTime.toLowerCase().equals("skip")) { + try { + to = Time.formatTime(to, toTime); + tasks.addTask(new Events(desc, from, to)); + } catch (InvalidTimeException | InvalidDateException e) { + reply.printDialog(e.toString()); + } + } } public static void markTask(String input, boolean mark) throws InvalidInputException, diff --git a/src/main/java/Exception/InvalidTimeException.java b/src/main/java/Exception/InvalidTimeException.java new file mode 100644 index 0000000000..12d4c2a521 --- /dev/null +++ b/src/main/java/Exception/InvalidTimeException.java @@ -0,0 +1,8 @@ +package Exception; + +public class InvalidTimeException extends Exception{ + @Override + public String toString() { + return "The given date is invalid. Returning to homepage..."; + } +} diff --git a/src/main/java/Task/Events.java b/src/main/java/Task/Events.java index 45825270f8..1d96766173 100644 --- a/src/main/java/Task/Events.java +++ b/src/main/java/Task/Events.java @@ -19,7 +19,7 @@ public Events(boolean status, String description, String from, String to) { @Override public String toString() { - return "[E]" + super.toString() + " (from: " + from + "to: " + to + ")"; + return "[E]" + super.toString() + " (from: " + from + " to: " + to + ")"; } @Override diff --git a/src/main/java/Time.java b/src/main/java/Time.java index 73ca01f76b..b673e57342 100644 --- a/src/main/java/Time.java +++ b/src/main/java/Time.java @@ -1,4 +1,5 @@ import Exception.InvalidDateException; +import Exception.InvalidTimeException; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -37,6 +38,7 @@ private static DateTimeFormatter findDateFormat(String date) throws InvalidDateE DateTimeFormatter.ofPattern("HHmm yyyy-MM-dd"), DateTimeFormatter.ofPattern("HHmm yyyy-MM-d"), DateTimeFormatter.ofPattern("HHmm yyyy-MM-dd"), + DateTimeFormatter.ofPattern("MMM d yyyy"), DateTimeFormatter.ofPattern("MMM dd yyyy"), DateTimeFormatter.ofPattern("d MMM yyyy"), @@ -67,6 +69,37 @@ private static DateTimeFormatter findDateFormat(String date) throws InvalidDateE DateTimeFormatter.ofPattern("HHmm yyyy MM dd"), DateTimeFormatter.ofPattern("HHmm yyyy MM d"), DateTimeFormatter.ofPattern("HHmm yyyy MM dd"), + + DateTimeFormatter.ofPattern("MMM/d/yyyy"), + DateTimeFormatter.ofPattern("MMM/dd/yyyy"), + DateTimeFormatter.ofPattern("d/MMM/yyyy"), + DateTimeFormatter.ofPattern("dd/MM/yyyy"), + DateTimeFormatter.ofPattern("d/MM/yyyy"), + DateTimeFormatter.ofPattern("MM/dd/yyyy"), + DateTimeFormatter.ofPattern("MM/d/yyyy"), + DateTimeFormatter.ofPattern("yyyy/MM/dd"), + DateTimeFormatter.ofPattern("yyyy/MM/d"), + DateTimeFormatter.ofPattern("yyyy/MM/dd"), + DateTimeFormatter.ofPattern("MMM/d/yyyy HHmm"), + DateTimeFormatter.ofPattern("MMM/dd/yyyy HHmm"), + DateTimeFormatter.ofPattern("d/MMM/yyyy HHmm"), + DateTimeFormatter.ofPattern("dd/MM/yyyy HHmm"), + DateTimeFormatter.ofPattern("d/MM/yyyy HHmm"), + DateTimeFormatter.ofPattern("MM/dd/yyyy HHmm"), + DateTimeFormatter.ofPattern("MM/d/yyyy HHmm"), + DateTimeFormatter.ofPattern("yyyy/MM/dd HHmm"), + DateTimeFormatter.ofPattern("yyyy/MM/d HHmm"), + DateTimeFormatter.ofPattern("yyyy/MM/dd HHmm"), + DateTimeFormatter.ofPattern("HHmm MMM/d yyyy"), + DateTimeFormatter.ofPattern("HHmm MMM/dd yyyy"), + DateTimeFormatter.ofPattern("HHmm d/MMM/yyyy"), + DateTimeFormatter.ofPattern("HHmm dd/MM/yyyy"), + DateTimeFormatter.ofPattern("HHmm d/MM/yyyy"), + DateTimeFormatter.ofPattern("HHmm MM/dd/yyyy"), + DateTimeFormatter.ofPattern("HHmm MM/d/yyyy"), + DateTimeFormatter.ofPattern("HHmm yyyy/MM/dd"), + DateTimeFormatter.ofPattern("HHmm yyyy/MM/d"), + DateTimeFormatter.ofPattern("HHmm yyyy/MM/dd"), }; for (DateTimeFormatter format: formats) { @@ -86,9 +119,19 @@ private static boolean hasSameDateFormat(String date, DateTimeFormatter formatte return true; } - public static String FormatDate(String date) throws InvalidDateException { - DateTimeFormatter stdFormat = DateTimeFormatter.ofPattern("d-MMM-yyyy"); + public static String formatDate(String date) throws InvalidDateException { + DateTimeFormatter stdFormat = DateTimeFormatter.ofPattern("dd-MMM-yyyy"); DateTimeFormatter currentFormat = findDateFormat(date); return LocalDate.parse(date, currentFormat).format(stdFormat); } + + public static String formatTime(String date, String time) throws InvalidTimeException, InvalidDateException { + DateTimeFormatter stdFormat = DateTimeFormatter.ofPattern("dd-MMM-yyyy HHmm"); + DateTimeFormatter currentFormat = findDateFormat(date); + LocalDate lDate = LocalDate.parse(date, currentFormat); + int intTime = Integer.parseInt(time); + int hour = intTime / 100; + int minute = intTime - (hour * 100); + return lDate.atTime(hour, minute).format(stdFormat); + } } From 2dffb617f6f53edf9adde373913d603c209b85f3 Mon Sep 17 00:00:00 2001 From: You Wei Date: Mon, 28 Aug 2023 09:56:16 +0800 Subject: [PATCH 18/70] More OOP --- src/main/java/Command/DeadlineCommand.java | 43 ++++++ src/main/java/Command/DeleteCommand.java | 27 ++++ src/main/java/Command/EventCommand.java | 66 ++++++++ src/main/java/Command/MarkCommand.java | 28 ++++ src/main/java/Command/ToDoCommand.java | 18 +++ src/main/java/Command/UnmarkCommand.java | 28 ++++ src/main/java/Duke.java | 146 ++---------------- src/main/java/Enums/Command.java | 3 +- .../Exception/InvalidCommandException.java | 4 + src/main/java/Parser/CommandParser.java | 33 ++++ src/main/java/{ => Parser}/Time.java | 4 +- src/main/java/{ => Storage}/Database.java | 3 + src/main/java/{ => Task}/TaskList.java | 5 +- src/main/java/{ => Ui}/Reply.java | 2 + 14 files changed, 272 insertions(+), 138 deletions(-) create mode 100644 src/main/java/Command/DeadlineCommand.java create mode 100644 src/main/java/Command/DeleteCommand.java create mode 100644 src/main/java/Command/EventCommand.java create mode 100644 src/main/java/Command/MarkCommand.java create mode 100644 src/main/java/Command/ToDoCommand.java create mode 100644 src/main/java/Command/UnmarkCommand.java create mode 100644 src/main/java/Parser/CommandParser.java rename src/main/java/{ => Parser}/Time.java (99%) rename src/main/java/{ => Storage}/Database.java (98%) rename src/main/java/{ => Task}/TaskList.java (97%) rename src/main/java/{ => Ui}/Reply.java (98%) diff --git a/src/main/java/Command/DeadlineCommand.java b/src/main/java/Command/DeadlineCommand.java new file mode 100644 index 0000000000..de8cf4aa02 --- /dev/null +++ b/src/main/java/Command/DeadlineCommand.java @@ -0,0 +1,43 @@ +package Command; + +import Task.TaskList; +import Ui.Reply; +import Parser.Time; +import Task.Deadlines; +import Exception.InvalidDateException; +import Exception.InvalidTimeException; + +import java.util.Scanner; + +public class DeadlineCommand { + private static Reply reply = Reply.init(); + private static TaskList tasks = TaskList.init(); + public static void start() { + Scanner scanner = new Scanner(System.in); + reply.printDialog("So you want to add a task with deadline. Tell me what's the task."); + String desc = scanner.nextLine(); + reply.printDialog("Now indicate the deadline date."); + String date = scanner.nextLine(); + + try { + date = Time.formatDate(date); + } catch (InvalidDateException e) { + reply.printDialog(e.toString()); + return; + } + reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); + String time = scanner.nextLine(); + if (!time.toLowerCase().equals(Enums.Command.SKIP.getCommand())) { + try { + date = Time.formatTime(date, time); + } catch (InvalidTimeException | InvalidDateException e) { + reply.printDialog(e.toString()); + return; + } catch (NumberFormatException e) { + reply.printDialog("Non-numerical characters detected. Please enter numbers only. Returning to homepage..."); + return; + } + } + tasks.addTask(new Deadlines(desc, date)); + } +} diff --git a/src/main/java/Command/DeleteCommand.java b/src/main/java/Command/DeleteCommand.java new file mode 100644 index 0000000000..fecc43262f --- /dev/null +++ b/src/main/java/Command/DeleteCommand.java @@ -0,0 +1,27 @@ +package Command; + +import Exception.InvalidCommandException; +import Exception.MissingArgumentException; +import Exception.InvalidInputException; +import Parser.CommandParser; +import Task.TaskList; +import Ui.Reply; + +public class DeleteCommand { + private static Reply reply = Reply.init(); + private static TaskList tasks = TaskList.init(); + public static void start(String input) throws + InvalidInputException, + MissingArgumentException, + InvalidCommandException { + + String number = CommandParser.getCommandArguments(input, Enums.Command.DELETE); + try { + tasks.deleteTask(Integer.parseInt(number)); + } catch (NumberFormatException e ) { + reply.printDialog(" Strictly type 1 number only"); + } catch (IndexOutOfBoundsException e) { + reply.printDialog(" Index number does not exist in our list"); + } + } +} diff --git a/src/main/java/Command/EventCommand.java b/src/main/java/Command/EventCommand.java new file mode 100644 index 0000000000..0c94475d20 --- /dev/null +++ b/src/main/java/Command/EventCommand.java @@ -0,0 +1,66 @@ +package Command; + +import Exception.InvalidDateException; +import Exception.InvalidTimeException; +import Enums.Command; +import Parser.Time; +import Task.Events; +import Task.TaskList; +import Ui.Reply; + +import java.util.Scanner; + +public class EventCommand { + private static Reply reply = Reply.init(); + private static TaskList tasks = TaskList.init(); + public static void start() { + + Scanner scanner = new Scanner(System.in); + + reply.printDialog("So you want to add a event task. Tell me what's the task."); + String desc = scanner.nextLine(); + reply.printDialog("Now indicate the start date."); + String from = scanner.nextLine(); + try { + from = Time.formatDate(from); + } catch (InvalidDateException e) { + reply.printDialog(e.toString()); + return; + } + reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); + String fromTime = scanner.nextLine(); + if (!fromTime.toLowerCase().equals(Command.SKIP.getCommand())) { + try { + from = Time.formatTime(from, fromTime); + } catch (InvalidTimeException | InvalidDateException e) { + reply.printDialog(e.toString()); + return; + } catch (NumberFormatException e) { + reply.printDialog("Non-numerical characters detected. Please enter numbers only. Returning to homepage..."); + return; + } + } + reply.printDialog("Now indicate the end date."); + String to = scanner.nextLine(); + try { + to = Time.formatDate(to); + } catch (InvalidDateException e) { + reply.printDialog(e.toString()); + return; + } + reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); + String toTime = scanner.nextLine(); + if (!toTime.toLowerCase().equals(Command.SKIP.getCommand())) { + try { + to = Time.formatTime(to, toTime); + } catch (InvalidTimeException | InvalidDateException e) { + reply.printDialog(e.toString()); + return; + } catch (NumberFormatException e) { + reply.printDialog("Non-numerical characters detected. Please enter numbers only. Returning to homepage..."); + return; + } + } + tasks.addTask(new Events(desc, from, to)); + } +} diff --git a/src/main/java/Command/MarkCommand.java b/src/main/java/Command/MarkCommand.java new file mode 100644 index 0000000000..b098d635cf --- /dev/null +++ b/src/main/java/Command/MarkCommand.java @@ -0,0 +1,28 @@ +package Command; + +import Exception.InvalidCommandException; +import Exception.MissingArgumentException; +import Exception.InvalidInputException; +import Enums.Command; +import Parser.CommandParser; +import Task.TaskList; +import Ui.Reply; + +public class MarkCommand { + private static Reply reply = Reply.init(); + private static TaskList tasks = TaskList.init(); + public static void start(String input) throws + InvalidInputException, + MissingArgumentException, + InvalidCommandException { + + String number = CommandParser.getCommandArguments(input, Command.MARK); + try { + tasks.markDone(Integer.parseInt(number)); + } catch (NumberFormatException e ) { + reply.printDialog("Strictly type 1 number only"); + } catch (IndexOutOfBoundsException e) { + reply.printDialog("Index number does not exist in our list"); + } + } +} diff --git a/src/main/java/Command/ToDoCommand.java b/src/main/java/Command/ToDoCommand.java new file mode 100644 index 0000000000..077c3d5c8d --- /dev/null +++ b/src/main/java/Command/ToDoCommand.java @@ -0,0 +1,18 @@ +package Command; + +import Task.TaskList; +import Task.ToDo; +import Ui.Reply; + +import java.util.Scanner; + +public class ToDoCommand { + private static Reply reply = Reply.init(); + private static TaskList tasks = TaskList.init(); + public static void start() { + Scanner scanner = new Scanner(System.in); + reply.printDialog("So you want to add a ToDo task. Tell me what's the task."); + String desc = scanner.nextLine(); + tasks.addTask(new ToDo(desc)); + } +} diff --git a/src/main/java/Command/UnmarkCommand.java b/src/main/java/Command/UnmarkCommand.java new file mode 100644 index 0000000000..d17e972770 --- /dev/null +++ b/src/main/java/Command/UnmarkCommand.java @@ -0,0 +1,28 @@ +package Command; + +import Exception.InvalidCommandException; +import Exception.MissingArgumentException; +import Exception.InvalidInputException; +import Enums.Command; +import Parser.CommandParser; +import Task.TaskList; +import Ui.Reply; + +public class UnmarkCommand { + private static Reply reply = Reply.init(); + private static TaskList tasks = TaskList.init(); + public static void start(String input) throws + InvalidInputException, + MissingArgumentException, + InvalidCommandException { + + String number = CommandParser.getCommandArguments(input, Command.UNMARK); + try { + tasks.unmarkDone(Integer.parseInt(number)); + } catch (NumberFormatException e ) { + reply.printDialog("Strictly type 1 number only"); + } catch (IndexOutOfBoundsException e) { + reply.printDialog("Index number does not exist in our list"); + } + } +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 497e1c917d..c655378a42 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,16 +1,18 @@ import Exception.InvalidDateException; import java.util.Scanner; +import Command.*; import Enums.Command; import Exception.InvalidInputException; import Exception.InvalidTimeException; -import Exception.InvalidDateException; import Exception.InvalidCommandException; import Exception.MissingArgumentException; -import Exception.MissingTaskArgumentException; -import Task.Deadlines; +import Parser.CommandParser; +import Parser.Time; import Task.Events; +import Task.TaskList; import Task.ToDo; +import Ui.Reply; public class Duke { @@ -28,17 +30,17 @@ public static void main(String[] args) { } else if (input.toLowerCase().equals(Command.LIST.getCommand())) { tasks.printTasks(); } else if (input.startsWith(Command.MARK.getCommand())) { - markTask(input, true); + MarkCommand.start(input); } else if (input.startsWith(Command.UNMARK.getCommand())) { - markTask(input, false); + UnmarkCommand.start(input); } else if (input.toLowerCase().equals(Command.TODO.getCommand())) { - handleToDo(scanner); + ToDoCommand.start(); } else if (input.toLowerCase().equals(Command.DEADLINE.getCommand())) { - handleDeadline(scanner); + DeadlineCommand.start(); } else if (input.toLowerCase().equals(Command.EVENT.getCommand())) { - handleEvent(scanner); + EventCommand.start(); } else if (input.startsWith(Command.DELETE.getCommand())) { - deleteTask(input); + DeleteCommand.start(input); } else { throw new InvalidCommandException(); } @@ -50,133 +52,7 @@ public static void main(String[] args) { reply.printDialog(e.toString()); } } - - } - - private static void handleToDo(Scanner scanner) { - reply.printDialog("So you want to add a ToDo task. Tell me what's the task."); - String desc = scanner.nextLine(); - tasks.addTask(new ToDo(desc)); - } - - private static void handleDeadline(Scanner scanner) { - - reply.printDialog("So you want to add a task with deadline. Tell me what's the task."); - String desc = scanner.nextLine(); - reply.printDialog("Now indicate the deadline date."); - String date = scanner.nextLine(); - - try { - date = Time.formatDate(date); - tasks.addTask(new Deadlines(desc, date)); - } catch (InvalidDateException e) { - reply.printDialog(e.toString()); - } - reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); - String time = scanner.nextLine(); - if (!time.toLowerCase().equals("skip")) { - try { - date = Time.formatTime(date, time); - tasks.addTask(new Deadlines(desc, date)); - } catch (InvalidTimeException | InvalidDateException e) { - reply.printDialog(e.toString()); - } - } - } - - private static void handleEvent(Scanner scanner) { - - reply.printDialog("So you want to add a event task. Tell me what's the task."); - String desc = scanner.nextLine(); - reply.printDialog("Now indicate the start date."); - String from = scanner.nextLine(); - try { - from = Time.formatDate(from); - } catch (InvalidDateException e) { - reply.printDialog(e.toString()); - } - reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); - String fromTime = scanner.nextLine(); - if (!fromTime.toLowerCase().equals("skip")) { - try { - from = Time.formatTime(from, fromTime); - } catch (InvalidTimeException | InvalidDateException e) { - reply.printDialog(e.toString()); - } - } - reply.printDialog("Now indicate the end date."); - String to = scanner.nextLine(); - try { - to = Time.formatDate(to); - } catch (InvalidDateException e) { - reply.printDialog(e.toString()); - } - reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); - String toTime = scanner.nextLine(); - if (!toTime.toLowerCase().equals("skip")) { - try { - to = Time.formatTime(to, toTime); - tasks.addTask(new Events(desc, from, to)); - } catch (InvalidTimeException | InvalidDateException e) { - reply.printDialog(e.toString()); - } - } } - public static void markTask(String input, boolean mark) throws - InvalidInputException, - MissingArgumentException, - InvalidCommandException { - Command command = mark ? Command.MARK : Command.UNMARK; - String number = getCommandArguments(input, command); - try { - if (mark) { - tasks.markDone(Integer.parseInt(number)); - } else { - tasks.unmarkDone(Integer.parseInt(number)); - } - } catch (NumberFormatException e ) { - reply.printDialog("Strictly type 1 number only"); - } catch (IndexOutOfBoundsException e) { - reply.printDialog("Index number does not exist in our list"); - } - } - private static void deleteTask(String input) throws - InvalidInputException, - MissingArgumentException, - InvalidCommandException { - String number = getCommandArguments(input,Command.DELETE); - try { - tasks.deleteTask(Integer.parseInt(number)); - } catch (NumberFormatException e ) { - reply.printDialog(" Strictly type 1 number only"); - } catch (IndexOutOfBoundsException e) { - reply.printDialog(" Index number does not exist in our list"); - } - } - - private static String getCommandArguments(String input, Command command) throws - InvalidInputException, - MissingArgumentException, - InvalidCommandException { - - int cmdLength = command.getCommandStringLength(); - String args = input.substring(cmdLength); - - if (args.isBlank()) { - switch (command) { - case MARK: - case UNMARK: - case DELETE: - throw new MissingTaskArgumentException(); - default: - throw new InvalidCommandException(); - } - } else if (args.startsWith(" ")){ - return args.substring(1); - } else { - throw new InvalidInputException(); - } - } } \ No newline at end of file diff --git a/src/main/java/Enums/Command.java b/src/main/java/Enums/Command.java index 8c052375f9..f73f3f24f4 100644 --- a/src/main/java/Enums/Command.java +++ b/src/main/java/Enums/Command.java @@ -11,7 +11,8 @@ public enum Command { EVENT("event"), BY("by"), FROM("from"), - TO("to"); + TO("to"), + SKIP("skip"); private String cmd; private int strLength; diff --git a/src/main/java/Exception/InvalidCommandException.java b/src/main/java/Exception/InvalidCommandException.java index 605a11e10a..cad061951b 100644 --- a/src/main/java/Exception/InvalidCommandException.java +++ b/src/main/java/Exception/InvalidCommandException.java @@ -1,4 +1,8 @@ package Exception; public class InvalidCommandException extends Exception { + @Override + public String toString() { + return "This is not a registered command that I know of"; + } } diff --git a/src/main/java/Parser/CommandParser.java b/src/main/java/Parser/CommandParser.java new file mode 100644 index 0000000000..3d729c788b --- /dev/null +++ b/src/main/java/Parser/CommandParser.java @@ -0,0 +1,33 @@ +package Parser; + +import Enums.Command; +import Exception.InvalidInputException; +import Exception.MissingArgumentException; +import Exception.InvalidCommandException; +import Exception.MissingTaskArgumentException; + +public class CommandParser { + public static String getCommandArguments(String input, Command command) throws + InvalidInputException, + MissingArgumentException, + InvalidCommandException { + + int cmdLength = command.getCommandStringLength(); + String args = input.substring(cmdLength); + + if (args.isBlank()) { + switch (command) { + case MARK: + case UNMARK: + case DELETE: + throw new MissingTaskArgumentException(); + default: + throw new InvalidCommandException(); + } + } else if (args.startsWith(" ")){ + return args.substring(1); + } else { + throw new InvalidInputException(); + } + } +} diff --git a/src/main/java/Time.java b/src/main/java/Parser/Time.java similarity index 99% rename from src/main/java/Time.java rename to src/main/java/Parser/Time.java index b673e57342..5397710eb1 100644 --- a/src/main/java/Time.java +++ b/src/main/java/Parser/Time.java @@ -1,3 +1,5 @@ +package Parser; + import Exception.InvalidDateException; import Exception.InvalidTimeException; @@ -130,7 +132,7 @@ public static String formatTime(String date, String time) throws InvalidTimeExce DateTimeFormatter currentFormat = findDateFormat(date); LocalDate lDate = LocalDate.parse(date, currentFormat); int intTime = Integer.parseInt(time); - int hour = intTime / 100; + int hour = (int) Math.floor(intTime / 100.0); int minute = intTime - (hour * 100); return lDate.atTime(hour, minute).format(stdFormat); } diff --git a/src/main/java/Database.java b/src/main/java/Storage/Database.java similarity index 98% rename from src/main/java/Database.java rename to src/main/java/Storage/Database.java index 724bc7c434..3128eeba43 100644 --- a/src/main/java/Database.java +++ b/src/main/java/Storage/Database.java @@ -1,8 +1,11 @@ +package Storage; + import Enums.Command; import Task.Task; import Task.Deadlines; import Task.ToDo; import Task.Events; +import Ui.Reply; import java.io.*; import java.util.ArrayList; diff --git a/src/main/java/TaskList.java b/src/main/java/Task/TaskList.java similarity index 97% rename from src/main/java/TaskList.java rename to src/main/java/Task/TaskList.java index 20d8c682d4..9bf495aba0 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/Task/TaskList.java @@ -1,4 +1,7 @@ -import Task.Task; +package Task; + +import Ui.Reply; +import Storage.Database; import java.util.ArrayList; diff --git a/src/main/java/Reply.java b/src/main/java/Ui/Reply.java similarity index 98% rename from src/main/java/Reply.java rename to src/main/java/Ui/Reply.java index d865763ed1..5299b52dd5 100644 --- a/src/main/java/Reply.java +++ b/src/main/java/Ui/Reply.java @@ -1,3 +1,5 @@ +package Ui; + public class Reply { private String indent = " "; private String section = indent + "________________________________________\n"; From 35c2a83d48ed0aec20bbf80e1b188ee1925f13dd Mon Sep 17 00:00:00 2001 From: You Wei Date: Mon, 28 Aug 2023 09:58:41 +0800 Subject: [PATCH 19/70] package and cleanup --- src/main/java/Duke.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index c655378a42..2e70dbc32a 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,17 +1,11 @@ -import Exception.InvalidDateException; import java.util.Scanner; import Command.*; import Enums.Command; import Exception.InvalidInputException; -import Exception.InvalidTimeException; import Exception.InvalidCommandException; import Exception.MissingArgumentException; -import Parser.CommandParser; -import Parser.Time; -import Task.Events; import Task.TaskList; -import Task.ToDo; import Ui.Reply; public class Duke { From 3c6d11213b3f37f3b5acde640825f5ee223b446d Mon Sep 17 00:00:00 2001 From: You Wei Date: Mon, 28 Aug 2023 22:25:13 +0800 Subject: [PATCH 20/70] Use Gradle --- .gitignore | 2 +- README.md | 4 ++-- build.gradle | 2 +- .../{Duke.java => chatbot/evan/Evan.java} | 18 ++++++++++-------- src/main/java/command/DeadlineCommand.class | Bin 0 -> 1940 bytes .../{Command => command}/DeadlineCommand.java | 16 ++++++++-------- src/main/java/command/DeleteCommand.class | Bin 0 -> 1273 bytes .../{Command => command}/DeleteCommand.java | 16 ++++++++-------- src/main/java/command/EventCommand.class | Bin 0 -> 2241 bytes .../{Command => command}/EventCommand.java | 16 ++++++++-------- src/main/java/command/MarkCommand.class | Bin 0 -> 1263 bytes .../{Command => command}/MarkCommand.java | 16 ++++++++-------- src/main/java/command/ToDoCommand.class | Bin 0 -> 886 bytes .../{Command => command}/ToDoCommand.java | 8 ++++---- src/main/java/command/UnmarkCommand.class | Bin 0 -> 1271 bytes .../{Command => command}/UnmarkCommand.java | 16 ++++++++-------- src/main/java/enums/Command.class | Bin 0 -> 1844 bytes src/main/java/{Enums => enums}/Command.java | 2 +- .../exception/InvalidCommandException.class | Bin 0 -> 361 bytes .../InvalidCommandException.java | 2 +- .../java/exception/InvalidDateException.class | Bin 0 -> 359 bytes .../InvalidDateException.java | 2 +- .../exception/InvalidInputException.class | Bin 0 -> 373 bytes .../InvalidInputException.java | 2 +- .../java/exception/InvalidTimeException.class | Bin 0 -> 359 bytes .../InvalidTimeException.java | 2 +- .../exception/MissingArgumentException.class | Bin 0 -> 277 bytes .../MissingArgumentException.java | 2 +- .../MissingTaskArgumentException.class | Bin 0 -> 414 bytes .../MissingTaskArgumentException.java | 2 +- src/main/java/parser/CommandParser$1.class | Bin 0 -> 658 bytes src/main/java/parser/CommandParser.class | Bin 0 -> 1035 bytes .../{Parser => parser}/CommandParser.java | 12 ++++++------ src/main/java/parser/Time.class | Bin 0 -> 4385 bytes src/main/java/{Parser => parser}/Time.java | 6 +++--- src/main/java/storage/Database.class | Bin 0 -> 2579 bytes .../java/{Storage => storage}/Database.java | 14 +++++++------- src/main/java/task/Deadlines.class | Bin 0 -> 1302 bytes src/main/java/{Task => task}/Deadlines.java | 4 +--- src/main/java/task/Events.class | Bin 0 -> 1427 bytes src/main/java/{Task => task}/Events.java | 4 +--- src/main/java/task/Task.class | Bin 0 -> 1384 bytes src/main/java/{Task => task}/Task.java | 2 +- src/main/java/task/TaskList.class | Bin 0 -> 2490 bytes src/main/java/{Task => task}/TaskList.java | 6 +++--- src/main/java/task/ToDo.class | Bin 0 -> 1108 bytes src/main/java/{Task => task}/ToDo.java | 4 +--- src/main/java/ui/Reply.class | Bin 0 -> 1955 bytes src/main/java/{Ui => ui}/Reply.java | 4 ++-- 49 files changed, 90 insertions(+), 94 deletions(-) rename src/main/java/{Duke.java => chatbot/evan/Evan.java} (88%) create mode 100644 src/main/java/command/DeadlineCommand.class rename src/main/java/{Command => command}/DeadlineCommand.java (84%) create mode 100644 src/main/java/command/DeleteCommand.class rename src/main/java/{Command => command}/DeleteCommand.java (74%) create mode 100644 src/main/java/command/EventCommand.class rename src/main/java/{Command => command}/EventCommand.java (92%) create mode 100644 src/main/java/command/MarkCommand.class rename src/main/java/{Command => command}/MarkCommand.java (74%) create mode 100644 src/main/java/command/ToDoCommand.class rename src/main/java/{Command => command}/ToDoCommand.java (84%) create mode 100644 src/main/java/command/UnmarkCommand.class rename src/main/java/{Command => command}/UnmarkCommand.java (74%) create mode 100644 src/main/java/enums/Command.class rename src/main/java/{Enums => enums}/Command.java (97%) create mode 100644 src/main/java/exception/InvalidCommandException.class rename src/main/java/{Exception => exception}/InvalidCommandException.java (90%) create mode 100644 src/main/java/exception/InvalidDateException.class rename src/main/java/{Exception => exception}/InvalidDateException.java (90%) create mode 100644 src/main/java/exception/InvalidInputException.class rename src/main/java/{Exception => exception}/InvalidInputException.java (90%) create mode 100644 src/main/java/exception/InvalidTimeException.class rename src/main/java/{Exception => exception}/InvalidTimeException.java (90%) create mode 100644 src/main/java/exception/MissingArgumentException.class rename src/main/java/{Exception => exception}/MissingArgumentException.java (86%) create mode 100644 src/main/java/exception/MissingTaskArgumentException.class rename src/main/java/{Exception => exception}/MissingTaskArgumentException.java (92%) create mode 100644 src/main/java/parser/CommandParser$1.class create mode 100644 src/main/java/parser/CommandParser.class rename src/main/java/{Parser => parser}/CommandParser.java (79%) create mode 100644 src/main/java/parser/Time.class rename src/main/java/{Parser => parser}/Time.java (98%) create mode 100644 src/main/java/storage/Database.class rename src/main/java/{Storage => storage}/Database.java (94%) create mode 100644 src/main/java/task/Deadlines.class rename src/main/java/{Task => task}/Deadlines.java (94%) create mode 100644 src/main/java/task/Events.class rename src/main/java/{Task => task}/Events.java (95%) create mode 100644 src/main/java/task/Task.class rename src/main/java/{Task => task}/Task.java (98%) create mode 100644 src/main/java/task/TaskList.class rename src/main/java/{Task => task}/TaskList.java (97%) create mode 100644 src/main/java/task/ToDo.class rename src/main/java/{Task => task}/ToDo.java (93%) create mode 100644 src/main/java/ui/Reply.class rename src/main/java/{Ui => ui}/Reply.java (90%) diff --git a/.gitignore b/.gitignore index 88ea822527..70038e7201 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ bin/ /text-ui-test/ACTUAL.TXT text-ui-test/EXPECTED-UNIX.TXT -data/tasklist.txt +data/*.txt # Class files src/main/java/*.class diff --git a/README.md b/README.md index 8715d4d915..71f098bfc8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Duke project template +# chatbot.evan.Evan project template This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it. @@ -13,7 +13,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version. 1. If there are any further prompts, accept the defaults. 1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).
In the same dialog, set the **Project language level** field to the `SDK default` option. -3. After that, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output: +3. After that, locate the `src/main/java/chatbot.evan.Evan.java` file, right-click it, and choose `Run chatbot.evan.Evan.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output: ``` Hello from ____ _ diff --git a/build.gradle b/build.gradle index a388517ae1..ca0b9f6722 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ test { } application { - mainClass.set("seedu.duke.Duke") + mainClass.set("chatbot.evan.Evan") } shadowJar { diff --git a/src/main/java/Duke.java b/src/main/java/chatbot/evan/Evan.java similarity index 88% rename from src/main/java/Duke.java rename to src/main/java/chatbot/evan/Evan.java index 2e70dbc32a..df7801570c 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/chatbot/evan/Evan.java @@ -1,14 +1,16 @@ +package chatbot.evan; + import java.util.Scanner; -import Command.*; -import Enums.Command; -import Exception.InvalidInputException; -import Exception.InvalidCommandException; -import Exception.MissingArgumentException; -import Task.TaskList; -import Ui.Reply; +import command.*; +import enums.Command; +import exception.InvalidInputException; +import exception.InvalidCommandException; +import exception.MissingArgumentException; +import task.TaskList; +import ui.Reply; -public class Duke { +public class Evan { private static TaskList tasks = TaskList.init(); private static Reply reply = Reply.init(); diff --git a/src/main/java/command/DeadlineCommand.class b/src/main/java/command/DeadlineCommand.class new file mode 100644 index 0000000000000000000000000000000000000000..2e74102df331cfeef3abc3f5fa863551170efdfb GIT binary patch literal 1940 zcma)7=~i4t5dIowxWna=00~0&c8M&3nJmUEU^GHdWLV4~N{nDL(}5fAGT!M4;R*B^ zd;x!loHOB=b9?|F%J}sxEJuFGaQb#ve^p)eRdw~>|NQwEfIEm?Tt?PGt`paB!$liz zcH$ClW$=lM+xXNFD+)u!L*A}Ogea! z!Hl)_m4mNc3}V*BH<+_l^L94xV8OwnKswRoU{}D+SN+^$JD;G?sLFOl;B?+ja?2d@ ze#LO7W73a&^FW||cw|K&H5He%#rct5sD>LlSymeXCFzP$i4o{77**V!SLM3g!IFb- z1u~PxplQb~#MPvzXMC%5c3P_vcl1;ohAJv$pQ{(j!-x1tpx4fGRpSS_LQzGLP8>Y; zP{6VUeCOc`q`<>MEO+Co+)ay|UC^s9uP=Q~X zCg4#^=wZ#;Tbpg!QnJpGG(NrXBblgZ(~magvm_4Xb^gh5dGprods(^4fI_t^b!2oR zhYH(%dB_GA#pcj8MoB{+*73x_&mI&uJQVT7LkSc=!{$jYE>q{gMMhgEIiM%GMmlHW zBvj@IVr3zY#-nPe6EYIW;+9HOk#1GUi_x5wvT`ZVs-m0j63eov$T$jiv+}Vv)g-cE z(*LbE)Md4)v)QbN_wj+isd~M&s-R*syXC<5@EqG70)%#m1O|$Y0?D-Ckh;CuGVst3b=JT}vd>!t`Ol-MoXhf@!mtk=D#0`5fGOgPr z&{gJ{X4+Rl%#-_@I(3d4?o8AbBK^|XYs6bHJkqdx6l3kEq@t6YO&Ra&vwCK1i3xms zlF^fFWK7(mpv%Phctx!EOqv5(0av%9Iy0jfj)QdI#P#j&Uw zyibg<+M8ZBT)umPm;ZJ0#Mp=apDKy(KGv}W9CiTPzgSzthuy4BdCImR0grUIvc&*< zxjbfLf~9$heHv`WuI)0Mxwc&SZHKVkiQ`qSF7Ye)O^?2Tc*O}b!?B|-^w5c+7E~-E z%^&dFTePk2q5Ta~b9+elb=2UD){x2DMQ3v{Kei8d{tuj9pme+jkMdU*(A@+qPmv4^-`V*2>BoFOG=sXajb3$!qZEY9IB&htgOh=-(QhV-ov z^^^>(lR8E60umRJkC>V}wEU8f*sruOOzSt0en&&?4%!@y@E^iKSJyj2QwOr9c$80B pzl#j6waB$_8UecZap5)6`?&ZT1BdyruPQg0ms13eao&dUe*vDda5sv3n9^|{sVI7p)-jD49S`u3 zV^&!*8XoDG!()yo8lEb3UiqJKEO0z$=<-F)IbzTYbvyG>>5F8PRL}6xOBWqxuJy~%*DkrWyC+IC>no;YgAn_~?9?E&RoDJsGzGKGcd z`X6HEiI~?IPpmA5JX0$`bWi0Kd9~K6F!a=j(lTpXj#nYSVk(1?N?+Zke!5=Ex`-sL zW*@C_2XsX=(sadBk`WL#4AD7Ex7#Ec$*$?IU?-$7jL_K~8g)c*6Qh(wg?=F!AvrUB zijD>%g;R9SG|+X9?qiG;Poc%5=g^N~gt|fc2|dxMdICI@N%W9K6_}#bAdg0v;#4FN zVj997(vwtff}*CW^eu`SM&uW{J2=MZ1LNQu96cI=2PKHmqj8v|B`@1bhxmb51F!=S(k(mOEu8!vk;`Tzg` literal 0 HcmV?d00001 diff --git a/src/main/java/Command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java similarity index 74% rename from src/main/java/Command/DeleteCommand.java rename to src/main/java/command/DeleteCommand.java index fecc43262f..6968421b91 100644 --- a/src/main/java/Command/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -1,11 +1,11 @@ -package Command; +package command; -import Exception.InvalidCommandException; -import Exception.MissingArgumentException; -import Exception.InvalidInputException; -import Parser.CommandParser; -import Task.TaskList; -import Ui.Reply; +import exception.InvalidCommandException; +import exception.MissingArgumentException; +import exception.InvalidInputException; +import parser.CommandParser; +import task.TaskList; +import ui.Reply; public class DeleteCommand { private static Reply reply = Reply.init(); @@ -15,7 +15,7 @@ public static void start(String input) throws MissingArgumentException, InvalidCommandException { - String number = CommandParser.getCommandArguments(input, Enums.Command.DELETE); + String number = CommandParser.getCommandArguments(input, enums.Command.DELETE); try { tasks.deleteTask(Integer.parseInt(number)); } catch (NumberFormatException e ) { diff --git a/src/main/java/command/EventCommand.class b/src/main/java/command/EventCommand.class new file mode 100644 index 0000000000000000000000000000000000000000..0b55ec60d180fb23195e886248e828dd1284659c GIT binary patch literal 2241 zcma)8%X3pz9R6;a^rpABlokpN6u79+2W^5pq)iKog=!@&NNTlM!PDf>UV0zl=7!Rp zD|gN~E}hXOY}^1dfsxUrGwNQ(rTz=L7Qb_o&{VRp)4AuI-}C!D&hO-xf4=__z!}^& za0nS4$2;&kP8f*cWCsr7R1&8Ryn!={GM>bQfh;CPvUmqT*er)1+OJ`{!ZIZ=w}I0 zELU0^Ya$#hTj83lF?4)nVhPtwe2irc1M~idWqU=tAVNw|DhkIc@|f1~iHYmDq2Zvs zTacyD_PxxkcSksO@d5=dHi#xZRmQH*HVlcnnb0N#+p_}Ut=itIbu;i?>p1_cG3&(1 z(-UcHiBY&>(;{*iScCa>yELdG^89cMm#~x}69UURR!kI7G$FBU;wDy2tif&tae+E7 zAZj=iW!52*Os#-3e&C9*Nn&x{_r|=6D+8v(u?lM<5Cy_2TSXa4?uu#aiX%l?*5Oi? zjZn6H&)G~{S7lfUJQXJKulcSliB*|Sr#0+*Da+C;)^cp(6}+mUGitx6DaxwQw{)zV zaNwHo;Hytb!|p<@Uoy?jqhaS(V3${J5$85iJ`4y+!>%o9aBajh6li9W*%ws3rU?yKuWsjtDAj1)Y1H&pkDkqr&k z>^93NJ0d8{AfqbDi+eLFnCd(YM_URPc11Xx7~7(%<$ZGa+6$C5$m1=XY>wS_U3qHEhQ z)1Y%csL`fj$I#ZGi;56e(@BHL0yOH!kb8LCW@8eEIbsiSoX23O8N{8TT9<1ZG&Q^U zJ<8Jot{T_G$YW>^xY01kZ+k@SLI;K#qOt3w>g4_X6tSg;XnTzKrH4rLwpXE#RFTZ7 zLr48EH~Iv|+e+ZIP7m4mee`4#N+Hq0Nj4%kyBSKwQwcg!iUZkprAYiWPwLe0)c+Kz zrDLP1_+#v=V*djqnTHXK@vU3LGHzg3eXX5c^x<=SfiKDb0YBkq@@s4D{EYlql-YY2 zW)6EPx0^D3=*J!wXfLg&X#W5`>_Zy+F^&ODu!!eb#u-X1vV6l~@h;|u)^llUD| z_ycG0C*SVB=vAR~U_2+FHXSh?Bm9S^qqFllUB_S0>f~c{I{GNS7l~$8L#gXIwcG#0 s*`~@2kJ50hEr+B21G=7I;1O7`1CP+Z)t>4n2(W_<*-gPQ?qf**3w9tN00000 literal 0 HcmV?d00001 diff --git a/src/main/java/Command/EventCommand.java b/src/main/java/command/EventCommand.java similarity index 92% rename from src/main/java/Command/EventCommand.java rename to src/main/java/command/EventCommand.java index 0c94475d20..b3232036c6 100644 --- a/src/main/java/Command/EventCommand.java +++ b/src/main/java/command/EventCommand.java @@ -1,12 +1,12 @@ -package Command; +package command; -import Exception.InvalidDateException; -import Exception.InvalidTimeException; -import Enums.Command; -import Parser.Time; -import Task.Events; -import Task.TaskList; -import Ui.Reply; +import exception.InvalidDateException; +import exception.InvalidTimeException; +import enums.Command; +import parser.Time; +import task.Events; +import task.TaskList; +import ui.Reply; import java.util.Scanner; diff --git a/src/main/java/command/MarkCommand.class b/src/main/java/command/MarkCommand.class new file mode 100644 index 0000000000000000000000000000000000000000..19f3a4a11b81730f3a9a0e3721d961472a44f767 GIT binary patch literal 1263 zcmZ`&+foxj5IvI+X0vSMjtD9nP)IJ>BQ@p84_f+jjs9*woR3dvV;yq>d@1;^;?%Sc%)+vk2#)bc&f~K6@SLD!10_R=839v%%JCMc4k}IS#k!Jf8aB8=arG!r6q6s z0Yy3&ZD|Lu8KSB5Cx(s{wHp0_pL)K<5;qs*$F&b zmb2<&VkfYQ2L-Dd=5xFt1Zzh{Q4MTY`W!DgvK)&H+G5dZwA6RpnpYI-wrbE*u)Kp6 zw^FfWX;!r`Fo+?JR|a0=4aZvpOISA0j{%Mq1FKl$SU2zv?-|Bgm@ZMTyI#c#t^gS5 zMIXbc0$dE7V>39e3UkhsAw|=b&M`;Mzz2*lOtgySWJw%t)q<_h%Wh4U{HuZtQ(>%G zq2vnRlx|>(BbuveOOvRX4%r4akXK8Ap}%;^FVn`An78_E?d^*qO}Wi=Ib)(In$yhW z8MMCm1@sdbp>2?TN>?=MJ_sJ}Npz7%HJGH*AVeC)`ly9MG(>Ig zlAWZCacVq`QTl4c9TTi8A$RZ zYL4f~cMQ>D=_^BQ*Y5}w=Xm1tu-6hnleb*5#0QcGk|9}ZyXP53!yg81@xf94Y}4QK zcl}PRYd6~5^F*NGiHWCprUIUu$YGgbr{P;8e`pHq zc&B4=OF>$SaK&m0*R^`WIzHsGFtFsIm^n1OF!2)GCXH~%#0pj!^jVLTtV(Qacx~bh zswQf9s{}Q>(w;H37g$pdAy=1sU3K5O{E%u946DV`40kbxA$?_= z3>wW%?UrGwINx*#7E?=OFbU{_2hq*Z^$JE68}!Dq^duwn#%MRB8EUL_MnPPWCwYx- z>vS?Y(E%wDJVW`WX5djDxKy zQWKbSusq_FmPQIo#34fkve+b6N!+{yFNFmu>J;e{#80tw0(}ml{*7uOK_CpbNRQz5 EKLVnVlA1Zw-P3)#_sox<-@XHw#k!6z+-t{ujOiFhx*eU!=$OEyjt6+i zF{Lb74Ucq8<1xn*4Nn!EQT}HfvmDPET0K#9>I{0mW@k4Qo+D#m`TIUYXI_EqHZ6JE z56IItZ%aFP%@9v#J~6Z`xh0|EY$?`jm0jU&Te}WfTK&NC0*1bHe$P6vvW_Lo*{#5{ zWqD3rOl$>Kalc?y!+4Gt#9-yHD5`<&N}uB;#~jBzgEn7u8YT5Dx8@bas;vqncVxx# z_LtmB#ge5dRm4Ca`Z-=1c#St4Zw)M9(LfJ+IhG78V})bYz&pHW7>-z7@LqMjiWOW^ zFwl)8!;qp}44k?d)T_drHf7kP=}M>0ku&fCgAAilvYaf5!;M<7@p;j$$&!DWkYPOZ zH8Yf4;hWM8OmRq)HEn59bEZSsz#8&uDbVsY%hC zXf`JgEXOY8WVIGG$uJT{6l~w8ue0ElYZW1{2Bo5)Mw-UduQZnsG#NkJaF9-R)(Z=p zYf2i|JS3sss^$5@YsP*IPYgX}5j3thIgkQp{-K{gGG_i(7(;h7pqvauS$HI+urM9} zBg-7g@|xaBleJJ~%dRBJwWM=Ox?1z0FmzN&(8028Ic}N!N~a7)I&<|cb<^=$);Xl; zVRq3YjzL#4Bcv;p(jEtKLqDxI>2!y7MtkeTSFmFO3bg~krF;}!-fi3WR3r#fEdSZ`h#)sHI5FA$b%BZ>C!MvLaEEPG9iB;agM|( Zv~%1zMN8D4PAmX}+DuU32;mq;e*>k&E+YT{ literal 0 HcmV?d00001 diff --git a/src/main/java/Command/UnmarkCommand.java b/src/main/java/command/UnmarkCommand.java similarity index 74% rename from src/main/java/Command/UnmarkCommand.java rename to src/main/java/command/UnmarkCommand.java index d17e972770..7b76731c4a 100644 --- a/src/main/java/Command/UnmarkCommand.java +++ b/src/main/java/command/UnmarkCommand.java @@ -1,12 +1,12 @@ -package Command; +package command; -import Exception.InvalidCommandException; -import Exception.MissingArgumentException; -import Exception.InvalidInputException; -import Enums.Command; -import Parser.CommandParser; -import Task.TaskList; -import Ui.Reply; +import exception.InvalidCommandException; +import exception.MissingArgumentException; +import exception.InvalidInputException; +import enums.Command; +import parser.CommandParser; +import task.TaskList; +import ui.Reply; public class UnmarkCommand { private static Reply reply = Reply.init(); diff --git a/src/main/java/enums/Command.class b/src/main/java/enums/Command.class new file mode 100644 index 0000000000000000000000000000000000000000..25094cc7b7dfafde9693fd7ff20cb3edb8d609a3 GIT binary patch literal 1844 zcmZuxYgZdp6y1|dGB?9ero*Fxlv>(q5(N5!(t^k<)JP!61aw+olVnH(dDLWrQlFpw z3H}6^A2hYCt1eyr?2mGJ?nwmNz=!O;&pqd!d-u7+KmR`e8^A665P^yv9UtN&4NDpv z9h0~xf9}hbk9B;4PbK?I;HtpqI#E~ZtiW}FoTPby8v>rBy8<@_3X(n$m=Y*Tx+gF# zurFyz;FdsH(u%;0KvmL*0=EUekhCUnN1!gLFEA_6kn})cPT)&PztV81Ah_ft6!fIL zN~2t#T&|YOZY4jfKusm>48i*1)|!Iw_C}kmBvOeCRfv_u;z}yHK~&A8SJDbXiJim- zl?0X?imh&?*NJCnLABSCo75>+&MUA|d+vcdS#m3dN!za#D+Ov6srxlLLBW5ZKuIdl zF7GU+wiC7j^M1$4!Ut}t;niuYXsmNpU9RRmd7)y(+h~-tUM=HhOBB(#EWNAXQnd37 zvCcMg#Y)kiR}eiVJ$cFwJ9H1bSg5#uqelJuPbrI0j$ZKmw#^FqqOs1M6bu~av^@IX zoM1FY_K3M$seL#K(4H4hY?7cs&b@M*dGc7dtBqRDTP;d6jP?m8S0$EJaIu|PA;9(r=|eFIlg2SROK!bBd&1N9Lp?bw zxhvHToUCi7CFMxW;{&w9WI~Cb_`)^%_$KL}M$f{abPXUR#~8^iM)HY~9AYGA7|9hz zGK7)rU?eLT$p}U=fjR`_$QWr_fH@>5O*)JSmazf_2~wkk@=tFM!@7L6B|?^u@=9pCKF{e*!H&{uJT~BEKDV zvRXORu^(L+KrhZ=jaCClQMYw$w7Z`tl;;h_e~0#J;~`o~WAl{M$S+5oT6Y?Ozz5iB zr78|Wv<~I$pHLl34_aN%U_3@Q%QLFg!_s7VHe^{Wds+5{t$vmREYE4yYb*y@4hidZ zmcuO1n_+8&^##^%n3{Ew^(gC0rm!xvzQX!VGh)5PI?6g`>QM0=^+l9;2r4IIkp;^jO=L1_+(&QJ9nY#Dd zn&S{`qk$$Noy_!H@HW;9DV!?w+$*PYk*!j~&!iVaacAsIC=p+^MMCt4A0;QVGRjmu_Y311s;-@UPw&P;Nt9bY|8cJR)bUp!f CeNTn} literal 0 HcmV?d00001 diff --git a/src/main/java/Exception/InvalidDateException.java b/src/main/java/exception/InvalidDateException.java similarity index 90% rename from src/main/java/Exception/InvalidDateException.java rename to src/main/java/exception/InvalidDateException.java index 0dfc6b43d2..0636f6af23 100644 --- a/src/main/java/Exception/InvalidDateException.java +++ b/src/main/java/exception/InvalidDateException.java @@ -1,4 +1,4 @@ -package Exception; +package exception; public class InvalidDateException extends Exception { @Override diff --git a/src/main/java/exception/InvalidInputException.class b/src/main/java/exception/InvalidInputException.class new file mode 100644 index 0000000000000000000000000000000000000000..2163079276c6545c797b173f3fba8282af040c07 GIT binary patch literal 373 zcmZutJx{|h6ug&yq=Z8Gnm`D%wG7F~0D=L5RHA+*nIrU-+HHtMo2 zXR5lEvx1qPvr|`TlM}XvqshH&WKu|zCtvIlA)4B{O4Wt-^6jx{WTCUMnb+?8F;#P? zt%<#@j}E$o(_34MTsO)H?M1>?BDG~HO(ygMa|?egu9T}Q!-Ivh;?9<8E^`&fF=0=A z-<$k9jj;I}^CtuL(c(YwD**W{j3MuKxf0jT!3*e_8-6sSKL%R}ONbb~bcgGL-3Xrk L2)%rnxd8o7l227; literal 0 HcmV?d00001 diff --git a/src/main/java/Exception/InvalidInputException.java b/src/main/java/exception/InvalidInputException.java similarity index 90% rename from src/main/java/Exception/InvalidInputException.java rename to src/main/java/exception/InvalidInputException.java index fecd3e8498..4fd8934a4d 100644 --- a/src/main/java/Exception/InvalidInputException.java +++ b/src/main/java/exception/InvalidInputException.java @@ -1,4 +1,4 @@ -package Exception; +package exception; public class InvalidInputException extends Exception{ @Override diff --git a/src/main/java/exception/InvalidTimeException.class b/src/main/java/exception/InvalidTimeException.class new file mode 100644 index 0000000000000000000000000000000000000000..959f5c0cae88e2106ceb18c6e4f4d17529e1e861 GIT binary patch literal 359 zcmZusJx{|h6uj53lu#&N3ql~XwG7F?zyM-FAR$!@G-7v~r_?BQs^CQYESQiO_yPPV z#4{BjAw1mK=R2R@`^W1WfD>$nXko33^#J_<8-&i8vBsSfnuFmTp>JRS^gaQO Cv`?r2 literal 0 HcmV?d00001 diff --git a/src/main/java/Exception/InvalidTimeException.java b/src/main/java/exception/InvalidTimeException.java similarity index 90% rename from src/main/java/Exception/InvalidTimeException.java rename to src/main/java/exception/InvalidTimeException.java index 12d4c2a521..034993401c 100644 --- a/src/main/java/Exception/InvalidTimeException.java +++ b/src/main/java/exception/InvalidTimeException.java @@ -1,4 +1,4 @@ -package Exception; +package exception; public class InvalidTimeException extends Exception{ @Override diff --git a/src/main/java/exception/MissingArgumentException.class b/src/main/java/exception/MissingArgumentException.class new file mode 100644 index 0000000000000000000000000000000000000000..7bd5c7cfdc75b08a72e6af70ebf4172c0462cb08 GIT binary patch literal 277 zcmX^0Z`VEs1_pBmel7-P1|D_>UUmjPMg}&U%)HDJJ4Oa(4b3n{1{UZ1lvG9rexJ;| zRKL>Pq|~C2#H1Xc2uDeNa7j^SUOFR#h=!(5R$^JAeokUux;{kInvsDkIKQ+gIn^x_ zq+HfFv$zxFIZx z3`{^zfB+K%(9sO6K#~o}lLgX@K$=x+I|JiJAcK*C9Z0f)1({iZ-eBMai*f-;CI)T* D2gg6m literal 0 HcmV?d00001 diff --git a/src/main/java/Exception/MissingArgumentException.java b/src/main/java/exception/MissingArgumentException.java similarity index 86% rename from src/main/java/Exception/MissingArgumentException.java rename to src/main/java/exception/MissingArgumentException.java index f54dde131b..f57eea20c2 100644 --- a/src/main/java/Exception/MissingArgumentException.java +++ b/src/main/java/exception/MissingArgumentException.java @@ -1,4 +1,4 @@ -package Exception; +package exception; public abstract class MissingArgumentException extends Exception{ @Override diff --git a/src/main/java/exception/MissingTaskArgumentException.class b/src/main/java/exception/MissingTaskArgumentException.class new file mode 100644 index 0000000000000000000000000000000000000000..33de5f3cc0dcd3b328649056b764053fb77d71fe GIT binary patch literal 414 zcmaKoKTAU~6va>a@6}qZikk>|4$?Z<(LoVJbg^2YMQ}{tOJAdXiR9%;Ka7)~Kqt|` zK{x$Q;!VZHf*H?y6>K0~qDx?m_BnpiS4 zI!ep4JRL~e7lSc5RcCt6DxEN_Hd~!5aVy$mp_BHHyUS4PncPP5Sb01=Rar)KUu4$@ zHpx?|-O(hHH%=M7?WgM~qrz~)`TPCn-P<$ocF%iZ81hS#^P#bcaoia$;+VUUEN h_DC1n4ykX0Mi}N$BlYMS)v3Euc=!W)e4e}l>fhIuW~l%G literal 0 HcmV?d00001 diff --git a/src/main/java/Exception/MissingTaskArgumentException.java b/src/main/java/exception/MissingTaskArgumentException.java similarity index 92% rename from src/main/java/Exception/MissingTaskArgumentException.java rename to src/main/java/exception/MissingTaskArgumentException.java index 56ae79e131..68f9f584bd 100644 --- a/src/main/java/Exception/MissingTaskArgumentException.java +++ b/src/main/java/exception/MissingTaskArgumentException.java @@ -1,4 +1,4 @@ -package Exception; +package exception; public class MissingTaskArgumentException extends MissingArgumentException { @Override diff --git a/src/main/java/parser/CommandParser$1.class b/src/main/java/parser/CommandParser$1.class new file mode 100644 index 0000000000000000000000000000000000000000..92746473fa5032701972cc1aa9346fe4636fec08 GIT binary patch literal 658 zcmZuu+iuf95Ivi?c4Ay=($I!-X(=X6Kq3MO@c=?X!4*}L6p>OM`n0iEjf=Bet?ly0 z@9+#r2qDxD;G+<;rcf0jt#;&!E7b?pgtb4eHz=Mkm9&V%UVFMk871P~Ixjg8N)VPSIn~6x{P-~?BF; z%2~a0lY{#V-j|7)cmmID1DWU!BUS{RB(r@KEmmwZe@ z4WGT*HbVWIaFmV{$a<7Zx6I#-M-dP6WG@nWk1Bbz z=dWNV-`&rsd@`r{1(vn*0oHa2ZGv-W&>?7-@FTU?(Zn+5&?1G~WH;~t56M=rK*V-Q nzX+fFOR(QKlo|fLU{MfM+Q1@Ni>QFhWu%E!vTpfaa{SsahBJw* literal 0 HcmV?d00001 diff --git a/src/main/java/parser/CommandParser.class b/src/main/java/parser/CommandParser.class new file mode 100644 index 0000000000000000000000000000000000000000..793d705c0004860c86b8ff69b991383cdbe38b32 GIT binary patch literal 1035 zcmZuvT~8B16g^W4(_OZFBZzzytk{C3A|NVYqNqs|iY6r*;c41V%0fGBcBbfG;RpEQ zllo8+N#x!Cr19?3S_s|E%$>P&=AL`!+~0qH{sOR$EgJ)f*_g$gjS1ZKr?`bd-1B|& z9QSQ-#5fW*EW{#6`iKRNMH^Ay|9~UKvBcnHl#Mc)DDI*!m;e&5mp?mV$H#0tUGvurw*QBg<)Q{2+~Oj|=8t5-Fx={dj4xlq zUOqCzT${I9O@~UN*Q6kVwuqN;NUM@L48+ecSh}9qfrt#FiA+c3xT{~1+Q-42eTMOP z?vrZ@hoogZV2d{&iy?GCF?rQ1x=NHuP;G=~^as}`9PQ9J$$e_&e(H1o3xRqLBQ%fF zZi*};+r4lG_MH|~3(Y-&)1rp`$sQ~=5ZYRpY@lm5)j;?ZYd_FU&Yq>O zbc{I~e#kBw6RmL${_zZvi*s0H?Tge?uCMRqEPIgJ^zVM=U}VgYur IqQyYuAMlj(7ytkO literal 0 HcmV?d00001 diff --git a/src/main/java/Parser/CommandParser.java b/src/main/java/parser/CommandParser.java similarity index 79% rename from src/main/java/Parser/CommandParser.java rename to src/main/java/parser/CommandParser.java index 3d729c788b..5abedb17ea 100644 --- a/src/main/java/Parser/CommandParser.java +++ b/src/main/java/parser/CommandParser.java @@ -1,10 +1,10 @@ -package Parser; +package parser; -import Enums.Command; -import Exception.InvalidInputException; -import Exception.MissingArgumentException; -import Exception.InvalidCommandException; -import Exception.MissingTaskArgumentException; +import enums.Command; +import exception.InvalidInputException; +import exception.MissingArgumentException; +import exception.InvalidCommandException; +import exception.MissingTaskArgumentException; public class CommandParser { public static String getCommandArguments(String input, Command command) throws diff --git a/src/main/java/parser/Time.class b/src/main/java/parser/Time.class new file mode 100644 index 0000000000000000000000000000000000000000..c38378abe017c026604886f1fa48630e6918af23 GIT binary patch literal 4385 zcma)9Yjjjs75>hh*Um5`VZ#u@GrW_KFc2U>!aD&H$UqP~&c3%;q!zq5FR9)B7BkXCBl~p4-rlizC!pa;bFoV!Xt#Q5x!1%l<*D0S;9HO zdBS6a#|cjmzDc-1xJY=C@GZhqgr^DLCVYqRUBWYj?-9OF_yOS(;aS2D!${&sA^bRu zRvZrFIs7DqpAvp%^UvG;%Y>hY@eBMixU5}5CO=`kfM3}|zYgO!xE#WZA-rS|T-4py zonB(#D=lj^@YnSxQw9Z1-F>Nb2YPp=1~w&j_6U>T+1;0{Poz_;`UiRwX@do&O}i5Z z6S1B|->z6odZ4>+S8bV6>F(ZCtkannvzKg=zAj6r25Jq4wxkmsd*X?`j&=yY4dHhN z;gyFvQhU?g{eAllhIJ+Ow6T!>aV=%;F zl#=merQNs3?T+2cbn1TtO9N zjb|nmWIf0*`JNl@l&mlAl&eh@c#b69DIVjh*iMyXofQAFjJwkUhsruB+fv5!NzS-8 zClel>l6BIZ;yLN6crHokRK;U7ZzahRo6(e&B;8&(Y5ScSl9Wj=)5*)hlCta)Ntq|+ zq|9F9rOfGQ$}+PuL9$ckinwvh8uu8_YKFX4*N zdYMjM4i&uWIrznUocKN(5cm8P6q zre3)!_68lsHRPr&<{n-zW#VM!)MoCKtaF3n-ZEQCW0tvPS;9@3yH_`>o|CyLb6mP2 zWeyX;UhFd%pK@zRtg-K4qNm#_SzciY;SUk~5q~n6{e zJrTTuSLKb#;hhkL@aG8rg1?6FS_FT?-y`@3UJv07k=Sc%4#c#M6lTlj`klK|9a2kk zD6OOhQ@349X&Y?Ewv`x~{}POKRVN zR9{D`_F7!Yt^J<36#Jl7-faDR$13N3Lgdy@`5MTEtg$bh+LanGAjfOz8bos)cRxiM z5~is{o8$ z%H?mD^v6kSqz#mxgLy=NLAU%3I%HVB#pE2xcdJYdgy9z+zP7@x7htvf*moZOmUce} zoHoEgrwww*X+um-OPuGlg+UH02=NdF#1RE~E)(XV$_(Lr1raV#Fq8`w{M#iJDz^B4uAd8~plJWjz_9@WI36vMhec5~h!Q#M~V}5h$tyi8vYx_BD zc~b73W#2w?1UCqdAP++^4EZQVfn4B1lu2(k7&RDP z;|Rv!PK?F9a=q`zcsz&+co-!(FDg%A5-wpfp2rlth^bN{rr~u=$G=f3??9Q!L%Cs8 zm@%j{Q!vw1B4(;F%Phrg(|{_o0dve&%rzaDXL?X=4q(2y84JvDEHw9^#+*Q{If+H) zAuKkJVu`tcrREtdGtXhUc>ycT%cwK2q2BxpE6snf$_ik$m5&Ci2#r<=)>>s~vZ@fb zYO&6$$9gM{W~&t&tR2{Bb)m)DhfUUv*lZm|t92K)SofjLdI0U#DQvaQV4L+AuCt!T z_13f4Ze7L>>m}S^y^4hO26kF+qQhs9^vOTvzTxQfjm0kCRCM{uvB$RrJ-*fG^{o-y zERpPy42**BEngJ^A@qjOC%;BQRP-hS=$BEyypgT)LP|XsWIv{BC4W9?^ULLOwrx3u zVBB}wf7*FVgObg5&97uEAhQn0YkEl7gQD>+$@XE#W(ZbeNcJNG1K6)mFXm;0qr6oP zSd+W~+v4SN@7rda#dT*yOJD7L$NEj8dozaMmK-nhkQRH+JC0uQoMg>nzFx%Qw%EFI zc{|!_{NncZ>OeGbd<1s%pGV^E>R>bw4HhQ5lGUMNe>4~koyE?Iv*^eg9gmQR9TlU; i#OSSZJa3c09hakZJ7T!QaUv+D4@$6%Y}7vFhyDkBc~emU literal 0 HcmV?d00001 diff --git a/src/main/java/Parser/Time.java b/src/main/java/parser/Time.java similarity index 98% rename from src/main/java/Parser/Time.java rename to src/main/java/parser/Time.java index 5397710eb1..00b6993eb3 100644 --- a/src/main/java/Parser/Time.java +++ b/src/main/java/parser/Time.java @@ -1,7 +1,7 @@ -package Parser; +package parser; -import Exception.InvalidDateException; -import Exception.InvalidTimeException; +import exception.InvalidDateException; +import exception.InvalidTimeException; import java.time.LocalDate; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/storage/Database.class b/src/main/java/storage/Database.class new file mode 100644 index 0000000000000000000000000000000000000000..7ec82cc786209beae0af4ecbc625e8d76566b3f1 GIT binary patch literal 2579 zcmc&$%Trrb82=qeIN|m}OA54UX}RTH$x=c=qg0WOOoa_cg$t7-t71WJuE>kGmkf@^Ba71_;~Ex07F8_aD#Nw7m2uj%gk{@HZQ8_~ zu!Uwgnr_nQWQBIcaOX64PG~bkO_NUNiD^kItLcQb#pSGFil%&nWFP) zTj(UU%raw+J})$r1{JSK(ghzkXZv5F7#Dg<*bL1jIw!L;GvsZma3Ev!x{5d8FtCt{ zYq(C;J=L}~a)mfQl zZN{?ab=Nh_SNnOuA!#2mYY<*UQ!o`Xp(S{@Osf%LT-6Tr5Hd&%fUnsO&-r<69 zkfEvAxaCsW>^hmWw9-*29_7T=BUeNHr>Ci;H-)eii}U2VFthVc=#(`-PyI-K zPQ=4;`Sfm*ldHv|*SBC!dEfk#uR zWCU&KrB9*!s|KUqJVfJTwA({7quJZF0(OfQ4E;3L91aaC%Ou6vU>$JV_ntXfal=5i`rQAVNa8%_s$pC-P7CT>CZvQVN1_#s5IU5u;sPi zdvd5-M*Y}rY>oB$x8=}qi|$hp!5P%kZPJ6osH1T!NgJ@8zMrl1k?cehdDDzRT8|(= z_`RgD3!~VLF|;5-s3%FQ3!XLXgO|h4QN`t=mPr1My=%mb1X2vfQLoTFp!E@A`V@{9 zn6kU@(LeC#I@7bO@F!QWoftPJDO62kt7uO4tYAm1H;0`Ao`C0jd>Zih13By(@CLlq z{R1@tuczO?JBOCTJW%r$_T;daHlJZ<_bOVGO+4WB_OC$8p>1**;}Wv31Zg42{vssc zts&Tf0<2rY4whhh2-aQ(3wSv}J0!H=*7BM`!4A@AH^NWn4c%W7b3g9k zCyKwEAE28gG7mPz6%jW_KXzKk;X1 zqLT375Aa7B&$Js@vm0YJnK|>F^PStA*D~w!<_#1BP@% z+Jd39>v-bb*=bYw`@HEAQZ9dtGvbK$kyWyv0>fCj61QQ<+g$M->7Q~%hdp`bx5SR4 z!xXm#w_OSztm=YH6tQH&#GsbSCPp#FFtjD53Y5<~Z-qLRc2LTol7(er8C4T2ST#^H z@c@HaJk;PLa;$jJu3dR&$n}7ILK(&r`lBnENGiH=kjG;@VK5K3Ke4%Tv%4|JDh!jS zye%5iYjO3#QO6_&ihC+xSWj>tZ%bmQGET59J!;Hogh1uHf_rqs!`HVSf(!*)1TEj` zC`Wo!w;eXL#`MSV=D(7OL<`3$Aw2_Yy1UP57_akiymQ$W;Sl!QvBO(R`dtHhCU>Q5 zpLM8vuRTxr4VMRjpdNjWrWN|=-|j2!*{%rY`^0)Yvk3ARalhLU3Fe0p`}fTg(Ngtj zZJ~<>cilZliMoMJhJ{#tNx3o1{@acouzu5^=bP3;O;VcVB1*Il(PUX5R_RNQAE%sCfZXio;ay_E{6KGaE0c$0JX(B@*3*?8!31cC1kwP-< z-MT>9`i9gc1;7_VXuN36^t3w8_!Vc3qG`@J*=K&hpe@^{=AzVo!jqKP6j3LMG(n^k bN$a%d$;DG_(0^|lx9D6X&27SFd+Yr_7I{7O literal 0 HcmV?d00001 diff --git a/src/main/java/Task/Deadlines.java b/src/main/java/task/Deadlines.java similarity index 94% rename from src/main/java/Task/Deadlines.java rename to src/main/java/task/Deadlines.java index 17cc67bee1..9aed615d48 100644 --- a/src/main/java/Task/Deadlines.java +++ b/src/main/java/task/Deadlines.java @@ -1,6 +1,4 @@ -package Task; - -import Task.Task; +package task; public class Deadlines extends Task { protected String by; diff --git a/src/main/java/task/Events.class b/src/main/java/task/Events.class new file mode 100644 index 0000000000000000000000000000000000000000..507ed58d7ac2974dfdfb2e594986dd98a748e2eb GIT binary patch literal 1427 zcmbVM>rN9v6#k|y-L@>HR4xLFMM2x;QZEQX@e(UU4eAdFCZa!vc7&zdoo06+;Z1xD zO+XTU_y9hX@l4yun%x*;HaRor%y+(X*)#L=*ZB_sOL&%niLo?#F|NfmtzOq+B2VWx z)3m#l!4xL+ZaNQ!I|hmdN(_n5o@_GYHxBp_FFV}bD{m^#cK0d_F(nz2tF~*aCk)HQ zFy=Cr(l$k@%DQ0a->_Zr_OQ7tye+=#kY%O#;W8XyjAl(K*~yh*uviLX7&3LP_`39( zT#>RV551aLw{_s&wIkswe_oeuA_vPvAF?L;wa8({#1MuVa?hnyzVdkMjZpit?)N7# zo5Gxld6Z4u#XSS}O*}w0g#~SVNYsk^jdF*dA>G!t$iy%d(L!Cwa8wsc+ZilkiE7(f z`@{-G{i9Y2te_-G`g0>q-Vjyk*0_3at9{z}ic?7puOq^QyA!rVwlHb?FQiKyyAp7q zt~i3bG$R8SbJI0a1M0%Bd3H6L>P#eDl6YX+zrr;%a>yGfJI*yfa zW&z7zj$6kq5dq%`;NR^Yh?=SdYwJ=}x#MiwN>mIyWta}t7nK{s#J_QvqzA*KS0aXl zz5%pL=u6OEY5p-luZ4a^7TO3PXU&{}S+l2zS#zg|f1@)R4w8BD1Pt^bg$&ZflA)6v z2D=Q4h|?M2tnt}1B(!(T8cjrS^dU(Z^b*4W`P03@aF@d(4%X&4LyvVr1Sg1}6C7X3 z+Q}o?M(C&`fBcpyH|;k{c;h=#w4^WGGeP$(g&-g~jNvM+agw?{qo~lTOIpTbtdM?# O^emke$Tr!Qw|@hJ>|Zwk literal 0 HcmV?d00001 diff --git a/src/main/java/Task/Events.java b/src/main/java/task/Events.java similarity index 95% rename from src/main/java/Task/Events.java rename to src/main/java/task/Events.java index 1d96766173..eeae00947b 100644 --- a/src/main/java/Task/Events.java +++ b/src/main/java/task/Events.java @@ -1,6 +1,4 @@ -package Task; - -import Task.Task; +package task; public class Events extends Task { protected String from; diff --git a/src/main/java/task/Task.class b/src/main/java/task/Task.class new file mode 100644 index 0000000000000000000000000000000000000000..0fbf90e254f0b2345e8f68d4031eecb5620f314d GIT binary patch literal 1384 zcmaJ=?M@Rx6g|@}-EG-YsC+1>fC83+)K5T*DAW*1`1nzR2I7xtJHpa-x7nSN@Fw~M z{?!D~@WTi2p^SIBE3CFLo1Kq4=bSnB&dkqW7e4?jppZZ}#^Oj|Jb^p7t40%QG-+VU zz`X>`Giid(>bS3Cj-k6Eys~RGq~+KQ>5U_P%yTtvALNSCwd{jDL(KACJGNlB7Fu0( zoSNXaT3)hjOD;1EWJ2o!dwQ2aD>xNmr#38GY&Gj8;qLHKjUt1Yz0Qo}fsjSXWz$

2@GPk}&1!CU3O#bmSNkb?#PI0>9CW+CJ%rwjAkaVMxa}N9YQde9dv|T+*cI zG~KdTvy`>?4)>~asu(7EF>Jy_QpW=m5An!E4^k!`;|T+MNB@|K0Sq$qQc@t^cEqO>IPjXv&42vBOvAy=;eS?$M zkym-XWSF>eZP~|8RRmYb-*1hVrQ@FHSfQ)4;W*W1gTY+4ZQ&Mb-17vP_!u@3X!s?4 z!|h5 zkFlHHVg#DHUNq9w&7xihT?h10tKRB7AtKbLv){n7GiQioqu&udgZ7o8^eojHaTQO4 zfjE7Aq^&giLmJUbjaj8J(pkeKjU*}bkVcBwbh87E1?pK#;}qICx<0{3$3CMgt$(3t zq~#;#BQVr*6G^S;xK5!P7^YSwGf6-t63=S??w@F7IY=1{5oDwTr7dlrGE9^aqTIZ+ zIu-2FlRbx#Jw@b#GJ>+{m&>;~sxjOm4iLp{Y9koMGWDu-OL&DB5u(y+L_vZCmSGG#%aTF_nyZ+=eyrI=l=HUrxyTD;wuAfIBj4M zXDXrLtbrk%lihh)hBaI;_@%=LE{g4vhNO;B163H4Wn9N)`Cid+Rh%Y7nACAizSkx0 zl!hB(nbvSq$Bd3!Vk$AX@*nU3iC>+|(r*AW2?*QXfWS!;o zs)CWsyNRo^r!vy#W?X-OC}Qo`ne(idV!Ya#DQZ(l?n>r)qq#fT0 zA{i52K0D`}cLhuJI!WEajET2!Ov61B@4z+Djf92;6N^Zj=s>557}|NpFK1W7l8FpF z6U+EWp|Qwt+Rn@;CVV2CKa+RUDJQFNblCGP*YCDQ+EyHk7jsgUf6vWX60XOvf}cRh zn#h3+MFOQrd8Qrn?pv!~-nwV=yonXu7t6;A^~Df5%gr#LV@a*MO|0U9iBG`Hl^cLf ze2UK$%$YJW6j>B7_p$7p zm0~@53fY951lYN?F85Q=F%&*O)wD6XbK{FLQKVmO0I~j)V+Aefiwk-|F z>uvF05BLWEaL#=|h#cn;h5ekXH~8wl7erLpwa!!76fk>LabSmBJMHnM(tNM@0x85| zGi7nt8QMliB=e5EVq1}vPVhyLCLGKK&p>q`uyF!860{9k_(r$!JrBW&#>buLi~iEqT)NM72f6=MVM+i{Rc!Se@p$2Vw4(!lUNbdqYe!?K`8`P#~>&1UMbW= zs>JPV$B(G!ETD2qHqT%@N7Z!HTthXLHPPAv>Y_Wjh_!%d0rk;c6h|qC;srDmuzM4K z2T1{%hTlGL-4VB-YajZ>`VFe^F6I$opC49jtsqzbJ~2*1KU4NV%V z)L%HRG&KH!$e*a-{d&+_B0JCfNoD)xLTlJB>{aXwrwV9(iN>+60uG3V?8l=Ag>j1u zwKY z6T$^T7$Jm#Z1%9w|o>Jt|Tw7jZ3X#_d@;!9fDX r3Gp%^ULm}ztlk7GImwZ_M*gmouPI*O21YSWkDIu~>MCkwlurEvSur2d literal 0 HcmV?d00001 diff --git a/src/main/java/Task/TaskList.java b/src/main/java/task/TaskList.java similarity index 97% rename from src/main/java/Task/TaskList.java rename to src/main/java/task/TaskList.java index 9bf495aba0..a1e47beca5 100644 --- a/src/main/java/Task/TaskList.java +++ b/src/main/java/task/TaskList.java @@ -1,7 +1,7 @@ -package Task; +package task; -import Ui.Reply; -import Storage.Database; +import ui.Reply; +import storage.Database; import java.util.ArrayList; diff --git a/src/main/java/task/ToDo.class b/src/main/java/task/ToDo.class new file mode 100644 index 0000000000000000000000000000000000000000..9a9def66903483b720f71d9a54213549b8ca9989 GIT binary patch literal 1108 zcmaJ=T~8B16g^XDw_R3BTRv121qzmeRQ!UZ#s^CpOi&+aG?Dl)?M`6nGSlo1B>WS9 zh9<-&Jop3rQN}y%23ETVcGad4;$Q-fF?k15 zC@@UDQA&q8;JtT3A1gP^XRw?_*})1{9XvwC!kU9B*0b0!!N)|WdDyKP&TF3nHa1bC z&JJ5&7{lBt?}~bE!jy)ufRm^^@_!T_s6=DfXA-`hv?kL*ZtyQIKK6 z6=5gvdfHQxp%}wOvuB_=x~j%%q;V%f$tWaY))t4&lW z5A74t(e-$55k-Uh{(+}O-NH7*%1D1n+87r8pNBXMAdk{?{jm#iFALTD&j6T4s&TsUQ`WKL+bemG?YDa)2TA3lN_Az!v)$#4R zh@l3RqnmP_zeR;jv{1c7`UmN{gmr~%95y*nP$I5rDpaCfi2y0uJ)_l>-@*$##U0!p N(5J{_xI3^9{s3Uy1;YRU literal 0 HcmV?d00001 diff --git a/src/main/java/Task/ToDo.java b/src/main/java/task/ToDo.java similarity index 93% rename from src/main/java/Task/ToDo.java rename to src/main/java/task/ToDo.java index c7cb79a82f..bdeb7da5f6 100644 --- a/src/main/java/Task/ToDo.java +++ b/src/main/java/task/ToDo.java @@ -1,6 +1,4 @@ -package Task; - -import Task.Task; +package task; public class ToDo extends Task { public ToDo(String description) { diff --git a/src/main/java/ui/Reply.class b/src/main/java/ui/Reply.class new file mode 100644 index 0000000000000000000000000000000000000000..b4ae89c36ae255fe420314a25fdd0c5bd1f56788 GIT binary patch literal 1955 zcmd5-+iqJ$6kU_Vx2e+vH)$!Q%>>dmaZAIkT_X zSS%5{=tq|dxQyiz1j-UuaMfe)Q{cuo)=1*U4YWdvsGL1gatI$I`w zsJB8QQ=TSJTwWR8J>77+*}kW{1J;Qyy}H|h4(*P>{PL(E?HH** zPd!-4p<2Wm&K2<*O7wdecOEzVI-{OF%GiUg$IO((O?=LTi|=3ZlLBWtx@~GUYHIf= zaJw8OPDd^gxHK*Uqe(fYqp_bj)8T>G9uq#_X9srmOP^XEtI?gR5d7OPVQ3fC=H-sM zv!|o0YM;4OT@xoZ(xGxXX{#1@28!(G;*y0z_ImsMsnicDM!d1(z_(GSBy2R8a8V1t)4G|5tbV|6qeL&&j>5BIxf z4E@_7e!m`6hhrOJRlFxka>zMrx_2u#DC@hIpA01f1*i& z(`-*8!!}QIQ!v0}(eU$$xWCQTPMXzd?TU94CH8f%6}UPo$PkGAM9Q z7H1jKIkrAbF-s$FaN3XOI$d~UXNQDe@ev#_(BsNvN?f2tMSXAno09W1<-d%ef}=pP kDV(Lt^IV+31>9yYiQd9GYLxR9=W|?to7hs?uB7eiKX-HoU;qFB literal 0 HcmV?d00001 diff --git a/src/main/java/Ui/Reply.java b/src/main/java/ui/Reply.java similarity index 90% rename from src/main/java/Ui/Reply.java rename to src/main/java/ui/Reply.java index 5299b52dd5..7566de7294 100644 --- a/src/main/java/Ui/Reply.java +++ b/src/main/java/ui/Reply.java @@ -1,4 +1,4 @@ -package Ui; +package ui; public class Reply { private String indent = " "; @@ -8,7 +8,7 @@ public class Reply { private Reply() { //Print intro System.out.println(section - + indent + "Hello! I'm Evan, your personal task planning assistant\n" + + indent + "Hello! I'm chatbot.evan.Evan, your personal task planning assistant\n" + indent + "What can I do for you?\n\n" + indent + "List of available commands:\n" + indent + "todo: create a new todo task\n" From 9e7638d2b3c8c23a02dbe17cc6fa5e401033ec28 Mon Sep 17 00:00:00 2001 From: You Wei Date: Tue, 29 Aug 2023 00:28:07 +0800 Subject: [PATCH 21/70] JUnit --- src/main/java/command/DeadlineCommand.class | Bin 1940 -> 0 bytes src/main/java/command/DeleteCommand.class | Bin 1273 -> 0 bytes src/main/java/command/EventCommand.class | Bin 2241 -> 0 bytes src/main/java/command/MarkCommand.class | Bin 1263 -> 0 bytes src/main/java/command/MarkCommand.java | 1 - src/main/java/command/ToDoCommand.class | Bin 886 -> 0 bytes src/main/java/command/UnmarkCommand.class | Bin 1271 -> 0 bytes .../exception/InvalidCommandException.class | Bin 361 -> 0 bytes .../java/exception/InvalidDateException.class | Bin 359 -> 0 bytes .../exception/InvalidInputException.class | Bin 373 -> 0 bytes .../java/exception/InvalidTimeException.class | Bin 359 -> 0 bytes .../exception/MissingArgumentException.class | Bin 277 -> 0 bytes .../MissingTaskArgumentException.class | Bin 414 -> 0 bytes src/main/java/parser/CommandParser$1.class | Bin 658 -> 0 bytes src/main/java/parser/CommandParser.class | Bin 1035 -> 0 bytes src/main/java/parser/CommandParser.java | 3 +- src/main/java/parser/Time.class | Bin 4385 -> 0 bytes src/main/java/task/Deadlines.class | Bin 1302 -> 0 bytes src/main/java/task/Events.class | Bin 1427 -> 0 bytes src/main/java/task/Task.class | Bin 1384 -> 0 bytes src/main/java/task/TaskList.class | Bin 2490 -> 0 bytes src/main/java/task/ToDo.class | Bin 1108 -> 0 bytes .../java/command/DeadlineCommandTest.java | 46 ++++++++++++++++ src/test/java/command/MarkCommandTest.java | 49 +++++++++++++++++ src/test/java/parser/CommandParserTest.java | 51 ++++++++++++++++++ 25 files changed, 147 insertions(+), 3 deletions(-) delete mode 100644 src/main/java/command/DeadlineCommand.class delete mode 100644 src/main/java/command/DeleteCommand.class delete mode 100644 src/main/java/command/EventCommand.class delete mode 100644 src/main/java/command/MarkCommand.class delete mode 100644 src/main/java/command/ToDoCommand.class delete mode 100644 src/main/java/command/UnmarkCommand.class delete mode 100644 src/main/java/exception/InvalidCommandException.class delete mode 100644 src/main/java/exception/InvalidDateException.class delete mode 100644 src/main/java/exception/InvalidInputException.class delete mode 100644 src/main/java/exception/InvalidTimeException.class delete mode 100644 src/main/java/exception/MissingArgumentException.class delete mode 100644 src/main/java/exception/MissingTaskArgumentException.class delete mode 100644 src/main/java/parser/CommandParser$1.class delete mode 100644 src/main/java/parser/CommandParser.class delete mode 100644 src/main/java/parser/Time.class delete mode 100644 src/main/java/task/Deadlines.class delete mode 100644 src/main/java/task/Events.class delete mode 100644 src/main/java/task/Task.class delete mode 100644 src/main/java/task/TaskList.class delete mode 100644 src/main/java/task/ToDo.class create mode 100644 src/test/java/command/DeadlineCommandTest.java create mode 100644 src/test/java/command/MarkCommandTest.java create mode 100644 src/test/java/parser/CommandParserTest.java diff --git a/src/main/java/command/DeadlineCommand.class b/src/main/java/command/DeadlineCommand.class deleted file mode 100644 index 2e74102df331cfeef3abc3f5fa863551170efdfb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1940 zcma)7=~i4t5dIowxWna=00~0&c8M&3nJmUEU^GHdWLV4~N{nDL(}5fAGT!M4;R*B^ zd;x!loHOB=b9?|F%J}sxEJuFGaQb#ve^p)eRdw~>|NQwEfIEm?Tt?PGt`paB!$liz zcH$ClW$=lM+xXNFD+)u!L*A}Ogea! z!Hl)_m4mNc3}V*BH<+_l^L94xV8OwnKswRoU{}D+SN+^$JD;G?sLFOl;B?+ja?2d@ ze#LO7W73a&^FW||cw|K&H5He%#rct5sD>LlSymeXCFzP$i4o{77**V!SLM3g!IFb- z1u~PxplQb~#MPvzXMC%5c3P_vcl1;ohAJv$pQ{(j!-x1tpx4fGRpSS_LQzGLP8>Y; zP{6VUeCOc`q`<>MEO+Co+)ay|UC^s9uP=Q~X zCg4#^=wZ#;Tbpg!QnJpGG(NrXBblgZ(~magvm_4Xb^gh5dGprods(^4fI_t^b!2oR zhYH(%dB_GA#pcj8MoB{+*73x_&mI&uJQVT7LkSc=!{$jYE>q{gMMhgEIiM%GMmlHW zBvj@IVr3zY#-nPe6EYIW;+9HOk#1GUi_x5wvT`ZVs-m0j63eov$T$jiv+}Vv)g-cE z(*LbE)Md4)v)QbN_wj+isd~M&s-R*syXC<5@EqG70)%#m1O|$Y0?D-Ckh;CuGVst3b=JT}vd>!t`Ol-MoXhf@!mtk=D#0`5fGOgPr z&{gJ{X4+Rl%#-_@I(3d4?o8AbBK^|XYs6bHJkqdx6l3kEq@t6YO&Ra&vwCK1i3xms zlF^fFWK7(mpv%Phctx!EOqv5(0av%9Iy0jfj)QdI#P#j&Uw zyibg<+M8ZBT)umPm;ZJ0#Mp=apDKy(KGv}W9CiTPzgSzthuy4BdCImR0grUIvc&*< zxjbfLf~9$heHv`WuI)0Mxwc&SZHKVkiQ`qSF7Ye)O^?2Tc*O}b!?B|-^w5c+7E~-E z%^&dFTePk2q5Ta~b9+elb=2UD){x2DMQ3v{Kei8d{tuj9pme+jkMdU*(A@+qPmv4^-`V*2>BoFOG=sXajb3$!qZEY9IB&htgOh=-(QhV-ov z^^^>(lR8E60umRJkC>V}wEU8f*sruOOzSt0en&&?4%!@y@E^iKSJyj2QwOr9c$80B pzl#j6waB$_8UecZap5)6`?&ZT1BdyruPQg0ms13eao&dUe*vDda5sv3n9^|{sVI7p)-jD49S`u3 zV^&!*8XoDG!()yo8lEb3UiqJKEO0z$=<-F)IbzTYbvyG>>5F8PRL}6xOBWqxuJy~%*DkrWyC+IC>no;YgAn_~?9?E&RoDJsGzGKGcd z`X6HEiI~?IPpmA5JX0$`bWi0Kd9~K6F!a=j(lTpXj#nYSVk(1?N?+Zke!5=Ex`-sL zW*@C_2XsX=(sadBk`WL#4AD7Ex7#Ec$*$?IU?-$7jL_K~8g)c*6Qh(wg?=F!AvrUB zijD>%g;R9SG|+X9?qiG;Poc%5=g^N~gt|fc2|dxMdICI@N%W9K6_}#bAdg0v;#4FN zVj997(vwtff}*CW^eu`SM&uW{J2=MZ1LNQu96cI=2PKHmqj8v|B`@1bhxmb51F!=S(k(mOEu8!vk;`Tzg` diff --git a/src/main/java/command/EventCommand.class b/src/main/java/command/EventCommand.class deleted file mode 100644 index 0b55ec60d180fb23195e886248e828dd1284659c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2241 zcma)8%X3pz9R6;a^rpABlokpN6u79+2W^5pq)iKog=!@&NNTlM!PDf>UV0zl=7!Rp zD|gN~E}hXOY}^1dfsxUrGwNQ(rTz=L7Qb_o&{VRp)4AuI-}C!D&hO-xf4=__z!}^& za0nS4$2;&kP8f*cWCsr7R1&8Ryn!={GM>bQfh;CPvUmqT*er)1+OJ`{!ZIZ=w}I0 zELU0^Ya$#hTj83lF?4)nVhPtwe2irc1M~idWqU=tAVNw|DhkIc@|f1~iHYmDq2Zvs zTacyD_PxxkcSksO@d5=dHi#xZRmQH*HVlcnnb0N#+p_}Ut=itIbu;i?>p1_cG3&(1 z(-UcHiBY&>(;{*iScCa>yELdG^89cMm#~x}69UURR!kI7G$FBU;wDy2tif&tae+E7 zAZj=iW!52*Os#-3e&C9*Nn&x{_r|=6D+8v(u?lM<5Cy_2TSXa4?uu#aiX%l?*5Oi? zjZn6H&)G~{S7lfUJQXJKulcSliB*|Sr#0+*Da+C;)^cp(6}+mUGitx6DaxwQw{)zV zaNwHo;Hytb!|p<@Uoy?jqhaS(V3${J5$85iJ`4y+!>%o9aBajh6li9W*%ws3rU?yKuWsjtDAj1)Y1H&pkDkqr&k z>^93NJ0d8{AfqbDi+eLFnCd(YM_URPc11Xx7~7(%<$ZGa+6$C5$m1=XY>wS_U3qHEhQ z)1Y%csL`fj$I#ZGi;56e(@BHL0yOH!kb8LCW@8eEIbsiSoX23O8N{8TT9<1ZG&Q^U zJ<8Jot{T_G$YW>^xY01kZ+k@SLI;K#qOt3w>g4_X6tSg;XnTzKrH4rLwpXE#RFTZ7 zLr48EH~Iv|+e+ZIP7m4mee`4#N+Hq0Nj4%kyBSKwQwcg!iUZkprAYiWPwLe0)c+Kz zrDLP1_+#v=V*djqnTHXK@vU3LGHzg3eXX5c^x<=SfiKDb0YBkq@@s4D{EYlql-YY2 zW)6EPx0^D3=*J!wXfLg&X#W5`>_Zy+F^&ODu!!eb#u-X1vV6l~@h;|u)^llUD| z_ycG0C*SVB=vAR~U_2+FHXSh?Bm9S^qqFllUB_S0>f~c{I{GNS7l~$8L#gXIwcG#0 s*`~@2kJ50hEr+B21G=7I;1O7`1CP+Z)t>4n2(W_<*-gPQ?qf**3w9tN00000 diff --git a/src/main/java/command/MarkCommand.class b/src/main/java/command/MarkCommand.class deleted file mode 100644 index 19f3a4a11b81730f3a9a0e3721d961472a44f767..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1263 zcmZ`&+foxj5IvI+X0vSMjtD9nP)IJ>BQ@p84_f+jjs9*woR3dvV;yq>d@1;^;?%Sc%)+vk2#)bc&f~K6@SLD!10_R=839v%%JCMc4k}IS#k!Jf8aB8=arG!r6q6s z0Yy3&ZD|Lu8KSB5Cx(s{wHp0_pL)K<5;qs*$F&b zmb2<&VkfYQ2L-Dd=5xFt1Zzh{Q4MTY`W!DgvK)&H+G5dZwA6RpnpYI-wrbE*u)Kp6 zw^FfWX;!r`Fo+?JR|a0=4aZvpOISA0j{%Mq1FKl$SU2zv?-|Bgm@ZMTyI#c#t^gS5 zMIXbc0$dE7V>39e3UkhsAw|=b&M`;Mzz2*lOtgySWJw%t)q<_h%Wh4U{HuZtQ(>%G zq2vnRlx|>(BbuveOOvRX4%r4akXK8Ap}%;^FVn`An78_E?d^*qO}Wi=Ib)(In$yhW z8MMCm1@sdbp>2?TN>?=MJ_sJ}Npz7%HJGH*AVeC)`ly9MG(>Ig zlAWZCacVq`QTl4c9TTi8A$RZ zYL4f~cMQ>D=_^BQ*Y5}w=Xm1tu-6hnleb*5#0QcGk|9}ZyXP53!yg81@xf94Y}4QK zcl}PRYd6~5^F*NGiHWCprUIUu$YGgbr{P;8e`pHq zc&B4=OF>$SaK&m0*R^`WIzHsGFtFsIm^n1OF!2)GCXH~%#0pj!^jVLTtV(Qacx~bh zswQf9s{}Q>(w;H37g$pdAy=1sU3K5O{E%u946DV`40kbxA$?_= z3>wW%?UrGwINx*#7E?=OFbU{_2hq*Z^$JE68}!Dq^duwn#%MRB8EUL_MnPPWCwYx- z>vS?Y(E%wDJVW`WX5djDxKy zQWKbSusq_FmPQIo#34fkve+b6N!+{yFNFmu>J;e{#80tw0(}ml{*7uOK_CpbNRQz5 EKLVnVlA1Zw-P3)#_sox<-@XHw#k!6z+-t{ujOiFhx*eU!=$OEyjt6+i zF{Lb74Ucq8<1xn*4Nn!EQT}HfvmDPET0K#9>I{0mW@k4Qo+D#m`TIUYXI_EqHZ6JE z56IItZ%aFP%@9v#J~6Z`xh0|EY$?`jm0jU&Te}WfTK&NC0*1bHe$P6vvW_Lo*{#5{ zWqD3rOl$>Kalc?y!+4Gt#9-yHD5`<&N}uB;#~jBzgEn7u8YT5Dx8@bas;vqncVxx# z_LtmB#ge5dRm4Ca`Z-=1c#St4Zw)M9(LfJ+IhG78V})bYz&pHW7>-z7@LqMjiWOW^ zFwl)8!;qp}44k?d)T_drHf7kP=}M>0ku&fCgAAilvYaf5!;M<7@p;j$$&!DWkYPOZ zH8Yf4;hWM8OmRq)HEn59bEZSsz#8&uDbVsY%hC zXf`JgEXOY8WVIGG$uJT{6l~w8ue0ElYZW1{2Bo5)Mw-UduQZnsG#NkJaF9-R)(Z=p zYf2i|JS3sss^$5@YsP*IPYgX}5j3thIgkQp{-K{gGG_i(7(;h7pqvauS$HI+urM9} zBg-7g@|xaBleJJ~%dRBJwWM=Ox?1z0FmzN&(8028Ic}N!N~a7)I&<|cb<^=$);Xl; zVRq3YjzL#4Bcv;p(jEtKLqDxI>2!y7MtkeTSFmFO3bg~krF;}!-fi3WR3r#fEdSZ`h#)sHI5FA$b%BZ>C!MvLaEEPG9iB;agM|( Zv~%1zMN8D4PAmX}+DuU32;mq;e*>k&E+YT{ diff --git a/src/main/java/exception/InvalidCommandException.class b/src/main/java/exception/InvalidCommandException.class deleted file mode 100644 index 1947936c8a1ac70881e337edc2b6ec27c44e704f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmZ`!O-lnY6r8vH*t%Bh*G+}=)_QP{9uzM{p-{ZEcu#lZHoBWgnpS_7o&*p60DqMD zVo^abgqdVA^IqQj$Lkw_6Kp4_W21%57@Zhfgyxwx+Mg3@z5X?!KCrnWbVk~!t3@?c zZX%~8D=lxw-f2@1_Imx%tz62ql%_~m>M0=^+l9;2r4IIkp;^jO=L1_+(&QJ9nY#Dd zn&S{`qk$$Noy_!H@HW;9DV!?w+$*PYk*!j~&!iVaacAsIC=p+^MMCt4A0;QVGRjmu_Y311s;-@UPw&P;Nt9bY|8cJR)bUp!f CeNTn} diff --git a/src/main/java/exception/InvalidInputException.class b/src/main/java/exception/InvalidInputException.class deleted file mode 100644 index 2163079276c6545c797b173f3fba8282af040c07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmZutJx{|h6ug&yq=Z8Gnm`D%wG7F~0D=L5RHA+*nIrU-+HHtMo2 zXR5lEvx1qPvr|`TlM}XvqshH&WKu|zCtvIlA)4B{O4Wt-^6jx{WTCUMnb+?8F;#P? zt%<#@j}E$o(_34MTsO)H?M1>?BDG~HO(ygMa|?egu9T}Q!-Ivh;?9<8E^`&fF=0=A z-<$k9jj;I}^CtuL(c(YwD**W{j3MuKxf0jT!3*e_8-6sSKL%R}ONbb~bcgGL-3Xrk L2)%rnxd8o7l227; diff --git a/src/main/java/exception/InvalidTimeException.class b/src/main/java/exception/InvalidTimeException.class deleted file mode 100644 index 959f5c0cae88e2106ceb18c6e4f4d17529e1e861..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmZusJx{|h6uj53lu#&N3ql~XwG7F?zyM-FAR$!@G-7v~r_?BQs^CQYESQiO_yPPV z#4{BjAw1mK=R2R@`^W1WfD>$nXko33^#J_<8-&i8vBsSfnuFmTp>JRS^gaQO Cv`?r2 diff --git a/src/main/java/exception/MissingArgumentException.class b/src/main/java/exception/MissingArgumentException.class deleted file mode 100644 index 7bd5c7cfdc75b08a72e6af70ebf4172c0462cb08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmX^0Z`VEs1_pBmel7-P1|D_>UUmjPMg}&U%)HDJJ4Oa(4b3n{1{UZ1lvG9rexJ;| zRKL>Pq|~C2#H1Xc2uDeNa7j^SUOFR#h=!(5R$^JAeokUux;{kInvsDkIKQ+gIn^x_ zq+HfFv$zxFIZx z3`{^zfB+K%(9sO6K#~o}lLgX@K$=x+I|JiJAcK*C9Z0f)1({iZ-eBMai*f-;CI)T* D2gg6m diff --git a/src/main/java/exception/MissingTaskArgumentException.class b/src/main/java/exception/MissingTaskArgumentException.class deleted file mode 100644 index 33de5f3cc0dcd3b328649056b764053fb77d71fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 414 zcmaKoKTAU~6va>a@6}qZikk>|4$?Z<(LoVJbg^2YMQ}{tOJAdXiR9%;Ka7)~Kqt|` zK{x$Q;!VZHf*H?y6>K0~qDx?m_BnpiS4 zI!ep4JRL~e7lSc5RcCt6DxEN_Hd~!5aVy$mp_BHHyUS4PncPP5Sb01=Rar)KUu4$@ zHpx?|-O(hHH%=M7?WgM~qrz~)`TPCn-P<$ocF%iZ81hS#^P#bcaoia$;+VUUEN h_DC1n4ykX0Mi}N$BlYMS)v3Euc=!W)e4e}l>fhIuW~l%G diff --git a/src/main/java/parser/CommandParser$1.class b/src/main/java/parser/CommandParser$1.class deleted file mode 100644 index 92746473fa5032701972cc1aa9346fe4636fec08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 658 zcmZuu+iuf95Ivi?c4Ay=($I!-X(=X6Kq3MO@c=?X!4*}L6p>OM`n0iEjf=Bet?ly0 z@9+#r2qDxD;G+<;rcf0jt#;&!E7b?pgtb4eHz=Mkm9&V%UVFMk871P~Ixjg8N)VPSIn~6x{P-~?BF; z%2~a0lY{#V-j|7)cmmID1DWU!BUS{RB(r@KEmmwZe@ z4WGT*HbVWIaFmV{$a<7Zx6I#-M-dP6WG@nWk1Bbz z=dWNV-`&rsd@`r{1(vn*0oHa2ZGv-W&>?7-@FTU?(Zn+5&?1G~WH;~t56M=rK*V-Q nzX+fFOR(QKlo|fLU{MfM+Q1@Ni>QFhWu%E!vTpfaa{SsahBJw* diff --git a/src/main/java/parser/CommandParser.class b/src/main/java/parser/CommandParser.class deleted file mode 100644 index 793d705c0004860c86b8ff69b991383cdbe38b32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1035 zcmZuvT~8B16g^W4(_OZFBZzzytk{C3A|NVYqNqs|iY6r*;c41V%0fGBcBbfG;RpEQ zllo8+N#x!Cr19?3S_s|E%$>P&=AL`!+~0qH{sOR$EgJ)f*_g$gjS1ZKr?`bd-1B|& z9QSQ-#5fW*EW{#6`iKRNMH^Ay|9~UKvBcnHl#Mc)DDI*!m;e&5mp?mV$H#0tUGvurw*QBg<)Q{2+~Oj|=8t5-Fx={dj4xlq zUOqCzT${I9O@~UN*Q6kVwuqN;NUM@L48+ecSh}9qfrt#FiA+c3xT{~1+Q-42eTMOP z?vrZ@hoogZV2d{&iy?GCF?rQ1x=NHuP;G=~^as}`9PQ9J$$e_&e(H1o3xRqLBQ%fF zZi*};+r4lG_MH|~3(Y-&)1rp`$sQ~=5ZYRpY@lm5)j;?ZYd_FU&Yq>O zbc{I~e#kBw6RmL${_zZvi*s0H?Tge?uCMRqEPIgJ^zVM=U}VgYur IqQyYuAMlj(7ytkO diff --git a/src/main/java/parser/CommandParser.java b/src/main/java/parser/CommandParser.java index 5abedb17ea..c3e0236cb1 100644 --- a/src/main/java/parser/CommandParser.java +++ b/src/main/java/parser/CommandParser.java @@ -8,7 +8,6 @@ public class CommandParser { public static String getCommandArguments(String input, Command command) throws - InvalidInputException, MissingArgumentException, InvalidCommandException { @@ -27,7 +26,7 @@ public static String getCommandArguments(String input, Command command) throws } else if (args.startsWith(" ")){ return args.substring(1); } else { - throw new InvalidInputException(); + throw new InvalidCommandException(); } } } diff --git a/src/main/java/parser/Time.class b/src/main/java/parser/Time.class deleted file mode 100644 index c38378abe017c026604886f1fa48630e6918af23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4385 zcma)9Yjjjs75>hh*Um5`VZ#u@GrW_KFc2U>!aD&H$UqP~&c3%;q!zq5FR9)B7BkXCBl~p4-rlizC!pa;bFoV!Xt#Q5x!1%l<*D0S;9HO zdBS6a#|cjmzDc-1xJY=C@GZhqgr^DLCVYqRUBWYj?-9OF_yOS(;aS2D!${&sA^bRu zRvZrFIs7DqpAvp%^UvG;%Y>hY@eBMixU5}5CO=`kfM3}|zYgO!xE#WZA-rS|T-4py zonB(#D=lj^@YnSxQw9Z1-F>Nb2YPp=1~w&j_6U>T+1;0{Poz_;`UiRwX@do&O}i5Z z6S1B|->z6odZ4>+S8bV6>F(ZCtkannvzKg=zAj6r25Jq4wxkmsd*X?`j&=yY4dHhN z;gyFvQhU?g{eAllhIJ+Ow6T!>aV=%;F zl#=merQNs3?T+2cbn1TtO9N zjb|nmWIf0*`JNl@l&mlAl&eh@c#b69DIVjh*iMyXofQAFjJwkUhsruB+fv5!NzS-8 zClel>l6BIZ;yLN6crHokRK;U7ZzahRo6(e&B;8&(Y5ScSl9Wj=)5*)hlCta)Ntq|+ zq|9F9rOfGQ$}+PuL9$ckinwvh8uu8_YKFX4*N zdYMjM4i&uWIrznUocKN(5cm8P6q zre3)!_68lsHRPr&<{n-zW#VM!)MoCKtaF3n-ZEQCW0tvPS;9@3yH_`>o|CyLb6mP2 zWeyX;UhFd%pK@zRtg-K4qNm#_SzciY;SUk~5q~n6{e zJrTTuSLKb#;hhkL@aG8rg1?6FS_FT?-y`@3UJv07k=Sc%4#c#M6lTlj`klK|9a2kk zD6OOhQ@349X&Y?Ewv`x~{}POKRVN zR9{D`_F7!Yt^J<36#Jl7-faDR$13N3Lgdy@`5MTEtg$bh+LanGAjfOz8bos)cRxiM z5~is{o8$ z%H?mD^v6kSqz#mxgLy=NLAU%3I%HVB#pE2xcdJYdgy9z+zP7@x7htvf*moZOmUce} zoHoEgrwww*X+um-OPuGlg+UH02=NdF#1RE~E)(XV$_(Lr1raV#Fq8`w{M#iJDz^B4uAd8~plJWjz_9@WI36vMhec5~h!Q#M~V}5h$tyi8vYx_BD zc~b73W#2w?1UCqdAP++^4EZQVfn4B1lu2(k7&RDP z;|Rv!PK?F9a=q`zcsz&+co-!(FDg%A5-wpfp2rlth^bN{rr~u=$G=f3??9Q!L%Cs8 zm@%j{Q!vw1B4(;F%Phrg(|{_o0dve&%rzaDXL?X=4q(2y84JvDEHw9^#+*Q{If+H) zAuKkJVu`tcrREtdGtXhUc>ycT%cwK2q2BxpE6snf$_ik$m5&Ci2#r<=)>>s~vZ@fb zYO&6$$9gM{W~&t&tR2{Bb)m)DhfUUv*lZm|t92K)SofjLdI0U#DQvaQV4L+AuCt!T z_13f4Ze7L>>m}S^y^4hO26kF+qQhs9^vOTvzTxQfjm0kCRCM{uvB$RrJ-*fG^{o-y zERpPy42**BEngJ^A@qjOC%;BQRP-hS=$BEyypgT)LP|XsWIv{BC4W9?^ULLOwrx3u zVBB}wf7*FVgObg5&97uEAhQn0YkEl7gQD>+$@XE#W(ZbeNcJNG1K6)mFXm;0qr6oP zSd+W~+v4SN@7rda#dT*yOJD7L$NEj8dozaMmK-nhkQRH+JC0uQoMg>nzFx%Qw%EFI zc{|!_{NncZ>OeGbd<1s%pGV^E>R>bw4HhQ5lGUMNe>4~koyE?Iv*^eg9gmQR9TlU; i#OSSZJa3c09hakZJ7T!QaUv+D4@$6%Y}7vFhyDkBc~emU diff --git a/src/main/java/task/Deadlines.class b/src/main/java/task/Deadlines.class deleted file mode 100644 index 2476cedc748e5458c7c1d36ad7734ce1589c909f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1302 zcma)6TTc@~6#k~vZZAvA{UVB}T-v2jZzxjqffAwy^#Ov3#D{5j0!x>jW_KXzKk;X1 zqLT375Aa7B&$Js@vm0YJnK|>F^PStA*D~w!<_#1BP@% z+Jd39>v-bb*=bYw`@HEAQZ9dtGvbK$kyWyv0>fCj61QQ<+g$M->7Q~%hdp`bx5SR4 z!xXm#w_OSztm=YH6tQH&#GsbSCPp#FFtjD53Y5<~Z-qLRc2LTol7(er8C4T2ST#^H z@c@HaJk;PLa;$jJu3dR&$n}7ILK(&r`lBnENGiH=kjG;@VK5K3Ke4%Tv%4|JDh!jS zye%5iYjO3#QO6_&ihC+xSWj>tZ%bmQGET59J!;Hogh1uHf_rqs!`HVSf(!*)1TEj` zC`Wo!w;eXL#`MSV=D(7OL<`3$Aw2_Yy1UP57_akiymQ$W;Sl!QvBO(R`dtHhCU>Q5 zpLM8vuRTxr4VMRjpdNjWrWN|=-|j2!*{%rY`^0)Yvk3ARalhLU3Fe0p`}fTg(Ngtj zZJ~<>cilZliMoMJhJ{#tNx3o1{@acouzu5^=bP3;O;VcVB1*Il(PUX5R_RNQAE%sCfZXio;ay_E{6KGaE0c$0JX(B@*3*?8!31cC1kwP-< z-MT>9`i9gc1;7_VXuN36^t3w8_!Vc3qG`@J*=K&hpe@^{=AzVo!jqKP6j3LMG(n^k bN$a%d$;DG_(0^|lx9D6X&27SFd+Yr_7I{7O diff --git a/src/main/java/task/Events.class b/src/main/java/task/Events.class deleted file mode 100644 index 507ed58d7ac2974dfdfb2e594986dd98a748e2eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1427 zcmbVM>rN9v6#k|y-L@>HR4xLFMM2x;QZEQX@e(UU4eAdFCZa!vc7&zdoo06+;Z1xD zO+XTU_y9hX@l4yun%x*;HaRor%y+(X*)#L=*ZB_sOL&%niLo?#F|NfmtzOq+B2VWx z)3m#l!4xL+ZaNQ!I|hmdN(_n5o@_GYHxBp_FFV}bD{m^#cK0d_F(nz2tF~*aCk)HQ zFy=Cr(l$k@%DQ0a->_Zr_OQ7tye+=#kY%O#;W8XyjAl(K*~yh*uviLX7&3LP_`39( zT#>RV551aLw{_s&wIkswe_oeuA_vPvAF?L;wa8({#1MuVa?hnyzVdkMjZpit?)N7# zo5Gxld6Z4u#XSS}O*}w0g#~SVNYsk^jdF*dA>G!t$iy%d(L!Cwa8wsc+ZilkiE7(f z`@{-G{i9Y2te_-G`g0>q-Vjyk*0_3at9{z}ic?7puOq^QyA!rVwlHb?FQiKyyAp7q zt~i3bG$R8SbJI0a1M0%Bd3H6L>P#eDl6YX+zrr;%a>yGfJI*yfa zW&z7zj$6kq5dq%`;NR^Yh?=SdYwJ=}x#MiwN>mIyWta}t7nK{s#J_QvqzA*KS0aXl zz5%pL=u6OEY5p-luZ4a^7TO3PXU&{}S+l2zS#zg|f1@)R4w8BD1Pt^bg$&ZflA)6v z2D=Q4h|?M2tnt}1B(!(T8cjrS^dU(Z^b*4W`P03@aF@d(4%X&4LyvVr1Sg1}6C7X3 z+Q}o?M(C&`fBcpyH|;k{c;h=#w4^WGGeP$(g&-g~jNvM+agw?{qo~lTOIpTbtdM?# O^emke$Tr!Qw|@hJ>|Zwk diff --git a/src/main/java/task/Task.class b/src/main/java/task/Task.class deleted file mode 100644 index 0fbf90e254f0b2345e8f68d4031eecb5620f314d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1384 zcmaJ=?M@Rx6g|@}-EG-YsC+1>fC83+)K5T*DAW*1`1nzR2I7xtJHpa-x7nSN@Fw~M z{?!D~@WTi2p^SIBE3CFLo1Kq4=bSnB&dkqW7e4?jppZZ}#^Oj|Jb^p7t40%QG-+VU zz`X>`Giid(>bS3Cj-k6Eys~RGq~+KQ>5U_P%yTtvALNSCwd{jDL(KACJGNlB7Fu0( zoSNXaT3)hjOD;1EWJ2o!dwQ2aD>xNmr#38GY&Gj8;qLHKjUt1Yz0Qo}fsjSXWz$

2@GPk}&1!CU3O#bmSNkb?#PI0>9CW+CJ%rwjAkaVMxa}N9YQde9dv|T+*cI zG~KdTvy`>?4)>~asu(7EF>Jy_QpW=m5An!E4^k!`;|T+MNB@|K0Sq$qQc@t^cEqO>IPjXv&42vBOvAy=;eS?$M zkym-XWSF>eZP~|8RRmYb-*1hVrQ@FHSfQ)4;W*W1gTY+4ZQ&Mb-17vP_!u@3X!s?4 z!|h5 zkFlHHVg#DHUNq9w&7xihT?h10tKRB7AtKbLv){n7GiQioqu&udgZ7o8^eojHaTQO4 zfjE7Aq^&giLmJUbjaj8J(pkeKjU*}bkVcBwbh87E1?pK#;}qICx<0{3$3CMgt$(3t zq~#;#BQVr*6G^S;xK5!P7^YSwGf6-t63=S??w@F7IY=1{5oDwTr7dlrGE9^aqTIZ+ zIu-2FlRbx#Jw@b#GJ>+{m&>;~sxjOm4iLp{Y9koMGWDu-OL&DB5u(y+L_vZCmSGG#%aTF_nyZ+=eyrI=l=HUrxyTD;wuAfIBj4M zXDXrLtbrk%lihh)hBaI;_@%=LE{g4vhNO;B163H4Wn9N)`Cid+Rh%Y7nACAizSkx0 zl!hB(nbvSq$Bd3!Vk$AX@*nU3iC>+|(r*AW2?*QXfWS!;o zs)CWsyNRo^r!vy#W?X-OC}Qo`ne(idV!Ya#DQZ(l?n>r)qq#fT0 zA{i52K0D`}cLhuJI!WEajET2!Ov61B@4z+Djf92;6N^Zj=s>557}|NpFK1W7l8FpF z6U+EWp|Qwt+Rn@;CVV2CKa+RUDJQFNblCGP*YCDQ+EyHk7jsgUf6vWX60XOvf}cRh zn#h3+MFOQrd8Qrn?pv!~-nwV=yonXu7t6;A^~Df5%gr#LV@a*MO|0U9iBG`Hl^cLf ze2UK$%$YJW6j>B7_p$7p zm0~@53fY951lYN?F85Q=F%&*O)wD6XbK{FLQKVmO0I~j)V+Aefiwk-|F z>uvF05BLWEaL#=|h#cn;h5ekXH~8wl7erLpwa!!76fk>LabSmBJMHnM(tNM@0x85| zGi7nt8QMliB=e5EVq1}vPVhyLCLGKK&p>q`uyF!860{9k_(r$!JrBW&#>buLi~iEqT)NM72f6=MVM+i{Rc!Se@p$2Vw4(!lUNbdqYe!?K`8`P#~>&1UMbW= zs>JPV$B(G!ETD2qHqT%@N7Z!HTthXLHPPAv>Y_Wjh_!%d0rk;c6h|qC;srDmuzM4K z2T1{%hTlGL-4VB-YajZ>`VFe^F6I$opC49jtsqzbJ~2*1KU4NV%V z)L%HRG&KH!$e*a-{d&+_B0JCfNoD)xLTlJB>{aXwrwV9(iN>+60uG3V?8l=Ag>j1u zwKY z6T$^T7$Jm#Z1%9w|o>Jt|Tw7jZ3X#_d@;!9fDX r3Gp%^ULm}ztlk7GImwZ_M*gmouPI*O21YSWkDIu~>MCkwlurEvSur2d diff --git a/src/main/java/task/ToDo.class b/src/main/java/task/ToDo.class deleted file mode 100644 index 9a9def66903483b720f71d9a54213549b8ca9989..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1108 zcmaJ=T~8B16g^XDw_R3BTRv121qzmeRQ!UZ#s^CpOi&+aG?Dl)?M`6nGSlo1B>WS9 zh9<-&Jop3rQN}y%23ETVcGad4;$Q-fF?k15 zC@@UDQA&q8;JtT3A1gP^XRw?_*})1{9XvwC!kU9B*0b0!!N)|WdDyKP&TF3nHa1bC z&JJ5&7{lBt?}~bE!jy)ufRm^^@_!T_s6=DfXA-`hv?kL*ZtyQIKK6 z6=5gvdfHQxp%}wOvuB_=x~j%%q;V%f$tWaY))t4&lW z5A74t(e-$55k-Uh{(+}O-NH7*%1D1n+87r8pNBXMAdk{?{jm#iFALTD&j6T4s&TsUQ`WKL+bemG?YDa)2TA3lN_Az!v)$#4R zh@l3RqnmP_zeR;jv{1c7`UmN{gmr~%95y*nP$I5rDpaCfi2y0uJ)_l>-@*$##U0!p N(5J{_xI3^9{s3Uy1;YRU diff --git a/src/test/java/command/DeadlineCommandTest.java b/src/test/java/command/DeadlineCommandTest.java new file mode 100644 index 0000000000..24df244ac0 --- /dev/null +++ b/src/test/java/command/DeadlineCommandTest.java @@ -0,0 +1,46 @@ +package command; + +import org.junit.After; +import org.junit.Before; +import org.junit.jupiter.api.Test; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class DeadlineCommandTest { + private final ByteArrayOutputStream outContent = new ByteArrayOutputStream(); + private final ByteArrayOutputStream errContent = new ByteArrayOutputStream(); + private final PrintStream originalOut = System.out; + private final PrintStream originalErr = System.err; + + @Before + public void setUpStreams() { + System.setOut(new PrintStream(outContent)); + System.setErr(new PrintStream(errContent)); + } + + @After + public void restoreStreams() { + System.setOut(originalOut); + System.setErr(originalErr); + } + @Test + public void dmySlashFormat(){ + setUpStreams(); + DeadlineCommand.start(); + + String deadline = "deadline"; + ByteArrayInputStream input = new ByteArrayInputStream(deadline.getBytes()); + System.setIn(input); + + assertEquals("hello", outContent.toString()); + + String bye = "bye"; + input = new ByteArrayInputStream(bye.getBytes()); + System.setIn(input); + restoreStreams(); + } +} diff --git a/src/test/java/command/MarkCommandTest.java b/src/test/java/command/MarkCommandTest.java new file mode 100644 index 0000000000..a25716c073 --- /dev/null +++ b/src/test/java/command/MarkCommandTest.java @@ -0,0 +1,49 @@ +package command; + +import exception.InvalidCommandException; +import exception.InvalidInputException; +import exception.MissingArgumentException; +import org.junit.After; +import org.junit.Before; +import org.junit.jupiter.api.Test; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + +import static org.junit.jupiter.api.Assertions.*; + +public class MarkCommandTest { + private final ByteArrayOutputStream outContent = new ByteArrayOutputStream(); + private final ByteArrayOutputStream errContent = new ByteArrayOutputStream(); + private final PrintStream originalOut = System.out; + private final PrintStream originalErr = System.err; + + @Before + public void setUpStreams() { + System.setOut(new PrintStream(outContent)); + System.setErr(new PrintStream(errContent)); + } + + @After + public void restoreStreams() { + System.setOut(originalOut); + System.setErr(originalErr); + } + + @Test + public void testEmptyArgument() { + + setUpStreams(); + assertThrows(MissingArgumentException.class, () -> MarkCommand.start("mark ")); + restoreStreams(); + } + + @Test + public void testCommandIsSubstring() { + + setUpStreams(); + assertThrows(InvalidCommandException.class, () -> MarkCommand.start("marker")); + restoreStreams(); + } +} diff --git a/src/test/java/parser/CommandParserTest.java b/src/test/java/parser/CommandParserTest.java new file mode 100644 index 0000000000..942294ec01 --- /dev/null +++ b/src/test/java/parser/CommandParserTest.java @@ -0,0 +1,51 @@ +package parser; + +import command.DeleteCommand; +import command.MarkCommand; +import command.UnmarkCommand; +import enums.Command; +import exception.InvalidCommandException; +import exception.InvalidInputException; +import exception.MissingArgumentException; +import org.junit.Assert; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +public class CommandParserTest { + @Test + public void testBlankSpaces() { + assertThrows(MissingArgumentException.class, () -> CommandParser.getCommandArguments("mark ", Command.MARK)); + } + @Test + public void testMispeltCommand() { + assertThrows(InvalidCommandException.class, () -> CommandParser.getCommandArguments("markus", Command.MARK)); + } + @Test + public void validMarkInput() { + try { + String output = CommandParser.getCommandArguments("mark 1", Command.MARK); + assertEquals("1", output); + } catch (Exception e) { + Assert.fail(); + } + } + @Test + public void validDeleteInput() { + try { + String output = CommandParser.getCommandArguments("delete 1", Command.UNMARK); + assertEquals("1", output); + } catch (Exception e) { + Assert.fail(); + } + } + @Test + public void validUnmarkInput() { + try { + String output = CommandParser.getCommandArguments("unmark 12", Command.UNMARK); + assertEquals("12", output); + } catch (Exception e) { + Assert.fail(); + } + } +} From 4af0479d8a3c47bd37cf7a2377da0b1b3190afd7 Mon Sep 17 00:00:00 2001 From: You Wei Date: Tue, 29 Aug 2023 02:17:08 +0800 Subject: [PATCH 22/70] Fix Bug --- src/main/java/command/DeleteCommand.java | 2 +- src/main/java/command/MarkCommand.java | 2 +- src/main/java/command/UnmarkCommand.java | 2 +- src/main/java/parser/CommandParser.java | 29 ++++++++++++++++----- src/test/java/parser/CommandParserTest.java | 14 ++++------ 5 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/main/java/command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java index 6968421b91..d0185f334f 100644 --- a/src/main/java/command/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -15,7 +15,7 @@ public static void start(String input) throws MissingArgumentException, InvalidCommandException { - String number = CommandParser.getCommandArguments(input, enums.Command.DELETE); + String number = CommandParser.getCommandArguments(input); try { tasks.deleteTask(Integer.parseInt(number)); } catch (NumberFormatException e ) { diff --git a/src/main/java/command/MarkCommand.java b/src/main/java/command/MarkCommand.java index 3eed373fab..e8d2cf50d2 100644 --- a/src/main/java/command/MarkCommand.java +++ b/src/main/java/command/MarkCommand.java @@ -15,7 +15,7 @@ public static void start(String input) throws MissingArgumentException, InvalidCommandException { - String number = CommandParser.getCommandArguments(input, Command.MARK); + String number = CommandParser.getCommandArguments(input); try { tasks.markDone(Integer.parseInt(number)); } catch (NumberFormatException e ) { diff --git a/src/main/java/command/UnmarkCommand.java b/src/main/java/command/UnmarkCommand.java index 7b76731c4a..4f071cea82 100644 --- a/src/main/java/command/UnmarkCommand.java +++ b/src/main/java/command/UnmarkCommand.java @@ -16,7 +16,7 @@ public static void start(String input) throws MissingArgumentException, InvalidCommandException { - String number = CommandParser.getCommandArguments(input, Command.UNMARK); + String number = CommandParser.getCommandArguments(input); try { tasks.unmarkDone(Integer.parseInt(number)); } catch (NumberFormatException e ) { diff --git a/src/main/java/parser/CommandParser.java b/src/main/java/parser/CommandParser.java index c3e0236cb1..fc58394969 100644 --- a/src/main/java/parser/CommandParser.java +++ b/src/main/java/parser/CommandParser.java @@ -1,18 +1,27 @@ package parser; import enums.Command; -import exception.InvalidInputException; import exception.MissingArgumentException; import exception.InvalidCommandException; import exception.MissingTaskArgumentException; public class CommandParser { - public static String getCommandArguments(String input, Command command) throws + + public static String getCommandArguments(String input) throws MissingArgumentException, InvalidCommandException { - int cmdLength = command.getCommandStringLength(); - String args = input.substring(cmdLength); + String firstWord = getFirstWord(input); + Command command; + + try { + System.out.println(firstWord); + command = Command.valueOf(firstWord.toUpperCase()); + } catch (IllegalArgumentException e) { + throw new InvalidCommandException(); + } + + String args = input.substring(command.getCommandStringLength() + 1); if (args.isBlank()) { switch (command) { @@ -23,10 +32,16 @@ public static String getCommandArguments(String input, Command command) throws default: throw new InvalidCommandException(); } - } else if (args.startsWith(" ")){ - return args.substring(1); } else { - throw new InvalidCommandException(); + return args; + } + } + + public static String getFirstWord(String input) { + int spaceIndex = input.indexOf(' '); + if (spaceIndex == -1) { + return input; } + return input.substring(0, spaceIndex); } } diff --git a/src/test/java/parser/CommandParserTest.java b/src/test/java/parser/CommandParserTest.java index 942294ec01..a4e34fdf0d 100644 --- a/src/test/java/parser/CommandParserTest.java +++ b/src/test/java/parser/CommandParserTest.java @@ -1,11 +1,7 @@ package parser; -import command.DeleteCommand; -import command.MarkCommand; -import command.UnmarkCommand; import enums.Command; import exception.InvalidCommandException; -import exception.InvalidInputException; import exception.MissingArgumentException; import org.junit.Assert; import org.junit.jupiter.api.Test; @@ -15,16 +11,16 @@ public class CommandParserTest { @Test public void testBlankSpaces() { - assertThrows(MissingArgumentException.class, () -> CommandParser.getCommandArguments("mark ", Command.MARK)); + assertThrows(MissingArgumentException.class, () -> CommandParser.getCommandArguments("mark ")); } @Test public void testMispeltCommand() { - assertThrows(InvalidCommandException.class, () -> CommandParser.getCommandArguments("markus", Command.MARK)); + assertThrows(InvalidCommandException.class, () -> CommandParser.getCommandArguments("markus")); } @Test public void validMarkInput() { try { - String output = CommandParser.getCommandArguments("mark 1", Command.MARK); + String output = CommandParser.getCommandArguments("mark 1"); assertEquals("1", output); } catch (Exception e) { Assert.fail(); @@ -33,7 +29,7 @@ public void validMarkInput() { @Test public void validDeleteInput() { try { - String output = CommandParser.getCommandArguments("delete 1", Command.UNMARK); + String output = CommandParser.getCommandArguments("delete 1"); assertEquals("1", output); } catch (Exception e) { Assert.fail(); @@ -42,7 +38,7 @@ public void validDeleteInput() { @Test public void validUnmarkInput() { try { - String output = CommandParser.getCommandArguments("unmark 12", Command.UNMARK); + String output = CommandParser.getCommandArguments("unmark 12"); assertEquals("12", output); } catch (Exception e) { Assert.fail(); From 98caa89733e3bf8c4a214a5f1f07ac6f88522424 Mon Sep 17 00:00:00 2001 From: You Wei Date: Tue, 29 Aug 2023 02:20:25 +0800 Subject: [PATCH 23/70] Delete faulty test --- .../java/command/DeadlineCommandTest.java | 46 ------------------- 1 file changed, 46 deletions(-) delete mode 100644 src/test/java/command/DeadlineCommandTest.java diff --git a/src/test/java/command/DeadlineCommandTest.java b/src/test/java/command/DeadlineCommandTest.java deleted file mode 100644 index 24df244ac0..0000000000 --- a/src/test/java/command/DeadlineCommandTest.java +++ /dev/null @@ -1,46 +0,0 @@ -package command; - -import org.junit.After; -import org.junit.Before; -import org.junit.jupiter.api.Test; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class DeadlineCommandTest { - private final ByteArrayOutputStream outContent = new ByteArrayOutputStream(); - private final ByteArrayOutputStream errContent = new ByteArrayOutputStream(); - private final PrintStream originalOut = System.out; - private final PrintStream originalErr = System.err; - - @Before - public void setUpStreams() { - System.setOut(new PrintStream(outContent)); - System.setErr(new PrintStream(errContent)); - } - - @After - public void restoreStreams() { - System.setOut(originalOut); - System.setErr(originalErr); - } - @Test - public void dmySlashFormat(){ - setUpStreams(); - DeadlineCommand.start(); - - String deadline = "deadline"; - ByteArrayInputStream input = new ByteArrayInputStream(deadline.getBytes()); - System.setIn(input); - - assertEquals("hello", outContent.toString()); - - String bye = "bye"; - input = new ByteArrayInputStream(bye.getBytes()); - System.setIn(input); - restoreStreams(); - } -} From a0fb38124a9e23a93860335f0ce6d69cf96a030b Mon Sep 17 00:00:00 2001 From: You Wei Date: Tue, 29 Aug 2023 02:38:46 +0800 Subject: [PATCH 24/70] More bug fixes --- src/main/java/parser/CommandParser.java | 5 ++--- src/test/java/parser/CommandParserTest.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/parser/CommandParser.java b/src/main/java/parser/CommandParser.java index fc58394969..70b38172a3 100644 --- a/src/main/java/parser/CommandParser.java +++ b/src/main/java/parser/CommandParser.java @@ -15,13 +15,12 @@ public static String getCommandArguments(String input) throws Command command; try { - System.out.println(firstWord); command = Command.valueOf(firstWord.toUpperCase()); } catch (IllegalArgumentException e) { throw new InvalidCommandException(); } - String args = input.substring(command.getCommandStringLength() + 1); + String args = input.substring(command.getCommandStringLength()); if (args.isBlank()) { switch (command) { @@ -33,7 +32,7 @@ public static String getCommandArguments(String input) throws throw new InvalidCommandException(); } } else { - return args; + return args.substring(1); } } diff --git a/src/test/java/parser/CommandParserTest.java b/src/test/java/parser/CommandParserTest.java index a4e34fdf0d..9354708dff 100644 --- a/src/test/java/parser/CommandParserTest.java +++ b/src/test/java/parser/CommandParserTest.java @@ -3,6 +3,7 @@ import enums.Command; import exception.InvalidCommandException; import exception.MissingArgumentException; +import exception.MissingTaskArgumentException; import org.junit.Assert; import org.junit.jupiter.api.Test; @@ -44,4 +45,14 @@ public void validUnmarkInput() { Assert.fail(); } } + + @Test + public void emptyInput() { + assertThrows(InvalidCommandException.class, () -> CommandParser.getCommandArguments("")); + } + + @Test + public void noArguments() { + assertThrows(MissingTaskArgumentException.class, () -> CommandParser.getCommandArguments("delete")); + } } From 908f26bbf155ff132b7fe298d37dd51109521e46 Mon Sep 17 00:00:00 2001 From: You Wei Date: Tue, 29 Aug 2023 03:48:48 +0800 Subject: [PATCH 25/70] Add Javadocs --- src/main/java/chatbot/evan/Evan.java | 9 +++++ src/main/java/command/DeadlineCommand.java | 11 ++++++ src/main/java/command/DeleteCommand.java | 14 ++++++++ src/main/java/command/EventCommand.java | 10 ++++++ src/main/java/command/MarkCommand.java | 13 +++++++ src/main/java/command/ToDoCommand.java | 9 +++++ src/main/java/command/UnmarkCommand.java | 14 ++++++++ src/main/java/enums/Command.class | Bin 1844 -> 0 bytes src/main/java/enums/Command.java | 15 ++++++++ .../exception/InvalidCommandException.java | 7 ++++ .../java/exception/InvalidDateException.java | 8 +++++ .../java/exception/InvalidInputException.java | 10 +++++- .../java/exception/InvalidTimeException.java | 8 +++++ .../exception/MissingArgumentException.java | 8 +++++ .../MissingTaskArgumentException.java | 8 +++++ src/main/java/parser/CommandParser.java | 15 ++++++++ src/main/java/parser/Time.java | 30 ++++++++++++++++ src/main/java/storage/Database.class | Bin 2579 -> 0 bytes src/main/java/storage/Database.java | 11 ++++++ src/main/java/task/Deadlines.java | 22 ++++++++++++ src/main/java/task/Events.java | 25 +++++++++++++ src/main/java/task/Task.java | 34 ++++++++++++++++-- src/main/java/task/TaskList.java | 29 +++++++++++++++ src/main/java/task/ToDo.java | 25 +++++++++++-- src/main/java/ui/Reply.class | Bin 1955 -> 0 bytes src/main/java/ui/Reply.java | 14 ++++++++ 26 files changed, 344 insertions(+), 5 deletions(-) delete mode 100644 src/main/java/enums/Command.class delete mode 100644 src/main/java/storage/Database.class delete mode 100644 src/main/java/ui/Reply.class diff --git a/src/main/java/chatbot/evan/Evan.java b/src/main/java/chatbot/evan/Evan.java index df7801570c..a07dd05c6f 100644 --- a/src/main/java/chatbot/evan/Evan.java +++ b/src/main/java/chatbot/evan/Evan.java @@ -10,10 +10,19 @@ import task.TaskList; import ui.Reply; +/** + * Main class for the chatbot + */ public class Evan { private static TaskList tasks = TaskList.init(); private static Reply reply = Reply.init(); + + /** + * main method of the Main class Evan chatbot + * Continuously takes in user input and gives an appropriate response until the user enters "bye + * @param args unused + */ public static void main(String[] args) { //Start user interaction Scanner scanner = new Scanner(System.in); diff --git a/src/main/java/command/DeadlineCommand.java b/src/main/java/command/DeadlineCommand.java index 7443de4b66..42948183b7 100644 --- a/src/main/java/command/DeadlineCommand.java +++ b/src/main/java/command/DeadlineCommand.java @@ -9,9 +9,19 @@ import java.util.Scanner; +/** + * Class for Deadline command with its static implementation of its processes + */ public class DeadlineCommand { private static Reply reply = Reply.init(); private static TaskList tasks = TaskList.init(); + + /** + * Main process of Deadline Command. The choice of keeping the commands static is because there is no need for multiple + * instances of commands + * Prompts user to enter the task and deadline date and time before validating and adding it to the list. + * Returns to homepage otherwise. + */ public static void start() { Scanner scanner = new Scanner(System.in); reply.printDialog("So you want to add a task with deadline. Tell me what's the task."); @@ -25,6 +35,7 @@ public static void start() { reply.printDialog(e.toString()); return; } + reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); String time = scanner.nextLine(); if (!time.toLowerCase().equals(enums.Command.SKIP.getCommand())) { diff --git a/src/main/java/command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java index d0185f334f..a8af79c5c9 100644 --- a/src/main/java/command/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -7,9 +7,23 @@ import task.TaskList; import ui.Reply; +/** + * Class for Delete command with its static implementation of its processes + */ public class DeleteCommand { private static Reply reply = Reply.init(); private static TaskList tasks = TaskList.init(); + + /** + * Main process of Delete Command. The choice of keeping the command methods static is because there is no need + * for multiple instances of commands + * Validates the input after the delete keyword in the string. Deletes the task if it's a vlid input. + * Returns to homepage otherwise. + * @param input String input containing the command and its arguments + * @throws InvalidInputException if the arguments after command is invalid + * @throws MissingArgumentException if the arguments after the command is missing + * @throws InvalidCommandException if the command in the string is invalid + */ public static void start(String input) throws InvalidInputException, MissingArgumentException, diff --git a/src/main/java/command/EventCommand.java b/src/main/java/command/EventCommand.java index b3232036c6..eea0a04190 100644 --- a/src/main/java/command/EventCommand.java +++ b/src/main/java/command/EventCommand.java @@ -10,9 +10,19 @@ import java.util.Scanner; +/** + * Class for Event command with its static implementation of its processes + */ public class EventCommand { private static Reply reply = Reply.init(); private static TaskList tasks = TaskList.init(); + + /** + * Main process of Event Command. The choice of keeping the commands static is because there is no need for multiple + * instances of commands + * Prompts user to enter the task, start and end date/time before validating and adding it to the list. + * Returns to homepage otherwise. + */ public static void start() { Scanner scanner = new Scanner(System.in); diff --git a/src/main/java/command/MarkCommand.java b/src/main/java/command/MarkCommand.java index e8d2cf50d2..c68efabf68 100644 --- a/src/main/java/command/MarkCommand.java +++ b/src/main/java/command/MarkCommand.java @@ -8,9 +8,22 @@ import task.TaskList; import ui.Reply; +/** + * Class for Mark command with its static implementation of its processes + */ public class MarkCommand { private static Reply reply = Reply.init(); private static TaskList tasks = TaskList.init(); + + /** + * Main process of Mark Command. The choice of keeping the command methods static is because there is no need + * for multiple instances of commands + * Validates the input after the mark keyword in the string. Marks the task if it's a valid input. + * Returns to homepage otherwise. + * @param input String input containing the command and its arguments + * @throws MissingArgumentException if the arguments after the command is missing + * @throws InvalidCommandException if the command in the string is invalid + */ public static void start(String input) throws MissingArgumentException, InvalidCommandException { diff --git a/src/main/java/command/ToDoCommand.java b/src/main/java/command/ToDoCommand.java index 7b0c26071a..5efa9145f0 100644 --- a/src/main/java/command/ToDoCommand.java +++ b/src/main/java/command/ToDoCommand.java @@ -6,9 +6,18 @@ import java.util.Scanner; +/** + * Class for Todo command with its static implementation of its processes + */ public class ToDoCommand { private static Reply reply = Reply.init(); private static TaskList tasks = TaskList.init(); + + /** + * Main process of todo Command. The choice of keeping the commands static is because there is no need for multiple + * instances of commands + * Prompts user to enter the task name before adding it to the list. + */ public static void start() { Scanner scanner = new Scanner(System.in); reply.printDialog("So you want to add a ToDo task. Tell me what's the task."); diff --git a/src/main/java/command/UnmarkCommand.java b/src/main/java/command/UnmarkCommand.java index 4f071cea82..d8dcac3390 100644 --- a/src/main/java/command/UnmarkCommand.java +++ b/src/main/java/command/UnmarkCommand.java @@ -8,9 +8,23 @@ import task.TaskList; import ui.Reply; +/** + * Class for Unmark command with its static implementation of its processes + */ public class UnmarkCommand { private static Reply reply = Reply.init(); private static TaskList tasks = TaskList.init(); + + /** + * Main process of Unmark Command. The choice of keeping the command methods static is because there is no need + * for multiple instances of commands + * Validates the input after the unmark keyword in the string. Unmarks the task if it's a valid input. + * Returns to homepage otherwise. + * @param input String input containing the command and its arguments + * @throws InvalidInputException if the arguments after command is invalid + * @throws MissingArgumentException if the arguments after the command is missing + * @throws InvalidCommandException if the command in the string is invalid + */ public static void start(String input) throws InvalidInputException, MissingArgumentException, diff --git a/src/main/java/enums/Command.class b/src/main/java/enums/Command.class deleted file mode 100644 index 25094cc7b7dfafde9693fd7ff20cb3edb8d609a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1844 zcmZuxYgZdp6y1|dGB?9ero*Fxlv>(q5(N5!(t^k<)JP!61aw+olVnH(dDLWrQlFpw z3H}6^A2hYCt1eyr?2mGJ?nwmNz=!O;&pqd!d-u7+KmR`e8^A665P^yv9UtN&4NDpv z9h0~xf9}hbk9B;4PbK?I;HtpqI#E~ZtiW}FoTPby8v>rBy8<@_3X(n$m=Y*Tx+gF# zurFyz;FdsH(u%;0KvmL*0=EUekhCUnN1!gLFEA_6kn})cPT)&PztV81Ah_ft6!fIL zN~2t#T&|YOZY4jfKusm>48i*1)|!Iw_C}kmBvOeCRfv_u;z}yHK~&A8SJDbXiJim- zl?0X?imh&?*NJCnLABSCo75>+&MUA|d+vcdS#m3dN!za#D+Ov6srxlLLBW5ZKuIdl zF7GU+wiC7j^M1$4!Ut}t;niuYXsmNpU9RRmd7)y(+h~-tUM=HhOBB(#EWNAXQnd37 zvCcMg#Y)kiR}eiVJ$cFwJ9H1bSg5#uqelJuPbrI0j$ZKmw#^FqqOs1M6bu~av^@IX zoM1FY_K3M$seL#K(4H4hY?7cs&b@M*dGc7dtBqRDTP;d6jP?m8S0$EJaIu|PA;9(r=|eFIlg2SROK!bBd&1N9Lp?bw zxhvHToUCi7CFMxW;{&w9WI~Cb_`)^%_$KL}M$f{abPXUR#~8^iM)HY~9AYGA7|9hz zGK7)rU?eLT$p}U=fjR`_$QWr_fH@>5O*)JSmazf_2~wkk@=tFM!@7L6B|?^u@=9pCKF{e*!H&{uJT~BEKDV zvRXORu^(L+KrhZ=jaCClQMYw$w7Z`tl;;h_e~0#J;~`o~WAl{M$S+5oT6Y?Ozz5iB zr78|Wv<~I$pHLl34_aN%U_3@Q%QLFg!_s7VHe^{Wds+5{t$vmREYE4yYb*y@4hidZ zmcuO1n_+8&^##^%n3{Ew^(gC0rm!xvzQX!VGh)5PI?6g`>QTH$x=c=qg0WOOoa_cg$t7-t71WJuE>kGmkf@^Ba71_;~Ex07F8_aD#Nw7m2uj%gk{@HZQ8_~ zu!Uwgnr_nQWQBIcaOX64PG~bkO_NUNiD^kItLcQb#pSGFil%&nWFP) zTj(UU%raw+J})$r1{JSK(ghzkXZv5F7#Dg<*bL1jIw!L;GvsZma3Ev!x{5d8FtCt{ zYq(C;J=L}~a)mfQl zZN{?ab=Nh_SNnOuA!#2mYY<*UQ!o`Xp(S{@Osf%LT-6Tr5Hd&%fUnsO&-r<69 zkfEvAxaCsW>^hmWw9-*29_7T=BUeNHr>Ci;H-)eii}U2VFthVc=#(`-PyI-K zPQ=4;`Sfm*ldHv|*SBC!dEfk#uR zWCU&KrB9*!s|KUqJVfJTwA({7quJZF0(OfQ4E;3L91aaC%Ou6vU>$JV_ntXfal=5i`rQAVNa8%_s$pC-P7CT>CZvQVN1_#s5IU5u;sPi zdvd5-M*Y}rY>oB$x8=}qi|$hp!5P%kZPJ6osH1T!NgJ@8zMrl1k?cehdDDzRT8|(= z_`RgD3!~VLF|;5-s3%FQ3!XLXgO|h4QN`t=mPr1My=%mb1X2vfQLoTFp!E@A`V@{9 zn6kU@(LeC#I@7bO@F!QWoftPJDO62kt7uO4tYAm1H;0`Ao`C0jd>Zih13By(@CLlq z{R1@tuczO?JBOCTJW%r$_T;daHlJZ<_bOVGO+4WB_OC$8p>1**;}Wv31Zg42{vssc zts&Tf0<2rY4whhh2-aQ(3wSv}J0!H=*7BM`!4A@AH^NWn4c%W7b3g9k zCyKwEAE28gG7mPz6% list) { File file = new File("data/tasklist.txt"); try { @@ -30,6 +37,10 @@ public static void save(ArrayList list) { } } + /** + * Retrieves the list of task records from the text file and returns it in an arraylist + * @return list of tasks saved in the text file + */ public static ArrayList loadData() { File file = new File("data/tasklist.txt"); ArrayList list = new ArrayList<>(); diff --git a/src/main/java/task/Deadlines.java b/src/main/java/task/Deadlines.java index 9aed615d48..f3f7171d7a 100644 --- a/src/main/java/task/Deadlines.java +++ b/src/main/java/task/Deadlines.java @@ -1,23 +1,45 @@ package task; +/** + * Object class for instances of deadline tasks + */ public class Deadlines extends Task { protected String by; + /** + * Public constructor of the class + * @param description description of the task + * @param by date of the deadline + */ public Deadlines(String description, String by) { super(description); this.by = by; } + /** + * Overloaded constructor to create classes with known status + * @param status done status of task + * @param description description of the task + * @param by date of the deadline + */ public Deadlines(boolean status, String description, String by) { super(status, description); this.by = by; } + /** + * Overriden toString implementation for a deadline task + * @return String representing a deadline task + */ @Override public String toString() { return "[D]" + super.toString() + " (by: " + by + ")"; } + /** + * formats the properties of the object into a single string line for saving + * @return String of formatted properties + */ @Override public String dataFormat() { return "deadline/" + diff --git a/src/main/java/task/Events.java b/src/main/java/task/Events.java index eeae00947b..0d6445c83e 100644 --- a/src/main/java/task/Events.java +++ b/src/main/java/task/Events.java @@ -1,25 +1,50 @@ package task; +/** + * Object class for instances of event tasks + */ public class Events extends Task { protected String from; protected String to; + + /** + * Public constructor of the class + * @param description description of the task + * @param from start date + * @param to end date + */ public Events(String description, String from, String to) { super(description); this.from = from; this.to = to; } + /** + * Overloaded constructor of the class for a known status + * @param status status of the task + * @param description description of the task + * @param from start date + * @param to end date + */ public Events(boolean status, String description, String from, String to) { super(status, description); this.from = from; this.to = to; } + /** + * Overriden toString implementation for a event task + * @return String representing a event task + */ @Override public String toString() { return "[E]" + super.toString() + " (from: " + from + " to: " + to + ")"; } + /** + * formats the properties of the object into a single string line for saving + * @return String of formatted properties + */ @Override public String dataFormat() { return "event/" + diff --git a/src/main/java/task/Task.java b/src/main/java/task/Task.java index 3a8b0b8625..1632f468e3 100644 --- a/src/main/java/task/Task.java +++ b/src/main/java/task/Task.java @@ -1,35 +1,65 @@ package task; +/** + * Abstract class for all possible tasks + */ public abstract class Task { protected String description; protected Boolean isDone; + /** + * Public constructor of the class + * @param description description of the task + */ public Task(String description) { this.description = description; this.isDone = false; } - public Task(boolean done, String description) { + /** + * Overloaded constructor to create classes with known status + * @param status done status of task + * @param description description of the task + */ + public Task(boolean status, String description) { this.description = description; - this.isDone = done; + this.isDone = status; } + /** + * get display icon for its status + * @return display icon + */ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } + /** + * marks this task as done + */ public void markAsDone() { this.isDone = true; } + /** + * marks this task as not done + */ public void markAsNotDone() { this.isDone = false; } + /** + * Overriden toString implementation for a generic task + * @return String representing a generic task + */ @Override public String toString() { return "[" + getStatusIcon() + "] " + description; } + /** + * abstract declaration of a method to format properties of the instance + * @return String of formatted data of the instance + */ public abstract String dataFormat(); } diff --git a/src/main/java/task/TaskList.java b/src/main/java/task/TaskList.java index a1e47beca5..8c2fa649b0 100644 --- a/src/main/java/task/TaskList.java +++ b/src/main/java/task/TaskList.java @@ -5,15 +5,25 @@ import java.util.ArrayList; +/** + * Class for manipulating the list of tasks + */ public class TaskList { private static TaskList obj; private ArrayList list; private final Reply reply = Reply.init(); + /** + * private constructor + */ private TaskList() { list = Database.loadData(); } + /** + * factory method to enforce one instance of the list manager + * @return an instance of the list manager + */ public static TaskList init() { if (obj == null) { obj = new TaskList(); @@ -21,6 +31,10 @@ public static TaskList init() { return obj; } + /** + * Takes in a task, adds it into the list and saves it into the database + * @param task task to be added + */ public void addTask(Task task) { list.add(task); Database.save(this.list); @@ -34,6 +48,9 @@ public void addTask(Task task) { reply.printDialog(dialog.toString()); } + /** + * Prints all the tasks in the list + */ public void printTasks() { Task[] tasks = list.toArray(new Task[0]); StringBuilder dialog = new StringBuilder("Here are the tasks in your list:\n "); @@ -53,6 +70,10 @@ public void printTasks() { reply.printDialog(dialog.toString()); } + /** + * Takes in an integer index and marks the task associated with the index as done + * @param index index of the task + */ public void markDone(int index) { StringBuilder dialog = new StringBuilder(); Task element = list.get(index - 1); @@ -64,6 +85,10 @@ public void markDone(int index) { reply.printDialog(dialog.toString()); } + /** + * Takes in an integer index and marks the task associated with the index as not done + * @param index index of the task + */ public void unmarkDone(int index) { StringBuilder dialog = new StringBuilder(); Task element = list.get(index - 1); @@ -75,6 +100,10 @@ public void unmarkDone(int index) { reply.printDialog(dialog.toString()); } + /** + * Takes in an integer index and deletes the task associated with the index + * @param index index of the task + */ public void deleteTask(int index) { StringBuilder dialog = new StringBuilder(); Task element = list.get(index - 1); diff --git a/src/main/java/task/ToDo.java b/src/main/java/task/ToDo.java index bdeb7da5f6..51d85c0042 100644 --- a/src/main/java/task/ToDo.java +++ b/src/main/java/task/ToDo.java @@ -1,19 +1,40 @@ package task; +/** + * Object class for instances of todo tasks + */ public class ToDo extends Task { + + /** + * Public constructor of the class + * @param description description of the task + */ public ToDo(String description) { super(description); } - public ToDo(boolean done, String description) { - super(done, description); + /** + * Overloaded constructor to create classes with known status + * @param status done status of task + * @param description description of the task + */ + public ToDo(boolean status, String description) { + super(status, description); } + /** + * Overriden toString implementation for a todo task + * @return String representing a todo task + */ @Override public String toString() { return "[T]" + super.toString(); } + /** + * abstract declaration of a method to format properties of the todo task + * @return String of formatted data of the instance + */ @Override public String dataFormat() { return "todo/" + diff --git a/src/main/java/ui/Reply.class b/src/main/java/ui/Reply.class deleted file mode 100644 index b4ae89c36ae255fe420314a25fdd0c5bd1f56788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1955 zcmd5-+iqJ$6kU_Vx2e+vH)$!Q%>>dmaZAIkT_X zSS%5{=tq|dxQyiz1j-UuaMfe)Q{cuo)=1*U4YWdvsGL1gatI$I`w zsJB8QQ=TSJTwWR8J>77+*}kW{1J;Qyy}H|h4(*P>{PL(E?HH** zPd!-4p<2Wm&K2<*O7wdecOEzVI-{OF%GiUg$IO((O?=LTi|=3ZlLBWtx@~GUYHIf= zaJw8OPDd^gxHK*Uqe(fYqp_bj)8T>G9uq#_X9srmOP^XEtI?gR5d7OPVQ3fC=H-sM zv!|o0YM;4OT@xoZ(xGxXX{#1@28!(G;*y0z_ImsMsnicDM!d1(z_(GSBy2R8a8V1t)4G|5tbV|6qeL&&j>5BIxf z4E@_7e!m`6hhrOJRlFxka>zMrx_2u#DC@hIpA01f1*i& z(`-*8!!}QIQ!v0}(eU$$xWCQTPMXzd?TU94CH8f%6}UPo$PkGAM9Q z7H1jKIkrAbF-s$FaN3XOI$d~UXNQDe@ev#_(BsNvN?f2tMSXAno09W1<-d%ef}=pP kDV(Lt^IV+31>9yYiQd9GYLxR9=W|?to7hs?uB7eiKX-HoU;qFB diff --git a/src/main/java/ui/Reply.java b/src/main/java/ui/Reply.java index 7566de7294..ca6b99feec 100644 --- a/src/main/java/ui/Reply.java +++ b/src/main/java/ui/Reply.java @@ -1,10 +1,16 @@ package ui; +/** + * Class for chatbot to create standardised replies with ui + */ public class Reply { private String indent = " "; private String section = indent + "________________________________________\n"; private static Reply reply = null; + /** + * private constructor + */ private Reply() { //Print intro System.out.println(section @@ -20,6 +26,10 @@ private Reply() { + section); } + /** + * factory method to enforce one instance of the reply class + * @return an instance of Reply + */ public static Reply init() { if (reply == null) { reply = new Reply(); @@ -27,6 +37,10 @@ public static Reply init() { return reply; } + /** + * Takes in a dialog and prints it our in a standardised ui format + * @param dialog dialog of the chatbot reply + */ public void printDialog(String dialog) { System.out.println(section + indent + dialog + "\n" + section); } From 5f71000771580b02421ba0106e6805e16573e67c Mon Sep 17 00:00:00 2001 From: You Wei Date: Tue, 29 Aug 2023 15:59:13 +0800 Subject: [PATCH 26/70] Coding Standard --- src/main/java/chatbot/evan/Evan.java | 12 +++++++++++- src/main/java/command/DeadlineCommand.java | 14 ++++++++++---- src/main/java/command/DeleteCommand.java | 3 +++ src/main/java/command/EventCommand.java | 9 +++++++++ src/main/java/command/MarkCommand.java | 5 +++-- src/main/java/command/ToDoCommand.java | 4 ++++ src/main/java/command/UnmarkCommand.java | 4 ++++ .../exception/MissingArgumentException.java | 18 +++++++++++++++--- .../MissingTaskArgumentException.java | 16 ---------------- src/main/java/parser/CommandParser.java | 18 ++++++++++-------- src/main/java/parser/Time.java | 6 ++++++ src/main/java/storage/Database.java | 3 +++ src/main/java/task/TaskList.java | 16 +++++++++++++--- src/test/java/parser/CommandParserTest.java | 2 -- 14 files changed, 91 insertions(+), 39 deletions(-) delete mode 100644 src/main/java/exception/MissingTaskArgumentException.java diff --git a/src/main/java/chatbot/evan/Evan.java b/src/main/java/chatbot/evan/Evan.java index a07dd05c6f..acda8d3a2a 100644 --- a/src/main/java/chatbot/evan/Evan.java +++ b/src/main/java/chatbot/evan/Evan.java @@ -2,12 +2,21 @@ import java.util.Scanner; -import command.*; +import command.ToDoCommand; +import command.UnmarkCommand; +import command.DeleteCommand; +import command.DeadlineCommand; +import command.MarkCommand; +import command.EventCommand; + import enums.Command; + import exception.InvalidInputException; import exception.InvalidCommandException; import exception.MissingArgumentException; + import task.TaskList; + import ui.Reply; /** @@ -26,6 +35,7 @@ public class Evan { public static void main(String[] args) { //Start user interaction Scanner scanner = new Scanner(System.in); + while(true) { try { String input = scanner.nextLine(); diff --git a/src/main/java/command/DeadlineCommand.java b/src/main/java/command/DeadlineCommand.java index 42948183b7..6561262de7 100644 --- a/src/main/java/command/DeadlineCommand.java +++ b/src/main/java/command/DeadlineCommand.java @@ -1,11 +1,14 @@ package command; +import exception.InvalidDateException; +import exception.InvalidTimeException; + import task.TaskList; +import task.Deadlines; + import ui.Reply; + import parser.Time; -import task.Deadlines; -import exception.InvalidDateException; -import exception.InvalidTimeException; import java.util.Scanner; @@ -23,12 +26,14 @@ public class DeadlineCommand { * Returns to homepage otherwise. */ public static void start() { + Scanner scanner = new Scanner(System.in); + reply.printDialog("So you want to add a task with deadline. Tell me what's the task."); String desc = scanner.nextLine(); + reply.printDialog("Now indicate the deadline date."); String date = scanner.nextLine(); - try { date = Time.formatDate(date); } catch (InvalidDateException e) { @@ -49,6 +54,7 @@ public static void start() { return; } } + tasks.addTask(new Deadlines(desc, date)); } } diff --git a/src/main/java/command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java index a8af79c5c9..d0e99c12f8 100644 --- a/src/main/java/command/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -3,8 +3,11 @@ import exception.InvalidCommandException; import exception.MissingArgumentException; import exception.InvalidInputException; + import parser.CommandParser; + import task.TaskList; + import ui.Reply; /** diff --git a/src/main/java/command/EventCommand.java b/src/main/java/command/EventCommand.java index eea0a04190..034d5db0f4 100644 --- a/src/main/java/command/EventCommand.java +++ b/src/main/java/command/EventCommand.java @@ -2,10 +2,14 @@ import exception.InvalidDateException; import exception.InvalidTimeException; + import enums.Command; + import parser.Time; + import task.Events; import task.TaskList; + import ui.Reply; import java.util.Scanner; @@ -29,6 +33,7 @@ public static void start() { reply.printDialog("So you want to add a event task. Tell me what's the task."); String desc = scanner.nextLine(); + reply.printDialog("Now indicate the start date."); String from = scanner.nextLine(); try { @@ -37,6 +42,7 @@ public static void start() { reply.printDialog(e.toString()); return; } + reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); String fromTime = scanner.nextLine(); if (!fromTime.toLowerCase().equals(Command.SKIP.getCommand())) { @@ -50,6 +56,7 @@ public static void start() { return; } } + reply.printDialog("Now indicate the end date."); String to = scanner.nextLine(); try { @@ -58,6 +65,7 @@ public static void start() { reply.printDialog(e.toString()); return; } + reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); String toTime = scanner.nextLine(); if (!toTime.toLowerCase().equals(Command.SKIP.getCommand())) { @@ -71,6 +79,7 @@ public static void start() { return; } } + tasks.addTask(new Events(desc, from, to)); } } diff --git a/src/main/java/command/MarkCommand.java b/src/main/java/command/MarkCommand.java index c68efabf68..5e71eccdb3 100644 --- a/src/main/java/command/MarkCommand.java +++ b/src/main/java/command/MarkCommand.java @@ -2,10 +2,11 @@ import exception.InvalidCommandException; import exception.MissingArgumentException; -import exception.InvalidInputException; -import enums.Command; + import parser.CommandParser; + import task.TaskList; + import ui.Reply; /** diff --git a/src/main/java/command/ToDoCommand.java b/src/main/java/command/ToDoCommand.java index 5efa9145f0..19730f1cd5 100644 --- a/src/main/java/command/ToDoCommand.java +++ b/src/main/java/command/ToDoCommand.java @@ -2,6 +2,7 @@ import task.TaskList; import task.ToDo; + import ui.Reply; import java.util.Scanner; @@ -19,9 +20,12 @@ public class ToDoCommand { * Prompts user to enter the task name before adding it to the list. */ public static void start() { + Scanner scanner = new Scanner(System.in); + reply.printDialog("So you want to add a ToDo task. Tell me what's the task."); String desc = scanner.nextLine(); + tasks.addTask(new ToDo(desc)); } } diff --git a/src/main/java/command/UnmarkCommand.java b/src/main/java/command/UnmarkCommand.java index d8dcac3390..ed6ffda462 100644 --- a/src/main/java/command/UnmarkCommand.java +++ b/src/main/java/command/UnmarkCommand.java @@ -3,9 +3,13 @@ import exception.InvalidCommandException; import exception.MissingArgumentException; import exception.InvalidInputException; + import enums.Command; + import parser.CommandParser; + import task.TaskList; + import ui.Reply; /** diff --git a/src/main/java/exception/MissingArgumentException.java b/src/main/java/exception/MissingArgumentException.java index 05f7082829..a52f27050f 100644 --- a/src/main/java/exception/MissingArgumentException.java +++ b/src/main/java/exception/MissingArgumentException.java @@ -1,14 +1,26 @@ package exception; /** - * Abstract Exception for the event where user input has missing arguments. + * Exception for the event where user input has missing arguments. */ -public abstract class MissingArgumentException extends Exception{ +public class MissingArgumentException extends Exception{ + + String missingArgument; + + /** + * Constructor for MissingArgumentException + * @param missingArgument a string depicting arguments that are missing from user input + */ + public MissingArgumentException(String missingArgument) { + this.missingArgument = missingArgument; + } /** * Returns a string to inform users of the exception * @return string information to inform user of exception */ @Override - public abstract String toString(); + public String toString() { + return "the following information is missing: " + missingArgument; + } } diff --git a/src/main/java/exception/MissingTaskArgumentException.java b/src/main/java/exception/MissingTaskArgumentException.java deleted file mode 100644 index b7294dc845..0000000000 --- a/src/main/java/exception/MissingTaskArgumentException.java +++ /dev/null @@ -1,16 +0,0 @@ -package exception; - -/** - * Checked Exception for the event where the input arguments is missing. - */ -public class MissingTaskArgumentException extends MissingArgumentException { - - /** - * Returns a string to inform users that there are missing arguments - * @return string information to inform user of exception - */ - @Override - public String toString() { - return " ☹ OOPS!!! You forgot to add the index number right after the command"; - } -} diff --git a/src/main/java/parser/CommandParser.java b/src/main/java/parser/CommandParser.java index 14dabb59b7..a2ec64488a 100644 --- a/src/main/java/parser/CommandParser.java +++ b/src/main/java/parser/CommandParser.java @@ -1,9 +1,9 @@ package parser; import enums.Command; + import exception.MissingArgumentException; import exception.InvalidCommandException; -import exception.MissingTaskArgumentException; /** * Class to help parse complex strings from user input @@ -31,15 +31,16 @@ public static String getCommandArguments(String input) throws } String args = input.substring(command.getCommandStringLength()); - if (args.isBlank()) { switch (command) { - case MARK: - case UNMARK: - case DELETE: - throw new MissingTaskArgumentException(); - default: - throw new InvalidCommandException(); + case MARK: + throw new MissingArgumentException("task index number"); + case UNMARK: + throw new MissingArgumentException("task index number"); + case DELETE: + throw new MissingArgumentException("task index number"); + default: + throw new InvalidCommandException(); } } else { return args.substring(1); @@ -52,6 +53,7 @@ public static String getCommandArguments(String input) throws * @return the first word of the string */ public static String getFirstWord(String input) { + int spaceIndex = input.indexOf(' '); if (spaceIndex == -1) { return input; diff --git a/src/main/java/parser/Time.java b/src/main/java/parser/Time.java index 18823a5a6f..59f15de8f6 100644 --- a/src/main/java/parser/Time.java +++ b/src/main/java/parser/Time.java @@ -19,6 +19,7 @@ public class Time { * @throws InvalidDateException if no appropriate date format is found */ private static DateTimeFormatter findDateFormat(String date) throws InvalidDateException { + DateTimeFormatter[] formats = new DateTimeFormatter[]{ DateTimeFormatter.ofPattern("MMM-d-yyyy"), DateTimeFormatter.ofPattern("MMM-dd-yyyy"), @@ -119,6 +120,7 @@ private static DateTimeFormatter findDateFormat(String date) throws InvalidDateE return format; } } + throw new InvalidDateException(); } @@ -158,12 +160,16 @@ public static String formatDate(String date) throws InvalidDateException { * @throws InvalidDateException if date is not a valid date */ public static String formatTime(String date, String time) throws InvalidTimeException, InvalidDateException { + DateTimeFormatter stdFormat = DateTimeFormatter.ofPattern("dd-MMM-yyyy HHmm"); DateTimeFormatter currentFormat = findDateFormat(date); + LocalDate lDate = LocalDate.parse(date, currentFormat); + int intTime = Integer.parseInt(time); int hour = (int) Math.floor(intTime / 100.0); int minute = intTime - (hour * 100); + return lDate.atTime(hour, minute).format(stdFormat); } } diff --git a/src/main/java/storage/Database.java b/src/main/java/storage/Database.java index 844f487aa7..331ef21f39 100644 --- a/src/main/java/storage/Database.java +++ b/src/main/java/storage/Database.java @@ -42,8 +42,10 @@ public static void save(ArrayList list) { * @return list of tasks saved in the text file */ public static ArrayList loadData() { + File file = new File("data/tasklist.txt"); ArrayList list = new ArrayList<>(); + try { FileReader fileReader = new FileReader(file); BufferedReader fileToRead = new BufferedReader(fileReader); @@ -62,6 +64,7 @@ public static ArrayList loadData() { } nextLine = fileToRead.readLine(); } + fileReader.close(); fileToRead.close(); diff --git a/src/main/java/task/TaskList.java b/src/main/java/task/TaskList.java index 8c2fa649b0..abf315e642 100644 --- a/src/main/java/task/TaskList.java +++ b/src/main/java/task/TaskList.java @@ -1,6 +1,7 @@ package task; import ui.Reply; + import storage.Database; import java.util.ArrayList; @@ -54,6 +55,7 @@ public void addTask(Task task) { public void printTasks() { Task[] tasks = list.toArray(new Task[0]); StringBuilder dialog = new StringBuilder("Here are the tasks in your list:\n "); + for (int i = 0; i < tasks.length; i++) { int listIndex = i + 1; Task task = tasks[i]; @@ -67,6 +69,7 @@ public void printTasks() { dialog.append(task); } } + reply.printDialog(dialog.toString()); } @@ -75,10 +78,12 @@ public void printTasks() { * @param index index of the task */ public void markDone(int index) { - StringBuilder dialog = new StringBuilder(); Task element = list.get(index - 1); element.markAsDone(); + Database.save(list); + + StringBuilder dialog = new StringBuilder(); dialog.append("Nice! I've marked this task as done:\n") .append(" ") .append(element); @@ -90,10 +95,12 @@ public void markDone(int index) { * @param index index of the task */ public void unmarkDone(int index) { - StringBuilder dialog = new StringBuilder(); Task element = list.get(index - 1); element.markAsNotDone(); + Database.save(list); + + StringBuilder dialog = new StringBuilder(); dialog.append("OK! I've marked this task as not done yet:\n") .append(" ") .append(element); @@ -105,10 +112,13 @@ public void unmarkDone(int index) { * @param index index of the task */ public void deleteTask(int index) { - StringBuilder dialog = new StringBuilder(); + Task element = list.get(index - 1); list.remove(index - 1); + Database.save(list); + + StringBuilder dialog = new StringBuilder(); dialog.append("Noted. I've removed this task:\n") .append(" ") .append(element) diff --git a/src/test/java/parser/CommandParserTest.java b/src/test/java/parser/CommandParserTest.java index 9354708dff..367e0f1251 100644 --- a/src/test/java/parser/CommandParserTest.java +++ b/src/test/java/parser/CommandParserTest.java @@ -1,9 +1,7 @@ package parser; -import enums.Command; import exception.InvalidCommandException; import exception.MissingArgumentException; -import exception.MissingTaskArgumentException; import org.junit.Assert; import org.junit.jupiter.api.Test; From 3b03c4d8e099137629c77f6a19d119b25f132c8f Mon Sep 17 00:00:00 2001 From: You Wei Date: Tue, 29 Aug 2023 20:23:22 +0800 Subject: [PATCH 27/70] Add Find --- src/main/java/chatbot/evan/Evan.java | 34 +++++++++--------- src/main/java/command/DeadlineCommand.java | 3 +- src/main/java/command/DeleteCommand.java | 3 +- src/main/java/command/EventCommand.java | 3 +- src/main/java/command/FindCommand.java | 40 ++++++++++++++++++++++ src/main/java/command/MarkCommand.java | 3 +- src/main/java/command/ToDoCommand.java | 3 +- src/main/java/command/UnmarkCommand.java | 3 +- src/main/java/enums/Command.java | 4 +-- src/main/java/task/TaskList.java | 21 ++++++++++++ 10 files changed, 85 insertions(+), 32 deletions(-) create mode 100644 src/main/java/command/FindCommand.java diff --git a/src/main/java/chatbot/evan/Evan.java b/src/main/java/chatbot/evan/Evan.java index acda8d3a2a..68f9d5c2f6 100644 --- a/src/main/java/chatbot/evan/Evan.java +++ b/src/main/java/chatbot/evan/Evan.java @@ -2,12 +2,7 @@ import java.util.Scanner; -import command.ToDoCommand; -import command.UnmarkCommand; -import command.DeleteCommand; -import command.DeadlineCommand; -import command.MarkCommand; -import command.EventCommand; +import command.*; import enums.Command; @@ -15,6 +10,7 @@ import exception.InvalidCommandException; import exception.MissingArgumentException; +import parser.CommandParser; import task.TaskList; import ui.Reply; @@ -38,24 +34,28 @@ public static void main(String[] args) { while(true) { try { - String input = scanner.nextLine(); - if (input.toLowerCase().equals(Command.BYE.getCommand())) { + String input = scanner.nextLine().toLowerCase(); + String firstWord = CommandParser.getFirstWord(input); + + if (firstWord.equals(Command.BYE.getCommand())) { reply.printDialog("Bye. Hope to see you again soon!"); return; - } else if (input.toLowerCase().equals(Command.LIST.getCommand())) { + } else if (firstWord.equals(Command.LIST.getCommand())) { tasks.printTasks(); - } else if (input.startsWith(Command.MARK.getCommand())) { - MarkCommand.start(input); - } else if (input.startsWith(Command.UNMARK.getCommand())) { - UnmarkCommand.start(input); - } else if (input.toLowerCase().equals(Command.TODO.getCommand())) { + } else if (firstWord.equals(Command.TODO.getCommand())) { ToDoCommand.start(); - } else if (input.toLowerCase().equals(Command.DEADLINE.getCommand())) { + } else if (firstWord.equals(Command.DEADLINE.getCommand())) { DeadlineCommand.start(); - } else if (input.toLowerCase().equals(Command.EVENT.getCommand())) { + } else if (firstWord.equals(Command.EVENT.getCommand())) { EventCommand.start(); - } else if (input.startsWith(Command.DELETE.getCommand())) { + } else if (firstWord.equals(Command.DELETE.getCommand())) { DeleteCommand.start(input); + } else if (firstWord.equals(Command.MARK.getCommand())) { + MarkCommand.start(input); + } else if (firstWord.equals(Command.UNMARK.getCommand())) { + UnmarkCommand.start(input); + } else if (firstWord.equals(Command.FIND.getCommand())) { + FindCommand.start(input); } else { throw new InvalidCommandException(); } diff --git a/src/main/java/command/DeadlineCommand.java b/src/main/java/command/DeadlineCommand.java index 6561262de7..f8be651199 100644 --- a/src/main/java/command/DeadlineCommand.java +++ b/src/main/java/command/DeadlineCommand.java @@ -20,8 +20,7 @@ public class DeadlineCommand { private static TaskList tasks = TaskList.init(); /** - * Main process of Deadline Command. The choice of keeping the commands static is because there is no need for multiple - * instances of commands + * Main process of Deadline Command. * Prompts user to enter the task and deadline date and time before validating and adding it to the list. * Returns to homepage otherwise. */ diff --git a/src/main/java/command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java index d0e99c12f8..1e1c6420c7 100644 --- a/src/main/java/command/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -18,8 +18,7 @@ public class DeleteCommand { private static TaskList tasks = TaskList.init(); /** - * Main process of Delete Command. The choice of keeping the command methods static is because there is no need - * for multiple instances of commands + * Main process of Delete Command. * Validates the input after the delete keyword in the string. Deletes the task if it's a vlid input. * Returns to homepage otherwise. * @param input String input containing the command and its arguments diff --git a/src/main/java/command/EventCommand.java b/src/main/java/command/EventCommand.java index 034d5db0f4..b4c1bfcce7 100644 --- a/src/main/java/command/EventCommand.java +++ b/src/main/java/command/EventCommand.java @@ -22,8 +22,7 @@ public class EventCommand { private static TaskList tasks = TaskList.init(); /** - * Main process of Event Command. The choice of keeping the commands static is because there is no need for multiple - * instances of commands + * Main process of Event Command. * Prompts user to enter the task, start and end date/time before validating and adding it to the list. * Returns to homepage otherwise. */ diff --git a/src/main/java/command/FindCommand.java b/src/main/java/command/FindCommand.java new file mode 100644 index 0000000000..55ccc9aa1c --- /dev/null +++ b/src/main/java/command/FindCommand.java @@ -0,0 +1,40 @@ +package command; + +import exception.InvalidCommandException; +import exception.InvalidInputException; +import exception.MissingArgumentException; +import parser.CommandParser; +import task.TaskList; +import ui.Reply; + +/** + * Class for Fnd command with its static implementation of its processes + */ +public class FindCommand { + private static Reply reply = Reply.init(); + private static TaskList tasks = TaskList.init(); + + /** + * Main process of Mark Command. + * Validates the input after the find keyword in the string and finds the task + * Returns to homepage otherwise. + * @param input String input containing the command and its arguments + * @throws MissingArgumentException if the arguments after the command is missing + * @throws InvalidCommandException if the command in the string is invalid + * @throws InvalidInputException if there is more than one keyword in the input + */ + public static void start(String input) throws + InvalidCommandException, + MissingArgumentException, + InvalidInputException { + + String argument = CommandParser.getCommandArguments(input); + + String[] split = argument.split(" "); + if (split.length > 1) { + throw new InvalidInputException(); + } + + tasks.findTask(argument); + } +} diff --git a/src/main/java/command/MarkCommand.java b/src/main/java/command/MarkCommand.java index 5e71eccdb3..b8ba401aaf 100644 --- a/src/main/java/command/MarkCommand.java +++ b/src/main/java/command/MarkCommand.java @@ -17,8 +17,7 @@ public class MarkCommand { private static TaskList tasks = TaskList.init(); /** - * Main process of Mark Command. The choice of keeping the command methods static is because there is no need - * for multiple instances of commands + * Main process of Mark Command. * Validates the input after the mark keyword in the string. Marks the task if it's a valid input. * Returns to homepage otherwise. * @param input String input containing the command and its arguments diff --git a/src/main/java/command/ToDoCommand.java b/src/main/java/command/ToDoCommand.java index 19730f1cd5..a01b2aea4f 100644 --- a/src/main/java/command/ToDoCommand.java +++ b/src/main/java/command/ToDoCommand.java @@ -15,8 +15,7 @@ public class ToDoCommand { private static TaskList tasks = TaskList.init(); /** - * Main process of todo Command. The choice of keeping the commands static is because there is no need for multiple - * instances of commands + * Main process of todo Command. * Prompts user to enter the task name before adding it to the list. */ public static void start() { diff --git a/src/main/java/command/UnmarkCommand.java b/src/main/java/command/UnmarkCommand.java index ed6ffda462..2bf5e7c72a 100644 --- a/src/main/java/command/UnmarkCommand.java +++ b/src/main/java/command/UnmarkCommand.java @@ -20,8 +20,7 @@ public class UnmarkCommand { private static TaskList tasks = TaskList.init(); /** - * Main process of Unmark Command. The choice of keeping the command methods static is because there is no need - * for multiple instances of commands + * Main process of Unmark Command. * Validates the input after the unmark keyword in the string. Unmarks the task if it's a valid input. * Returns to homepage otherwise. * @param input String input containing the command and its arguments diff --git a/src/main/java/enums/Command.java b/src/main/java/enums/Command.java index bbc6044533..ef282fbacb 100644 --- a/src/main/java/enums/Command.java +++ b/src/main/java/enums/Command.java @@ -12,9 +12,7 @@ public enum Command { DEADLINE("deadline"), TODO("todo"), EVENT("event"), - BY("by"), - FROM("from"), - TO("to"), + FIND("find"), SKIP("skip"); private String cmd; diff --git a/src/main/java/task/TaskList.java b/src/main/java/task/TaskList.java index abf315e642..e1d42f6945 100644 --- a/src/main/java/task/TaskList.java +++ b/src/main/java/task/TaskList.java @@ -5,6 +5,7 @@ import storage.Database; import java.util.ArrayList; +import java.util.function.Consumer; /** * Class for manipulating the list of tasks @@ -128,4 +129,24 @@ public void deleteTask(int index) { .append(" tasks in the list."); reply.printDialog(dialog.toString()); } + + public void findTask(String keyword) { + StringBuilder dialog = new StringBuilder("Here are the matching tasks in your list with its correct " + + "corresponding index numbers: \n "); + + Task[] tasks = list.toArray(new Task[0]); + + for (int i = 0; i < tasks.length; i++) { + Task task = tasks[i]; + int listIndex = i + 1; + + if (task.description.contains(keyword)) { + dialog.append(listIndex) + .append(".") + .append(task) + .append("\n "); + } + } + reply.printDialog(dialog.toString()); + } } From b72184918908b00ccf7f989721fdc0883d6371fb Mon Sep 17 00:00:00 2001 From: You Wei Date: Tue, 29 Aug 2023 20:27:38 +0800 Subject: [PATCH 28/70] gitignore --- .gitignore | 7 +++- build.gradle | 42 ----------------------- data/tasklist.txt | 1 - gradle/wrapper/gradle-wrapper.jar | Bin 63375 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 7 ---- text-ui-test/EXPECTED.TXT | 2 +- text-ui-test/runtest.bat | 2 +- 7 files changed, 8 insertions(+), 53 deletions(-) delete mode 100644 build.gradle delete mode 100644 data/tasklist.txt delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 gradle/wrapper/gradle-wrapper.properties diff --git a/.gitignore b/.gitignore index 70038e7201..84951c9b1c 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,12 @@ bin/ /text-ui-test/ACTUAL.TXT text-ui-test/EXPECTED-UNIX.TXT -data/*.txt +build.gradle +data/tasklist.txt +gradle/wrapper/gradle-wrapper.jar +gradle/wrapper/gradle-wrapper.properties +gradlew +text-ui-test/runtest.bat # Class files src/main/java/*.class diff --git a/build.gradle b/build.gradle deleted file mode 100644 index ca0b9f6722..0000000000 --- a/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -plugins { - id 'java' - id 'application' - id 'com.github.johnrengelman.shadow' version '7.1.2' -} - -repositories { - mavenCentral() -} - -dependencies { - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0' - testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0' -} - -test { - useJUnitPlatform() - - testLogging { - events "passed", "skipped", "failed" - - showExceptions true - exceptionFormat "full" - showCauses true - showStackTraces true - showStandardStreams = false - } -} - -application { - mainClass.set("chatbot.evan.Evan") -} - -shadowJar { - archiveBaseName = "duke" - archiveClassifier = null - dependsOn("distZip", "distTar") -} - -run{ - standardInput = System.in -} diff --git a/data/tasklist.txt b/data/tasklist.txt deleted file mode 100644 index 79e50b9b68..0000000000 --- a/data/tasklist.txt +++ /dev/null @@ -1 +0,0 @@ -todo/false/read book diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 033e24c4cdf41af1ab109bc7f253b2b887023340..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 63375 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≫L+crb^Bz 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 ACTUAL.TXT +java -classpath ..\bin chatbot.evan.Evan < input.txt > ACTUAL.TXT REM compare the output to the expected output FC ACTUAL.TXT EXPECTED.TXT \ No newline at end of file From 09432bec5dda8dbff877079d1a757f400088e6db Mon Sep 17 00:00:00 2001 From: You Wei Date: Tue, 29 Aug 2023 20:27:58 +0800 Subject: [PATCH 29/70] gitignore --- gradlew | 248 -------------------------------------------------------- 1 file changed, 248 deletions(-) delete mode 100755 gradlew diff --git a/gradlew b/gradlew deleted file mode 100755 index fcb6fca147..0000000000 --- a/gradlew +++ /dev/null @@ -1,248 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original 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 POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# 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 ;; #( - MSYS* | 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 - if ! command -v java >/dev/null 2>&1 - then - 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 -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# 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"' - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" From 57b6cbeb9a9482a0c5cb4b1e7d8bbde25e38102d Mon Sep 17 00:00:00 2001 From: You Wei Date: Tue, 29 Aug 2023 20:38:52 +0800 Subject: [PATCH 30/70] Command bug fix --- src/main/java/chatbot/evan/Evan.java | 19 +++++++++---------- src/main/java/task/TaskList.java | 4 ++++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/chatbot/evan/Evan.java b/src/main/java/chatbot/evan/Evan.java index 68f9d5c2f6..9fdd72efe9 100644 --- a/src/main/java/chatbot/evan/Evan.java +++ b/src/main/java/chatbot/evan/Evan.java @@ -35,26 +35,25 @@ public static void main(String[] args) { while(true) { try { String input = scanner.nextLine().toLowerCase(); - String firstWord = CommandParser.getFirstWord(input); - if (firstWord.equals(Command.BYE.getCommand())) { + if (input.equals(Command.BYE.getCommand())) { reply.printDialog("Bye. Hope to see you again soon!"); return; - } else if (firstWord.equals(Command.LIST.getCommand())) { + } else if (input.equals(Command.LIST.getCommand())) { tasks.printTasks(); - } else if (firstWord.equals(Command.TODO.getCommand())) { + } else if (input.equals(Command.TODO.getCommand())) { ToDoCommand.start(); - } else if (firstWord.equals(Command.DEADLINE.getCommand())) { + } else if (input.equals(Command.DEADLINE.getCommand())) { DeadlineCommand.start(); - } else if (firstWord.equals(Command.EVENT.getCommand())) { + } else if (input.equals(Command.EVENT.getCommand())) { EventCommand.start(); - } else if (firstWord.equals(Command.DELETE.getCommand())) { + } else if (input.startsWith(Command.DELETE.getCommand())) { DeleteCommand.start(input); - } else if (firstWord.equals(Command.MARK.getCommand())) { + } else if (input.startsWith(Command.MARK.getCommand())) { MarkCommand.start(input); - } else if (firstWord.equals(Command.UNMARK.getCommand())) { + } else if (input.startsWith(Command.UNMARK.getCommand())) { UnmarkCommand.start(input); - } else if (firstWord.equals(Command.FIND.getCommand())) { + } else if (input.startsWith(Command.FIND.getCommand())) { FindCommand.start(input); } else { throw new InvalidCommandException(); diff --git a/src/main/java/task/TaskList.java b/src/main/java/task/TaskList.java index e1d42f6945..9ad6135ab0 100644 --- a/src/main/java/task/TaskList.java +++ b/src/main/java/task/TaskList.java @@ -130,6 +130,10 @@ public void deleteTask(int index) { reply.printDialog(dialog.toString()); } + /** + * Finds all tasks which contains the keyword and prints it + * @param keyword + */ public void findTask(String keyword) { StringBuilder dialog = new StringBuilder("Here are the matching tasks in your list with its correct " + "corresponding index numbers: \n "); From 27d3b04dc48dbeb282f3581d9c693ea1e8aea57d Mon Sep 17 00:00:00 2001 From: You Wei Date: Mon, 4 Sep 2023 11:27:56 +0800 Subject: [PATCH 31/70] add checkstyles --- config/checkstyle/checkstyle.xml | 434 +++++++++++++++++++++++++++++ config/checkstyle/suppressions.xml | 10 + 2 files changed, 444 insertions(+) create mode 100644 config/checkstyle/checkstyle.xml create mode 100644 config/checkstyle/suppressions.xml diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 0000000000..eb761a9b9a --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,434 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml new file mode 100644 index 0000000000..39efb6e4ac --- /dev/null +++ b/config/checkstyle/suppressions.xml @@ -0,0 +1,10 @@ + + + + + + + + From 02dd6386e0f2dfba0ca4bcc2972b783414cf4bcb Mon Sep 17 00:00:00 2001 From: You Wei Date: Wed, 6 Sep 2023 21:31:35 +0800 Subject: [PATCH 32/70] Add GUI --- src/main/java/command/DeadlineCommand.java | 59 --------------- src/main/java/command/DeleteCommand.java | 43 ----------- src/main/java/command/EventCommand.java | 84 --------------------- src/main/java/command/FindCommand.java | 40 ---------- src/main/java/command/MarkCommand.java | 40 ---------- src/main/java/command/ToDoCommand.java | 30 -------- src/main/java/command/UnmarkCommand.java | 45 ----------- src/main/java/process/ComplexProcess.java | 2 + src/main/java/process/Deadline.java | 2 + src/main/java/process/Delete.java | 2 + src/main/java/process/Event.java | 2 + src/main/java/process/Find.java | 2 + src/main/java/process/Mark.java | 2 + src/main/java/process/Process.java | 2 + src/main/java/process/SimpleProcess.java | 2 + src/main/java/process/ToDo.java | 2 + src/main/java/process/Unmark.java | 2 + src/main/java/ui/DialogBox.java | 61 +++++++++++++++ src/main/java/ui/Launcher.java | 12 +++ src/main/java/ui/Main.java | 31 ++++++++ src/main/java/ui/MainWindow.java | 51 +++++++++++++ src/main/java/ui/Reply.java | 47 ------------ src/main/resources/images/alex.jpg | Bin 0 -> 14232 bytes src/main/resources/images/majesty.jpg | Bin 0 -> 30041 bytes src/main/resources/images/user.png | Bin 0 -> 809 bytes src/main/resources/view/DialogBox.fxml | 14 ++++ src/main/resources/view/MainWindow.fxml | 14 ++++ 27 files changed, 203 insertions(+), 388 deletions(-) delete mode 100644 src/main/java/command/DeadlineCommand.java delete mode 100644 src/main/java/command/DeleteCommand.java delete mode 100644 src/main/java/command/EventCommand.java delete mode 100644 src/main/java/command/FindCommand.java delete mode 100644 src/main/java/command/MarkCommand.java delete mode 100644 src/main/java/command/ToDoCommand.java delete mode 100644 src/main/java/command/UnmarkCommand.java create mode 100644 src/main/java/process/ComplexProcess.java create mode 100644 src/main/java/process/Deadline.java create mode 100644 src/main/java/process/Delete.java create mode 100644 src/main/java/process/Event.java create mode 100644 src/main/java/process/Find.java create mode 100644 src/main/java/process/Mark.java create mode 100644 src/main/java/process/Process.java create mode 100644 src/main/java/process/SimpleProcess.java create mode 100644 src/main/java/process/ToDo.java create mode 100644 src/main/java/process/Unmark.java create mode 100644 src/main/java/ui/DialogBox.java create mode 100644 src/main/java/ui/Launcher.java create mode 100644 src/main/java/ui/Main.java create mode 100644 src/main/java/ui/MainWindow.java delete mode 100644 src/main/java/ui/Reply.java create mode 100644 src/main/resources/images/alex.jpg create mode 100644 src/main/resources/images/majesty.jpg create mode 100644 src/main/resources/images/user.png create mode 100644 src/main/resources/view/DialogBox.fxml create mode 100644 src/main/resources/view/MainWindow.fxml diff --git a/src/main/java/command/DeadlineCommand.java b/src/main/java/command/DeadlineCommand.java deleted file mode 100644 index f8be651199..0000000000 --- a/src/main/java/command/DeadlineCommand.java +++ /dev/null @@ -1,59 +0,0 @@ -package command; - -import exception.InvalidDateException; -import exception.InvalidTimeException; - -import task.TaskList; -import task.Deadlines; - -import ui.Reply; - -import parser.Time; - -import java.util.Scanner; - -/** - * Class for Deadline command with its static implementation of its processes - */ -public class DeadlineCommand { - private static Reply reply = Reply.init(); - private static TaskList tasks = TaskList.init(); - - /** - * Main process of Deadline Command. - * Prompts user to enter the task and deadline date and time before validating and adding it to the list. - * Returns to homepage otherwise. - */ - public static void start() { - - Scanner scanner = new Scanner(System.in); - - reply.printDialog("So you want to add a task with deadline. Tell me what's the task."); - String desc = scanner.nextLine(); - - reply.printDialog("Now indicate the deadline date."); - String date = scanner.nextLine(); - try { - date = Time.formatDate(date); - } catch (InvalidDateException e) { - reply.printDialog(e.toString()); - return; - } - - reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); - String time = scanner.nextLine(); - if (!time.toLowerCase().equals(enums.Command.SKIP.getCommand())) { - try { - date = Time.formatTime(date, time); - } catch (InvalidTimeException | InvalidDateException e) { - reply.printDialog(e.toString()); - return; - } catch (NumberFormatException e) { - reply.printDialog("Non-numerical characters detected. Please enter numbers only. Returning to homepage..."); - return; - } - } - - tasks.addTask(new Deadlines(desc, date)); - } -} diff --git a/src/main/java/command/DeleteCommand.java b/src/main/java/command/DeleteCommand.java deleted file mode 100644 index 1e1c6420c7..0000000000 --- a/src/main/java/command/DeleteCommand.java +++ /dev/null @@ -1,43 +0,0 @@ -package command; - -import exception.InvalidCommandException; -import exception.MissingArgumentException; -import exception.InvalidInputException; - -import parser.CommandParser; - -import task.TaskList; - -import ui.Reply; - -/** - * Class for Delete command with its static implementation of its processes - */ -public class DeleteCommand { - private static Reply reply = Reply.init(); - private static TaskList tasks = TaskList.init(); - - /** - * Main process of Delete Command. - * Validates the input after the delete keyword in the string. Deletes the task if it's a vlid input. - * Returns to homepage otherwise. - * @param input String input containing the command and its arguments - * @throws InvalidInputException if the arguments after command is invalid - * @throws MissingArgumentException if the arguments after the command is missing - * @throws InvalidCommandException if the command in the string is invalid - */ - public static void start(String input) throws - InvalidInputException, - MissingArgumentException, - InvalidCommandException { - - String number = CommandParser.getCommandArguments(input); - try { - tasks.deleteTask(Integer.parseInt(number)); - } catch (NumberFormatException e ) { - reply.printDialog(" Strictly type 1 number only"); - } catch (IndexOutOfBoundsException e) { - reply.printDialog(" Index number does not exist in our list"); - } - } -} diff --git a/src/main/java/command/EventCommand.java b/src/main/java/command/EventCommand.java deleted file mode 100644 index b4c1bfcce7..0000000000 --- a/src/main/java/command/EventCommand.java +++ /dev/null @@ -1,84 +0,0 @@ -package command; - -import exception.InvalidDateException; -import exception.InvalidTimeException; - -import enums.Command; - -import parser.Time; - -import task.Events; -import task.TaskList; - -import ui.Reply; - -import java.util.Scanner; - -/** - * Class for Event command with its static implementation of its processes - */ -public class EventCommand { - private static Reply reply = Reply.init(); - private static TaskList tasks = TaskList.init(); - - /** - * Main process of Event Command. - * Prompts user to enter the task, start and end date/time before validating and adding it to the list. - * Returns to homepage otherwise. - */ - public static void start() { - - Scanner scanner = new Scanner(System.in); - - reply.printDialog("So you want to add a event task. Tell me what's the task."); - String desc = scanner.nextLine(); - - reply.printDialog("Now indicate the start date."); - String from = scanner.nextLine(); - try { - from = Time.formatDate(from); - } catch (InvalidDateException e) { - reply.printDialog(e.toString()); - return; - } - - reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); - String fromTime = scanner.nextLine(); - if (!fromTime.toLowerCase().equals(Command.SKIP.getCommand())) { - try { - from = Time.formatTime(from, fromTime); - } catch (InvalidTimeException | InvalidDateException e) { - reply.printDialog(e.toString()); - return; - } catch (NumberFormatException e) { - reply.printDialog("Non-numerical characters detected. Please enter numbers only. Returning to homepage..."); - return; - } - } - - reply.printDialog("Now indicate the end date."); - String to = scanner.nextLine(); - try { - to = Time.formatDate(to); - } catch (InvalidDateException e) { - reply.printDialog(e.toString()); - return; - } - - reply.printDialog("Indicate a start time in ranging from 0000 - 2359. You may enter 'Skip' to not indicate a time"); - String toTime = scanner.nextLine(); - if (!toTime.toLowerCase().equals(Command.SKIP.getCommand())) { - try { - to = Time.formatTime(to, toTime); - } catch (InvalidTimeException | InvalidDateException e) { - reply.printDialog(e.toString()); - return; - } catch (NumberFormatException e) { - reply.printDialog("Non-numerical characters detected. Please enter numbers only. Returning to homepage..."); - return; - } - } - - tasks.addTask(new Events(desc, from, to)); - } -} diff --git a/src/main/java/command/FindCommand.java b/src/main/java/command/FindCommand.java deleted file mode 100644 index 55ccc9aa1c..0000000000 --- a/src/main/java/command/FindCommand.java +++ /dev/null @@ -1,40 +0,0 @@ -package command; - -import exception.InvalidCommandException; -import exception.InvalidInputException; -import exception.MissingArgumentException; -import parser.CommandParser; -import task.TaskList; -import ui.Reply; - -/** - * Class for Fnd command with its static implementation of its processes - */ -public class FindCommand { - private static Reply reply = Reply.init(); - private static TaskList tasks = TaskList.init(); - - /** - * Main process of Mark Command. - * Validates the input after the find keyword in the string and finds the task - * Returns to homepage otherwise. - * @param input String input containing the command and its arguments - * @throws MissingArgumentException if the arguments after the command is missing - * @throws InvalidCommandException if the command in the string is invalid - * @throws InvalidInputException if there is more than one keyword in the input - */ - public static void start(String input) throws - InvalidCommandException, - MissingArgumentException, - InvalidInputException { - - String argument = CommandParser.getCommandArguments(input); - - String[] split = argument.split(" "); - if (split.length > 1) { - throw new InvalidInputException(); - } - - tasks.findTask(argument); - } -} diff --git a/src/main/java/command/MarkCommand.java b/src/main/java/command/MarkCommand.java deleted file mode 100644 index b8ba401aaf..0000000000 --- a/src/main/java/command/MarkCommand.java +++ /dev/null @@ -1,40 +0,0 @@ -package command; - -import exception.InvalidCommandException; -import exception.MissingArgumentException; - -import parser.CommandParser; - -import task.TaskList; - -import ui.Reply; - -/** - * Class for Mark command with its static implementation of its processes - */ -public class MarkCommand { - private static Reply reply = Reply.init(); - private static TaskList tasks = TaskList.init(); - - /** - * Main process of Mark Command. - * Validates the input after the mark keyword in the string. Marks the task if it's a valid input. - * Returns to homepage otherwise. - * @param input String input containing the command and its arguments - * @throws MissingArgumentException if the arguments after the command is missing - * @throws InvalidCommandException if the command in the string is invalid - */ - public static void start(String input) throws - MissingArgumentException, - InvalidCommandException { - - String number = CommandParser.getCommandArguments(input); - try { - tasks.markDone(Integer.parseInt(number)); - } catch (NumberFormatException e ) { - reply.printDialog("Strictly type 1 number only"); - } catch (IndexOutOfBoundsException e) { - reply.printDialog("Index number does not exist in our list"); - } - } -} diff --git a/src/main/java/command/ToDoCommand.java b/src/main/java/command/ToDoCommand.java deleted file mode 100644 index a01b2aea4f..0000000000 --- a/src/main/java/command/ToDoCommand.java +++ /dev/null @@ -1,30 +0,0 @@ -package command; - -import task.TaskList; -import task.ToDo; - -import ui.Reply; - -import java.util.Scanner; - -/** - * Class for Todo command with its static implementation of its processes - */ -public class ToDoCommand { - private static Reply reply = Reply.init(); - private static TaskList tasks = TaskList.init(); - - /** - * Main process of todo Command. - * Prompts user to enter the task name before adding it to the list. - */ - public static void start() { - - Scanner scanner = new Scanner(System.in); - - reply.printDialog("So you want to add a ToDo task. Tell me what's the task."); - String desc = scanner.nextLine(); - - tasks.addTask(new ToDo(desc)); - } -} diff --git a/src/main/java/command/UnmarkCommand.java b/src/main/java/command/UnmarkCommand.java deleted file mode 100644 index 2bf5e7c72a..0000000000 --- a/src/main/java/command/UnmarkCommand.java +++ /dev/null @@ -1,45 +0,0 @@ -package command; - -import exception.InvalidCommandException; -import exception.MissingArgumentException; -import exception.InvalidInputException; - -import enums.Command; - -import parser.CommandParser; - -import task.TaskList; - -import ui.Reply; - -/** - * Class for Unmark command with its static implementation of its processes - */ -public class UnmarkCommand { - private static Reply reply = Reply.init(); - private static TaskList tasks = TaskList.init(); - - /** - * Main process of Unmark Command. - * Validates the input after the unmark keyword in the string. Unmarks the task if it's a valid input. - * Returns to homepage otherwise. - * @param input String input containing the command and its arguments - * @throws InvalidInputException if the arguments after command is invalid - * @throws MissingArgumentException if the arguments after the command is missing - * @throws InvalidCommandException if the command in the string is invalid - */ - public static void start(String input) throws - InvalidInputException, - MissingArgumentException, - InvalidCommandException { - - String number = CommandParser.getCommandArguments(input); - try { - tasks.unmarkDone(Integer.parseInt(number)); - } catch (NumberFormatException e ) { - reply.printDialog("Strictly type 1 number only"); - } catch (IndexOutOfBoundsException e) { - reply.printDialog("Index number does not exist in our list"); - } - } -} diff --git a/src/main/java/process/ComplexProcess.java b/src/main/java/process/ComplexProcess.java new file mode 100644 index 0000000000..1287432d4d --- /dev/null +++ b/src/main/java/process/ComplexProcess.java @@ -0,0 +1,2 @@ +package process;public class Process { +} diff --git a/src/main/java/process/Deadline.java b/src/main/java/process/Deadline.java new file mode 100644 index 0000000000..7abce00dcc --- /dev/null +++ b/src/main/java/process/Deadline.java @@ -0,0 +1,2 @@ +package process;public class Deadline { +} diff --git a/src/main/java/process/Delete.java b/src/main/java/process/Delete.java new file mode 100644 index 0000000000..c99e110315 --- /dev/null +++ b/src/main/java/process/Delete.java @@ -0,0 +1,2 @@ +package process;public class Delete { +} diff --git a/src/main/java/process/Event.java b/src/main/java/process/Event.java new file mode 100644 index 0000000000..e32e410400 --- /dev/null +++ b/src/main/java/process/Event.java @@ -0,0 +1,2 @@ +package process;public class Event { +} diff --git a/src/main/java/process/Find.java b/src/main/java/process/Find.java new file mode 100644 index 0000000000..5b7c857273 --- /dev/null +++ b/src/main/java/process/Find.java @@ -0,0 +1,2 @@ +package process;public class Find { +} diff --git a/src/main/java/process/Mark.java b/src/main/java/process/Mark.java new file mode 100644 index 0000000000..3b002ab27b --- /dev/null +++ b/src/main/java/process/Mark.java @@ -0,0 +1,2 @@ +package process;public class Mark { +} diff --git a/src/main/java/process/Process.java b/src/main/java/process/Process.java new file mode 100644 index 0000000000..3a3e2a62c2 --- /dev/null +++ b/src/main/java/process/Process.java @@ -0,0 +1,2 @@ +package process;public interface Process { +} diff --git a/src/main/java/process/SimpleProcess.java b/src/main/java/process/SimpleProcess.java new file mode 100644 index 0000000000..d984932d47 --- /dev/null +++ b/src/main/java/process/SimpleProcess.java @@ -0,0 +1,2 @@ +package process;public interface SimpleProcess { +} diff --git a/src/main/java/process/ToDo.java b/src/main/java/process/ToDo.java new file mode 100644 index 0000000000..80545373d2 --- /dev/null +++ b/src/main/java/process/ToDo.java @@ -0,0 +1,2 @@ +package process;public class ToDo { +} diff --git a/src/main/java/process/Unmark.java b/src/main/java/process/Unmark.java new file mode 100644 index 0000000000..858feefca2 --- /dev/null +++ b/src/main/java/process/Unmark.java @@ -0,0 +1,2 @@ +package process;public class Unmark { +} diff --git a/src/main/java/ui/DialogBox.java b/src/main/java/ui/DialogBox.java new file mode 100644 index 0000000000..1cef6bc09a --- /dev/null +++ b/src/main/java/ui/DialogBox.java @@ -0,0 +1,61 @@ +package chatbot.evan; + +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; + +/** + * 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 { + @FXML + private Label dialog; + @FXML + private ImageView displayPicture; + + 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(); + } + + 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() { + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + Collections.reverse(tmp); + getChildren().setAll(tmp); + setAlignment(Pos.TOP_LEFT); + } + + public static DialogBox getUserDialog(String text, Image img) { + return new DialogBox(text, img); + } + + public static DialogBox getEvanDialog(String text, Image img) { + var db = new DialogBox(text, img); + db.flip(); + return db; + } +} diff --git a/src/main/java/ui/Launcher.java b/src/main/java/ui/Launcher.java new file mode 100644 index 0000000000..e3f1e71837 --- /dev/null +++ b/src/main/java/ui/Launcher.java @@ -0,0 +1,12 @@ +package chatbot.evan; + +import javafx.application.Application; + +/** + * A launcher class to workaround classpath issues. + */ +public class Launcher { + public static void main(String[] args) { + Application.launch(Main.class, args); + } +} diff --git a/src/main/java/ui/Main.java b/src/main/java/ui/Main.java new file mode 100644 index 0000000000..7f681c97c5 --- /dev/null +++ b/src/main/java/ui/Main.java @@ -0,0 +1,31 @@ +package chatbot.evan; + +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 Evan evan = new Evan(); + + @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().setEvan(evan); + stage.show(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/src/main/java/ui/MainWindow.java b/src/main/java/ui/MainWindow.java new file mode 100644 index 0000000000..fe90cbb202 --- /dev/null +++ b/src/main/java/ui/MainWindow.java @@ -0,0 +1,51 @@ +package chatbot.evan; + +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 Evan evan; + + private Image userImage = new Image(this.getClass().getResourceAsStream("/images/alex.jpg")); + private Image evanImage = new Image(this.getClass().getResourceAsStream("/images/majesty.jpg")); + + @FXML + public void initialize() { + scrollPane.vvalueProperty().bind(dialogContainer.heightProperty()); + } + + public void setEvan(Evan d) { + evan = d; + } + + /** + * 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 = evan.getResponse(input); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(input, userImage), + DialogBox.getEvanDialog(response, evanImage) + ); + userInput.clear(); + } +} diff --git a/src/main/java/ui/Reply.java b/src/main/java/ui/Reply.java deleted file mode 100644 index ca6b99feec..0000000000 --- a/src/main/java/ui/Reply.java +++ /dev/null @@ -1,47 +0,0 @@ -package ui; - -/** - * Class for chatbot to create standardised replies with ui - */ -public class Reply { - private String indent = " "; - private String section = indent + "________________________________________\n"; - private static Reply reply = null; - - /** - * private constructor - */ - private Reply() { - //Print intro - System.out.println(section - + indent + "Hello! I'm chatbot.evan.Evan, your personal task planning assistant\n" - + indent + "What can I do for you?\n\n" - + indent + "List of available commands:\n" - + indent + "todo: create a new todo task\n" - + indent + "deadline: create a new deadline task\n" - + indent + "event: create a new event task\n" - + indent + "mark: mark a task as complete\n" - + indent + "unmark: mark a task as incomplete\n" - + indent + "delete: delete a task from the list\n" - + section); - } - - /** - * factory method to enforce one instance of the reply class - * @return an instance of Reply - */ - public static Reply init() { - if (reply == null) { - reply = new Reply(); - } - return reply; - } - - /** - * Takes in a dialog and prints it our in a standardised ui format - * @param dialog dialog of the chatbot reply - */ - public void printDialog(String dialog) { - System.out.println(section + indent + dialog + "\n" + section); - } -} diff --git a/src/main/resources/images/alex.jpg b/src/main/resources/images/alex.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6fcd799d81be3286e08c7815996849ef7f582578 GIT binary patch literal 14232 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

m3=AnE{PU; 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/images/majesty.jpg b/src/main/resources/images/majesty.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e8b4c90ba3384fd464168d9a134ee843821a8eab GIT binary patch literal 30041 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml new file mode 100644 index 0000000000..31fbc18d35 --- /dev/null +++ b/src/main/resources/view/DialogBox.fxml @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml new file mode 100644 index 0000000000..31fbc18d35 --- /dev/null +++ b/src/main/resources/view/MainWindow.fxml @@ -0,0 +1,14 @@ + + + + + + + + + + + From 19f01f9cc4fdcae5dd8d8637eca54350aeda32be Mon Sep 17 00:00:00 2001 From: You Wei Date: Wed, 6 Sep 2023 21:31:50 +0800 Subject: [PATCH 33/70] Add GUI --- src/main/java/chatbot/evan/Evan.java | 108 +++++++++--------- .../java/exception/InvalidDateException.java | 2 +- .../java/exception/InvalidInputException.java | 4 +- .../java/exception/InvalidTimeException.java | 5 +- .../exception/MissingArgumentException.java | 4 +- src/main/java/parser/CommandParser.java | 5 +- src/main/java/parser/Time.java | 14 ++- src/main/java/process/ComplexProcess.java | 6 +- src/main/java/process/Deadline.java | 54 ++++++++- src/main/java/process/Delete.java | 25 +++- src/main/java/process/Event.java | 83 +++++++++++++- src/main/java/process/Find.java | 27 ++++- src/main/java/process/Mark.java | 24 +++- src/main/java/process/Process.java | 5 +- src/main/java/process/SimpleProcess.java | 4 +- src/main/java/process/ToDo.java | 23 +++- src/main/java/process/Unmark.java | 24 +++- src/main/java/storage/Database.java | 83 ++++++-------- src/main/java/task/Deadlines.java | 8 +- src/main/java/task/Events.java | 10 +- src/main/java/task/TaskList.java | 73 ++++++++---- src/main/java/task/ToDo.java | 6 +- src/main/java/ui/DialogBox.java | 2 +- src/main/java/ui/Launcher.java | 2 +- src/main/java/ui/Main.java | 10 +- src/main/java/ui/MainWindow.java | 16 ++- src/main/resources/view/DialogBox.fxml | 24 ++-- src/main/resources/view/MainWindow.fxml | 25 ++-- src/test/java/command/MarkCommandTest.java | 45 ++++---- src/test/java/parser/CommandParserTest.java | 12 +- 30 files changed, 514 insertions(+), 219 deletions(-) diff --git a/src/main/java/chatbot/evan/Evan.java b/src/main/java/chatbot/evan/Evan.java index 9fdd72efe9..9afee32171 100644 --- a/src/main/java/chatbot/evan/Evan.java +++ b/src/main/java/chatbot/evan/Evan.java @@ -1,72 +1,72 @@ package chatbot.evan; -import java.util.Scanner; - -import command.*; - import enums.Command; - -import exception.InvalidInputException; import exception.InvalidCommandException; -import exception.MissingArgumentException; - -import parser.CommandParser; +import process.*; import task.TaskList; -import ui.Reply; - /** * Main class for the chatbot */ public class Evan { - private static TaskList tasks = TaskList.init(); - private static Reply reply = Reply.init(); + private ComplexProcess process = null; /** - * main method of the Main class Evan chatbot - * Continuously takes in user input and gives an appropriate response until the user enters "bye - * @param args unused + * You should have your own function to generate a response to user input. + * Replace this stub with your completed method. */ - public static void main(String[] args) { - //Start user interaction - Scanner scanner = new Scanner(System.in); - - while(true) { - try { - String input = scanner.nextLine().toLowerCase(); - - if (input.equals(Command.BYE.getCommand())) { - reply.printDialog("Bye. Hope to see you again soon!"); - return; - } else if (input.equals(Command.LIST.getCommand())) { - tasks.printTasks(); - } else if (input.equals(Command.TODO.getCommand())) { - ToDoCommand.start(); - } else if (input.equals(Command.DEADLINE.getCommand())) { - DeadlineCommand.start(); - } else if (input.equals(Command.EVENT.getCommand())) { - EventCommand.start(); - } else if (input.startsWith(Command.DELETE.getCommand())) { - DeleteCommand.start(input); - } else if (input.startsWith(Command.MARK.getCommand())) { - MarkCommand.start(input); - } else if (input.startsWith(Command.UNMARK.getCommand())) { - UnmarkCommand.start(input); - } else if (input.startsWith(Command.FIND.getCommand())) { - FindCommand.start(input); - } else { - throw new InvalidCommandException(); - } - } catch (InvalidInputException e) { - reply.printDialog(e.toString()); - } catch (MissingArgumentException e) { - reply.printDialog(e.toString()); - } catch (InvalidCommandException e) { - reply.printDialog(e.toString()); + public String getResponse(String input) { + if (process == null) { + if (input.equals(Command.BYE.getCommand())) { + return "Bye. Hope to see you again soon!"; + } else if (input.equals(Command.LIST.getCommand())) { + return tasks.printTasks(); + } else if (input.equals(Command.TODO.getCommand())) { + process = new ToDo(); + return process.start(); + } else if (input.equals(Command.DEADLINE.getCommand())) { + process = new Deadline(); + return process.start(); + } else if (input.equals(Command.EVENT.getCommand())) { + process = new Event(); + return process.start(); + } else if (input.startsWith(Command.DELETE.getCommand())) { + SimpleProcess simpleProcess = new Delete(); + return simpleProcess.processInput(input); + } else if (input.startsWith(Command.MARK.getCommand())) { + SimpleProcess simpleProcess = new Mark(); + return simpleProcess.processInput(input); + } else if (input.startsWith(Command.UNMARK.getCommand())) { + SimpleProcess simpleProcess = new Unmark(); + return simpleProcess.processInput(input); + } else if (input.startsWith(Command.FIND.getCommand())) { + SimpleProcess simpleProcess = new Find(); + return simpleProcess.processInput(input); + } else { + InvalidCommandException e = new InvalidCommandException(); + return e.toString(); + } + } else { + String response = process.processInput(input); + if (process.isComplete()) { + process = null; } + return response; + } } - -} \ No newline at end of file + public String getIntro() { + StringBuilder stringBuilder = new StringBuilder("Hello! I'm Evan, your personal task planning assistant\n") + .append("What can I do for you?\n\n") + .append("List of available commands:\n") + .append("todo: create a new todo task\n") + .append("deadline: create a new deadline task\n") + .append("event: create a new event task\n") + .append("mark: mark a task as complete\n") + .append("unmark: mark a task as incomplete\n") + .append("delete: delete a task from the list\n"); + return stringBuilder.toString(); + } +} diff --git a/src/main/java/exception/InvalidDateException.java b/src/main/java/exception/InvalidDateException.java index 9af4d26e5d..b88e73143e 100644 --- a/src/main/java/exception/InvalidDateException.java +++ b/src/main/java/exception/InvalidDateException.java @@ -11,6 +11,6 @@ public class InvalidDateException extends Exception { */ @Override public String toString() { - return "The given date is invalid. Returning to homepage..."; + return "The given date is invalid. Please type in a valid date."; } } diff --git a/src/main/java/exception/InvalidInputException.java b/src/main/java/exception/InvalidInputException.java index c973aad67c..da41c87519 100644 --- a/src/main/java/exception/InvalidInputException.java +++ b/src/main/java/exception/InvalidInputException.java @@ -3,7 +3,7 @@ /** * Checked Exception for the event where the input is not valid. */ -public class InvalidInputException extends Exception{ +public class InvalidInputException extends Exception { /** * Returns a string to inform users that the input is invalid @@ -11,6 +11,6 @@ public class InvalidInputException extends Exception{ */ @Override public String toString() { - return "Your given input is invalid. Returning to homepage..."; + return "Your given input is invalid. Please type an appropriate input."; } } diff --git a/src/main/java/exception/InvalidTimeException.java b/src/main/java/exception/InvalidTimeException.java index 6d4510ac7b..58c92b6a7d 100644 --- a/src/main/java/exception/InvalidTimeException.java +++ b/src/main/java/exception/InvalidTimeException.java @@ -3,7 +3,7 @@ /** * Checked Exception for the event where the input time is not a valid time. */ -public class InvalidTimeException extends Exception{ +public class InvalidTimeException extends Exception { /** * Returns a string to inform users that the time is invalid @@ -11,6 +11,7 @@ public class InvalidTimeException extends Exception{ */ @Override public String toString() { - return "The given date is invalid. Returning to homepage..."; + return "The given time is invalid. " + + "Please type in a valid time in the range between 0000 - 2359"; } } diff --git a/src/main/java/exception/MissingArgumentException.java b/src/main/java/exception/MissingArgumentException.java index a52f27050f..95906e4ea2 100644 --- a/src/main/java/exception/MissingArgumentException.java +++ b/src/main/java/exception/MissingArgumentException.java @@ -3,9 +3,9 @@ /** * Exception for the event where user input has missing arguments. */ -public class MissingArgumentException extends Exception{ +public class MissingArgumentException extends Exception { - String missingArgument; + private String missingArgument; /** * Constructor for MissingArgumentException diff --git a/src/main/java/parser/CommandParser.java b/src/main/java/parser/CommandParser.java index a2ec64488a..b33796d65d 100644 --- a/src/main/java/parser/CommandParser.java +++ b/src/main/java/parser/CommandParser.java @@ -1,9 +1,8 @@ package parser; import enums.Command; - -import exception.MissingArgumentException; import exception.InvalidCommandException; +import exception.MissingArgumentException; /** * Class to help parse complex strings from user input @@ -38,7 +37,7 @@ public static String getCommandArguments(String input) throws case UNMARK: throw new MissingArgumentException("task index number"); case DELETE: - throw new MissingArgumentException("task index number"); + throw new MissingArgumentException("task index number"); default: throw new InvalidCommandException(); } diff --git a/src/main/java/parser/Time.java b/src/main/java/parser/Time.java index 59f15de8f6..7a42901d13 100644 --- a/src/main/java/parser/Time.java +++ b/src/main/java/parser/Time.java @@ -1,12 +1,12 @@ package parser; -import exception.InvalidDateException; -import exception.InvalidTimeException; - import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; +import exception.InvalidDateException; +import exception.InvalidTimeException; + /** * Class for the parsing of a string of date/time data */ @@ -140,8 +140,9 @@ private static boolean hasSameDateFormat(String date, DateTimeFormatter formatte } /** - * Takes in a string containing date, validates if its a valid date and then returns the date in a standardized format - * @param date string containign the user input date + * Takes in a string containing date, validates if its a valid date and then + * returns the date in a standardized format + * @param date string containing the user input date * @return date string in a standardised format * @throws InvalidDateException if date is an invalid date */ @@ -152,7 +153,8 @@ public static String formatDate(String date) throws InvalidDateException { } /** - * Takes in a string containing time, validates if its a valid time and then returns the date/time in a standardized format + * Takes in a string containing time, validates if its a valid time and then + * returns the date/time in a standardized format * @param date string date input by user * @param time string time input by user * @return date and time string in standardised format diff --git a/src/main/java/process/ComplexProcess.java b/src/main/java/process/ComplexProcess.java index 1287432d4d..4e45639776 100644 --- a/src/main/java/process/ComplexProcess.java +++ b/src/main/java/process/ComplexProcess.java @@ -1,2 +1,6 @@ -package process;public class Process { +package process; + +public interface ComplexProcess extends Process { + public String start(); + public boolean isComplete(); } diff --git a/src/main/java/process/Deadline.java b/src/main/java/process/Deadline.java index 7abce00dcc..8e1405727f 100644 --- a/src/main/java/process/Deadline.java +++ b/src/main/java/process/Deadline.java @@ -1,2 +1,54 @@ -package process;public class Deadline { +package process; + +import exception.InvalidDateException; +import exception.InvalidTimeException; +import parser.Time; +import task.Deadlines; +import task.TaskList; + +public class Deadline implements ComplexProcess { + private TaskList tasks = TaskList.init(); + private String name = null; + private String deadline = null; + private boolean isComplete = false; + + @Override + public String start() { + return "So you want to add a task with deadline. Tell me what's the task."; + } + + @Override + public boolean isComplete() { + return isComplete; + } + + @Override + public String processInput(String input) { + if (name == null) { + name = input; + return "Now indicate the deadline date."; + } else if (deadline == null) { + try { + deadline = Time.formatDate(input); + return "Indicate a start time in ranging from 0000 - 2359. " + + "You may enter 'Skip' to not indicate a time"; + } catch (InvalidDateException e) { + return e.toString(); + } + } else { + if (!input.toLowerCase().equals(enums.Command.SKIP.getCommand())) { + try { + deadline = Time.formatTime(deadline, input); + + } catch (InvalidTimeException | InvalidDateException e) { + return e.toString(); + } catch (NumberFormatException e) { + return "Non-numerical characters detected. Please enter numbers only. " + + "Returning to homepage..."; + } + } + isComplete = true; + return tasks.addTask(new Deadlines(name, deadline)); + } + } } diff --git a/src/main/java/process/Delete.java b/src/main/java/process/Delete.java index c99e110315..655a3ce5ea 100644 --- a/src/main/java/process/Delete.java +++ b/src/main/java/process/Delete.java @@ -1,2 +1,25 @@ -package process;public class Delete { +package process; + +import exception.InvalidCommandException; +import exception.MissingArgumentException; +import parser.CommandParser; +import task.TaskList; + +public class Delete implements SimpleProcess { + private TaskList tasks = TaskList.init(); + @Override + public String processInput(String input) { + try { + String number = CommandParser.getCommandArguments(input); + return tasks.deleteTask(Integer.parseInt(number)); + } catch (MissingArgumentException e) { + return e.toString(); + } catch (InvalidCommandException e){ + return e.toString(); + } catch (NumberFormatException e) { + return " Strictly type 1 number only"; + } catch (IndexOutOfBoundsException e) { + return " Index number does not exist in our list"; + } + } } diff --git a/src/main/java/process/Event.java b/src/main/java/process/Event.java index e32e410400..f5e910fe63 100644 --- a/src/main/java/process/Event.java +++ b/src/main/java/process/Event.java @@ -1,2 +1,83 @@ -package process;public class Event { +package process; + +import exception.InvalidDateException; +import exception.InvalidTimeException; +import parser.Time; +import task.Events; +import task.TaskList; + +public class Event implements ComplexProcess { + private TaskList tasks = TaskList.init(); + private String name = null; + private String from = null; + private String to = null; + private boolean isCheckingTime = false; + private boolean isComplete = false; + + @Override + public String processInput(String input) { + if (name == null) { + name = input; + return "Now indicate the start date."; + } else if (from == null) { + try { + from = Time.formatDate(input); + isCheckingTime = true; + } catch (InvalidDateException e) { + return e.toString(); + } + return "Indicate a start time in ranging from 0000 - 2359. " + + "You may enter 'Skip' to not indicate a time"; + } else if (to == null && isCheckingTime) { + if (input.toLowerCase().equals(enums.Command.SKIP.getCommand())) { + isCheckingTime = false; + } else { + try { + from = Time.formatTime(from, input); + isCheckingTime = false; + } catch (InvalidTimeException | InvalidDateException e) { + return e.toString(); + } catch (NumberFormatException e) { + return "Non-numerical characters detected. Please enter numbers only. " + + "Returning to homepage..."; + } + } + return "Now indicate the end date."; + } else if (to == null) { + try { + to = Time.formatDate(input); + isCheckingTime = true; + } catch (InvalidDateException e) { + return e.toString(); + } + return "Indicate a start time in ranging from 0000 - 2359. " + + "You may enter 'Skip' to not indicate a time"; + } else if (isCheckingTime) { + if (input.toLowerCase().equals(enums.Command.SKIP.getCommand())) { + isCheckingTime = false; + } else { + try { + to = Time.formatTime(to, input); + isCheckingTime = false; + } catch (InvalidTimeException | InvalidDateException e) { + return e.toString(); + } catch (NumberFormatException e) { + return "Non-numerical characters detected. Please enter numbers only. " + + "Returning to homepage..."; + } + } + } + isComplete = true; + return tasks.addTask(new Events(name, from, to)); + } + + @Override + public String start() { + return "So you want to add a event task. Tell me what's the task."; + } + + @Override + public boolean isComplete() { + return isComplete; + } } diff --git a/src/main/java/process/Find.java b/src/main/java/process/Find.java index 5b7c857273..e651a60891 100644 --- a/src/main/java/process/Find.java +++ b/src/main/java/process/Find.java @@ -1,2 +1,27 @@ -package process;public class Find { +package process; + +import exception.InvalidCommandException; +import exception.InvalidInputException; +import exception.MissingArgumentException; +import parser.CommandParser; +import task.TaskList; + +public class Find implements SimpleProcess { + private TaskList tasks = TaskList.init(); + + @Override + public String processInput(String input) { + try { + String argument = CommandParser.getCommandArguments(input); + + String[] split = argument.split(" "); + if (split.length > 1) { + throw new InvalidInputException(); + } + + return tasks.findTask(argument); + } catch (MissingArgumentException | InvalidCommandException | InvalidInputException e) { + return e.toString(); + } + } } diff --git a/src/main/java/process/Mark.java b/src/main/java/process/Mark.java index 3b002ab27b..4e353baf47 100644 --- a/src/main/java/process/Mark.java +++ b/src/main/java/process/Mark.java @@ -1,2 +1,24 @@ -package process;public class Mark { +package process; + +import exception.InvalidCommandException; +import exception.MissingArgumentException; +import parser.CommandParser; +import task.TaskList; + +public class Mark implements SimpleProcess { + private TaskList tasks = TaskList.init(); + + @Override + public String processInput(String input) { + try { + String number = CommandParser.getCommandArguments(input); + return tasks.markDone(Integer.parseInt(number)); + } catch (NumberFormatException e) { + return "Strictly type 1 number only"; + } catch (IndexOutOfBoundsException e) { + return "Index number does not exist in our list"; + } catch (MissingArgumentException | InvalidCommandException e) { + return e.toString(); + } + } } diff --git a/src/main/java/process/Process.java b/src/main/java/process/Process.java index 3a3e2a62c2..b2dc7a8531 100644 --- a/src/main/java/process/Process.java +++ b/src/main/java/process/Process.java @@ -1,2 +1,5 @@ -package process;public interface Process { +package process; + +public interface Process { + public String processInput(String input); } diff --git a/src/main/java/process/SimpleProcess.java b/src/main/java/process/SimpleProcess.java index d984932d47..6abd395c26 100644 --- a/src/main/java/process/SimpleProcess.java +++ b/src/main/java/process/SimpleProcess.java @@ -1,2 +1,4 @@ -package process;public interface SimpleProcess { +package process; + +public interface SimpleProcess extends Process { } diff --git a/src/main/java/process/ToDo.java b/src/main/java/process/ToDo.java index 80545373d2..0da7bf2333 100644 --- a/src/main/java/process/ToDo.java +++ b/src/main/java/process/ToDo.java @@ -1,2 +1,23 @@ -package process;public class ToDo { +package process; + +import task.TaskList; + +public class ToDo implements ComplexProcess { + private TaskList tasks = TaskList.init(); + private boolean isComplete = false; + @Override + public String start() { + return "So you want to add a ToDo task. Tell me what's the task."; + } + + @Override + public boolean isComplete() { + return isComplete; + } + + @Override + public String processInput(String input) { + isComplete = true; + return tasks.addTask(new task.ToDo(input)); + } } diff --git a/src/main/java/process/Unmark.java b/src/main/java/process/Unmark.java index 858feefca2..fa479b934d 100644 --- a/src/main/java/process/Unmark.java +++ b/src/main/java/process/Unmark.java @@ -1,2 +1,24 @@ -package process;public class Unmark { +package process; + +import exception.InvalidCommandException; +import exception.MissingArgumentException; +import parser.CommandParser; +import task.TaskList; + +public class Unmark implements SimpleProcess { + private TaskList tasks = TaskList.init(); + + @Override + public String processInput(String input) { + try { + String number = CommandParser.getCommandArguments(input); + return tasks.unmarkDone(Integer.parseInt(number)); + } catch (NumberFormatException e) { + return "Strictly type 1 number only"; + } catch (IndexOutOfBoundsException e) { + return "Index number does not exist in our list"; + } catch (MissingArgumentException | InvalidCommandException e) { + return e.toString(); + } + } } diff --git a/src/main/java/storage/Database.java b/src/main/java/storage/Database.java index 331ef21f39..a83ad1b470 100644 --- a/src/main/java/storage/Database.java +++ b/src/main/java/storage/Database.java @@ -1,14 +1,17 @@ package storage; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; + import enums.Command; -import task.Task; import task.Deadlines; -import task.ToDo; import task.Events; -import ui.Reply; - -import java.io.*; -import java.util.ArrayList; +import task.Task; +import task.ToDo; /** * Class to interface with the text file storing the user task records @@ -18,64 +21,48 @@ public class Database { * Takes in a list of tasks and overwrites it onto the text file * @param list list of tasks */ - public static void save(ArrayList list) { + public static void save(ArrayList list) throws IOException { File file = new File("data/tasklist.txt"); - try { - FileWriter fileToWrite = new FileWriter(file); - Task[] tasks = list.toArray(new Task[0]); - - for (int i = 0; i < tasks.length; i++) { - fileToWrite.write(tasks[i].dataFormat()); - fileToWrite.write(System.lineSeparator()); - } + FileWriter fileToWrite = new FileWriter(file); + Task[] tasks = list.toArray(new Task[0]); - fileToWrite.close(); - } catch (IOException e) { - Reply reply = Reply.init(); - reply.printDialog("Oops! Sorry! There is an issue with the file database. " + - "You are required to delete the file and recreate one with the same name"); + for (int i = 0; i < tasks.length; i++) { + fileToWrite.write(tasks[i].dataFormat()); + fileToWrite.write(System.lineSeparator()); } + + fileToWrite.close(); } /** * Retrieves the list of task records from the text file and returns it in an arraylist * @return list of tasks saved in the text file */ - public static ArrayList loadData() { + public static ArrayList loadData() throws IOException, ArrayIndexOutOfBoundsException { File file = new File("data/tasklist.txt"); ArrayList list = new ArrayList<>(); - try { - FileReader fileReader = new FileReader(file); - BufferedReader fileToRead = new BufferedReader(fileReader); - String nextLine = fileToRead.readLine(); + FileReader fileReader = new FileReader(file); + BufferedReader fileToRead = new BufferedReader(fileReader); + String nextLine = fileToRead.readLine(); - while (nextLine != null) { - String[] data = nextLine.split("/"); - String taskType = data[0]; - boolean status = data[1].equals("true"); - if (taskType.equals(Command.TODO.getCommand())) { - list.add(new ToDo(status, data[2])); - } else if (taskType.equals(Command.DEADLINE.getCommand())) { - list.add(new Deadlines(status, data[2], data[3])); - } else if (taskType.equals(Command.EVENT.getCommand())) { - list.add(new Events(status, data[2], data[3], data[4])); - } - nextLine = fileToRead.readLine(); + while (nextLine != null) { + String[] data = nextLine.split("/"); + String taskType = data[0]; + boolean status = data[1].equals("true"); + if (taskType.equals(Command.TODO.getCommand())) { + list.add(new ToDo(status, data[2])); + } else if (taskType.equals(Command.DEADLINE.getCommand())) { + list.add(new Deadlines(status, data[2], data[3])); + } else if (taskType.equals(Command.EVENT.getCommand())) { + list.add(new Events(status, data[2], data[3], data[4])); } - - fileReader.close(); - fileToRead.close(); - - } catch (IOException e) { - Reply reply = Reply.init(); - reply.printDialog("Oops! Sorry! There is an issue with the file database. " + - "You are required to delete the file and recreate one with the same name."); - } catch (ArrayIndexOutOfBoundsException e) { - Reply reply = Reply.init(); - reply.printDialog("Oops! Sorry! There is an issue with the data formatting in the database."); + nextLine = fileToRead.readLine(); } + + fileReader.close(); + fileToRead.close(); return list; } } diff --git a/src/main/java/task/Deadlines.java b/src/main/java/task/Deadlines.java index f3f7171d7a..bf96774f97 100644 --- a/src/main/java/task/Deadlines.java +++ b/src/main/java/task/Deadlines.java @@ -42,9 +42,9 @@ public String toString() { */ @Override public String dataFormat() { - return "deadline/" + - super.isDone.toString() + "/" + - super.description + "/" + - this.by; + return "deadline/" + + super.isDone.toString() + "/" + + super.description + "/" + + this.by; } } diff --git a/src/main/java/task/Events.java b/src/main/java/task/Events.java index 0d6445c83e..814d648840 100644 --- a/src/main/java/task/Events.java +++ b/src/main/java/task/Events.java @@ -47,10 +47,10 @@ public String toString() { */ @Override public String dataFormat() { - return "event/" + - super.isDone.toString() + "/" + - super.description + "/" + - this.from + "/" + - this.to; + return "event/" + + super.isDone.toString() + + "/" + super.description + "/" + + this.from + "/" + + this.to; } } diff --git a/src/main/java/task/TaskList.java b/src/main/java/task/TaskList.java index 9ad6135ab0..f1d3e8e036 100644 --- a/src/main/java/task/TaskList.java +++ b/src/main/java/task/TaskList.java @@ -1,25 +1,29 @@ package task; -import ui.Reply; +import java.io.IOException; +import java.util.ArrayList; import storage.Database; -import java.util.ArrayList; -import java.util.function.Consumer; - /** * Class for manipulating the list of tasks */ public class TaskList { private static TaskList obj; private ArrayList list; - private final Reply reply = Reply.init(); /** * private constructor */ private TaskList() { - list = Database.loadData(); + try { + list = Database.loadData(); + } catch (IOException e) { + e.printStackTrace(); + } catch (ArrayIndexOutOfBoundsException e) { + e.printStackTrace(); + } + } /** @@ -37,9 +41,15 @@ public static TaskList init() { * Takes in a task, adds it into the list and saves it into the database * @param task task to be added */ - public void addTask(Task task) { + public String addTask(Task task) { list.add(task); - Database.save(this.list); + + try { + Database.save(list); + } catch (IOException e) { + return "Oops! Sorry! There is an issue with the file database. " + + "You are required to delete the file and recreate one with the same name."; + } StringBuilder dialog = new StringBuilder("Got it. I've added this task:\n ") .append(task) @@ -47,13 +57,13 @@ public void addTask(Task task) { .append("Now you have ") .append(list.size()) .append(" tasks in the list."); - reply.printDialog(dialog.toString()); + return dialog.toString(); } /** * Prints all the tasks in the list */ - public void printTasks() { + public String printTasks() { Task[] tasks = list.toArray(new Task[0]); StringBuilder dialog = new StringBuilder("Here are the tasks in your list:\n "); @@ -71,53 +81,68 @@ public void printTasks() { } } - reply.printDialog(dialog.toString()); + return dialog.toString(); } /** * Takes in an integer index and marks the task associated with the index as done * @param index index of the task */ - public void markDone(int index) { + public String markDone(int index) { Task element = list.get(index - 1); element.markAsDone(); - Database.save(list); + try { + Database.save(list); + } catch (IOException e) { + return "Oops! Sorry! There is an issue with the file database. " + + "You are required to delete the file and recreate one with the same name."; + } StringBuilder dialog = new StringBuilder(); dialog.append("Nice! I've marked this task as done:\n") .append(" ") .append(element); - reply.printDialog(dialog.toString()); + return dialog.toString(); } /** * Takes in an integer index and marks the task associated with the index as not done * @param index index of the task */ - public void unmarkDone(int index) { + public String unmarkDone(int index) { Task element = list.get(index - 1); element.markAsNotDone(); - Database.save(list); + try { + Database.save(list); + } catch (IOException e) { + return "Oops! Sorry! There is an issue with the file database. " + + "You are required to delete the file and recreate one with the same name."; + } StringBuilder dialog = new StringBuilder(); dialog.append("OK! I've marked this task as not done yet:\n") .append(" ") .append(element); - reply.printDialog(dialog.toString()); + return dialog.toString(); } /** * Takes in an integer index and deletes the task associated with the index * @param index index of the task */ - public void deleteTask(int index) { + public String deleteTask(int index) { Task element = list.get(index - 1); list.remove(index - 1); - Database.save(list); + try { + Database.save(list); + } catch (IOException e) { + return "Oops! Sorry! There is an issue with the file database. " + + "You are required to delete the file and recreate one with the same name."; + } StringBuilder dialog = new StringBuilder(); dialog.append("Noted. I've removed this task:\n") @@ -127,16 +152,16 @@ public void deleteTask(int index) { .append(" Now you have ") .append(list.size()) .append(" tasks in the list."); - reply.printDialog(dialog.toString()); + return dialog.toString(); } /** * Finds all tasks which contains the keyword and prints it * @param keyword */ - public void findTask(String keyword) { - StringBuilder dialog = new StringBuilder("Here are the matching tasks in your list with its correct " + - "corresponding index numbers: \n "); + public String findTask(String keyword) { + StringBuilder dialog = new StringBuilder("Here are the matching tasks in your list with its correct " + + "corresponding index numbers: \n "); Task[] tasks = list.toArray(new Task[0]); @@ -151,6 +176,6 @@ public void findTask(String keyword) { .append("\n "); } } - reply.printDialog(dialog.toString()); + return dialog.toString(); } } diff --git a/src/main/java/task/ToDo.java b/src/main/java/task/ToDo.java index 51d85c0042..683be4798f 100644 --- a/src/main/java/task/ToDo.java +++ b/src/main/java/task/ToDo.java @@ -37,8 +37,8 @@ public String toString() { */ @Override public String dataFormat() { - return "todo/" + - isDone.toString() + "/" + - description; + return "todo/" + + isDone.toString() + "/" + + description; } } diff --git a/src/main/java/ui/DialogBox.java b/src/main/java/ui/DialogBox.java index 1cef6bc09a..1973e704c9 100644 --- a/src/main/java/ui/DialogBox.java +++ b/src/main/java/ui/DialogBox.java @@ -1,4 +1,4 @@ -package chatbot.evan; +package ui; import java.io.IOException; import java.util.Collections; diff --git a/src/main/java/ui/Launcher.java b/src/main/java/ui/Launcher.java index e3f1e71837..6982c7c6c5 100644 --- a/src/main/java/ui/Launcher.java +++ b/src/main/java/ui/Launcher.java @@ -1,4 +1,4 @@ -package chatbot.evan; +package ui; import javafx.application.Application; diff --git a/src/main/java/ui/Main.java b/src/main/java/ui/Main.java index 7f681c97c5..5a0b8f18ef 100644 --- a/src/main/java/ui/Main.java +++ b/src/main/java/ui/Main.java @@ -1,7 +1,8 @@ -package chatbot.evan; +package ui; import java.io.IOException; +import chatbot.evan.Evan; import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; @@ -22,8 +23,13 @@ public void start(Stage stage) { AnchorPane ap = fxmlLoader.load(); Scene scene = new Scene(ap); stage.setScene(scene); - fxmlLoader.getController().setEvan(evan); + MainWindow window = fxmlLoader.getController(); + window.setEvan(evan); + window.onStart(); stage.show(); + + //Initialise introductory message + } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/ui/MainWindow.java b/src/main/java/ui/MainWindow.java index fe90cbb202..18eb1e4d25 100644 --- a/src/main/java/ui/MainWindow.java +++ b/src/main/java/ui/MainWindow.java @@ -1,5 +1,6 @@ -package chatbot.evan; +package ui; +import chatbot.evan.Evan; import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.ScrollPane; @@ -7,6 +8,8 @@ import javafx.scene.image.Image; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.VBox; +import ui.DialogBox; + /** * Controller for MainWindow. Provides the layout for the other controls. */ @@ -22,8 +25,8 @@ public class MainWindow extends AnchorPane { private Evan evan; - private Image userImage = new Image(this.getClass().getResourceAsStream("/images/alex.jpg")); - private Image evanImage = new Image(this.getClass().getResourceAsStream("/images/majesty.jpg")); + private Image userImage = new Image(this.getClass().getResourceAsStream("/images/user.png")); + private Image evanImage = new Image(this.getClass().getResourceAsStream("/images/user.png")); @FXML public void initialize() { @@ -48,4 +51,11 @@ private void handleUserInput() { ); userInput.clear(); } + + public void onStart() { + String message = evan.getIntro(); + dialogContainer.getChildren().addAll( + DialogBox.getEvanDialog(message, evanImage) + ); + } } diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml index 31fbc18d35..59d16ac91a 100644 --- a/src/main/resources/view/DialogBox.fxml +++ b/src/main/resources/view/DialogBox.fxml @@ -1,14 +1,16 @@ - - - - - + + + + - - - + + + + + + + diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml index 31fbc18d35..40813675a0 100644 --- a/src/main/resources/view/MainWindow.fxml +++ b/src/main/resources/view/MainWindow.fxml @@ -1,14 +1,19 @@ - - - - - - - + + + + + + + + +