From 28ad2b878f1a21d03879e81cd441d0175d89e6b1 Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 001/112] 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 002/112] 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 e8b3258e2a3352a4f1bfc285be5eefd0815a865a Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 18:46:12 +0800 Subject: [PATCH 003/112] chore(gitignore): Trim gitignore --- .gitignore | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2873e189e1..270e89fc9f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ # IDEA files -/.idea/ /out/ /*.iml @@ -8,10 +7,5 @@ /build/ src/main/resources/docs/ -# MacOS custom attributes files created by Finder -.DS_Store -*.iml -bin/ - /text-ui-test/ACTUAL.TXT text-ui-test/EXPECTED-UNIX.TXT From cc7b41d7f3cee8d50261207ae57747bb70939f5f Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 18:48:36 +0800 Subject: [PATCH 004/112] chore(md): Delete CONTRIBUTORS.md --- CONTRIBUTORS.md | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 CONTRIBUTORS.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md deleted file mode 100644 index 8e359a0145..0000000000 --- a/CONTRIBUTORS.md +++ /dev/null @@ -1,9 +0,0 @@ -# Contributors - -Display | Name | Github Profile | Homepage ----|:---:|:---:|:---: -![](https://avatars0.githubusercontent.com/u/22460123?s=100) | Jeffry Lum | [Github](https://github.com/j-lum/) | [Homepage](https://se.kasugano.moe) -![](https://avatars0.githubusercontent.com/u/1673303?s=100) | Damith C. Rajapakse | [Github](https://github.com/damithc/) | [Homepage](https://www.comp.nus.edu.sg/~damithch/) -# I would like to join this list. How can I help the project - -For more information, please refer to our [contributor's guide](https://oss-generic.github.io/process/). From fb5add2149b0c186eb2549b25cb6174c36bf5303 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 18:50:59 +0800 Subject: [PATCH 005/112] feat(): Rename Duke to Cloud --- README.md | 25 ++----------------------- src/main/java/{Duke.java => Cloud.java} | 2 +- text-ui-test/runtest.bat | 2 +- text-ui-test/runtest.sh | 4 ++-- 4 files changed, 6 insertions(+), 27 deletions(-) rename src/main/java/{Duke.java => Cloud.java} (94%) diff --git a/README.md b/README.md index 8715d4d915..4ac51761cc 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,3 @@ -# Duke project template +# The Cloud Chatbot -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. - -## Setting up in Intellij - -Prerequisites: JDK 11, update Intellij to the most recent version. - -1. Open Intellij (if you are not in the welcome screen, click `File` > `Close Project` to close the existing project first) -1. Open the project into Intellij as follows: - 1. Click `Open`. - 1. Select the project directory, and click `OK`. - 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: - ``` - Hello from - ____ _ - | _ \ _ _| | _____ - | | | | | | | |/ / _ \ - | |_| | |_| | < __/ - |____/ \__,_|_|\_\___| - ``` +This is a chatbot named **Cloud**. The name has no relation to the actual cloud. diff --git a/src/main/java/Duke.java b/src/main/java/Cloud.java similarity index 94% rename from src/main/java/Duke.java rename to src/main/java/Cloud.java index 5d313334cc..66a6e7cb18 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Cloud.java @@ -1,4 +1,4 @@ -public class Duke { +public class Cloud { public static void main(String[] args) { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 0873744649..da1559073f 100644 --- a/text-ui-test/runtest.bat +++ b/text-ui-test/runtest.bat @@ -15,7 +15,7 @@ IF ERRORLEVEL 1 ( REM no error here, errorlevel == 0 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT -java -classpath ..\bin Duke < input.txt > ACTUAL.TXT +java -classpath ..\bin Cloud < input.txt > ACTUAL.TXT REM compare the output to the expected output FC ACTUAL.TXT EXPECTED.TXT diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh index c9ec870033..d05cdfd2ff 100644 --- a/text-ui-test/runtest.sh +++ b/text-ui-test/runtest.sh @@ -20,7 +20,7 @@ then fi # run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT -java -classpath ../bin Duke < input.txt > ACTUAL.TXT +java -classpath ../bin Cloud < input.txt > ACTUAL.TXT # convert to UNIX format cp EXPECTED.TXT EXPECTED-UNIX.TXT @@ -35,4 +35,4 @@ then else echo "Test result: FAILED" exit 1 -fi \ No newline at end of file +fi From 0b333602b1969714ac150ae0fc26de690b1b2f85 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 19:10:48 +0800 Subject: [PATCH 006/112] feat(Cloud): Change default text to greeting/farewell --- src/main/java/Cloud.java | 10 ---------- src/main/java/cloud/main/Cloud.java | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 src/main/java/Cloud.java create mode 100644 src/main/java/cloud/main/Cloud.java diff --git a/src/main/java/Cloud.java b/src/main/java/Cloud.java deleted file mode 100644 index 66a6e7cb18..0000000000 --- a/src/main/java/Cloud.java +++ /dev/null @@ -1,10 +0,0 @@ -public class Cloud { - public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); - } -} diff --git a/src/main/java/cloud/main/Cloud.java b/src/main/java/cloud/main/Cloud.java new file mode 100644 index 0000000000..859c82bfd8 --- /dev/null +++ b/src/main/java/cloud/main/Cloud.java @@ -0,0 +1,18 @@ +package cloud.main; + +/** + * The chatbot's main class. + */ +public class Cloud { + public static void main(String[] args) { + Cloud.line(); + System.out.println("Cloud, online."); + Cloud.line(); + System.out.println("\\o"); + Cloud.line(); + } + + public static void line() { + System.out.println("-".repeat(50)); + } +} From 1d9a846e920e3c35aa1bd70a187bd6bc3ae263f1 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 19:34:05 +0800 Subject: [PATCH 007/112] feat(Cloud): Command handler, docs, bye command, echo unknown commands --- src/main/java/cloud/main/Cloud.java | 61 +++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 8 deletions(-) diff --git a/src/main/java/cloud/main/Cloud.java b/src/main/java/cloud/main/Cloud.java index 859c82bfd8..7fb4e2352c 100644 --- a/src/main/java/cloud/main/Cloud.java +++ b/src/main/java/cloud/main/Cloud.java @@ -1,18 +1,63 @@ package cloud.main; +import java.util.Scanner; + + + /** * The chatbot's main class. */ public class Cloud { - public static void main(String[] args) { - Cloud.line(); - System.out.println("Cloud, online."); - Cloud.line(); - System.out.println("\\o"); - Cloud.line(); + /** The scanner used to read commands */ + private static Scanner SCANNER = new Scanner(System.in); + + /** + * Handles all String commands. + * + * @param command The command to handle. + */ + private static void handle(String command) { + switch (command) { + case "bye": + Cloud.say("\\o"); + System.exit(0); + break; + default: + Cloud.say( + String.format( + "Unknown command: \"%s\"", + command + ) + ); + break; + } } - public static void line() { - System.out.println("-".repeat(50)); + /** + * Prints the specified text as output. + * + * @param text The text to print. + */ + private static void say(String text) { + System.out.println( + String.format( + ">>> %s", + text + ) + ); + } + + /** + * The chatbot's main method. + */ + public static void main(String[] args) { + Cloud.say("Cloud online. Now listening for commands."); + + while (true) { + System.out.println(""); + + String command = Cloud.SCANNER.nextLine(); + Cloud.handle(command); + } } } From 304ec50cc291a8d981bbbf2a17b8e516c5617276 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 19:46:27 +0800 Subject: [PATCH 008/112] feat(Cloud): Commands to add TODOs, list TODOs --- src/main/java/cloud/main/Cloud.java | 49 +++++++++++++++++++---------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/src/main/java/cloud/main/Cloud.java b/src/main/java/cloud/main/Cloud.java index 7fb4e2352c..36c9eb886f 100644 --- a/src/main/java/cloud/main/Cloud.java +++ b/src/main/java/cloud/main/Cloud.java @@ -1,5 +1,7 @@ package cloud.main; +import java.util.ArrayList; +import java.util.List; import java.util.Scanner; @@ -8,25 +10,44 @@ * The chatbot's main class. */ public class Cloud { - /** The scanner used to read commands */ + /** The scanner used to read inputs */ private static Scanner SCANNER = new Scanner(System.in); + /** The list of stored user TODOs */ + private static List LIST = new ArrayList<>(); + /** - * Handles all String commands. + * Handles all String inputs. * - * @param command The command to handle. + * @param input The String to handle. */ - private static void handle(String command) { - switch (command) { + private static void handle(String input) { + switch (input) { + case "list": + // Lists TODOs + Cloud.say("Your TODO list:"); + for (int i = 0; i < Cloud.LIST.size(); i++) { + Cloud.say( + String.format( + "%d) %s", + i + 1, + Cloud.LIST.get(i) + ) + ); + } + break; case "bye": + // Ends chat session Cloud.say("\\o"); System.exit(0); break; default: + // Stores new TODO + Cloud.LIST.add(input); Cloud.say( String.format( - "Unknown command: \"%s\"", - command + "Added TODO: \"%s\"", + input ) ); break; @@ -39,25 +60,21 @@ private static void handle(String command) { * @param text The text to print. */ private static void say(String text) { - System.out.println( - String.format( - ">>> %s", - text - ) - ); + System.out.println(text); } /** * The chatbot's main method. */ public static void main(String[] args) { - Cloud.say("Cloud online. Now listening for commands."); + Cloud.say("Cloud online."); while (true) { System.out.println(""); + System.out.print(">>> "); - String command = Cloud.SCANNER.nextLine(); - Cloud.handle(command); + String input = Cloud.SCANNER.nextLine(); + Cloud.handle(input); } } } From 2b43d5a5c68e6e29b694d5df88acad1f7dc6cff5 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 19:59:53 +0800 Subject: [PATCH 009/112] feat(): Trim private docs, create Todo class --- src/main/java/cloud/main/Cloud.java | 28 ++++++++-------------- src/main/java/cloud/main/Todo.java | 36 +++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 src/main/java/cloud/main/Todo.java diff --git a/src/main/java/cloud/main/Cloud.java b/src/main/java/cloud/main/Cloud.java index 36c9eb886f..e30db89a85 100644 --- a/src/main/java/cloud/main/Cloud.java +++ b/src/main/java/cloud/main/Cloud.java @@ -10,28 +10,20 @@ * The chatbot's main class. */ public class Cloud { - /** The scanner used to read inputs */ private static Scanner SCANNER = new Scanner(System.in); + private static List TODOS = new ArrayList<>(); - /** The list of stored user TODOs */ - private static List LIST = new ArrayList<>(); - - /** - * Handles all String inputs. - * - * @param input The String to handle. - */ private static void handle(String input) { switch (input) { case "list": // Lists TODOs Cloud.say("Your TODO list:"); - for (int i = 0; i < Cloud.LIST.size(); i++) { + for (int i = 0; i < Cloud.TODOS.size(); i++) { Cloud.say( String.format( "%d) %s", i + 1, - Cloud.LIST.get(i) + Cloud.TODOS.get(i).getDescription() ) ); } @@ -43,10 +35,13 @@ private static void handle(String input) { break; default: // Stores new TODO - Cloud.LIST.add(input); + Cloud.TODOS.add( + new Todo(input) + ); Cloud.say( String.format( - "Added TODO: \"%s\"", + "Added TODO #%d: \"%s\"", + Cloud.TODOS.size(), input ) ); @@ -54,17 +49,14 @@ private static void handle(String input) { } } - /** - * Prints the specified text as output. - * - * @param text The text to print. - */ private static void say(String text) { System.out.println(text); } /** * The chatbot's main method. + * + * @param args Java arguments. */ public static void main(String[] args) { Cloud.say("Cloud online."); diff --git a/src/main/java/cloud/main/Todo.java b/src/main/java/cloud/main/Todo.java new file mode 100644 index 0000000000..6df3110869 --- /dev/null +++ b/src/main/java/cloud/main/Todo.java @@ -0,0 +1,36 @@ +package cloud.main; + + + +/** + * Represents a TODO. + */ +public class Todo { + private String description; + private boolean isDone; + + public Todo(String _description) { + this(_description, false); + } + + public Todo(String _description, boolean _isDone) { + this.description = _description; + this.isDone = _isDone; + } + + public String getDescription() { + return this.description; + } + + public void setDescription(String _description) { + this.description = _description; + } + + public boolean isDone() { + return this.isDone; + } + + public void setDone(boolean _isDone) { + this.isDone = _isDone; + } +} From a76b0db4726151a652a0279905676969e4f3a672 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 20:07:02 +0800 Subject: [PATCH 010/112] feat(Cloud): Extract first word, handle empty, display isDone --- src/main/java/cloud/main/Cloud.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/cloud/main/Cloud.java b/src/main/java/cloud/main/Cloud.java index e30db89a85..8e3a6bb7d5 100644 --- a/src/main/java/cloud/main/Cloud.java +++ b/src/main/java/cloud/main/Cloud.java @@ -14,16 +14,24 @@ public class Cloud { private static List TODOS = new ArrayList<>(); private static void handle(String input) { - switch (input) { + String[] words = input.split(" "); + String command = words.length >= 1 ? words[0] : ""; + + switch (command) { + case "": + Cloud.say("Please enter a valid command."); + break; case "list": // Lists TODOs Cloud.say("Your TODO list:"); for (int i = 0; i < Cloud.TODOS.size(); i++) { + Todo todo = Cloud.TODOS.get(i); Cloud.say( String.format( - "%d) %s", + "[%s] %d) %s", + todo.isDone() ? "X" : " ", i + 1, - Cloud.TODOS.get(i).getDescription() + todo.getDescription() ) ); } From 1a28c6988086dd7288c5f290f5b090723294adb1 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 20:28:47 +0800 Subject: [PATCH 011/112] ref(Todo): Rename done to complete --- src/main/java/cloud/main/Todo.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/cloud/main/Todo.java b/src/main/java/cloud/main/Todo.java index 6df3110869..81d489e8ad 100644 --- a/src/main/java/cloud/main/Todo.java +++ b/src/main/java/cloud/main/Todo.java @@ -7,15 +7,15 @@ */ public class Todo { private String description; - private boolean isDone; + private boolean isComplete; public Todo(String _description) { this(_description, false); } - public Todo(String _description, boolean _isDone) { + public Todo(String _description, boolean _isComplete) { this.description = _description; - this.isDone = _isDone; + this.isComplete = _isComplete; } public String getDescription() { @@ -26,11 +26,11 @@ public void setDescription(String _description) { this.description = _description; } - public boolean isDone() { - return this.isDone; + public boolean isComplete() { + return this.isComplete; } - public void setDone(boolean _isDone) { - this.isDone = _isDone; + public void setComplete(boolean _isComplete) { + this.isComplete = _isComplete; } } From 6881b0d053e0baf923add3737dd8636c6dff9e19 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 20:30:05 +0800 Subject: [PATCH 012/112] feat(Cloud): Mark/unmark with error handling, trim comments --- src/main/java/cloud/main/Cloud.java | 104 +++++++++++++++++++++++++--- 1 file changed, 96 insertions(+), 8 deletions(-) diff --git a/src/main/java/cloud/main/Cloud.java b/src/main/java/cloud/main/Cloud.java index 8e3a6bb7d5..587efba472 100644 --- a/src/main/java/cloud/main/Cloud.java +++ b/src/main/java/cloud/main/Cloud.java @@ -22,22 +22,71 @@ private static void handle(String input) { Cloud.say("Please enter a valid command."); break; case "list": - // Lists TODOs - Cloud.say("Your TODO list:"); + if (Cloud.TODOS.size() <= 0) { + Cloud.say("Your TODO list is empty."); + return; + } + for (int i = 0; i < Cloud.TODOS.size(); i++) { Todo todo = Cloud.TODOS.get(i); + Cloud.sayTodo(todo, i + 1); + } + break; + case "mark": { + Integer number = wordToInt(words, 1); + if (number == null) { + return; + } + + Todo todo = Cloud.TODOS.get(number - 1); + if (todo.isComplete()) { Cloud.say( String.format( - "[%s] %d) %s", - todo.isDone() ? "X" : " ", - i + 1, - todo.getDescription() + "TODO #%d is already marked as complete.", + number ) ); + return; } + + todo.setComplete(true); + Cloud.say( + String.format( + "TODO #%d marked as complete.", + number + ) + ); + Cloud.sayTodo(todo, number); + break; + } + case "unmark": { + Integer number = wordToInt(words, 1); + if (number == null) { + return; + } + + Todo todo = Cloud.TODOS.get(number - 1); + if (!todo.isComplete()) { + Cloud.say( + String.format( + "TODO #%d is already not marked as complete.", + number + ) + ); + return; + } + + todo.setComplete(false); + Cloud.say( + String.format( + "TODO #%d marked as incomplete.", + number + ) + ); + Cloud.sayTodo(todo, number); break; + } case "bye": - // Ends chat session Cloud.say("\\o"); System.exit(0); break; @@ -48,7 +97,7 @@ private static void handle(String input) { ); Cloud.say( String.format( - "Added TODO #%d: \"%s\"", + "Added new TODO #%d: \"%s\"", Cloud.TODOS.size(), input ) @@ -57,10 +106,49 @@ private static void handle(String input) { } } + private static Integer wordToInt(String[] words, int index) { + String numberString = words.length >= index + 1 ? words[index] : ""; + int number; + try { + number = Integer.parseInt(numberString); + } catch (NumberFormatException e) { + Cloud.say( + String.format( + "\"%s\" is not a valid TODO number.", + numberString + ) + ); + return null; + } + + if (number < 0 || number > Cloud.TODOS.size()) { + Cloud.say( + String.format( + "TODO #%d does not exist.", + number + ) + ); + return null; + } + + return number; + } + private static void say(String text) { System.out.println(text); } + private static void sayTodo(Todo todo, int number) { + Cloud.say( + String.format( + "[%s] %d) %s", + todo.isComplete() ? "X" : " ", + number, + todo.getDescription() + ) + ); + } + /** * The chatbot's main method. * From f8ea187a4015a3484eb75d577b66b8aa435b964c Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 20:39:43 +0800 Subject: [PATCH 013/112] feat(Cloud): Simplify error checking, change todo display --- src/main/java/cloud/main/Cloud.java | 47 +++-------------------------- 1 file changed, 4 insertions(+), 43 deletions(-) diff --git a/src/main/java/cloud/main/Cloud.java b/src/main/java/cloud/main/Cloud.java index 587efba472..5724534b56 100644 --- a/src/main/java/cloud/main/Cloud.java +++ b/src/main/java/cloud/main/Cloud.java @@ -39,23 +39,7 @@ private static void handle(String input) { } Todo todo = Cloud.TODOS.get(number - 1); - if (todo.isComplete()) { - Cloud.say( - String.format( - "TODO #%d is already marked as complete.", - number - ) - ); - return; - } - todo.setComplete(true); - Cloud.say( - String.format( - "TODO #%d marked as complete.", - number - ) - ); Cloud.sayTodo(todo, number); break; } @@ -66,23 +50,7 @@ private static void handle(String input) { } Todo todo = Cloud.TODOS.get(number - 1); - if (!todo.isComplete()) { - Cloud.say( - String.format( - "TODO #%d is already not marked as complete.", - number - ) - ); - return; - } - todo.setComplete(false); - Cloud.say( - String.format( - "TODO #%d marked as incomplete.", - number - ) - ); Cloud.sayTodo(todo, number); break; } @@ -92,16 +60,9 @@ private static void handle(String input) { break; default: // Stores new TODO - Cloud.TODOS.add( - new Todo(input) - ); - Cloud.say( - String.format( - "Added new TODO #%d: \"%s\"", - Cloud.TODOS.size(), - input - ) - ); + Todo todo = new Todo(input); + Cloud.TODOS.add(todo); + Cloud.sayTodo(todo, Cloud.TODOS.size()); break; } } @@ -141,7 +102,7 @@ private static void say(String text) { private static void sayTodo(Todo todo, int number) { Cloud.say( String.format( - "[%s] %d) %s", + "%s | #%d: %s", todo.isComplete() ? "X" : " ", number, todo.getDescription() From dbc3b33676d101178a9ea443aa7f8b0077dc9c94 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 20:52:13 +0800 Subject: [PATCH 014/112] feat(todo): Move to todo package, simplify, create Deadline/Event --- src/main/java/cloud/main/Cloud.java | 2 ++ src/main/java/cloud/main/todo/Deadline.java | 24 +++++++++++++++++++ src/main/java/cloud/main/todo/Event.java | 24 +++++++++++++++++++ src/main/java/cloud/main/{ => todo}/Todo.java | 12 ++++------ 4 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 src/main/java/cloud/main/todo/Deadline.java create mode 100644 src/main/java/cloud/main/todo/Event.java rename src/main/java/cloud/main/{ => todo}/Todo.java (67%) diff --git a/src/main/java/cloud/main/Cloud.java b/src/main/java/cloud/main/Cloud.java index 5724534b56..ad1cc3529d 100644 --- a/src/main/java/cloud/main/Cloud.java +++ b/src/main/java/cloud/main/Cloud.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Scanner; +import cloud.main.todo.Todo; + /** diff --git a/src/main/java/cloud/main/todo/Deadline.java b/src/main/java/cloud/main/todo/Deadline.java new file mode 100644 index 0000000000..509481e4c4 --- /dev/null +++ b/src/main/java/cloud/main/todo/Deadline.java @@ -0,0 +1,24 @@ +package cloud.main.todo; + + + +/** + * Represents a deadline TODO, which has an ending timestamp. + */ +public class Deadline extends Todo { + private String timestampEnd; + + public Deadline(String _description, String end) { + super(_description); + + this.timestampEnd = end; + } + + public String getEnd() { + return this.timestampEnd; + } + + public void setEnd(String end) { + this.timestampEnd = end; + } +} diff --git a/src/main/java/cloud/main/todo/Event.java b/src/main/java/cloud/main/todo/Event.java new file mode 100644 index 0000000000..8cb48021e5 --- /dev/null +++ b/src/main/java/cloud/main/todo/Event.java @@ -0,0 +1,24 @@ +package cloud.main.todo; + + + +/** + * Represents an event TODO, which has both a starting and ending timestamp. + */ +public class Event extends Deadline { + private String timestampStart; + + public Event(String _description, String start, String end) { + super(_description, end); + + this.timestampStart = start; + } + + public String getStart() { + return this.timestampStart; + } + + public void setStart(String start) { + this.timestampStart = start; + } +} diff --git a/src/main/java/cloud/main/Todo.java b/src/main/java/cloud/main/todo/Todo.java similarity index 67% rename from src/main/java/cloud/main/Todo.java rename to src/main/java/cloud/main/todo/Todo.java index 81d489e8ad..8150be9433 100644 --- a/src/main/java/cloud/main/Todo.java +++ b/src/main/java/cloud/main/todo/Todo.java @@ -1,4 +1,4 @@ -package cloud.main; +package cloud.main.todo; @@ -6,16 +6,12 @@ * Represents a TODO. */ public class Todo { - private String description; - private boolean isComplete; + private boolean isComplete = false; - public Todo(String _description) { - this(_description, false); - } + private String description; - public Todo(String _description, boolean _isComplete) { + public Todo(String _description) { this.description = _description; - this.isComplete = _isComplete; } public String getDescription() { From 9be3d205c2fd8e1d6ff7cdb5d4f59e7d206196d0 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 21:08:53 +0800 Subject: [PATCH 015/112] style(): Fix accidental tabs, update VSCode settings for repo --- .vscode/settings.json | 5 ++++ src/main/java/cloud/main/todo/Deadline.java | 18 ++++++------- src/main/java/cloud/main/todo/Event.java | 18 ++++++------- src/main/java/cloud/main/todo/Todo.java | 30 ++++++++++----------- 4 files changed, 38 insertions(+), 33 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..c7bc5014da --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "editor.insertSpaces": true, + "editor.detectIndentation": false, + "editor.tabSize": 4 +} diff --git a/src/main/java/cloud/main/todo/Deadline.java b/src/main/java/cloud/main/todo/Deadline.java index 509481e4c4..e41681130a 100644 --- a/src/main/java/cloud/main/todo/Deadline.java +++ b/src/main/java/cloud/main/todo/Deadline.java @@ -6,19 +6,19 @@ * Represents a deadline TODO, which has an ending timestamp. */ public class Deadline extends Todo { - private String timestampEnd; + private String timestampEnd; public Deadline(String _description, String end) { - super(_description); + super(_description); - this.timestampEnd = end; + this.timestampEnd = end; } - public String getEnd() { - return this.timestampEnd; - } + public String getEnd() { + return this.timestampEnd; + } - public void setEnd(String end) { - this.timestampEnd = end; - } + public void setEnd(String end) { + this.timestampEnd = end; + } } diff --git a/src/main/java/cloud/main/todo/Event.java b/src/main/java/cloud/main/todo/Event.java index 8cb48021e5..6b8f7f8504 100644 --- a/src/main/java/cloud/main/todo/Event.java +++ b/src/main/java/cloud/main/todo/Event.java @@ -6,19 +6,19 @@ * Represents an event TODO, which has both a starting and ending timestamp. */ public class Event extends Deadline { - private String timestampStart; + private String timestampStart; public Event(String _description, String start, String end) { - super(_description, end); + super(_description, end); - this.timestampStart = start; + this.timestampStart = start; } - public String getStart() { - return this.timestampStart; - } + public String getStart() { + return this.timestampStart; + } - public void setStart(String start) { - this.timestampStart = start; - } + public void setStart(String start) { + this.timestampStart = start; + } } diff --git a/src/main/java/cloud/main/todo/Todo.java b/src/main/java/cloud/main/todo/Todo.java index 8150be9433..a001a7a6c5 100644 --- a/src/main/java/cloud/main/todo/Todo.java +++ b/src/main/java/cloud/main/todo/Todo.java @@ -6,27 +6,27 @@ * Represents a TODO. */ public class Todo { - private boolean isComplete = false; + private boolean isComplete = false; - private String description; + private String description; public Todo(String _description) { - this.description = _description; + this.description = _description; } - public String getDescription() { - return this.description; - } + public String getDescription() { + return this.description; + } - public void setDescription(String _description) { - this.description = _description; - } + public void setDescription(String _description) { + this.description = _description; + } - public boolean isComplete() { - return this.isComplete; - } + public boolean isComplete() { + return this.isComplete; + } - public void setComplete(boolean _isComplete) { - this.isComplete = _isComplete; - } + public void setComplete(boolean _isComplete) { + this.isComplete = _isComplete; + } } From 774a3668ef1bc708529a570634402bee479f5a77 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 21:09:10 +0800 Subject: [PATCH 016/112] devfeat(Token): Create initial token handler --- src/main/java/cloud/main/Token.java | 60 +++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 src/main/java/cloud/main/Token.java diff --git a/src/main/java/cloud/main/Token.java b/src/main/java/cloud/main/Token.java new file mode 100644 index 0000000000..9b04b6232a --- /dev/null +++ b/src/main/java/cloud/main/Token.java @@ -0,0 +1,60 @@ +package cloud.main; + +import java.util.List; + +import cloud.main.todo.Todo; + + + +/** + * Represents a single word of user input. + */ +public class Token { + private String token; + + public Token(String _token) { + this.token = _token; + } + + private Integer toInt() { + try { + return Integer.parseInt(token); + } catch (NumberFormatException e) { + return null; + } + } + + /** + * Whether the token can be converted to a valid integer. + */ + public boolean isInt() { + Integer integer = this.toInt(); + return integer != null; + } + + /** + * Returns the token as an integer. Defaults to -1 if the token cannot be + * converted to a valid integer. + */ + public int asInt() { + if (!isInt()) return -1; + + return this.toInt(); + } + + /** + * Whether the token is a valid TODO number. + * + * @param todos The list of Todos. + */ + public boolean isValidNumber(List todos) { + if (!this.isInt()) return false; + + int number = this.asInt(); + + if (number < 0 || number > todos.size()) { + return false; + } + return true; + } +} From 21d63d041854d9b6b9679e0f7f0a037bd306ceb4 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 21:19:41 +0800 Subject: [PATCH 017/112] ref(): Handle commands mostly as tokens --- src/main/java/cloud/main/Cloud.java | 41 +++++++++++++++++++---------- src/main/java/cloud/main/Token.java | 8 ++++++ 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/main/java/cloud/main/Cloud.java b/src/main/java/cloud/main/Cloud.java index ad1cc3529d..7ff3e50f06 100644 --- a/src/main/java/cloud/main/Cloud.java +++ b/src/main/java/cloud/main/Cloud.java @@ -15,10 +15,22 @@ public class Cloud { private static Scanner SCANNER = new Scanner(System.in); private static List TODOS = new ArrayList<>(); - private static void handle(String input) { + private static List toTokens(String input) { String[] words = input.split(" "); - String command = words.length >= 1 ? words[0] : ""; + List tokens = new ArrayList<>(); + for (int i = 0; i < words.length; i++) { + String word = words[i]; + Token token = new Token(word); + tokens.add(token); + } + return tokens; + } + + private static void handle(String input) { + List tokens = Cloud.toTokens(input); + + String command = tokens.size() >= 1 ? tokens.get(0).get() : ""; switch (command) { case "": Cloud.say("Please enter a valid command."); @@ -35,7 +47,7 @@ private static void handle(String input) { } break; case "mark": { - Integer number = wordToInt(words, 1); + Integer number = Cloud.verifyNumber(tokens); if (number == null) { return; } @@ -46,7 +58,7 @@ private static void handle(String input) { break; } case "unmark": { - Integer number = wordToInt(words, 1); + Integer number = Cloud.verifyNumber(tokens); if (number == null) { return; } @@ -69,32 +81,33 @@ private static void handle(String input) { } } - private static Integer wordToInt(String[] words, int index) { - String numberString = words.length >= index + 1 ? words[index] : ""; - int number; - try { - number = Integer.parseInt(numberString); - } catch (NumberFormatException e) { + private static Integer verifyNumber(List tokens) { + if (tokens.size() <= 1) { + return null; + } + + Token numberToken = tokens.get(1); + if (!numberToken.isInt()) { Cloud.say( String.format( "\"%s\" is not a valid TODO number.", - numberString + numberToken.get() ) ); return null; } - if (number < 0 || number > Cloud.TODOS.size()) { + if (!numberToken.isValidNumber(Cloud.TODOS)) { Cloud.say( String.format( "TODO #%d does not exist.", - number + numberToken.asInt() ) ); return null; } - return number; + return numberToken.asInt(); } private static void say(String text) { diff --git a/src/main/java/cloud/main/Token.java b/src/main/java/cloud/main/Token.java index 9b04b6232a..3a32588059 100644 --- a/src/main/java/cloud/main/Token.java +++ b/src/main/java/cloud/main/Token.java @@ -24,6 +24,14 @@ private Integer toInt() { } } + public String get() { + return this.token; + } + + public void set(String _token) { + this.token = _token; + } + /** * Whether the token can be converted to a valid integer. */ From 0f1568276a7c14989a75edd6229b583786e0fd3a Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 22:27:41 +0800 Subject: [PATCH 018/112] ref(): TokenManager, trim setters --- src/main/java/cloud/main/Cloud.java | 35 ++---- src/main/java/cloud/main/todo/Deadline.java | 4 - src/main/java/cloud/main/todo/Event.java | 4 - src/main/java/cloud/main/todo/Todo.java | 8 +- .../java/cloud/main/{ => token}/Token.java | 34 +++-- .../java/cloud/main/token/TokenManager.java | 119 ++++++++++++++++++ 6 files changed, 161 insertions(+), 43 deletions(-) rename src/main/java/cloud/main/{ => token}/Token.java (61%) create mode 100644 src/main/java/cloud/main/token/TokenManager.java diff --git a/src/main/java/cloud/main/Cloud.java b/src/main/java/cloud/main/Cloud.java index 7ff3e50f06..5363567559 100644 --- a/src/main/java/cloud/main/Cloud.java +++ b/src/main/java/cloud/main/Cloud.java @@ -5,6 +5,8 @@ import java.util.Scanner; import cloud.main.todo.Todo; +import cloud.main.token.Token; +import cloud.main.token.TokenManager; @@ -12,26 +14,12 @@ * The chatbot's main class. */ public class Cloud { - private static Scanner SCANNER = new Scanner(System.in); - private static List TODOS = new ArrayList<>(); - - private static List toTokens(String input) { - String[] words = input.split(" "); - List tokens = new ArrayList<>(); - - for (int i = 0; i < words.length; i++) { - String word = words[i]; - Token token = new Token(word); - tokens.add(token); - } - return tokens; - } + private static final Scanner SCANNER = new Scanner(System.in); + private static final List TODOS = new ArrayList<>(); private static void handle(String input) { - List tokens = Cloud.toTokens(input); - - String command = tokens.size() >= 1 ? tokens.get(0).get() : ""; - switch (command) { + TokenManager manager = new TokenManager(input); + switch (manager.getCommand()) { case "": Cloud.say("Please enter a valid command."); break; @@ -47,7 +35,7 @@ private static void handle(String input) { } break; case "mark": { - Integer number = Cloud.verifyNumber(tokens); + Integer number = Cloud.verifyNumber(manager); if (number == null) { return; } @@ -58,7 +46,7 @@ private static void handle(String input) { break; } case "unmark": { - Integer number = Cloud.verifyNumber(tokens); + Integer number = Cloud.verifyNumber(manager); if (number == null) { return; } @@ -74,14 +62,15 @@ private static void handle(String input) { break; default: // Stores new TODO - Todo todo = new Todo(input); + Todo todo = new Todo(manager.toString()); Cloud.TODOS.add(todo); Cloud.sayTodo(todo, Cloud.TODOS.size()); break; } } - private static Integer verifyNumber(List tokens) { + private static Integer verifyNumber(TokenManager manager) { + List tokens = manager.getTokens(); if (tokens.size() <= 1) { return null; } @@ -118,7 +107,7 @@ private static void sayTodo(Todo todo, int number) { Cloud.say( String.format( "%s | #%d: %s", - todo.isComplete() ? "X" : " ", + todo.getCompleteSymbol(), number, todo.getDescription() ) diff --git a/src/main/java/cloud/main/todo/Deadline.java b/src/main/java/cloud/main/todo/Deadline.java index e41681130a..272b880717 100644 --- a/src/main/java/cloud/main/todo/Deadline.java +++ b/src/main/java/cloud/main/todo/Deadline.java @@ -17,8 +17,4 @@ public Deadline(String _description, String end) { public String getEnd() { return this.timestampEnd; } - - public void setEnd(String end) { - this.timestampEnd = end; - } } diff --git a/src/main/java/cloud/main/todo/Event.java b/src/main/java/cloud/main/todo/Event.java index 6b8f7f8504..cc87256a14 100644 --- a/src/main/java/cloud/main/todo/Event.java +++ b/src/main/java/cloud/main/todo/Event.java @@ -17,8 +17,4 @@ public Event(String _description, String start, String end) { public String getStart() { return this.timestampStart; } - - public void setStart(String start) { - this.timestampStart = start; - } } diff --git a/src/main/java/cloud/main/todo/Todo.java b/src/main/java/cloud/main/todo/Todo.java index a001a7a6c5..51169e0476 100644 --- a/src/main/java/cloud/main/todo/Todo.java +++ b/src/main/java/cloud/main/todo/Todo.java @@ -18,14 +18,14 @@ public String getDescription() { return this.description; } - public void setDescription(String _description) { - this.description = _description; - } - public boolean isComplete() { return this.isComplete; } + public String getCompleteSymbol() { + return this.isComplete ? "X" : " "; + } + public void setComplete(boolean _isComplete) { this.isComplete = _isComplete; } diff --git a/src/main/java/cloud/main/Token.java b/src/main/java/cloud/main/token/Token.java similarity index 61% rename from src/main/java/cloud/main/Token.java rename to src/main/java/cloud/main/token/Token.java index 3a32588059..62538430ec 100644 --- a/src/main/java/cloud/main/Token.java +++ b/src/main/java/cloud/main/token/Token.java @@ -1,4 +1,4 @@ -package cloud.main; +package cloud.main.token; import java.util.List; @@ -10,6 +10,9 @@ * Represents a single word of user input. */ public class Token { + /** The prefix for flags */ + public static final String PREFIX_FLAG = "/"; + private String token; public Token(String _token) { @@ -28,10 +31,6 @@ public String get() { return this.token; } - public void set(String _token) { - this.token = _token; - } - /** * Whether the token can be converted to a valid integer. */ @@ -41,11 +40,12 @@ public boolean isInt() { } /** - * Returns the token as an integer. Defaults to -1 if the token cannot be - * converted to a valid integer. + * Returns the token as an integer. + * + * @return Defaults to -1 if the token cannot be converted to a valid integer. */ public int asInt() { - if (!isInt()) return -1; + if (!this.isInt()) return -1; return this.toInt(); } @@ -65,4 +65,22 @@ public boolean isValidNumber(List todos) { } return true; } + + /** + * Whether the token is a flag. + */ + public boolean isFlag() { + return this.token.startsWith(Token.PREFIX_FLAG); + } + + /** + * Returns the text portion of the flag. + * + * @return Defaults to "" if the token is not actually a flag. + */ + public String getFlag() { + if (!this.isFlag()) return ""; + + return this.token.substring(1); + } } diff --git a/src/main/java/cloud/main/token/TokenManager.java b/src/main/java/cloud/main/token/TokenManager.java new file mode 100644 index 0000000000..280dca624c --- /dev/null +++ b/src/main/java/cloud/main/token/TokenManager.java @@ -0,0 +1,119 @@ +package cloud.main.token; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.stream.Collectors; + + + +/** + * Manages all the Tokens representing an instance of user input. + * + * Flag sets are stored separate from the list of Tokens. The entire set is stored in a nested + * TokenManager, with each first token understood to be the flag, whose flag text is used as the + * key. + */ +public class TokenManager { + private List tokens = new ArrayList<>(); + private HashMap flagSets = new HashMap<>(); + + public TokenManager(String input) { + String[] words = input.split(" "); + + for (int i = 0; i < words.length; i++) { + String word = words[i]; + Token token = new Token(word); + this.tokens.add(token); + } + + // Go through tokens to extract flag sets + int i = 0; + while (i < tokens.size()) { + Token token = this.tokens.get(i); + + if (token.isFlag()) { + int endIndex = this.findFlagSetEnd(i); + List flagSet = this.removeTokens(i, endIndex); + + Token flag = flagSet.get(0); + this.flagSets.put( + flag.getFlag(), + new TokenManager(flagSet) + ); + continue; + } + + i++; + } + } + + public TokenManager(List _tokens) { + this.tokens = _tokens; + } + + private int findFlagSetEnd(int startIndex) { + int lastIndex = this.tokens.size() - 1; + int movingIndex = startIndex + 1; + + while (movingIndex <= lastIndex) { + Token token = this.tokens.get(movingIndex); + if (token.isFlag()) break; + + movingIndex++; + } + + // Start index inclusive, end index exclusive + return movingIndex; + } + + /** + * Removes and returns all tokens between the specified indices. + * + * @param startIndex The index to start from (inclusive). + * @param endIndex The index to end before (exclusive). + */ + private List removeTokens(int startIndex, int endIndex) { + int removeCount = endIndex - startIndex; + List removed = new ArrayList<>(); + while (removeCount > 0) { + Token token = this.tokens.remove(startIndex); + removed.add(token); + } + return removed; + } + + @Override + public String toString() { + return this.tokens + .stream() + .map(Token::get) + .collect(Collectors.joining(" ")); + } + + public List getTokens() { + return this.tokens; + } + + /** + * Returns the first token, understood to be the command. + * + * @return Defaults to "" if the user input is too short. + */ + public String getCommand() { + if (this.tokens.size() <= 0) { + return ""; + } + + return this.tokens.get(0).get(); + } + + /** + * Returns the TokenManager for the specified flag, if it exists. + * + * @return Defaults to null if no such flag exists. + */ + public TokenManager findFlag(String flag) { + return this.flagSets.get(flag); + } +} From eddd8a23b83a07d888cc7a581fd904c86bd2669a Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 22:36:07 +0800 Subject: [PATCH 019/112] devfeat(): Add type strings, Todo toString --- src/main/java/cloud/main/Cloud.java | 26 ++++++++------------- src/main/java/cloud/main/todo/Deadline.java | 5 ++++ src/main/java/cloud/main/todo/Event.java | 5 ++++ src/main/java/cloud/main/todo/Todo.java | 21 ++++++++++++++++- 4 files changed, 40 insertions(+), 17 deletions(-) diff --git a/src/main/java/cloud/main/Cloud.java b/src/main/java/cloud/main/Cloud.java index 5363567559..232e6e4569 100644 --- a/src/main/java/cloud/main/Cloud.java +++ b/src/main/java/cloud/main/Cloud.java @@ -31,7 +31,7 @@ private static void handle(String input) { for (int i = 0; i < Cloud.TODOS.size(); i++) { Todo todo = Cloud.TODOS.get(i); - Cloud.sayTodo(todo, i + 1); + Cloud.say(todo.toString(i + 1)); } break; case "mark": { @@ -42,7 +42,7 @@ private static void handle(String input) { Todo todo = Cloud.TODOS.get(number - 1); todo.setComplete(true); - Cloud.sayTodo(todo, number); + Cloud.say(todo.toString(number)); break; } case "unmark": { @@ -53,7 +53,7 @@ private static void handle(String input) { Todo todo = Cloud.TODOS.get(number - 1); todo.setComplete(false); - Cloud.sayTodo(todo, number); + Cloud.say(todo.toString(number)); break; } case "bye": @@ -62,13 +62,18 @@ private static void handle(String input) { break; default: // Stores new TODO - Todo todo = new Todo(manager.toString()); + Todo todo = Cloud.createTodo(manager); Cloud.TODOS.add(todo); - Cloud.sayTodo(todo, Cloud.TODOS.size()); + Cloud.say(todo.toString(Cloud.TODOS.size())); break; } } + private static Todo createTodo(TokenManager manager) { + //TODO base on flags + return new Todo(manager.toString()); + } + private static Integer verifyNumber(TokenManager manager) { List tokens = manager.getTokens(); if (tokens.size() <= 1) { @@ -103,17 +108,6 @@ private static void say(String text) { System.out.println(text); } - private static void sayTodo(Todo todo, int number) { - Cloud.say( - String.format( - "%s | #%d: %s", - todo.getCompleteSymbol(), - number, - todo.getDescription() - ) - ); - } - /** * The chatbot's main method. * diff --git a/src/main/java/cloud/main/todo/Deadline.java b/src/main/java/cloud/main/todo/Deadline.java index 272b880717..bc4c0e35e9 100644 --- a/src/main/java/cloud/main/todo/Deadline.java +++ b/src/main/java/cloud/main/todo/Deadline.java @@ -14,6 +14,11 @@ public Deadline(String _description, String end) { this.timestampEnd = end; } + @Override + public String getTypeString() { + return "D"; + } + public String getEnd() { return this.timestampEnd; } diff --git a/src/main/java/cloud/main/todo/Event.java b/src/main/java/cloud/main/todo/Event.java index cc87256a14..c4cd940d40 100644 --- a/src/main/java/cloud/main/todo/Event.java +++ b/src/main/java/cloud/main/todo/Event.java @@ -14,6 +14,11 @@ public Event(String _description, String start, String end) { this.timestampStart = start; } + @Override + public String getTypeString() { + return "E"; + } + public String getStart() { return this.timestampStart; } diff --git a/src/main/java/cloud/main/todo/Todo.java b/src/main/java/cloud/main/todo/Todo.java index 51169e0476..16b751e4bc 100644 --- a/src/main/java/cloud/main/todo/Todo.java +++ b/src/main/java/cloud/main/todo/Todo.java @@ -14,6 +14,15 @@ public Todo(String _description) { this.description = _description; } + public String toString(int number) { + return String.format( + "%s | #%d: %s", + this.getCompletionString(), + number, + this.getDescription() + ); + } + public String getDescription() { return this.description; } @@ -22,11 +31,21 @@ public boolean isComplete() { return this.isComplete; } - public String getCompleteSymbol() { + /** + * Returns a string representing whether the TODO has been completed. + */ + public String getCompletionString() { return this.isComplete ? "X" : " "; } public void setComplete(boolean _isComplete) { this.isComplete = _isComplete; } + + /** + * Returns a string representing the type of this TODO. + */ + public String getTypeString() { + return "T"; + } } From 4fe1224989d2cccd79b1ae8fd46f2f1ccadcae68 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 22:47:47 +0800 Subject: [PATCH 020/112] fix(TokenManager): Fix infinite removeTokens() --- src/main/java/cloud/main/token/TokenManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/cloud/main/token/TokenManager.java b/src/main/java/cloud/main/token/TokenManager.java index 280dca624c..71d66ab9b5 100644 --- a/src/main/java/cloud/main/token/TokenManager.java +++ b/src/main/java/cloud/main/token/TokenManager.java @@ -79,6 +79,8 @@ private List removeTokens(int startIndex, int endIndex) { while (removeCount > 0) { Token token = this.tokens.remove(startIndex); removed.add(token); + + removeCount--; } return removed; } From e2b528a83f732aee5d5420dc0f18a30089972ddc Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 22:48:11 +0800 Subject: [PATCH 021/112] ref(TokenManager): Store sub input without flag --- src/main/java/cloud/main/token/TokenManager.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/cloud/main/token/TokenManager.java b/src/main/java/cloud/main/token/TokenManager.java index 71d66ab9b5..c6cd92820d 100644 --- a/src/main/java/cloud/main/token/TokenManager.java +++ b/src/main/java/cloud/main/token/TokenManager.java @@ -10,9 +10,9 @@ /** * Manages all the Tokens representing an instance of user input. * - * Flag sets are stored separate from the list of Tokens. The entire set is stored in a nested - * TokenManager, with each first token understood to be the flag, whose flag text is used as the - * key. + * Flag sets are stored separate from the list of Tokens. The first token is understood to be the + * flag, whose flag text is used as the key. The remaining tokens are the sub input, stored in a + * nested TokenManager. */ public class TokenManager { private List tokens = new ArrayList<>(); @@ -36,7 +36,8 @@ public TokenManager(String input) { int endIndex = this.findFlagSetEnd(i); List flagSet = this.removeTokens(i, endIndex); - Token flag = flagSet.get(0); + // This removal degrades the flag set into a sub input + Token flag = flagSet.remove(0); this.flagSets.put( flag.getFlag(), new TokenManager(flagSet) From 35067fbbf45954cba9fdc453ec3509a24df67ae2 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 22:48:45 +0800 Subject: [PATCH 022/112] feat(todo): Different Todo string representations --- src/main/java/cloud/main/todo/Deadline.java | 9 +++++++++ src/main/java/cloud/main/todo/Event.java | 13 +++++++++++++ src/main/java/cloud/main/todo/Todo.java | 3 ++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/main/java/cloud/main/todo/Deadline.java b/src/main/java/cloud/main/todo/Deadline.java index bc4c0e35e9..b82c522f84 100644 --- a/src/main/java/cloud/main/todo/Deadline.java +++ b/src/main/java/cloud/main/todo/Deadline.java @@ -14,6 +14,15 @@ public Deadline(String _description, String end) { this.timestampEnd = end; } + @Override + public String toString(int number) { + return String.format( + "%s | BY %s", + super.toString(number), + this.timestampEnd + ); + } + @Override public String getTypeString() { return "D"; diff --git a/src/main/java/cloud/main/todo/Event.java b/src/main/java/cloud/main/todo/Event.java index c4cd940d40..9f35ee9021 100644 --- a/src/main/java/cloud/main/todo/Event.java +++ b/src/main/java/cloud/main/todo/Event.java @@ -14,6 +14,19 @@ public Event(String _description, String start, String end) { this.timestampStart = start; } + @Override + public String toString(int number) { + return String.format( + "%s | %s#%d: %s | FROM %s | TO %s", + this.getCompletionString(), + this.getTypeString(), + number, + this.getDescription(), + this.getStart(), + this.getEnd() + ); + } + @Override public String getTypeString() { return "E"; diff --git a/src/main/java/cloud/main/todo/Todo.java b/src/main/java/cloud/main/todo/Todo.java index 16b751e4bc..0c1f861b41 100644 --- a/src/main/java/cloud/main/todo/Todo.java +++ b/src/main/java/cloud/main/todo/Todo.java @@ -16,8 +16,9 @@ public Todo(String _description) { public String toString(int number) { return String.format( - "%s | #%d: %s", + "%s | %s#%d: %s", this.getCompletionString(), + this.getTypeString(), number, this.getDescription() ); From b88606a78a5b347b13d9a1fff66fddc57ea7d1e5 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 31 Aug 2023 22:49:09 +0800 Subject: [PATCH 023/112] feat(Cloud): Create different Todos based on flags! --- src/main/java/cloud/main/Cloud.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/cloud/main/Cloud.java b/src/main/java/cloud/main/Cloud.java index 232e6e4569..fd2da9348d 100644 --- a/src/main/java/cloud/main/Cloud.java +++ b/src/main/java/cloud/main/Cloud.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Scanner; +import cloud.main.todo.Deadline; +import cloud.main.todo.Event; import cloud.main.todo.Todo; import cloud.main.token.Token; import cloud.main.token.TokenManager; @@ -70,7 +72,16 @@ private static void handle(String input) { } private static Todo createTodo(TokenManager manager) { - //TODO base on flags + TokenManager inputBy = manager.findFlag("by"); + TokenManager inputFrom = manager.findFlag("from"); + TokenManager inputTo = manager.findFlag("to"); + + if (inputBy != null) { + return new Deadline(manager.toString(), inputBy.toString()); + } + if (inputFrom != null && inputTo != null) { + return new Event(manager.toString(), inputFrom.toString(), inputTo.toString()); + } return new Todo(manager.toString()); } From 4f1f3f6728e9f663a3f750e348df9c85da5b3e61 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Sun, 3 Sep 2023 15:55:11 +0800 Subject: [PATCH 024/112] chore(tests): Remove shell test script --- text-ui-test/runtest.sh | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 text-ui-test/runtest.sh diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh deleted file mode 100644 index d05cdfd2ff..0000000000 --- a/text-ui-test/runtest.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -# create bin directory if it doesn't exist -if [ ! -d "../bin" ] -then - mkdir ../bin -fi - -# delete output from previous run -if [ -e "./ACTUAL.TXT" ] -then - rm ACTUAL.TXT -fi - -# compile the code into the bin folder, terminates if error occurred -if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/*.java -then - echo "********** BUILD FAILURE **********" - exit 1 -fi - -# run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT -java -classpath ../bin Cloud < input.txt > ACTUAL.TXT - -# convert to UNIX format -cp EXPECTED.TXT EXPECTED-UNIX.TXT -dos2unix ACTUAL.TXT EXPECTED-UNIX.TXT - -# compare the output to the expected output -diff ACTUAL.TXT EXPECTED-UNIX.TXT -if [ $? -eq 0 ] -then - echo "Test result: PASSED" - exit 0 -else - echo "Test result: FAILED" - exit 1 -fi From 5610437cb4026245f18ff0fc605bff228ed98e1d Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Sun, 3 Sep 2023 15:58:59 +0800 Subject: [PATCH 025/112] feat(src): Handle EOF, move packages Also edit invalid mark error text --- .../main => com/cloud/chatbot}/Cloud.java | 26 +++++++++++-------- .../cloud/chatbot}/todo/Deadline.java | 2 +- .../cloud/chatbot}/todo/Event.java | 2 +- .../main => com/cloud/chatbot}/todo/Todo.java | 2 +- .../cloud/chatbot}/token/Token.java | 4 +-- .../cloud/chatbot}/token/TokenManager.java | 2 +- 6 files changed, 21 insertions(+), 17 deletions(-) rename src/{main/java/cloud/main => com/cloud/chatbot}/Cloud.java (88%) rename src/{main/java/cloud/main => com/cloud/chatbot}/todo/Deadline.java (95%) rename src/{main/java/cloud/main => com/cloud/chatbot}/todo/Event.java (96%) rename src/{main/java/cloud/main => com/cloud/chatbot}/todo/Todo.java (96%) rename src/{main/java/cloud/main => com/cloud/chatbot}/token/Token.java (96%) rename src/{main/java/cloud/main => com/cloud/chatbot}/token/TokenManager.java (99%) diff --git a/src/main/java/cloud/main/Cloud.java b/src/com/cloud/chatbot/Cloud.java similarity index 88% rename from src/main/java/cloud/main/Cloud.java rename to src/com/cloud/chatbot/Cloud.java index fd2da9348d..76120cfe17 100644 --- a/src/main/java/cloud/main/Cloud.java +++ b/src/com/cloud/chatbot/Cloud.java @@ -1,14 +1,14 @@ -package cloud.main; +package com.cloud.chatbot; import java.util.ArrayList; import java.util.List; import java.util.Scanner; -import cloud.main.todo.Deadline; -import cloud.main.todo.Event; -import cloud.main.todo.Todo; -import cloud.main.token.Token; -import cloud.main.token.TokenManager; +import com.cloud.chatbot.todo.Deadline; +import com.cloud.chatbot.todo.Event; +import com.cloud.chatbot.todo.Todo; +import com.cloud.chatbot.token.Token; +import com.cloud.chatbot.token.TokenManager; @@ -95,7 +95,7 @@ private static Integer verifyNumber(TokenManager manager) { if (!numberToken.isInt()) { Cloud.say( String.format( - "\"%s\" is not a valid TODO number.", + "\"%s\" is not a valid number.", numberToken.get() ) ); @@ -119,6 +119,10 @@ private static void say(String text) { System.out.println(text); } + private static void inputMarker() { + System.out.print("\n>>> "); + } + /** * The chatbot's main method. * @@ -126,13 +130,13 @@ private static void say(String text) { */ public static void main(String[] args) { Cloud.say("Cloud online."); + Cloud.inputMarker(); - while (true) { - System.out.println(""); - System.out.print(">>> "); - + while (Cloud.SCANNER.hasNextLine()) { String input = Cloud.SCANNER.nextLine(); Cloud.handle(input); + + Cloud.inputMarker(); } } } diff --git a/src/main/java/cloud/main/todo/Deadline.java b/src/com/cloud/chatbot/todo/Deadline.java similarity index 95% rename from src/main/java/cloud/main/todo/Deadline.java rename to src/com/cloud/chatbot/todo/Deadline.java index b82c522f84..df179e0144 100644 --- a/src/main/java/cloud/main/todo/Deadline.java +++ b/src/com/cloud/chatbot/todo/Deadline.java @@ -1,4 +1,4 @@ -package cloud.main.todo; +package com.cloud.chatbot.todo; diff --git a/src/main/java/cloud/main/todo/Event.java b/src/com/cloud/chatbot/todo/Event.java similarity index 96% rename from src/main/java/cloud/main/todo/Event.java rename to src/com/cloud/chatbot/todo/Event.java index 9f35ee9021..e2adce6941 100644 --- a/src/main/java/cloud/main/todo/Event.java +++ b/src/com/cloud/chatbot/todo/Event.java @@ -1,4 +1,4 @@ -package cloud.main.todo; +package com.cloud.chatbot.todo; diff --git a/src/main/java/cloud/main/todo/Todo.java b/src/com/cloud/chatbot/todo/Todo.java similarity index 96% rename from src/main/java/cloud/main/todo/Todo.java rename to src/com/cloud/chatbot/todo/Todo.java index 0c1f861b41..12e09ca620 100644 --- a/src/main/java/cloud/main/todo/Todo.java +++ b/src/com/cloud/chatbot/todo/Todo.java @@ -1,4 +1,4 @@ -package cloud.main.todo; +package com.cloud.chatbot.todo; diff --git a/src/main/java/cloud/main/token/Token.java b/src/com/cloud/chatbot/token/Token.java similarity index 96% rename from src/main/java/cloud/main/token/Token.java rename to src/com/cloud/chatbot/token/Token.java index 62538430ec..bee39c865d 100644 --- a/src/main/java/cloud/main/token/Token.java +++ b/src/com/cloud/chatbot/token/Token.java @@ -1,8 +1,8 @@ -package cloud.main.token; +package com.cloud.chatbot.token; import java.util.List; -import cloud.main.todo.Todo; +import com.cloud.chatbot.todo.Todo; diff --git a/src/main/java/cloud/main/token/TokenManager.java b/src/com/cloud/chatbot/token/TokenManager.java similarity index 99% rename from src/main/java/cloud/main/token/TokenManager.java rename to src/com/cloud/chatbot/token/TokenManager.java index c6cd92820d..314015a5cb 100644 --- a/src/main/java/cloud/main/token/TokenManager.java +++ b/src/com/cloud/chatbot/token/TokenManager.java @@ -1,4 +1,4 @@ -package cloud.main.token; +package com.cloud.chatbot.token; import java.util.ArrayList; import java.util.HashMap; From 811a80cb1b69cbc285db8722dfdfa7f5ef80c877 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Sun, 3 Sep 2023 15:59:24 +0800 Subject: [PATCH 026/112] chore(gitignore): Trim, edit for tests --- .gitignore | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 270e89fc9f..234d95663a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,2 @@ -# IDEA files -/out/ -/*.iml - -# Gradle build files -/.gradle/ -/build/ -src/main/resources/docs/ - -/text-ui-test/ACTUAL.TXT -text-ui-test/EXPECTED-UNIX.TXT +bin/ +tests/ACTUAL.txt From e945188372b82ffac0ecce87a56644591e10e559 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Sun, 3 Sep 2023 15:59:52 +0800 Subject: [PATCH 027/112] devfeat(tests): Update for semi-auto test --- test.bat | 25 +++++++++++++++++++++++++ tests/EXPECTED.txt | 27 +++++++++++++++++++++++++++ tests/input.txt | 11 +++++++++++ text-ui-test/EXPECTED.TXT | 7 ------- text-ui-test/input.txt | 0 text-ui-test/runtest.bat | 21 --------------------- 6 files changed, 63 insertions(+), 28 deletions(-) create mode 100644 test.bat create mode 100644 tests/EXPECTED.txt create mode 100644 tests/input.txt delete mode 100644 text-ui-test/EXPECTED.TXT delete mode 100644 text-ui-test/input.txt delete mode 100644 text-ui-test/runtest.bat diff --git a/test.bat b/test.bat new file mode 100644 index 0000000000..054e839442 --- /dev/null +++ b/test.bat @@ -0,0 +1,25 @@ +@ECHO OFF + + + +@REM Clear any previous build files, remake bin\ +del /S /Q .\bin\ > nul +rmdir /S /Q .\bin\ +mkdir .\bin\ + +@REM Compile +javac .\src\com\cloud\chatbot\*.java -cp .\src\ -Xlint:none -d .\bin\ +IF ERRORLEVEL 1 ( + echo: + echo ^>^>^> javac failed + exit /B 1 +) + +@REM Clear previous output +del .\tests\ACTUAL.txt + +@REM Test main class, generate output +java -classpath .\bin\ com.cloud.chatbot.Cloud < .\tests\input.txt > .\tests\ACTUAL.txt + +@REM Compare output with expected +FC .\tests\ACTUAL.txt .\tests\EXPECTED.txt diff --git a/tests/EXPECTED.txt b/tests/EXPECTED.txt new file mode 100644 index 0000000000..fbd191fe54 --- /dev/null +++ b/tests/EXPECTED.txt @@ -0,0 +1,27 @@ +Cloud online. + +>>> | T#1: Download wk 3 files + +>>> | D#2: Watch L3 recording | BY Friday + +>>> | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm + +>>> | T#1: Download wk 3 files + | D#2: Watch L3 recording | BY Friday + | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm + +>>> "a" is not a valid number. + +>>> TODO #-7050 does not exist. + +>>> X | D#2: Watch L3 recording | BY Friday + +>>> X | D#2: Watch L3 recording | BY Friday + +>>> X | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm + +>>> | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm + +>>> | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm + +>>> diff --git a/tests/input.txt b/tests/input.txt new file mode 100644 index 0000000000..e850831341 --- /dev/null +++ b/tests/input.txt @@ -0,0 +1,11 @@ +Download wk 3 files +Watch L3 recording /by Friday +Project meeting /from Monday 3pm /to Monday 4:30pm +list +mark a +mark -7050 +mark 2 +mark 2 +mark 3 +unmark 3 +unmark 3 diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT deleted file mode 100644 index 657e74f6e7..0000000000 --- a/text-ui-test/EXPECTED.TXT +++ /dev/null @@ -1,7 +0,0 @@ -Hello from - ____ _ -| _ \ _ _| | _____ -| | | | | | | |/ / _ \ -| |_| | |_| | < __/ -|____/ \__,_|_|\_\___| - diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat deleted file mode 100644 index da1559073f..0000000000 --- a/text-ui-test/runtest.bat +++ /dev/null @@ -1,21 +0,0 @@ -@ECHO OFF - -REM create bin directory if it doesn't exist -if not exist ..\bin mkdir ..\bin - -REM delete output from previous run -if exist ACTUAL.TXT del ACTUAL.TXT - -REM compile the code into the bin folder -javac -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\*.java -IF ERRORLEVEL 1 ( - echo ********** BUILD FAILURE ********** - exit /b 1 -) -REM no error here, errorlevel == 0 - -REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT -java -classpath ..\bin Cloud < input.txt > ACTUAL.TXT - -REM compare the output to the expected output -FC ACTUAL.TXT EXPECTED.TXT From ca81c37d82b68b71e19a5ed41a5e6eea25adfea2 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Sun, 3 Sep 2023 16:18:21 +0800 Subject: [PATCH 028/112] ref(todo): Improve toString() Reuse from Todo parent class via getBasicString() --- src/com/cloud/chatbot/todo/Deadline.java | 4 ++-- src/com/cloud/chatbot/todo/Event.java | 7 ++----- src/com/cloud/chatbot/todo/Todo.java | 6 +++++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/com/cloud/chatbot/todo/Deadline.java b/src/com/cloud/chatbot/todo/Deadline.java index df179e0144..4d7a83012e 100644 --- a/src/com/cloud/chatbot/todo/Deadline.java +++ b/src/com/cloud/chatbot/todo/Deadline.java @@ -18,8 +18,8 @@ public Deadline(String _description, String end) { public String toString(int number) { return String.format( "%s | BY %s", - super.toString(number), - this.timestampEnd + this.getBasicString(number), + this.getEnd() ); } diff --git a/src/com/cloud/chatbot/todo/Event.java b/src/com/cloud/chatbot/todo/Event.java index e2adce6941..614b94abd4 100644 --- a/src/com/cloud/chatbot/todo/Event.java +++ b/src/com/cloud/chatbot/todo/Event.java @@ -17,11 +17,8 @@ public Event(String _description, String start, String end) { @Override public String toString(int number) { return String.format( - "%s | %s#%d: %s | FROM %s | TO %s", - this.getCompletionString(), - this.getTypeString(), - number, - this.getDescription(), + "%s | FROM %s | TO %s", + this.getBasicString(number), this.getStart(), this.getEnd() ); diff --git a/src/com/cloud/chatbot/todo/Todo.java b/src/com/cloud/chatbot/todo/Todo.java index 12e09ca620..04a090831c 100644 --- a/src/com/cloud/chatbot/todo/Todo.java +++ b/src/com/cloud/chatbot/todo/Todo.java @@ -14,7 +14,7 @@ public Todo(String _description) { this.description = _description; } - public String toString(int number) { + protected String getBasicString(int number) { return String.format( "%s | %s#%d: %s", this.getCompletionString(), @@ -24,6 +24,10 @@ public String toString(int number) { ); } + public String toString(int number) { + return this.getBasicString(number); + } + public String getDescription() { return this.description; } From 373f2868d2a73f8bd87c2b38ddca8ad5386115f7 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Sun, 3 Sep 2023 16:56:51 +0800 Subject: [PATCH 029/112] feat(src): Require command to add TODOs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also: • Reject unknown commands • Add command aliases • Add TokenManager#getDescription() • Comment assumption and checks expected before using methods • Rename Token#asInt() → toInt() --- src/com/cloud/chatbot/Cloud.java | 66 ++++++++++++++----- src/com/cloud/chatbot/token/Token.java | 16 +++-- src/com/cloud/chatbot/token/TokenManager.java | 32 +++++++-- 3 files changed, 84 insertions(+), 30 deletions(-) diff --git a/src/com/cloud/chatbot/Cloud.java b/src/com/cloud/chatbot/Cloud.java index 76120cfe17..7435433d82 100644 --- a/src/com/cloud/chatbot/Cloud.java +++ b/src/com/cloud/chatbot/Cloud.java @@ -15,20 +15,35 @@ /** * The chatbot's main class. */ -public class Cloud { +public final class Cloud { private static final Scanner SCANNER = new Scanner(System.in); private static final List TODOS = new ArrayList<>(); private static void handle(String input) { TokenManager manager = new TokenManager(input); switch (manager.getCommand()) { - case "": - Cloud.say("Please enter a valid command."); + case "todo": + case "t": + case "deadline": + case "d": + case "event": + case "e": + case "add": { + if (manager.getDescription().length() <= 0) { + Cloud.say("Please enter a description for your TODO."); + break; + } + + Todo todo = Cloud.createTodo(manager); + Cloud.TODOS.add(todo); + Cloud.say(todo.toString(Cloud.TODOS.size())); break; + } case "list": + case "l":{ if (Cloud.TODOS.size() <= 0) { Cloud.say("Your TODO list is empty."); - return; + break; } for (int i = 0; i < Cloud.TODOS.size(); i++) { @@ -36,10 +51,12 @@ private static void handle(String input) { Cloud.say(todo.toString(i + 1)); } break; - case "mark": { + } + case "mark": + case "m": { Integer number = Cloud.verifyNumber(manager); if (number == null) { - return; + break; } Todo todo = Cloud.TODOS.get(number - 1); @@ -47,10 +64,11 @@ private static void handle(String input) { Cloud.say(todo.toString(number)); break; } - case "unmark": { + case "unmark": + case "un": { Integer number = Cloud.verifyNumber(manager); if (number == null) { - return; + break; } Todo todo = Cloud.TODOS.get(number - 1); @@ -59,16 +77,28 @@ private static void handle(String input) { break; } case "bye": + case "exit": + case "quit": + case "q": + case "done": { Cloud.say("\\o"); System.exit(0); break; - default: - // Stores new TODO - Todo todo = Cloud.createTodo(manager); - Cloud.TODOS.add(todo); - Cloud.say(todo.toString(Cloud.TODOS.size())); + } + default: { + if (manager.getCommand().length() <= 0) { + break; + } + + Cloud.say( + String.format( + "\"%s\" is not a valid command.", + manager.getCommand() + ) + ); break; } + } } private static Todo createTodo(TokenManager manager) { @@ -77,12 +107,12 @@ private static Todo createTodo(TokenManager manager) { TokenManager inputTo = manager.findFlag("to"); if (inputBy != null) { - return new Deadline(manager.toString(), inputBy.toString()); + return new Deadline(manager.getDescription(), inputBy.toString()); } if (inputFrom != null && inputTo != null) { - return new Event(manager.toString(), inputFrom.toString(), inputTo.toString()); + return new Event(manager.getDescription(), inputFrom.toString(), inputTo.toString()); } - return new Todo(manager.toString()); + return new Todo(manager.getDescription()); } private static Integer verifyNumber(TokenManager manager) { @@ -106,13 +136,13 @@ private static Integer verifyNumber(TokenManager manager) { Cloud.say( String.format( "TODO #%d does not exist.", - numberToken.asInt() + numberToken.toInt() ) ); return null; } - return numberToken.asInt(); + return numberToken.toInt(); } private static void say(String text) { diff --git a/src/com/cloud/chatbot/token/Token.java b/src/com/cloud/chatbot/token/Token.java index bee39c865d..15b124a1c2 100644 --- a/src/com/cloud/chatbot/token/Token.java +++ b/src/com/cloud/chatbot/token/Token.java @@ -19,7 +19,7 @@ public Token(String _token) { this.token = _token; } - private Integer toInt() { + private Integer toInteger() { try { return Integer.parseInt(token); } catch (NumberFormatException e) { @@ -35,19 +35,21 @@ public String get() { * Whether the token can be converted to a valid integer. */ public boolean isInt() { - Integer integer = this.toInt(); + Integer integer = this.toInteger(); return integer != null; } /** * Returns the token as an integer. * + * Use isInt() to check if this is possible. + * * @return Defaults to -1 if the token cannot be converted to a valid integer. */ - public int asInt() { + public int toInt() { if (!this.isInt()) return -1; - return this.toInt(); + return this.toInteger(); } /** @@ -58,7 +60,7 @@ public int asInt() { public boolean isValidNumber(List todos) { if (!this.isInt()) return false; - int number = this.asInt(); + int number = this.toInt(); if (number < 0 || number > todos.size()) { return false; @@ -76,11 +78,13 @@ public boolean isFlag() { /** * Returns the text portion of the flag. * + * Use isFlag() to check if this makes sense. + * * @return Defaults to "" if the token is not actually a flag. */ public String getFlag() { if (!this.isFlag()) return ""; - return this.token.substring(1); + return this.token.substring(Token.PREFIX_FLAG.length()).toLowerCase(); } } diff --git a/src/com/cloud/chatbot/token/TokenManager.java b/src/com/cloud/chatbot/token/TokenManager.java index 314015a5cb..7c1756b7b1 100644 --- a/src/com/cloud/chatbot/token/TokenManager.java +++ b/src/com/cloud/chatbot/token/TokenManager.java @@ -50,9 +50,17 @@ public TokenManager(String input) { } public TokenManager(List _tokens) { + // Assumption: The passed list will not be mutated externally this.tokens = _tokens; } + private static String tokensToString(List tokens) { + return tokens + .stream() + .map(Token::get) + .collect(Collectors.joining(" ")); + } + private int findFlagSetEnd(int startIndex) { int lastIndex = this.tokens.size() - 1; int movingIndex = startIndex + 1; @@ -88,10 +96,7 @@ private List removeTokens(int startIndex, int endIndex) { @Override public String toString() { - return this.tokens - .stream() - .map(Token::get) - .collect(Collectors.joining(" ")); + return TokenManager.tokensToString(this.tokens); } public List getTokens() { @@ -108,13 +113,28 @@ public String getCommand() { return ""; } - return this.tokens.get(0).get(); + return this.tokens.get(0).get().toLowerCase(); + } + + /** + * Returns all rejoined tokens except the command. + * + * @return Defaults to "" if the user input is too short. + */ + public String getDescription() { + if (this.tokens.size() <= 1) { + return ""; + } + + List descriptionTokens = new ArrayList<>(this.tokens); + descriptionTokens.remove(0); + return TokenManager.tokensToString(descriptionTokens); } /** * Returns the TokenManager for the specified flag, if it exists. * - * @return Defaults to null if no such flag exists. + * @return null if no such flag exists. */ public TokenManager findFlag(String flag) { return this.flagSets.get(flag); From 0e012578586068a3b1f81668f7f080d927845be6 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Sun, 3 Sep 2023 16:57:16 +0800 Subject: [PATCH 030/112] devfeat(tests): Update inputs/outputs --- tests/EXPECTED.txt | 4 ++++ tests/input.txt | 14 ++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/EXPECTED.txt b/tests/EXPECTED.txt index fbd191fe54..ba694e5193 100644 --- a/tests/EXPECTED.txt +++ b/tests/EXPECTED.txt @@ -1,5 +1,9 @@ Cloud online. +>>> "wat" is not a valid command. + +>>> Please enter a description for your TODO. + >>> | T#1: Download wk 3 files >>> | D#2: Watch L3 recording | BY Friday diff --git a/tests/input.txt b/tests/input.txt index e850831341..0132c691a7 100644 --- a/tests/input.txt +++ b/tests/input.txt @@ -1,11 +1,13 @@ -Download wk 3 files -Watch L3 recording /by Friday -Project meeting /from Monday 3pm /to Monday 4:30pm +wat how to use +e +TODO Download wk 3 files +deadline Watch L3 recording /by Friday +event Project meeting /from Monday 3pm /To Monday 4:30pm list mark a -mark -7050 -mark 2 +MARK -7050 +Mark 2 mark 2 mark 3 unmark 3 -unmark 3 +un 3 From becf3388c23c25fb6c3276a535a549e29e60509f Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Sun, 3 Sep 2023 18:04:35 +0800 Subject: [PATCH 031/112] fix(): Use new MissingInputException, fix empty split() corner case --- src/com/cloud/chatbot/Cloud.java | 36 ++++++++++++------- .../exceptions/MissingInputException.java | 14 ++++++++ src/com/cloud/chatbot/token/TokenManager.java | 30 +++++++++++----- tests/EXPECTED.txt | 2 ++ tests/input.txt | 2 ++ 5 files changed, 64 insertions(+), 20 deletions(-) create mode 100644 src/com/cloud/chatbot/exceptions/MissingInputException.java diff --git a/src/com/cloud/chatbot/Cloud.java b/src/com/cloud/chatbot/Cloud.java index 7435433d82..6d0e45bca1 100644 --- a/src/com/cloud/chatbot/Cloud.java +++ b/src/com/cloud/chatbot/Cloud.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Scanner; +import com.cloud.chatbot.exceptions.MissingInputException; import com.cloud.chatbot.todo.Deadline; import com.cloud.chatbot.todo.Event; import com.cloud.chatbot.todo.Todo; @@ -21,7 +22,15 @@ public final class Cloud { private static void handle(String input) { TokenManager manager = new TokenManager(input); - switch (manager.getCommand()) { + String command; + try { + command = manager.getCommand(); + } catch (MissingInputException e) { + // Ignore empty inputs + return; + } + + switch (command) { case "todo": case "t": case "deadline": @@ -29,12 +38,11 @@ private static void handle(String input) { case "event": case "e": case "add": { - if (manager.getDescription().length() <= 0) { - Cloud.say("Please enter a description for your TODO."); + Todo todo = Cloud.createTodo(manager); + if (todo == null) { break; } - Todo todo = Cloud.createTodo(manager); Cloud.TODOS.add(todo); Cloud.say(todo.toString(Cloud.TODOS.size())); break; @@ -86,14 +94,10 @@ private static void handle(String input) { break; } default: { - if (manager.getCommand().length() <= 0) { - break; - } - Cloud.say( String.format( "\"%s\" is not a valid command.", - manager.getCommand() + command ) ); break; @@ -102,17 +106,25 @@ private static void handle(String input) { } private static Todo createTodo(TokenManager manager) { + String description; + try { + description = manager.getDescription(); + } catch (MissingInputException e) { + Cloud.say(e.getMessage()); + return null; + } + TokenManager inputBy = manager.findFlag("by"); TokenManager inputFrom = manager.findFlag("from"); TokenManager inputTo = manager.findFlag("to"); if (inputBy != null) { - return new Deadline(manager.getDescription(), inputBy.toString()); + return new Deadline(description, inputBy.toString()); } if (inputFrom != null && inputTo != null) { - return new Event(manager.getDescription(), inputFrom.toString(), inputTo.toString()); + return new Event(description, inputFrom.toString(), inputTo.toString()); } - return new Todo(manager.getDescription()); + return new Todo(description); } private static Integer verifyNumber(TokenManager manager) { diff --git a/src/com/cloud/chatbot/exceptions/MissingInputException.java b/src/com/cloud/chatbot/exceptions/MissingInputException.java new file mode 100644 index 0000000000..047e44080f --- /dev/null +++ b/src/com/cloud/chatbot/exceptions/MissingInputException.java @@ -0,0 +1,14 @@ +package com.cloud.chatbot.exceptions; + + + +/** + * An exception for when the user does not specify all required inputs. + */ +public class MissingInputException extends Exception { + public MissingInputException() {} + + public MissingInputException(String message) { + super(message); + } +} diff --git a/src/com/cloud/chatbot/token/TokenManager.java b/src/com/cloud/chatbot/token/TokenManager.java index 7c1756b7b1..4a24373e1e 100644 --- a/src/com/cloud/chatbot/token/TokenManager.java +++ b/src/com/cloud/chatbot/token/TokenManager.java @@ -5,6 +5,8 @@ import java.util.List; import java.util.stream.Collectors; +import com.cloud.chatbot.exceptions.MissingInputException; + /** @@ -19,12 +21,24 @@ public class TokenManager { private HashMap flagSets = new HashMap<>(); public TokenManager(String input) { + // Corner case: Passing "" returns [""] instead of [] + // https://stackoverflow.com/q/4964484/11536796 String[] words = input.split(" "); + boolean encounteredContent = false; for (int i = 0; i < words.length; i++) { String word = words[i]; - Token token = new Token(word); - this.tokens.add(token); + + // Deal with corner case by ignoring any leading "" + if (!word.equals("")) { + encounteredContent = true; + } + + if (encounteredContent) { + Token token = new Token(word); + this.tokens.add(token); + } + } // Go through tokens to extract flag sets @@ -106,11 +120,11 @@ public List getTokens() { /** * Returns the first token, understood to be the command. * - * @return Defaults to "" if the user input is too short. + * @throws MissingInputException If the user input is too short. */ - public String getCommand() { + public String getCommand() throws MissingInputException { if (this.tokens.size() <= 0) { - return ""; + throw new MissingInputException(); } return this.tokens.get(0).get().toLowerCase(); @@ -119,11 +133,11 @@ public String getCommand() { /** * Returns all rejoined tokens except the command. * - * @return Defaults to "" if the user input is too short. + * @throws MissingInputException If the user input is too short. */ - public String getDescription() { + public String getDescription() throws MissingInputException { if (this.tokens.size() <= 1) { - return ""; + throw new MissingInputException("Please enter a description for your TODO."); } List descriptionTokens = new ArrayList<>(this.tokens); diff --git a/tests/EXPECTED.txt b/tests/EXPECTED.txt index ba694e5193..36e32265bc 100644 --- a/tests/EXPECTED.txt +++ b/tests/EXPECTED.txt @@ -2,6 +2,8 @@ Cloud online. >>> "wat" is not a valid command. +>>> +>>> >>> Please enter a description for your TODO. >>> | T#1: Download wk 3 files diff --git a/tests/input.txt b/tests/input.txt index 0132c691a7..ec9959e28d 100644 --- a/tests/input.txt +++ b/tests/input.txt @@ -1,4 +1,6 @@ wat how to use + + e TODO Download wk 3 files deadline Watch L3 recording /by Friday From 541f6bcb6fde8dca9b648f3fc8c74c2ccde21e9f Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Sun, 3 Sep 2023 18:09:26 +0800 Subject: [PATCH 032/112] ref(src): Use new @Nullable --- src/com/cloud/chatbot/Cloud.java | 17 +++++++++-------- src/com/cloud/chatbot/annotations/Nullable.java | 9 +++++++++ src/com/cloud/chatbot/token/Token.java | 5 +++-- src/com/cloud/chatbot/token/TokenManager.java | 3 ++- 4 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 src/com/cloud/chatbot/annotations/Nullable.java diff --git a/src/com/cloud/chatbot/Cloud.java b/src/com/cloud/chatbot/Cloud.java index 6d0e45bca1..41d48838f4 100644 --- a/src/com/cloud/chatbot/Cloud.java +++ b/src/com/cloud/chatbot/Cloud.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Scanner; +import com.cloud.chatbot.annotations.Nullable; import com.cloud.chatbot.exceptions.MissingInputException; import com.cloud.chatbot.todo.Deadline; import com.cloud.chatbot.todo.Event; @@ -38,7 +39,7 @@ private static void handle(String input) { case "event": case "e": case "add": { - Todo todo = Cloud.createTodo(manager); + @Nullable Todo todo = Cloud.createTodo(manager); if (todo == null) { break; } @@ -62,7 +63,7 @@ private static void handle(String input) { } case "mark": case "m": { - Integer number = Cloud.verifyNumber(manager); + @Nullable Integer number = Cloud.verifyNumber(manager); if (number == null) { break; } @@ -74,7 +75,7 @@ private static void handle(String input) { } case "unmark": case "un": { - Integer number = Cloud.verifyNumber(manager); + @Nullable Integer number = Cloud.verifyNumber(manager); if (number == null) { break; } @@ -105,7 +106,7 @@ private static void handle(String input) { } } - private static Todo createTodo(TokenManager manager) { + private static @Nullable Todo createTodo(TokenManager manager) { String description; try { description = manager.getDescription(); @@ -114,9 +115,9 @@ private static Todo createTodo(TokenManager manager) { return null; } - TokenManager inputBy = manager.findFlag("by"); - TokenManager inputFrom = manager.findFlag("from"); - TokenManager inputTo = manager.findFlag("to"); + @Nullable TokenManager inputBy = manager.findFlag("by"); + @Nullable TokenManager inputFrom = manager.findFlag("from"); + @Nullable TokenManager inputTo = manager.findFlag("to"); if (inputBy != null) { return new Deadline(description, inputBy.toString()); @@ -127,7 +128,7 @@ private static Todo createTodo(TokenManager manager) { return new Todo(description); } - private static Integer verifyNumber(TokenManager manager) { + private static @Nullable Integer verifyNumber(TokenManager manager) { List tokens = manager.getTokens(); if (tokens.size() <= 1) { return null; diff --git a/src/com/cloud/chatbot/annotations/Nullable.java b/src/com/cloud/chatbot/annotations/Nullable.java new file mode 100644 index 0000000000..4bcca71827 --- /dev/null +++ b/src/com/cloud/chatbot/annotations/Nullable.java @@ -0,0 +1,9 @@ +package com.cloud.chatbot.annotations; + + + +/** + * Explicitly marks types as potentially being null, meaning appropriate null + * checking is in order. + */ +public @interface Nullable {} diff --git a/src/com/cloud/chatbot/token/Token.java b/src/com/cloud/chatbot/token/Token.java index 15b124a1c2..0012a6b7ea 100644 --- a/src/com/cloud/chatbot/token/Token.java +++ b/src/com/cloud/chatbot/token/Token.java @@ -2,6 +2,7 @@ import java.util.List; +import com.cloud.chatbot.annotations.Nullable; import com.cloud.chatbot.todo.Todo; @@ -19,7 +20,7 @@ public Token(String _token) { this.token = _token; } - private Integer toInteger() { + private @Nullable Integer toInteger() { try { return Integer.parseInt(token); } catch (NumberFormatException e) { @@ -35,7 +36,7 @@ public String get() { * Whether the token can be converted to a valid integer. */ public boolean isInt() { - Integer integer = this.toInteger(); + @Nullable Integer integer = this.toInteger(); return integer != null; } diff --git a/src/com/cloud/chatbot/token/TokenManager.java b/src/com/cloud/chatbot/token/TokenManager.java index 4a24373e1e..6bea52f234 100644 --- a/src/com/cloud/chatbot/token/TokenManager.java +++ b/src/com/cloud/chatbot/token/TokenManager.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.stream.Collectors; +import com.cloud.chatbot.annotations.Nullable; import com.cloud.chatbot.exceptions.MissingInputException; @@ -150,7 +151,7 @@ public String getDescription() throws MissingInputException { * * @return null if no such flag exists. */ - public TokenManager findFlag(String flag) { + public @Nullable TokenManager findFlag(String flag) { return this.flagSets.get(flag); } } From 9a7cdeed82dd7d637611c43b14d9d1ebe8268e21 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Sun, 3 Sep 2023 19:27:38 +0800 Subject: [PATCH 033/112] feat(): TokenManager child classes, empty sub input exception Also enhances tests --- src/com/cloud/chatbot/Cloud.java | 47 +++--- .../exceptions/MissingFlagInputException.java | 23 +++ .../exceptions/MissingInputException.java | 2 +- .../cloud/chatbot/token/CommandManager.java | 108 ++++++++++++++ src/com/cloud/chatbot/token/FlagManager.java | 41 ++++++ src/com/cloud/chatbot/token/Token.java | 9 +- src/com/cloud/chatbot/token/TokenManager.java | 137 +++++------------- tests/EXPECTED.txt | 22 ++- tests/input.txt | 10 +- 9 files changed, 271 insertions(+), 128 deletions(-) create mode 100644 src/com/cloud/chatbot/exceptions/MissingFlagInputException.java create mode 100644 src/com/cloud/chatbot/token/CommandManager.java create mode 100644 src/com/cloud/chatbot/token/FlagManager.java diff --git a/src/com/cloud/chatbot/Cloud.java b/src/com/cloud/chatbot/Cloud.java index 41d48838f4..3663c4bbde 100644 --- a/src/com/cloud/chatbot/Cloud.java +++ b/src/com/cloud/chatbot/Cloud.java @@ -5,10 +5,13 @@ import java.util.Scanner; import com.cloud.chatbot.annotations.Nullable; +import com.cloud.chatbot.exceptions.MissingFlagInputException; import com.cloud.chatbot.exceptions.MissingInputException; import com.cloud.chatbot.todo.Deadline; import com.cloud.chatbot.todo.Event; import com.cloud.chatbot.todo.Todo; +import com.cloud.chatbot.token.CommandManager; +import com.cloud.chatbot.token.FlagManager; import com.cloud.chatbot.token.Token; import com.cloud.chatbot.token.TokenManager; @@ -22,7 +25,7 @@ public final class Cloud { private static final List TODOS = new ArrayList<>(); private static void handle(String input) { - TokenManager manager = new TokenManager(input); + CommandManager manager = new CommandManager(input); String command; try { command = manager.getCommand(); @@ -106,40 +109,50 @@ private static void handle(String input) { } } - private static @Nullable Todo createTodo(TokenManager manager) { + private static @Nullable Todo createTodo(CommandManager manager) { String description; try { - description = manager.getDescription(); + description = manager.getDetails(); } catch (MissingInputException e) { - Cloud.say(e.getMessage()); + Cloud.say("Please enter a description for your TODO."); return null; } - @Nullable TokenManager inputBy = manager.findFlag("by"); - @Nullable TokenManager inputFrom = manager.findFlag("from"); - @Nullable TokenManager inputTo = manager.findFlag("to"); + @Nullable FlagManager managerBy = manager.findFlag("by"); + @Nullable FlagManager managerFrom = manager.findFlag("from"); + @Nullable FlagManager managerTo = manager.findFlag("to"); - if (inputBy != null) { - return new Deadline(description, inputBy.toString()); - } - if (inputFrom != null && inputTo != null) { - return new Event(description, inputFrom.toString(), inputTo.toString()); + try { + if (managerBy != null) { + return new Deadline(description, managerBy.getSubInput()); + } + if (managerFrom != null && managerTo != null) { + return new Event(description, managerFrom.getSubInput(), managerTo.getSubInput()); + } + } catch (MissingFlagInputException e) { + Cloud.say( + String.format( + "Please enter a description for the \"%s\" flag.", + e.getFlagText() + ) + ); + return null; } + return new Todo(description); } - private static @Nullable Integer verifyNumber(TokenManager manager) { - List tokens = manager.getTokens(); - if (tokens.size() <= 1) { + private static @Nullable Integer verifyNumber(CommandManager manager) { + if (manager.getTokenCount() <= 1) { return null; } - Token numberToken = tokens.get(1); + Token numberToken = manager.getToken(1); if (!numberToken.isInt()) { Cloud.say( String.format( "\"%s\" is not a valid number.", - numberToken.get() + numberToken.toString() ) ); return null; diff --git a/src/com/cloud/chatbot/exceptions/MissingFlagInputException.java b/src/com/cloud/chatbot/exceptions/MissingFlagInputException.java new file mode 100644 index 0000000000..fcfe92e7ad --- /dev/null +++ b/src/com/cloud/chatbot/exceptions/MissingFlagInputException.java @@ -0,0 +1,23 @@ +package com.cloud.chatbot.exceptions; + +import com.cloud.chatbot.token.FlagManager; + + + +/** + * Thrown when the user does not specify all required sub inputs for a flag. + */ +public class MissingFlagInputException extends MissingInputException { + private FlagManager manager; + + public MissingFlagInputException(FlagManager _manager) { + this.manager = _manager; + } + + /** + * Returns the text portion of the associated flag. + */ + public String getFlagText() { + return manager.getFlagText(); + } +} diff --git a/src/com/cloud/chatbot/exceptions/MissingInputException.java b/src/com/cloud/chatbot/exceptions/MissingInputException.java index 047e44080f..da32feaa64 100644 --- a/src/com/cloud/chatbot/exceptions/MissingInputException.java +++ b/src/com/cloud/chatbot/exceptions/MissingInputException.java @@ -3,7 +3,7 @@ /** - * An exception for when the user does not specify all required inputs. + * Thrown when the user does not specify all required inputs. */ public class MissingInputException extends Exception { public MissingInputException() {} diff --git a/src/com/cloud/chatbot/token/CommandManager.java b/src/com/cloud/chatbot/token/CommandManager.java new file mode 100644 index 0000000000..f3723897a9 --- /dev/null +++ b/src/com/cloud/chatbot/token/CommandManager.java @@ -0,0 +1,108 @@ +package com.cloud.chatbot.token; + +import java.util.HashMap; +import java.util.List; + +import com.cloud.chatbot.annotations.Nullable; +import com.cloud.chatbot.exceptions.MissingInputException; + + + +/** + * Manages all the Tokens representing an instance of user input. + * + * The command is the head, while the details are the tail. + * + * A flag set is a flag and its sub input that have been processed. Eg "/by + * Tomorrow night" split into tokens is a flag set, where the flag is "/by" + * whose flag text is "by", and the sub input is "Tomorrow night". + */ +public class CommandManager extends TokenManager { + // Index by flag text instead of Token for faster retrieval + private HashMap flagSets = new HashMap<>(); + + public CommandManager(String input) { + // Corner case: Passing "" returns [""] instead of [] + // https://stackoverflow.com/q/4964484/11536796 + String[] words = input.split(" "); + + boolean encounteredContent = false; + for (int i = 0; i < words.length; i++) { + String word = words[i]; + + // Deal with corner case by ignoring any leading "" + if (!word.equals("")) { + encounteredContent = true; + } + + if (encounteredContent) { + Token token = new Token(word); + this.tokens.add(token); + } + + } + + // Go through tokens to extract flag sets + int i = 0; + while (i < this.tokens.size()) { + Token token = this.tokens.get(i); + + if (token.isFlag()) { + int endIndex = this.findFlagSetEnd(i); + List flagSet = this.removeTokens(i, endIndex); + + FlagManager manager = new FlagManager(flagSet); + this.flagSets.put( + manager.getFlagText(), + manager + ); + + continue; + } + + i++; + } + } + + private int findFlagSetEnd(int startIndex) { + int lastIndex = this.tokens.size() - 1; + int movingIndex = startIndex + 1; + + while (movingIndex <= lastIndex) { + Token token = this.tokens.get(movingIndex); + if (token.isFlag()) break; + + movingIndex++; + } + + // Start index inclusive, end index exclusive + return movingIndex; + } + + /** + * Returns the head as the command (lowercase). + * + * @throws MissingInputException If there is no command. + */ + public String getCommand() throws MissingInputException { + return this.getHead().toLowerCase(); + } + + /** + * Returns the tail as the details. + * + * @throws MissingInputException If there are no details. + */ + public String getDetails() throws MissingInputException { + return this.getTail(); + } + + /** + * Returns the FlagManager for the specified flag, if it exists. + * + * @return null if no such flag exists. + */ + public @Nullable FlagManager findFlag(String flagText) { + return this.flagSets.get(flagText); + } +} diff --git a/src/com/cloud/chatbot/token/FlagManager.java b/src/com/cloud/chatbot/token/FlagManager.java new file mode 100644 index 0000000000..b7a08174ed --- /dev/null +++ b/src/com/cloud/chatbot/token/FlagManager.java @@ -0,0 +1,41 @@ +package com.cloud.chatbot.token; + +import java.util.List; + +import com.cloud.chatbot.exceptions.MissingFlagInputException; +import com.cloud.chatbot.exceptions.MissingInputException; + + + +/** + * Manages a flag set for a CommandManager. + * + * The flag is the head, while the sub input is the tail. + */ +public class FlagManager extends TokenManager { + public FlagManager(List flagSet) { + // Assumption: There is a first token and it is a flag. + // Assumption: The passed list will not be mutated externally + this.tokens = flagSet; + } + + /** + * Returns the text portion of the flag. + */ + public String getFlagText() { + return this.tokens.get(0).getFlagText(); + } + + /** + * Returns the tail as the sub input. + * + * @throws MissingFlagInputException If there is no sub input. + */ + public String getSubInput() throws MissingFlagInputException { + try { + return this.getTail(); + } catch (MissingInputException e) { + throw new MissingFlagInputException(this); + } + } +} diff --git a/src/com/cloud/chatbot/token/Token.java b/src/com/cloud/chatbot/token/Token.java index 0012a6b7ea..fbef62bd78 100644 --- a/src/com/cloud/chatbot/token/Token.java +++ b/src/com/cloud/chatbot/token/Token.java @@ -10,7 +10,7 @@ /** * Represents a single word of user input. */ -public class Token { +public final class Token { /** The prefix for flags */ public static final String PREFIX_FLAG = "/"; @@ -28,7 +28,8 @@ public Token(String _token) { } } - public String get() { + @Override + public String toString() { return this.token; } @@ -77,13 +78,13 @@ public boolean isFlag() { } /** - * Returns the text portion of the flag. + * Returns the text portion of the flag (lowercase). * * Use isFlag() to check if this makes sense. * * @return Defaults to "" if the token is not actually a flag. */ - public String getFlag() { + public String getFlagText() { if (!this.isFlag()) return ""; return this.token.substring(Token.PREFIX_FLAG.length()).toLowerCase(); diff --git a/src/com/cloud/chatbot/token/TokenManager.java b/src/com/cloud/chatbot/token/TokenManager.java index 6bea52f234..c00a46c5bf 100644 --- a/src/com/cloud/chatbot/token/TokenManager.java +++ b/src/com/cloud/chatbot/token/TokenManager.java @@ -1,94 +1,54 @@ package com.cloud.chatbot.token; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; -import com.cloud.chatbot.annotations.Nullable; import com.cloud.chatbot.exceptions.MissingInputException; /** - * Manages all the Tokens representing an instance of user input. - * - * Flag sets are stored separate from the list of Tokens. The first token is understood to be the - * flag, whose flag text is used as the key. The remaining tokens are the sub input, stored in a - * nested TokenManager. + * A general parent Token manager providing children useful shared methods. */ -public class TokenManager { - private List tokens = new ArrayList<>(); - private HashMap flagSets = new HashMap<>(); +public abstract class TokenManager { + protected List tokens = new ArrayList<>(); - public TokenManager(String input) { - // Corner case: Passing "" returns [""] instead of [] - // https://stackoverflow.com/q/4964484/11536796 - String[] words = input.split(" "); + public TokenManager() {} - boolean encounteredContent = false; - for (int i = 0; i < words.length; i++) { - String word = words[i]; - - // Deal with corner case by ignoring any leading "" - if (!word.equals("")) { - encounteredContent = true; - } - - if (encounteredContent) { - Token token = new Token(word); - this.tokens.add(token); - } - - } - - // Go through tokens to extract flag sets - int i = 0; - while (i < tokens.size()) { - Token token = this.tokens.get(i); - - if (token.isFlag()) { - int endIndex = this.findFlagSetEnd(i); - List flagSet = this.removeTokens(i, endIndex); - - // This removal degrades the flag set into a sub input - Token flag = flagSet.remove(0); - this.flagSets.put( - flag.getFlag(), - new TokenManager(flagSet) - ); - continue; - } - - i++; - } - } - - public TokenManager(List _tokens) { - // Assumption: The passed list will not be mutated externally - this.tokens = _tokens; - } - - private static String tokensToString(List tokens) { + protected static String tokensToString(List tokens) { return tokens .stream() - .map(Token::get) + .map(Token::toString) .collect(Collectors.joining(" ")); } - private int findFlagSetEnd(int startIndex) { - int lastIndex = this.tokens.size() - 1; - int movingIndex = startIndex + 1; + /** + * Returns the first token as a String. + * + * @throws MissingInputException If there is no first token. + */ + protected String getHead() throws MissingInputException { + if (this.getTokenCount() <= 0) { + throw new MissingInputException(); + } - while (movingIndex <= lastIndex) { - Token token = this.tokens.get(movingIndex); - if (token.isFlag()) break; + return this.tokens.get(0).toString(); + } - movingIndex++; + /** + * Returns all tokens except the first as a rejoined String. + * + * @throws MissingInputException If there are no relevant tokens to join. + */ + protected String getTail() throws MissingInputException { + if (this.getTokenCount() <= 1) { + throw new MissingInputException(); } - // Start index inclusive, end index exclusive - return movingIndex; + List tailTokens = new ArrayList<>(this.tokens); + tailTokens.remove(0); + return TokenManager.tokensToString(tailTokens); } /** @@ -97,7 +57,7 @@ private int findFlagSetEnd(int startIndex) { * @param startIndex The index to start from (inclusive). * @param endIndex The index to end before (exclusive). */ - private List removeTokens(int startIndex, int endIndex) { + protected List removeTokens(int startIndex, int endIndex) { int removeCount = endIndex - startIndex; List removed = new ArrayList<>(); while (removeCount > 0) { @@ -114,44 +74,19 @@ public String toString() { return TokenManager.tokensToString(this.tokens); } - public List getTokens() { - return this.tokens; - } - - /** - * Returns the first token, understood to be the command. - * - * @throws MissingInputException If the user input is too short. - */ - public String getCommand() throws MissingInputException { - if (this.tokens.size() <= 0) { - throw new MissingInputException(); - } - - return this.tokens.get(0).get().toLowerCase(); - } - /** - * Returns all rejoined tokens except the command. + * Returns the Token at the specified index. * - * @throws MissingInputException If the user input is too short. + * @param index The index. */ - public String getDescription() throws MissingInputException { - if (this.tokens.size() <= 1) { - throw new MissingInputException("Please enter a description for your TODO."); - } - - List descriptionTokens = new ArrayList<>(this.tokens); - descriptionTokens.remove(0); - return TokenManager.tokensToString(descriptionTokens); + public Token getToken(int index) { + return this.tokens.get(index); } /** - * Returns the TokenManager for the specified flag, if it exists. - * - * @return null if no such flag exists. + * Returns the total number of Tokens. */ - public @Nullable TokenManager findFlag(String flag) { - return this.flagSets.get(flag); + public int getTokenCount() { + return this.tokens.size(); } } diff --git a/tests/EXPECTED.txt b/tests/EXPECTED.txt index 36e32265bc..5ad2d0d337 100644 --- a/tests/EXPECTED.txt +++ b/tests/EXPECTED.txt @@ -6,15 +6,31 @@ Cloud online. >>> >>> Please enter a description for your TODO. ->>> | T#1: Download wk 3 files +>>> | T#1: Download wk 3 files >>> | D#2: Watch L3 recording | BY Friday >>> | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm ->>> | T#1: Download wk 3 files +>>> Please enter a description for the "by" flag. + +>>> Please enter a description for your TODO. + +>>> | D#4: | BY The deadline has no description 2 + +>>> | D#5: | BY The deadline hasn't proper content! + +>>> | T#6: I tried to make an event by didn't specify flags. + +>>> | E#7: This event has no proper from flag set | FROM | TO Far future. + +>>> | T#1: Download wk 3 files | D#2: Watch L3 recording | BY Friday | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm + | D#4: | BY The deadline has no description 2 + | D#5: | BY The deadline hasn't proper content! + | T#6: I tried to make an event by didn't specify flags. + | E#7: This event has no proper from flag set | FROM | TO Far future. >>> "a" is not a valid number. @@ -30,4 +46,4 @@ Cloud online. >>> | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm ->>> +>>> \ No newline at end of file diff --git a/tests/input.txt b/tests/input.txt index ec9959e28d..94a9fcc1ba 100644 --- a/tests/input.txt +++ b/tests/input.txt @@ -1,10 +1,16 @@ wat how to use -e -TODO Download wk 3 files +t +TODO Download wk 3 files deadline Watch L3 recording /by Friday event Project meeting /from Monday 3pm /To Monday 4:30pm +deadline My deadline flag has no sub input /BY +deadline /by The deadline has no description +deadline /by The deadline has no description 2 +deadline /by The deadline hasn't proper content! +e I tried to make an event by didn't specify flags. +EVENT This event has no proper from flag set /frOM /to Far future. list mark a MARK -7050 From 59bb19f5356f6cf8a65f32e8d36b979289d98b80 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Sun, 3 Sep 2023 20:16:36 +0800 Subject: [PATCH 034/112] feat(): Intelligent space handling! Performance was not much of a concern. This is the kind of thing I'd have wanted for my Discord bots --- src/com/cloud/chatbot/Cloud.java | 1 - .../cloud/chatbot/token/CommandManager.java | 20 +--------- src/com/cloud/chatbot/token/Token.java | 21 +++++++++++ src/com/cloud/chatbot/token/TokenManager.java | 37 +++++++++++++++++-- tests/EXPECTED.txt | 37 ++++++++++++------- tests/input.txt | 12 ++++-- 6 files changed, 86 insertions(+), 42 deletions(-) diff --git a/src/com/cloud/chatbot/Cloud.java b/src/com/cloud/chatbot/Cloud.java index 3663c4bbde..e546fe8fcf 100644 --- a/src/com/cloud/chatbot/Cloud.java +++ b/src/com/cloud/chatbot/Cloud.java @@ -13,7 +13,6 @@ import com.cloud.chatbot.token.CommandManager; import com.cloud.chatbot.token.FlagManager; import com.cloud.chatbot.token.Token; -import com.cloud.chatbot.token.TokenManager; diff --git a/src/com/cloud/chatbot/token/CommandManager.java b/src/com/cloud/chatbot/token/CommandManager.java index f3723897a9..6fe425874c 100644 --- a/src/com/cloud/chatbot/token/CommandManager.java +++ b/src/com/cloud/chatbot/token/CommandManager.java @@ -22,25 +22,7 @@ public class CommandManager extends TokenManager { private HashMap flagSets = new HashMap<>(); public CommandManager(String input) { - // Corner case: Passing "" returns [""] instead of [] - // https://stackoverflow.com/q/4964484/11536796 - String[] words = input.split(" "); - - boolean encounteredContent = false; - for (int i = 0; i < words.length; i++) { - String word = words[i]; - - // Deal with corner case by ignoring any leading "" - if (!word.equals("")) { - encounteredContent = true; - } - - if (encounteredContent) { - Token token = new Token(word); - this.tokens.add(token); - } - - } + this.tokens = TokenManager.stringToTokens(input); // Go through tokens to extract flag sets int i = 0; diff --git a/src/com/cloud/chatbot/token/Token.java b/src/com/cloud/chatbot/token/Token.java index fbef62bd78..0d82c6bc03 100644 --- a/src/com/cloud/chatbot/token/Token.java +++ b/src/com/cloud/chatbot/token/Token.java @@ -16,6 +16,8 @@ public final class Token { private String token; + private int nextSpaces = 0; + public Token(String _token) { this.token = _token; } @@ -89,4 +91,23 @@ public String getFlagText() { return this.token.substring(Token.PREFIX_FLAG.length()).toLowerCase(); } + + public int getNextSpaces() { + return nextSpaces; + } + + public String getSpacesString() { + return " ".repeat(this.nextSpaces); + } + + public void setNextSpaces(int count) { + this.nextSpaces = count; + } + + /** + * Increments nextSpaces. + */ + public void incrementNextSpaces() { + this.nextSpaces++; + } } diff --git a/src/com/cloud/chatbot/token/TokenManager.java b/src/com/cloud/chatbot/token/TokenManager.java index c00a46c5bf..839f8c931e 100644 --- a/src/com/cloud/chatbot/token/TokenManager.java +++ b/src/com/cloud/chatbot/token/TokenManager.java @@ -16,11 +16,40 @@ public abstract class TokenManager { public TokenManager() {} + protected static List stringToTokens(String s) { + String trimmed = s.trim(); + + String word = ""; + List tokens = new ArrayList<>(); + for (int i = 0; i < trimmed.length(); i++) { + char c = trimmed.charAt(i); + if (c == ' ') { + if (word.length() > 0) { + tokens.add(new Token(word)); + word = ""; + } + + tokens.get(tokens.size() - 1).incrementNextSpaces(); + } else { + word += c; + } + } + + if (word.length() > 0) { + tokens.add(new Token(word)); + } + + return tokens; + } + protected static String tokensToString(List tokens) { - return tokens - .stream() - .map(Token::toString) - .collect(Collectors.joining(" ")); + String joined = ""; + for (int i = 0; i < tokens.size(); i++) { + Token token = tokens.get(i); + joined += token.toString(); + joined += token.getSpacesString(); + } + return joined.trim(); } /** diff --git a/tests/EXPECTED.txt b/tests/EXPECTED.txt index 5ad2d0d337..0e82bae915 100644 --- a/tests/EXPECTED.txt +++ b/tests/EXPECTED.txt @@ -6,9 +6,9 @@ Cloud online. >>> >>> Please enter a description for your TODO. ->>> | T#1: Download wk 3 files +>>> | T#1: Download wk 3 files ->>> | D#2: Watch L3 recording | BY Friday +>>> | D#2: Watch L3 recording | BY Friday 2359 >>> | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm @@ -16,29 +16,26 @@ Cloud online. >>> Please enter a description for your TODO. ->>> | D#4: | BY The deadline has no description 2 +>>> Please enter a description for your TODO. ->>> | D#5: | BY The deadline hasn't proper content! +>>> Please enter a description for your TODO. ->>> | T#6: I tried to make an event by didn't specify flags. +>>> | T#4: I tried to make an event by didn't specify flags. ->>> | E#7: This event has no proper from flag set | FROM | TO Far future. +>>> Please enter a description for the "from" flag. ->>> | T#1: Download wk 3 files - | D#2: Watch L3 recording | BY Friday +>>> | T#1: Download wk 3 files + | D#2: Watch L3 recording | BY Friday 2359 | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm - | D#4: | BY The deadline has no description 2 - | D#5: | BY The deadline hasn't proper content! - | T#6: I tried to make an event by didn't specify flags. - | E#7: This event has no proper from flag set | FROM | TO Far future. + | T#4: I tried to make an event by didn't specify flags. >>> "a" is not a valid number. >>> TODO #-7050 does not exist. ->>> X | D#2: Watch L3 recording | BY Friday +>>> X | D#2: Watch L3 recording | BY Friday 2359 ->>> X | D#2: Watch L3 recording | BY Friday +>>> X | D#2: Watch L3 recording | BY Friday 2359 >>> X | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm @@ -46,4 +43,16 @@ Cloud online. >>> | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm +>>> TODO #5 does not exist. + +>>> X | T#4: I tried to make an event by didn't specify flags. + +>>> | D#5: another | BY x + +>>> | T#1: Download wk 3 files +X | D#2: Watch L3 recording | BY Friday 2359 + | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm +X | T#4: I tried to make an event by didn't specify flags. + | D#5: another | BY x + >>> \ No newline at end of file diff --git a/tests/input.txt b/tests/input.txt index 94a9fcc1ba..feb2ce506a 100644 --- a/tests/input.txt +++ b/tests/input.txt @@ -2,13 +2,13 @@ wat how to use t -TODO Download wk 3 files -deadline Watch L3 recording /by Friday +TODO Download wk 3 files +deadline Watch L3 recording /by Friday 2359 event Project meeting /from Monday 3pm /To Monday 4:30pm deadline My deadline flag has no sub input /BY deadline /by The deadline has no description -deadline /by The deadline has no description 2 -deadline /by The deadline hasn't proper content! +deadline /by No description again +deadline /by No description yet again! e I tried to make an event by didn't specify flags. EVENT This event has no proper from flag set /frOM /to Far future. list @@ -19,3 +19,7 @@ mark 2 mark 3 unmark 3 un 3 +m 5 +m 4 +add another /by x +l \ No newline at end of file From e161bc511f0d1ade4fb68e60b5c57d1f97ea5291 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Sun, 3 Sep 2023 20:31:34 +0800 Subject: [PATCH 035/112] feat(): Add deletion, fix boundary error --- src/com/cloud/chatbot/Cloud.java | 13 +++++++++++++ src/com/cloud/chatbot/token/Token.java | 2 +- tests/EXPECTED.txt | 16 ++++++++++++++-- tests/input.txt | 14 +++++++++----- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/src/com/cloud/chatbot/Cloud.java b/src/com/cloud/chatbot/Cloud.java index e546fe8fcf..5b8cff04d3 100644 --- a/src/com/cloud/chatbot/Cloud.java +++ b/src/com/cloud/chatbot/Cloud.java @@ -87,6 +87,19 @@ private static void handle(String input) { Cloud.say(todo.toString(number)); break; } + case "delete": + case "del": + case "yeet": { + @Nullable Integer number = Cloud.verifyNumber(manager); + if (number == null) { + break; + } + + Todo todo = Cloud.TODOS.remove(number - 1); + Cloud.say("Yeeted:"); + Cloud.say(todo.toString(number)); + break; + } case "bye": case "exit": case "quit": diff --git a/src/com/cloud/chatbot/token/Token.java b/src/com/cloud/chatbot/token/Token.java index 0d82c6bc03..5fed2cd4f0 100644 --- a/src/com/cloud/chatbot/token/Token.java +++ b/src/com/cloud/chatbot/token/Token.java @@ -66,7 +66,7 @@ public boolean isValidNumber(List todos) { int number = this.toInt(); - if (number < 0 || number > todos.size()) { + if (number <= 0 || number > todos.size()) { return false; } return true; diff --git a/tests/EXPECTED.txt b/tests/EXPECTED.txt index 0e82bae915..cbd8732863 100644 --- a/tests/EXPECTED.txt +++ b/tests/EXPECTED.txt @@ -47,12 +47,24 @@ Cloud online. >>> X | T#4: I tried to make an event by didn't specify flags. ->>> | D#5: another | BY x +>>> | D#5: another | BY ??? >>> | T#1: Download wk 3 files X | D#2: Watch L3 recording | BY Friday 2359 | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm X | T#4: I tried to make an event by didn't specify flags. - | D#5: another | BY x + | D#5: another | BY ??? + +>>> TODO #0 does not exist. + +>>> Yeeted: + | T#1: Download wk 3 files + +>>> Yeeted: +X | D#1: Watch L3 recording | BY Friday 2359 + +>>> | E#1: Project meeting | FROM Monday 3pm | TO Monday 4:30pm +X | T#2: I tried to make an event by didn't specify flags. + | D#3: another | BY ??? >>> \ No newline at end of file diff --git a/tests/input.txt b/tests/input.txt index feb2ce506a..03ef26a9b9 100644 --- a/tests/input.txt +++ b/tests/input.txt @@ -1,9 +1,9 @@ wat how to use -t -TODO Download wk 3 files -deadline Watch L3 recording /by Friday 2359 +t +TODO Download wk 3 files +deadline Watch L3 recording /by Friday 2359 event Project meeting /from Monday 3pm /To Monday 4:30pm deadline My deadline flag has no sub input /BY deadline /by The deadline has no description @@ -21,5 +21,9 @@ unmark 3 un 3 m 5 m 4 -add another /by x -l \ No newline at end of file +add another /by ??? +l +del 0 +yeet 1 +yeet 1 +l From abb83ad37dc5a8c4d916f4b414881e9e3ed8b10d Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Sun, 3 Sep 2023 20:41:38 +0800 Subject: [PATCH 036/112] ref(src): Add CommandType enum! --- src/com/cloud/chatbot/Cloud.java | 30 +++------- src/com/cloud/chatbot/CommandType.java | 55 +++++++++++++++++++ src/com/cloud/chatbot/token/TokenManager.java | 1 - 3 files changed, 63 insertions(+), 23 deletions(-) create mode 100644 src/com/cloud/chatbot/CommandType.java diff --git a/src/com/cloud/chatbot/Cloud.java b/src/com/cloud/chatbot/Cloud.java index 5b8cff04d3..24c68494c9 100644 --- a/src/com/cloud/chatbot/Cloud.java +++ b/src/com/cloud/chatbot/Cloud.java @@ -33,14 +33,8 @@ private static void handle(String input) { return; } - switch (command) { - case "todo": - case "t": - case "deadline": - case "d": - case "event": - case "e": - case "add": { + switch (CommandType.stringToCommandType(command)) { + case ADD: { @Nullable Todo todo = Cloud.createTodo(manager); if (todo == null) { break; @@ -50,8 +44,7 @@ private static void handle(String input) { Cloud.say(todo.toString(Cloud.TODOS.size())); break; } - case "list": - case "l":{ + case LIST: { if (Cloud.TODOS.size() <= 0) { Cloud.say("Your TODO list is empty."); break; @@ -63,8 +56,7 @@ private static void handle(String input) { } break; } - case "mark": - case "m": { + case MARK: { @Nullable Integer number = Cloud.verifyNumber(manager); if (number == null) { break; @@ -75,8 +67,7 @@ private static void handle(String input) { Cloud.say(todo.toString(number)); break; } - case "unmark": - case "un": { + case UNMARK: { @Nullable Integer number = Cloud.verifyNumber(manager); if (number == null) { break; @@ -87,9 +78,7 @@ private static void handle(String input) { Cloud.say(todo.toString(number)); break; } - case "delete": - case "del": - case "yeet": { + case DELETE: { @Nullable Integer number = Cloud.verifyNumber(manager); if (number == null) { break; @@ -100,15 +89,12 @@ private static void handle(String input) { Cloud.say(todo.toString(number)); break; } - case "bye": - case "exit": - case "quit": - case "q": - case "done": { + case EXIT: { Cloud.say("\\o"); System.exit(0); break; } + case UNKNOWN: default: { Cloud.say( String.format( diff --git a/src/com/cloud/chatbot/CommandType.java b/src/com/cloud/chatbot/CommandType.java new file mode 100644 index 0000000000..45185df2c2 --- /dev/null +++ b/src/com/cloud/chatbot/CommandType.java @@ -0,0 +1,55 @@ +package com.cloud.chatbot; + + + +/** + * Represents all possible command types, including unknown commands. + */ +public enum CommandType { + ADD, + LIST, + MARK, + UNMARK, + DELETE, + EXIT, + UNKNOWN; + + /** + * Returns the matching command type for the specified command. + * + * @param command The command. + */ + public static CommandType stringToCommandType(String command) { + switch (command) { + case "todo": + case "t": + case "deadline": + case "d": + case "event": + case "e": + case "add": + return CommandType.ADD; + case "list": + case "l": + return CommandType.LIST; + case "mark": + case "m": + return CommandType.MARK; + case "unmark": + case "un": + return CommandType.UNMARK; + case "delete": + case "del": + case "yeet": + return CommandType.DELETE; + case "bye": + case "exit": + case "quit": + case "q": + case "done": + return CommandType.EXIT; + default: + return CommandType.UNKNOWN; + } + } +} diff --git a/src/com/cloud/chatbot/token/TokenManager.java b/src/com/cloud/chatbot/token/TokenManager.java index 839f8c931e..3c7571d867 100644 --- a/src/com/cloud/chatbot/token/TokenManager.java +++ b/src/com/cloud/chatbot/token/TokenManager.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; import com.cloud.chatbot.exceptions.MissingInputException; From ed9c0c647409d91e9a40d0c5e82c71cdd3ea5e48 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 7 Sep 2023 21:59:40 +0800 Subject: [PATCH 037/112] ref(src): Remove redundant default constructors --- .../cloud/chatbot/exceptions/MissingInputException.java | 8 +------- src/com/cloud/chatbot/token/TokenManager.java | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/com/cloud/chatbot/exceptions/MissingInputException.java b/src/com/cloud/chatbot/exceptions/MissingInputException.java index da32feaa64..92fc9c2b1d 100644 --- a/src/com/cloud/chatbot/exceptions/MissingInputException.java +++ b/src/com/cloud/chatbot/exceptions/MissingInputException.java @@ -5,10 +5,4 @@ /** * Thrown when the user does not specify all required inputs. */ -public class MissingInputException extends Exception { - public MissingInputException() {} - - public MissingInputException(String message) { - super(message); - } -} +public class MissingInputException extends Exception {} diff --git a/src/com/cloud/chatbot/token/TokenManager.java b/src/com/cloud/chatbot/token/TokenManager.java index 3c7571d867..c60fae7b92 100644 --- a/src/com/cloud/chatbot/token/TokenManager.java +++ b/src/com/cloud/chatbot/token/TokenManager.java @@ -13,8 +13,6 @@ public abstract class TokenManager { protected List tokens = new ArrayList<>(); - public TokenManager() {} - protected static List stringToTokens(String s) { String trimmed = s.trim(); From bc86d2e8db7a39d17e62c696c1b1c84ce8e28199 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 7 Sep 2023 22:00:02 +0800 Subject: [PATCH 038/112] docs(src): Add missing public constructor docs --- .../cloud/chatbot/exceptions/MissingFlagInputException.java | 3 +++ src/com/cloud/chatbot/todo/Deadline.java | 4 ++++ src/com/cloud/chatbot/todo/Event.java | 5 +++++ src/com/cloud/chatbot/todo/Todo.java | 3 +++ src/com/cloud/chatbot/token/CommandManager.java | 3 +++ src/com/cloud/chatbot/token/FlagManager.java | 3 +++ src/com/cloud/chatbot/token/Token.java | 3 +++ 7 files changed, 24 insertions(+) diff --git a/src/com/cloud/chatbot/exceptions/MissingFlagInputException.java b/src/com/cloud/chatbot/exceptions/MissingFlagInputException.java index fcfe92e7ad..6a329f9353 100644 --- a/src/com/cloud/chatbot/exceptions/MissingFlagInputException.java +++ b/src/com/cloud/chatbot/exceptions/MissingFlagInputException.java @@ -10,6 +10,9 @@ public class MissingFlagInputException extends MissingInputException { private FlagManager manager; + /** + * @param _manager The FlagManager that threw this exception. + */ public MissingFlagInputException(FlagManager _manager) { this.manager = _manager; } diff --git a/src/com/cloud/chatbot/todo/Deadline.java b/src/com/cloud/chatbot/todo/Deadline.java index 4d7a83012e..79e9ce2367 100644 --- a/src/com/cloud/chatbot/todo/Deadline.java +++ b/src/com/cloud/chatbot/todo/Deadline.java @@ -8,6 +8,10 @@ public class Deadline extends Todo { private String timestampEnd; + /** + * @param description The TODO description. + * @param end The ending timestamp for the TODO. + */ public Deadline(String _description, String end) { super(_description); diff --git a/src/com/cloud/chatbot/todo/Event.java b/src/com/cloud/chatbot/todo/Event.java index 614b94abd4..d8f7f64bf3 100644 --- a/src/com/cloud/chatbot/todo/Event.java +++ b/src/com/cloud/chatbot/todo/Event.java @@ -8,6 +8,11 @@ public class Event extends Deadline { private String timestampStart; + /** + * @param description The TODO description. + * @param start The starting timestamp for the TODO. + * @param end The ending timestamp for the TODO. + */ public Event(String _description, String start, String end) { super(_description, end); diff --git a/src/com/cloud/chatbot/todo/Todo.java b/src/com/cloud/chatbot/todo/Todo.java index 04a090831c..957320fe91 100644 --- a/src/com/cloud/chatbot/todo/Todo.java +++ b/src/com/cloud/chatbot/todo/Todo.java @@ -10,6 +10,9 @@ public class Todo { private String description; + /** + * @param description The TODO description. + */ public Todo(String _description) { this.description = _description; } diff --git a/src/com/cloud/chatbot/token/CommandManager.java b/src/com/cloud/chatbot/token/CommandManager.java index 6fe425874c..b79d49957f 100644 --- a/src/com/cloud/chatbot/token/CommandManager.java +++ b/src/com/cloud/chatbot/token/CommandManager.java @@ -21,6 +21,9 @@ public class CommandManager extends TokenManager { // Index by flag text instead of Token for faster retrieval private HashMap flagSets = new HashMap<>(); + /** + * @param input The full instance of user input. + */ public CommandManager(String input) { this.tokens = TokenManager.stringToTokens(input); diff --git a/src/com/cloud/chatbot/token/FlagManager.java b/src/com/cloud/chatbot/token/FlagManager.java index b7a08174ed..5d86439227 100644 --- a/src/com/cloud/chatbot/token/FlagManager.java +++ b/src/com/cloud/chatbot/token/FlagManager.java @@ -13,6 +13,9 @@ * The flag is the head, while the sub input is the tail. */ public class FlagManager extends TokenManager { + /** + * @param flagSet The flag set to manage. + */ public FlagManager(List flagSet) { // Assumption: There is a first token and it is a flag. // Assumption: The passed list will not be mutated externally diff --git a/src/com/cloud/chatbot/token/Token.java b/src/com/cloud/chatbot/token/Token.java index 5fed2cd4f0..1a81e25a78 100644 --- a/src/com/cloud/chatbot/token/Token.java +++ b/src/com/cloud/chatbot/token/Token.java @@ -18,6 +18,9 @@ public final class Token { private int nextSpaces = 0; + /** + * @param _token The word this token represents. + */ public Token(String _token) { this.token = _token; } From c6eed14c20273fdd855fa793d72a7de4f1f95866 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Fri, 8 Sep 2023 05:42:48 +0800 Subject: [PATCH 039/112] chore(src): Restore src/main/java/ structure --- src/{ => main/java}/com/cloud/chatbot/Cloud.java | 0 src/{ => main/java}/com/cloud/chatbot/CommandType.java | 0 src/{ => main/java}/com/cloud/chatbot/annotations/Nullable.java | 0 .../com/cloud/chatbot/exceptions/MissingFlagInputException.java | 0 .../java}/com/cloud/chatbot/exceptions/MissingInputException.java | 0 src/{ => main/java}/com/cloud/chatbot/todo/Deadline.java | 0 src/{ => main/java}/com/cloud/chatbot/todo/Event.java | 0 src/{ => main/java}/com/cloud/chatbot/todo/Todo.java | 0 src/{ => main/java}/com/cloud/chatbot/token/CommandManager.java | 0 src/{ => main/java}/com/cloud/chatbot/token/FlagManager.java | 0 src/{ => main/java}/com/cloud/chatbot/token/Token.java | 0 src/{ => main/java}/com/cloud/chatbot/token/TokenManager.java | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename src/{ => main/java}/com/cloud/chatbot/Cloud.java (100%) rename src/{ => main/java}/com/cloud/chatbot/CommandType.java (100%) rename src/{ => main/java}/com/cloud/chatbot/annotations/Nullable.java (100%) rename src/{ => main/java}/com/cloud/chatbot/exceptions/MissingFlagInputException.java (100%) rename src/{ => main/java}/com/cloud/chatbot/exceptions/MissingInputException.java (100%) rename src/{ => main/java}/com/cloud/chatbot/todo/Deadline.java (100%) rename src/{ => main/java}/com/cloud/chatbot/todo/Event.java (100%) rename src/{ => main/java}/com/cloud/chatbot/todo/Todo.java (100%) rename src/{ => main/java}/com/cloud/chatbot/token/CommandManager.java (100%) rename src/{ => main/java}/com/cloud/chatbot/token/FlagManager.java (100%) rename src/{ => main/java}/com/cloud/chatbot/token/Token.java (100%) rename src/{ => main/java}/com/cloud/chatbot/token/TokenManager.java (100%) diff --git a/src/com/cloud/chatbot/Cloud.java b/src/main/java/com/cloud/chatbot/Cloud.java similarity index 100% rename from src/com/cloud/chatbot/Cloud.java rename to src/main/java/com/cloud/chatbot/Cloud.java diff --git a/src/com/cloud/chatbot/CommandType.java b/src/main/java/com/cloud/chatbot/CommandType.java similarity index 100% rename from src/com/cloud/chatbot/CommandType.java rename to src/main/java/com/cloud/chatbot/CommandType.java diff --git a/src/com/cloud/chatbot/annotations/Nullable.java b/src/main/java/com/cloud/chatbot/annotations/Nullable.java similarity index 100% rename from src/com/cloud/chatbot/annotations/Nullable.java rename to src/main/java/com/cloud/chatbot/annotations/Nullable.java diff --git a/src/com/cloud/chatbot/exceptions/MissingFlagInputException.java b/src/main/java/com/cloud/chatbot/exceptions/MissingFlagInputException.java similarity index 100% rename from src/com/cloud/chatbot/exceptions/MissingFlagInputException.java rename to src/main/java/com/cloud/chatbot/exceptions/MissingFlagInputException.java diff --git a/src/com/cloud/chatbot/exceptions/MissingInputException.java b/src/main/java/com/cloud/chatbot/exceptions/MissingInputException.java similarity index 100% rename from src/com/cloud/chatbot/exceptions/MissingInputException.java rename to src/main/java/com/cloud/chatbot/exceptions/MissingInputException.java diff --git a/src/com/cloud/chatbot/todo/Deadline.java b/src/main/java/com/cloud/chatbot/todo/Deadline.java similarity index 100% rename from src/com/cloud/chatbot/todo/Deadline.java rename to src/main/java/com/cloud/chatbot/todo/Deadline.java diff --git a/src/com/cloud/chatbot/todo/Event.java b/src/main/java/com/cloud/chatbot/todo/Event.java similarity index 100% rename from src/com/cloud/chatbot/todo/Event.java rename to src/main/java/com/cloud/chatbot/todo/Event.java diff --git a/src/com/cloud/chatbot/todo/Todo.java b/src/main/java/com/cloud/chatbot/todo/Todo.java similarity index 100% rename from src/com/cloud/chatbot/todo/Todo.java rename to src/main/java/com/cloud/chatbot/todo/Todo.java diff --git a/src/com/cloud/chatbot/token/CommandManager.java b/src/main/java/com/cloud/chatbot/token/CommandManager.java similarity index 100% rename from src/com/cloud/chatbot/token/CommandManager.java rename to src/main/java/com/cloud/chatbot/token/CommandManager.java diff --git a/src/com/cloud/chatbot/token/FlagManager.java b/src/main/java/com/cloud/chatbot/token/FlagManager.java similarity index 100% rename from src/com/cloud/chatbot/token/FlagManager.java rename to src/main/java/com/cloud/chatbot/token/FlagManager.java diff --git a/src/com/cloud/chatbot/token/Token.java b/src/main/java/com/cloud/chatbot/token/Token.java similarity index 100% rename from src/com/cloud/chatbot/token/Token.java rename to src/main/java/com/cloud/chatbot/token/Token.java diff --git a/src/com/cloud/chatbot/token/TokenManager.java b/src/main/java/com/cloud/chatbot/token/TokenManager.java similarity index 100% rename from src/com/cloud/chatbot/token/TokenManager.java rename to src/main/java/com/cloud/chatbot/token/TokenManager.java From 8d26682eacbb0b2c0dd841b7506b971157e154b1 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Mon, 11 Sep 2023 19:46:18 +0800 Subject: [PATCH 040/112] ref(src): TodoManager to prepare for file storage --- src/main/java/com/cloud/chatbot/Cloud.java | 23 ++++----- .../com/cloud/chatbot/todo/TodoManager.java | 47 +++++++++++++++++++ .../java/com/cloud/chatbot/token/Token.java | 6 +-- 3 files changed, 62 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/cloud/chatbot/todo/TodoManager.java diff --git a/src/main/java/com/cloud/chatbot/Cloud.java b/src/main/java/com/cloud/chatbot/Cloud.java index 24c68494c9..b412c1fd6f 100644 --- a/src/main/java/com/cloud/chatbot/Cloud.java +++ b/src/main/java/com/cloud/chatbot/Cloud.java @@ -10,6 +10,7 @@ import com.cloud.chatbot.todo.Deadline; import com.cloud.chatbot.todo.Event; import com.cloud.chatbot.todo.Todo; +import com.cloud.chatbot.todo.TodoManager; import com.cloud.chatbot.token.CommandManager; import com.cloud.chatbot.token.FlagManager; import com.cloud.chatbot.token.Token; @@ -21,7 +22,7 @@ */ public final class Cloud { private static final Scanner SCANNER = new Scanner(System.in); - private static final List TODOS = new ArrayList<>(); + private static final TodoManager TODO_MANAGER = new TodoManager(); private static void handle(String input) { CommandManager manager = new CommandManager(input); @@ -40,19 +41,19 @@ private static void handle(String input) { break; } - Cloud.TODOS.add(todo); - Cloud.say(todo.toString(Cloud.TODOS.size())); + Cloud.TODO_MANAGER.add(todo); + Cloud.say(todo.toString(Cloud.TODO_MANAGER.getCount())); break; } case LIST: { - if (Cloud.TODOS.size() <= 0) { + if (Cloud.TODO_MANAGER.getCount() <= 0) { Cloud.say("Your TODO list is empty."); break; } - for (int i = 0; i < Cloud.TODOS.size(); i++) { - Todo todo = Cloud.TODOS.get(i); - Cloud.say(todo.toString(i + 1)); + for (int number = 1; number <= Cloud.TODO_MANAGER.getCount(); number++) { + Todo todo = Cloud.TODO_MANAGER.get(number); + Cloud.say(todo.toString(number)); } break; } @@ -62,7 +63,7 @@ private static void handle(String input) { break; } - Todo todo = Cloud.TODOS.get(number - 1); + Todo todo = Cloud.TODO_MANAGER.get(number); todo.setComplete(true); Cloud.say(todo.toString(number)); break; @@ -73,7 +74,7 @@ private static void handle(String input) { break; } - Todo todo = Cloud.TODOS.get(number - 1); + Todo todo = Cloud.TODO_MANAGER.get(number); todo.setComplete(false); Cloud.say(todo.toString(number)); break; @@ -84,7 +85,7 @@ private static void handle(String input) { break; } - Todo todo = Cloud.TODOS.remove(number - 1); + Todo todo = Cloud.TODO_MANAGER.remove(number); Cloud.say("Yeeted:"); Cloud.say(todo.toString(number)); break; @@ -156,7 +157,7 @@ private static void handle(String input) { return null; } - if (!numberToken.isValidNumber(Cloud.TODOS)) { + if (!numberToken.isValidNumber(Cloud.TODO_MANAGER.getCount())) { Cloud.say( String.format( "TODO #%d does not exist.", diff --git a/src/main/java/com/cloud/chatbot/todo/TodoManager.java b/src/main/java/com/cloud/chatbot/todo/TodoManager.java new file mode 100644 index 0000000000..6fd4630528 --- /dev/null +++ b/src/main/java/com/cloud/chatbot/todo/TodoManager.java @@ -0,0 +1,47 @@ +package com.cloud.chatbot.todo; + +import java.util.ArrayList; +import java.util.List; + + + +/** + * Manages all TODOs while the bot is running. + */ +public class TodoManager { + private List todos = new ArrayList<>(); + + /** + * Adds the specified TODO. + * + * @param todo The TODO to add. + */ + public void add(Todo todo) { + this.todos.add(todo); + } + + /** + * Returns the TODO for the specified number. + * + * @param int The TODO's number. + */ + public Todo get(int number) { + return this.todos.get(number - 1); + } + + /** + * Removes and returns the TODO of the specified number. + * + * @param int The TODO's number. + */ + public Todo remove(int number) { + return this.todos.remove(number - 1); + } + + /** + * Returns the total number of TODOs. + */ + public int getCount() { + return this.todos.size(); + } +} diff --git a/src/main/java/com/cloud/chatbot/token/Token.java b/src/main/java/com/cloud/chatbot/token/Token.java index 1a81e25a78..d135d3c38b 100644 --- a/src/main/java/com/cloud/chatbot/token/Token.java +++ b/src/main/java/com/cloud/chatbot/token/Token.java @@ -62,14 +62,14 @@ public int toInt() { /** * Whether the token is a valid TODO number. * - * @param todos The list of Todos. + * @param count The current number of TODOs. */ - public boolean isValidNumber(List todos) { + public boolean isValidNumber(int count) { if (!this.isInt()) return false; int number = this.toInt(); - if (number <= 0 || number > todos.size()) { + if (number <= 0 || number > count) { return false; } return true; From 69f990f7ffbcd48b91c119f08e4a5ec04abba491 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Mon, 11 Sep 2023 20:36:14 +0800 Subject: [PATCH 041/112] ref(): Rename TODO to Item, add Item parent class Editor automatically recognises TODO as a dev comment. This change disambiguates the two and prevents annoying highlighting. --- src/main/java/com/cloud/chatbot/Cloud.java | 67 +++++++++---------- .../chatbot/{todo => task}/Deadline.java | 10 +-- .../cloud/chatbot/{todo => task}/Event.java | 10 +-- .../{todo/Todo.java => task/Item.java} | 18 +++-- .../com/cloud/chatbot/task/ItemManager.java | 47 +++++++++++++ .../java/com/cloud/chatbot/task/Task.java | 20 ++++++ .../com/cloud/chatbot/todo/TodoManager.java | 47 ------------- .../java/com/cloud/chatbot/token/Token.java | 7 +- tests/EXPECTED.txt | 14 ++-- 9 files changed, 127 insertions(+), 113 deletions(-) rename src/main/java/com/cloud/chatbot/{todo => task}/Deadline.java (69%) rename src/main/java/com/cloud/chatbot/{todo => task}/Event.java (70%) rename src/main/java/com/cloud/chatbot/{todo/Todo.java => task/Item.java} (70%) create mode 100644 src/main/java/com/cloud/chatbot/task/ItemManager.java create mode 100644 src/main/java/com/cloud/chatbot/task/Task.java delete mode 100644 src/main/java/com/cloud/chatbot/todo/TodoManager.java diff --git a/src/main/java/com/cloud/chatbot/Cloud.java b/src/main/java/com/cloud/chatbot/Cloud.java index b412c1fd6f..37c372d9f7 100644 --- a/src/main/java/com/cloud/chatbot/Cloud.java +++ b/src/main/java/com/cloud/chatbot/Cloud.java @@ -1,16 +1,15 @@ package com.cloud.chatbot; -import java.util.ArrayList; -import java.util.List; import java.util.Scanner; import com.cloud.chatbot.annotations.Nullable; import com.cloud.chatbot.exceptions.MissingFlagInputException; import com.cloud.chatbot.exceptions.MissingInputException; -import com.cloud.chatbot.todo.Deadline; -import com.cloud.chatbot.todo.Event; -import com.cloud.chatbot.todo.Todo; -import com.cloud.chatbot.todo.TodoManager; +import com.cloud.chatbot.task.Deadline; +import com.cloud.chatbot.task.Event; +import com.cloud.chatbot.task.Item; +import com.cloud.chatbot.task.ItemManager; +import com.cloud.chatbot.task.Task; import com.cloud.chatbot.token.CommandManager; import com.cloud.chatbot.token.FlagManager; import com.cloud.chatbot.token.Token; @@ -22,13 +21,13 @@ */ public final class Cloud { private static final Scanner SCANNER = new Scanner(System.in); - private static final TodoManager TODO_MANAGER = new TodoManager(); + private static final ItemManager ITEM_MANAGER = new ItemManager(); private static void handle(String input) { - CommandManager manager = new CommandManager(input); + CommandManager commandManager = new CommandManager(input); String command; try { - command = manager.getCommand(); + command = commandManager.getCommand(); } catch (MissingInputException e) { // Ignore empty inputs return; @@ -36,58 +35,58 @@ private static void handle(String input) { switch (CommandType.stringToCommandType(command)) { case ADD: { - @Nullable Todo todo = Cloud.createTodo(manager); - if (todo == null) { + @Nullable Item item = Cloud.createItem(commandManager); + if (item == null) { break; } - Cloud.TODO_MANAGER.add(todo); - Cloud.say(todo.toString(Cloud.TODO_MANAGER.getCount())); + Cloud.ITEM_MANAGER.add(item); + Cloud.say(item.toString(Cloud.ITEM_MANAGER.getCount())); break; } case LIST: { - if (Cloud.TODO_MANAGER.getCount() <= 0) { - Cloud.say("Your TODO list is empty."); + if (Cloud.ITEM_MANAGER.getCount() <= 0) { + Cloud.say("Your item list is empty."); break; } - for (int number = 1; number <= Cloud.TODO_MANAGER.getCount(); number++) { - Todo todo = Cloud.TODO_MANAGER.get(number); - Cloud.say(todo.toString(number)); + for (int number = 1; number <= Cloud.ITEM_MANAGER.getCount(); number++) { + Item item = Cloud.ITEM_MANAGER.get(number); + Cloud.say(item.toString(number)); } break; } case MARK: { - @Nullable Integer number = Cloud.verifyNumber(manager); + @Nullable Integer number = Cloud.verifyNumber(commandManager); if (number == null) { break; } - Todo todo = Cloud.TODO_MANAGER.get(number); - todo.setComplete(true); - Cloud.say(todo.toString(number)); + Item item = Cloud.ITEM_MANAGER.get(number); + item.setComplete(true); + Cloud.say(item.toString(number)); break; } case UNMARK: { - @Nullable Integer number = Cloud.verifyNumber(manager); + @Nullable Integer number = Cloud.verifyNumber(commandManager); if (number == null) { break; } - Todo todo = Cloud.TODO_MANAGER.get(number); - todo.setComplete(false); - Cloud.say(todo.toString(number)); + Item item = Cloud.ITEM_MANAGER.get(number); + item.setComplete(false); + Cloud.say(item.toString(number)); break; } case DELETE: { - @Nullable Integer number = Cloud.verifyNumber(manager); + @Nullable Integer number = Cloud.verifyNumber(commandManager); if (number == null) { break; } - Todo todo = Cloud.TODO_MANAGER.remove(number); + Item item = Cloud.ITEM_MANAGER.remove(number); Cloud.say("Yeeted:"); - Cloud.say(todo.toString(number)); + Cloud.say(item.toString(number)); break; } case EXIT: { @@ -108,12 +107,12 @@ private static void handle(String input) { } } - private static @Nullable Todo createTodo(CommandManager manager) { + private static @Nullable Item createItem(CommandManager manager) { String description; try { description = manager.getDetails(); } catch (MissingInputException e) { - Cloud.say("Please enter a description for your TODO."); + Cloud.say("Please enter a description for your item."); return null; } @@ -138,7 +137,7 @@ private static void handle(String input) { return null; } - return new Todo(description); + return new Task(description); } private static @Nullable Integer verifyNumber(CommandManager manager) { @@ -157,10 +156,10 @@ private static void handle(String input) { return null; } - if (!numberToken.isValidNumber(Cloud.TODO_MANAGER.getCount())) { + if (!numberToken.isValidNumber(Cloud.ITEM_MANAGER.getCount())) { Cloud.say( String.format( - "TODO #%d does not exist.", + "Item #%d does not exist.", numberToken.toInt() ) ); diff --git a/src/main/java/com/cloud/chatbot/todo/Deadline.java b/src/main/java/com/cloud/chatbot/task/Deadline.java similarity index 69% rename from src/main/java/com/cloud/chatbot/todo/Deadline.java rename to src/main/java/com/cloud/chatbot/task/Deadline.java index 79e9ce2367..ff2e2420f7 100644 --- a/src/main/java/com/cloud/chatbot/todo/Deadline.java +++ b/src/main/java/com/cloud/chatbot/task/Deadline.java @@ -1,16 +1,16 @@ -package com.cloud.chatbot.todo; +package com.cloud.chatbot.task; /** - * Represents a deadline TODO, which has an ending timestamp. + * Represents a deadline work Item, which has an ending timestamp. */ -public class Deadline extends Todo { +public class Deadline extends Item { private String timestampEnd; /** - * @param description The TODO description. - * @param end The ending timestamp for the TODO. + * @param _description The Item description. + * @param end The ending timestamp. */ public Deadline(String _description, String end) { super(_description); diff --git a/src/main/java/com/cloud/chatbot/todo/Event.java b/src/main/java/com/cloud/chatbot/task/Event.java similarity index 70% rename from src/main/java/com/cloud/chatbot/todo/Event.java rename to src/main/java/com/cloud/chatbot/task/Event.java index d8f7f64bf3..fe81b5c9d0 100644 --- a/src/main/java/com/cloud/chatbot/todo/Event.java +++ b/src/main/java/com/cloud/chatbot/task/Event.java @@ -1,17 +1,17 @@ -package com.cloud.chatbot.todo; +package com.cloud.chatbot.task; /** - * Represents an event TODO, which has both a starting and ending timestamp. + * Represents an event work Item, which has both a starting and ending timestamp. */ public class Event extends Deadline { private String timestampStart; /** - * @param description The TODO description. - * @param start The starting timestamp for the TODO. - * @param end The ending timestamp for the TODO. + * @param _description The Item description. + * @param start The starting timestamp. + * @param end The ending timestamp. */ public Event(String _description, String start, String end) { super(_description, end); diff --git a/src/main/java/com/cloud/chatbot/todo/Todo.java b/src/main/java/com/cloud/chatbot/task/Item.java similarity index 70% rename from src/main/java/com/cloud/chatbot/todo/Todo.java rename to src/main/java/com/cloud/chatbot/task/Item.java index 957320fe91..29b7a13954 100644 --- a/src/main/java/com/cloud/chatbot/todo/Todo.java +++ b/src/main/java/com/cloud/chatbot/task/Item.java @@ -1,19 +1,19 @@ -package com.cloud.chatbot.todo; +package com.cloud.chatbot.task; /** - * Represents a TODO. + * A parent work Item class. */ -public class Todo { +public abstract class Item { private boolean isComplete = false; private String description; /** - * @param description The TODO description. + * @param _description The Item description. */ - public Todo(String _description) { + public Item(String _description) { this.description = _description; } @@ -40,7 +40,7 @@ public boolean isComplete() { } /** - * Returns a string representing whether the TODO has been completed. + * Returns a string denoting whether the Item has been completed. */ public String getCompletionString() { return this.isComplete ? "X" : " "; @@ -51,9 +51,7 @@ public void setComplete(boolean _isComplete) { } /** - * Returns a string representing the type of this TODO. + * Returns a string representing the type of this Item. */ - public String getTypeString() { - return "T"; - } + public abstract String getTypeString(); } diff --git a/src/main/java/com/cloud/chatbot/task/ItemManager.java b/src/main/java/com/cloud/chatbot/task/ItemManager.java new file mode 100644 index 0000000000..7ddc1d063f --- /dev/null +++ b/src/main/java/com/cloud/chatbot/task/ItemManager.java @@ -0,0 +1,47 @@ +package com.cloud.chatbot.task; + +import java.util.ArrayList; +import java.util.List; + + + +/** + * Manages all Items while the bot is running. + */ +public class ItemManager { + private List items = new ArrayList<>(); + + /** + * Adds the specified Item. + * + * @param item The Item to add. + */ + public void add(Item item) { + this.items.add(item); + } + + /** + * Returns the Item for the specified number. + * + * @param int The Item's number. + */ + public Item get(int number) { + return this.items.get(number - 1); + } + + /** + * Removes and returns the Item of the specified number. + * + * @param int The Item's number. + */ + public Item remove(int number) { + return this.items.remove(number - 1); + } + + /** + * Returns the total number of Items. + */ + public int getCount() { + return this.items.size(); + } +} diff --git a/src/main/java/com/cloud/chatbot/task/Task.java b/src/main/java/com/cloud/chatbot/task/Task.java new file mode 100644 index 0000000000..516e6ea4c9 --- /dev/null +++ b/src/main/java/com/cloud/chatbot/task/Task.java @@ -0,0 +1,20 @@ +package com.cloud.chatbot.task; + + + +/** + * Represents the most basic form of work Item. + */ +public class Task extends Item { + /** + * @param _description The Item description. + */ + public Task(String _description) { + super(_description); + } + + @Override + public String getTypeString() { + return "T"; + } +} diff --git a/src/main/java/com/cloud/chatbot/todo/TodoManager.java b/src/main/java/com/cloud/chatbot/todo/TodoManager.java deleted file mode 100644 index 6fd4630528..0000000000 --- a/src/main/java/com/cloud/chatbot/todo/TodoManager.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.cloud.chatbot.todo; - -import java.util.ArrayList; -import java.util.List; - - - -/** - * Manages all TODOs while the bot is running. - */ -public class TodoManager { - private List todos = new ArrayList<>(); - - /** - * Adds the specified TODO. - * - * @param todo The TODO to add. - */ - public void add(Todo todo) { - this.todos.add(todo); - } - - /** - * Returns the TODO for the specified number. - * - * @param int The TODO's number. - */ - public Todo get(int number) { - return this.todos.get(number - 1); - } - - /** - * Removes and returns the TODO of the specified number. - * - * @param int The TODO's number. - */ - public Todo remove(int number) { - return this.todos.remove(number - 1); - } - - /** - * Returns the total number of TODOs. - */ - public int getCount() { - return this.todos.size(); - } -} diff --git a/src/main/java/com/cloud/chatbot/token/Token.java b/src/main/java/com/cloud/chatbot/token/Token.java index d135d3c38b..55cf8e86cc 100644 --- a/src/main/java/com/cloud/chatbot/token/Token.java +++ b/src/main/java/com/cloud/chatbot/token/Token.java @@ -1,9 +1,6 @@ package com.cloud.chatbot.token; -import java.util.List; - import com.cloud.chatbot.annotations.Nullable; -import com.cloud.chatbot.todo.Todo; @@ -60,9 +57,9 @@ public int toInt() { } /** - * Whether the token is a valid TODO number. + * Whether the token is a valid Item number. * - * @param count The current number of TODOs. + * @param count The current number of Items. */ public boolean isValidNumber(int count) { if (!this.isInt()) return false; diff --git a/tests/EXPECTED.txt b/tests/EXPECTED.txt index cbd8732863..2a62d1437d 100644 --- a/tests/EXPECTED.txt +++ b/tests/EXPECTED.txt @@ -4,7 +4,7 @@ Cloud online. >>> >>> ->>> Please enter a description for your TODO. +>>> Please enter a description for your item. >>> | T#1: Download wk 3 files @@ -14,11 +14,11 @@ Cloud online. >>> Please enter a description for the "by" flag. ->>> Please enter a description for your TODO. +>>> Please enter a description for your item. ->>> Please enter a description for your TODO. +>>> Please enter a description for your item. ->>> Please enter a description for your TODO. +>>> Please enter a description for your item. >>> | T#4: I tried to make an event by didn't specify flags. @@ -31,7 +31,7 @@ Cloud online. >>> "a" is not a valid number. ->>> TODO #-7050 does not exist. +>>> Item #-7050 does not exist. >>> X | D#2: Watch L3 recording | BY Friday 2359 @@ -43,7 +43,7 @@ Cloud online. >>> | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm ->>> TODO #5 does not exist. +>>> Item #5 does not exist. >>> X | T#4: I tried to make an event by didn't specify flags. @@ -55,7 +55,7 @@ X | D#2: Watch L3 recording | BY Friday 2359 X | T#4: I tried to make an event by didn't specify flags. | D#5: another | BY ??? ->>> TODO #0 does not exist. +>>> Item #0 does not exist. >>> Yeeted: | T#1: Download wk 3 files From e7c1de2ccfe80d45ec6b2a5fa20340524575c22f Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Mon, 11 Sep 2023 20:38:31 +0800 Subject: [PATCH 042/112] fix(test): Fix new src path in test's javac --- test.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.bat b/test.bat index 054e839442..1405f54be3 100644 --- a/test.bat +++ b/test.bat @@ -8,7 +8,7 @@ rmdir /S /Q .\bin\ mkdir .\bin\ @REM Compile -javac .\src\com\cloud\chatbot\*.java -cp .\src\ -Xlint:none -d .\bin\ +javac .\src\main\java\com\cloud\chatbot\*.java -cp .\src\main\java\ -Xlint:none -d .\bin\ IF ERRORLEVEL 1 ( echo: echo ^>^>^> javac failed From badd237ed9534e954ccbfdc7f16cb4f3fc4cab39 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Mon, 11 Sep 2023 20:40:12 +0800 Subject: [PATCH 043/112] ref(src): Rename task to item in package --- src/main/java/com/cloud/chatbot/Cloud.java | 10 +++++----- .../com/cloud/chatbot/{task => item}/Deadline.java | 2 +- .../java/com/cloud/chatbot/{task => item}/Event.java | 2 +- .../java/com/cloud/chatbot/{task => item}/Item.java | 2 +- .../com/cloud/chatbot/{task => item}/ItemManager.java | 2 +- .../java/com/cloud/chatbot/{task => item}/Task.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename src/main/java/com/cloud/chatbot/{task => item}/Deadline.java (95%) rename src/main/java/com/cloud/chatbot/{task => item}/Event.java (96%) rename src/main/java/com/cloud/chatbot/{task => item}/Item.java (97%) rename src/main/java/com/cloud/chatbot/{task => item}/ItemManager.java (96%) rename src/main/java/com/cloud/chatbot/{task => item}/Task.java (90%) diff --git a/src/main/java/com/cloud/chatbot/Cloud.java b/src/main/java/com/cloud/chatbot/Cloud.java index 37c372d9f7..6eddee545c 100644 --- a/src/main/java/com/cloud/chatbot/Cloud.java +++ b/src/main/java/com/cloud/chatbot/Cloud.java @@ -5,11 +5,11 @@ import com.cloud.chatbot.annotations.Nullable; import com.cloud.chatbot.exceptions.MissingFlagInputException; import com.cloud.chatbot.exceptions.MissingInputException; -import com.cloud.chatbot.task.Deadline; -import com.cloud.chatbot.task.Event; -import com.cloud.chatbot.task.Item; -import com.cloud.chatbot.task.ItemManager; -import com.cloud.chatbot.task.Task; +import com.cloud.chatbot.item.Deadline; +import com.cloud.chatbot.item.Event; +import com.cloud.chatbot.item.Item; +import com.cloud.chatbot.item.ItemManager; +import com.cloud.chatbot.item.Task; import com.cloud.chatbot.token.CommandManager; import com.cloud.chatbot.token.FlagManager; import com.cloud.chatbot.token.Token; diff --git a/src/main/java/com/cloud/chatbot/task/Deadline.java b/src/main/java/com/cloud/chatbot/item/Deadline.java similarity index 95% rename from src/main/java/com/cloud/chatbot/task/Deadline.java rename to src/main/java/com/cloud/chatbot/item/Deadline.java index ff2e2420f7..57574507b1 100644 --- a/src/main/java/com/cloud/chatbot/task/Deadline.java +++ b/src/main/java/com/cloud/chatbot/item/Deadline.java @@ -1,4 +1,4 @@ -package com.cloud.chatbot.task; +package com.cloud.chatbot.item; diff --git a/src/main/java/com/cloud/chatbot/task/Event.java b/src/main/java/com/cloud/chatbot/item/Event.java similarity index 96% rename from src/main/java/com/cloud/chatbot/task/Event.java rename to src/main/java/com/cloud/chatbot/item/Event.java index fe81b5c9d0..c58883f60e 100644 --- a/src/main/java/com/cloud/chatbot/task/Event.java +++ b/src/main/java/com/cloud/chatbot/item/Event.java @@ -1,4 +1,4 @@ -package com.cloud.chatbot.task; +package com.cloud.chatbot.item; diff --git a/src/main/java/com/cloud/chatbot/task/Item.java b/src/main/java/com/cloud/chatbot/item/Item.java similarity index 97% rename from src/main/java/com/cloud/chatbot/task/Item.java rename to src/main/java/com/cloud/chatbot/item/Item.java index 29b7a13954..f81d3101cd 100644 --- a/src/main/java/com/cloud/chatbot/task/Item.java +++ b/src/main/java/com/cloud/chatbot/item/Item.java @@ -1,4 +1,4 @@ -package com.cloud.chatbot.task; +package com.cloud.chatbot.item; diff --git a/src/main/java/com/cloud/chatbot/task/ItemManager.java b/src/main/java/com/cloud/chatbot/item/ItemManager.java similarity index 96% rename from src/main/java/com/cloud/chatbot/task/ItemManager.java rename to src/main/java/com/cloud/chatbot/item/ItemManager.java index 7ddc1d063f..f8074f6263 100644 --- a/src/main/java/com/cloud/chatbot/task/ItemManager.java +++ b/src/main/java/com/cloud/chatbot/item/ItemManager.java @@ -1,4 +1,4 @@ -package com.cloud.chatbot.task; +package com.cloud.chatbot.item; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/cloud/chatbot/task/Task.java b/src/main/java/com/cloud/chatbot/item/Task.java similarity index 90% rename from src/main/java/com/cloud/chatbot/task/Task.java rename to src/main/java/com/cloud/chatbot/item/Task.java index 516e6ea4c9..3866ca1d1c 100644 --- a/src/main/java/com/cloud/chatbot/task/Task.java +++ b/src/main/java/com/cloud/chatbot/item/Task.java @@ -1,4 +1,4 @@ -package com.cloud.chatbot.task; +package com.cloud.chatbot.item; From f2e99fb846553aa029fa184ce68a5b3a0dd4f9ad Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Mon, 11 Sep 2023 20:55:17 +0800 Subject: [PATCH 044/112] chore(lib): Add org.json --- lib/json-20230618.jar | Bin 0 -> 73447 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 lib/json-20230618.jar diff --git a/lib/json-20230618.jar b/lib/json-20230618.jar new file mode 100644 index 0000000000000000000000000000000000000000..c450ad43d8aaeceeb11c58adbea2f2dc6b42b0e5 GIT binary patch literal 73447 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 K1p_v`kpBTz8tg3q literal 0 HcmV?d00001 From 3818dd787401be10898d5a49bebf6411f7c79154 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Mon, 11 Sep 2023 20:55:49 +0800 Subject: [PATCH 045/112] devfeat(src): Add export() item to JSON --- .../java/com/cloud/chatbot/item/Deadline.java | 9 +++++++++ src/main/java/com/cloud/chatbot/item/Event.java | 10 ++++++++++ src/main/java/com/cloud/chatbot/item/Item.java | 15 +++++++++++++++ src/main/java/com/cloud/chatbot/item/Task.java | 7 +++++++ 4 files changed, 41 insertions(+) diff --git a/src/main/java/com/cloud/chatbot/item/Deadline.java b/src/main/java/com/cloud/chatbot/item/Deadline.java index 57574507b1..7ca75426db 100644 --- a/src/main/java/com/cloud/chatbot/item/Deadline.java +++ b/src/main/java/com/cloud/chatbot/item/Deadline.java @@ -1,5 +1,7 @@ package com.cloud.chatbot.item; +import org.json.JSONObject; + /** @@ -32,6 +34,13 @@ public String getTypeString() { return "D"; } + @Override + public JSONObject export() { + JSONObject json = this.getBasicJson(); + json.put("timestampEnd", this.getEnd()); + return json; + } + public String getEnd() { return this.timestampEnd; } diff --git a/src/main/java/com/cloud/chatbot/item/Event.java b/src/main/java/com/cloud/chatbot/item/Event.java index c58883f60e..9fc71f4eff 100644 --- a/src/main/java/com/cloud/chatbot/item/Event.java +++ b/src/main/java/com/cloud/chatbot/item/Event.java @@ -1,5 +1,7 @@ package com.cloud.chatbot.item; +import org.json.JSONObject; + /** @@ -34,6 +36,14 @@ public String getTypeString() { return "E"; } + @Override + public JSONObject export() { + JSONObject json = this.getBasicJson(); + json.put("timestampStart", this.getStart()); + json.put("timestampEnd", this.getEnd()); + return json; + } + public String getStart() { return this.timestampStart; } diff --git a/src/main/java/com/cloud/chatbot/item/Item.java b/src/main/java/com/cloud/chatbot/item/Item.java index f81d3101cd..c3f031172d 100644 --- a/src/main/java/com/cloud/chatbot/item/Item.java +++ b/src/main/java/com/cloud/chatbot/item/Item.java @@ -1,5 +1,7 @@ package com.cloud.chatbot.item; +import org.json.JSONObject; + /** @@ -27,6 +29,14 @@ protected String getBasicString(int number) { ); } + protected JSONObject getBasicJson() { + JSONObject json = new JSONObject(); + json.put("type", this.getTypeString()); + json.put("description", this.getDescription()); + json.put("isComplete", this.isComplete()); + return json; + } + public String toString(int number) { return this.getBasicString(number); } @@ -54,4 +64,9 @@ public void setComplete(boolean _isComplete) { * Returns a string representing the type of this Item. */ public abstract String getTypeString(); + + /* + * Returns the JSON representation of this item. + */ + public abstract JSONObject export(); } diff --git a/src/main/java/com/cloud/chatbot/item/Task.java b/src/main/java/com/cloud/chatbot/item/Task.java index 3866ca1d1c..8bf977ae47 100644 --- a/src/main/java/com/cloud/chatbot/item/Task.java +++ b/src/main/java/com/cloud/chatbot/item/Task.java @@ -1,5 +1,7 @@ package com.cloud.chatbot.item; +import org.json.JSONObject; + /** @@ -17,4 +19,9 @@ public Task(String _description) { public String getTypeString() { return "T"; } + + @Override + public JSONObject export() { + return this.getBasicJson(); + } } From 56812600e71b619ff65f92816f6a4b824a8af6d9 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Mon, 11 Sep 2023 21:23:18 +0800 Subject: [PATCH 046/112] feat(src): Save to file with every item change --- src/main/java/com/cloud/chatbot/Cloud.java | 19 ++++--- .../com/cloud/chatbot/file/FileManager.java | 54 +++++++++++++++++++ .../java/com/cloud/chatbot/item/Item.java | 3 -- .../com/cloud/chatbot/item/ItemManager.java | 48 +++++++++++++++-- 4 files changed, 109 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/cloud/chatbot/file/FileManager.java diff --git a/src/main/java/com/cloud/chatbot/Cloud.java b/src/main/java/com/cloud/chatbot/Cloud.java index 6eddee545c..38269a7f71 100644 --- a/src/main/java/com/cloud/chatbot/Cloud.java +++ b/src/main/java/com/cloud/chatbot/Cloud.java @@ -51,8 +51,9 @@ private static void handle(String input) { } for (int number = 1; number <= Cloud.ITEM_MANAGER.getCount(); number++) { - Item item = Cloud.ITEM_MANAGER.get(number); - Cloud.say(item.toString(number)); + Cloud.say( + Cloud.ITEM_MANAGER.getString(number) + ); } break; } @@ -62,9 +63,10 @@ private static void handle(String input) { break; } - Item item = Cloud.ITEM_MANAGER.get(number); - item.setComplete(true); - Cloud.say(item.toString(number)); + Cloud.ITEM_MANAGER.setComplete(number, true); + Cloud.say( + Cloud.ITEM_MANAGER.getString(number) + ); break; } case UNMARK: { @@ -73,9 +75,10 @@ private static void handle(String input) { break; } - Item item = Cloud.ITEM_MANAGER.get(number); - item.setComplete(false); - Cloud.say(item.toString(number)); + Cloud.ITEM_MANAGER.setComplete(number, false); + Cloud.say( + Cloud.ITEM_MANAGER.getString(number) + ); break; } case DELETE: { diff --git a/src/main/java/com/cloud/chatbot/file/FileManager.java b/src/main/java/com/cloud/chatbot/file/FileManager.java new file mode 100644 index 0000000000..71ea5b9a3f --- /dev/null +++ b/src/main/java/com/cloud/chatbot/file/FileManager.java @@ -0,0 +1,54 @@ +package com.cloud.chatbot.file; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.nio.file.Paths; + +import org.json.JSONObject; + +/** + * Handles reading from and writing to file storage. + */ +public final class FileManager { + private static final String RELATIVE_PATH = "./data/items.json"; + + /** + * Initialises the FileManager. + */ + public FileManager() { + // Create directories & storage file as needed + //TODO + } + + private File getFile() { + return Paths.get(FileManager.RELATIVE_PATH).toFile(); + } + + public void save(JSONObject json) { + FileWriter writer; + try { + writer = new FileWriter(this.getFile()); + } catch (IOException e) { + System.out.println("ERR Could not create FileWriter!"); + System.out.println(e); + return; + } + + try { + writer.write(json.toString()); + } catch (IOException e) { + System.out.println("ERR Could not write to file!"); + System.out.println(e); + return; + } + + try { + writer.close(); + } catch (IOException e) { + System.out.println("ERR Could not close FileWriter!"); + System.out.println(e); + return; + } + } +} diff --git a/src/main/java/com/cloud/chatbot/item/Item.java b/src/main/java/com/cloud/chatbot/item/Item.java index c3f031172d..3741f1c600 100644 --- a/src/main/java/com/cloud/chatbot/item/Item.java +++ b/src/main/java/com/cloud/chatbot/item/Item.java @@ -12,9 +12,6 @@ public abstract class Item { private String description; - /** - * @param _description The Item description. - */ public Item(String _description) { this.description = _description; } diff --git a/src/main/java/com/cloud/chatbot/item/ItemManager.java b/src/main/java/com/cloud/chatbot/item/ItemManager.java index f8074f6263..cb702bf8c4 100644 --- a/src/main/java/com/cloud/chatbot/item/ItemManager.java +++ b/src/main/java/com/cloud/chatbot/item/ItemManager.java @@ -2,6 +2,11 @@ import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; + +import org.json.JSONObject; + +import com.cloud.chatbot.file.FileManager; @@ -9,8 +14,21 @@ * Manages all Items while the bot is running. */ public class ItemManager { + private FileManager fileManager = new FileManager(); private List items = new ArrayList<>(); + private void save() { + List jsons = items + .stream() + .map(Item::export) + .collect(Collectors.toList()); + + JSONObject json = new JSONObject(); + json.put("items", jsons); + + this.fileManager.save(json); + } + /** * Adds the specified Item. * @@ -18,15 +36,33 @@ public class ItemManager { */ public void add(Item item) { this.items.add(item); + + this.save(); + } + + /** + * Returns the String representation for the Item of the specified number. + * + * @param int The Item's number. + */ + public String getString(int number) { + return this.items + .get(number - 1) + .toString(number); } /** - * Returns the Item for the specified number. + * Sets the completion status for the Item of the specified number. * * @param int The Item's number. + * @param isComplete The completion status. */ - public Item get(int number) { - return this.items.get(number - 1); + public void setComplete(int number, boolean isComplete) { + this.items + .get(number - 1) + .setComplete(isComplete); + + this.save(); } /** @@ -35,7 +71,11 @@ public Item get(int number) { * @param int The Item's number. */ public Item remove(int number) { - return this.items.remove(number - 1); + Item item = this.items.remove(number - 1); + + this.save(); + + return item; } /** From b7153f7c7c08d1d340b629f46c5b5b7048d07e48 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Mon, 11 Sep 2023 21:26:58 +0800 Subject: [PATCH 047/112] feat(): Create directory if not exists. Gitignore --- .gitignore | 1 + src/main/java/com/cloud/chatbot/file/FileManager.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 234d95663a..7e55c2e651 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bin/ +data/ tests/ACTUAL.txt diff --git a/src/main/java/com/cloud/chatbot/file/FileManager.java b/src/main/java/com/cloud/chatbot/file/FileManager.java index 71ea5b9a3f..4a98ddf486 100644 --- a/src/main/java/com/cloud/chatbot/file/FileManager.java +++ b/src/main/java/com/cloud/chatbot/file/FileManager.java @@ -17,8 +17,10 @@ public final class FileManager { * Initialises the FileManager. */ public FileManager() { - // Create directories & storage file as needed - //TODO + // Create directories as needed + File file = getFile(); + File folder = file.getParentFile(); + folder.mkdirs(); } private File getFile() { From 8308678ce7073997853d288c656a62cdcbb096c5 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Mon, 11 Sep 2023 21:30:14 +0800 Subject: [PATCH 048/112] docs(FileManager): JavaDoc --- src/main/java/com/cloud/chatbot/file/FileManager.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloud/chatbot/file/FileManager.java b/src/main/java/com/cloud/chatbot/file/FileManager.java index 4a98ddf486..cb26d468a7 100644 --- a/src/main/java/com/cloud/chatbot/file/FileManager.java +++ b/src/main/java/com/cloud/chatbot/file/FileManager.java @@ -7,8 +7,10 @@ import org.json.JSONObject; + + /** - * Handles reading from and writing to file storage. + * Handles reading from and writing to disk. */ public final class FileManager { private static final String RELATIVE_PATH = "./data/items.json"; @@ -27,6 +29,11 @@ private File getFile() { return Paths.get(FileManager.RELATIVE_PATH).toFile(); } + /* + * Saves the specified JSON object to disk. + * + * @param json The JSON object to save. + */ public void save(JSONObject json) { FileWriter writer; try { From c90a50a84af4b3ce6019890c0555233084f04cb0 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Mon, 11 Sep 2023 22:12:09 +0800 Subject: [PATCH 049/112] feat(src): Read from file if exists --- .../com/cloud/chatbot/file/FileManager.java | 43 +++++++++++---- .../com/cloud/chatbot/item/ItemManager.java | 54 ++++++++++++++++++- 2 files changed, 85 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/cloud/chatbot/file/FileManager.java b/src/main/java/com/cloud/chatbot/file/FileManager.java index cb26d468a7..f8a10e1088 100644 --- a/src/main/java/com/cloud/chatbot/file/FileManager.java +++ b/src/main/java/com/cloud/chatbot/file/FileManager.java @@ -3,10 +3,13 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Paths; import org.json.JSONObject; +import com.cloud.chatbot.annotations.Nullable; + /** @@ -29,34 +32,52 @@ private File getFile() { return Paths.get(FileManager.RELATIVE_PATH).toFile(); } - /* - * Saves the specified JSON object to disk. + /** + * Returns a JSON object by reading from disk. + */ + public @Nullable JSONObject read() { + //TODO fix tests lib + //TODO neater err print? + //TODO enum for item type, for json keys + String string; + try { + string = Files.readString(this.getFile().toPath()); + } catch (IOException e) { + // The file probably doesn't exist yet + return null; + } + + return new JSONObject(string); + } + + /** + * Writes the specified JSON object to disk. * - * @param json The JSON object to save. + * @param json The JSON object to write. */ - public void save(JSONObject json) { + public void write(JSONObject json) { FileWriter writer; try { writer = new FileWriter(this.getFile()); } catch (IOException e) { - System.out.println("ERR Could not create FileWriter!"); - System.out.println(e); + System.err.println("ERR Could not create FileWriter!"); + System.err.println(e); return; } try { - writer.write(json.toString()); + writer.write(json.toString(4)); } catch (IOException e) { - System.out.println("ERR Could not write to file!"); - System.out.println(e); + System.err.println("ERR Could not write to file!"); + System.err.println(e); return; } try { writer.close(); } catch (IOException e) { - System.out.println("ERR Could not close FileWriter!"); - System.out.println(e); + System.err.println("ERR Could not close FileWriter!"); + System.err.println(e); return; } } diff --git a/src/main/java/com/cloud/chatbot/item/ItemManager.java b/src/main/java/com/cloud/chatbot/item/ItemManager.java index cb702bf8c4..7a5cec6f6c 100644 --- a/src/main/java/com/cloud/chatbot/item/ItemManager.java +++ b/src/main/java/com/cloud/chatbot/item/ItemManager.java @@ -4,8 +4,10 @@ import java.util.List; import java.util.stream.Collectors; +import org.json.JSONArray; import org.json.JSONObject; +import com.cloud.chatbot.annotations.Nullable; import com.cloud.chatbot.file.FileManager; @@ -17,6 +19,56 @@ public class ItemManager { private FileManager fileManager = new FileManager(); private List items = new ArrayList<>(); + /** + * Initialises the ItemManager. + */ + public ItemManager() { + @Nullable JSONObject jsonAll = this.fileManager.read(); + if (jsonAll == null) { + return; + } + + JSONArray array = jsonAll.getJSONArray("items"); + for (int i = 0; i < array.length(); i++) { + JSONObject jsonItem = array.getJSONObject(i); + this.importJson(jsonItem); + } + } + + private void importJson(JSONObject json) { + String type = json.getString("type"); + String description = json.getString("description"); + boolean isComplete = json.getBoolean("isComplete"); + + Item item; + switch (type) { + case "T": { + item = new Task(description); + break; + } + case "D": { + String end = json.getString("timestampEnd"); + item = new Deadline(description, end); + break; + } + case "E": { + String end = json.getString("timestampEnd"); + String start = json.getString("timestampStart"); + item = new Event(description, start, end); + break; + } + default: + System.err.println( + "ERR Could not import JSON item with unsupported type!" + ); + System.err.println(json); + return; + } + + item.setComplete(isComplete); + this.items.add(item); + } + private void save() { List jsons = items .stream() @@ -26,7 +78,7 @@ private void save() { JSONObject json = new JSONObject(); json.put("items", jsons); - this.fileManager.save(json); + this.fileManager.write(json); } /** From bde28cb2b4a1b7bad11f20fd3b07d1e7964aafeb Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Mon, 11 Sep 2023 22:18:48 +0800 Subject: [PATCH 050/112] fix(test): Update for lib & data folder --- test.bat | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test.bat b/test.bat index 1405f54be3..01d0575d24 100644 --- a/test.bat +++ b/test.bat @@ -7,8 +7,13 @@ del /S /Q .\bin\ > nul rmdir /S /Q .\bin\ mkdir .\bin\ +@REM Clear any previous data files, remake data\ +del /S /Q .\data\ > nul +rmdir /S /Q .\data\ +mkdir .\data\ + @REM Compile -javac .\src\main\java\com\cloud\chatbot\*.java -cp .\src\main\java\ -Xlint:none -d .\bin\ +javac -cp .\src\main\java\;.\lib\* -Xlint:none -d .\bin\ .\src\main\java\com\cloud\chatbot\*.java IF ERRORLEVEL 1 ( echo: echo ^>^>^> javac failed @@ -19,7 +24,7 @@ IF ERRORLEVEL 1 ( del .\tests\ACTUAL.txt @REM Test main class, generate output -java -classpath .\bin\ com.cloud.chatbot.Cloud < .\tests\input.txt > .\tests\ACTUAL.txt +java -cp .\bin\;.\lib\* com.cloud.chatbot.Cloud < .\tests\input.txt > .\tests\ACTUAL.txt @REM Compare output with expected FC .\tests\ACTUAL.txt .\tests\EXPECTED.txt From 09b969160d59747952ad0444425e0e1bde9ad4ec Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Mon, 11 Sep 2023 22:40:42 +0800 Subject: [PATCH 051/112] ref(src): Enums for ItemType, JSON Key --- src/main/java/com/cloud/chatbot/Cloud.java | 3 +- .../java/com/cloud/chatbot/CommandType.java | 4 +- .../com/cloud/chatbot/file/FileManager.java | 3 -- src/main/java/com/cloud/chatbot/file/Key.java | 22 +++++++++++ .../java/com/cloud/chatbot/item/Deadline.java | 6 ++- .../java/com/cloud/chatbot/item/Event.java | 8 ++-- .../java/com/cloud/chatbot/item/Item.java | 8 ++-- .../com/cloud/chatbot/item/ItemManager.java | 23 ++++++----- .../java/com/cloud/chatbot/item/ItemType.java | 38 +++++++++++++++++++ .../java/com/cloud/chatbot/item/Task.java | 2 +- .../java/com/cloud/chatbot/token/Token.java | 2 +- .../com/cloud/chatbot/token/TokenManager.java | 4 +- 12 files changed, 94 insertions(+), 29 deletions(-) create mode 100644 src/main/java/com/cloud/chatbot/file/Key.java create mode 100644 src/main/java/com/cloud/chatbot/item/ItemType.java diff --git a/src/main/java/com/cloud/chatbot/Cloud.java b/src/main/java/com/cloud/chatbot/Cloud.java index 38269a7f71..7e23f97611 100644 --- a/src/main/java/com/cloud/chatbot/Cloud.java +++ b/src/main/java/com/cloud/chatbot/Cloud.java @@ -33,7 +33,7 @@ private static void handle(String input) { return; } - switch (CommandType.stringToCommandType(command)) { + switch (CommandType.fromString(command)) { case ADD: { @Nullable Item item = Cloud.createItem(commandManager); if (item == null) { @@ -97,7 +97,6 @@ private static void handle(String input) { System.exit(0); break; } - case UNKNOWN: default: { Cloud.say( String.format( diff --git a/src/main/java/com/cloud/chatbot/CommandType.java b/src/main/java/com/cloud/chatbot/CommandType.java index 45185df2c2..c879e1f21a 100644 --- a/src/main/java/com/cloud/chatbot/CommandType.java +++ b/src/main/java/com/cloud/chatbot/CommandType.java @@ -15,11 +15,11 @@ public enum CommandType { UNKNOWN; /** - * Returns the matching command type for the specified command. + * Returns the matching CommandType for the specified command. * * @param command The command. */ - public static CommandType stringToCommandType(String command) { + public static CommandType fromString(String command) { switch (command) { case "todo": case "t": diff --git a/src/main/java/com/cloud/chatbot/file/FileManager.java b/src/main/java/com/cloud/chatbot/file/FileManager.java index f8a10e1088..78e4235821 100644 --- a/src/main/java/com/cloud/chatbot/file/FileManager.java +++ b/src/main/java/com/cloud/chatbot/file/FileManager.java @@ -36,9 +36,6 @@ private File getFile() { * Returns a JSON object by reading from disk. */ public @Nullable JSONObject read() { - //TODO fix tests lib - //TODO neater err print? - //TODO enum for item type, for json keys String string; try { string = Files.readString(this.getFile().toPath()); diff --git a/src/main/java/com/cloud/chatbot/file/Key.java b/src/main/java/com/cloud/chatbot/file/Key.java new file mode 100644 index 0000000000..f4f8f041e8 --- /dev/null +++ b/src/main/java/com/cloud/chatbot/file/Key.java @@ -0,0 +1,22 @@ +package com.cloud.chatbot.file; + + + +/** + * Represents all JSON keys used to represent work Items. + */ +public enum Key { + TYPE("type"), + DESCRIPTION("description"), + IS_COMPLETE("isComplete"), + + START("timestampStart"), + END("timestampEnd"); + + /** The key string. */ + public String string; + + private Key(String _string) { + this.string = _string; + } +} diff --git a/src/main/java/com/cloud/chatbot/item/Deadline.java b/src/main/java/com/cloud/chatbot/item/Deadline.java index 7ca75426db..2caae2b1d9 100644 --- a/src/main/java/com/cloud/chatbot/item/Deadline.java +++ b/src/main/java/com/cloud/chatbot/item/Deadline.java @@ -2,6 +2,8 @@ import org.json.JSONObject; +import com.cloud.chatbot.file.Key; + /** @@ -31,13 +33,13 @@ public String toString(int number) { @Override public String getTypeString() { - return "D"; + return ItemType.DEADLINE.string; } @Override public JSONObject export() { JSONObject json = this.getBasicJson(); - json.put("timestampEnd", this.getEnd()); + json.put(Key.END.string, this.getEnd()); return json; } diff --git a/src/main/java/com/cloud/chatbot/item/Event.java b/src/main/java/com/cloud/chatbot/item/Event.java index 9fc71f4eff..33b7a32610 100644 --- a/src/main/java/com/cloud/chatbot/item/Event.java +++ b/src/main/java/com/cloud/chatbot/item/Event.java @@ -2,6 +2,8 @@ import org.json.JSONObject; +import com.cloud.chatbot.file.Key; + /** @@ -33,14 +35,14 @@ public String toString(int number) { @Override public String getTypeString() { - return "E"; + return ItemType.EVENT.string; } @Override public JSONObject export() { JSONObject json = this.getBasicJson(); - json.put("timestampStart", this.getStart()); - json.put("timestampEnd", this.getEnd()); + json.put(Key.START.string, this.getStart()); + json.put(Key.END.string, this.getEnd()); return json; } diff --git a/src/main/java/com/cloud/chatbot/item/Item.java b/src/main/java/com/cloud/chatbot/item/Item.java index 3741f1c600..a8eb2bd2bd 100644 --- a/src/main/java/com/cloud/chatbot/item/Item.java +++ b/src/main/java/com/cloud/chatbot/item/Item.java @@ -2,6 +2,8 @@ import org.json.JSONObject; +import com.cloud.chatbot.file.Key; + /** @@ -28,9 +30,9 @@ protected String getBasicString(int number) { protected JSONObject getBasicJson() { JSONObject json = new JSONObject(); - json.put("type", this.getTypeString()); - json.put("description", this.getDescription()); - json.put("isComplete", this.isComplete()); + json.put(Key.TYPE.string, this.getTypeString()); + json.put(Key.DESCRIPTION.string, this.getDescription()); + json.put(Key.IS_COMPLETE.string, this.isComplete()); return json; } diff --git a/src/main/java/com/cloud/chatbot/item/ItemManager.java b/src/main/java/com/cloud/chatbot/item/ItemManager.java index 7a5cec6f6c..0cbd109dd8 100644 --- a/src/main/java/com/cloud/chatbot/item/ItemManager.java +++ b/src/main/java/com/cloud/chatbot/item/ItemManager.java @@ -9,6 +9,7 @@ import com.cloud.chatbot.annotations.Nullable; import com.cloud.chatbot.file.FileManager; +import com.cloud.chatbot.file.Key; @@ -36,24 +37,26 @@ public ItemManager() { } private void importJson(JSONObject json) { - String type = json.getString("type"); - String description = json.getString("description"); - boolean isComplete = json.getBoolean("isComplete"); + ItemType type = ItemType.fromString( + json.getString(Key.TYPE.string) + ); + String description = json.getString(Key.DESCRIPTION.string); + boolean isComplete = json.getBoolean(Key.IS_COMPLETE.string); Item item; switch (type) { - case "T": { + case TASK: { item = new Task(description); break; } - case "D": { - String end = json.getString("timestampEnd"); + case DEADLINE: { + String end = json.getString(Key.END.string); item = new Deadline(description, end); break; } - case "E": { - String end = json.getString("timestampEnd"); - String start = json.getString("timestampStart"); + case EVENT: { + String start = json.getString(Key.START.string); + String end = json.getString(Key.END.string); item = new Event(description, start, end); break; } @@ -93,7 +96,7 @@ public void add(Item item) { } /** - * Returns the String representation for the Item of the specified number. + * Returns the string representation for the Item of the specified number. * * @param int The Item's number. */ diff --git a/src/main/java/com/cloud/chatbot/item/ItemType.java b/src/main/java/com/cloud/chatbot/item/ItemType.java new file mode 100644 index 0000000000..e54db4331e --- /dev/null +++ b/src/main/java/com/cloud/chatbot/item/ItemType.java @@ -0,0 +1,38 @@ +package com.cloud.chatbot.item; + + + +/** + * Represents all work Item types. + */ +public enum ItemType { + TASK("T"), + DEADLINE("D"), + EVENT("E"), + UNKNOWN("?"); + + /** The type string. */ + public String string; + + private ItemType(String _string) { + this.string = _string; + } + + /** + * Returns the matching ItemType for the specified type string. + * + * @param string The type string. + */ + public static ItemType fromString(String string) { + switch (string) { + case "T": + return ItemType.TASK; + case "D": + return ItemType.DEADLINE; + case "E": + return ItemType.EVENT; + default: + return ItemType.UNKNOWN; + } + } +} diff --git a/src/main/java/com/cloud/chatbot/item/Task.java b/src/main/java/com/cloud/chatbot/item/Task.java index 8bf977ae47..3405fdd23b 100644 --- a/src/main/java/com/cloud/chatbot/item/Task.java +++ b/src/main/java/com/cloud/chatbot/item/Task.java @@ -17,7 +17,7 @@ public Task(String _description) { @Override public String getTypeString() { - return "T"; + return ItemType.TASK.string; } @Override diff --git a/src/main/java/com/cloud/chatbot/token/Token.java b/src/main/java/com/cloud/chatbot/token/Token.java index 55cf8e86cc..dcfe7e822a 100644 --- a/src/main/java/com/cloud/chatbot/token/Token.java +++ b/src/main/java/com/cloud/chatbot/token/Token.java @@ -8,7 +8,7 @@ * Represents a single word of user input. */ public final class Token { - /** The prefix for flags */ + /** The prefix for flags. */ public static final String PREFIX_FLAG = "/"; private String token; diff --git a/src/main/java/com/cloud/chatbot/token/TokenManager.java b/src/main/java/com/cloud/chatbot/token/TokenManager.java index c60fae7b92..9de8ae03bb 100644 --- a/src/main/java/com/cloud/chatbot/token/TokenManager.java +++ b/src/main/java/com/cloud/chatbot/token/TokenManager.java @@ -50,7 +50,7 @@ protected static String tokensToString(List tokens) { } /** - * Returns the first token as a String. + * Returns the first token as a string. * * @throws MissingInputException If there is no first token. */ @@ -63,7 +63,7 @@ protected String getHead() throws MissingInputException { } /** - * Returns all tokens except the first as a rejoined String. + * Returns all tokens except the first as a rejoined string. * * @throws MissingInputException If there are no relevant tokens to join. */ From 996216e69a6772ce5585a59fb048175c8f2eb14e Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Tue, 12 Sep 2023 00:25:55 +0800 Subject: [PATCH 052/112] FEAT(src): Handle real timestamps --- src/main/java/com/cloud/chatbot/Cloud.java | 19 ++++++- .../java/com/cloud/chatbot/DateConverter.java | 50 +++++++++++++++++++ .../exceptions/IllegalTimestampException.java | 8 +++ src/main/java/com/cloud/chatbot/file/Key.java | 4 +- .../java/com/cloud/chatbot/item/Deadline.java | 24 +++++---- .../java/com/cloud/chatbot/item/Event.java | 40 ++++++++++----- .../com/cloud/chatbot/item/ItemManager.java | 29 +++++++++-- 7 files changed, 143 insertions(+), 31 deletions(-) create mode 100644 src/main/java/com/cloud/chatbot/DateConverter.java create mode 100644 src/main/java/com/cloud/chatbot/exceptions/IllegalTimestampException.java diff --git a/src/main/java/com/cloud/chatbot/Cloud.java b/src/main/java/com/cloud/chatbot/Cloud.java index 7e23f97611..852a4d42a6 100644 --- a/src/main/java/com/cloud/chatbot/Cloud.java +++ b/src/main/java/com/cloud/chatbot/Cloud.java @@ -1,8 +1,10 @@ package com.cloud.chatbot; +import java.time.format.DateTimeParseException; import java.util.Scanner; import com.cloud.chatbot.annotations.Nullable; +import com.cloud.chatbot.exceptions.IllegalTimestampException; import com.cloud.chatbot.exceptions.MissingFlagInputException; import com.cloud.chatbot.exceptions.MissingInputException; import com.cloud.chatbot.item.Deadline; @@ -124,10 +126,17 @@ private static void handle(String input) { try { if (managerBy != null) { - return new Deadline(description, managerBy.getSubInput()); + return new Deadline( + description, + DateConverter.timestampToInstant(managerBy.getSubInput()) + ); } if (managerFrom != null && managerTo != null) { - return new Event(description, managerFrom.getSubInput(), managerTo.getSubInput()); + return new Event( + description, + DateConverter.timestampToInstant(managerFrom.getSubInput()), + DateConverter.timestampToInstant(managerTo.getSubInput()) + ); } } catch (MissingFlagInputException e) { Cloud.say( @@ -137,6 +146,12 @@ private static void handle(String input) { ) ); return null; + } catch (DateTimeParseException e) { + Cloud.say("Please use a valid timestamp format."); + return null; + } catch (IllegalTimestampException e) { + Cloud.say("Please enter a logical timestamp range."); + return null; } return new Task(description); diff --git a/src/main/java/com/cloud/chatbot/DateConverter.java b/src/main/java/com/cloud/chatbot/DateConverter.java new file mode 100644 index 0000000000..d0f7418ddc --- /dev/null +++ b/src/main/java/com/cloud/chatbot/DateConverter.java @@ -0,0 +1,50 @@ +package com.cloud.chatbot; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; + +/** + * Provides utilities for working with timestamps. + * + * A timestamp is a string of a format that is easy to type. + * + * A pretty timestamp is a more complex string used for display purposes. + */ +public final class DateConverter { + public static Instant timestampToInstant(String timestamp) { + // Eg 1 2 23 456 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("d M uu Hmm"); + + LocalDateTime local = LocalDateTime.parse(timestamp, formatter); + ZonedDateTime zoned = local.atZone(ZoneId.systemDefault()); + return zoned.toInstant(); + } + + public static String instantToPrettyTimestamp(Instant instant) { + ZonedDateTime zoned = instant.atZone(ZoneId.systemDefault()); + + // Eg 1 Feb '23, 4 + String timestamp = DateTimeFormatter + .ofPattern("d MMM ''uu, h") + .format(zoned); + + // Only add minutes that are not 00 + if (zoned.getMinute() != 0) { + timestamp += DateTimeFormatter + .ofPattern(":mm") + .format(zoned); + } + + // Lowercase the AM/PM + timestamp += DateTimeFormatter + .ofPattern("a") + .format(zoned) + .toLowerCase(); + + // Eg 1 Feb '23, 4:56am + return timestamp; + } +} diff --git a/src/main/java/com/cloud/chatbot/exceptions/IllegalTimestampException.java b/src/main/java/com/cloud/chatbot/exceptions/IllegalTimestampException.java new file mode 100644 index 0000000000..2b376365fd --- /dev/null +++ b/src/main/java/com/cloud/chatbot/exceptions/IllegalTimestampException.java @@ -0,0 +1,8 @@ +package com.cloud.chatbot.exceptions; + + + +/** + * Thrown when the user specifies a disallowed timestamp. + */ +public class IllegalTimestampException extends Exception {} diff --git a/src/main/java/com/cloud/chatbot/file/Key.java b/src/main/java/com/cloud/chatbot/file/Key.java index f4f8f041e8..780490183d 100644 --- a/src/main/java/com/cloud/chatbot/file/Key.java +++ b/src/main/java/com/cloud/chatbot/file/Key.java @@ -10,8 +10,8 @@ public enum Key { DESCRIPTION("description"), IS_COMPLETE("isComplete"), - START("timestampStart"), - END("timestampEnd"); + START("start"), + END("end"); /** The key string. */ public String string; diff --git a/src/main/java/com/cloud/chatbot/item/Deadline.java b/src/main/java/com/cloud/chatbot/item/Deadline.java index 2caae2b1d9..6b217e1b7c 100644 --- a/src/main/java/com/cloud/chatbot/item/Deadline.java +++ b/src/main/java/com/cloud/chatbot/item/Deadline.java @@ -1,25 +1,28 @@ package com.cloud.chatbot.item; +import java.time.Instant; + import org.json.JSONObject; +import com.cloud.chatbot.DateConverter; import com.cloud.chatbot.file.Key; /** - * Represents a deadline work Item, which has an ending timestamp. + * Represents a deadline work Item, which has an end Instant. */ public class Deadline extends Item { - private String timestampEnd; + private Instant end; /** * @param _description The Item description. - * @param end The ending timestamp. + * @param _end The end Instant. */ - public Deadline(String _description, String end) { + public Deadline(String _description, Instant _end) { super(_description); - this.timestampEnd = end; + this.end = _end; } @Override @@ -27,7 +30,7 @@ public String toString(int number) { return String.format( "%s | BY %s", this.getBasicString(number), - this.getEnd() + DateConverter.instantToPrettyTimestamp(this.getEnd()) ); } @@ -39,11 +42,14 @@ public String getTypeString() { @Override public JSONObject export() { JSONObject json = this.getBasicJson(); - json.put(Key.END.string, this.getEnd()); + json.put( + Key.END.string, + this.getEnd().toEpochMilli() + ); return json; } - public String getEnd() { - return this.timestampEnd; + public Instant getEnd() { + return this.end; } } diff --git a/src/main/java/com/cloud/chatbot/item/Event.java b/src/main/java/com/cloud/chatbot/item/Event.java index 33b7a32610..6d17fb1428 100644 --- a/src/main/java/com/cloud/chatbot/item/Event.java +++ b/src/main/java/com/cloud/chatbot/item/Event.java @@ -1,26 +1,34 @@ package com.cloud.chatbot.item; +import java.time.Instant; + import org.json.JSONObject; +import com.cloud.chatbot.DateConverter; +import com.cloud.chatbot.exceptions.IllegalTimestampException; import com.cloud.chatbot.file.Key; /** - * Represents an event work Item, which has both a starting and ending timestamp. + * Represents an event work Item, which has both a start and end Instant. */ public class Event extends Deadline { - private String timestampStart; + private Instant start; /** * @param _description The Item description. - * @param start The starting timestamp. - * @param end The ending timestamp. + * @param _start The start Instant. + * @param _end The end Instant. */ - public Event(String _description, String start, String end) { - super(_description, end); + public Event(String _description, Instant _start, Instant _end) throws IllegalTimestampException { + super(_description, _end); + + if (_end.isBefore(_start)) { + throw new IllegalTimestampException(); + } - this.timestampStart = start; + this.start = _start; } @Override @@ -28,8 +36,8 @@ public String toString(int number) { return String.format( "%s | FROM %s | TO %s", this.getBasicString(number), - this.getStart(), - this.getEnd() + DateConverter.instantToPrettyTimestamp(this.getStart()), + DateConverter.instantToPrettyTimestamp(this.getEnd()) ); } @@ -41,12 +49,18 @@ public String getTypeString() { @Override public JSONObject export() { JSONObject json = this.getBasicJson(); - json.put(Key.START.string, this.getStart()); - json.put(Key.END.string, this.getEnd()); + json.put( + Key.START.string, + this.getStart().toEpochMilli() + ); + json.put( + Key.END.string, + this.getEnd().toEpochMilli() + ); return json; } - public String getStart() { - return this.timestampStart; + public Instant getStart() { + return this.start; } } diff --git a/src/main/java/com/cloud/chatbot/item/ItemManager.java b/src/main/java/com/cloud/chatbot/item/ItemManager.java index 0cbd109dd8..3b7697be1b 100644 --- a/src/main/java/com/cloud/chatbot/item/ItemManager.java +++ b/src/main/java/com/cloud/chatbot/item/ItemManager.java @@ -1,5 +1,6 @@ package com.cloud.chatbot.item; +import java.time.Instant; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -8,6 +9,7 @@ import org.json.JSONObject; import com.cloud.chatbot.annotations.Nullable; +import com.cloud.chatbot.exceptions.IllegalTimestampException; import com.cloud.chatbot.file.FileManager; import com.cloud.chatbot.file.Key; @@ -50,14 +52,31 @@ private void importJson(JSONObject json) { break; } case DEADLINE: { - String end = json.getString(Key.END.string); - item = new Deadline(description, end); + long endEpoch = json.getLong(Key.END.string); + item = new Deadline( + description, + Instant.ofEpochMilli(endEpoch) + ); break; } case EVENT: { - String start = json.getString(Key.START.string); - String end = json.getString(Key.END.string); - item = new Event(description, start, end); + long startEpoch = json.getLong(Key.START.string); + long endEpoch = json.getLong(Key.END.string); + + try { + item = new Event( + description, + Instant.ofEpochMilli(startEpoch), + Instant.ofEpochMilli(endEpoch) + ); + } catch (IllegalTimestampException e) { + System.err.println( + "ERR Could not import JSON event with illegal timestamp!" + ); + System.err.println(json); + return; + } + break; } default: From 3befaddadd7ebfc333e05b83adb103a3653f4254 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Tue, 12 Sep 2023 00:31:12 +0800 Subject: [PATCH 053/112] feat(tests): Update tests for new timestamps --- tests/EXPECTED.txt | 44 +++++++++++++++++++++++--------------------- tests/input.txt | 11 ++++++----- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/tests/EXPECTED.txt b/tests/EXPECTED.txt index 2a62d1437d..a200e659d7 100644 --- a/tests/EXPECTED.txt +++ b/tests/EXPECTED.txt @@ -8,9 +8,9 @@ Cloud online. >>> | T#1: Download wk 3 files ->>> | D#2: Watch L3 recording | BY Friday 2359 +>>> | D#2: Watch L3 recording | BY 18 Jun '23, 11:59pm ->>> | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm +>>> | E#3: Project meeting | FROM 11 Sep '23, 3pm | TO 11 Sep '23, 4:30pm >>> Please enter a description for the "by" flag. @@ -20,40 +20,42 @@ Cloud online. >>> Please enter a description for your item. ->>> | T#4: I tried to make an event by didn't specify flags. +>>> | T#4: I tried to make an event but didn't specify flags. >>> Please enter a description for the "from" flag. +>>> Please use a valid timestamp format. + >>> | T#1: Download wk 3 files - | D#2: Watch L3 recording | BY Friday 2359 - | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm - | T#4: I tried to make an event by didn't specify flags. + | D#2: Watch L3 recording | BY 18 Jun '23, 11:59pm + | E#3: Project meeting | FROM 11 Sep '23, 3pm | TO 11 Sep '23, 4:30pm + | T#4: I tried to make an event but didn't specify flags. >>> "a" is not a valid number. >>> Item #-7050 does not exist. ->>> X | D#2: Watch L3 recording | BY Friday 2359 +>>> X | D#2: Watch L3 recording | BY 18 Jun '23, 11:59pm ->>> X | D#2: Watch L3 recording | BY Friday 2359 +>>> X | D#2: Watch L3 recording | BY 18 Jun '23, 11:59pm ->>> X | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm +>>> X | E#3: Project meeting | FROM 11 Sep '23, 3pm | TO 11 Sep '23, 4:30pm ->>> | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm +>>> | E#3: Project meeting | FROM 11 Sep '23, 3pm | TO 11 Sep '23, 4:30pm ->>> | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm +>>> | E#3: Project meeting | FROM 11 Sep '23, 3pm | TO 11 Sep '23, 4:30pm >>> Item #5 does not exist. ->>> X | T#4: I tried to make an event by didn't specify flags. +>>> X | T#4: I tried to make an event but didn't specify flags. ->>> | D#5: another | BY ??? +>>> | D#5: another | BY 1 Jan '20, 6:01am >>> | T#1: Download wk 3 files -X | D#2: Watch L3 recording | BY Friday 2359 - | E#3: Project meeting | FROM Monday 3pm | TO Monday 4:30pm -X | T#4: I tried to make an event by didn't specify flags. - | D#5: another | BY ??? +X | D#2: Watch L3 recording | BY 18 Jun '23, 11:59pm + | E#3: Project meeting | FROM 11 Sep '23, 3pm | TO 11 Sep '23, 4:30pm +X | T#4: I tried to make an event but didn't specify flags. + | D#5: another | BY 1 Jan '20, 6:01am >>> Item #0 does not exist. @@ -61,10 +63,10 @@ X | T#4: I tried to make an event by didn't specify flags. | T#1: Download wk 3 files >>> Yeeted: -X | D#1: Watch L3 recording | BY Friday 2359 +X | D#1: Watch L3 recording | BY 18 Jun '23, 11:59pm ->>> | E#1: Project meeting | FROM Monday 3pm | TO Monday 4:30pm -X | T#2: I tried to make an event by didn't specify flags. - | D#3: another | BY ??? +>>> | E#1: Project meeting | FROM 11 Sep '23, 3pm | TO 11 Sep '23, 4:30pm +X | T#2: I tried to make an event but didn't specify flags. + | D#3: another | BY 1 Jan '20, 6:01am >>> \ No newline at end of file diff --git a/tests/input.txt b/tests/input.txt index 03ef26a9b9..fdec831d28 100644 --- a/tests/input.txt +++ b/tests/input.txt @@ -2,15 +2,16 @@ wat how to use t -TODO Download wk 3 files -deadline Watch L3 recording /by Friday 2359 -event Project meeting /from Monday 3pm /To Monday 4:30pm +TODO Download wk 3 files +deadline Watch L3 recording /by 18 6 23 2359 +event Project meeting /from 11 9 23 1500 /To 11 9 23 1630 deadline My deadline flag has no sub input /BY deadline /by The deadline has no description deadline /by No description again deadline /by No description yet again! -e I tried to make an event by didn't specify flags. +e I tried to make an event but didn't specify flags. EVENT This event has no proper from flag set /frOM /to Far future. +t This event has unparseable timestamps /from 123 /to 456 list mark a MARK -7050 @@ -21,7 +22,7 @@ unmark 3 un 3 m 5 m 4 -add another /by ??? +add another /by 1 1 20 601 l del 0 yeet 1 From 3349793f9e44b46305597ad2cdefa02db781c931 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Tue, 12 Sep 2023 00:58:13 +0800 Subject: [PATCH 054/112] ref(src): Extract Ui class --- src/main/java/com/cloud/chatbot/Cloud.java | 44 +++++++---------- src/main/java/com/cloud/chatbot/Ui.java | 49 +++++++++++++++++++ .../{FileManager.java => FileStorage.java} | 33 ++++++++----- .../com/cloud/chatbot/item/ItemManager.java | 20 ++++---- 4 files changed, 98 insertions(+), 48 deletions(-) create mode 100644 src/main/java/com/cloud/chatbot/Ui.java rename src/main/java/com/cloud/chatbot/file/{FileManager.java => FileStorage.java} (68%) diff --git a/src/main/java/com/cloud/chatbot/Cloud.java b/src/main/java/com/cloud/chatbot/Cloud.java index 852a4d42a6..c284a5f1eb 100644 --- a/src/main/java/com/cloud/chatbot/Cloud.java +++ b/src/main/java/com/cloud/chatbot/Cloud.java @@ -43,17 +43,17 @@ private static void handle(String input) { } Cloud.ITEM_MANAGER.add(item); - Cloud.say(item.toString(Cloud.ITEM_MANAGER.getCount())); + Ui.say(item.toString(Cloud.ITEM_MANAGER.getCount())); break; } case LIST: { if (Cloud.ITEM_MANAGER.getCount() <= 0) { - Cloud.say("Your item list is empty."); + Ui.say("Your item list is empty."); break; } for (int number = 1; number <= Cloud.ITEM_MANAGER.getCount(); number++) { - Cloud.say( + Ui.say( Cloud.ITEM_MANAGER.getString(number) ); } @@ -66,7 +66,7 @@ private static void handle(String input) { } Cloud.ITEM_MANAGER.setComplete(number, true); - Cloud.say( + Ui.say( Cloud.ITEM_MANAGER.getString(number) ); break; @@ -78,7 +78,7 @@ private static void handle(String input) { } Cloud.ITEM_MANAGER.setComplete(number, false); - Cloud.say( + Ui.say( Cloud.ITEM_MANAGER.getString(number) ); break; @@ -90,17 +90,17 @@ private static void handle(String input) { } Item item = Cloud.ITEM_MANAGER.remove(number); - Cloud.say("Yeeted:"); - Cloud.say(item.toString(number)); + Ui.say("Yeeted:"); + Ui.say(item.toString(number)); break; } case EXIT: { - Cloud.say("\\o"); + Ui.say("\\o"); System.exit(0); break; } default: { - Cloud.say( + Ui.say( String.format( "\"%s\" is not a valid command.", command @@ -116,7 +116,7 @@ private static void handle(String input) { try { description = manager.getDetails(); } catch (MissingInputException e) { - Cloud.say("Please enter a description for your item."); + Ui.say("Please enter a description for your item."); return null; } @@ -139,7 +139,7 @@ private static void handle(String input) { ); } } catch (MissingFlagInputException e) { - Cloud.say( + Ui.say( String.format( "Please enter a description for the \"%s\" flag.", e.getFlagText() @@ -147,10 +147,10 @@ private static void handle(String input) { ); return null; } catch (DateTimeParseException e) { - Cloud.say("Please use a valid timestamp format."); + Ui.say("Please use a valid timestamp format."); return null; } catch (IllegalTimestampException e) { - Cloud.say("Please enter a logical timestamp range."); + Ui.say("Please enter a logical timestamp range."); return null; } @@ -164,7 +164,7 @@ private static void handle(String input) { Token numberToken = manager.getToken(1); if (!numberToken.isInt()) { - Cloud.say( + Ui.say( String.format( "\"%s\" is not a valid number.", numberToken.toString() @@ -174,7 +174,7 @@ private static void handle(String input) { } if (!numberToken.isValidNumber(Cloud.ITEM_MANAGER.getCount())) { - Cloud.say( + Ui.say( String.format( "Item #%d does not exist.", numberToken.toInt() @@ -186,28 +186,20 @@ private static void handle(String input) { return numberToken.toInt(); } - private static void say(String text) { - System.out.println(text); - } - - private static void inputMarker() { - System.out.print("\n>>> "); - } - /** * The chatbot's main method. * * @param args Java arguments. */ public static void main(String[] args) { - Cloud.say("Cloud online."); - Cloud.inputMarker(); + Ui.say("Cloud online."); + Ui.inputMarker(); while (Cloud.SCANNER.hasNextLine()) { String input = Cloud.SCANNER.nextLine(); Cloud.handle(input); - Cloud.inputMarker(); + Ui.inputMarker(); } } } diff --git a/src/main/java/com/cloud/chatbot/Ui.java b/src/main/java/com/cloud/chatbot/Ui.java new file mode 100644 index 0000000000..5d563ed915 --- /dev/null +++ b/src/main/java/com/cloud/chatbot/Ui.java @@ -0,0 +1,49 @@ +package com.cloud.chatbot; + +import com.cloud.chatbot.annotations.Nullable; + + + +/** + * Handles interactions with the user. + */ +public final class Ui { + /** + * Displays output to the user. + * + * @param message The output. + */ + public static void say(String message) { + System.out.println(message); + } + + /** + * Displays an input marker indicating the bot is waiting for a command. + */ + public static void inputMarker() { + System.out.print("\n>>> "); + } + + public static void error(String message) { + error(message, null); + } + + /** + * Displays an error message alongside an object. + * + * @param message The error. + * @param object The object to display. + */ + public static void error(String message, @Nullable Object object) { + System.err.println( + String.format( + "ERR %s!", + message + ) + ); + + if (object != null) { + System.err.println(object); + } + } +} diff --git a/src/main/java/com/cloud/chatbot/file/FileManager.java b/src/main/java/com/cloud/chatbot/file/FileStorage.java similarity index 68% rename from src/main/java/com/cloud/chatbot/file/FileManager.java rename to src/main/java/com/cloud/chatbot/file/FileStorage.java index 78e4235821..b32e178183 100644 --- a/src/main/java/com/cloud/chatbot/file/FileManager.java +++ b/src/main/java/com/cloud/chatbot/file/FileStorage.java @@ -8,20 +8,21 @@ import org.json.JSONObject; +import com.cloud.chatbot.Ui; import com.cloud.chatbot.annotations.Nullable; /** - * Handles reading from and writing to disk. + * Handles reading from and writing to file. */ -public final class FileManager { +public final class FileStorage { private static final String RELATIVE_PATH = "./data/items.json"; /** - * Initialises the FileManager. + * Initialises the FileStorage. */ - public FileManager() { + public FileStorage() { // Create directories as needed File file = getFile(); File folder = file.getParentFile(); @@ -29,11 +30,11 @@ public FileManager() { } private File getFile() { - return Paths.get(FileManager.RELATIVE_PATH).toFile(); + return Paths.get(FileStorage.RELATIVE_PATH).toFile(); } /** - * Returns a JSON object by reading from disk. + * Returns a JSON object by reading from file. */ public @Nullable JSONObject read() { String string; @@ -48,7 +49,7 @@ private File getFile() { } /** - * Writes the specified JSON object to disk. + * Writes the specified JSON object to file. * * @param json The JSON object to write. */ @@ -57,24 +58,30 @@ public void write(JSONObject json) { try { writer = new FileWriter(this.getFile()); } catch (IOException e) { - System.err.println("ERR Could not create FileWriter!"); - System.err.println(e); + Ui.error( + "Could not create FileWriter", + e + ); return; } try { writer.write(json.toString(4)); } catch (IOException e) { - System.err.println("ERR Could not write to file!"); - System.err.println(e); + Ui.error( + "Could not write to file", + e + ); return; } try { writer.close(); } catch (IOException e) { - System.err.println("ERR Could not close FileWriter!"); - System.err.println(e); + Ui.error( + "Could not close FileWriter", + e + ); return; } } diff --git a/src/main/java/com/cloud/chatbot/item/ItemManager.java b/src/main/java/com/cloud/chatbot/item/ItemManager.java index 3b7697be1b..3d09b9c9b0 100644 --- a/src/main/java/com/cloud/chatbot/item/ItemManager.java +++ b/src/main/java/com/cloud/chatbot/item/ItemManager.java @@ -8,9 +8,10 @@ import org.json.JSONArray; import org.json.JSONObject; +import com.cloud.chatbot.Ui; import com.cloud.chatbot.annotations.Nullable; import com.cloud.chatbot.exceptions.IllegalTimestampException; -import com.cloud.chatbot.file.FileManager; +import com.cloud.chatbot.file.FileStorage; import com.cloud.chatbot.file.Key; @@ -19,7 +20,7 @@ * Manages all Items while the bot is running. */ public class ItemManager { - private FileManager fileManager = new FileManager(); + private FileStorage fileManager = new FileStorage(); private List items = new ArrayList<>(); /** @@ -70,22 +71,23 @@ private void importJson(JSONObject json) { Instant.ofEpochMilli(endEpoch) ); } catch (IllegalTimestampException e) { - System.err.println( - "ERR Could not import JSON event with illegal timestamp!" + Ui.error( + "Could not import JSON event with illegal timestamp", + json ); - System.err.println(json); return; } break; } - default: - System.err.println( - "ERR Could not import JSON item with unsupported type!" + default: { + Ui.error( + "Could not import JSON item with unknown type", + json ); - System.err.println(json); return; } + } item.setComplete(isComplete); this.items.add(item); From 910bca7b1ab09a71f7de3611162eb4fbd9ea8ce0 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Tue, 12 Sep 2023 01:09:25 +0800 Subject: [PATCH 055/112] ref(src): Extract Handler class --- src/main/java/com/cloud/chatbot/Cloud.java | 175 +--------------- src/main/java/com/cloud/chatbot/Handler.java | 202 +++++++++++++++++++ 2 files changed, 203 insertions(+), 174 deletions(-) create mode 100644 src/main/java/com/cloud/chatbot/Handler.java diff --git a/src/main/java/com/cloud/chatbot/Cloud.java b/src/main/java/com/cloud/chatbot/Cloud.java index c284a5f1eb..7bde2b6c62 100644 --- a/src/main/java/com/cloud/chatbot/Cloud.java +++ b/src/main/java/com/cloud/chatbot/Cloud.java @@ -1,20 +1,8 @@ package com.cloud.chatbot; -import java.time.format.DateTimeParseException; import java.util.Scanner; -import com.cloud.chatbot.annotations.Nullable; -import com.cloud.chatbot.exceptions.IllegalTimestampException; -import com.cloud.chatbot.exceptions.MissingFlagInputException; -import com.cloud.chatbot.exceptions.MissingInputException; -import com.cloud.chatbot.item.Deadline; -import com.cloud.chatbot.item.Event; -import com.cloud.chatbot.item.Item; import com.cloud.chatbot.item.ItemManager; -import com.cloud.chatbot.item.Task; -import com.cloud.chatbot.token.CommandManager; -import com.cloud.chatbot.token.FlagManager; -import com.cloud.chatbot.token.Token; @@ -25,167 +13,6 @@ public final class Cloud { private static final Scanner SCANNER = new Scanner(System.in); private static final ItemManager ITEM_MANAGER = new ItemManager(); - private static void handle(String input) { - CommandManager commandManager = new CommandManager(input); - String command; - try { - command = commandManager.getCommand(); - } catch (MissingInputException e) { - // Ignore empty inputs - return; - } - - switch (CommandType.fromString(command)) { - case ADD: { - @Nullable Item item = Cloud.createItem(commandManager); - if (item == null) { - break; - } - - Cloud.ITEM_MANAGER.add(item); - Ui.say(item.toString(Cloud.ITEM_MANAGER.getCount())); - break; - } - case LIST: { - if (Cloud.ITEM_MANAGER.getCount() <= 0) { - Ui.say("Your item list is empty."); - break; - } - - for (int number = 1; number <= Cloud.ITEM_MANAGER.getCount(); number++) { - Ui.say( - Cloud.ITEM_MANAGER.getString(number) - ); - } - break; - } - case MARK: { - @Nullable Integer number = Cloud.verifyNumber(commandManager); - if (number == null) { - break; - } - - Cloud.ITEM_MANAGER.setComplete(number, true); - Ui.say( - Cloud.ITEM_MANAGER.getString(number) - ); - break; - } - case UNMARK: { - @Nullable Integer number = Cloud.verifyNumber(commandManager); - if (number == null) { - break; - } - - Cloud.ITEM_MANAGER.setComplete(number, false); - Ui.say( - Cloud.ITEM_MANAGER.getString(number) - ); - break; - } - case DELETE: { - @Nullable Integer number = Cloud.verifyNumber(commandManager); - if (number == null) { - break; - } - - Item item = Cloud.ITEM_MANAGER.remove(number); - Ui.say("Yeeted:"); - Ui.say(item.toString(number)); - break; - } - case EXIT: { - Ui.say("\\o"); - System.exit(0); - break; - } - default: { - Ui.say( - String.format( - "\"%s\" is not a valid command.", - command - ) - ); - break; - } - } - } - - private static @Nullable Item createItem(CommandManager manager) { - String description; - try { - description = manager.getDetails(); - } catch (MissingInputException e) { - Ui.say("Please enter a description for your item."); - return null; - } - - @Nullable FlagManager managerBy = manager.findFlag("by"); - @Nullable FlagManager managerFrom = manager.findFlag("from"); - @Nullable FlagManager managerTo = manager.findFlag("to"); - - try { - if (managerBy != null) { - return new Deadline( - description, - DateConverter.timestampToInstant(managerBy.getSubInput()) - ); - } - if (managerFrom != null && managerTo != null) { - return new Event( - description, - DateConverter.timestampToInstant(managerFrom.getSubInput()), - DateConverter.timestampToInstant(managerTo.getSubInput()) - ); - } - } catch (MissingFlagInputException e) { - Ui.say( - String.format( - "Please enter a description for the \"%s\" flag.", - e.getFlagText() - ) - ); - return null; - } catch (DateTimeParseException e) { - Ui.say("Please use a valid timestamp format."); - return null; - } catch (IllegalTimestampException e) { - Ui.say("Please enter a logical timestamp range."); - return null; - } - - return new Task(description); - } - - private static @Nullable Integer verifyNumber(CommandManager manager) { - if (manager.getTokenCount() <= 1) { - return null; - } - - Token numberToken = manager.getToken(1); - if (!numberToken.isInt()) { - Ui.say( - String.format( - "\"%s\" is not a valid number.", - numberToken.toString() - ) - ); - return null; - } - - if (!numberToken.isValidNumber(Cloud.ITEM_MANAGER.getCount())) { - Ui.say( - String.format( - "Item #%d does not exist.", - numberToken.toInt() - ) - ); - return null; - } - - return numberToken.toInt(); - } - /** * The chatbot's main method. * @@ -197,7 +24,7 @@ public static void main(String[] args) { while (Cloud.SCANNER.hasNextLine()) { String input = Cloud.SCANNER.nextLine(); - Cloud.handle(input); + Handler.handle(Cloud.ITEM_MANAGER, input); Ui.inputMarker(); } diff --git a/src/main/java/com/cloud/chatbot/Handler.java b/src/main/java/com/cloud/chatbot/Handler.java new file mode 100644 index 0000000000..84ec0fd444 --- /dev/null +++ b/src/main/java/com/cloud/chatbot/Handler.java @@ -0,0 +1,202 @@ +package com.cloud.chatbot; + +import java.time.format.DateTimeParseException; + +import com.cloud.chatbot.annotations.Nullable; +import com.cloud.chatbot.exceptions.IllegalTimestampException; +import com.cloud.chatbot.exceptions.MissingFlagInputException; +import com.cloud.chatbot.exceptions.MissingInputException; +import com.cloud.chatbot.item.Deadline; +import com.cloud.chatbot.item.Event; +import com.cloud.chatbot.item.Item; +import com.cloud.chatbot.item.ItemManager; +import com.cloud.chatbot.item.Task; +import com.cloud.chatbot.token.CommandManager; +import com.cloud.chatbot.token.FlagManager; +import com.cloud.chatbot.token.Token; + + + +/** + * Handles commands from the user, reacting accordingly. + */ +public final class Handler { + private static @Nullable Item createItem(CommandManager manager) { + String description; + try { + description = manager.getDetails(); + } catch (MissingInputException e) { + Ui.say("Please enter a description for your item."); + return null; + } + + @Nullable FlagManager managerBy = manager.findFlag("by"); + @Nullable FlagManager managerFrom = manager.findFlag("from"); + @Nullable FlagManager managerTo = manager.findFlag("to"); + + try { + if (managerBy != null) { + return new Deadline( + description, + DateConverter.timestampToInstant(managerBy.getSubInput()) + ); + } + if (managerFrom != null && managerTo != null) { + return new Event( + description, + DateConverter.timestampToInstant(managerFrom.getSubInput()), + DateConverter.timestampToInstant(managerTo.getSubInput()) + ); + } + } catch (MissingFlagInputException e) { + Ui.say( + String.format( + "Please enter a description for the \"%s\" flag.", + e.getFlagText() + ) + ); + return null; + } catch (DateTimeParseException e) { + Ui.say("Please use a valid timestamp format."); + return null; + } catch (IllegalTimestampException e) { + Ui.say("Please enter a logical timestamp range."); + return null; + } + + return new Task(description); + } + + private static @Nullable Integer verifyNumber( + CommandManager commandManager, + ItemManager itemManager + ) { + if (commandManager.getTokenCount() <= 1) { + return null; + } + + Token numberToken = commandManager.getToken(1); + if (!numberToken.isInt()) { + Ui.say( + String.format( + "\"%s\" is not a valid number.", + numberToken.toString() + ) + ); + return null; + } + + if (!numberToken.isValidNumber(itemManager.getCount())) { + Ui.say( + String.format( + "Item #%d does not exist.", + numberToken.toInt() + ) + ); + return null; + } + + return numberToken.toInt(); + } + + /** + * The main handler logic based on the instance of user input. + * + * @param itemManager The bot's ItemManager. + * @param input The raw input. + */ + public static void handle(ItemManager itemManager, String input) { + CommandManager commandManager = new CommandManager(input); + String command; + try { + command = commandManager.getCommand(); + } catch (MissingInputException e) { + // Ignore empty inputs + return; + } + + switch (CommandType.fromString(command)) { + case ADD: { + @Nullable Item item = Handler.createItem(commandManager); + if (item == null) { + break; + } + + itemManager.add(item); + Ui.say(item.toString(itemManager.getCount())); + break; + } + case LIST: { + if (itemManager.getCount() <= 0) { + Ui.say("Your item list is empty."); + break; + } + + for (int number = 1; number <= itemManager.getCount(); number++) { + Ui.say( + itemManager.getString(number) + ); + } + break; + } + case MARK: { + @Nullable Integer number = Handler.verifyNumber( + commandManager, + itemManager + ); + if (number == null) { + break; + } + + itemManager.setComplete(number, true); + Ui.say( + itemManager.getString(number) + ); + break; + } + case UNMARK: { + @Nullable Integer number = Handler.verifyNumber( + commandManager, + itemManager + ); + if (number == null) { + break; + } + + itemManager.setComplete(number, false); + Ui.say( + itemManager.getString(number) + ); + break; + } + case DELETE: { + @Nullable Integer number = Handler.verifyNumber( + commandManager, + itemManager + ); + if (number == null) { + break; + } + + Item item = itemManager.remove(number); + Ui.say("Yeeted:"); + Ui.say(item.toString(number)); + break; + } + case EXIT: { + Ui.say("\\o"); + System.exit(0); + break; + } + default: { + Ui.say( + String.format( + "\"%s\" is not a valid command.", + command + ) + ); + break; + } + } + } +} From 4d16a808353e53854d1ebc8f14f2492e801fcc52 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Tue, 12 Sep 2023 01:10:47 +0800 Subject: [PATCH 056/112] ref(src): Singular package names --- src/main/java/com/cloud/chatbot/Handler.java | 8 ++++---- src/main/java/com/cloud/chatbot/Ui.java | 2 +- .../chatbot/{annotations => annotation}/Nullable.java | 2 +- .../IllegalTimestampException.java | 2 +- .../MissingFlagInputException.java | 2 +- .../{exceptions => exception}/MissingInputException.java | 2 +- src/main/java/com/cloud/chatbot/file/FileStorage.java | 2 +- src/main/java/com/cloud/chatbot/item/Event.java | 2 +- src/main/java/com/cloud/chatbot/item/ItemManager.java | 4 ++-- src/main/java/com/cloud/chatbot/token/CommandManager.java | 4 ++-- src/main/java/com/cloud/chatbot/token/FlagManager.java | 4 ++-- src/main/java/com/cloud/chatbot/token/Token.java | 2 +- src/main/java/com/cloud/chatbot/token/TokenManager.java | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) rename src/main/java/com/cloud/chatbot/{annotations => annotation}/Nullable.java (78%) rename src/main/java/com/cloud/chatbot/{exceptions => exception}/IllegalTimestampException.java (77%) rename src/main/java/com/cloud/chatbot/{exceptions => exception}/MissingFlagInputException.java (93%) rename src/main/java/com/cloud/chatbot/{exceptions => exception}/MissingInputException.java (77%) diff --git a/src/main/java/com/cloud/chatbot/Handler.java b/src/main/java/com/cloud/chatbot/Handler.java index 84ec0fd444..9dc751a124 100644 --- a/src/main/java/com/cloud/chatbot/Handler.java +++ b/src/main/java/com/cloud/chatbot/Handler.java @@ -2,10 +2,10 @@ import java.time.format.DateTimeParseException; -import com.cloud.chatbot.annotations.Nullable; -import com.cloud.chatbot.exceptions.IllegalTimestampException; -import com.cloud.chatbot.exceptions.MissingFlagInputException; -import com.cloud.chatbot.exceptions.MissingInputException; +import com.cloud.chatbot.annotation.Nullable; +import com.cloud.chatbot.exception.IllegalTimestampException; +import com.cloud.chatbot.exception.MissingFlagInputException; +import com.cloud.chatbot.exception.MissingInputException; import com.cloud.chatbot.item.Deadline; import com.cloud.chatbot.item.Event; import com.cloud.chatbot.item.Item; diff --git a/src/main/java/com/cloud/chatbot/Ui.java b/src/main/java/com/cloud/chatbot/Ui.java index 5d563ed915..ae53dd188e 100644 --- a/src/main/java/com/cloud/chatbot/Ui.java +++ b/src/main/java/com/cloud/chatbot/Ui.java @@ -1,6 +1,6 @@ package com.cloud.chatbot; -import com.cloud.chatbot.annotations.Nullable; +import com.cloud.chatbot.annotation.Nullable; diff --git a/src/main/java/com/cloud/chatbot/annotations/Nullable.java b/src/main/java/com/cloud/chatbot/annotation/Nullable.java similarity index 78% rename from src/main/java/com/cloud/chatbot/annotations/Nullable.java rename to src/main/java/com/cloud/chatbot/annotation/Nullable.java index 4bcca71827..f550a1af4d 100644 --- a/src/main/java/com/cloud/chatbot/annotations/Nullable.java +++ b/src/main/java/com/cloud/chatbot/annotation/Nullable.java @@ -1,4 +1,4 @@ -package com.cloud.chatbot.annotations; +package com.cloud.chatbot.annotation; diff --git a/src/main/java/com/cloud/chatbot/exceptions/IllegalTimestampException.java b/src/main/java/com/cloud/chatbot/exception/IllegalTimestampException.java similarity index 77% rename from src/main/java/com/cloud/chatbot/exceptions/IllegalTimestampException.java rename to src/main/java/com/cloud/chatbot/exception/IllegalTimestampException.java index 2b376365fd..3517fe1bdc 100644 --- a/src/main/java/com/cloud/chatbot/exceptions/IllegalTimestampException.java +++ b/src/main/java/com/cloud/chatbot/exception/IllegalTimestampException.java @@ -1,4 +1,4 @@ -package com.cloud.chatbot.exceptions; +package com.cloud.chatbot.exception; diff --git a/src/main/java/com/cloud/chatbot/exceptions/MissingFlagInputException.java b/src/main/java/com/cloud/chatbot/exception/MissingFlagInputException.java similarity index 93% rename from src/main/java/com/cloud/chatbot/exceptions/MissingFlagInputException.java rename to src/main/java/com/cloud/chatbot/exception/MissingFlagInputException.java index 6a329f9353..001b2ced57 100644 --- a/src/main/java/com/cloud/chatbot/exceptions/MissingFlagInputException.java +++ b/src/main/java/com/cloud/chatbot/exception/MissingFlagInputException.java @@ -1,4 +1,4 @@ -package com.cloud.chatbot.exceptions; +package com.cloud.chatbot.exception; import com.cloud.chatbot.token.FlagManager; diff --git a/src/main/java/com/cloud/chatbot/exceptions/MissingInputException.java b/src/main/java/com/cloud/chatbot/exception/MissingInputException.java similarity index 77% rename from src/main/java/com/cloud/chatbot/exceptions/MissingInputException.java rename to src/main/java/com/cloud/chatbot/exception/MissingInputException.java index 92fc9c2b1d..9b4adb2646 100644 --- a/src/main/java/com/cloud/chatbot/exceptions/MissingInputException.java +++ b/src/main/java/com/cloud/chatbot/exception/MissingInputException.java @@ -1,4 +1,4 @@ -package com.cloud.chatbot.exceptions; +package com.cloud.chatbot.exception; diff --git a/src/main/java/com/cloud/chatbot/file/FileStorage.java b/src/main/java/com/cloud/chatbot/file/FileStorage.java index b32e178183..d07bcd58d2 100644 --- a/src/main/java/com/cloud/chatbot/file/FileStorage.java +++ b/src/main/java/com/cloud/chatbot/file/FileStorage.java @@ -9,7 +9,7 @@ import org.json.JSONObject; import com.cloud.chatbot.Ui; -import com.cloud.chatbot.annotations.Nullable; +import com.cloud.chatbot.annotation.Nullable; diff --git a/src/main/java/com/cloud/chatbot/item/Event.java b/src/main/java/com/cloud/chatbot/item/Event.java index 6d17fb1428..e3877bef25 100644 --- a/src/main/java/com/cloud/chatbot/item/Event.java +++ b/src/main/java/com/cloud/chatbot/item/Event.java @@ -5,7 +5,7 @@ import org.json.JSONObject; import com.cloud.chatbot.DateConverter; -import com.cloud.chatbot.exceptions.IllegalTimestampException; +import com.cloud.chatbot.exception.IllegalTimestampException; import com.cloud.chatbot.file.Key; diff --git a/src/main/java/com/cloud/chatbot/item/ItemManager.java b/src/main/java/com/cloud/chatbot/item/ItemManager.java index 3d09b9c9b0..42f859de3d 100644 --- a/src/main/java/com/cloud/chatbot/item/ItemManager.java +++ b/src/main/java/com/cloud/chatbot/item/ItemManager.java @@ -9,8 +9,8 @@ import org.json.JSONObject; import com.cloud.chatbot.Ui; -import com.cloud.chatbot.annotations.Nullable; -import com.cloud.chatbot.exceptions.IllegalTimestampException; +import com.cloud.chatbot.annotation.Nullable; +import com.cloud.chatbot.exception.IllegalTimestampException; import com.cloud.chatbot.file.FileStorage; import com.cloud.chatbot.file.Key; diff --git a/src/main/java/com/cloud/chatbot/token/CommandManager.java b/src/main/java/com/cloud/chatbot/token/CommandManager.java index b79d49957f..6c67612c58 100644 --- a/src/main/java/com/cloud/chatbot/token/CommandManager.java +++ b/src/main/java/com/cloud/chatbot/token/CommandManager.java @@ -3,8 +3,8 @@ import java.util.HashMap; import java.util.List; -import com.cloud.chatbot.annotations.Nullable; -import com.cloud.chatbot.exceptions.MissingInputException; +import com.cloud.chatbot.annotation.Nullable; +import com.cloud.chatbot.exception.MissingInputException; diff --git a/src/main/java/com/cloud/chatbot/token/FlagManager.java b/src/main/java/com/cloud/chatbot/token/FlagManager.java index 5d86439227..a52b9c6625 100644 --- a/src/main/java/com/cloud/chatbot/token/FlagManager.java +++ b/src/main/java/com/cloud/chatbot/token/FlagManager.java @@ -2,8 +2,8 @@ import java.util.List; -import com.cloud.chatbot.exceptions.MissingFlagInputException; -import com.cloud.chatbot.exceptions.MissingInputException; +import com.cloud.chatbot.exception.MissingFlagInputException; +import com.cloud.chatbot.exception.MissingInputException; diff --git a/src/main/java/com/cloud/chatbot/token/Token.java b/src/main/java/com/cloud/chatbot/token/Token.java index dcfe7e822a..6eb28c93ac 100644 --- a/src/main/java/com/cloud/chatbot/token/Token.java +++ b/src/main/java/com/cloud/chatbot/token/Token.java @@ -1,6 +1,6 @@ package com.cloud.chatbot.token; -import com.cloud.chatbot.annotations.Nullable; +import com.cloud.chatbot.annotation.Nullable; diff --git a/src/main/java/com/cloud/chatbot/token/TokenManager.java b/src/main/java/com/cloud/chatbot/token/TokenManager.java index 9de8ae03bb..52476eb744 100644 --- a/src/main/java/com/cloud/chatbot/token/TokenManager.java +++ b/src/main/java/com/cloud/chatbot/token/TokenManager.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import com.cloud.chatbot.exceptions.MissingInputException; +import com.cloud.chatbot.exception.MissingInputException; From 8a692b5900558255f15f1004391115c0cd3cf981 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Tue, 12 Sep 2023 01:52:43 +0800 Subject: [PATCH 057/112] ref(src): Split into Commands --- src/main/java/com/cloud/chatbot/Cloud.java | 11 +- src/main/java/com/cloud/chatbot/Handler.java | 202 ------------------ .../com/cloud/chatbot/command/AddCommand.java | 85 ++++++++ .../com/cloud/chatbot/command/Command.java | 59 +++++ .../chatbot/{ => command}/CommandType.java | 2 +- .../cloud/chatbot/command/DeleteCommand.java | 30 +++ .../com/cloud/chatbot/command/Dispatcher.java | 57 +++++ .../cloud/chatbot/command/ExitCommand.java | 21 ++ .../cloud/chatbot/command/ListCommand.java | 30 +++ .../cloud/chatbot/command/MarkCommand.java | 30 +++ .../cloud/chatbot/command/UnmarkCommand.java | 30 +++ tests/EXPECTED.txt | 2 +- tests/input.txt | 1 + 13 files changed, 352 insertions(+), 208 deletions(-) delete mode 100644 src/main/java/com/cloud/chatbot/Handler.java create mode 100644 src/main/java/com/cloud/chatbot/command/AddCommand.java create mode 100644 src/main/java/com/cloud/chatbot/command/Command.java rename src/main/java/com/cloud/chatbot/{ => command}/CommandType.java (96%) create mode 100644 src/main/java/com/cloud/chatbot/command/DeleteCommand.java create mode 100644 src/main/java/com/cloud/chatbot/command/Dispatcher.java create mode 100644 src/main/java/com/cloud/chatbot/command/ExitCommand.java create mode 100644 src/main/java/com/cloud/chatbot/command/ListCommand.java create mode 100644 src/main/java/com/cloud/chatbot/command/MarkCommand.java create mode 100644 src/main/java/com/cloud/chatbot/command/UnmarkCommand.java diff --git a/src/main/java/com/cloud/chatbot/Cloud.java b/src/main/java/com/cloud/chatbot/Cloud.java index 7bde2b6c62..09ced6075a 100644 --- a/src/main/java/com/cloud/chatbot/Cloud.java +++ b/src/main/java/com/cloud/chatbot/Cloud.java @@ -2,19 +2,22 @@ import java.util.Scanner; +import com.cloud.chatbot.command.Dispatcher; import com.cloud.chatbot.item.ItemManager; /** - * The chatbot's main class. + * The bot's entry point. */ public final class Cloud { private static final Scanner SCANNER = new Scanner(System.in); - private static final ItemManager ITEM_MANAGER = new ItemManager(); + + /** Manages the user's Items. */ + public static final ItemManager ITEM_MANAGER = new ItemManager(); /** - * The chatbot's main method. + * The bot's main loop. * * @param args Java arguments. */ @@ -24,7 +27,7 @@ public static void main(String[] args) { while (Cloud.SCANNER.hasNextLine()) { String input = Cloud.SCANNER.nextLine(); - Handler.handle(Cloud.ITEM_MANAGER, input); + Dispatcher.handle(input); Ui.inputMarker(); } diff --git a/src/main/java/com/cloud/chatbot/Handler.java b/src/main/java/com/cloud/chatbot/Handler.java deleted file mode 100644 index 9dc751a124..0000000000 --- a/src/main/java/com/cloud/chatbot/Handler.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.cloud.chatbot; - -import java.time.format.DateTimeParseException; - -import com.cloud.chatbot.annotation.Nullable; -import com.cloud.chatbot.exception.IllegalTimestampException; -import com.cloud.chatbot.exception.MissingFlagInputException; -import com.cloud.chatbot.exception.MissingInputException; -import com.cloud.chatbot.item.Deadline; -import com.cloud.chatbot.item.Event; -import com.cloud.chatbot.item.Item; -import com.cloud.chatbot.item.ItemManager; -import com.cloud.chatbot.item.Task; -import com.cloud.chatbot.token.CommandManager; -import com.cloud.chatbot.token.FlagManager; -import com.cloud.chatbot.token.Token; - - - -/** - * Handles commands from the user, reacting accordingly. - */ -public final class Handler { - private static @Nullable Item createItem(CommandManager manager) { - String description; - try { - description = manager.getDetails(); - } catch (MissingInputException e) { - Ui.say("Please enter a description for your item."); - return null; - } - - @Nullable FlagManager managerBy = manager.findFlag("by"); - @Nullable FlagManager managerFrom = manager.findFlag("from"); - @Nullable FlagManager managerTo = manager.findFlag("to"); - - try { - if (managerBy != null) { - return new Deadline( - description, - DateConverter.timestampToInstant(managerBy.getSubInput()) - ); - } - if (managerFrom != null && managerTo != null) { - return new Event( - description, - DateConverter.timestampToInstant(managerFrom.getSubInput()), - DateConverter.timestampToInstant(managerTo.getSubInput()) - ); - } - } catch (MissingFlagInputException e) { - Ui.say( - String.format( - "Please enter a description for the \"%s\" flag.", - e.getFlagText() - ) - ); - return null; - } catch (DateTimeParseException e) { - Ui.say("Please use a valid timestamp format."); - return null; - } catch (IllegalTimestampException e) { - Ui.say("Please enter a logical timestamp range."); - return null; - } - - return new Task(description); - } - - private static @Nullable Integer verifyNumber( - CommandManager commandManager, - ItemManager itemManager - ) { - if (commandManager.getTokenCount() <= 1) { - return null; - } - - Token numberToken = commandManager.getToken(1); - if (!numberToken.isInt()) { - Ui.say( - String.format( - "\"%s\" is not a valid number.", - numberToken.toString() - ) - ); - return null; - } - - if (!numberToken.isValidNumber(itemManager.getCount())) { - Ui.say( - String.format( - "Item #%d does not exist.", - numberToken.toInt() - ) - ); - return null; - } - - return numberToken.toInt(); - } - - /** - * The main handler logic based on the instance of user input. - * - * @param itemManager The bot's ItemManager. - * @param input The raw input. - */ - public static void handle(ItemManager itemManager, String input) { - CommandManager commandManager = new CommandManager(input); - String command; - try { - command = commandManager.getCommand(); - } catch (MissingInputException e) { - // Ignore empty inputs - return; - } - - switch (CommandType.fromString(command)) { - case ADD: { - @Nullable Item item = Handler.createItem(commandManager); - if (item == null) { - break; - } - - itemManager.add(item); - Ui.say(item.toString(itemManager.getCount())); - break; - } - case LIST: { - if (itemManager.getCount() <= 0) { - Ui.say("Your item list is empty."); - break; - } - - for (int number = 1; number <= itemManager.getCount(); number++) { - Ui.say( - itemManager.getString(number) - ); - } - break; - } - case MARK: { - @Nullable Integer number = Handler.verifyNumber( - commandManager, - itemManager - ); - if (number == null) { - break; - } - - itemManager.setComplete(number, true); - Ui.say( - itemManager.getString(number) - ); - break; - } - case UNMARK: { - @Nullable Integer number = Handler.verifyNumber( - commandManager, - itemManager - ); - if (number == null) { - break; - } - - itemManager.setComplete(number, false); - Ui.say( - itemManager.getString(number) - ); - break; - } - case DELETE: { - @Nullable Integer number = Handler.verifyNumber( - commandManager, - itemManager - ); - if (number == null) { - break; - } - - Item item = itemManager.remove(number); - Ui.say("Yeeted:"); - Ui.say(item.toString(number)); - break; - } - case EXIT: { - Ui.say("\\o"); - System.exit(0); - break; - } - default: { - Ui.say( - String.format( - "\"%s\" is not a valid command.", - command - ) - ); - break; - } - } - } -} diff --git a/src/main/java/com/cloud/chatbot/command/AddCommand.java b/src/main/java/com/cloud/chatbot/command/AddCommand.java new file mode 100644 index 0000000000..ffeb5c3bf2 --- /dev/null +++ b/src/main/java/com/cloud/chatbot/command/AddCommand.java @@ -0,0 +1,85 @@ +package com.cloud.chatbot.command; + +import java.time.format.DateTimeParseException; + +import com.cloud.chatbot.Cloud; +import com.cloud.chatbot.DateConverter; +import com.cloud.chatbot.Ui; +import com.cloud.chatbot.annotation.Nullable; +import com.cloud.chatbot.exception.IllegalTimestampException; +import com.cloud.chatbot.exception.MissingFlagInputException; +import com.cloud.chatbot.exception.MissingInputException; +import com.cloud.chatbot.item.Deadline; +import com.cloud.chatbot.item.Event; +import com.cloud.chatbot.item.Item; +import com.cloud.chatbot.item.Task; +import com.cloud.chatbot.token.CommandManager; +import com.cloud.chatbot.token.FlagManager; + + + +/** + * Command for adding new Items. + */ +public class AddCommand extends Command { + private @Nullable Item createItem() { + String description; + try { + description = this.commandManager.getDetails(); + } catch (MissingInputException e) { + Ui.say("Please enter a description for your item."); + return null; + } + + @Nullable FlagManager managerBy = this.commandManager.findFlag("by"); + @Nullable FlagManager managerFrom = this.commandManager.findFlag("from"); + @Nullable FlagManager managerTo = this.commandManager.findFlag("to"); + + try { + if (managerBy != null) { + return new Deadline( + description, + DateConverter.timestampToInstant(managerBy.getSubInput()) + ); + } + if (managerFrom != null && managerTo != null) { + return new Event( + description, + DateConverter.timestampToInstant(managerFrom.getSubInput()), + DateConverter.timestampToInstant(managerTo.getSubInput()) + ); + } + } catch (MissingFlagInputException e) { + Ui.say( + String.format( + "Please enter a description for the \"%s\" flag.", + e.getFlagText() + ) + ); + return null; + } catch (DateTimeParseException e) { + Ui.say("Please use a valid timestamp format."); + return null; + } catch (IllegalTimestampException e) { + Ui.say("Please enter a logical timestamp range."); + return null; + } + + return new Task(description); + } + + public AddCommand(CommandManager _commandManager) { + super(_commandManager); + } + + @Override + public void run() { + @Nullable Item item = this.createItem(); + if (item == null) { + return; + } + + Cloud.ITEM_MANAGER.add(item); + Ui.say(item.toString(Cloud.ITEM_MANAGER.getCount())); + } +} diff --git a/src/main/java/com/cloud/chatbot/command/Command.java b/src/main/java/com/cloud/chatbot/command/Command.java new file mode 100644 index 0000000000..6818f51177 --- /dev/null +++ b/src/main/java/com/cloud/chatbot/command/Command.java @@ -0,0 +1,59 @@ +package com.cloud.chatbot.command; + +import com.cloud.chatbot.Cloud; +import com.cloud.chatbot.Ui; +import com.cloud.chatbot.annotation.Nullable; +import com.cloud.chatbot.token.CommandManager; +import com.cloud.chatbot.token.Token; + + + +/** + * Parent Command class which all runnable Commands inherit from. + */ +public abstract class Command { + CommandManager commandManager; + + protected @Nullable Integer verifyNumber() { + if (commandManager.getTokenCount() <= 1) { + return null; + } + + Token numberToken = commandManager.getToken(1); + if (!numberToken.isInt()) { + Ui.say( + String.format( + "\"%s\" is not a valid number.", + numberToken.toString() + ) + ); + return null; + } + + if (!numberToken.isValidNumber(Cloud.ITEM_MANAGER.getCount())) { + Ui.say( + String.format( + "Item #%d does not exist.", + numberToken.toInt() + ) + ); + return null; + } + + return numberToken.toInt(); + } + + /** + * Creates a Command for an instance of user input. + * + * @param commandManager The input. + */ + public Command(CommandManager _commandManager) { + this.commandManager = _commandManager; + } + + /** + * Runs the command. + */ + public abstract void run(); +} diff --git a/src/main/java/com/cloud/chatbot/CommandType.java b/src/main/java/com/cloud/chatbot/command/CommandType.java similarity index 96% rename from src/main/java/com/cloud/chatbot/CommandType.java rename to src/main/java/com/cloud/chatbot/command/CommandType.java index c879e1f21a..f941e86302 100644 --- a/src/main/java/com/cloud/chatbot/CommandType.java +++ b/src/main/java/com/cloud/chatbot/command/CommandType.java @@ -1,4 +1,4 @@ -package com.cloud.chatbot; +package com.cloud.chatbot.command; diff --git a/src/main/java/com/cloud/chatbot/command/DeleteCommand.java b/src/main/java/com/cloud/chatbot/command/DeleteCommand.java new file mode 100644 index 0000000000..6743dde2d6 --- /dev/null +++ b/src/main/java/com/cloud/chatbot/command/DeleteCommand.java @@ -0,0 +1,30 @@ +package com.cloud.chatbot.command; + +import com.cloud.chatbot.Cloud; +import com.cloud.chatbot.Ui; +import com.cloud.chatbot.annotation.Nullable; +import com.cloud.chatbot.item.Item; +import com.cloud.chatbot.token.CommandManager; + + + +/** + * Command for deleting an Item. + */ +public class DeleteCommand extends Command { + public DeleteCommand(CommandManager _commandManager) { + super(_commandManager); + } + + @Override + public void run() { + @Nullable Integer number = this.verifyNumber(); + if (number == null) { + return; + } + + Item item = Cloud.ITEM_MANAGER.remove(number); + Ui.say("Yeeted:"); + Ui.say(item.toString(number)); + } +} diff --git a/src/main/java/com/cloud/chatbot/command/Dispatcher.java b/src/main/java/com/cloud/chatbot/command/Dispatcher.java new file mode 100644 index 0000000000..a946540544 --- /dev/null +++ b/src/main/java/com/cloud/chatbot/command/Dispatcher.java @@ -0,0 +1,57 @@ +package com.cloud.chatbot.command; + +import com.cloud.chatbot.Ui; +import com.cloud.chatbot.exception.MissingInputException; +import com.cloud.chatbot.token.CommandManager; + + + +/** + * Handles commands from the user, reacting accordingly. + */ +public final class Dispatcher { + /** + * Handles an instance of user input by dispatching the appropriate Command. + * + * @param input The input. + */ + public static void handle(String input) { + CommandManager commandManager = new CommandManager(input); + String command; + try { + command = commandManager.getCommand(); + } catch (MissingInputException e) { + // Ignore empty inputs + return; + } + + switch (CommandType.fromString(command)) { + case ADD: + new AddCommand(commandManager).run(); + break; + case LIST: + new ListCommand(commandManager).run(); + break; + case MARK: + new MarkCommand(commandManager).run(); + break; + case UNMARK: + new UnmarkCommand(commandManager).run(); + break; + case DELETE: + new DeleteCommand(commandManager).run(); + break; + case EXIT: + new ExitCommand(commandManager).run(); + break; + default: + Ui.say( + String.format( + "\"%s\" is not a valid command.", + command + ) + ); + break; + } + } +} diff --git a/src/main/java/com/cloud/chatbot/command/ExitCommand.java b/src/main/java/com/cloud/chatbot/command/ExitCommand.java new file mode 100644 index 0000000000..96b725b4ba --- /dev/null +++ b/src/main/java/com/cloud/chatbot/command/ExitCommand.java @@ -0,0 +1,21 @@ +package com.cloud.chatbot.command; + +import com.cloud.chatbot.Ui; +import com.cloud.chatbot.token.CommandManager; + + + +/** + * Command for exiting the bot. + */ +public class ExitCommand extends Command { + public ExitCommand(CommandManager _commandManager) { + super(_commandManager); + } + + @Override + public void run() { + Ui.say("\\o"); + System.exit(0); + } +} diff --git a/src/main/java/com/cloud/chatbot/command/ListCommand.java b/src/main/java/com/cloud/chatbot/command/ListCommand.java new file mode 100644 index 0000000000..33c4d923b5 --- /dev/null +++ b/src/main/java/com/cloud/chatbot/command/ListCommand.java @@ -0,0 +1,30 @@ +package com.cloud.chatbot.command; + +import com.cloud.chatbot.Cloud; +import com.cloud.chatbot.Ui; +import com.cloud.chatbot.token.CommandManager; + + + +/** + * Command for listing all Items. + */ +public class ListCommand extends Command { + public ListCommand(CommandManager _commandManager) { + super(_commandManager); + } + + @Override + public void run() { + if (Cloud.ITEM_MANAGER.getCount() <= 0) { + Ui.say("Your list is empty."); + return; + } + + for (int number = 1; number <= Cloud.ITEM_MANAGER.getCount(); number++) { + Ui.say( + Cloud.ITEM_MANAGER.getString(number) + ); + } + } +} diff --git a/src/main/java/com/cloud/chatbot/command/MarkCommand.java b/src/main/java/com/cloud/chatbot/command/MarkCommand.java new file mode 100644 index 0000000000..e2e39b3ee2 --- /dev/null +++ b/src/main/java/com/cloud/chatbot/command/MarkCommand.java @@ -0,0 +1,30 @@ +package com.cloud.chatbot.command; + +import com.cloud.chatbot.Cloud; +import com.cloud.chatbot.Ui; +import com.cloud.chatbot.annotation.Nullable; +import com.cloud.chatbot.token.CommandManager; + + + +/** + * Command for marking an Item as complete. + */ +public class MarkCommand extends Command { + public MarkCommand(CommandManager _commandManager) { + super(_commandManager); + } + + @Override + public void run() { + @Nullable Integer number = this.verifyNumber(); + if (number == null) { + return; + } + + Cloud.ITEM_MANAGER.setComplete(number, true); + Ui.say( + Cloud.ITEM_MANAGER.getString(number) + ); + } +} diff --git a/src/main/java/com/cloud/chatbot/command/UnmarkCommand.java b/src/main/java/com/cloud/chatbot/command/UnmarkCommand.java new file mode 100644 index 0000000000..e8d8c21f03 --- /dev/null +++ b/src/main/java/com/cloud/chatbot/command/UnmarkCommand.java @@ -0,0 +1,30 @@ +package com.cloud.chatbot.command; + +import com.cloud.chatbot.Cloud; +import com.cloud.chatbot.Ui; +import com.cloud.chatbot.annotation.Nullable; +import com.cloud.chatbot.token.CommandManager; + + + +/** + * Command for marking an Item as incomplete. + */ +public class UnmarkCommand extends Command { + public UnmarkCommand(CommandManager _commandManager) { + super(_commandManager); + } + + @Override + public void run() { + @Nullable Integer number = this.verifyNumber(); + if (number == null) { + return; + } + + Cloud.ITEM_MANAGER.setComplete(number, false); + Ui.say( + Cloud.ITEM_MANAGER.getString(number) + ); + } +} diff --git a/tests/EXPECTED.txt b/tests/EXPECTED.txt index a200e659d7..3ba5c0452c 100644 --- a/tests/EXPECTED.txt +++ b/tests/EXPECTED.txt @@ -69,4 +69,4 @@ X | D#1: Watch L3 recording | BY 18 Jun '23, 11:59pm X | T#2: I tried to make an event but didn't specify flags. | D#3: another | BY 1 Jan '20, 6:01am ->>> \ No newline at end of file +>>> \o diff --git a/tests/input.txt b/tests/input.txt index fdec831d28..917317a8e1 100644 --- a/tests/input.txt +++ b/tests/input.txt @@ -28,3 +28,4 @@ del 0 yeet 1 yeet 1 l +QUIT \ No newline at end of file From d0d2b64ebc30124f64d8de821d063c8c017f2ce9 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Tue, 12 Sep 2023 17:53:22 +0800 Subject: [PATCH 058/112] style(test): Cosmetic capitalisation --- test.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.bat b/test.bat index 01d0575d24..3a199048f1 100644 --- a/test.bat +++ b/test.bat @@ -14,7 +14,7 @@ mkdir .\data\ @REM Compile javac -cp .\src\main\java\;.\lib\* -Xlint:none -d .\bin\ .\src\main\java\com\cloud\chatbot\*.java -IF ERRORLEVEL 1 ( +if errorlevel 1 ( echo: echo ^>^>^> javac failed exit /B 1 From 1f392943d94983c9d484d87bf01ea7c08266ab9d Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Wed, 13 Sep 2023 01:49:45 +0800 Subject: [PATCH 059/112] chore(gradle): Remove unix script --- 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 6b463ae09b37c9e8a1a1bd56338788261b11b08d Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Wed, 13 Sep 2023 02:01:26 +0800 Subject: [PATCH 060/112] chore(gitignore): Ignore .gradle/ --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7e55c2e651..da74c9e7c2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.gradle/ bin/ data/ tests/ACTUAL.txt From 5df2d8e3bd4fd90f092d0c59a2f9da56ef299ca5 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Wed, 13 Sep 2023 16:25:06 +0800 Subject: [PATCH 061/112] devfeat(): Set up working gradle --- .gitignore | 10 +++++++++- build.gradle | 28 +++++++++++++++++----------- lib/json-20230618.jar | Bin 73447 -> 0 bytes 3 files changed, 26 insertions(+), 12 deletions(-) delete mode 100644 lib/json-20230618.jar diff --git a/.gitignore b/.gitignore index da74c9e7c2..dc4b781dfd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,12 @@ +# Gradle .gradle/ +build/ + +# Script Build bin/ -data/ + +# Tests tests/ACTUAL.txt + +# App +data/ diff --git a/build.gradle b/build.gradle index a388517ae1..cd52c28d07 100644 --- a/build.gradle +++ b/build.gradle @@ -9,10 +9,24 @@ repositories { } dependencies { + implementation group: 'org.json', name: 'json', version: '20230618' + 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' } + + +application { + mainClass = "com.cloud.chatbot.Cloud" +} + +run { + standardInput System.in +} + +defaultTasks 'clean', 'build' + test { useJUnitPlatform() @@ -23,20 +37,12 @@ test { exceptionFormat "full" showCauses true showStackTraces true - showStandardStreams = false + showStandardStreams false } } -application { - mainClass.set("seedu.duke.Duke") -} - shadowJar { - archiveBaseName = "duke" + archiveBaseName = "cloud" archiveClassifier = null - dependsOn("distZip", "distTar") -} - -run{ - standardInput = System.in + dependsOn "distZip", "distTar" } diff --git a/lib/json-20230618.jar b/lib/json-20230618.jar deleted file mode 100644 index c450ad43d8aaeceeb11c58adbea2f2dc6b42b0e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73447 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 K1p_v`kpBTz8tg3q From 735bfd5eb78e8ce551cf0ab6c2483785945f3b93 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 14 Sep 2023 09:38:03 +0800 Subject: [PATCH 062/112] devfeat(test): Set up runnable dummy tests --- .../chatbot/token/CommandManagerTest.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/test/java/com/cloud/chatbot/token/CommandManagerTest.java diff --git a/src/test/java/com/cloud/chatbot/token/CommandManagerTest.java b/src/test/java/com/cloud/chatbot/token/CommandManagerTest.java new file mode 100644 index 0000000000..931f3ff826 --- /dev/null +++ b/src/test/java/com/cloud/chatbot/token/CommandManagerTest.java @@ -0,0 +1,19 @@ +package com.cloud.chatbot.token; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + + + +public class CommandManagerTest { + @Test + public void dummyTest() { + assertEquals(2, 2); + } + + @Test + public void anotherDummyTest() { + assertEquals(4, 4); + } +} From 0baff58db24d0c1d11d2c21bed1acd2bb06bd736 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 14 Sep 2023 10:03:25 +0800 Subject: [PATCH 063/112] devfeat(test): Add real tests --- .../com/cloud/chatbot/DateConverterTest.java | 33 +++++++++++++++++++ .../chatbot/token/CommandManagerTest.java | 12 ++++--- 2 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 src/test/java/com/cloud/chatbot/DateConverterTest.java diff --git a/src/test/java/com/cloud/chatbot/DateConverterTest.java b/src/test/java/com/cloud/chatbot/DateConverterTest.java new file mode 100644 index 0000000000..e3f74cd604 --- /dev/null +++ b/src/test/java/com/cloud/chatbot/DateConverterTest.java @@ -0,0 +1,33 @@ +package com.cloud.chatbot; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.time.Instant; + +import org.junit.jupiter.api.Test; + + + +// Assuming the "user" is on a GMT+8 system +public class DateConverterTest { + @Test + public void timestampToInstant() { + Instant instantExpected = Instant.parse("2023-01-31T20:56:00Z"); + Instant instantActual = DateConverter.timestampToInstant("1 2 23 456"); + assertEquals(instantExpected, instantActual); + } + + @Test + public void instantToPrettyTimestamp_nonZeroMinutes() { + Instant instant = Instant.parse("2023-01-31T20:56:00Z"); + String timestamp = DateConverter.instantToPrettyTimestamp(instant); + assertEquals("1 Feb '23, 4:56am", timestamp); + } + + @Test + public void instantToPrettyTimestamp_zeroMinutes() { + Instant instant = Instant.parse("2023-09-14T13:00:00Z"); + String timestamp = DateConverter.instantToPrettyTimestamp(instant); + assertEquals("14 Sep '23, 9pm", timestamp); + } +} diff --git a/src/test/java/com/cloud/chatbot/token/CommandManagerTest.java b/src/test/java/com/cloud/chatbot/token/CommandManagerTest.java index 931f3ff826..4a237082fc 100644 --- a/src/test/java/com/cloud/chatbot/token/CommandManagerTest.java +++ b/src/test/java/com/cloud/chatbot/token/CommandManagerTest.java @@ -4,16 +4,20 @@ import org.junit.jupiter.api.Test; +import com.cloud.chatbot.exception.MissingInputException; + public class CommandManagerTest { @Test - public void dummyTest() { - assertEquals(2, 2); + public void getCommand_whitespaceInput() throws MissingInputException { + CommandManager commandManager = new CommandManager(" myCommand arg1 arg2 "); + assertEquals("mycommand", commandManager.getCommand()); } @Test - public void anotherDummyTest() { - assertEquals(4, 4); + public void getDetails_whitespaceInput() throws MissingInputException { + CommandManager commandManager = new CommandManager(" myCommand arg1 arg2 "); + assertEquals("arg1 arg2", commandManager.getDetails()); } } From 8e5e69d4ca1fff4213247bca96380279d0813ad3 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 14 Sep 2023 21:21:51 +0800 Subject: [PATCH 064/112] chore(gradle): Tweaks for jar --- build.gradle | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index cd52c28d07..6d6b095e55 100644 --- a/build.gradle +++ b/build.gradle @@ -30,19 +30,17 @@ defaultTasks 'clean', 'build' test { useJUnitPlatform() + // https://docs.gradle.org/current/dsl/org.gradle.api.tasks.testing.logging.TestLogging.html testLogging { events "passed", "skipped", "failed" showExceptions true - exceptionFormat "full" showCauses true showStackTraces true - showStandardStreams false + exceptionFormat "full" } } shadowJar { - archiveBaseName = "cloud" - archiveClassifier = null - dependsOn "distZip", "distTar" + archiveFileName = "cloud.jar" } From 929e65cd3a4d65ea64dd78fbfa94b165189d6b9e Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 14 Sep 2023 21:32:24 +0800 Subject: [PATCH 065/112] docs(src): Docs tweaks in root src dir --- .../java/com/cloud/chatbot/DateConverter.java | 21 ++++++++++++++----- src/main/java/com/cloud/chatbot/Ui.java | 12 +++++------ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/cloud/chatbot/DateConverter.java b/src/main/java/com/cloud/chatbot/DateConverter.java index d0f7418ddc..9e0a167dbc 100644 --- a/src/main/java/com/cloud/chatbot/DateConverter.java +++ b/src/main/java/com/cloud/chatbot/DateConverter.java @@ -9,13 +9,21 @@ /** * Provides utilities for working with timestamps. * - * A timestamp is a string of a format that is easy to type. + * A timestamp is a string of a format that is easy to type. For example, + * "1 2 23 456" represents the 1st of February 2023, at 4:56am. * - * A pretty timestamp is a more complex string used for display purposes. + * A pretty timestamp is a more complex string used for display purposes. It is + * only meant to be generated by the program, not for a user to type in that + * format. Eg the above time would become "1 Feb '23, 4:56am". If the minutes + * are 00, then that part as well as the colon is omitted. */ public final class DateConverter { + /** + * Converts the specified timestamp into an Instant. + * + * @param timestamp The timestamp. + */ public static Instant timestampToInstant(String timestamp) { - // Eg 1 2 23 456 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("d M uu Hmm"); LocalDateTime local = LocalDateTime.parse(timestamp, formatter); @@ -23,10 +31,14 @@ public static Instant timestampToInstant(String timestamp) { return zoned.toInstant(); } + /** + * Converts the specified Instant into a pretty timestamp. + * + * @param instant the Instant. + */ public static String instantToPrettyTimestamp(Instant instant) { ZonedDateTime zoned = instant.atZone(ZoneId.systemDefault()); - // Eg 1 Feb '23, 4 String timestamp = DateTimeFormatter .ofPattern("d MMM ''uu, h") .format(zoned); @@ -44,7 +56,6 @@ public static String instantToPrettyTimestamp(Instant instant) { .format(zoned) .toLowerCase(); - // Eg 1 Feb '23, 4:56am return timestamp; } } diff --git a/src/main/java/com/cloud/chatbot/Ui.java b/src/main/java/com/cloud/chatbot/Ui.java index ae53dd188e..cac1db7e6a 100644 --- a/src/main/java/com/cloud/chatbot/Ui.java +++ b/src/main/java/com/cloud/chatbot/Ui.java @@ -5,20 +5,20 @@ /** - * Handles interactions with the user. + * Handles the user interface (UI). */ public final class Ui { /** - * Displays output to the user. + * Prints the specified message. * - * @param message The output. + * @param message The message. */ public static void say(String message) { System.out.println(message); } /** - * Displays an input marker indicating the bot is waiting for a command. + * Prints an input marker indicating the bot is awaiting a command. */ public static void inputMarker() { System.out.print("\n>>> "); @@ -29,10 +29,10 @@ public static void error(String message) { } /** - * Displays an error message alongside an object. + * Prints an error message to standard error, alongside an optional object. * * @param message The error. - * @param object The object to display. + * @param object The object to print. */ public static void error(String message, @Nullable Object object) { System.err.println( From c9fddc3c3624948bf9e709521de1fd5deef37d16 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 14 Sep 2023 21:39:36 +0800 Subject: [PATCH 066/112] docs(FileStorage): Tweak docs --- src/main/java/com/cloud/chatbot/file/FileStorage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cloud/chatbot/file/FileStorage.java b/src/main/java/com/cloud/chatbot/file/FileStorage.java index d07bcd58d2..ee0998eb45 100644 --- a/src/main/java/com/cloud/chatbot/file/FileStorage.java +++ b/src/main/java/com/cloud/chatbot/file/FileStorage.java @@ -14,7 +14,7 @@ /** - * Handles reading from and writing to file. + * Handles reading from and writing to the JSON storage file. */ public final class FileStorage { private static final String RELATIVE_PATH = "./data/items.json"; From 1013ed1aefb0e2a81919012e418e4f51e914cb36 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 14 Sep 2023 21:56:36 +0800 Subject: [PATCH 067/112] feat(src): FindCommand --- .../cloud/chatbot/command/CommandType.java | 6 +++ .../com/cloud/chatbot/command/Dispatcher.java | 3 ++ .../cloud/chatbot/command/FindCommand.java | 42 +++++++++++++++++++ .../com/cloud/chatbot/item/ItemManager.java | 36 ++++++++++++---- 4 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/cloud/chatbot/command/FindCommand.java diff --git a/src/main/java/com/cloud/chatbot/command/CommandType.java b/src/main/java/com/cloud/chatbot/command/CommandType.java index f941e86302..ad1af94ae3 100644 --- a/src/main/java/com/cloud/chatbot/command/CommandType.java +++ b/src/main/java/com/cloud/chatbot/command/CommandType.java @@ -8,6 +8,7 @@ public enum CommandType { ADD, LIST, + FIND, MARK, UNMARK, DELETE, @@ -32,6 +33,11 @@ public static CommandType fromString(String command) { case "list": case "l": return CommandType.LIST; + case "find": + case "f": + case "search": + case "s": + return CommandType.FIND; case "mark": case "m": return CommandType.MARK; diff --git a/src/main/java/com/cloud/chatbot/command/Dispatcher.java b/src/main/java/com/cloud/chatbot/command/Dispatcher.java index a946540544..091f4f1da6 100644 --- a/src/main/java/com/cloud/chatbot/command/Dispatcher.java +++ b/src/main/java/com/cloud/chatbot/command/Dispatcher.java @@ -32,6 +32,9 @@ public static void handle(String input) { case LIST: new ListCommand(commandManager).run(); break; + case FIND: + new FindCommand(commandManager).run(); + break; case MARK: new MarkCommand(commandManager).run(); break; diff --git a/src/main/java/com/cloud/chatbot/command/FindCommand.java b/src/main/java/com/cloud/chatbot/command/FindCommand.java new file mode 100644 index 0000000000..a977d3a02b --- /dev/null +++ b/src/main/java/com/cloud/chatbot/command/FindCommand.java @@ -0,0 +1,42 @@ +package com.cloud.chatbot.command; + +import java.util.List; + +import com.cloud.chatbot.Cloud; +import com.cloud.chatbot.Ui; +import com.cloud.chatbot.exception.MissingInputException; +import com.cloud.chatbot.token.CommandManager; + + + +/** + * Command for finding Items by searching details for an exact match. + */ +public class FindCommand extends Command { + public FindCommand(CommandManager _commandManager) { + super(_commandManager); + } + + @Override + public void run() { + String query; + try { + query = this.commandManager.getDetails(); + } catch (MissingInputException e) { + Ui.say("Please enter a phrase to search for."); + return; + } + + List matches = Cloud.ITEM_MANAGER.findStrings(query); + if (matches.size() <= 0) { + Ui.say("No matches were found. Please try a different query."); + return; + } + + for (int i = 0; i < matches.size(); i++) { + Ui.say( + matches.get(i) + ); + } + } +} diff --git a/src/main/java/com/cloud/chatbot/item/ItemManager.java b/src/main/java/com/cloud/chatbot/item/ItemManager.java index 42f859de3d..e2053f3af0 100644 --- a/src/main/java/com/cloud/chatbot/item/ItemManager.java +++ b/src/main/java/com/cloud/chatbot/item/ItemManager.java @@ -127,6 +127,35 @@ public String getString(int number) { .toString(number); } + /** + * Returns the total number of Items. + */ + public int getCount() { + return this.items.size(); + } + + /** + * Returns the string representations of any Items whose description + * contains the specified query. + * + * @param query The exact query to search for. + */ + public List findStrings(String query) { + List matches = new ArrayList<>(); + + for (int number = 1; number <= this.getCount(); number++) { + Item item = this.items.get(number - 1); + + if (item.getDescription().contains(query)) { + matches.add( + item.toString(number) + ); + } + } + + return matches; + } + /** * Sets the completion status for the Item of the specified number. * @@ -153,11 +182,4 @@ public Item remove(int number) { return item; } - - /** - * Returns the total number of Items. - */ - public int getCount() { - return this.items.size(); - } } From 6a981f30849244bfcbefcba6dd9c74595cf3c5da Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 14 Sep 2023 22:11:20 +0800 Subject: [PATCH 068/112] devfeat(test): Update & fix overall test script --- .gitignore | 3 --- test.bat | 15 +++++---------- tests/EXPECTED.txt | 19 ++++++++++++++----- tests/input.txt | 6 +++++- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index dc4b781dfd..1a24e17612 100644 --- a/.gitignore +++ b/.gitignore @@ -2,9 +2,6 @@ .gradle/ build/ -# Script Build -bin/ - # Tests tests/ACTUAL.txt diff --git a/test.bat b/test.bat index 3a199048f1..f99be8ae39 100644 --- a/test.bat +++ b/test.bat @@ -2,29 +2,24 @@ -@REM Clear any previous build files, remake bin\ -del /S /Q .\bin\ > nul -rmdir /S /Q .\bin\ -mkdir .\bin\ - @REM Clear any previous data files, remake data\ del /S /Q .\data\ > nul rmdir /S /Q .\data\ mkdir .\data\ -@REM Compile -javac -cp .\src\main\java\;.\lib\* -Xlint:none -d .\bin\ .\src\main\java\com\cloud\chatbot\*.java +@REM Gradle default clean & build +call gradlew if errorlevel 1 ( echo: - echo ^>^>^> javac failed + echo ^>^>^> Gradle build failed exit /B 1 ) @REM Clear previous output del .\tests\ACTUAL.txt -@REM Test main class, generate output -java -cp .\bin\;.\lib\* com.cloud.chatbot.Cloud < .\tests\input.txt > .\tests\ACTUAL.txt +@REM Test using JAR, generate output +java -jar .\build\libs\cloud.jar < .\tests\input.txt > .\tests\ACTUAL.txt @REM Compare output with expected FC .\tests\ACTUAL.txt .\tests\EXPECTED.txt diff --git a/tests/EXPECTED.txt b/tests/EXPECTED.txt index 3ba5c0452c..d68afb85c4 100644 --- a/tests/EXPECTED.txt +++ b/tests/EXPECTED.txt @@ -20,7 +20,7 @@ Cloud online. >>> Please enter a description for your item. ->>> | T#4: I tried to make an event but didn't specify flags. +>>> | T#4: Tried to make event for that meeting but didn't specify flags. >>> Please enter a description for the "from" flag. @@ -29,7 +29,16 @@ Cloud online. >>> | T#1: Download wk 3 files | D#2: Watch L3 recording | BY 18 Jun '23, 11:59pm | E#3: Project meeting | FROM 11 Sep '23, 3pm | TO 11 Sep '23, 4:30pm - | T#4: I tried to make an event but didn't specify flags. + | T#4: Tried to make event for that meeting but didn't specify flags. + +>>> | E#3: Project meeting | FROM 11 Sep '23, 3pm | TO 11 Sep '23, 4:30pm + | T#4: Tried to make event for that meeting but didn't specify flags. + +>>> No matches were found for "l3". Please try a different query. + +>>> | D#2: Watch L3 recording | BY 18 Jun '23, 11:59pm + +>>> Please enter a phrase to search for. >>> "a" is not a valid number. @@ -47,14 +56,14 @@ Cloud online. >>> Item #5 does not exist. ->>> X | T#4: I tried to make an event but didn't specify flags. +>>> X | T#4: Tried to make event for that meeting but didn't specify flags. >>> | D#5: another | BY 1 Jan '20, 6:01am >>> | T#1: Download wk 3 files X | D#2: Watch L3 recording | BY 18 Jun '23, 11:59pm | E#3: Project meeting | FROM 11 Sep '23, 3pm | TO 11 Sep '23, 4:30pm -X | T#4: I tried to make an event but didn't specify flags. +X | T#4: Tried to make event for that meeting but didn't specify flags. | D#5: another | BY 1 Jan '20, 6:01am >>> Item #0 does not exist. @@ -66,7 +75,7 @@ X | T#4: I tried to make an event but didn't specify flags. X | D#1: Watch L3 recording | BY 18 Jun '23, 11:59pm >>> | E#1: Project meeting | FROM 11 Sep '23, 3pm | TO 11 Sep '23, 4:30pm -X | T#2: I tried to make an event but didn't specify flags. +X | T#2: Tried to make event for that meeting but didn't specify flags. | D#3: another | BY 1 Jan '20, 6:01am >>> \o diff --git a/tests/input.txt b/tests/input.txt index 917317a8e1..513bd94db9 100644 --- a/tests/input.txt +++ b/tests/input.txt @@ -9,10 +9,14 @@ deadline My deadline flag has no sub input /BY deadline /by The deadline has no description deadline /by No description again deadline /by No description yet again! -e I tried to make an event but didn't specify flags. +e Tried to make event for that meeting but didn't specify flags. EVENT This event has no proper from flag set /frOM /to Far future. t This event has unparseable timestamps /from 123 /to 456 list +search t meeting +f l3 +f L3 +f mark a MARK -7050 Mark 2 From e3b0f1138250f6b406a6a267af044fae098f64dc Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 14 Sep 2023 22:11:43 +0800 Subject: [PATCH 069/112] feat(FindCommand): No match message contains query --- src/main/java/com/cloud/chatbot/command/FindCommand.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cloud/chatbot/command/FindCommand.java b/src/main/java/com/cloud/chatbot/command/FindCommand.java index a977d3a02b..01318a64cc 100644 --- a/src/main/java/com/cloud/chatbot/command/FindCommand.java +++ b/src/main/java/com/cloud/chatbot/command/FindCommand.java @@ -29,7 +29,12 @@ public void run() { List matches = Cloud.ITEM_MANAGER.findStrings(query); if (matches.size() <= 0) { - Ui.say("No matches were found. Please try a different query."); + Ui.say( + String.format( + "No matches were found for \"%s\". Please try a different query.", + query + ) + ); return; } From 95daf36694a369fc61fc5b09d3932d5a653e5750 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 21 Sep 2023 07:11:58 +0800 Subject: [PATCH 070/112] devfeat(): Add initial checkstyle --- .vscode/settings.json | 7 +- build.gradle | 19 +- config/checkstyle/checkstyle.xml | 434 +++++++++++++++++++++++++++++ config/checkstyle/suppressions.xml | 10 + 4 files changed, 462 insertions(+), 8 deletions(-) create mode 100644 config/checkstyle/checkstyle.xml create mode 100644 config/checkstyle/suppressions.xml diff --git a/.vscode/settings.json b/.vscode/settings.json index c7bc5014da..1073eab020 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,10 @@ { "editor.insertSpaces": true, "editor.detectIndentation": false, - "editor.tabSize": 4 + "editor.tabSize": 4, + "java.checkstyle.configuration": "${workspaceFolder}\\config\\checkstyle\\checkstyle.xml", + "java.checkstyle.version": "10.2", + "java.checkstyle.properties": { + "config_loc": "${workspaceFolder}\\config\\checkstyle\\" + } } diff --git a/build.gradle b/build.gradle index 6d6b095e55..024ddd37ea 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,8 @@ plugins { - id 'java' - id 'application' - id 'com.github.johnrengelman.shadow' version '7.1.2' + id "java" + id "application" + id "com.github.johnrengelman.shadow" version "7.1.2" + id "checkstyle" } repositories { @@ -9,10 +10,10 @@ repositories { } dependencies { - implementation group: 'org.json', name: 'json', version: '20230618' + implementation group: "org.json", name: "json", version: "20230618" - 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' + 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" } @@ -25,7 +26,7 @@ run { standardInput System.in } -defaultTasks 'clean', 'build' +defaultTasks "clean", "build" test { useJUnitPlatform() @@ -44,3 +45,7 @@ test { shadowJar { archiveFileName = "cloud.jar" } + +checkstyle { + toolVersion = "10.2" +} 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 0b5a85fc2474e6e162373bfd903d131cdefa09a6 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 21 Sep 2023 07:29:07 +0800 Subject: [PATCH 071/112] chore(checkstyle): Tweak config --- config/checkstyle/checkstyle.xml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index eb761a9b9a..50a2b28ded 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -130,11 +130,6 @@ - - - - - @@ -221,13 +216,6 @@ - - - - - - - @@ -237,14 +225,6 @@ --> - - - From 69c2957c7d6e87e7eb773fc8970d29a73c073623 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 21 Sep 2023 07:29:20 +0800 Subject: [PATCH 072/112] chore(gitignore): Ignore bin/ from VSCode build --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 1a24e17612..88d1f30646 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,8 @@ build/ # Tests tests/ACTUAL.txt +# VSCode +bin/ + # App data/ From cecdeecfec474824b7511880f610fb1c895655e0 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 21 Sep 2023 07:29:36 +0800 Subject: [PATCH 073/112] style(src): Fix checkstyle issues --- src/main/java/com/cloud/chatbot/command/Command.java | 8 ++++---- .../java/com/cloud/chatbot/item/ItemManager.java | 6 +++--- .../java/com/cloud/chatbot/token/CommandManager.java | 4 +++- src/main/java/com/cloud/chatbot/token/Token.java | 12 +++++++++--- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/cloud/chatbot/command/Command.java b/src/main/java/com/cloud/chatbot/command/Command.java index 6818f51177..baedfe09e2 100644 --- a/src/main/java/com/cloud/chatbot/command/Command.java +++ b/src/main/java/com/cloud/chatbot/command/Command.java @@ -12,14 +12,14 @@ * Parent Command class which all runnable Commands inherit from. */ public abstract class Command { - CommandManager commandManager; + protected CommandManager commandManager; protected @Nullable Integer verifyNumber() { - if (commandManager.getTokenCount() <= 1) { + if (this.commandManager.getTokenCount() <= 1) { return null; } - Token numberToken = commandManager.getToken(1); + Token numberToken = this.commandManager.getToken(1); if (!numberToken.isInt()) { Ui.say( String.format( @@ -46,7 +46,7 @@ public abstract class Command { /** * Creates a Command for an instance of user input. * - * @param commandManager The input. + * @param _commandManager The input. */ public Command(CommandManager _commandManager) { this.commandManager = _commandManager; diff --git a/src/main/java/com/cloud/chatbot/item/ItemManager.java b/src/main/java/com/cloud/chatbot/item/ItemManager.java index e2053f3af0..c3e90ecaac 100644 --- a/src/main/java/com/cloud/chatbot/item/ItemManager.java +++ b/src/main/java/com/cloud/chatbot/item/ItemManager.java @@ -119,7 +119,7 @@ public void add(Item item) { /** * Returns the string representation for the Item of the specified number. * - * @param int The Item's number. + * @param number The Item's number. */ public String getString(int number) { return this.items @@ -159,7 +159,7 @@ public List findStrings(String query) { /** * Sets the completion status for the Item of the specified number. * - * @param int The Item's number. + * @param number The Item's number. * @param isComplete The completion status. */ public void setComplete(int number, boolean isComplete) { @@ -173,7 +173,7 @@ public void setComplete(int number, boolean isComplete) { /** * Removes and returns the Item of the specified number. * - * @param int The Item's number. + * @param number The Item's number. */ public Item remove(int number) { Item item = this.items.remove(number - 1); diff --git a/src/main/java/com/cloud/chatbot/token/CommandManager.java b/src/main/java/com/cloud/chatbot/token/CommandManager.java index 6c67612c58..6400be1db8 100644 --- a/src/main/java/com/cloud/chatbot/token/CommandManager.java +++ b/src/main/java/com/cloud/chatbot/token/CommandManager.java @@ -55,7 +55,9 @@ private int findFlagSetEnd(int startIndex) { while (movingIndex <= lastIndex) { Token token = this.tokens.get(movingIndex); - if (token.isFlag()) break; + if (token.isFlag()) { + break; + } movingIndex++; } diff --git a/src/main/java/com/cloud/chatbot/token/Token.java b/src/main/java/com/cloud/chatbot/token/Token.java index 6eb28c93ac..c233c9176e 100644 --- a/src/main/java/com/cloud/chatbot/token/Token.java +++ b/src/main/java/com/cloud/chatbot/token/Token.java @@ -51,7 +51,9 @@ public boolean isInt() { * @return Defaults to -1 if the token cannot be converted to a valid integer. */ public int toInt() { - if (!this.isInt()) return -1; + if (!this.isInt()) { + return -1; + } return this.toInteger(); } @@ -62,7 +64,9 @@ public int toInt() { * @param count The current number of Items. */ public boolean isValidNumber(int count) { - if (!this.isInt()) return false; + if (!this.isInt()) { + return false; + } int number = this.toInt(); @@ -87,7 +91,9 @@ public boolean isFlag() { * @return Defaults to "" if the token is not actually a flag. */ public String getFlagText() { - if (!this.isFlag()) return ""; + if (!this.isFlag()) { + return ""; + } return this.token.substring(Token.PREFIX_FLAG.length()).toLowerCase(); } From d8bb3d8e3dfbc0a3026521aa9fd4ca746242757b Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 21 Sep 2023 23:04:18 +0800 Subject: [PATCH 074/112] chore(gradle): Add JavaFX --- build.gradle | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 024ddd37ea..134456ab01 100644 --- a/build.gradle +++ b/build.gradle @@ -9,11 +9,26 @@ repositories { mavenCentral() } +String versionJavaFx = "17.0.7"; +String versionJUnit = "5.10.0"; dependencies { + implementation group: "org.openjfx", name: "javafx-base", version: versionJavaFx, classifier: "win" + implementation group: "org.openjfx", name: "javafx-base", version: versionJavaFx, classifier: "mac" + implementation group: "org.openjfx", name: "javafx-base", version: versionJavaFx, classifier: "linux" + implementation group: "org.openjfx", name: "javafx-controls", version: versionJavaFx, classifier: "win" + implementation group: "org.openjfx", name: "javafx-controls", version: versionJavaFx, classifier: "mac" + implementation group: "org.openjfx", name: "javafx-controls", version: versionJavaFx, classifier: "linux" + implementation group: "org.openjfx", name: "javafx-fxml", version: versionJavaFx, classifier: "win" + implementation group: "org.openjfx", name: "javafx-fxml", version: versionJavaFx, classifier: "mac" + implementation group: "org.openjfx", name: "javafx-fxml", version: versionJavaFx, classifier: "linux" + implementation group: "org.openjfx", name: "javafx-graphics", version: versionJavaFx, classifier: "win" + implementation group: "org.openjfx", name: "javafx-graphics", version: versionJavaFx, classifier: "mac" + implementation group: "org.openjfx", name: "javafx-graphics", version: versionJavaFx, classifier: "linux" + implementation group: "org.json", name: "json", version: "20230618" - 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" + testImplementation group: "org.junit.jupiter", name: "junit-jupiter-api", version: versionJUnit + testRuntimeOnly group: "org.junit.jupiter", name: "junit-jupiter-engine", version: versionJUnit } From b48a507e5672f76f51933044836a01f00f7b9d60 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 21 Sep 2023 23:06:15 +0800 Subject: [PATCH 075/112] feat(src): Launch UI with label --- src/main/java/com/cloud/chatbot/Cloud.java | 20 +++++--------------- src/main/java/com/cloud/chatbot/Ui.java | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/cloud/chatbot/Cloud.java b/src/main/java/com/cloud/chatbot/Cloud.java index 09ced6075a..51206974bb 100644 --- a/src/main/java/com/cloud/chatbot/Cloud.java +++ b/src/main/java/com/cloud/chatbot/Cloud.java @@ -1,35 +1,25 @@ package com.cloud.chatbot; -import java.util.Scanner; - -import com.cloud.chatbot.command.Dispatcher; import com.cloud.chatbot.item.ItemManager; +import javafx.application.Application; + /** * The bot's entry point. */ public final class Cloud { - private static final Scanner SCANNER = new Scanner(System.in); - /** Manages the user's Items. */ public static final ItemManager ITEM_MANAGER = new ItemManager(); /** - * The bot's main loop. + * The main method which launches the JavaFX UI. * * @param args Java arguments. */ public static void main(String[] args) { - Ui.say("Cloud online."); - Ui.inputMarker(); - - while (Cloud.SCANNER.hasNextLine()) { - String input = Cloud.SCANNER.nextLine(); - Dispatcher.handle(input); - - Ui.inputMarker(); - } + System.out.println("Launching..."); + Application.launch(Ui.class, args); } } diff --git a/src/main/java/com/cloud/chatbot/Ui.java b/src/main/java/com/cloud/chatbot/Ui.java index cac1db7e6a..b88f7970cc 100644 --- a/src/main/java/com/cloud/chatbot/Ui.java +++ b/src/main/java/com/cloud/chatbot/Ui.java @@ -2,12 +2,26 @@ import com.cloud.chatbot.annotation.Nullable; +import javafx.application.Application; +import javafx.scene.Scene; +import javafx.scene.control.Label; +import javafx.stage.Stage; + /** * Handles the user interface (UI). */ -public final class Ui { +public final class Ui extends Application { + @Override + public void start(Stage stage) { + Label helloWorld = new Label("o/"); + Scene scene = new Scene(helloWorld); + + stage.setScene(scene); + stage.show(); + } + /** * Prints the specified message. * From 6f4c459a93d01212a89a4381f550afcd223f3cfa Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Thu, 21 Sep 2023 23:59:47 +0800 Subject: [PATCH 076/112] feat(Ui): Add initial nodes with neat styling --- src/main/java/com/cloud/chatbot/Ui.java | 60 +++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cloud/chatbot/Ui.java b/src/main/java/com/cloud/chatbot/Ui.java index b88f7970cc..11d122ea94 100644 --- a/src/main/java/com/cloud/chatbot/Ui.java +++ b/src/main/java/com/cloud/chatbot/Ui.java @@ -4,7 +4,11 @@ import javafx.application.Application; import javafx.scene.Scene; -import javafx.scene.control.Label; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.VBox; import javafx.stage.Stage; @@ -13,10 +17,60 @@ * Handles the user interface (UI). */ public final class Ui extends Application { + private static final double WIDTH = 400; + /** Lost width to account for on Windows 11. */ + private static final double WIDTH_OS_LOSS = 15; + private static final double HEIGHT = 600; + /** Lost width to account for on Windows 11. */ + private static final double HEIGHT_OS_LOSS = 40; + private static final double PADDING = 5; + + private static final double WIDTH_SCROLL = Ui.WIDTH - (Ui.PADDING * 2); + private static final double HEIGHT_SCROLL = Ui.HEIGHT - (Ui.PADDING * 3) - Ui.HEIGHT_BOTTOM; + + private static final double WIDTH_SEND = 50; + private static final double WIDTH_INPUT = Ui.WIDTH - (Ui.PADDING * 3) - Ui.WIDTH_SEND; + /** Default height of the input & button. */ + private static final double HEIGHT_BOTTOM = 25; + @Override public void start(Stage stage) { - Label helloWorld = new Label("o/"); - Scene scene = new Scene(helloWorld); + // Create node structure + VBox messagesHolder = new VBox(); + ScrollPane scrollPane = new ScrollPane(messagesHolder); + + TextField input = new TextField(); + Button sendButton = new Button("Send"); + + AnchorPane anchorPane = new AnchorPane(scrollPane, input, sendButton); + + Scene scene = new Scene(anchorPane); + + // Format nodes + scrollPane.setPrefSize(WIDTH_SCROLL, HEIGHT_SCROLL); + // scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); + // scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED); + + // scrollPane.setVvalue(1.0); + // scrollPane.setFitToWidth(true); + + input.setPrefWidth(WIDTH_INPUT); + sendButton.setPrefWidth(WIDTH_SEND); + + AnchorPane.setTopAnchor(scrollPane, Ui.PADDING); + AnchorPane.setLeftAnchor(scrollPane , Ui.PADDING); + + AnchorPane.setLeftAnchor(input , Ui.PADDING); + AnchorPane.setBottomAnchor(input, Ui.PADDING); + + AnchorPane.setBottomAnchor(sendButton, Ui.PADDING); + AnchorPane.setRightAnchor(sendButton, Ui.PADDING); + + // Show when done + stage.setTitle("Cloud"); + stage.setWidth(Ui.WIDTH + Ui.WIDTH_OS_LOSS); + stage.setHeight(Ui.HEIGHT + Ui.HEIGHT_OS_LOSS); + stage.setResizable(false); stage.setScene(scene); stage.show(); From b5eaec2caf92c8baf96e0e7172502d3dd4ed75e7 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Fri, 22 Sep 2023 00:27:53 +0800 Subject: [PATCH 077/112] deat(Ui): Initial event handlers --- src/main/java/com/cloud/chatbot/Ui.java | 28 ++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cloud/chatbot/Ui.java b/src/main/java/com/cloud/chatbot/Ui.java index 11d122ea94..5713b0e2b3 100644 --- a/src/main/java/com/cloud/chatbot/Ui.java +++ b/src/main/java/com/cloud/chatbot/Ui.java @@ -3,8 +3,11 @@ import com.cloud.chatbot.annotation.Nullable; import javafx.application.Application; +import javafx.event.Event; +import javafx.event.EventHandler; import javafx.scene.Scene; import javafx.scene.control.Button; +import javafx.scene.control.Label; import javafx.scene.control.ScrollPane; import javafx.scene.control.TextField; import javafx.scene.layout.AnchorPane; @@ -48,11 +51,7 @@ public void start(Stage stage) { // Format nodes scrollPane.setPrefSize(WIDTH_SCROLL, HEIGHT_SCROLL); - // scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); - // scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED); - - // scrollPane.setVvalue(1.0); - // scrollPane.setFitToWidth(true); + scrollPane.setFitToWidth(true); input.setPrefWidth(WIDTH_INPUT); sendButton.setPrefWidth(WIDTH_SEND); @@ -66,6 +65,25 @@ public void start(Stage stage) { AnchorPane.setBottomAnchor(sendButton, Ui.PADDING); AnchorPane.setRightAnchor(sendButton, Ui.PADDING); + // Set handler callbacks + EventHandler handleSend = (event) -> { + // Echo user input + Label label = new Label(input.getText()); + label.setWrapText(true); + + messagesHolder.getChildren().add(label); + input.clear(); + }; + sendButton.setOnMouseClicked(handleSend); + input.setOnAction((event) -> handleSend.handle(event)); + + messagesHolder.heightProperty().addListener( + (observable) -> { + // Scroll down whenever height changes + scrollPane.setVvalue(1); + } + ); + // Show when done stage.setTitle("Cloud"); stage.setWidth(Ui.WIDTH + Ui.WIDTH_OS_LOSS); From 1cd0649404d6846270144f286486fac1a542b8b4 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Fri, 22 Sep 2023 01:37:04 +0800 Subject: [PATCH 078/112] chore(checkstyle): Allow lambda on nested newline --- config/checkstyle/checkstyle.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 50a2b28ded..1d033140e3 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -317,7 +317,7 @@ - + From 8a65ca9284bfb676b49cc4f9680f24b3cf1e5192 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Fri, 22 Sep 2023 01:39:46 +0800 Subject: [PATCH 079/112] feat(): Directional message rows with images --- src/main/java/com/cloud/chatbot/Cloud.java | 1 + .../com/cloud/chatbot/command/AddCommand.java | 2 +- .../com/cloud/chatbot/command/Command.java | 2 +- .../cloud/chatbot/command/DeleteCommand.java | 2 +- .../com/cloud/chatbot/command/Dispatcher.java | 2 +- .../cloud/chatbot/command/ExitCommand.java | 2 +- .../cloud/chatbot/command/FindCommand.java | 2 +- .../cloud/chatbot/command/ListCommand.java | 2 +- .../cloud/chatbot/command/MarkCommand.java | 2 +- .../cloud/chatbot/command/UnmarkCommand.java | 2 +- .../com/cloud/chatbot/file/FileStorage.java | 2 +- .../com/cloud/chatbot/item/ItemManager.java | 2 +- .../java/com/cloud/chatbot/ui/MessageRow.java | 50 ++++++++++++++++++ .../java/com/cloud/chatbot/{ => ui}/Ui.java | 16 +++--- src/main/resources/images/cloud.png | Bin 0 -> 27003 bytes src/main/resources/images/user.png | Bin 0 -> 2450 bytes 16 files changed, 72 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/cloud/chatbot/ui/MessageRow.java rename src/main/java/com/cloud/chatbot/{ => ui}/Ui.java (90%) create mode 100644 src/main/resources/images/cloud.png create mode 100644 src/main/resources/images/user.png diff --git a/src/main/java/com/cloud/chatbot/Cloud.java b/src/main/java/com/cloud/chatbot/Cloud.java index 51206974bb..b94290692a 100644 --- a/src/main/java/com/cloud/chatbot/Cloud.java +++ b/src/main/java/com/cloud/chatbot/Cloud.java @@ -1,6 +1,7 @@ package com.cloud.chatbot; import com.cloud.chatbot.item.ItemManager; +import com.cloud.chatbot.ui.Ui; import javafx.application.Application; diff --git a/src/main/java/com/cloud/chatbot/command/AddCommand.java b/src/main/java/com/cloud/chatbot/command/AddCommand.java index ffeb5c3bf2..c24ee5bf1b 100644 --- a/src/main/java/com/cloud/chatbot/command/AddCommand.java +++ b/src/main/java/com/cloud/chatbot/command/AddCommand.java @@ -4,7 +4,6 @@ import com.cloud.chatbot.Cloud; import com.cloud.chatbot.DateConverter; -import com.cloud.chatbot.Ui; import com.cloud.chatbot.annotation.Nullable; import com.cloud.chatbot.exception.IllegalTimestampException; import com.cloud.chatbot.exception.MissingFlagInputException; @@ -15,6 +14,7 @@ import com.cloud.chatbot.item.Task; import com.cloud.chatbot.token.CommandManager; import com.cloud.chatbot.token.FlagManager; +import com.cloud.chatbot.ui.Ui; diff --git a/src/main/java/com/cloud/chatbot/command/Command.java b/src/main/java/com/cloud/chatbot/command/Command.java index baedfe09e2..10c7c865c7 100644 --- a/src/main/java/com/cloud/chatbot/command/Command.java +++ b/src/main/java/com/cloud/chatbot/command/Command.java @@ -1,10 +1,10 @@ package com.cloud.chatbot.command; import com.cloud.chatbot.Cloud; -import com.cloud.chatbot.Ui; import com.cloud.chatbot.annotation.Nullable; import com.cloud.chatbot.token.CommandManager; import com.cloud.chatbot.token.Token; +import com.cloud.chatbot.ui.Ui; diff --git a/src/main/java/com/cloud/chatbot/command/DeleteCommand.java b/src/main/java/com/cloud/chatbot/command/DeleteCommand.java index 6743dde2d6..5351bb02e7 100644 --- a/src/main/java/com/cloud/chatbot/command/DeleteCommand.java +++ b/src/main/java/com/cloud/chatbot/command/DeleteCommand.java @@ -1,10 +1,10 @@ package com.cloud.chatbot.command; import com.cloud.chatbot.Cloud; -import com.cloud.chatbot.Ui; import com.cloud.chatbot.annotation.Nullable; import com.cloud.chatbot.item.Item; import com.cloud.chatbot.token.CommandManager; +import com.cloud.chatbot.ui.Ui; diff --git a/src/main/java/com/cloud/chatbot/command/Dispatcher.java b/src/main/java/com/cloud/chatbot/command/Dispatcher.java index 091f4f1da6..8b319fa695 100644 --- a/src/main/java/com/cloud/chatbot/command/Dispatcher.java +++ b/src/main/java/com/cloud/chatbot/command/Dispatcher.java @@ -1,8 +1,8 @@ package com.cloud.chatbot.command; -import com.cloud.chatbot.Ui; import com.cloud.chatbot.exception.MissingInputException; import com.cloud.chatbot.token.CommandManager; +import com.cloud.chatbot.ui.Ui; diff --git a/src/main/java/com/cloud/chatbot/command/ExitCommand.java b/src/main/java/com/cloud/chatbot/command/ExitCommand.java index 96b725b4ba..520a6a44f4 100644 --- a/src/main/java/com/cloud/chatbot/command/ExitCommand.java +++ b/src/main/java/com/cloud/chatbot/command/ExitCommand.java @@ -1,7 +1,7 @@ package com.cloud.chatbot.command; -import com.cloud.chatbot.Ui; import com.cloud.chatbot.token.CommandManager; +import com.cloud.chatbot.ui.Ui; diff --git a/src/main/java/com/cloud/chatbot/command/FindCommand.java b/src/main/java/com/cloud/chatbot/command/FindCommand.java index 01318a64cc..429c1538f1 100644 --- a/src/main/java/com/cloud/chatbot/command/FindCommand.java +++ b/src/main/java/com/cloud/chatbot/command/FindCommand.java @@ -3,9 +3,9 @@ import java.util.List; import com.cloud.chatbot.Cloud; -import com.cloud.chatbot.Ui; import com.cloud.chatbot.exception.MissingInputException; import com.cloud.chatbot.token.CommandManager; +import com.cloud.chatbot.ui.Ui; diff --git a/src/main/java/com/cloud/chatbot/command/ListCommand.java b/src/main/java/com/cloud/chatbot/command/ListCommand.java index 33c4d923b5..bbe0dee7c5 100644 --- a/src/main/java/com/cloud/chatbot/command/ListCommand.java +++ b/src/main/java/com/cloud/chatbot/command/ListCommand.java @@ -1,8 +1,8 @@ package com.cloud.chatbot.command; import com.cloud.chatbot.Cloud; -import com.cloud.chatbot.Ui; import com.cloud.chatbot.token.CommandManager; +import com.cloud.chatbot.ui.Ui; diff --git a/src/main/java/com/cloud/chatbot/command/MarkCommand.java b/src/main/java/com/cloud/chatbot/command/MarkCommand.java index e2e39b3ee2..3cef01222d 100644 --- a/src/main/java/com/cloud/chatbot/command/MarkCommand.java +++ b/src/main/java/com/cloud/chatbot/command/MarkCommand.java @@ -1,9 +1,9 @@ package com.cloud.chatbot.command; import com.cloud.chatbot.Cloud; -import com.cloud.chatbot.Ui; import com.cloud.chatbot.annotation.Nullable; import com.cloud.chatbot.token.CommandManager; +import com.cloud.chatbot.ui.Ui; diff --git a/src/main/java/com/cloud/chatbot/command/UnmarkCommand.java b/src/main/java/com/cloud/chatbot/command/UnmarkCommand.java index e8d8c21f03..4a21969aea 100644 --- a/src/main/java/com/cloud/chatbot/command/UnmarkCommand.java +++ b/src/main/java/com/cloud/chatbot/command/UnmarkCommand.java @@ -1,9 +1,9 @@ package com.cloud.chatbot.command; import com.cloud.chatbot.Cloud; -import com.cloud.chatbot.Ui; import com.cloud.chatbot.annotation.Nullable; import com.cloud.chatbot.token.CommandManager; +import com.cloud.chatbot.ui.Ui; diff --git a/src/main/java/com/cloud/chatbot/file/FileStorage.java b/src/main/java/com/cloud/chatbot/file/FileStorage.java index ee0998eb45..01a7aa442a 100644 --- a/src/main/java/com/cloud/chatbot/file/FileStorage.java +++ b/src/main/java/com/cloud/chatbot/file/FileStorage.java @@ -8,8 +8,8 @@ import org.json.JSONObject; -import com.cloud.chatbot.Ui; import com.cloud.chatbot.annotation.Nullable; +import com.cloud.chatbot.ui.Ui; diff --git a/src/main/java/com/cloud/chatbot/item/ItemManager.java b/src/main/java/com/cloud/chatbot/item/ItemManager.java index c3e90ecaac..43d8071676 100644 --- a/src/main/java/com/cloud/chatbot/item/ItemManager.java +++ b/src/main/java/com/cloud/chatbot/item/ItemManager.java @@ -8,11 +8,11 @@ import org.json.JSONArray; import org.json.JSONObject; -import com.cloud.chatbot.Ui; import com.cloud.chatbot.annotation.Nullable; import com.cloud.chatbot.exception.IllegalTimestampException; import com.cloud.chatbot.file.FileStorage; import com.cloud.chatbot.file.Key; +import com.cloud.chatbot.ui.Ui; diff --git a/src/main/java/com/cloud/chatbot/ui/MessageRow.java b/src/main/java/com/cloud/chatbot/ui/MessageRow.java new file mode 100644 index 0000000000..15182bef12 --- /dev/null +++ b/src/main/java/com/cloud/chatbot/ui/MessageRow.java @@ -0,0 +1,50 @@ +package com.cloud.chatbot.ui; + +import com.cloud.chatbot.Cloud; + +import javafx.geometry.Pos; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; + + + +/** + * A custom JavaFX node for displaying chat messages. + */ +public class MessageRow extends HBox { + public static final double PICTURE_WIDTH = 100; + public static final double PICTURE_HEIGHT = 100; + + /** + * Constructs a MessageRow from the user's perspective (profile picture on + * right). + * + * @param text The Label for the message text. + * @param isUser Whether the message is by the user. + */ + public MessageRow(Label text, boolean isUser) { + text.setWrapText(true); + + ImageView picture = new ImageView( + new Image( + Cloud.class.getResourceAsStream( + isUser + ? "/images/user.png" + : "/images/cloud.png" + ) + ) + ); + picture.setFitWidth(MessageRow.PICTURE_WIDTH); + picture.setFitHeight(MessageRow.PICTURE_HEIGHT); + + if (isUser) { + this.setAlignment(Pos.TOP_RIGHT); + this.getChildren().addAll(text, picture); + } else { + this.setAlignment(Pos.TOP_LEFT); + this.getChildren().addAll(picture, text); + } + } +} diff --git a/src/main/java/com/cloud/chatbot/Ui.java b/src/main/java/com/cloud/chatbot/ui/Ui.java similarity index 90% rename from src/main/java/com/cloud/chatbot/Ui.java rename to src/main/java/com/cloud/chatbot/ui/Ui.java index 5713b0e2b3..71cee78e66 100644 --- a/src/main/java/com/cloud/chatbot/Ui.java +++ b/src/main/java/com/cloud/chatbot/ui/Ui.java @@ -1,4 +1,4 @@ -package com.cloud.chatbot; +package com.cloud.chatbot.ui; import com.cloud.chatbot.annotation.Nullable; @@ -10,6 +10,8 @@ import javafx.scene.control.Label; import javafx.scene.control.ScrollPane; import javafx.scene.control.TextField; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.VBox; import javafx.stage.Stage; @@ -19,7 +21,7 @@ /** * Handles the user interface (UI). */ -public final class Ui extends Application { +public class Ui extends Application { private static final double WIDTH = 400; /** Lost width to account for on Windows 11. */ private static final double WIDTH_OS_LOSS = 15; @@ -67,11 +69,13 @@ public void start(Stage stage) { // Set handler callbacks EventHandler handleSend = (event) -> { - // Echo user input - Label label = new Label(input.getText()); - label.setWrapText(true); + Label labelUser = new Label(input.getText()); + Label labelCloud = new Label("OK."); - messagesHolder.getChildren().add(label); + messagesHolder.getChildren().addAll( + new MessageRow(labelUser, true), + new MessageRow(labelCloud, false) + ); input.clear(); }; sendButton.setOnMouseClicked(handleSend); diff --git a/src/main/resources/images/cloud.png b/src/main/resources/images/cloud.png new file mode 100644 index 0000000000000000000000000000000000000000..678d063b0c9508146e1aa3000d3ff48301e8786e GIT binary patch literal 27003 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/images/user.png b/src/main/resources/images/user.png new file mode 100644 index 0000000000000000000000000000000000000000..51026fadd9e199e9fa7c234015fde5369ff0bbf9 GIT binary patch literal 2450 zcma);dstFu9LLdYg@xKEpC+4HF70BqS`TD4i88So+A=ls9$Jwcj+YYDAcyA zQRX)02m}JP!P9*U0%5XdbWHsWo@vOqTnOJx;M%pZN966nmkrBP#^wOO9`zDuf7ncPF zeCE4~+*iLyDdG!Nnm%VHXI1=Fyo)GdpNejF_Ix8#jWz&Je|ydvA_^fN?){NzRz$@9 zZKhN2e!j+@jWE4#X7%&DpVl~=nC(E?TSd`m5MFoBrwlXLXt+ocDegWuyv-% z@O)7-qAv1pT@j4+P(g)|{ghT$z-F+QL*r4-k}~R6n*1yKu_;xy&239aDBkNJ*wfM8 zb55~$DVV0%1~xNS@6AIoWwXznP+@F+OSKA4%)}Kro{WALEo|vLL_Q4IwCGZq1G?bV z6-{|M?y}_z`S?a(EFn*X{J0Hc1A#l_D*#5c*^+qvj8LT_pO(@e-~Ku<7;N`%V|N0S zeYyS2?w*hfb=jI)r7JKSTZF^G=}H?Zn#NhDj6~N!MMs3BC6h1pVH_f>QR%8gFs)zZ zUV>b{#Oog}{u9tBGLXH`a=0e&(HZ$(yJ{Tn1hbb1 z*u;+vS71@CjMwV`8;+_?lg$z+^4zFtX~)oi(=aZoSVAFW&B1T3dK{`Z474PnBlJh$ zZd0S8sz@R%c!fvFN@NKQTK#rN%Qc$Ll~=qbn7Y1_iU+N7u@|o(UBlGvgi^oLD?*@D zUmU@roDORsS~v*yPTI96`+#&B2BxY1)F${k07_LB1<67zp{9D`PD=HD+JPvJhd#bm z25)LDV3d$V7Od?_x)i#<-bJX-4Fqg|jB9Ii<1?TVc86+S zbkjqr&D^e3B1jC?mXR`M80mhsa^p1``$}-d!#uB7DvF4!!kAA9Tv|qv-2rU@A3K&o z;xB(FCJKg5VFzLu9U#y}eyz_Q{f1+$N}bq-%0Dc*5iV6vWq7pD?KpFqR-= zEtNRJQCNgv+hZ84_xi#XH5@4HQhP|DYfH;1vI9;Q@)cfEA+M_u>}UrddjxWf;f)0w zhIBU=$Han%XAY=l7pzifbl}U8z|tX}_FctgEb1k{peazEO3a)X&HA3+q<2zFy9EFv zXyi>UP?;_PQ?}wP6TyhBIFA|uGPZknkFJwH$49C=&b}-~314dNOpMJey6er#Cl6XX z8u7BcaDE#*pB8a%&(j?3^CDVG8dH>8Sc%*rA}=>8S+utQQOE-Q^tbWX*n(HL@dmkL zO_(28C^I`};WU1+;lrXup_rR34Yc#MWWA$7sl}trgkwD%o0CMjUHiYShp`orR~f;U z26=aC%X}`QPUDBegd~xmUtbT`r;0AWFTOqK1=UdeAdIh+=jOLWHRy_)Ya}0Dlje!o zdkLLMepb}j!%l8Vs`8HtedJi1FEdL3V<-0Iip*q7K92AQ$lN*$N1!s&jvYT4V?-|% zfZIF@$h@~lL^c!)Lf^_B$kiU1q>TTuF6Y9TM;kG=$DCk65jCjv>%xWyNg}deBFN5S z471ywAdOfkT>krNjU*HHJq$vMbD+|CPe|)=dJFGcoS7dT;$xYHaqqAmItZT!{DI`a zi*MB)8q}cxeU@0_SQ}xiTPMBiV6)l?O&9z7$yWqZFq2E=&I#mQ9FoXZ*UcKHdF?kM z1)vYCSK81d(vQHx=<2*pGlYx|3@J Date: Fri, 22 Sep 2023 01:52:12 +0800 Subject: [PATCH 080/112] feat(src): Add padding --- .../java/com/cloud/chatbot/ui/MessageRow.java | 4 ++++ src/main/java/com/cloud/chatbot/ui/Ui.java | 22 +++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/cloud/chatbot/ui/MessageRow.java b/src/main/java/com/cloud/chatbot/ui/MessageRow.java index 15182bef12..c11323c41b 100644 --- a/src/main/java/com/cloud/chatbot/ui/MessageRow.java +++ b/src/main/java/com/cloud/chatbot/ui/MessageRow.java @@ -2,6 +2,7 @@ import com.cloud.chatbot.Cloud; +import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.Label; import javafx.scene.image.Image; @@ -25,6 +26,9 @@ public class MessageRow extends HBox { * @param isUser Whether the message is by the user. */ public MessageRow(Label text, boolean isUser) { + this.setPadding(new Insets(Ui.PADDING)); + + text.setPadding(new Insets(Ui.PADDING)); text.setWrapText(true); ImageView picture = new ImageView( diff --git a/src/main/java/com/cloud/chatbot/ui/Ui.java b/src/main/java/com/cloud/chatbot/ui/Ui.java index 71cee78e66..cd11adc226 100644 --- a/src/main/java/com/cloud/chatbot/ui/Ui.java +++ b/src/main/java/com/cloud/chatbot/ui/Ui.java @@ -10,8 +10,6 @@ import javafx.scene.control.Label; import javafx.scene.control.ScrollPane; import javafx.scene.control.TextField; -import javafx.scene.image.Image; -import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.VBox; import javafx.stage.Stage; @@ -22,21 +20,21 @@ * Handles the user interface (UI). */ public class Ui extends Application { - private static final double WIDTH = 400; + public static final double WIDTH = 400; /** Lost width to account for on Windows 11. */ - private static final double WIDTH_OS_LOSS = 15; - private static final double HEIGHT = 600; + public static final double WIDTH_OS_LOSS = 15; + public static final double HEIGHT = 600; /** Lost width to account for on Windows 11. */ - private static final double HEIGHT_OS_LOSS = 40; - private static final double PADDING = 5; + public static final double HEIGHT_OS_LOSS = 40; + public static final double PADDING = 5; - private static final double WIDTH_SCROLL = Ui.WIDTH - (Ui.PADDING * 2); - private static final double HEIGHT_SCROLL = Ui.HEIGHT - (Ui.PADDING * 3) - Ui.HEIGHT_BOTTOM; + public static final double WIDTH_SCROLL = Ui.WIDTH - (Ui.PADDING * 2); + public static final double HEIGHT_SCROLL = Ui.HEIGHT - (Ui.PADDING * 3) - Ui.HEIGHT_BOTTOM; - private static final double WIDTH_SEND = 50; - private static final double WIDTH_INPUT = Ui.WIDTH - (Ui.PADDING * 3) - Ui.WIDTH_SEND; + public static final double WIDTH_SEND = 50; + public static final double WIDTH_INPUT = Ui.WIDTH - (Ui.PADDING * 3) - Ui.WIDTH_SEND; /** Default height of the input & button. */ - private static final double HEIGHT_BOTTOM = 25; + public static final double HEIGHT_BOTTOM = 25; @Override public void start(Stage stage) { From 3e9daf65873e6f18029db704ff6ab7b44cc9207d Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Fri, 22 Sep 2023 02:22:06 +0800 Subject: [PATCH 081/112] style(checkstyle): Tweak formatting --- config/checkstyle/checkstyle.xml | 756 +++++++++++++++-------------- config/checkstyle/suppressions.xml | 12 +- 2 files changed, 390 insertions(+), 378 deletions(-) diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 1d033140e3..febac213ea 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -1,414 +1,426 @@ - - - - + "https://checkstyle.org/dtds/configuration_1_3.dtd" +> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + - - - - - - + + + + - - - - - + + - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + - - - - - - - + - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + - - - - + - - - - - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + - - - - + + - - - - - + + + - + - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + - + + - - + + - - + + - - + + - - + + - - + + + + - - + + + + + + + + + - - - - + - - - - - - - - - + + + + + + - + + - - - - - - - - - - diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml index 39efb6e4ac..6c03d52b96 100644 --- a/config/checkstyle/suppressions.xml +++ b/config/checkstyle/suppressions.xml @@ -1,10 +1,10 @@ - - - + "https://checkstyle.org/dtds/suppressions_1_2.dtd" +> - - + + From e50e606faf90d5a6cfbb5250406cc143638f9a01 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Fri, 22 Sep 2023 02:23:53 +0800 Subject: [PATCH 082/112] ref(src): Rename to CloudApp --- src/main/java/com/cloud/chatbot/Cloud.java | 4 +-- .../com/cloud/chatbot/command/AddCommand.java | 12 ++++----- .../com/cloud/chatbot/command/Command.java | 6 ++--- .../cloud/chatbot/command/DeleteCommand.java | 6 ++--- .../com/cloud/chatbot/command/Dispatcher.java | 4 +-- .../cloud/chatbot/command/ExitCommand.java | 4 +-- .../cloud/chatbot/command/FindCommand.java | 8 +++--- .../cloud/chatbot/command/ListCommand.java | 6 ++--- .../cloud/chatbot/command/MarkCommand.java | 4 +-- .../cloud/chatbot/command/UnmarkCommand.java | 4 +-- .../com/cloud/chatbot/file/FileStorage.java | 8 +++--- .../com/cloud/chatbot/item/ItemManager.java | 6 ++--- .../chatbot/ui/{Ui.java => CloudApp.java} | 26 +++++++++---------- .../java/com/cloud/chatbot/ui/MessageRow.java | 4 +-- 14 files changed, 51 insertions(+), 51 deletions(-) rename src/main/java/com/cloud/chatbot/ui/{Ui.java => CloudApp.java} (78%) diff --git a/src/main/java/com/cloud/chatbot/Cloud.java b/src/main/java/com/cloud/chatbot/Cloud.java index b94290692a..1e58849dad 100644 --- a/src/main/java/com/cloud/chatbot/Cloud.java +++ b/src/main/java/com/cloud/chatbot/Cloud.java @@ -1,7 +1,7 @@ package com.cloud.chatbot; import com.cloud.chatbot.item.ItemManager; -import com.cloud.chatbot.ui.Ui; +import com.cloud.chatbot.ui.CloudApp; import javafx.application.Application; @@ -21,6 +21,6 @@ public final class Cloud { */ public static void main(String[] args) { System.out.println("Launching..."); - Application.launch(Ui.class, args); + Application.launch(CloudApp.class, args); } } diff --git a/src/main/java/com/cloud/chatbot/command/AddCommand.java b/src/main/java/com/cloud/chatbot/command/AddCommand.java index c24ee5bf1b..3aca91677b 100644 --- a/src/main/java/com/cloud/chatbot/command/AddCommand.java +++ b/src/main/java/com/cloud/chatbot/command/AddCommand.java @@ -14,7 +14,7 @@ import com.cloud.chatbot.item.Task; import com.cloud.chatbot.token.CommandManager; import com.cloud.chatbot.token.FlagManager; -import com.cloud.chatbot.ui.Ui; +import com.cloud.chatbot.ui.CloudApp; @@ -27,7 +27,7 @@ public class AddCommand extends Command { try { description = this.commandManager.getDetails(); } catch (MissingInputException e) { - Ui.say("Please enter a description for your item."); + CloudApp.say("Please enter a description for your item."); return null; } @@ -50,7 +50,7 @@ public class AddCommand extends Command { ); } } catch (MissingFlagInputException e) { - Ui.say( + CloudApp.say( String.format( "Please enter a description for the \"%s\" flag.", e.getFlagText() @@ -58,10 +58,10 @@ public class AddCommand extends Command { ); return null; } catch (DateTimeParseException e) { - Ui.say("Please use a valid timestamp format."); + CloudApp.say("Please use a valid timestamp format."); return null; } catch (IllegalTimestampException e) { - Ui.say("Please enter a logical timestamp range."); + CloudApp.say("Please enter a logical timestamp range."); return null; } @@ -80,6 +80,6 @@ public void run() { } Cloud.ITEM_MANAGER.add(item); - Ui.say(item.toString(Cloud.ITEM_MANAGER.getCount())); + CloudApp.say(item.toString(Cloud.ITEM_MANAGER.getCount())); } } diff --git a/src/main/java/com/cloud/chatbot/command/Command.java b/src/main/java/com/cloud/chatbot/command/Command.java index 10c7c865c7..2f0e66e3ad 100644 --- a/src/main/java/com/cloud/chatbot/command/Command.java +++ b/src/main/java/com/cloud/chatbot/command/Command.java @@ -4,7 +4,7 @@ import com.cloud.chatbot.annotation.Nullable; import com.cloud.chatbot.token.CommandManager; import com.cloud.chatbot.token.Token; -import com.cloud.chatbot.ui.Ui; +import com.cloud.chatbot.ui.CloudApp; @@ -21,7 +21,7 @@ public abstract class Command { Token numberToken = this.commandManager.getToken(1); if (!numberToken.isInt()) { - Ui.say( + CloudApp.say( String.format( "\"%s\" is not a valid number.", numberToken.toString() @@ -31,7 +31,7 @@ public abstract class Command { } if (!numberToken.isValidNumber(Cloud.ITEM_MANAGER.getCount())) { - Ui.say( + CloudApp.say( String.format( "Item #%d does not exist.", numberToken.toInt() diff --git a/src/main/java/com/cloud/chatbot/command/DeleteCommand.java b/src/main/java/com/cloud/chatbot/command/DeleteCommand.java index 5351bb02e7..fec40745c1 100644 --- a/src/main/java/com/cloud/chatbot/command/DeleteCommand.java +++ b/src/main/java/com/cloud/chatbot/command/DeleteCommand.java @@ -4,7 +4,7 @@ import com.cloud.chatbot.annotation.Nullable; import com.cloud.chatbot.item.Item; import com.cloud.chatbot.token.CommandManager; -import com.cloud.chatbot.ui.Ui; +import com.cloud.chatbot.ui.CloudApp; @@ -24,7 +24,7 @@ public void run() { } Item item = Cloud.ITEM_MANAGER.remove(number); - Ui.say("Yeeted:"); - Ui.say(item.toString(number)); + CloudApp.say("Yeeted:"); + CloudApp.say(item.toString(number)); } } diff --git a/src/main/java/com/cloud/chatbot/command/Dispatcher.java b/src/main/java/com/cloud/chatbot/command/Dispatcher.java index 8b319fa695..ce6d092f22 100644 --- a/src/main/java/com/cloud/chatbot/command/Dispatcher.java +++ b/src/main/java/com/cloud/chatbot/command/Dispatcher.java @@ -2,7 +2,7 @@ import com.cloud.chatbot.exception.MissingInputException; import com.cloud.chatbot.token.CommandManager; -import com.cloud.chatbot.ui.Ui; +import com.cloud.chatbot.ui.CloudApp; @@ -48,7 +48,7 @@ public static void handle(String input) { new ExitCommand(commandManager).run(); break; default: - Ui.say( + CloudApp.say( String.format( "\"%s\" is not a valid command.", command diff --git a/src/main/java/com/cloud/chatbot/command/ExitCommand.java b/src/main/java/com/cloud/chatbot/command/ExitCommand.java index 520a6a44f4..625557aab5 100644 --- a/src/main/java/com/cloud/chatbot/command/ExitCommand.java +++ b/src/main/java/com/cloud/chatbot/command/ExitCommand.java @@ -1,7 +1,7 @@ package com.cloud.chatbot.command; import com.cloud.chatbot.token.CommandManager; -import com.cloud.chatbot.ui.Ui; +import com.cloud.chatbot.ui.CloudApp; @@ -15,7 +15,7 @@ public ExitCommand(CommandManager _commandManager) { @Override public void run() { - Ui.say("\\o"); + CloudApp.say("\\o"); System.exit(0); } } diff --git a/src/main/java/com/cloud/chatbot/command/FindCommand.java b/src/main/java/com/cloud/chatbot/command/FindCommand.java index 429c1538f1..280f702903 100644 --- a/src/main/java/com/cloud/chatbot/command/FindCommand.java +++ b/src/main/java/com/cloud/chatbot/command/FindCommand.java @@ -5,7 +5,7 @@ import com.cloud.chatbot.Cloud; import com.cloud.chatbot.exception.MissingInputException; import com.cloud.chatbot.token.CommandManager; -import com.cloud.chatbot.ui.Ui; +import com.cloud.chatbot.ui.CloudApp; @@ -23,13 +23,13 @@ public void run() { try { query = this.commandManager.getDetails(); } catch (MissingInputException e) { - Ui.say("Please enter a phrase to search for."); + CloudApp.say("Please enter a phrase to search for."); return; } List matches = Cloud.ITEM_MANAGER.findStrings(query); if (matches.size() <= 0) { - Ui.say( + CloudApp.say( String.format( "No matches were found for \"%s\". Please try a different query.", query @@ -39,7 +39,7 @@ public void run() { } for (int i = 0; i < matches.size(); i++) { - Ui.say( + CloudApp.say( matches.get(i) ); } diff --git a/src/main/java/com/cloud/chatbot/command/ListCommand.java b/src/main/java/com/cloud/chatbot/command/ListCommand.java index bbe0dee7c5..aff2b84ec6 100644 --- a/src/main/java/com/cloud/chatbot/command/ListCommand.java +++ b/src/main/java/com/cloud/chatbot/command/ListCommand.java @@ -2,7 +2,7 @@ import com.cloud.chatbot.Cloud; import com.cloud.chatbot.token.CommandManager; -import com.cloud.chatbot.ui.Ui; +import com.cloud.chatbot.ui.CloudApp; @@ -17,12 +17,12 @@ public ListCommand(CommandManager _commandManager) { @Override public void run() { if (Cloud.ITEM_MANAGER.getCount() <= 0) { - Ui.say("Your list is empty."); + CloudApp.say("Your list is empty."); return; } for (int number = 1; number <= Cloud.ITEM_MANAGER.getCount(); number++) { - Ui.say( + CloudApp.say( Cloud.ITEM_MANAGER.getString(number) ); } diff --git a/src/main/java/com/cloud/chatbot/command/MarkCommand.java b/src/main/java/com/cloud/chatbot/command/MarkCommand.java index 3cef01222d..bda6ea4e9b 100644 --- a/src/main/java/com/cloud/chatbot/command/MarkCommand.java +++ b/src/main/java/com/cloud/chatbot/command/MarkCommand.java @@ -3,7 +3,7 @@ import com.cloud.chatbot.Cloud; import com.cloud.chatbot.annotation.Nullable; import com.cloud.chatbot.token.CommandManager; -import com.cloud.chatbot.ui.Ui; +import com.cloud.chatbot.ui.CloudApp; @@ -23,7 +23,7 @@ public void run() { } Cloud.ITEM_MANAGER.setComplete(number, true); - Ui.say( + CloudApp.say( Cloud.ITEM_MANAGER.getString(number) ); } diff --git a/src/main/java/com/cloud/chatbot/command/UnmarkCommand.java b/src/main/java/com/cloud/chatbot/command/UnmarkCommand.java index 4a21969aea..23bbde1232 100644 --- a/src/main/java/com/cloud/chatbot/command/UnmarkCommand.java +++ b/src/main/java/com/cloud/chatbot/command/UnmarkCommand.java @@ -3,7 +3,7 @@ import com.cloud.chatbot.Cloud; import com.cloud.chatbot.annotation.Nullable; import com.cloud.chatbot.token.CommandManager; -import com.cloud.chatbot.ui.Ui; +import com.cloud.chatbot.ui.CloudApp; @@ -23,7 +23,7 @@ public void run() { } Cloud.ITEM_MANAGER.setComplete(number, false); - Ui.say( + CloudApp.say( Cloud.ITEM_MANAGER.getString(number) ); } diff --git a/src/main/java/com/cloud/chatbot/file/FileStorage.java b/src/main/java/com/cloud/chatbot/file/FileStorage.java index 01a7aa442a..1f81d390b7 100644 --- a/src/main/java/com/cloud/chatbot/file/FileStorage.java +++ b/src/main/java/com/cloud/chatbot/file/FileStorage.java @@ -9,7 +9,7 @@ import org.json.JSONObject; import com.cloud.chatbot.annotation.Nullable; -import com.cloud.chatbot.ui.Ui; +import com.cloud.chatbot.ui.CloudApp; @@ -58,7 +58,7 @@ public void write(JSONObject json) { try { writer = new FileWriter(this.getFile()); } catch (IOException e) { - Ui.error( + CloudApp.error( "Could not create FileWriter", e ); @@ -68,7 +68,7 @@ public void write(JSONObject json) { try { writer.write(json.toString(4)); } catch (IOException e) { - Ui.error( + CloudApp.error( "Could not write to file", e ); @@ -78,7 +78,7 @@ public void write(JSONObject json) { try { writer.close(); } catch (IOException e) { - Ui.error( + CloudApp.error( "Could not close FileWriter", e ); diff --git a/src/main/java/com/cloud/chatbot/item/ItemManager.java b/src/main/java/com/cloud/chatbot/item/ItemManager.java index 43d8071676..8377183677 100644 --- a/src/main/java/com/cloud/chatbot/item/ItemManager.java +++ b/src/main/java/com/cloud/chatbot/item/ItemManager.java @@ -12,7 +12,7 @@ import com.cloud.chatbot.exception.IllegalTimestampException; import com.cloud.chatbot.file.FileStorage; import com.cloud.chatbot.file.Key; -import com.cloud.chatbot.ui.Ui; +import com.cloud.chatbot.ui.CloudApp; @@ -71,7 +71,7 @@ private void importJson(JSONObject json) { Instant.ofEpochMilli(endEpoch) ); } catch (IllegalTimestampException e) { - Ui.error( + CloudApp.error( "Could not import JSON event with illegal timestamp", json ); @@ -81,7 +81,7 @@ private void importJson(JSONObject json) { break; } default: { - Ui.error( + CloudApp.error( "Could not import JSON item with unknown type", json ); diff --git a/src/main/java/com/cloud/chatbot/ui/Ui.java b/src/main/java/com/cloud/chatbot/ui/CloudApp.java similarity index 78% rename from src/main/java/com/cloud/chatbot/ui/Ui.java rename to src/main/java/com/cloud/chatbot/ui/CloudApp.java index cd11adc226..3e4d65b1d1 100644 --- a/src/main/java/com/cloud/chatbot/ui/Ui.java +++ b/src/main/java/com/cloud/chatbot/ui/CloudApp.java @@ -17,9 +17,9 @@ /** - * Handles the user interface (UI). + * Custom subclass for launching as the JavaFX Application. */ -public class Ui extends Application { +public class CloudApp extends Application { public static final double WIDTH = 400; /** Lost width to account for on Windows 11. */ public static final double WIDTH_OS_LOSS = 15; @@ -28,11 +28,11 @@ public class Ui extends Application { public static final double HEIGHT_OS_LOSS = 40; public static final double PADDING = 5; - public static final double WIDTH_SCROLL = Ui.WIDTH - (Ui.PADDING * 2); - public static final double HEIGHT_SCROLL = Ui.HEIGHT - (Ui.PADDING * 3) - Ui.HEIGHT_BOTTOM; + public static final double WIDTH_SCROLL = CloudApp.WIDTH - (CloudApp.PADDING * 2); + public static final double HEIGHT_SCROLL = CloudApp.HEIGHT - (CloudApp.PADDING * 3) - CloudApp.HEIGHT_BOTTOM; public static final double WIDTH_SEND = 50; - public static final double WIDTH_INPUT = Ui.WIDTH - (Ui.PADDING * 3) - Ui.WIDTH_SEND; + public static final double WIDTH_INPUT = CloudApp.WIDTH - (CloudApp.PADDING * 3) - CloudApp.WIDTH_SEND; /** Default height of the input & button. */ public static final double HEIGHT_BOTTOM = 25; @@ -56,14 +56,14 @@ public void start(Stage stage) { input.setPrefWidth(WIDTH_INPUT); sendButton.setPrefWidth(WIDTH_SEND); - AnchorPane.setTopAnchor(scrollPane, Ui.PADDING); - AnchorPane.setLeftAnchor(scrollPane , Ui.PADDING); + AnchorPane.setTopAnchor(scrollPane, CloudApp.PADDING); + AnchorPane.setLeftAnchor(scrollPane , CloudApp.PADDING); - AnchorPane.setLeftAnchor(input , Ui.PADDING); - AnchorPane.setBottomAnchor(input, Ui.PADDING); + AnchorPane.setLeftAnchor(input , CloudApp.PADDING); + AnchorPane.setBottomAnchor(input, CloudApp.PADDING); - AnchorPane.setBottomAnchor(sendButton, Ui.PADDING); - AnchorPane.setRightAnchor(sendButton, Ui.PADDING); + AnchorPane.setBottomAnchor(sendButton, CloudApp.PADDING); + AnchorPane.setRightAnchor(sendButton, CloudApp.PADDING); // Set handler callbacks EventHandler handleSend = (event) -> { @@ -88,8 +88,8 @@ public void start(Stage stage) { // Show when done stage.setTitle("Cloud"); - stage.setWidth(Ui.WIDTH + Ui.WIDTH_OS_LOSS); - stage.setHeight(Ui.HEIGHT + Ui.HEIGHT_OS_LOSS); + stage.setWidth(CloudApp.WIDTH + CloudApp.WIDTH_OS_LOSS); + stage.setHeight(CloudApp.HEIGHT + CloudApp.HEIGHT_OS_LOSS); stage.setResizable(false); stage.setScene(scene); diff --git a/src/main/java/com/cloud/chatbot/ui/MessageRow.java b/src/main/java/com/cloud/chatbot/ui/MessageRow.java index c11323c41b..6623691887 100644 --- a/src/main/java/com/cloud/chatbot/ui/MessageRow.java +++ b/src/main/java/com/cloud/chatbot/ui/MessageRow.java @@ -26,9 +26,9 @@ public class MessageRow extends HBox { * @param isUser Whether the message is by the user. */ public MessageRow(Label text, boolean isUser) { - this.setPadding(new Insets(Ui.PADDING)); + this.setPadding(new Insets(CloudApp.PADDING)); - text.setPadding(new Insets(Ui.PADDING)); + text.setPadding(new Insets(CloudApp.PADDING)); text.setWrapText(true); ImageView picture = new ImageView( From 3828a899e9f39a56a708c12230b0b6dfc0176fd4 Mon Sep 17 00:00:00 2001 From: Cloud <44526554+Cloud7050@users.noreply.github.com> Date: Fri, 22 Sep 2023 02:31:02 +0800 Subject: [PATCH 083/112] feat(view): Add template fxml with slight edits --- src/main/resources/view/MessageRow.fxml | 14 ++++++++++++++ src/main/resources/view/Window.fxml | 17 +++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 src/main/resources/view/MessageRow.fxml create mode 100644 src/main/resources/view/Window.fxml diff --git a/src/main/resources/view/MessageRow.fxml b/src/main/resources/view/MessageRow.fxml new file mode 100644 index 0000000000..1712ae1d8b --- /dev/null +++ b/src/main/resources/view/MessageRow.fxml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/src/main/resources/view/Window.fxml b/src/main/resources/view/Window.fxml new file mode 100644 index 0000000000..1a4e20a729 --- /dev/null +++ b/src/main/resources/view/Window.fxml @@ -0,0 +1,17 @@ + + + + + + + + + +