From 68c58c12c1d631736a4b25500248a2956171496f Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 01/41] 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 03523ec89e823ff5457b647df22a4e395641da7a Mon Sep 17 00:00:00 2001 From: lzq Date: Sat, 5 Aug 2023 15:24:02 +0800 Subject: [PATCH 02/41] 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 81a9c537afe8492675eb253968939364d65db091 Mon Sep 17 00:00:00 2001 From: aureliony <39163684+aureliony@users.noreply.github.com> Date: Tue, 16 Jul 2024 23:35:06 +0800 Subject: [PATCH 03/41] build.gradle: Prevent generating a second JAR file In build.gradle, the dependencies on distZip and/or distTar causes the shadowJar task to generate a second JAR file for which the mainClass.set("seedu.duke.Duke") does not take effect. Hence, this additional JAR file cannot be run. For this product, there is no need to generate a second JAR file to begin with. Let's remove this dependency from the build.gradle to prevent the shadowJar task from generating the extra JAR file. --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index a388517ae1..c361f9811e 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,6 @@ application { shadowJar { archiveBaseName = "duke" archiveClassifier = null - dependsOn("distZip", "distTar") } run{ From 3625838e474b76a707b49612fb8a172d4d7f81fd Mon Sep 17 00:00:00 2001 From: jhwan0707 Date: Mon, 27 Jan 2025 23:52:33 +0800 Subject: [PATCH 04/41] Rename, Greet, Exit --- src/main/java/Johan.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/java/Johan.java diff --git a/src/main/java/Johan.java b/src/main/java/Johan.java new file mode 100644 index 0000000000..1ba63aa4c2 --- /dev/null +++ b/src/main/java/Johan.java @@ -0,0 +1,7 @@ +public class Johan { + public static void main(String[] args) { + System.out.println("Hello! I'm Johan"); + System.out.println("What can I do for you?"); + System.out.println("Bye. Hope to see you again soon!"); + } +} From 80f4f23ffbfd1016a0457a78d7decf6abcd0819e Mon Sep 17 00:00:00 2001 From: jhwan0707 Date: Tue, 28 Jan 2025 00:04:44 +0800 Subject: [PATCH 05/41] Echo --- src/main/java/Johan.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/Johan.java b/src/main/java/Johan.java index 1ba63aa4c2..68ee6d5247 100644 --- a/src/main/java/Johan.java +++ b/src/main/java/Johan.java @@ -1,7 +1,15 @@ +import java.util.Scanner; + public class Johan { public static void main(String[] args) { + Scanner scanner = new Scanner(System.in); System.out.println("Hello! I'm Johan"); System.out.println("What can I do for you?"); + String input = scanner.nextLine(); + while (!input.equals("bye")) { + System.out.println(input); + input = scanner.nextLine(); + } System.out.println("Bye. Hope to see you again soon!"); } } From 2b997b1cb20326debb084fcf79252378dd725643 Mon Sep 17 00:00:00 2001 From: jhwan0707 Date: Tue, 28 Jan 2025 21:53:04 +0800 Subject: [PATCH 06/41] Add, List --- src/main/java/Johan.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/Johan.java b/src/main/java/Johan.java index 68ee6d5247..6344ff69e2 100644 --- a/src/main/java/Johan.java +++ b/src/main/java/Johan.java @@ -1,14 +1,26 @@ import java.util.Scanner; +import java.util.ArrayList; public class Johan { public static void main(String[] args) { + String input; Scanner scanner = new Scanner(System.in); System.out.println("Hello! I'm Johan"); System.out.println("What can I do for you?"); - String input = scanner.nextLine(); - while (!input.equals("bye")) { - System.out.println(input); + ArrayList words = new ArrayList<>(); + while (true) { input = scanner.nextLine(); + if (input.equals("bye")) { + break; + } else if (input.equals("list")) { + int count = 0; + for (String word : words) { + System.out.println(++count + ". " + word); + } + } else { + System.out.println("added: " + input); + words.add(input); + } } System.out.println("Bye. Hope to see you again soon!"); } From 0635185cd6ffd6fad744d212dd0702f0b8bae786 Mon Sep 17 00:00:00 2001 From: jhwan0707 Date: Wed, 29 Jan 2025 21:31:22 +0800 Subject: [PATCH 07/41] Mark as Done --- src/main/java/Johan.java | 29 +++++++++++++++++++++++------ src/main/java/Task.java | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 src/main/java/Task.java diff --git a/src/main/java/Johan.java b/src/main/java/Johan.java index 6344ff69e2..c50e02b158 100644 --- a/src/main/java/Johan.java +++ b/src/main/java/Johan.java @@ -7,19 +7,36 @@ public static void main(String[] args) { Scanner scanner = new Scanner(System.in); System.out.println("Hello! I'm Johan"); System.out.println("What can I do for you?"); - ArrayList words = new ArrayList<>(); + ArrayList tasks = new ArrayList<>(); while (true) { - input = scanner.nextLine(); + input = scanner.nextLine().toLowerCase().trim(); + String[] words = input.split(""); if (input.equals("bye")) { break; } else if (input.equals("list")) { - int count = 0; - for (String word : words) { - System.out.println(++count + ". " + word); + System.out.println("Here are the tasks in your list:"); + for (Task t : tasks) { + System.out.println(t.getID() + ". [" + t.getStatusIcon() + "] " + t.toString()); + } + } else if (input.startsWith("mark ")) { + String taskID = input.substring(5); + int id = Integer.parseInt(taskID); + if (id > 0 && id <= tasks.size()) { + tasks.get(id - 1).markAsDone(); + System.out.println("Nice! I've marked this task as done:"); + System.out.println("[" + tasks.get(id - 1).getStatusIcon() + "] " + tasks.get(id - 1).toString()); + } + } else if (input.startsWith("unmark ")) { + String taskID = input.substring(7); + int id = Integer.parseInt(taskID); + if (id > 0 && id <= tasks.size()) { + tasks.get(id - 1).markAsNotDone(); + System.out.println("OK, I've marked this task as not done yet:"); + System.out.println("[" + tasks.get(id - 1).getStatusIcon() + "] " + tasks.get(id - 1).toString()); } } else { System.out.println("added: " + input); - words.add(input); + tasks.add(new Task(input)); } } System.out.println("Bye. Hope to see you again soon!"); diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 0000000000..f0fccf36d2 --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,33 @@ +public class Task { + protected String description; + protected boolean isDone; + private static int nextTaskID = 1; + private final int ID; + + public Task(String description) { + this.description = description; + this.isDone = false; + this.ID = nextTaskID++; + } + + public String getID() { + return Integer.toString(this.ID); + } + + public String getStatusIcon() { + return (isDone ? "X" : " "); // mark done task with X + } + + public void markAsDone() { + isDone = true; + } + + public void markAsNotDone() { + isDone = false; + } + + @Override + public String toString() { + return description; + } +} From 2df5b9950ed69f70436b39752812c7497993e6f6 Mon Sep 17 00:00:00 2001 From: jhwan0707 Date: Fri, 31 Jan 2025 11:40:24 +0800 Subject: [PATCH 08/41] ToDos, Events, Deadlines --- src/main/java/Deadline.java | 15 ++++++++++++ src/main/java/Event.java | 16 ++++++++++++ src/main/java/Johan.java | 49 +++++++++++++++++++++++++++++-------- src/main/java/Task.java | 2 +- src/main/java/Todo.java | 11 +++++++++ 5 files changed, 82 insertions(+), 11 deletions(-) create mode 100644 src/main/java/Deadline.java create mode 100644 src/main/java/Event.java create mode 100644 src/main/java/Todo.java diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java new file mode 100644 index 0000000000..a1a150db94 --- /dev/null +++ b/src/main/java/Deadline.java @@ -0,0 +1,15 @@ +public class Deadline extends Task { + + protected String by; + + public Deadline(String description, String by) { + super(description); + this.by = by; + } + + @Override + public String toString() { + return "[D]" + super.toString() + " (by: " + by + ")"; + } + +} diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 0000000000..79ce156ea2 --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,16 @@ +public class Event extends Task { + + protected String startDate; + protected String endDate; + + public Event(String description, String startDate, String endDate) { + super(description); + this.startDate = startDate; + this.endDate = endDate; + } + + @Override + public String toString() { + return "[E]" + super.toString() + " (from: " + startDate + "to: " + endDate + ")"; + } +} diff --git a/src/main/java/Johan.java b/src/main/java/Johan.java index c50e02b158..dfad250efc 100644 --- a/src/main/java/Johan.java +++ b/src/main/java/Johan.java @@ -7,7 +7,9 @@ public static void main(String[] args) { Scanner scanner = new Scanner(System.in); System.out.println("Hello! I'm Johan"); System.out.println("What can I do for you?"); - ArrayList tasks = new ArrayList<>(); + Task[] tasks = new Task[100]; + int taskCount = 0; + while (true) { input = scanner.nextLine().toLowerCase().trim(); String[] words = input.split(""); @@ -15,28 +17,55 @@ public static void main(String[] args) { break; } else if (input.equals("list")) { System.out.println("Here are the tasks in your list:"); - for (Task t : tasks) { - System.out.println(t.getID() + ". [" + t.getStatusIcon() + "] " + t.toString()); + for (int i = 0; i < taskCount; i++) { + System.out.println(tasks[i].getID() + "." + tasks[i].toString()); } } else if (input.startsWith("mark ")) { String taskID = input.substring(5); int id = Integer.parseInt(taskID); - if (id > 0 && id <= tasks.size()) { - tasks.get(id - 1).markAsDone(); + if (id > 0 && id <= tasks.length) { + tasks[id - 1].markAsDone(); System.out.println("Nice! I've marked this task as done:"); - System.out.println("[" + tasks.get(id - 1).getStatusIcon() + "] " + tasks.get(id - 1).toString()); + System.out.println(tasks[id - 1].toString()); } } else if (input.startsWith("unmark ")) { String taskID = input.substring(7); int id = Integer.parseInt(taskID); - if (id > 0 && id <= tasks.size()) { - tasks.get(id - 1).markAsNotDone(); + if (id > 0 && id <= tasks.length) { + tasks[id - 1].markAsNotDone(); System.out.println("OK, I've marked this task as not done yet:"); - System.out.println("[" + tasks.get(id - 1).getStatusIcon() + "] " + tasks.get(id - 1).toString()); + System.out.println(tasks[id - 1].toString()); } + } else if (input.startsWith("todo")) { + String description = input.substring(5).trim(); + tasks[taskCount++] = new Todo(description); + System.out.println("Got it. I've added this task:"); + System.out.println(tasks[taskCount - 1].toString()); + System.out.println("Now you have " + taskCount + " tasks in the list."); + } else if (input.startsWith("deadline")) { + int byIndex = input.indexOf("/by"); + String description = input.substring(9, byIndex).trim(); + String by = input.substring(byIndex + 4); + by = by.substring(0, 1).toUpperCase() + by.substring(1); + tasks[taskCount++] = new Deadline(description, by); + System.out.println("Got it. I've added this task:"); + System.out.println(tasks[taskCount - 1].toString()); + System.out.println("Now you have " + taskCount + " tasks in the list."); + } else if (input.startsWith("event")) { + int fromIndex = input.indexOf("/from"); + int toIndex = input.indexOf("/to"); + String description = input.substring(6, fromIndex).trim(); + String startDate = input.substring(fromIndex + 6, toIndex); + startDate = startDate.substring(0, 1).toUpperCase() + startDate.substring(1); + String endDate = input.substring(toIndex + 3).trim(); + endDate = endDate.substring(0, 1).toUpperCase() + endDate.substring(1); + tasks[taskCount++] = new Event(description, startDate, endDate); + System.out.println("Got it. I've added this task:"); + System.out.println(tasks[taskCount - 1].toString()); + System.out.println("Now you have " + taskCount + " tasks in the list."); } else { System.out.println("added: " + input); - tasks.add(new Task(input)); + tasks[taskCount++] = new Task(input); } } System.out.println("Bye. Hope to see you again soon!"); diff --git a/src/main/java/Task.java b/src/main/java/Task.java index f0fccf36d2..7613d3351c 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -28,6 +28,6 @@ public void markAsNotDone() { @Override public String toString() { - return description; + return "[" + this.getStatusIcon() + "] " + description; } } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 0000000000..931cfd4f9e --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,11 @@ +public class Todo extends Task { + + public Todo(String description) { + super(description); + } + + @Override + public String toString() { + return "[T]" + super.toString(); + } +} From 52c7599f817b1e76ff842687c66e5a79bc7f7fd3 Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Fri, 31 Jan 2025 13:04:07 +0800 Subject: [PATCH 09/41] Automated Text UI Testing --- text-ui-test/runtest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh index c9ec870033..9ac25484da 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 Johan < 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 2841546d89183433108671b83f6c8a03d60d3781 Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Fri, 31 Jan 2025 13:04:59 +0800 Subject: [PATCH 10/41] Handle Errors --- src/main/java/Johan.java | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/main/java/Johan.java b/src/main/java/Johan.java index dfad250efc..750b262342 100644 --- a/src/main/java/Johan.java +++ b/src/main/java/Johan.java @@ -37,11 +37,21 @@ public static void main(String[] args) { System.out.println(tasks[id - 1].toString()); } } else if (input.startsWith("todo")) { - String description = input.substring(5).trim(); - tasks[taskCount++] = new Todo(description); - System.out.println("Got it. I've added this task:"); - System.out.println(tasks[taskCount - 1].toString()); - System.out.println("Now you have " + taskCount + " tasks in the list."); + String description = input.substring(4).trim(); + if (description.isEmpty()) { + System.out.println("____________________________________________________________"); + System.out.println(" OOPS!!! The description of a todo cannot be empty."); + System.out.println("____________________________________________________________"); + } else { + tasks[taskCount++] = new Todo(description); + System.out.println("Got it. I've added this task:"); + System.out.println(tasks[taskCount - 1].toString()); + System.out.println("Now you have " + taskCount + " tasks in the list."); + } + // tasks[taskCount++] = new Todo(description); + // System.out.println("Got it. I've added this task:"); + // System.out.println(tasks[taskCount - 1].toString()); + // System.out.println("Now you have " + taskCount + " tasks in the list."); } else if (input.startsWith("deadline")) { int byIndex = input.indexOf("/by"); String description = input.substring(9, byIndex).trim(); @@ -64,8 +74,9 @@ public static void main(String[] args) { System.out.println(tasks[taskCount - 1].toString()); System.out.println("Now you have " + taskCount + " tasks in the list."); } else { - System.out.println("added: " + input); - tasks[taskCount++] = new Task(input); + System.out.println("____________________________________________________________"); + System.out.println(" OOPS!!! I'm sorry, but I don't know what that means :-("); + System.out.println("____________________________________________________________"); } } System.out.println("Bye. Hope to see you again soon!"); From e30a5d94f34d0261cbf7f0e6e891c817a40d4894 Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Fri, 31 Jan 2025 13:33:06 +0800 Subject: [PATCH 11/41] Delete --- src/main/java/Johan.java | 54 ++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/src/main/java/Johan.java b/src/main/java/Johan.java index 750b262342..fa78f7622a 100644 --- a/src/main/java/Johan.java +++ b/src/main/java/Johan.java @@ -7,8 +7,9 @@ public static void main(String[] args) { Scanner scanner = new Scanner(System.in); System.out.println("Hello! I'm Johan"); System.out.println("What can I do for you?"); - Task[] tasks = new Task[100]; - int taskCount = 0; + // Task[] tasks = new Task[100]; + ArrayList tasks = new ArrayList<>(); + // int taskCount = 0; while (true) { input = scanner.nextLine().toLowerCase().trim(); @@ -17,24 +18,24 @@ public static void main(String[] args) { break; } else if (input.equals("list")) { System.out.println("Here are the tasks in your list:"); - for (int i = 0; i < taskCount; i++) { - System.out.println(tasks[i].getID() + "." + tasks[i].toString()); + for (int i = 0; i < tasks.size(); i++) { + System.out.println((i + 1) + "." + tasks.get(i).toString()); } } else if (input.startsWith("mark ")) { String taskID = input.substring(5); int id = Integer.parseInt(taskID); - if (id > 0 && id <= tasks.length) { - tasks[id - 1].markAsDone(); + if (id > 0 && id <= tasks.size()) { + tasks.get(id - 1).markAsDone(); System.out.println("Nice! I've marked this task as done:"); - System.out.println(tasks[id - 1].toString()); + System.out.println(tasks.get(id - 1).toString()); } } else if (input.startsWith("unmark ")) { String taskID = input.substring(7); int id = Integer.parseInt(taskID); - if (id > 0 && id <= tasks.length) { - tasks[id - 1].markAsNotDone(); + if (id > 0 && id <= tasks.size()) { + tasks.get(id - 1).markAsNotDone(); System.out.println("OK, I've marked this task as not done yet:"); - System.out.println(tasks[id - 1].toString()); + System.out.println(tasks.get(id - 1).toString()); } } else if (input.startsWith("todo")) { String description = input.substring(4).trim(); @@ -43,10 +44,10 @@ public static void main(String[] args) { System.out.println(" OOPS!!! The description of a todo cannot be empty."); System.out.println("____________________________________________________________"); } else { - tasks[taskCount++] = new Todo(description); + tasks.add(new Todo(description)); System.out.println("Got it. I've added this task:"); - System.out.println(tasks[taskCount - 1].toString()); - System.out.println("Now you have " + taskCount + " tasks in the list."); + System.out.println(tasks.get(tasks.size() - 1).toString()); + System.out.println("Now you have " + tasks.size() + " tasks in the list."); } // tasks[taskCount++] = new Todo(description); // System.out.println("Got it. I've added this task:"); @@ -57,10 +58,10 @@ public static void main(String[] args) { String description = input.substring(9, byIndex).trim(); String by = input.substring(byIndex + 4); by = by.substring(0, 1).toUpperCase() + by.substring(1); - tasks[taskCount++] = new Deadline(description, by); + tasks.add(new Deadline(description, by)); System.out.println("Got it. I've added this task:"); - System.out.println(tasks[taskCount - 1].toString()); - System.out.println("Now you have " + taskCount + " tasks in the list."); + System.out.println(tasks.get(tasks.size() - 1).toString()); + System.out.println("Now you have " + tasks.size() + " tasks in the list."); } else if (input.startsWith("event")) { int fromIndex = input.indexOf("/from"); int toIndex = input.indexOf("/to"); @@ -69,10 +70,25 @@ public static void main(String[] args) { startDate = startDate.substring(0, 1).toUpperCase() + startDate.substring(1); String endDate = input.substring(toIndex + 3).trim(); endDate = endDate.substring(0, 1).toUpperCase() + endDate.substring(1); - tasks[taskCount++] = new Event(description, startDate, endDate); + tasks.add(new Event(description, startDate, endDate)); System.out.println("Got it. I've added this task:"); - System.out.println(tasks[taskCount - 1].toString()); - System.out.println("Now you have " + taskCount + " tasks in the list."); + System.out.println(tasks.get(tasks.size() - 1).toString()); + System.out.println("Now you have " + tasks.size() + " tasks in the list."); + } else if (input.startsWith("delete")) { + String taskID = input.substring(7); + int id = Integer.parseInt(taskID); + if (id > 0 && id <= tasks.size()) { + Task removedTask = tasks.remove(id - 1); + System.out.println("____________________________________________________________"); + System.out.println("Noted. I've removed this task:"); + System.out.println(removedTask.toString()); + System.out.println("Now you have " + tasks.size() + " tasks in the list."); + System.out.println("____________________________________________________________"); + } else { + System.out.println("____________________________________________________________"); + System.out.println(" OOPS!!! The task ID is invalid."); + System.out.println("____________________________________________________________"); + } } else { System.out.println("____________________________________________________________"); System.out.println(" OOPS!!! I'm sorry, but I don't know what that means :-("); From b29de72c76272a5956781839365a545402928970 Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Thu, 20 Feb 2025 20:49:00 +0800 Subject: [PATCH 12/41] no message --- .gitignore | 1 + src/main/java/Johan.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2873e189e1..e27aae3e5d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ bin/ /text-ui-test/ACTUAL.TXT text-ui-test/EXPECTED-UNIX.TXT +Johan.class diff --git a/src/main/java/Johan.java b/src/main/java/Johan.java index fa78f7622a..a21d836a8f 100644 --- a/src/main/java/Johan.java +++ b/src/main/java/Johan.java @@ -13,7 +13,7 @@ public static void main(String[] args) { while (true) { input = scanner.nextLine().toLowerCase().trim(); - String[] words = input.split(""); + // String[] words = input.split(""); if (input.equals("bye")) { break; } else if (input.equals("list")) { From 55e1bbed5f38d0b3f3feda91d612ed432fcba8e5 Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Fri, 21 Feb 2025 12:56:10 +0800 Subject: [PATCH 13/41] Save the tasks in the hard disk automatically whenever the task list changes. Load the data from the hard disk when the chatbot starts up. --- data/johan.txt | 3 ++ src/main/java/Johan.java | 14 +++++- src/main/java/Storage.java | 95 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 data/johan.txt create mode 100644 src/main/java/Storage.java diff --git a/data/johan.txt b/data/johan.txt new file mode 100644 index 0000000000..a084dcf106 --- /dev/null +++ b/data/johan.txt @@ -0,0 +1,3 @@ +D | 1 | return book | Sunday +E | 1 | project meeting | Mon 2pm | 4pm +T | 0 | borrow book diff --git a/src/main/java/Johan.java b/src/main/java/Johan.java index a21d836a8f..b64ca76a85 100644 --- a/src/main/java/Johan.java +++ b/src/main/java/Johan.java @@ -2,13 +2,19 @@ import java.util.ArrayList; public class Johan { + private static final String FILE_PATH = "./data/johan.txt"; + private static ArrayList tasks = new ArrayList<>(); + private static Storage storage; + public static void main(String[] args) { + storage = new Storage(FILE_PATH); + tasks = storage.loadTasks(); String input; Scanner scanner = new Scanner(System.in); System.out.println("Hello! I'm Johan"); System.out.println("What can I do for you?"); // Task[] tasks = new Task[100]; - ArrayList tasks = new ArrayList<>(); + // ArrayList tasks = new ArrayList<>(); // int taskCount = 0; while (true) { @@ -28,6 +34,7 @@ public static void main(String[] args) { tasks.get(id - 1).markAsDone(); System.out.println("Nice! I've marked this task as done:"); System.out.println(tasks.get(id - 1).toString()); + storage.saveTasks(tasks); } } else if (input.startsWith("unmark ")) { String taskID = input.substring(7); @@ -36,6 +43,7 @@ public static void main(String[] args) { tasks.get(id - 1).markAsNotDone(); System.out.println("OK, I've marked this task as not done yet:"); System.out.println(tasks.get(id - 1).toString()); + storage.saveTasks(tasks); } } else if (input.startsWith("todo")) { String description = input.substring(4).trim(); @@ -48,6 +56,7 @@ public static void main(String[] args) { System.out.println("Got it. I've added this task:"); System.out.println(tasks.get(tasks.size() - 1).toString()); System.out.println("Now you have " + tasks.size() + " tasks in the list."); + storage.saveTasks(tasks); } // tasks[taskCount++] = new Todo(description); // System.out.println("Got it. I've added this task:"); @@ -62,6 +71,7 @@ public static void main(String[] args) { System.out.println("Got it. I've added this task:"); System.out.println(tasks.get(tasks.size() - 1).toString()); System.out.println("Now you have " + tasks.size() + " tasks in the list."); + storage.saveTasks(tasks); } else if (input.startsWith("event")) { int fromIndex = input.indexOf("/from"); int toIndex = input.indexOf("/to"); @@ -74,6 +84,7 @@ public static void main(String[] args) { System.out.println("Got it. I've added this task:"); System.out.println(tasks.get(tasks.size() - 1).toString()); System.out.println("Now you have " + tasks.size() + " tasks in the list."); + storage.saveTasks(tasks); } else if (input.startsWith("delete")) { String taskID = input.substring(7); int id = Integer.parseInt(taskID); @@ -84,6 +95,7 @@ public static void main(String[] args) { System.out.println(removedTask.toString()); System.out.println("Now you have " + tasks.size() + " tasks in the list."); System.out.println("____________________________________________________________"); + storage.saveTasks(tasks); } else { System.out.println("____________________________________________________________"); System.out.println(" OOPS!!! The task ID is invalid."); diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java new file mode 100644 index 0000000000..76ea74b9bc --- /dev/null +++ b/src/main/java/Storage.java @@ -0,0 +1,95 @@ +import java.io.*; +import java.util.ArrayList; + +public class Storage { + private final String filePath; + + public Storage(String filePath) { + this.filePath = filePath; + } + + public void saveTasks(ArrayList tasks) { + File file = new File(filePath); + File directory = new File(file.getParent()); + + if (!directory.exists()) { + directory.mkdirs(); // Ensure directory exists + } + + try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) { + for (Task task : tasks) { + writer.write(formatTaskForSaving(task)); + writer.newLine(); + } + } catch (IOException e) { + System.out.println("Error saving tasks: " + e.getMessage()); + } + } + + public ArrayList loadTasks() { + ArrayList tasks = new ArrayList<>(); + File file = new File(filePath); + + if (!file.exists()) { + System.out.println("No saved tasks found. Starting fresh."); + return tasks; + } + + try (BufferedReader reader = new BufferedReader(new FileReader(file))) { + String line; + while ((line = reader.readLine()) != null) { + String[] parts = line.split(" \\| "); + if (parts.length < 3) continue; + + String type = parts[0]; + boolean isDone = parts[1].equals("1"); + String description = parts[2]; + + Task task; + if (type.equals("T")) { + task = new Todo(description); + } else if (type.equals("D") && parts.length == 4) { + task = new Deadline(description, parts[3]); + } else if (type.equals("E") && parts.length == 5) { + task = new Event(description, parts[3], parts[4]); + } else { + continue; // Ignore invalid entries + } + + if (isDone) { + task.markAsDone(); + } + + tasks.add(task); + } + } catch (IOException e) { + System.out.println("Error loading tasks: " + e.getMessage()); + } + + return tasks; + } + + private String formatTaskForSaving(Task task) { + String type; + if (task instanceof Todo) { + type = "T"; + } else if (task instanceof Deadline) { + type = "D"; + } else if (task instanceof Event) { + type = "E"; + } else { + return ""; + } + + String status = task.isDone ? "1" : "0"; + String description = task.description; + + if (task instanceof Deadline) { + return type + " | " + status + " | " + description + " | " + ((Deadline) task).by; + } else if (task instanceof Event) { + return type + " | " + status + " | " + description + " | " + ((Event) task).startDate + " | " + ((Event) task).endDate; + } else { + return type + " | " + status + " | " + description; + } + } +} From 969ec0d76c2da5d47e325f8ad99de45320318cea Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Sat, 22 Feb 2025 14:42:28 +0800 Subject: [PATCH 14/41] Dates and Times --- data/johan.txt | 4 +- src/main/java/Deadline.java | 24 +++++++- src/main/java/Event.java | 37 ++++++++++-- src/main/java/Johan.java | 112 +++++++++++++++++++++++++++++++----- src/main/java/Storage.java | 28 +++++++-- src/main/java/Task.java | 21 ++++++- 6 files changed, 194 insertions(+), 32 deletions(-) diff --git a/data/johan.txt b/data/johan.txt index a084dcf106..65ff185e96 100644 --- a/data/johan.txt +++ b/data/johan.txt @@ -1,3 +1 @@ -D | 1 | return book | Sunday -E | 1 | project meeting | Mon 2pm | 4pm -T | 0 | borrow book +E | 0 | project meeting | 2/12/2019 | 9/12/2019 diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index a1a150db94..55a4970d3e 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,15 +1,33 @@ +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + public class Deadline extends Task { - protected String by; + protected LocalDate by; public Deadline(String description, String by) { super(description); - this.by = by; + // this.by = by; + // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/M/yyyy"); + this.by = parseDate(by); + } + + private static LocalDate parseDate(String dateString) { + try { + DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("d/M/yyyy").withLocale(java.util.Locale.ENGLISH); + return LocalDate.parse(dateString.trim(), formatter1); + } catch (Exception e) { + DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd").withLocale(java.util.Locale.ENGLISH); + return LocalDate.parse(dateString.trim(), formatter2); + } } @Override public String toString() { - return "[D]" + super.toString() + " (by: " + by + ")"; + return "[D]" + super.toString() + " (by: " + by.format(DateTimeFormatter.ofPattern("MMM dd yyyy")) + ")"; } + public LocalDate getBy() { + return by; + } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 79ce156ea2..cb1563de88 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,16 +1,43 @@ +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Date; + public class Event extends Task { - protected String startDate; - protected String endDate; + protected LocalDate startDate; + protected LocalDate endDate; public Event(String description, String startDate, String endDate) { super(description); - this.startDate = startDate; - this.endDate = endDate; + // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/M/yyyy"); + // this.startDate = LocalDate.parse(startDate, inputFormatter); + // this.endDate = LocalDate.parse(endDate, inputFormatter); + this.startDate = parseDate(startDate); + this.endDate = parseDate(endDate); + } + + private static LocalDate parseDate(String dateString) { + try { + DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("d/M/yyyy").withLocale(java.util.Locale.ENGLISH); + return LocalDate.parse(dateString.trim(), formatter1); + } catch (Exception e) { + DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd").withLocale(java.util.Locale.ENGLISH); + return LocalDate.parse(dateString.trim(), formatter2); + } } @Override public String toString() { - return "[E]" + super.toString() + " (from: " + startDate + "to: " + endDate + ")"; + return "[E]" + super.toString() + + " (from: " + startDate.format(DateTimeFormatter.ofPattern("MMM dd yyyy")) + + " to: " + endDate.format(DateTimeFormatter.ofPattern("MMM dd yyyy")) + ")"; + } + + public LocalDate getStartDate() { + return startDate; + } + + public LocalDate getEndDate() { + return endDate; } } diff --git a/src/main/java/Johan.java b/src/main/java/Johan.java index b64ca76a85..206c245807 100644 --- a/src/main/java/Johan.java +++ b/src/main/java/Johan.java @@ -1,3 +1,7 @@ +import java.time.LocalDate; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Date; import java.util.Scanner; import java.util.ArrayList; @@ -64,27 +68,60 @@ public static void main(String[] args) { // System.out.println("Now you have " + taskCount + " tasks in the list."); } else if (input.startsWith("deadline")) { int byIndex = input.indexOf("/by"); + if (byIndex == -1) { + System.out.println("____________________________________________________________"); + System.out.println(" OOPS!!! Please specify a deadline with /by in d/M/yyyy format (e.g., 2/12/2019)."); + System.out.println("____________________________________________________________"); + continue; + } String description = input.substring(9, byIndex).trim(); String by = input.substring(byIndex + 4); - by = by.substring(0, 1).toUpperCase() + by.substring(1); - tasks.add(new Deadline(description, by)); - System.out.println("Got it. I've added this task:"); - System.out.println(tasks.get(tasks.size() - 1).toString()); - System.out.println("Now you have " + tasks.size() + " tasks in the list."); - storage.saveTasks(tasks); + try { + // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/MM/yyyy"); + // LocalDate dateTime = LocalDate.parse(by, inputFormatter); + tasks.add(new Deadline(description, by)); + System.out.println("Got it. I've added this task:"); + System.out.println(tasks.get(tasks.size() - 1).toString()); + System.out.println("Now you have " + tasks.size() + " tasks in the list."); + storage.saveTasks(tasks); + } catch (Exception e) { + System.out.println("____________________________________________________________"); + System.out.println(" OOPS!!! Invalid date format. Use d/M/yyyy (e.g., 2/12/2019)."); + System.out.println("____________________________________________________________"); + } + // by = by.substring(0, 1).toUpperCase() + by.substring(1); } else if (input.startsWith("event")) { int fromIndex = input.indexOf("/from"); int toIndex = input.indexOf("/to"); + if (fromIndex == -1 && toIndex == -1) { + System.out.println("____________________________________________________________"); + System.out.println(" OOPS!!! Please specify start and end times with /from and /to in d/M/yyyy format (e.g., 2/12/2019)."); + System.out.println("____________________________________________________________"); + continue; + } String description = input.substring(6, fromIndex).trim(); - String startDate = input.substring(fromIndex + 6, toIndex); - startDate = startDate.substring(0, 1).toUpperCase() + startDate.substring(1); - String endDate = input.substring(toIndex + 3).trim(); - endDate = endDate.substring(0, 1).toUpperCase() + endDate.substring(1); - tasks.add(new Event(description, startDate, endDate)); - System.out.println("Got it. I've added this task:"); - System.out.println(tasks.get(tasks.size() - 1).toString()); - System.out.println("Now you have " + tasks.size() + " tasks in the list."); - storage.saveTasks(tasks); + String startDate = input.substring(fromIndex + 6, toIndex).trim(); + // startDate = startDate.substring(0, 1).toUpperCase() + startDate.substring(1); + // String endDate = input.substring(toIndex + 3).trim(); + String endDate = input.substring(toIndex + 4).trim(); + // endDate = endDate.substring(0, 1).toUpperCase() + endDate.substring(1); + try { + // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/MM/yyyy"); + // System.out.println("Parsing date: " + startDate + " to " + endDate); // Debug + // LocalDate dateTime = LocalDate.parse(startDate, inputFormatter); + // LocalDate endDateTime = LocalDate.parse(endDate, inputFormatter); + LocalDate dateTime = parseDate(startDate); + LocalDate endDateTime = parseDate(startDate); + tasks.add(new Event(description, startDate, endDate)); + System.out.println("Got it. I've added this task:"); + System.out.println(tasks.get(tasks.size() - 1).toString()); + System.out.println("Now you have " + tasks.size() + " tasks in the list."); + storage.saveTasks(tasks); + } catch (Exception e) { + System.out.println("____________________________________________________________"); + System.out.println(" OOPS!!! Invalid date format. Use d/M/yyyy (e.g., 2/12/2019)."); + System.out.println("____________________________________________________________"); + } } else if (input.startsWith("delete")) { String taskID = input.substring(7); int id = Integer.parseInt(taskID); @@ -101,6 +138,41 @@ public static void main(String[] args) { System.out.println(" OOPS!!! The task ID is invalid."); System.out.println("____________________________________________________________"); } + } else if (input.startsWith("on ")) { // fix this, showing everything despite not being on the right date + String dateStr = input.substring(3).trim(); + try { + // DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("d/MM/yyyy"); + // LocalDate targetDate = LocalDate.parse(dateStr, dateFormatter); + LocalDate targetDate = parseDate(dateStr); + System.out.println("Tasks on " + targetDate.format(DateTimeFormatter.ofPattern("d/MM/yyyy")) + ":"); + boolean found = false; + for (int i = 0; i < tasks.size(); i++) { + Task task = tasks.get(i); + if (task instanceof Deadline) { + LocalDate deadline = ((Deadline) task).getBy(); + if (deadline != null && deadline.equals(targetDate)) { + System.out.println((i + 1) + "." + task.toString()); + found = true; + } + } else if (task instanceof Event) { + LocalDate startDate = ((Event) task).getStartDate(); + LocalDate endDate = ((Event) task).getEndDate(); + if (startDate != null && endDate != null) { + if (!startDate.isAfter(targetDate) && !endDate.isBefore(targetDate)) { + System.out.println((i + 1) + "." + task.toString()); + found = true; + } + } + } + } + if (!found) { + System.out.println("No tasks found on this date."); + } + } catch (Exception e) { + System.out.println("____________________________________________________________"); + System.out.println(" OOPS!!! Invalid date format. Use d/M/yyyy (e.g., 2/12/2019)."); + System.out.println("____________________________________________________________"); + } } else { System.out.println("____________________________________________________________"); System.out.println(" OOPS!!! I'm sorry, but I don't know what that means :-("); @@ -109,4 +181,14 @@ public static void main(String[] args) { } System.out.println("Bye. Hope to see you again soon!"); } + + private static LocalDate parseDate(String dateStr) { + try { + DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("d/M/yyyy").withLocale(java.util.Locale.ENGLISH); + return LocalDate.parse(dateStr.trim(), formatter1); + } catch (Exception e) { + DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd").withLocale(java.util.Locale.ENGLISH); + return LocalDate.parse(dateStr.trim(), formatter2); + } + } } diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index 76ea74b9bc..922e1938b2 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -1,5 +1,8 @@ import java.io.*; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Date; public class Storage { private final String filePath; @@ -37,6 +40,7 @@ public ArrayList loadTasks() { try (BufferedReader reader = new BufferedReader(new FileReader(file))) { String line; + // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/M/yyyy HHmm"); while ((line = reader.readLine()) != null) { String[] parts = line.split(" \\| "); if (parts.length < 3) continue; @@ -49,9 +53,22 @@ public ArrayList loadTasks() { if (type.equals("T")) { task = new Todo(description); } else if (type.equals("D") && parts.length == 4) { - task = new Deadline(description, parts[3]); + try { + // LocalDate deadline = LocalDate.parse(parts[3], inputFormatter); + task = new Deadline(description, parts[3]); + } catch (Exception e) { + System.out.println("Error parsing deadline for task: " + description + ". Skipping..."); + continue; + } } else if (type.equals("E") && parts.length == 5) { - task = new Event(description, parts[3], parts[4]); + try { + // LocalDate from = LocalDate.parse(parts[3], inputFormatter); + // LocalDate to = LocalDate.parse(parts[4], inputFormatter); + task = new Event(description, parts[3], parts[4]); + } catch (Exception e) { + System.out.println("Error parsing deadline for task: " + description + ". Skipping..."); + continue; + } } else { continue; // Ignore invalid entries } @@ -85,9 +102,12 @@ private String formatTaskForSaving(Task task) { String description = task.description; if (task instanceof Deadline) { - return type + " | " + status + " | " + description + " | " + ((Deadline) task).by; + LocalDate deadline = ((Deadline) task).getBy(); + return type + " | " + status + " | " + description + " | " + deadline.format(DateTimeFormatter.ofPattern("d/M/yyyy")); } else if (task instanceof Event) { - return type + " | " + status + " | " + description + " | " + ((Event) task).startDate + " | " + ((Event) task).endDate; + LocalDate startDate = ((Event) task).getStartDate(); + LocalDate endDate = ((Event) task).getEndDate(); + return type + " | " + status + " | " + description + " | " + startDate.format(DateTimeFormatter.ofPattern("d/M/yyyy")) + " | " + endDate.format(DateTimeFormatter.ofPattern("d/M/yyyy")); } else { return type + " | " + status + " | " + description; } diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 7613d3351c..51c6dda991 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,13 +1,18 @@ -public class Task { +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +public abstract class Task { protected String description; protected boolean isDone; private static int nextTaskID = 1; private final int ID; + protected LocalDate deadline; public Task(String description) { this.description = description; this.isDone = false; this.ID = nextTaskID++; + this.deadline = null; } public String getID() { @@ -26,8 +31,20 @@ public void markAsNotDone() { isDone = false; } + public LocalDate getDeadline() { + return deadline; + } + + public void setDeadline(LocalDate deadline) { + this.deadline = deadline; + } + @Override public String toString() { - return "[" + this.getStatusIcon() + "] " + description; + String baseString = "[" + this.getStatusIcon() + "] " + description; + if (deadline != null) { + baseString += "(by: " + deadline.format(DateTimeFormatter.ofPattern("MMM dd yyyy")) + ")"; + } + return baseString; } } From 9c11eb3db4af7be5d8fb6256fe3803c934a0a453 Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Sat, 22 Feb 2025 15:35:47 +0800 Subject: [PATCH 15/41] Ui class --- src/main/java/Ui.java | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 src/main/java/Ui.java diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java new file mode 100644 index 0000000000..ecaa4c2a73 --- /dev/null +++ b/src/main/java/Ui.java @@ -0,0 +1,58 @@ +import java.util.Scanner; + +public class Ui { + private final Scanner scanner = new Scanner(System.in); + + public void showWelcome() { + System.out.println("Hello! I'm Johan"); + System.out.println("What can I do for you?"); + } + + public void showGoodbye() { + System.out.println("Bye. Hope to see you again soon!"); + } + + public void showTaskList(TaskList tasks) { + System.out.println("Here are the tasks in your list:"); + for (int i = 0; i < tasks.size(); i++) { + System.out.println((i + 1) + "." + tasks.get(i).toString()); + } + } + + public void showTaskAdded(Task task, int taskCount) { + System.out.println("Got it. I've added this task:"); + System.out.println(task.toString()); + System.out.println("Now you have " + taskCount + " tasks in the list."); + } + + public void showTaskMarked(Task task, boolean isDone) { + if (isDone) { + System.out.println("Nice! I've marked this task as done:"); + } else { + System.out.println("OK, I've marked this task as not done yet:"); + } + System.out.println(task.toString()); + } + + public void showTaskDeleted(Task task, int taskCount) { + System.out.println("____________________________________________________________"); + System.out.println("Noted. I've removed this task:"); + System.out.println(task.toString()); + System.out.println("Now you have " + taskCount + " tasks in the list."); + System.out.println("____________________________________________________________"); + } + + public void showError(String message) { + System.out.println("____________________________________________________________"); + System.out.println(" OOPS!!! " + message); + System.out.println("____________________________________________________________"); + } + + public String readCommand() { + return scanner.nextLine().toLowerCase().trim(); + } + + public void showLine() { + System.out.println("____________________________________________________________"); + } +} \ No newline at end of file From ef0c6b12171ce7343bb860115057de505a581d02 Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Sun, 23 Feb 2025 16:45:18 +0800 Subject: [PATCH 16/41] A-MoreOOP --- src/main/java/AddCommand.java | 61 +++++ src/main/java/Command.java | 6 + src/main/java/DeleteCommand.java | 14 ++ src/main/java/ExitCommand.java | 11 + src/main/java/Johan.java | 407 ++++++++++++++++++------------- src/main/java/ListCommand.java | 6 + src/main/java/MarkCommand.java | 22 ++ src/main/java/OnDateCommand.java | 14 ++ src/main/java/Parser.java | 102 ++++++++ src/main/java/TaskList.java | 35 +++ src/main/java/Ui.java | 29 ++- 11 files changed, 532 insertions(+), 175 deletions(-) create mode 100644 src/main/java/AddCommand.java create mode 100644 src/main/java/Command.java create mode 100644 src/main/java/DeleteCommand.java create mode 100644 src/main/java/ExitCommand.java create mode 100644 src/main/java/ListCommand.java create mode 100644 src/main/java/MarkCommand.java create mode 100644 src/main/java/OnDateCommand.java create mode 100644 src/main/java/Parser.java create mode 100644 src/main/java/TaskList.java diff --git a/src/main/java/AddCommand.java b/src/main/java/AddCommand.java new file mode 100644 index 0000000000..ab3302ad9c --- /dev/null +++ b/src/main/java/AddCommand.java @@ -0,0 +1,61 @@ +public abstract class AddCommand extends Command { + protected final String description; + + public AddCommand(String description) { + this.description = description; + } + + @Override + public abstract void execute(TaskList tasks, Ui ui, Storage storage) throws Exception; +} + +class TodoCommand extends AddCommand { + public TodoCommand(String description) { + super(description); + } + + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + if (description.isEmpty()) throw new IllegalArgumentException("The description of a todo cannot be empty."); + Task task = new Todo(description); + tasks.addTask(task); + ui.showTaskAdded(task, tasks.size()); + storage.saveTasks(tasks.getTasks()); + } +} + +class DeadlineCommand extends AddCommand { + private final String by; + + public DeadlineCommand(String description, String by) { + super(description); + this.by = by; + } + + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + Task task = new Deadline(description, by); + tasks.addTask(task); + ui.showTaskAdded(task, tasks.size()); + storage.saveTasks(tasks.getTasks()); + } +} + +class EventCommand extends AddCommand { + private final String from; + private final String to; + + public EventCommand(String description, String from, String to) { + super(description); + this.from = from; + this.to = to; + } + + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + Task task = new Event(description, from, to); + tasks.addTask(task); + ui.showTaskAdded(task, tasks.size()); + storage.saveTasks(tasks.getTasks()); + } +} \ No newline at end of file diff --git a/src/main/java/Command.java b/src/main/java/Command.java new file mode 100644 index 0000000000..ff3812d8aa --- /dev/null +++ b/src/main/java/Command.java @@ -0,0 +1,6 @@ +public abstract class Command { + public abstract void execute(TaskList tasks, Ui ui, Storage storage) throws Exception; + public boolean isExit() { + return false; + } +} \ No newline at end of file diff --git a/src/main/java/DeleteCommand.java b/src/main/java/DeleteCommand.java new file mode 100644 index 0000000000..096f0c9e45 --- /dev/null +++ b/src/main/java/DeleteCommand.java @@ -0,0 +1,14 @@ +public class DeleteCommand extends Command { + private final int taskIndex; + + public DeleteCommand(int taskIndex) { + this.taskIndex = taskIndex; + } + + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + Task task = tasks.deleteTask(taskIndex); + ui.showTaskDeleted(task, tasks.size()); + storage.saveTasks(tasks.getTasks()); + } +} \ No newline at end of file diff --git a/src/main/java/ExitCommand.java b/src/main/java/ExitCommand.java new file mode 100644 index 0000000000..ab0a90eed3 --- /dev/null +++ b/src/main/java/ExitCommand.java @@ -0,0 +1,11 @@ +public class ExitCommand extends Command { + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + // No action needed; isExit() handles termination + } + + @Override + public boolean isExit() { + return true; + } +} \ No newline at end of file diff --git a/src/main/java/Johan.java b/src/main/java/Johan.java index 206c245807..0ac43f7dba 100644 --- a/src/main/java/Johan.java +++ b/src/main/java/Johan.java @@ -1,188 +1,52 @@ import java.time.LocalDate; -import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.Date; -import java.util.Scanner; import java.util.ArrayList; public class Johan { - private static final String FILE_PATH = "./data/johan.txt"; - private static ArrayList tasks = new ArrayList<>(); - private static Storage storage; + private final Storage storage; + private final TaskList tasks; + private final Ui ui; + private final Parser parser; - public static void main(String[] args) { - storage = new Storage(FILE_PATH); - tasks = storage.loadTasks(); - String input; - Scanner scanner = new Scanner(System.in); - System.out.println("Hello! I'm Johan"); - System.out.println("What can I do for you?"); - // Task[] tasks = new Task[100]; - // ArrayList tasks = new ArrayList<>(); - // int taskCount = 0; + public Johan(String filePath) { + ui = new Ui(); + storage = new Storage(filePath); + parser = new Parser(); - while (true) { - input = scanner.nextLine().toLowerCase().trim(); - // String[] words = input.split(""); - if (input.equals("bye")) { - break; - } else if (input.equals("list")) { - System.out.println("Here are the tasks in your list:"); - for (int i = 0; i < tasks.size(); i++) { - System.out.println((i + 1) + "." + tasks.get(i).toString()); - } - } else if (input.startsWith("mark ")) { - String taskID = input.substring(5); - int id = Integer.parseInt(taskID); - if (id > 0 && id <= tasks.size()) { - tasks.get(id - 1).markAsDone(); - System.out.println("Nice! I've marked this task as done:"); - System.out.println(tasks.get(id - 1).toString()); - storage.saveTasks(tasks); - } - } else if (input.startsWith("unmark ")) { - String taskID = input.substring(7); - int id = Integer.parseInt(taskID); - if (id > 0 && id <= tasks.size()) { - tasks.get(id - 1).markAsNotDone(); - System.out.println("OK, I've marked this task as not done yet:"); - System.out.println(tasks.get(id - 1).toString()); - storage.saveTasks(tasks); - } - } else if (input.startsWith("todo")) { - String description = input.substring(4).trim(); - if (description.isEmpty()) { - System.out.println("____________________________________________________________"); - System.out.println(" OOPS!!! The description of a todo cannot be empty."); - System.out.println("____________________________________________________________"); - } else { - tasks.add(new Todo(description)); - System.out.println("Got it. I've added this task:"); - System.out.println(tasks.get(tasks.size() - 1).toString()); - System.out.println("Now you have " + tasks.size() + " tasks in the list."); - storage.saveTasks(tasks); - } - // tasks[taskCount++] = new Todo(description); - // System.out.println("Got it. I've added this task:"); - // System.out.println(tasks[taskCount - 1].toString()); - // System.out.println("Now you have " + taskCount + " tasks in the list."); - } else if (input.startsWith("deadline")) { - int byIndex = input.indexOf("/by"); - if (byIndex == -1) { - System.out.println("____________________________________________________________"); - System.out.println(" OOPS!!! Please specify a deadline with /by in d/M/yyyy format (e.g., 2/12/2019)."); - System.out.println("____________________________________________________________"); - continue; - } - String description = input.substring(9, byIndex).trim(); - String by = input.substring(byIndex + 4); - try { - // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/MM/yyyy"); - // LocalDate dateTime = LocalDate.parse(by, inputFormatter); - tasks.add(new Deadline(description, by)); - System.out.println("Got it. I've added this task:"); - System.out.println(tasks.get(tasks.size() - 1).toString()); - System.out.println("Now you have " + tasks.size() + " tasks in the list."); - storage.saveTasks(tasks); - } catch (Exception e) { - System.out.println("____________________________________________________________"); - System.out.println(" OOPS!!! Invalid date format. Use d/M/yyyy (e.g., 2/12/2019)."); - System.out.println("____________________________________________________________"); - } - // by = by.substring(0, 1).toUpperCase() + by.substring(1); - } else if (input.startsWith("event")) { - int fromIndex = input.indexOf("/from"); - int toIndex = input.indexOf("/to"); - if (fromIndex == -1 && toIndex == -1) { - System.out.println("____________________________________________________________"); - System.out.println(" OOPS!!! Please specify start and end times with /from and /to in d/M/yyyy format (e.g., 2/12/2019)."); - System.out.println("____________________________________________________________"); - continue; - } - String description = input.substring(6, fromIndex).trim(); - String startDate = input.substring(fromIndex + 6, toIndex).trim(); - // startDate = startDate.substring(0, 1).toUpperCase() + startDate.substring(1); - // String endDate = input.substring(toIndex + 3).trim(); - String endDate = input.substring(toIndex + 4).trim(); - // endDate = endDate.substring(0, 1).toUpperCase() + endDate.substring(1); - try { - // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/MM/yyyy"); - // System.out.println("Parsing date: " + startDate + " to " + endDate); // Debug - // LocalDate dateTime = LocalDate.parse(startDate, inputFormatter); - // LocalDate endDateTime = LocalDate.parse(endDate, inputFormatter); - LocalDate dateTime = parseDate(startDate); - LocalDate endDateTime = parseDate(startDate); - tasks.add(new Event(description, startDate, endDate)); - System.out.println("Got it. I've added this task:"); - System.out.println(tasks.get(tasks.size() - 1).toString()); - System.out.println("Now you have " + tasks.size() + " tasks in the list."); - storage.saveTasks(tasks); - } catch (Exception e) { - System.out.println("____________________________________________________________"); - System.out.println(" OOPS!!! Invalid date format. Use d/M/yyyy (e.g., 2/12/2019)."); - System.out.println("____________________________________________________________"); - } - } else if (input.startsWith("delete")) { - String taskID = input.substring(7); - int id = Integer.parseInt(taskID); - if (id > 0 && id <= tasks.size()) { - Task removedTask = tasks.remove(id - 1); - System.out.println("____________________________________________________________"); - System.out.println("Noted. I've removed this task:"); - System.out.println(removedTask.toString()); - System.out.println("Now you have " + tasks.size() + " tasks in the list."); - System.out.println("____________________________________________________________"); - storage.saveTasks(tasks); - } else { - System.out.println("____________________________________________________________"); - System.out.println(" OOPS!!! The task ID is invalid."); - System.out.println("____________________________________________________________"); - } - } else if (input.startsWith("on ")) { // fix this, showing everything despite not being on the right date - String dateStr = input.substring(3).trim(); - try { - // DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("d/MM/yyyy"); - // LocalDate targetDate = LocalDate.parse(dateStr, dateFormatter); - LocalDate targetDate = parseDate(dateStr); - System.out.println("Tasks on " + targetDate.format(DateTimeFormatter.ofPattern("d/MM/yyyy")) + ":"); - boolean found = false; - for (int i = 0; i < tasks.size(); i++) { - Task task = tasks.get(i); - if (task instanceof Deadline) { - LocalDate deadline = ((Deadline) task).getBy(); - if (deadline != null && deadline.equals(targetDate)) { - System.out.println((i + 1) + "." + task.toString()); - found = true; - } - } else if (task instanceof Event) { - LocalDate startDate = ((Event) task).getStartDate(); - LocalDate endDate = ((Event) task).getEndDate(); - if (startDate != null && endDate != null) { - if (!startDate.isAfter(targetDate) && !endDate.isBefore(targetDate)) { - System.out.println((i + 1) + "." + task.toString()); - found = true; - } - } - } - } - if (!found) { - System.out.println("No tasks found on this date."); - } - } catch (Exception e) { - System.out.println("____________________________________________________________"); - System.out.println(" OOPS!!! Invalid date format. Use d/M/yyyy (e.g., 2/12/2019)."); - System.out.println("____________________________________________________________"); - } - } else { - System.out.println("____________________________________________________________"); - System.out.println(" OOPS!!! I'm sorry, but I don't know what that means :-("); - System.out.println("____________________________________________________________"); + ArrayList loadedTasks; + try { + loadedTasks = storage.loadTasks(); + } catch (Exception e) { + ui.showError("Failed to load tasks: " + e.getMessage()); + loadedTasks = new ArrayList<>(); + } + tasks = new TaskList(loadedTasks); + } + + public void run() { + ui.showWelcome(); + boolean isExit = false; + while (!isExit) { + try { + String fullCommand = ui.readCommand(); + ui.showLine(); + Command command = parser.parse(fullCommand); + command.execute(tasks, ui, storage); + isExit = command.isExit(); + } catch (Exception e) { + ui.showError(e.getMessage()); + } finally { + ui.showLine(); } } - System.out.println("Bye. Hope to see you again soon!"); + ui.showGoodbye(); } - private static LocalDate parseDate(String dateStr) { + public static void main(String[] args) { + new Johan("./data/johan.txt").run(); + } + + public static LocalDate parseDate(String dateStr) { try { DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("d/M/yyyy").withLocale(java.util.Locale.ENGLISH); return LocalDate.parse(dateStr.trim(), formatter1); @@ -192,3 +56,198 @@ private static LocalDate parseDate(String dateStr) { } } } + +//import java.time.LocalDate; +//import java.time.LocalDate; +//import java.time.format.DateTimeFormatter; +//import java.util.Date; +//import java.util.Scanner; +//import java.util.ArrayList; +// +//public class Johan { +// private static final String FILE_PATH = "./data/johan.txt"; +// private static ArrayList tasks = new ArrayList<>(); +// private static Storage storage; +// +// public static void main(String[] args) { +// storage = new Storage(FILE_PATH); +// tasks = storage.loadTasks(); +// String input; +// Scanner scanner = new Scanner(System.in); +// System.out.println("Hello! I'm Johan"); +// System.out.println("What can I do for you?"); +// // Task[] tasks = new Task[100]; +// // ArrayList tasks = new ArrayList<>(); +// // int taskCount = 0; +// +// while (true) { +// input = scanner.nextLine().toLowerCase().trim(); +// // String[] words = input.split(""); +// if (input.equals("bye")) { +// break; +// } else if (input.equals("list")) { +// System.out.println("Here are the tasks in your list:"); +// for (int i = 0; i < tasks.size(); i++) { +// System.out.println((i + 1) + "." + tasks.get(i).toString()); +// } +// } else if (input.startsWith("mark ")) { +// String taskID = input.substring(5); +// int id = Integer.parseInt(taskID); +// if (id > 0 && id <= tasks.size()) { +// tasks.get(id - 1).markAsDone(); +// System.out.println("Nice! I've marked this task as done:"); +// System.out.println(tasks.get(id - 1).toString()); +// storage.saveTasks(tasks); +// } +// } else if (input.startsWith("unmark ")) { +// String taskID = input.substring(7); +// int id = Integer.parseInt(taskID); +// if (id > 0 && id <= tasks.size()) { +// tasks.get(id - 1).markAsNotDone(); +// System.out.println("OK, I've marked this task as not done yet:"); +// System.out.println(tasks.get(id - 1).toString()); +// storage.saveTasks(tasks); +// } +// } else if (input.startsWith("todo")) { +// String description = input.substring(4).trim(); +// if (description.isEmpty()) { +// System.out.println("____________________________________________________________"); +// System.out.println(" OOPS!!! The description of a todo cannot be empty."); +// System.out.println("____________________________________________________________"); +// } else { +// tasks.add(new Todo(description)); +// System.out.println("Got it. I've added this task:"); +// System.out.println(tasks.get(tasks.size() - 1).toString()); +// System.out.println("Now you have " + tasks.size() + " tasks in the list."); +// storage.saveTasks(tasks); +// } +// // tasks[taskCount++] = new Todo(description); +// // System.out.println("Got it. I've added this task:"); +// // System.out.println(tasks[taskCount - 1].toString()); +// // System.out.println("Now you have " + taskCount + " tasks in the list."); +// } else if (input.startsWith("deadline")) { +// int byIndex = input.indexOf("/by"); +// if (byIndex == -1) { +// System.out.println("____________________________________________________________"); +// System.out.println(" OOPS!!! Please specify a deadline with /by in d/M/yyyy format (e.g., 2/12/2019)."); +// System.out.println("____________________________________________________________"); +// continue; +// } +// String description = input.substring(9, byIndex).trim(); +// String by = input.substring(byIndex + 4); +// try { +// // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/MM/yyyy"); +// // LocalDate dateTime = LocalDate.parse(by, inputFormatter); +// tasks.add(new Deadline(description, by)); +// System.out.println("Got it. I've added this task:"); +// System.out.println(tasks.get(tasks.size() - 1).toString()); +// System.out.println("Now you have " + tasks.size() + " tasks in the list."); +// storage.saveTasks(tasks); +// } catch (Exception e) { +// System.out.println("____________________________________________________________"); +// System.out.println(" OOPS!!! Invalid date format. Use d/M/yyyy (e.g., 2/12/2019)."); +// System.out.println("____________________________________________________________"); +// } +// // by = by.substring(0, 1).toUpperCase() + by.substring(1); +// } else if (input.startsWith("event")) { +// int fromIndex = input.indexOf("/from"); +// int toIndex = input.indexOf("/to"); +// if (fromIndex == -1 && toIndex == -1) { +// System.out.println("____________________________________________________________"); +// System.out.println(" OOPS!!! Please specify start and end times with /from and /to in d/M/yyyy format (e.g., 2/12/2019)."); +// System.out.println("____________________________________________________________"); +// continue; +// } +// String description = input.substring(6, fromIndex).trim(); +// String startDate = input.substring(fromIndex + 6, toIndex).trim(); +// // startDate = startDate.substring(0, 1).toUpperCase() + startDate.substring(1); +// // String endDate = input.substring(toIndex + 3).trim(); +// String endDate = input.substring(toIndex + 4).trim(); +// // endDate = endDate.substring(0, 1).toUpperCase() + endDate.substring(1); +// try { +// // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/MM/yyyy"); +// // System.out.println("Parsing date: " + startDate + " to " + endDate); // Debug +// // LocalDate dateTime = LocalDate.parse(startDate, inputFormatter); +// // LocalDate endDateTime = LocalDate.parse(endDate, inputFormatter); +// LocalDate dateTime = parseDate(startDate); +// LocalDate endDateTime = parseDate(startDate); +// tasks.add(new Event(description, startDate, endDate)); +// System.out.println("Got it. I've added this task:"); +// System.out.println(tasks.get(tasks.size() - 1).toString()); +// System.out.println("Now you have " + tasks.size() + " tasks in the list."); +// storage.saveTasks(tasks); +// } catch (Exception e) { +// System.out.println("____________________________________________________________"); +// System.out.println(" OOPS!!! Invalid date format. Use d/M/yyyy (e.g., 2/12/2019)."); +// System.out.println("____________________________________________________________"); +// } +// } else if (input.startsWith("delete")) { +// String taskID = input.substring(7); +// int id = Integer.parseInt(taskID); +// if (id > 0 && id <= tasks.size()) { +// Task removedTask = tasks.remove(id - 1); +// System.out.println("____________________________________________________________"); +// System.out.println("Noted. I've removed this task:"); +// System.out.println(removedTask.toString()); +// System.out.println("Now you have " + tasks.size() + " tasks in the list."); +// System.out.println("____________________________________________________________"); +// storage.saveTasks(tasks); +// } else { +// System.out.println("____________________________________________________________"); +// System.out.println(" OOPS!!! The task ID is invalid."); +// System.out.println("____________________________________________________________"); +// } +// } else if (input.startsWith("on ")) { // fix this, showing everything despite not being on the right date +// String dateStr = input.substring(3).trim(); +// try { +// // DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("d/MM/yyyy"); +// // LocalDate targetDate = LocalDate.parse(dateStr, dateFormatter); +// LocalDate targetDate = parseDate(dateStr); +// System.out.println("Tasks on " + targetDate.format(DateTimeFormatter.ofPattern("d/MM/yyyy")) + ":"); +// boolean found = false; +// for (int i = 0; i < tasks.size(); i++) { +// Task task = tasks.get(i); +// if (task instanceof Deadline) { +// LocalDate deadline = ((Deadline) task).getBy(); +// if (deadline != null && deadline.equals(targetDate)) { +// System.out.println((i + 1) + "." + task.toString()); +// found = true; +// } +// } else if (task instanceof Event) { +// LocalDate startDate = ((Event) task).getStartDate(); +// LocalDate endDate = ((Event) task).getEndDate(); +// if (startDate != null && endDate != null) { +// if (!startDate.isAfter(targetDate) && !endDate.isBefore(targetDate)) { +// System.out.println((i + 1) + "." + task.toString()); +// found = true; +// } +// } +// } +// } +// if (!found) { +// System.out.println("No tasks found on this date."); +// } +// } catch (Exception e) { +// System.out.println("____________________________________________________________"); +// System.out.println(" OOPS!!! Invalid date format. Use d/M/yyyy (e.g., 2/12/2019)."); +// System.out.println("____________________________________________________________"); +// } +// } else { +// System.out.println("____________________________________________________________"); +// System.out.println(" OOPS!!! I'm sorry, but I don't know what that means :-("); +// System.out.println("____________________________________________________________"); +// } +// } +// System.out.println("Bye. Hope to see you again soon!"); +// } +// +// private static LocalDate parseDate(String dateStr) { +// try { +// DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("d/M/yyyy").withLocale(java.util.Locale.ENGLISH); +// return LocalDate.parse(dateStr.trim(), formatter1); +// } catch (Exception e) { +// DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd").withLocale(java.util.Locale.ENGLISH); +// return LocalDate.parse(dateStr.trim(), formatter2); +// } +// } +//} diff --git a/src/main/java/ListCommand.java b/src/main/java/ListCommand.java new file mode 100644 index 0000000000..9474d70232 --- /dev/null +++ b/src/main/java/ListCommand.java @@ -0,0 +1,6 @@ +public class ListCommand extends Command { + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + ui.showTaskList(tasks); + } +} \ No newline at end of file diff --git a/src/main/java/MarkCommand.java b/src/main/java/MarkCommand.java new file mode 100644 index 0000000000..15e273865c --- /dev/null +++ b/src/main/java/MarkCommand.java @@ -0,0 +1,22 @@ +public class MarkCommand extends Command { + private final int taskIndex; + private final boolean markAsDone; + + public MarkCommand(int taskIndex, boolean markAsDone) { + this.taskIndex = taskIndex; + this.markAsDone = markAsDone; + } + + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + Task task = tasks.getTask(taskIndex); + if (markAsDone) { + task.markAsDone(); + ui.showTaskMarked(task, true); + } else { + task.markAsNotDone(); + ui.showTaskMarked(task, false); + } + storage.saveTasks(tasks.getTasks()); + } +} \ No newline at end of file diff --git a/src/main/java/OnDateCommand.java b/src/main/java/OnDateCommand.java new file mode 100644 index 0000000000..fe7a48b355 --- /dev/null +++ b/src/main/java/OnDateCommand.java @@ -0,0 +1,14 @@ +import java.time.LocalDate; + +public class OnDateCommand extends Command { + private final LocalDate targetDate; + + public OnDateCommand(String dateStr) { + this.targetDate = Johan.parseDate(dateStr); + } + + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + ui.showTasksOnDate(tasks, targetDate); + } +} diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java new file mode 100644 index 0000000000..8825c13736 --- /dev/null +++ b/src/main/java/Parser.java @@ -0,0 +1,102 @@ +public class Parser { + public Command parse(String input) throws Exception { + if (input.equals("bye")) { + return new ExitCommand(); + } else if (input.equals("list")) { + return new ListCommand(); + } else if (input.startsWith("mark ")) { + int id = Integer.parseInt(input.substring(5)) - 1; + return new MarkCommand(id, true); + } else if (input.startsWith("unmark ")) { + int id = Integer.parseInt(input.substring(7)) - 1; + return new MarkCommand(id, false); + } else if (input.startsWith("todo ")) { + String desc = input.substring(5).trim(); + return new TodoCommand(desc); + } else if (input.startsWith("deadline ")) { + int byIndex = input.indexOf("/by"); + if (byIndex == -1) throw new IllegalArgumentException("Please specify a deadline with /by."); + String desc = input.substring(9, byIndex).trim(); + String by = input.substring(byIndex + 4).trim(); + return new DeadlineCommand(desc, by); + } else if (input.startsWith("event ")) { + int fromIndex = input.indexOf("/from"); + int toIndex = input.indexOf("/to"); + if (fromIndex == -1 || toIndex == -1) throw new IllegalArgumentException("Please specify /from and /to."); + String desc = input.substring(6, fromIndex).trim(); + String from = input.substring(fromIndex + 6, toIndex).trim(); + String to = input.substring(toIndex + 4).trim(); + return new EventCommand(desc, from, to); + } else if (input.startsWith("delete ")) { + int id = Integer.parseInt(input.substring(7)) - 1; + return new DeleteCommand(id); + } else if (input.startsWith("on ")) { + String dateStr = input.substring(3).trim(); + return new OnDateCommand(dateStr); + } else { + throw new IllegalArgumentException("I'm sorry, but I don't know what that means :-("); + } + } +} +//import java.time.LocalDate; +// +//public class Parser { +// public boolean parseAndExecute(String input, TaskList tasks, Ui ui, Storage storage) { +// if (input.equals("bye")) { +// return false; +// } else if (input.equals("list")) { +// ui.showTaskList(tasks); +// } else if (input.startsWith("mark ")) { +// int id = Integer.parseInt(input.substring(5)) - 1; +// Task task = tasks.getTask(id); +// task.markAsDone(); +// ui.showTaskMarked(task, true); +// storage.saveTasks(tasks.getTasks()); +// } else if (input.startsWith("unmark ")) { +// int id = Integer.parseInt(input.substring(7)) - 1; +// Task task = tasks.getTask(id); +// task.markAsNotDone(); +// ui.showTaskMarked(task, false); +// storage.saveTasks(tasks.getTasks()); +// } else if (input.startsWith("todo ")) { +// String desc = input.substring(5).trim(); +// if (desc.isEmpty()) throw new IllegalArgumentException("The description of a todo cannot be empty."); +// Task task = new Todo(desc); +// tasks.addTask(task); +// ui.showTaskAdded(task, tasks.size()); +// storage.saveTasks(tasks.getTasks()); +// } else if (input.startsWith("deadline ")) { +// int byIndex = input.indexOf("/by"); +// if (byIndex == -1) throw new IllegalArgumentException("Please specify a deadline with /by."); +// String desc = input.substring(9, byIndex).trim(); +// String by = input.substring(byIndex + 4).trim(); +// Task task = new Deadline(desc, by); +// tasks.addTask(task); +// ui.showTaskAdded(task, tasks.size()); +// storage.saveTasks(tasks.getTasks()); +// } else if (input.startsWith("event ")) { +// int fromIndex = input.indexOf("/from"); +// int toIndex = input.indexOf("/to"); +// if (fromIndex == -1 || toIndex == -1) throw new IllegalArgumentException("Please specify /from and /to."); +// String desc = input.substring(6, fromIndex).trim(); +// String from = input.substring(fromIndex + 6, toIndex).trim(); +// String to = input.substring(toIndex + 4).trim(); +// Task task = new Event(desc, from, to); +// tasks.addTask(task); +// ui.showTaskAdded(task, tasks.size()); +// storage.saveTasks(tasks.getTasks()); +// } else if (input.startsWith("delete ")) { +// int id = Integer.parseInt(input.substring(7)) - 1; +// Task task = tasks.deleteTask(id); +// ui.showTaskDeleted(task, tasks.size()); +// storage.saveTasks(tasks.getTasks()); +// } else if (input.startsWith("on ")) { +// String dateStr = input.substring(3).trim(); +// LocalDate targetDate = Johan.parseDate(dateStr); +// ui.showTasksOnDate(tasks, targetDate); +// } else { +// throw new IllegalArgumentException("I'm sorry, but I don't know what that means :-("); +// } +// return true; +// } +//} \ No newline at end of file diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java new file mode 100644 index 0000000000..b2b0e89585 --- /dev/null +++ b/src/main/java/TaskList.java @@ -0,0 +1,35 @@ +import java.util.ArrayList; + +public class TaskList { + private final ArrayList tasks; + + public TaskList(ArrayList tasks) { + this.tasks = tasks; + } + + public void addTask(Task task) { + tasks.add(task); + } + + public Task deleteTask(int index) { + if (index >= 0 && index < tasks.size()) { + return tasks.remove(index); + } + throw new IllegalArgumentException("Invalid task index."); + } + + public Task getTask(int index) { + if (index >= 0 && index < tasks.size()) { + return tasks.get(index); + } + throw new IllegalArgumentException("Invalid task index."); + } + + public ArrayList getTasks() { + return tasks; + } + + public int size() { + return tasks.size(); + } +} \ No newline at end of file diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index ecaa4c2a73..a428c26a22 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -1,3 +1,5 @@ +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.Scanner; public class Ui { @@ -15,7 +17,7 @@ public void showGoodbye() { public void showTaskList(TaskList tasks) { System.out.println("Here are the tasks in your list:"); for (int i = 0; i < tasks.size(); i++) { - System.out.println((i + 1) + "." + tasks.get(i).toString()); + System.out.println((i + 1) + "." + tasks.getTask(i).toString()); } } @@ -55,4 +57,29 @@ public String readCommand() { public void showLine() { System.out.println("____________________________________________________________"); } + + public void showTasksOnDate(TaskList tasks, LocalDate targetDate) { + System.out.println("Tasks on " + targetDate.format(DateTimeFormatter.ofPattern("d/MM/yyyy")) + ":"); + boolean found = false; + for (int i = 0; i < tasks.size(); i++) { + Task task = tasks.getTask(i); + if (task instanceof Deadline) { + LocalDate deadline = ((Deadline) task).getBy(); + if (deadline != null && deadline.equals(targetDate)) { + System.out.println((i + 1) + "." + task.toString()); + found = true; + } + } else if (task instanceof Event) { + LocalDate startDate = ((Event) task).getStartDate(); + LocalDate endDate = ((Event) task).getEndDate(); + if (startDate != null && endDate != null && !startDate.isAfter(targetDate) && !endDate.isBefore(targetDate)) { + System.out.println((i + 1) + "." + task.toString()); + found = true; + } + } + } + if (!found) { + System.out.println("No tasks found on this date."); + } + } } \ No newline at end of file From 0a4ea80ebc68635ea78a294295171390190a163c Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Mon, 24 Feb 2025 14:11:23 +0800 Subject: [PATCH 17/41] Organize into packages --- README.md | 4 +- data/johan.txt | 3 +- docs/README.md | 2 +- src/main/java/AddCommand.java | 61 ------------------- src/main/java/{ => johan}/Duke.java | 2 + src/main/java/{ => johan}/Johan.java | 45 ++++++++------ src/main/java/johan/command/AddCommand.java | 20 ++++++ .../java/{ => johan/command}/Command.java | 6 ++ .../java/johan/command/DeadlineCommand.java | 24 ++++++++ .../{ => johan/command}/DeleteCommand.java | 7 +++ src/main/java/johan/command/EventCommand.java | 26 ++++++++ .../java/{ => johan/command}/ExitCommand.java | 6 ++ .../java/{ => johan/command}/ListCommand.java | 6 ++ .../java/{ => johan/command}/MarkCommand.java | 7 +++ .../{ => johan/command}/OnDateCommand.java | 7 +++ src/main/java/johan/command/TodoCommand.java | 23 +++++++ src/main/java/{ => johan/parser}/Parser.java | 30 ++++++--- .../java/{ => johan/storage}/Storage.java | 12 +++- src/main/java/{ => johan/task}/Deadline.java | 2 + src/main/java/{ => johan/task}/Event.java | 3 +- src/main/java/{ => johan/task}/Task.java | 10 +++ src/main/java/{ => johan/task}/TaskList.java | 2 + src/main/java/{ => johan/task}/Todo.java | 2 + src/main/java/{ => johan/ui}/Ui.java | 9 ++- text-ui-test/runtest.bat | 2 +- 25 files changed, 223 insertions(+), 98 deletions(-) delete mode 100644 src/main/java/AddCommand.java rename src/main/java/{ => johan}/Duke.java (95%) rename src/main/java/{ => johan}/Johan.java (89%) create mode 100644 src/main/java/johan/command/AddCommand.java rename src/main/java/{ => johan/command}/Command.java (63%) create mode 100644 src/main/java/johan/command/DeadlineCommand.java rename src/main/java/{ => johan/command}/DeleteCommand.java (75%) create mode 100644 src/main/java/johan/command/EventCommand.java rename src/main/java/{ => johan/command}/ExitCommand.java (71%) rename src/main/java/{ => johan/command}/ListCommand.java (61%) rename src/main/java/{ => johan/command}/MarkCommand.java (83%) rename src/main/java/{ => johan/command}/OnDateCommand.java (74%) create mode 100644 src/main/java/johan/command/TodoCommand.java rename src/main/java/{ => johan/parser}/Parser.java (83%) rename src/main/java/{ => johan/storage}/Storage.java (94%) rename src/main/java/{ => johan/task}/Deadline.java (98%) rename src/main/java/{ => johan/task}/Event.java (98%) rename src/main/java/{ => johan/task}/Task.java (88%) rename src/main/java/{ => johan/task}/TaskList.java (97%) rename src/main/java/{ => johan/task}/Todo.java (90%) rename src/main/java/{ => johan/ui}/Ui.java (94%) diff --git a/README.md b/README.md index af0309a9ef..be006b04f1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Duke project template +# johan.Duke project template This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it. @@ -13,7 +13,7 @@ Prerequisites: JDK 17, update Intellij to the most recent version. 1. If there are any further prompts, accept the defaults. 1. Configure the project to use **JDK 17** (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. -1. 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: +1. After that, locate the `src/main/java/johan.Duke.java` file, right-click it, and choose `Run johan.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 ____ _ diff --git a/data/johan.txt b/data/johan.txt index 65ff185e96..b3904fcc83 100644 --- a/data/johan.txt +++ b/data/johan.txt @@ -1 +1,2 @@ -E | 0 | project meeting | 2/12/2019 | 9/12/2019 +T | 0 | fly +T | 0 | walk diff --git a/docs/README.md b/docs/README.md index 47b9f984f7..fbcf0d0b6b 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,4 +1,4 @@ -# Duke User Guide +# johan.Duke User Guide // Update the title above to match the actual product name diff --git a/src/main/java/AddCommand.java b/src/main/java/AddCommand.java deleted file mode 100644 index ab3302ad9c..0000000000 --- a/src/main/java/AddCommand.java +++ /dev/null @@ -1,61 +0,0 @@ -public abstract class AddCommand extends Command { - protected final String description; - - public AddCommand(String description) { - this.description = description; - } - - @Override - public abstract void execute(TaskList tasks, Ui ui, Storage storage) throws Exception; -} - -class TodoCommand extends AddCommand { - public TodoCommand(String description) { - super(description); - } - - @Override - public void execute(TaskList tasks, Ui ui, Storage storage) { - if (description.isEmpty()) throw new IllegalArgumentException("The description of a todo cannot be empty."); - Task task = new Todo(description); - tasks.addTask(task); - ui.showTaskAdded(task, tasks.size()); - storage.saveTasks(tasks.getTasks()); - } -} - -class DeadlineCommand extends AddCommand { - private final String by; - - public DeadlineCommand(String description, String by) { - super(description); - this.by = by; - } - - @Override - public void execute(TaskList tasks, Ui ui, Storage storage) { - Task task = new Deadline(description, by); - tasks.addTask(task); - ui.showTaskAdded(task, tasks.size()); - storage.saveTasks(tasks.getTasks()); - } -} - -class EventCommand extends AddCommand { - private final String from; - private final String to; - - public EventCommand(String description, String from, String to) { - super(description); - this.from = from; - this.to = to; - } - - @Override - public void execute(TaskList tasks, Ui ui, Storage storage) { - Task task = new Event(description, from, to); - tasks.addTask(task); - ui.showTaskAdded(task, tasks.size()); - storage.saveTasks(tasks.getTasks()); - } -} \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/johan/Duke.java similarity index 95% rename from src/main/java/Duke.java rename to src/main/java/johan/Duke.java index 5d313334cc..9ad297f206 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/johan/Duke.java @@ -1,3 +1,5 @@ +package johan; + public class Duke { public static void main(String[] args) { String logo = " ____ _ \n" diff --git a/src/main/java/Johan.java b/src/main/java/johan/Johan.java similarity index 89% rename from src/main/java/Johan.java rename to src/main/java/johan/Johan.java index 0ac43f7dba..9da9b4584f 100644 --- a/src/main/java/Johan.java +++ b/src/main/java/johan/Johan.java @@ -1,3 +1,12 @@ +package johan; + +import johan.command.Command; +import johan.parser.Parser; +import johan.storage.Storage; +import johan.task.Task; +import johan.task.TaskList; +import johan.ui.Ui; + import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -64,20 +73,20 @@ public static LocalDate parseDate(String dateStr) { //import java.util.Scanner; //import java.util.ArrayList; // -//public class Johan { +//public class johan.Johan { // private static final String FILE_PATH = "./data/johan.txt"; -// private static ArrayList tasks = new ArrayList<>(); -// private static Storage storage; +// private static ArrayList tasks = new ArrayList<>(); +// private static johan.storage.Storage storage; // // public static void main(String[] args) { -// storage = new Storage(FILE_PATH); +// storage = new johan.storage.Storage(FILE_PATH); // tasks = storage.loadTasks(); // String input; // Scanner scanner = new Scanner(System.in); -// System.out.println("Hello! I'm Johan"); +// System.out.println("Hello! I'm johan.Johan"); // System.out.println("What can I do for you?"); -// // Task[] tasks = new Task[100]; -// // ArrayList tasks = new ArrayList<>(); +// // johan.task.Task[] tasks = new johan.task.Task[100]; +// // ArrayList tasks = new ArrayList<>(); // // int taskCount = 0; // // while (true) { @@ -115,13 +124,13 @@ public static LocalDate parseDate(String dateStr) { // System.out.println(" OOPS!!! The description of a todo cannot be empty."); // System.out.println("____________________________________________________________"); // } else { -// tasks.add(new Todo(description)); +// tasks.add(new johan.task.Todo(description)); // System.out.println("Got it. I've added this task:"); // System.out.println(tasks.get(tasks.size() - 1).toString()); // System.out.println("Now you have " + tasks.size() + " tasks in the list."); // storage.saveTasks(tasks); // } -// // tasks[taskCount++] = new Todo(description); +// // tasks[taskCount++] = new johan.task.Todo(description); // // System.out.println("Got it. I've added this task:"); // // System.out.println(tasks[taskCount - 1].toString()); // // System.out.println("Now you have " + taskCount + " tasks in the list."); @@ -138,7 +147,7 @@ public static LocalDate parseDate(String dateStr) { // try { // // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/MM/yyyy"); // // LocalDate dateTime = LocalDate.parse(by, inputFormatter); -// tasks.add(new Deadline(description, by)); +// tasks.add(new johan.task.Deadline(description, by)); // System.out.println("Got it. I've added this task:"); // System.out.println(tasks.get(tasks.size() - 1).toString()); // System.out.println("Now you have " + tasks.size() + " tasks in the list."); @@ -171,7 +180,7 @@ public static LocalDate parseDate(String dateStr) { // // LocalDate endDateTime = LocalDate.parse(endDate, inputFormatter); // LocalDate dateTime = parseDate(startDate); // LocalDate endDateTime = parseDate(startDate); -// tasks.add(new Event(description, startDate, endDate)); +// tasks.add(new johan.task.Event(description, startDate, endDate)); // System.out.println("Got it. I've added this task:"); // System.out.println(tasks.get(tasks.size() - 1).toString()); // System.out.println("Now you have " + tasks.size() + " tasks in the list."); @@ -185,7 +194,7 @@ public static LocalDate parseDate(String dateStr) { // String taskID = input.substring(7); // int id = Integer.parseInt(taskID); // if (id > 0 && id <= tasks.size()) { -// Task removedTask = tasks.remove(id - 1); +// johan.task.Task removedTask = tasks.remove(id - 1); // System.out.println("____________________________________________________________"); // System.out.println("Noted. I've removed this task:"); // System.out.println(removedTask.toString()); @@ -206,16 +215,16 @@ public static LocalDate parseDate(String dateStr) { // System.out.println("Tasks on " + targetDate.format(DateTimeFormatter.ofPattern("d/MM/yyyy")) + ":"); // boolean found = false; // for (int i = 0; i < tasks.size(); i++) { -// Task task = tasks.get(i); -// if (task instanceof Deadline) { -// LocalDate deadline = ((Deadline) task).getBy(); +// johan.task.Task task = tasks.get(i); +// if (task instanceof johan.task.Deadline) { +// LocalDate deadline = ((johan.task.Deadline) task).getBy(); // if (deadline != null && deadline.equals(targetDate)) { // System.out.println((i + 1) + "." + task.toString()); // found = true; // } -// } else if (task instanceof Event) { -// LocalDate startDate = ((Event) task).getStartDate(); -// LocalDate endDate = ((Event) task).getEndDate(); +// } else if (task instanceof johan.task.Event) { +// LocalDate startDate = ((johan.task.Event) task).getStartDate(); +// LocalDate endDate = ((johan.task.Event) task).getEndDate(); // if (startDate != null && endDate != null) { // if (!startDate.isAfter(targetDate) && !endDate.isBefore(targetDate)) { // System.out.println((i + 1) + "." + task.toString()); diff --git a/src/main/java/johan/command/AddCommand.java b/src/main/java/johan/command/AddCommand.java new file mode 100644 index 0000000000..468abf39a1 --- /dev/null +++ b/src/main/java/johan/command/AddCommand.java @@ -0,0 +1,20 @@ +package johan.command; + +import johan.storage.Storage; +import johan.task.*; +import johan.ui.Ui; + +public abstract class AddCommand extends Command { + protected final String description; + + public AddCommand(String description) { + this.description = description; + } + + @Override + public abstract void execute(TaskList tasks, Ui ui, Storage storage) throws Exception; +} + + + + diff --git a/src/main/java/Command.java b/src/main/java/johan/command/Command.java similarity index 63% rename from src/main/java/Command.java rename to src/main/java/johan/command/Command.java index ff3812d8aa..d5a15067ba 100644 --- a/src/main/java/Command.java +++ b/src/main/java/johan/command/Command.java @@ -1,3 +1,9 @@ +package johan.command; + +import johan.storage.Storage; +import johan.task.TaskList; +import johan.ui.Ui; + public abstract class Command { public abstract void execute(TaskList tasks, Ui ui, Storage storage) throws Exception; public boolean isExit() { diff --git a/src/main/java/johan/command/DeadlineCommand.java b/src/main/java/johan/command/DeadlineCommand.java new file mode 100644 index 0000000000..bfaddb4bc0 --- /dev/null +++ b/src/main/java/johan/command/DeadlineCommand.java @@ -0,0 +1,24 @@ +package johan.command; + +import johan.storage.Storage; +import johan.task.Deadline; +import johan.task.Task; +import johan.task.TaskList; +import johan.ui.Ui; + +public class DeadlineCommand extends AddCommand { + private final String by; + + public DeadlineCommand(String description, String by) { + super(description); + this.by = by; + } + + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + Task task = new Deadline(description, by); + tasks.addTask(task); + ui.showTaskAdded(task, tasks.size()); + storage.saveTasks(tasks.getTasks()); + } +} diff --git a/src/main/java/DeleteCommand.java b/src/main/java/johan/command/DeleteCommand.java similarity index 75% rename from src/main/java/DeleteCommand.java rename to src/main/java/johan/command/DeleteCommand.java index 096f0c9e45..3fac41aa44 100644 --- a/src/main/java/DeleteCommand.java +++ b/src/main/java/johan/command/DeleteCommand.java @@ -1,3 +1,10 @@ +package johan.command; + +import johan.storage.Storage; +import johan.task.Task; +import johan.task.TaskList; +import johan.ui.Ui; + public class DeleteCommand extends Command { private final int taskIndex; diff --git a/src/main/java/johan/command/EventCommand.java b/src/main/java/johan/command/EventCommand.java new file mode 100644 index 0000000000..0060c397e8 --- /dev/null +++ b/src/main/java/johan/command/EventCommand.java @@ -0,0 +1,26 @@ +package johan.command; + +import johan.storage.Storage; +import johan.task.Event; +import johan.task.Task; +import johan.task.TaskList; +import johan.ui.Ui; + +public class EventCommand extends AddCommand { + private final String from; + private final String to; + + public EventCommand(String description, String from, String to) { + super(description); + this.from = from; + this.to = to; + } + + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + Task task = new Event(description, from, to); + tasks.addTask(task); + ui.showTaskAdded(task, tasks.size()); + storage.saveTasks(tasks.getTasks()); + } +} diff --git a/src/main/java/ExitCommand.java b/src/main/java/johan/command/ExitCommand.java similarity index 71% rename from src/main/java/ExitCommand.java rename to src/main/java/johan/command/ExitCommand.java index ab0a90eed3..d08bdb0f50 100644 --- a/src/main/java/ExitCommand.java +++ b/src/main/java/johan/command/ExitCommand.java @@ -1,3 +1,9 @@ +package johan.command; + +import johan.storage.Storage; +import johan.task.TaskList; +import johan.ui.Ui; + public class ExitCommand extends Command { @Override public void execute(TaskList tasks, Ui ui, Storage storage) { diff --git a/src/main/java/ListCommand.java b/src/main/java/johan/command/ListCommand.java similarity index 61% rename from src/main/java/ListCommand.java rename to src/main/java/johan/command/ListCommand.java index 9474d70232..4656bde999 100644 --- a/src/main/java/ListCommand.java +++ b/src/main/java/johan/command/ListCommand.java @@ -1,3 +1,9 @@ +package johan.command; + +import johan.storage.Storage; +import johan.task.TaskList; +import johan.ui.Ui; + public class ListCommand extends Command { @Override public void execute(TaskList tasks, Ui ui, Storage storage) { diff --git a/src/main/java/MarkCommand.java b/src/main/java/johan/command/MarkCommand.java similarity index 83% rename from src/main/java/MarkCommand.java rename to src/main/java/johan/command/MarkCommand.java index 15e273865c..85ae1814d3 100644 --- a/src/main/java/MarkCommand.java +++ b/src/main/java/johan/command/MarkCommand.java @@ -1,3 +1,10 @@ +package johan.command; + +import johan.storage.Storage; +import johan.task.Task; +import johan.task.TaskList; +import johan.ui.Ui; + public class MarkCommand extends Command { private final int taskIndex; private final boolean markAsDone; diff --git a/src/main/java/OnDateCommand.java b/src/main/java/johan/command/OnDateCommand.java similarity index 74% rename from src/main/java/OnDateCommand.java rename to src/main/java/johan/command/OnDateCommand.java index fe7a48b355..0f84123640 100644 --- a/src/main/java/OnDateCommand.java +++ b/src/main/java/johan/command/OnDateCommand.java @@ -1,3 +1,10 @@ +package johan.command; + +import johan.Johan; +import johan.storage.Storage; +import johan.task.TaskList; +import johan.ui.Ui; + import java.time.LocalDate; public class OnDateCommand extends Command { diff --git a/src/main/java/johan/command/TodoCommand.java b/src/main/java/johan/command/TodoCommand.java new file mode 100644 index 0000000000..b8662249df --- /dev/null +++ b/src/main/java/johan/command/TodoCommand.java @@ -0,0 +1,23 @@ +package johan.command; + +import johan.command.AddCommand; +import johan.storage.Storage; +import johan.task.Task; +import johan.task.TaskList; +import johan.task.Todo; +import johan.ui.Ui; + +public class TodoCommand extends AddCommand { + public TodoCommand(String description) { + super(description); + } + + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + if (description.isEmpty()) throw new IllegalArgumentException("The description of a todo cannot be empty."); + Task task = new Todo(description); + tasks.addTask(task); + ui.showTaskAdded(task, tasks.size()); + storage.saveTasks(tasks.getTasks()); + } +} diff --git a/src/main/java/Parser.java b/src/main/java/johan/parser/Parser.java similarity index 83% rename from src/main/java/Parser.java rename to src/main/java/johan/parser/Parser.java index 8825c13736..273dc63a00 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/johan/parser/Parser.java @@ -1,3 +1,15 @@ +package johan.parser; + +import johan.command.Command; +import johan.command.ExitCommand; +import johan.command.ListCommand; +import johan.command.MarkCommand; +import johan.command.DeleteCommand; +import johan.command.OnDateCommand; +import johan.command.DeadlineCommand; +import johan.command.EventCommand; +import johan.command.TodoCommand; + public class Parser { public Command parse(String input) throws Exception { if (input.equals("bye")) { @@ -40,28 +52,28 @@ public Command parse(String input) throws Exception { } //import java.time.LocalDate; // -//public class Parser { -// public boolean parseAndExecute(String input, TaskList tasks, Ui ui, Storage storage) { +//public class johan.parser.Parser { +// public boolean parseAndExecute(String input, johan.task.TaskList tasks, johan.ui.Ui ui, johan.storage.Storage storage) { // if (input.equals("bye")) { // return false; // } else if (input.equals("list")) { // ui.showTaskList(tasks); // } else if (input.startsWith("mark ")) { // int id = Integer.parseInt(input.substring(5)) - 1; -// Task task = tasks.getTask(id); +// johan.task.Task task = tasks.getTask(id); // task.markAsDone(); // ui.showTaskMarked(task, true); // storage.saveTasks(tasks.getTasks()); // } else if (input.startsWith("unmark ")) { // int id = Integer.parseInt(input.substring(7)) - 1; -// Task task = tasks.getTask(id); +// johan.task.Task task = tasks.getTask(id); // task.markAsNotDone(); // ui.showTaskMarked(task, false); // storage.saveTasks(tasks.getTasks()); // } else if (input.startsWith("todo ")) { // String desc = input.substring(5).trim(); // if (desc.isEmpty()) throw new IllegalArgumentException("The description of a todo cannot be empty."); -// Task task = new Todo(desc); +// johan.task.Task task = new johan.task.Todo(desc); // tasks.addTask(task); // ui.showTaskAdded(task, tasks.size()); // storage.saveTasks(tasks.getTasks()); @@ -70,7 +82,7 @@ public Command parse(String input) throws Exception { // if (byIndex == -1) throw new IllegalArgumentException("Please specify a deadline with /by."); // String desc = input.substring(9, byIndex).trim(); // String by = input.substring(byIndex + 4).trim(); -// Task task = new Deadline(desc, by); +// johan.task.Task task = new johan.task.Deadline(desc, by); // tasks.addTask(task); // ui.showTaskAdded(task, tasks.size()); // storage.saveTasks(tasks.getTasks()); @@ -81,18 +93,18 @@ public Command parse(String input) throws Exception { // String desc = input.substring(6, fromIndex).trim(); // String from = input.substring(fromIndex + 6, toIndex).trim(); // String to = input.substring(toIndex + 4).trim(); -// Task task = new Event(desc, from, to); +// johan.task.Task task = new johan.task.Event(desc, from, to); // tasks.addTask(task); // ui.showTaskAdded(task, tasks.size()); // storage.saveTasks(tasks.getTasks()); // } else if (input.startsWith("delete ")) { // int id = Integer.parseInt(input.substring(7)) - 1; -// Task task = tasks.deleteTask(id); +// johan.task.Task task = tasks.deleteTask(id); // ui.showTaskDeleted(task, tasks.size()); // storage.saveTasks(tasks.getTasks()); // } else if (input.startsWith("on ")) { // String dateStr = input.substring(3).trim(); -// LocalDate targetDate = Johan.parseDate(dateStr); +// LocalDate targetDate = johan.Johan.parseDate(dateStr); // ui.showTasksOnDate(tasks, targetDate); // } else { // throw new IllegalArgumentException("I'm sorry, but I don't know what that means :-("); diff --git a/src/main/java/Storage.java b/src/main/java/johan/storage/Storage.java similarity index 94% rename from src/main/java/Storage.java rename to src/main/java/johan/storage/Storage.java index 922e1938b2..519e951d3c 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/johan/storage/Storage.java @@ -1,8 +1,14 @@ +package johan.storage; + +import johan.task.Deadline; +import johan.task.Event; +import johan.task.Task; +import johan.task.Todo; + import java.io.*; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; -import java.util.Date; public class Storage { private final String filePath; @@ -98,8 +104,8 @@ private String formatTaskForSaving(Task task) { return ""; } - String status = task.isDone ? "1" : "0"; - String description = task.description; + String status = task.isDone() ? "1" : "0"; + String description = task.getDescription(); if (task instanceof Deadline) { LocalDate deadline = ((Deadline) task).getBy(); diff --git a/src/main/java/Deadline.java b/src/main/java/johan/task/Deadline.java similarity index 98% rename from src/main/java/Deadline.java rename to src/main/java/johan/task/Deadline.java index 55a4970d3e..7d57efeeb3 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/johan/task/Deadline.java @@ -1,3 +1,5 @@ +package johan.task; + import java.time.LocalDate; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/Event.java b/src/main/java/johan/task/Event.java similarity index 98% rename from src/main/java/Event.java rename to src/main/java/johan/task/Event.java index cb1563de88..3c6ac43337 100644 --- a/src/main/java/Event.java +++ b/src/main/java/johan/task/Event.java @@ -1,6 +1,7 @@ +package johan.task; + import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.Date; public class Event extends Task { diff --git a/src/main/java/Task.java b/src/main/java/johan/task/Task.java similarity index 88% rename from src/main/java/Task.java rename to src/main/java/johan/task/Task.java index 51c6dda991..2b8160e0a3 100644 --- a/src/main/java/Task.java +++ b/src/main/java/johan/task/Task.java @@ -1,3 +1,5 @@ +package johan.task; + import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -39,6 +41,14 @@ public void setDeadline(LocalDate deadline) { this.deadline = deadline; } + public boolean isDone() { + return isDone; + } + + public String getDescription() { + return description; + } + @Override public String toString() { String baseString = "[" + this.getStatusIcon() + "] " + description; diff --git a/src/main/java/TaskList.java b/src/main/java/johan/task/TaskList.java similarity index 97% rename from src/main/java/TaskList.java rename to src/main/java/johan/task/TaskList.java index b2b0e89585..7a6016fecf 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/johan/task/TaskList.java @@ -1,3 +1,5 @@ +package johan.task; + import java.util.ArrayList; public class TaskList { diff --git a/src/main/java/Todo.java b/src/main/java/johan/task/Todo.java similarity index 90% rename from src/main/java/Todo.java rename to src/main/java/johan/task/Todo.java index 931cfd4f9e..e7fa7ac100 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/johan/task/Todo.java @@ -1,3 +1,5 @@ +package johan.task; + public class Todo extends Task { public Todo(String description) { diff --git a/src/main/java/Ui.java b/src/main/java/johan/ui/Ui.java similarity index 94% rename from src/main/java/Ui.java rename to src/main/java/johan/ui/Ui.java index a428c26a22..54f097b9b0 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/johan/ui/Ui.java @@ -1,3 +1,10 @@ +package johan.ui; + +import johan.task.Deadline; +import johan.task.Event; +import johan.task.Task; +import johan.task.TaskList; + import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.Scanner; @@ -6,7 +13,7 @@ public class Ui { private final Scanner scanner = new Scanner(System.in); public void showWelcome() { - System.out.println("Hello! I'm Johan"); + System.out.println("Hello! I'm johan.Johan"); System.out.println("What can I do for you?"); } diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 0873744649..79697abb68 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 johan.Duke < input.txt > ACTUAL.TXT REM compare the output to the expected output FC ACTUAL.TXT EXPECTED.TXT From d76bc3b01ddc3627cb93a2f5eab0c3d69700bba3 Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Tue, 25 Feb 2025 13:32:45 +0800 Subject: [PATCH 18/41] Gradle stuff --- build.gradle | 37 ++- config/checkstyle/checkstyle.xml | 434 +++++++++++++++++++++++++++++ config/checkstyle/suppressions.xml | 10 + data/johan.txt | 5 +- src/main/java/data/johan.txt | 3 + src/main/java/johan/Johan.java | 4 + src/test/java/johan/JohanTest.java | 16 ++ 7 files changed, 504 insertions(+), 5 deletions(-) create mode 100644 config/checkstyle/checkstyle.xml create mode 100644 config/checkstyle/suppressions.xml create mode 100644 src/main/java/data/johan.txt create mode 100644 src/test/java/johan/JohanTest.java diff --git a/build.gradle b/build.gradle index c361f9811e..18531f599a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,36 @@ plugins { id 'java' id 'application' + id 'checkstyle' id 'com.github.johnrengelman.shadow' version '7.1.2' } repositories { mavenCentral() + maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } } dependencies { testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0' testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0' + implementation group: 'com.joestelmach', name: 'natty', version: '0.13' + checkstyle('com.puppycrawl.tools:checkstyle:10.12.7') { + exclude group: 'com.google.collections', module: 'google-collections' + } + String javaFxVersion = '17.0.7' + + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac' + implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux' } test { @@ -28,14 +48,25 @@ test { } application { - mainClass.set("seedu.duke.Duke") + mainClass.set("johan.Johan") } shadowJar { - archiveBaseName = "duke" + archiveBaseName = "johan" archiveClassifier = null + archiveFileName = 'johan.jar' } -run{ +run { standardInput = System.in + enableAssertions = true +} + +test { + useJUnitPlatform() +} + +checkstyle { + toolVersion = '10.2' + configFile = file('config/checkstyle/checkstyle.xml') } diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 0000000000..a1f4a94ff0 --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,434 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml new file mode 100644 index 0000000000..135ea49ee0 --- /dev/null +++ b/config/checkstyle/suppressions.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/data/johan.txt b/data/johan.txt index b3904fcc83..ba24ed636b 100644 --- a/data/johan.txt +++ b/data/johan.txt @@ -1,2 +1,3 @@ -T | 0 | fly -T | 0 | walk +T | 0 | fly around +T | 0 | read book +D | 1 | finish project | 25/2/2025 diff --git a/src/main/java/data/johan.txt b/src/main/java/data/johan.txt new file mode 100644 index 0000000000..6ebc238016 --- /dev/null +++ b/src/main/java/data/johan.txt @@ -0,0 +1,3 @@ +D | 1 | readbook | 2/12/2019 +E | 0 | try clothes | 10/2/2019 | 1/3/2020 +T | 0 | read book diff --git a/src/main/java/johan/Johan.java b/src/main/java/johan/Johan.java index 9da9b4584f..aed8136389 100644 --- a/src/main/java/johan/Johan.java +++ b/src/main/java/johan/Johan.java @@ -11,6 +11,10 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; +// to run +// from repos dir >> javac -d bin src/main/java/johan/*.java src/main/java/johan/*/*.java +// java -cp bin johan.Johan + public class Johan { private final Storage storage; private final TaskList tasks; diff --git a/src/test/java/johan/JohanTest.java b/src/test/java/johan/JohanTest.java new file mode 100644 index 0000000000..bd577256a6 --- /dev/null +++ b/src/test/java/johan/JohanTest.java @@ -0,0 +1,16 @@ +//package johan; +// +//import org.junit.jupiter.api.Test; +//import static org.junit.jupiter.api.Assertions.assertEquals; +// +//class JohanTest { +// @Test +// public void dummyTest() { +// assertEquals(true, true); +// } +// +// @Test +// public void anotherDummyTest() { +// assertEquals(4, 4); +// } +//} From 58a2f75e4e9849f6694e520989096675c9847ece Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Tue, 25 Feb 2025 13:33:20 +0800 Subject: [PATCH 19/41] ignore files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e27aae3e5d..4da6229490 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ bin/ /text-ui-test/ACTUAL.TXT text-ui-test/EXPECTED-UNIX.TXT Johan.class +test_johan.txt From 77a07c11ce7ac1f97329e9a95df2956c45187aaa Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Tue, 25 Feb 2025 15:00:28 +0800 Subject: [PATCH 20/41] Add JUnit Tests for parser and ui --- build.gradle | 2 + src/test/java/johan/parser/ParserTest.java | 33 ++++++++++++++ src/test/java/johan/ui/UiTest.java | 53 ++++++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 src/test/java/johan/parser/ParserTest.java create mode 100644 src/test/java/johan/ui/UiTest.java diff --git a/build.gradle b/build.gradle index 18531f599a..60bd2292f4 100644 --- a/build.gradle +++ b/build.gradle @@ -69,4 +69,6 @@ test { checkstyle { toolVersion = '10.2' configFile = file('config/checkstyle/checkstyle.xml') + ignoreFailures = true + showViolations = true } diff --git a/src/test/java/johan/parser/ParserTest.java b/src/test/java/johan/parser/ParserTest.java new file mode 100644 index 0000000000..4f13e5e375 --- /dev/null +++ b/src/test/java/johan/parser/ParserTest.java @@ -0,0 +1,33 @@ +package johan.parser; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import johan.command.Command; +import johan.command.TodoCommand; + +import org.junit.jupiter.api.Test; + +/** + * Tests for the Parser class. + */ +public class ParserTest { + @Test + void parse_todoCommand_returnsTodoCommand() throws Exception { + Parser parser = new Parser(); + Command command = parser.parse("todo read book"); + assertTrue(command instanceof TodoCommand, "Should return TodoCommand for 'todo' input"); + } + + @Test + void parse_invalidInput_throwsException() { + Parser parser = new Parser(); + assertThrows(Exception.class, () -> parser.parse("invalid garbage"), "Should throw for invalid input"); + } + + @Test + void parse_emptyInput_throwsException() { + Parser parser = new Parser(); + assertThrows(Exception.class, () -> parser.parse(""), "Should throw for empty input"); + } +} diff --git a/src/test/java/johan/ui/UiTest.java b/src/test/java/johan/ui/UiTest.java new file mode 100644 index 0000000000..bcdb587629 --- /dev/null +++ b/src/test/java/johan/ui/UiTest.java @@ -0,0 +1,53 @@ +package johan.ui; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +/** + * Tests for the Ui class. + */ +public class UiTest { + private final ByteArrayOutputStream outContent = new ByteArrayOutputStream(); + private final PrintStream originalOut = System.out; + + @BeforeEach + void setUp() { + System.setOut(new PrintStream(outContent)); + } + + @AfterEach + void tearDown() { + System.setOut(originalOut); + } + + @Test + void readCommand_validInput_returnsInput() { + // Simulate user input + String input = "todo read book\n"; + System.setIn(new ByteArrayInputStream(input.getBytes())); + + Ui ui = new Ui(); + String result = ui.readCommand(); + + assertEquals("todo read book", result.trim(), "Should return trimmed user input"); + } + + @Test + void readCommand_emptyInput_returnsEmpty() { + // Simulate empty input + String input = "\n"; + System.setIn(new ByteArrayInputStream(input.getBytes())); + + Ui ui = new Ui(); + String result = ui.readCommand(); + + assertEquals("", result.trim(), "Should return empty string for empty input"); + } +} \ No newline at end of file From 4b94ab29181912f5bf98f208e07b63c997b24a9c Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Tue, 25 Feb 2025 15:34:06 +0800 Subject: [PATCH 21/41] no message --- data/johan.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/johan.txt b/data/johan.txt index ba24ed636b..e16eac78c3 100644 --- a/data/johan.txt +++ b/data/johan.txt @@ -1,3 +1,2 @@ -T | 0 | fly around T | 0 | read book -D | 1 | finish project | 25/2/2025 +E | 0 | project meeting | 12/2/2019 | 12/12/2022 From f3f3f4e96d22dc352fe45aa77625442aa8af8e0b Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Wed, 26 Feb 2025 13:54:34 +0800 Subject: [PATCH 22/41] Add JavaDoc Comments to johan folder --- src/main/java/johan/Duke.java | 3 + src/main/java/johan/Johan.java | 31 +++- src/main/java/johan/command/AddCommand.java | 18 ++- src/main/java/johan/command/Command.java | 17 ++- .../java/johan/command/DeadlineCommand.java | 14 ++ .../java/johan/command/DeleteCommand.java | 13 ++ src/main/java/johan/command/EventCommand.java | 15 ++ src/main/java/johan/command/ExitCommand.java | 13 ++ src/main/java/johan/command/ListCommand.java | 11 +- src/main/java/johan/command/MarkCommand.java | 16 +- .../java/johan/command/OnDateCommand.java | 13 ++ src/main/java/johan/command/TodoCommand.java | 19 ++- src/main/java/johan/parser/Parser.java | 144 ++++++++++-------- src/main/java/johan/storage/Storage.java | 45 +++++- src/main/java/johan/task/Deadline.java | 16 +- src/main/java/johan/task/Event.java | 32 +++- src/main/java/johan/task/Task.java | 65 ++++++-- src/main/java/johan/task/TaskList.java | 45 +++++- src/main/java/johan/task/Todo.java | 16 +- 19 files changed, 437 insertions(+), 109 deletions(-) diff --git a/src/main/java/johan/Duke.java b/src/main/java/johan/Duke.java index 9ad297f206..8177679984 100644 --- a/src/main/java/johan/Duke.java +++ b/src/main/java/johan/Duke.java @@ -1,5 +1,8 @@ package johan; +/** + * Main class for Duke Program + */ public class Duke { public static void main(String[] args) { String logo = " ____ _ \n" diff --git a/src/main/java/johan/Johan.java b/src/main/java/johan/Johan.java index aed8136389..5344ec9793 100644 --- a/src/main/java/johan/Johan.java +++ b/src/main/java/johan/Johan.java @@ -1,5 +1,9 @@ package johan; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; + import johan.command.Command; import johan.parser.Parser; import johan.storage.Storage; @@ -7,20 +11,25 @@ import johan.task.TaskList; import johan.ui.Ui; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; // to run // from repos dir >> javac -d bin src/main/java/johan/*.java src/main/java/johan/*/*.java // java -cp bin johan.Johan +/** + * Main class for the Johan task management application. + */ public class Johan { private final Storage storage; private final TaskList tasks; private final Ui ui; private final Parser parser; + /** + * Constructs a Johan instance with the specified storage file path. + * + * @param filePath The path to the storage file + */ public Johan(String filePath) { ui = new Ui(); storage = new Storage(filePath); @@ -36,6 +45,9 @@ public Johan(String filePath) { tasks = new TaskList(loadedTasks); } + /** + * Runs the main application loop, processing user commands until exit. + */ public void run() { ui.showWelcome(); boolean isExit = false; @@ -54,11 +66,20 @@ public void run() { } ui.showGoodbye(); } - + /** + * Main entry point for the application. + * + * @param args Command-line arguments (unused) + */ public static void main(String[] args) { new Johan("./data/johan.txt").run(); } - + /** + * Parses a date string into a LocalDate object. + * + * @param dateStr The date string to parse + * @return The parsed LocalDate + */ public static LocalDate parseDate(String dateStr) { try { DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("d/M/yyyy").withLocale(java.util.Locale.ENGLISH); diff --git a/src/main/java/johan/command/AddCommand.java b/src/main/java/johan/command/AddCommand.java index 468abf39a1..98b4a1ad44 100644 --- a/src/main/java/johan/command/AddCommand.java +++ b/src/main/java/johan/command/AddCommand.java @@ -1,16 +1,32 @@ package johan.command; import johan.storage.Storage; -import johan.task.*; +import johan.task.TaskList; import johan.ui.Ui; +/** + * Abstract base class for commands that add tasks to the task list. + */ public abstract class AddCommand extends Command { protected final String description; + /** + * Constructs an AddCommand with the specified task description. + * + * @param description the description of the task to be added + */ public AddCommand(String description) { this.description = description; } + /** + * Executes the command to add a task to the task list. + * + * @param tasks The task list to modify + * @param ui The user interface for displaying output + * @param storage The storage system for persisting tasks + * @throws Exception If an error occurs during exception + */ @Override public abstract void execute(TaskList tasks, Ui ui, Storage storage) throws Exception; } diff --git a/src/main/java/johan/command/Command.java b/src/main/java/johan/command/Command.java index d5a15067ba..2d404ccafb 100644 --- a/src/main/java/johan/command/Command.java +++ b/src/main/java/johan/command/Command.java @@ -4,9 +4,24 @@ import johan.task.TaskList; import johan.ui.Ui; +/** + * Abstract base class for all commands in the application + */ public abstract class Command { + /** + * Executes the command with the given task list, UI, and storage. + * @param tasks The task list to operate on + * @param ui The user interface for displaying output + * @param storage The storage system for persisting tasks + * @throws Exception If an error occurs during execution + */ public abstract void execute(TaskList tasks, Ui ui, Storage storage) throws Exception; + + /** + * Indicates whether this command should terminate the application. + * @return true if this is an exit command, false otherwise + */ public boolean isExit() { return false; } -} \ No newline at end of file +} diff --git a/src/main/java/johan/command/DeadlineCommand.java b/src/main/java/johan/command/DeadlineCommand.java index bfaddb4bc0..485743905c 100644 --- a/src/main/java/johan/command/DeadlineCommand.java +++ b/src/main/java/johan/command/DeadlineCommand.java @@ -6,14 +6,28 @@ import johan.task.TaskList; import johan.ui.Ui; +/** + * Command to add a deadline task to the task list. + */ public class DeadlineCommand extends AddCommand { private final String by; + /** + * Constructs a DeadlineCommand with the specified description and deadline. + * @param description The description of the deadline task + * @param by The deadline date/time string + */ public DeadlineCommand(String description, String by) { super(description); this.by = by; } + /** + * Adds a deadline task to the task list and updates storage. + * @param tasks The task list to modify + * @param ui The user interface for displaying output + * @param storage The storage system for persisting tasks + */ @Override public void execute(TaskList tasks, Ui ui, Storage storage) { Task task = new Deadline(description, by); diff --git a/src/main/java/johan/command/DeleteCommand.java b/src/main/java/johan/command/DeleteCommand.java index 3fac41aa44..ee570f7067 100644 --- a/src/main/java/johan/command/DeleteCommand.java +++ b/src/main/java/johan/command/DeleteCommand.java @@ -5,13 +5,26 @@ import johan.task.TaskList; import johan.ui.Ui; +/** + * Command to delete a task from the task list. + */ public class DeleteCommand extends Command { private final int taskIndex; + /** + * Constructs a DeleteCommand for the specified task index + * @param taskIndex The zero-based index of the task to delete + */ public DeleteCommand(int taskIndex) { this.taskIndex = taskIndex; } + /** + * Deletes the task at the specified index and updates storage. + * @param tasks The task list to operate on + * @param ui The user interface for displaying output + * @param storage The storage system for persisting tasks + */ @Override public void execute(TaskList tasks, Ui ui, Storage storage) { Task task = tasks.deleteTask(taskIndex); diff --git a/src/main/java/johan/command/EventCommand.java b/src/main/java/johan/command/EventCommand.java index 0060c397e8..9af3cb5ab4 100644 --- a/src/main/java/johan/command/EventCommand.java +++ b/src/main/java/johan/command/EventCommand.java @@ -6,16 +6,31 @@ import johan.task.TaskList; import johan.ui.Ui; +/** + * Command to add an event task to the task list. + */ public class EventCommand extends AddCommand { private final String from; private final String to; + /** + * Constructs an EventCommand with the specified description and time range. + * @param description The description of the event + * @param from The start date/time string + * @param to The end date/time string + */ public EventCommand(String description, String from, String to) { super(description); this.from = from; this.to = to; } + /** + * Adds an event task to the task list and updates storage. + * @param tasks The task list to modify + * @param ui The user interface for displaying output + * @param storage The storage system for persisting tasks + */ @Override public void execute(TaskList tasks, Ui ui, Storage storage) { Task task = new Event(description, from, to); diff --git a/src/main/java/johan/command/ExitCommand.java b/src/main/java/johan/command/ExitCommand.java index d08bdb0f50..516784fad3 100644 --- a/src/main/java/johan/command/ExitCommand.java +++ b/src/main/java/johan/command/ExitCommand.java @@ -4,12 +4,25 @@ import johan.task.TaskList; import johan.ui.Ui; +/** + * Command to exit the application. + */ public class ExitCommand extends Command { + /** + * Performs no action as termination is handled by isExit(). + * @param tasks The task list to operate on + * @param ui The user interface for displaying output + * @param storage The storage system for persisting tasks + */ @Override public void execute(TaskList tasks, Ui ui, Storage storage) { // No action needed; isExit() handles termination } + /** + * Indicates that this command terminates the application. + * @return true always + */ @Override public boolean isExit() { return true; diff --git a/src/main/java/johan/command/ListCommand.java b/src/main/java/johan/command/ListCommand.java index 4656bde999..c7dd5ca591 100644 --- a/src/main/java/johan/command/ListCommand.java +++ b/src/main/java/johan/command/ListCommand.java @@ -4,9 +4,18 @@ import johan.task.TaskList; import johan.ui.Ui; +/** + * Command to list all tasks in the task list. + */ public class ListCommand extends Command { + /** + * Displays all tasks in the task list. + * @param tasks The task list to display + * @param ui The user interface for displaying output + * @param storage The storage system for persisting tasks + */ @Override public void execute(TaskList tasks, Ui ui, Storage storage) { ui.showTaskList(tasks); } -} \ No newline at end of file +} diff --git a/src/main/java/johan/command/MarkCommand.java b/src/main/java/johan/command/MarkCommand.java index 85ae1814d3..6c31110aec 100644 --- a/src/main/java/johan/command/MarkCommand.java +++ b/src/main/java/johan/command/MarkCommand.java @@ -5,15 +5,29 @@ import johan.task.TaskList; import johan.ui.Ui; +/** + * Command to mark a task as done or not done. + */ public class MarkCommand extends Command { private final int taskIndex; private final boolean markAsDone; + /** + * Constructs a MarkCommand for the specified task and mark status. + * @param taskIndex The zero-based index of the task to mark + * @param markAsDone True to mark as done, false to mark as not done + */ public MarkCommand(int taskIndex, boolean markAsDone) { this.taskIndex = taskIndex; this.markAsDone = markAsDone; } + /** + * Marks the specified task and updates storage. + * @param tasks The task list to operate on + * @param ui The user interface for displaying output + * @param storage The storage system for persisting tasks + */ @Override public void execute(TaskList tasks, Ui ui, Storage storage) { Task task = tasks.getTask(taskIndex); @@ -26,4 +40,4 @@ public void execute(TaskList tasks, Ui ui, Storage storage) { } storage.saveTasks(tasks.getTasks()); } -} \ No newline at end of file +} diff --git a/src/main/java/johan/command/OnDateCommand.java b/src/main/java/johan/command/OnDateCommand.java index 0f84123640..1284b970bb 100644 --- a/src/main/java/johan/command/OnDateCommand.java +++ b/src/main/java/johan/command/OnDateCommand.java @@ -7,13 +7,26 @@ import java.time.LocalDate; +/** + * Command to show tasks occurring on a specific date. + */ public class OnDateCommand extends Command { private final LocalDate targetDate; + /** + * Constructs an OnDateCommand for the specified date string. + * @param dateStr The date string to parse + */ public OnDateCommand(String dateStr) { this.targetDate = Johan.parseDate(dateStr); } + /** + * Displays all tasks occurring on the target date. + * @param tasks The task list to operate on + * @param ui The user interface for displaying output + * @param storage The storage system for persisting tasks + */ @Override public void execute(TaskList tasks, Ui ui, Storage storage) { ui.showTasksOnDate(tasks, targetDate); diff --git a/src/main/java/johan/command/TodoCommand.java b/src/main/java/johan/command/TodoCommand.java index b8662249df..ccfa543932 100644 --- a/src/main/java/johan/command/TodoCommand.java +++ b/src/main/java/johan/command/TodoCommand.java @@ -1,20 +1,35 @@ package johan.command; -import johan.command.AddCommand; import johan.storage.Storage; import johan.task.Task; import johan.task.TaskList; import johan.task.Todo; import johan.ui.Ui; +/** + * Command to add a todo task to the task list + */ public class TodoCommand extends AddCommand { + /** + * Constructs a TodoCommand with the specified description. + * @param description The description of the todo task + */ public TodoCommand(String description) { super(description); } + /** + * Adds a todo task to the task list and updates storage. + * @param tasks The task list to modify + * @param ui The user interface for displaying output + * @param storage The storage system for persisting tasks + * @throws IllegalArgumentException If the description is empty + */ @Override public void execute(TaskList tasks, Ui ui, Storage storage) { - if (description.isEmpty()) throw new IllegalArgumentException("The description of a todo cannot be empty."); + if (description.isEmpty()) { + throw new IllegalArgumentException("The description of a todo cannot be empty."); + } Task task = new Todo(description); tasks.addTask(task); ui.showTaskAdded(task, tasks.size()); diff --git a/src/main/java/johan/parser/Parser.java b/src/main/java/johan/parser/Parser.java index 273dc63a00..aae82beb3f 100644 --- a/src/main/java/johan/parser/Parser.java +++ b/src/main/java/johan/parser/Parser.java @@ -10,7 +10,16 @@ import johan.command.EventCommand; import johan.command.TodoCommand; +/** + * Parses user input into executable commands. + */ public class Parser { + /** + * Parses the input string into a corresponding Command object. + * @param input The user input string to parse + * @return The corresponding Command object + * @throws Exception If the input cannot be parsed + */ public Command parse(String input) throws Exception { if (input.equals("bye")) { return new ExitCommand(); @@ -27,14 +36,18 @@ public Command parse(String input) throws Exception { return new TodoCommand(desc); } else if (input.startsWith("deadline ")) { int byIndex = input.indexOf("/by"); - if (byIndex == -1) throw new IllegalArgumentException("Please specify a deadline with /by."); + if (byIndex == -1) { + throw new IllegalArgumentException("Please specify a deadline with /by."); + } String desc = input.substring(9, byIndex).trim(); String by = input.substring(byIndex + 4).trim(); return new DeadlineCommand(desc, by); } else if (input.startsWith("event ")) { int fromIndex = input.indexOf("/from"); int toIndex = input.indexOf("/to"); - if (fromIndex == -1 || toIndex == -1) throw new IllegalArgumentException("Please specify /from and /to."); + if (fromIndex == -1 || toIndex == -1) { + throw new IllegalArgumentException("Please specify /from and /to."); + } String desc = input.substring(6, fromIndex).trim(); String from = input.substring(fromIndex + 6, toIndex).trim(); String to = input.substring(toIndex + 4).trim(); @@ -50,65 +63,68 @@ public Command parse(String input) throws Exception { } } } -//import java.time.LocalDate; -// -//public class johan.parser.Parser { -// public boolean parseAndExecute(String input, johan.task.TaskList tasks, johan.ui.Ui ui, johan.storage.Storage storage) { -// if (input.equals("bye")) { -// return false; -// } else if (input.equals("list")) { -// ui.showTaskList(tasks); -// } else if (input.startsWith("mark ")) { -// int id = Integer.parseInt(input.substring(5)) - 1; -// johan.task.Task task = tasks.getTask(id); -// task.markAsDone(); -// ui.showTaskMarked(task, true); -// storage.saveTasks(tasks.getTasks()); -// } else if (input.startsWith("unmark ")) { -// int id = Integer.parseInt(input.substring(7)) - 1; -// johan.task.Task task = tasks.getTask(id); -// task.markAsNotDone(); -// ui.showTaskMarked(task, false); -// storage.saveTasks(tasks.getTasks()); -// } else if (input.startsWith("todo ")) { -// String desc = input.substring(5).trim(); -// if (desc.isEmpty()) throw new IllegalArgumentException("The description of a todo cannot be empty."); -// johan.task.Task task = new johan.task.Todo(desc); -// tasks.addTask(task); -// ui.showTaskAdded(task, tasks.size()); -// storage.saveTasks(tasks.getTasks()); -// } else if (input.startsWith("deadline ")) { -// int byIndex = input.indexOf("/by"); -// if (byIndex == -1) throw new IllegalArgumentException("Please specify a deadline with /by."); -// String desc = input.substring(9, byIndex).trim(); -// String by = input.substring(byIndex + 4).trim(); -// johan.task.Task task = new johan.task.Deadline(desc, by); -// tasks.addTask(task); -// ui.showTaskAdded(task, tasks.size()); -// storage.saveTasks(tasks.getTasks()); -// } else if (input.startsWith("event ")) { -// int fromIndex = input.indexOf("/from"); -// int toIndex = input.indexOf("/to"); -// if (fromIndex == -1 || toIndex == -1) throw new IllegalArgumentException("Please specify /from and /to."); -// String desc = input.substring(6, fromIndex).trim(); -// String from = input.substring(fromIndex + 6, toIndex).trim(); -// String to = input.substring(toIndex + 4).trim(); -// johan.task.Task task = new johan.task.Event(desc, from, to); -// tasks.addTask(task); -// ui.showTaskAdded(task, tasks.size()); -// storage.saveTasks(tasks.getTasks()); -// } else if (input.startsWith("delete ")) { -// int id = Integer.parseInt(input.substring(7)) - 1; -// johan.task.Task task = tasks.deleteTask(id); -// ui.showTaskDeleted(task, tasks.size()); -// storage.saveTasks(tasks.getTasks()); -// } else if (input.startsWith("on ")) { -// String dateStr = input.substring(3).trim(); -// LocalDate targetDate = johan.Johan.parseDate(dateStr); -// ui.showTasksOnDate(tasks, targetDate); -// } else { -// throw new IllegalArgumentException("I'm sorry, but I don't know what that means :-("); -// } -// return true; -// } -//} \ No newline at end of file + +/* +import java.time.LocalDate; + +public class johan.parser.Parser { + public boolean parseAndExecute(String input, johan.task.TaskList tasks, johan.ui.Ui ui, johan.storage.Storage storage) { + if (input.equals("bye")) { + return false; + } else if (input.equals("list")) { + ui.showTaskList(tasks); + } else if (input.startsWith("mark ")) { + int id = Integer.parseInt(input.substring(5)) - 1; + johan.task.Task task = tasks.getTask(id); + task.markAsDone(); + ui.showTaskMarked(task, true); + storage.saveTasks(tasks.getTasks()); + } else if (input.startsWith("unmark ")) { + int id = Integer.parseInt(input.substring(7)) - 1; + johan.task.Task task = tasks.getTask(id); + task.markAsNotDone(); + ui.showTaskMarked(task, false); + storage.saveTasks(tasks.getTasks()); + } else if (input.startsWith("todo ")) { + String desc = input.substring(5).trim(); + if (desc.isEmpty()) throw new IllegalArgumentException("The description of a todo cannot be empty."); + johan.task.Task task = new johan.task.Todo(desc); + tasks.addTask(task); + ui.showTaskAdded(task, tasks.size()); + storage.saveTasks(tasks.getTasks()); + } else if (input.startsWith("deadline ")) { + int byIndex = input.indexOf("/by"); + if (byIndex == -1) throw new IllegalArgumentException("Please specify a deadline with /by."); + String desc = input.substring(9, byIndex).trim(); + String by = input.substring(byIndex + 4).trim(); + johan.task.Task task = new johan.task.Deadline(desc, by); + tasks.addTask(task); + ui.showTaskAdded(task, tasks.size()); + storage.saveTasks(tasks.getTasks()); + } else if (input.startsWith("event ")) { + int fromIndex = input.indexOf("/from"); + int toIndex = input.indexOf("/to"); + if (fromIndex == -1 || toIndex == -1) throw new IllegalArgumentException("Please specify /from and /to."); + String desc = input.substring(6, fromIndex).trim(); + String from = input.substring(fromIndex + 6, toIndex).trim(); + String to = input.substring(toIndex + 4).trim(); + johan.task.Task task = new johan.task.Event(desc, from, to); + tasks.addTask(task); + ui.showTaskAdded(task, tasks.size()); + storage.saveTasks(tasks.getTasks()); + } else if (input.startsWith("delete ")) { + int id = Integer.parseInt(input.substring(7)) - 1; + johan.task.Task task = tasks.deleteTask(id); + ui.showTaskDeleted(task, tasks.size()); + storage.saveTasks(tasks.getTasks()); + } else if (input.startsWith("on ")) { + String dateStr = input.substring(3).trim(); + LocalDate targetDate = johan.Johan.parseDate(dateStr); + ui.showTasksOnDate(tasks, targetDate); + } else { + throw new IllegalArgumentException("I'm sorry, but I don't know what that means :-("); + } + return true; + } +} +*/ diff --git a/src/main/java/johan/storage/Storage.java b/src/main/java/johan/storage/Storage.java index 519e951d3c..885c67d6f6 100644 --- a/src/main/java/johan/storage/Storage.java +++ b/src/main/java/johan/storage/Storage.java @@ -1,22 +1,39 @@ package johan.storage; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; + import johan.task.Deadline; import johan.task.Event; import johan.task.Task; import johan.task.Todo; -import java.io.*; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; +/** + * Handles storage and retrieval of tasks to/from a file + */ public class Storage { private final String filePath; + /** + * Constructs a Storage instance with the specified file path. + * @param filePath The path to the storage file + */ public Storage(String filePath) { this.filePath = filePath; } + /** + * Saves the task list to the storage file. + * @param tasks The list of tasks to save + */ public void saveTasks(ArrayList tasks) { File file = new File(filePath); File directory = new File(file.getParent()); @@ -35,6 +52,10 @@ public void saveTasks(ArrayList tasks) { } } + /** + * Loads tasks from the storage files. + * @return The list of loaded tasks + */ public ArrayList loadTasks() { ArrayList tasks = new ArrayList<>(); File file = new File(filePath); @@ -49,7 +70,9 @@ public ArrayList loadTasks() { // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/M/yyyy HHmm"); while ((line = reader.readLine()) != null) { String[] parts = line.split(" \\| "); - if (parts.length < 3) continue; + if (parts.length < 3) { + continue; + } String type = parts[0]; boolean isDone = parts[1].equals("1"); @@ -92,6 +115,11 @@ public ArrayList loadTasks() { return tasks; } + /** + * Formats a task for saving to the file. + * @param task The task to format + * @return The formatted string representation + */ private String formatTaskForSaving(Task task) { String type; if (task instanceof Todo) { @@ -109,11 +137,14 @@ private String formatTaskForSaving(Task task) { if (task instanceof Deadline) { LocalDate deadline = ((Deadline) task).getBy(); - return type + " | " + status + " | " + description + " | " + deadline.format(DateTimeFormatter.ofPattern("d/M/yyyy")); + return type + " | " + status + " | " + description + " | " + + deadline.format(DateTimeFormatter.ofPattern("d/M/yyyy")); } else if (task instanceof Event) { LocalDate startDate = ((Event) task).getStartDate(); LocalDate endDate = ((Event) task).getEndDate(); - return type + " | " + status + " | " + description + " | " + startDate.format(DateTimeFormatter.ofPattern("d/M/yyyy")) + " | " + endDate.format(DateTimeFormatter.ofPattern("d/M/yyyy")); + return type + " | " + status + " | " + description + " | " + + startDate.format(DateTimeFormatter.ofPattern("d/M/yyyy")) + " | " + + endDate.format(DateTimeFormatter.ofPattern("d/M/yyyy")); } else { return type + " | " + status + " | " + description; } diff --git a/src/main/java/johan/task/Deadline.java b/src/main/java/johan/task/Deadline.java index 7d57efeeb3..6ac661e9a9 100644 --- a/src/main/java/johan/task/Deadline.java +++ b/src/main/java/johan/task/Deadline.java @@ -3,10 +3,18 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; +/** + * Represents a task with a deadline. + */ public class Deadline extends Task { protected LocalDate by; + /** + * Constructs a Deadline task with the specified description and deadline. + * @param description The task description + * @param by The deadline date string + */ public Deadline(String description, String by) { super(description); // this.by = by; @@ -14,12 +22,18 @@ public Deadline(String description, String by) { this.by = parseDate(by); } + /** + * Parses a date string into a LocalDate object. + * @param dateString The date string to parse + * @return The parsed LocalDate + */ private static LocalDate parseDate(String dateString) { try { DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("d/M/yyyy").withLocale(java.util.Locale.ENGLISH); return LocalDate.parse(dateString.trim(), formatter1); } catch (Exception e) { - DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd").withLocale(java.util.Locale.ENGLISH); + DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd") + .withLocale(java.util.Locale.ENGLISH); return LocalDate.parse(dateString.trim(), formatter2); } } diff --git a/src/main/java/johan/task/Event.java b/src/main/java/johan/task/Event.java index 3c6ac43337..8f4c983041 100644 --- a/src/main/java/johan/task/Event.java +++ b/src/main/java/johan/task/Event.java @@ -3,11 +3,20 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; +/** + * Represents a task with a start and end date/time. + */ public class Event extends Task { protected LocalDate startDate; protected LocalDate endDate; + /** + * Constructs an Event task with the specified description and time range. + * @param description The task description + * @param startDate The start date string + * @param endDate The end date string + */ public Event(String description, String startDate, String endDate) { super(description); // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/M/yyyy"); @@ -17,6 +26,11 @@ public Event(String description, String startDate, String endDate) { this.endDate = parseDate(endDate); } + /** + * Parses a date string into a LocalDate object. + * @param dateString The date string to parse + * @return The parsed LocalDate + */ private static LocalDate parseDate(String dateString) { try { DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("d/M/yyyy").withLocale(java.util.Locale.ENGLISH); @@ -27,17 +41,29 @@ private static LocalDate parseDate(String dateString) { } } + /** + * Returns a string representation of the event task. + * @return The formatted string + */ @Override public String toString() { - return "[E]" + super.toString() + - " (from: " + startDate.format(DateTimeFormatter.ofPattern("MMM dd yyyy")) + - " to: " + endDate.format(DateTimeFormatter.ofPattern("MMM dd yyyy")) + ")"; + return "[E]" + super.toString() + + " (from: " + startDate.format(DateTimeFormatter.ofPattern("MMM dd yyyy")) + + " to: " + endDate.format(DateTimeFormatter.ofPattern("MMM dd yyyy")) + ")"; } + /** + * Gets the start date of the event. + * @return The start date as a LocalDate + */ public LocalDate getStartDate() { return startDate; } + /** + * Gets the end date of the event. + * @return The end date as a LocalDate + */ public LocalDate getEndDate() { return endDate; } diff --git a/src/main/java/johan/task/Task.java b/src/main/java/johan/task/Task.java index 2b8160e0a3..3e11582a26 100644 --- a/src/main/java/johan/task/Task.java +++ b/src/main/java/johan/task/Task.java @@ -3,52 +3,91 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; +/** + * Abstract base class representing a task in the application. + */ public abstract class Task { + private static int nextTaskID = 1; protected String description; protected boolean isDone; - private static int nextTaskID = 1; - private final int ID; protected LocalDate deadline; - + private final int id; + /** + * Constructs a Task with the specified description. + * @param description The task description + */ public Task(String description) { this.description = description; this.isDone = false; - this.ID = nextTaskID++; + this.id = nextTaskID++; this.deadline = null; } + /** + * Gets the unique ID of the task as a string. + * + * @return The task ID + */ public String getID() { - return Integer.toString(this.ID); + return Integer.toString(this.id); } - + /** + * Gets the status icon representing whether the task is done. + * + * @return "X" if done, " " if not done + */ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } - + /** + * Marks the task as completed. + */ public void markAsDone() { isDone = true; } - + /** + * Marks the task as not completed. + */ public void markAsNotDone() { isDone = false; } - + /** + * Gets the deadline of the task, if any. + * + * @return The deadline date, or null if not set + */ public LocalDate getDeadline() { return deadline; } - + /** + * Sets the deadline for the task. + * + * @param deadline The deadline date to set + */ public void setDeadline(LocalDate deadline) { this.deadline = deadline; } - + /** + * Checks if the task is marked as done. + * + * @return true if the task is done, false otherwise + */ public boolean isDone() { return isDone; } - + /** + * Gets the description of the task. + * + * @return The task description + */ public String getDescription() { return description; } - + /** + * Returns a string representation of the task. + * + * @return The formatted string including status and deadline if present + */ @Override public String toString() { String baseString = "[" + this.getStatusIcon() + "] " + description; diff --git a/src/main/java/johan/task/TaskList.java b/src/main/java/johan/task/TaskList.java index 7a6016fecf..a156b84ec0 100644 --- a/src/main/java/johan/task/TaskList.java +++ b/src/main/java/johan/task/TaskList.java @@ -2,36 +2,67 @@ import java.util.ArrayList; +/** + * Manages a list of tasks. + */ public class TaskList { private final ArrayList tasks; - + /** + * Constructs a TaskList with the specified initial tasks. + * + * @param tasks The initial list of tasks + */ public TaskList(ArrayList tasks) { this.tasks = tasks; } - + /** + * Adds a task to the list. + * + * @param task The task to add + */ public void addTask(Task task) { tasks.add(task); } - + /** + * Deletes a task at the specified index. + * + * @param index The zero-based index of the task to delete + * @return The deleted task + * @throws IllegalArgumentException If the index is invalid + */ public Task deleteTask(int index) { if (index >= 0 && index < tasks.size()) { return tasks.remove(index); } throw new IllegalArgumentException("Invalid task index."); } - + /** + * Gets the task at the specified index. + * + * @param index The zero-based index of the task to retrieve + * @return The task at the specified index + * @throws IllegalArgumentException If the index is invalid + */ public Task getTask(int index) { if (index >= 0 && index < tasks.size()) { return tasks.get(index); } throw new IllegalArgumentException("Invalid task index."); } - + /** + * Gets the complete list of tasks. + * + * @return The ArrayList containing all tasks + */ public ArrayList getTasks() { return tasks; } - + /** + * Gets the number of tasks in the list. + * + * @return The size of the task list + */ public int size() { return tasks.size(); } -} \ No newline at end of file +} diff --git a/src/main/java/johan/task/Todo.java b/src/main/java/johan/task/Todo.java index e7fa7ac100..5240865f85 100644 --- a/src/main/java/johan/task/Todo.java +++ b/src/main/java/johan/task/Todo.java @@ -1,11 +1,21 @@ package johan.task; - +/** + * Represents a simple todo task without a deadline. + */ public class Todo extends Task { - + /** + * Constructs a Todo task with the specified description. + * + * @param description The task description + */ public Todo(String description) { super(description); } - + /** + * Returns a string representation of the todo task. + * + * @return The formatted string with "[T]" prefix + */ @Override public String toString() { return "[T]" + super.toString(); From 63ae7b153e0b07fcaa7bef9c7d642b06d812eb97 Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Wed, 26 Feb 2025 14:15:25 +0800 Subject: [PATCH 23/41] fixed coding standard --- data/johan.txt | 2 - src/main/java/johan/Johan.java | 201 +----------------- .../java/johan/command/DeleteCommand.java | 2 +- src/main/java/johan/command/ExitCommand.java | 2 +- .../java/johan/command/OnDateCommand.java | 4 +- src/main/java/johan/parser/Parser.java | 71 +------ src/main/java/johan/task/Event.java | 6 +- src/main/java/johan/ui/Ui.java | 74 +++++-- src/test/java/johan/parser/ParserTest.java | 4 +- src/test/java/johan/ui/UiTest.java | 6 +- 10 files changed, 78 insertions(+), 294 deletions(-) diff --git a/data/johan.txt b/data/johan.txt index e16eac78c3..e69de29bb2 100644 --- a/data/johan.txt +++ b/data/johan.txt @@ -1,2 +0,0 @@ -T | 0 | read book -E | 0 | project meeting | 12/2/2019 | 12/12/2022 diff --git a/src/main/java/johan/Johan.java b/src/main/java/johan/Johan.java index 5344ec9793..156c8fd1bd 100644 --- a/src/main/java/johan/Johan.java +++ b/src/main/java/johan/Johan.java @@ -82,206 +82,13 @@ public static void main(String[] args) { */ public static LocalDate parseDate(String dateStr) { try { - DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("d/M/yyyy").withLocale(java.util.Locale.ENGLISH); + DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("d/M/yyyy") + .withLocale(java.util.Locale.ENGLISH); return LocalDate.parse(dateStr.trim(), formatter1); } catch (Exception e) { - DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd").withLocale(java.util.Locale.ENGLISH); + DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd") + .withLocale(java.util.Locale.ENGLISH); return LocalDate.parse(dateStr.trim(), formatter2); } } } - -//import java.time.LocalDate; -//import java.time.LocalDate; -//import java.time.format.DateTimeFormatter; -//import java.util.Date; -//import java.util.Scanner; -//import java.util.ArrayList; -// -//public class johan.Johan { -// private static final String FILE_PATH = "./data/johan.txt"; -// private static ArrayList tasks = new ArrayList<>(); -// private static johan.storage.Storage storage; -// -// public static void main(String[] args) { -// storage = new johan.storage.Storage(FILE_PATH); -// tasks = storage.loadTasks(); -// String input; -// Scanner scanner = new Scanner(System.in); -// System.out.println("Hello! I'm johan.Johan"); -// System.out.println("What can I do for you?"); -// // johan.task.Task[] tasks = new johan.task.Task[100]; -// // ArrayList tasks = new ArrayList<>(); -// // int taskCount = 0; -// -// while (true) { -// input = scanner.nextLine().toLowerCase().trim(); -// // String[] words = input.split(""); -// if (input.equals("bye")) { -// break; -// } else if (input.equals("list")) { -// System.out.println("Here are the tasks in your list:"); -// for (int i = 0; i < tasks.size(); i++) { -// System.out.println((i + 1) + "." + tasks.get(i).toString()); -// } -// } else if (input.startsWith("mark ")) { -// String taskID = input.substring(5); -// int id = Integer.parseInt(taskID); -// if (id > 0 && id <= tasks.size()) { -// tasks.get(id - 1).markAsDone(); -// System.out.println("Nice! I've marked this task as done:"); -// System.out.println(tasks.get(id - 1).toString()); -// storage.saveTasks(tasks); -// } -// } else if (input.startsWith("unmark ")) { -// String taskID = input.substring(7); -// int id = Integer.parseInt(taskID); -// if (id > 0 && id <= tasks.size()) { -// tasks.get(id - 1).markAsNotDone(); -// System.out.println("OK, I've marked this task as not done yet:"); -// System.out.println(tasks.get(id - 1).toString()); -// storage.saveTasks(tasks); -// } -// } else if (input.startsWith("todo")) { -// String description = input.substring(4).trim(); -// if (description.isEmpty()) { -// System.out.println("____________________________________________________________"); -// System.out.println(" OOPS!!! The description of a todo cannot be empty."); -// System.out.println("____________________________________________________________"); -// } else { -// tasks.add(new johan.task.Todo(description)); -// System.out.println("Got it. I've added this task:"); -// System.out.println(tasks.get(tasks.size() - 1).toString()); -// System.out.println("Now you have " + tasks.size() + " tasks in the list."); -// storage.saveTasks(tasks); -// } -// // tasks[taskCount++] = new johan.task.Todo(description); -// // System.out.println("Got it. I've added this task:"); -// // System.out.println(tasks[taskCount - 1].toString()); -// // System.out.println("Now you have " + taskCount + " tasks in the list."); -// } else if (input.startsWith("deadline")) { -// int byIndex = input.indexOf("/by"); -// if (byIndex == -1) { -// System.out.println("____________________________________________________________"); -// System.out.println(" OOPS!!! Please specify a deadline with /by in d/M/yyyy format (e.g., 2/12/2019)."); -// System.out.println("____________________________________________________________"); -// continue; -// } -// String description = input.substring(9, byIndex).trim(); -// String by = input.substring(byIndex + 4); -// try { -// // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/MM/yyyy"); -// // LocalDate dateTime = LocalDate.parse(by, inputFormatter); -// tasks.add(new johan.task.Deadline(description, by)); -// System.out.println("Got it. I've added this task:"); -// System.out.println(tasks.get(tasks.size() - 1).toString()); -// System.out.println("Now you have " + tasks.size() + " tasks in the list."); -// storage.saveTasks(tasks); -// } catch (Exception e) { -// System.out.println("____________________________________________________________"); -// System.out.println(" OOPS!!! Invalid date format. Use d/M/yyyy (e.g., 2/12/2019)."); -// System.out.println("____________________________________________________________"); -// } -// // by = by.substring(0, 1).toUpperCase() + by.substring(1); -// } else if (input.startsWith("event")) { -// int fromIndex = input.indexOf("/from"); -// int toIndex = input.indexOf("/to"); -// if (fromIndex == -1 && toIndex == -1) { -// System.out.println("____________________________________________________________"); -// System.out.println(" OOPS!!! Please specify start and end times with /from and /to in d/M/yyyy format (e.g., 2/12/2019)."); -// System.out.println("____________________________________________________________"); -// continue; -// } -// String description = input.substring(6, fromIndex).trim(); -// String startDate = input.substring(fromIndex + 6, toIndex).trim(); -// // startDate = startDate.substring(0, 1).toUpperCase() + startDate.substring(1); -// // String endDate = input.substring(toIndex + 3).trim(); -// String endDate = input.substring(toIndex + 4).trim(); -// // endDate = endDate.substring(0, 1).toUpperCase() + endDate.substring(1); -// try { -// // DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("d/MM/yyyy"); -// // System.out.println("Parsing date: " + startDate + " to " + endDate); // Debug -// // LocalDate dateTime = LocalDate.parse(startDate, inputFormatter); -// // LocalDate endDateTime = LocalDate.parse(endDate, inputFormatter); -// LocalDate dateTime = parseDate(startDate); -// LocalDate endDateTime = parseDate(startDate); -// tasks.add(new johan.task.Event(description, startDate, endDate)); -// System.out.println("Got it. I've added this task:"); -// System.out.println(tasks.get(tasks.size() - 1).toString()); -// System.out.println("Now you have " + tasks.size() + " tasks in the list."); -// storage.saveTasks(tasks); -// } catch (Exception e) { -// System.out.println("____________________________________________________________"); -// System.out.println(" OOPS!!! Invalid date format. Use d/M/yyyy (e.g., 2/12/2019)."); -// System.out.println("____________________________________________________________"); -// } -// } else if (input.startsWith("delete")) { -// String taskID = input.substring(7); -// int id = Integer.parseInt(taskID); -// if (id > 0 && id <= tasks.size()) { -// johan.task.Task removedTask = tasks.remove(id - 1); -// System.out.println("____________________________________________________________"); -// System.out.println("Noted. I've removed this task:"); -// System.out.println(removedTask.toString()); -// System.out.println("Now you have " + tasks.size() + " tasks in the list."); -// System.out.println("____________________________________________________________"); -// storage.saveTasks(tasks); -// } else { -// System.out.println("____________________________________________________________"); -// System.out.println(" OOPS!!! The task ID is invalid."); -// System.out.println("____________________________________________________________"); -// } -// } else if (input.startsWith("on ")) { // fix this, showing everything despite not being on the right date -// String dateStr = input.substring(3).trim(); -// try { -// // DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("d/MM/yyyy"); -// // LocalDate targetDate = LocalDate.parse(dateStr, dateFormatter); -// LocalDate targetDate = parseDate(dateStr); -// System.out.println("Tasks on " + targetDate.format(DateTimeFormatter.ofPattern("d/MM/yyyy")) + ":"); -// boolean found = false; -// for (int i = 0; i < tasks.size(); i++) { -// johan.task.Task task = tasks.get(i); -// if (task instanceof johan.task.Deadline) { -// LocalDate deadline = ((johan.task.Deadline) task).getBy(); -// if (deadline != null && deadline.equals(targetDate)) { -// System.out.println((i + 1) + "." + task.toString()); -// found = true; -// } -// } else if (task instanceof johan.task.Event) { -// LocalDate startDate = ((johan.task.Event) task).getStartDate(); -// LocalDate endDate = ((johan.task.Event) task).getEndDate(); -// if (startDate != null && endDate != null) { -// if (!startDate.isAfter(targetDate) && !endDate.isBefore(targetDate)) { -// System.out.println((i + 1) + "." + task.toString()); -// found = true; -// } -// } -// } -// } -// if (!found) { -// System.out.println("No tasks found on this date."); -// } -// } catch (Exception e) { -// System.out.println("____________________________________________________________"); -// System.out.println(" OOPS!!! Invalid date format. Use d/M/yyyy (e.g., 2/12/2019)."); -// System.out.println("____________________________________________________________"); -// } -// } else { -// System.out.println("____________________________________________________________"); -// System.out.println(" OOPS!!! I'm sorry, but I don't know what that means :-("); -// System.out.println("____________________________________________________________"); -// } -// } -// System.out.println("Bye. Hope to see you again soon!"); -// } -// -// private static LocalDate parseDate(String dateStr) { -// try { -// DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("d/M/yyyy").withLocale(java.util.Locale.ENGLISH); -// return LocalDate.parse(dateStr.trim(), formatter1); -// } catch (Exception e) { -// DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd").withLocale(java.util.Locale.ENGLISH); -// return LocalDate.parse(dateStr.trim(), formatter2); -// } -// } -//} diff --git a/src/main/java/johan/command/DeleteCommand.java b/src/main/java/johan/command/DeleteCommand.java index ee570f7067..b18ab67a45 100644 --- a/src/main/java/johan/command/DeleteCommand.java +++ b/src/main/java/johan/command/DeleteCommand.java @@ -31,4 +31,4 @@ public void execute(TaskList tasks, Ui ui, Storage storage) { ui.showTaskDeleted(task, tasks.size()); storage.saveTasks(tasks.getTasks()); } -} \ No newline at end of file +} diff --git a/src/main/java/johan/command/ExitCommand.java b/src/main/java/johan/command/ExitCommand.java index 516784fad3..feac4bcc5e 100644 --- a/src/main/java/johan/command/ExitCommand.java +++ b/src/main/java/johan/command/ExitCommand.java @@ -27,4 +27,4 @@ public void execute(TaskList tasks, Ui ui, Storage storage) { public boolean isExit() { return true; } -} \ No newline at end of file +} diff --git a/src/main/java/johan/command/OnDateCommand.java b/src/main/java/johan/command/OnDateCommand.java index 1284b970bb..a63a1ee10f 100644 --- a/src/main/java/johan/command/OnDateCommand.java +++ b/src/main/java/johan/command/OnDateCommand.java @@ -1,12 +1,12 @@ package johan.command; +import java.time.LocalDate; + import johan.Johan; import johan.storage.Storage; import johan.task.TaskList; import johan.ui.Ui; -import java.time.LocalDate; - /** * Command to show tasks occurring on a specific date. */ diff --git a/src/main/java/johan/parser/Parser.java b/src/main/java/johan/parser/Parser.java index aae82beb3f..cad45d4f5d 100644 --- a/src/main/java/johan/parser/Parser.java +++ b/src/main/java/johan/parser/Parser.java @@ -1,13 +1,13 @@ package johan.parser; import johan.command.Command; +import johan.command.DeadlineCommand; +import johan.command.DeleteCommand; +import johan.command.EventCommand; import johan.command.ExitCommand; import johan.command.ListCommand; import johan.command.MarkCommand; -import johan.command.DeleteCommand; import johan.command.OnDateCommand; -import johan.command.DeadlineCommand; -import johan.command.EventCommand; import johan.command.TodoCommand; /** @@ -63,68 +63,3 @@ public Command parse(String input) throws Exception { } } } - -/* -import java.time.LocalDate; - -public class johan.parser.Parser { - public boolean parseAndExecute(String input, johan.task.TaskList tasks, johan.ui.Ui ui, johan.storage.Storage storage) { - if (input.equals("bye")) { - return false; - } else if (input.equals("list")) { - ui.showTaskList(tasks); - } else if (input.startsWith("mark ")) { - int id = Integer.parseInt(input.substring(5)) - 1; - johan.task.Task task = tasks.getTask(id); - task.markAsDone(); - ui.showTaskMarked(task, true); - storage.saveTasks(tasks.getTasks()); - } else if (input.startsWith("unmark ")) { - int id = Integer.parseInt(input.substring(7)) - 1; - johan.task.Task task = tasks.getTask(id); - task.markAsNotDone(); - ui.showTaskMarked(task, false); - storage.saveTasks(tasks.getTasks()); - } else if (input.startsWith("todo ")) { - String desc = input.substring(5).trim(); - if (desc.isEmpty()) throw new IllegalArgumentException("The description of a todo cannot be empty."); - johan.task.Task task = new johan.task.Todo(desc); - tasks.addTask(task); - ui.showTaskAdded(task, tasks.size()); - storage.saveTasks(tasks.getTasks()); - } else if (input.startsWith("deadline ")) { - int byIndex = input.indexOf("/by"); - if (byIndex == -1) throw new IllegalArgumentException("Please specify a deadline with /by."); - String desc = input.substring(9, byIndex).trim(); - String by = input.substring(byIndex + 4).trim(); - johan.task.Task task = new johan.task.Deadline(desc, by); - tasks.addTask(task); - ui.showTaskAdded(task, tasks.size()); - storage.saveTasks(tasks.getTasks()); - } else if (input.startsWith("event ")) { - int fromIndex = input.indexOf("/from"); - int toIndex = input.indexOf("/to"); - if (fromIndex == -1 || toIndex == -1) throw new IllegalArgumentException("Please specify /from and /to."); - String desc = input.substring(6, fromIndex).trim(); - String from = input.substring(fromIndex + 6, toIndex).trim(); - String to = input.substring(toIndex + 4).trim(); - johan.task.Task task = new johan.task.Event(desc, from, to); - tasks.addTask(task); - ui.showTaskAdded(task, tasks.size()); - storage.saveTasks(tasks.getTasks()); - } else if (input.startsWith("delete ")) { - int id = Integer.parseInt(input.substring(7)) - 1; - johan.task.Task task = tasks.deleteTask(id); - ui.showTaskDeleted(task, tasks.size()); - storage.saveTasks(tasks.getTasks()); - } else if (input.startsWith("on ")) { - String dateStr = input.substring(3).trim(); - LocalDate targetDate = johan.Johan.parseDate(dateStr); - ui.showTasksOnDate(tasks, targetDate); - } else { - throw new IllegalArgumentException("I'm sorry, but I don't know what that means :-("); - } - return true; - } -} -*/ diff --git a/src/main/java/johan/task/Event.java b/src/main/java/johan/task/Event.java index 8f4c983041..acd2bbe199 100644 --- a/src/main/java/johan/task/Event.java +++ b/src/main/java/johan/task/Event.java @@ -33,10 +33,12 @@ public Event(String description, String startDate, String endDate) { */ private static LocalDate parseDate(String dateString) { try { - DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("d/M/yyyy").withLocale(java.util.Locale.ENGLISH); + DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("d/M/yyyy") + .withLocale(java.util.Locale.ENGLISH); return LocalDate.parse(dateString.trim(), formatter1); } catch (Exception e) { - DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd").withLocale(java.util.Locale.ENGLISH); + DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd") + .withLocale(java.util.Locale.ENGLISH); return LocalDate.parse(dateString.trim(), formatter2); } } diff --git a/src/main/java/johan/ui/Ui.java b/src/main/java/johan/ui/Ui.java index 54f097b9b0..e92cd3615a 100644 --- a/src/main/java/johan/ui/Ui.java +++ b/src/main/java/johan/ui/Ui.java @@ -1,39 +1,60 @@ package johan.ui; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Scanner; + import johan.task.Deadline; import johan.task.Event; import johan.task.Task; import johan.task.TaskList; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.Scanner; - +/** + * Handles user interface interactions for the Johan task management application. + */ public class Ui { private final Scanner scanner = new Scanner(System.in); - + /** + * Displays a welcome message to the user. + */ public void showWelcome() { System.out.println("Hello! I'm johan.Johan"); System.out.println("What can I do for you?"); } - + /** + * Displays a goodbye message to the user. + */ public void showGoodbye() { System.out.println("Bye. Hope to see you again soon!"); } - + /** + * Displays the list of tasks in the provided TaskList. + * + * @param tasks The TaskList containing tasks to display + */ public void showTaskList(TaskList tasks) { System.out.println("Here are the tasks in your list:"); for (int i = 0; i < tasks.size(); i++) { System.out.println((i + 1) + "." + tasks.getTask(i).toString()); } } - + /** + * Displays a confirmation message for a newly added task. + * + * @param task The task that was added + * @param taskCount The total number of tasks in the list after adding + */ public void showTaskAdded(Task task, int taskCount) { System.out.println("Got it. I've added this task:"); System.out.println(task.toString()); System.out.println("Now you have " + taskCount + " tasks in the list."); } - + /** + * Displays a confirmation message when a task's completion status is changed. + * + * @param task The task whose status was updated + * @param isDone True if the task was marked as done, false if marked as not done + */ public void showTaskMarked(Task task, boolean isDone) { if (isDone) { System.out.println("Nice! I've marked this task as done:"); @@ -42,7 +63,12 @@ public void showTaskMarked(Task task, boolean isDone) { } System.out.println(task.toString()); } - + /** + * Displays a confirmation message when a task is deleted. + * + * @param task The task that was removed + * @param taskCount The total number of tasks remaining in the list + */ public void showTaskDeleted(Task task, int taskCount) { System.out.println("____________________________________________________________"); System.out.println("Noted. I've removed this task:"); @@ -50,21 +76,36 @@ public void showTaskDeleted(Task task, int taskCount) { System.out.println("Now you have " + taskCount + " tasks in the list."); System.out.println("____________________________________________________________"); } - + /** + * Displays an error message to the user. + * + * @param message The error message to display + */ public void showError(String message) { System.out.println("____________________________________________________________"); System.out.println(" OOPS!!! " + message); System.out.println("____________________________________________________________"); } - + /** + * Reads a command from the user input. + * + * @return The user's command as a lowercase, trimmed string + */ public String readCommand() { return scanner.nextLine().toLowerCase().trim(); } - + /** + * Displays a horizontal line as a visual separator. + */ public void showLine() { System.out.println("____________________________________________________________"); } - + /** + * Displays tasks occurring on the specified date from the TaskList. + * + * @param tasks The TaskList to search for tasks + * @param targetDate The date to filter tasks by + */ public void showTasksOnDate(TaskList tasks, LocalDate targetDate) { System.out.println("Tasks on " + targetDate.format(DateTimeFormatter.ofPattern("d/MM/yyyy")) + ":"); boolean found = false; @@ -79,7 +120,8 @@ public void showTasksOnDate(TaskList tasks, LocalDate targetDate) { } else if (task instanceof Event) { LocalDate startDate = ((Event) task).getStartDate(); LocalDate endDate = ((Event) task).getEndDate(); - if (startDate != null && endDate != null && !startDate.isAfter(targetDate) && !endDate.isBefore(targetDate)) { + if (startDate != null && endDate != null && !startDate.isAfter(targetDate) + && !endDate.isBefore(targetDate)) { System.out.println((i + 1) + "." + task.toString()); found = true; } @@ -89,4 +131,4 @@ public void showTasksOnDate(TaskList tasks, LocalDate targetDate) { System.out.println("No tasks found on this date."); } } -} \ No newline at end of file +} diff --git a/src/test/java/johan/parser/ParserTest.java b/src/test/java/johan/parser/ParserTest.java index 4f13e5e375..acf9cb7b42 100644 --- a/src/test/java/johan/parser/ParserTest.java +++ b/src/test/java/johan/parser/ParserTest.java @@ -3,11 +3,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; + import johan.command.Command; import johan.command.TodoCommand; -import org.junit.jupiter.api.Test; - /** * Tests for the Parser class. */ diff --git a/src/test/java/johan/ui/UiTest.java b/src/test/java/johan/ui/UiTest.java index bcdb587629..61ab72b38d 100644 --- a/src/test/java/johan/ui/UiTest.java +++ b/src/test/java/johan/ui/UiTest.java @@ -1,11 +1,11 @@ package johan.ui; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.PrintStream; -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -50,4 +50,4 @@ void readCommand_emptyInput_returnsEmpty() { assertEquals("", result.trim(), "Should return empty string for empty input"); } -} \ No newline at end of file +} From c5445daf4b4ef0a06f94409fa1a7f4def12936f8 Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Wed, 26 Feb 2025 14:25:02 +0800 Subject: [PATCH 24/41] Created FindCommand class --- src/main/java/johan/command/FindCommand.java | 43 ++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/main/java/johan/command/FindCommand.java diff --git a/src/main/java/johan/command/FindCommand.java b/src/main/java/johan/command/FindCommand.java new file mode 100644 index 0000000000..50a1c9044d --- /dev/null +++ b/src/main/java/johan/command/FindCommand.java @@ -0,0 +1,43 @@ +package johan.command; + +import johan.storage.Storage; +import johan.task.Task; +import johan.task.TaskList; +import johan.ui.Ui; + +import java.util.ArrayList; + +/** + * Command to find tasks containing a specific keyword in their description. + */ +public class FindCommand extends Command { + private final String keyword; + + /** + * Constructs a FindCommand with the specified search keyword. + * + * @param keyword The keyword to search for in task descriptions + */ + public FindCommand(String keyword) { + this.keyword = keyword; + } + + /** + * Executes the command to find and display tasks matching the keyword. + * + * @param tasks The task list to search + * @param ui The user interface for displaying results + * @param storage The storage system (unused in this command) + */ + @Override + public void execute(TaskList tasks, Ui ui, Storage storage) { + ArrayList matchingTasks = new ArrayList<>(); + for (int i = 0; i < tasks.size(); i++) { + Task task = tasks.getTask(i); + if (task.getDescription().toLowerCase().contains(this.keyword.toLowerCase())) { + matchingTasks.add(task); + } + } + ui.showFoundTasks(matchingTasks); + } +} \ No newline at end of file From 3b030ad1d31cc9636733e4f6b73638cfdf01b9ed Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Wed, 26 Feb 2025 14:35:27 +0800 Subject: [PATCH 25/41] Implemented find command --- data/johan.txt | 3 +++ src/main/java/johan/command/FindCommand.java | 6 +++--- src/main/java/johan/parser/Parser.java | 9 +++++++++ src/main/java/johan/ui/Ui.java | 19 +++++++++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/data/johan.txt b/data/johan.txt index e69de29bb2..ebffa900ad 100644 --- a/data/johan.txt +++ b/data/johan.txt @@ -0,0 +1,3 @@ +T | 0 | read book +D | 0 | return book | 6/6/2025 +E | 0 | fly aorund | 12/3/2020 | 2/2/2021 diff --git a/src/main/java/johan/command/FindCommand.java b/src/main/java/johan/command/FindCommand.java index 50a1c9044d..a942e19d61 100644 --- a/src/main/java/johan/command/FindCommand.java +++ b/src/main/java/johan/command/FindCommand.java @@ -1,12 +1,12 @@ package johan.command; +import java.util.ArrayList; + import johan.storage.Storage; import johan.task.Task; import johan.task.TaskList; import johan.ui.Ui; -import java.util.ArrayList; - /** * Command to find tasks containing a specific keyword in their description. */ @@ -40,4 +40,4 @@ public void execute(TaskList tasks, Ui ui, Storage storage) { } ui.showFoundTasks(matchingTasks); } -} \ No newline at end of file +} diff --git a/src/main/java/johan/parser/Parser.java b/src/main/java/johan/parser/Parser.java index cad45d4f5d..42b10f2859 100644 --- a/src/main/java/johan/parser/Parser.java +++ b/src/main/java/johan/parser/Parser.java @@ -5,6 +5,7 @@ import johan.command.DeleteCommand; import johan.command.EventCommand; import johan.command.ExitCommand; +import johan.command.FindCommand; import johan.command.ListCommand; import johan.command.MarkCommand; import johan.command.OnDateCommand; @@ -16,6 +17,7 @@ public class Parser { /** * Parses the input string into a corresponding Command object. + * * @param input The user input string to parse * @return The corresponding Command object * @throws Exception If the input cannot be parsed @@ -58,8 +60,15 @@ public Command parse(String input) throws Exception { } else if (input.startsWith("on ")) { String dateStr = input.substring(3).trim(); return new OnDateCommand(dateStr); + } else if (input.startsWith("find ")) { + String keyword = input.substring(5).trim(); + if (keyword.isEmpty()) { + throw new IllegalArgumentException("Please specify a keyword."); + } + return new FindCommand(keyword); } else { throw new IllegalArgumentException("I'm sorry, but I don't know what that means :-("); } } } + diff --git a/src/main/java/johan/ui/Ui.java b/src/main/java/johan/ui/Ui.java index e92cd3615a..a71ef30c7b 100644 --- a/src/main/java/johan/ui/Ui.java +++ b/src/main/java/johan/ui/Ui.java @@ -2,6 +2,7 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.Scanner; import johan.task.Deadline; @@ -131,4 +132,22 @@ public void showTasksOnDate(TaskList tasks, LocalDate targetDate) { System.out.println("No tasks found on this date."); } } + + /** + * Displays tasks whose descriptions contain the search keyword. + * + * @param matchingTasks The list of tasks that match the keyword + */ + public void showFoundTasks(ArrayList matchingTasks) { + System.out.println("____________________________________________________________"); + System.out.println(" Here are the matching tasks in your list:"); + if (matchingTasks.isEmpty()) { + System.out.println(" No matching tasks found."); + } else { + for (int i = 0; i < matchingTasks.size(); i++) { + System.out.println(" " + (i + 1) + "." + matchingTasks.get(i).toString()); + } + } + System.out.println("____________________________________________________________"); + } } From b8bcf636d2a1c3ec2972c76ad531d261d4058376 Mon Sep 17 00:00:00 2001 From: Chin Jung Hwan Date: Thu, 27 Feb 2025 20:45:22 +0800 Subject: [PATCH 26/41] Level 10. GUI --- build.gradle | 2 +- data/johan.txt | 3 - src/main/java/johan/DialogBox.java | 78 +++++++++++++++++++++ src/main/java/johan/Johan.java | 31 +++++++- src/main/java/johan/Main.java | 50 +++++++++++++ src/main/java/johan/MainWindow.java | 63 +++++++++++++++++ src/main/java/johan/launcher/Launcher.java | 13 ++++ src/main/java/johan/ui/Ui.java | 58 ++++++++------- src/main/resources/images/Johan.png | Bin 0 -> 23228 bytes src/main/resources/images/User.png | Bin 0 -> 26935 bytes src/main/resources/view/DialogBox.fxml | 22 ++++++ src/main/resources/view/MainWindow.fxml | 43 ++++++++++++ 12 files changed, 332 insertions(+), 31 deletions(-) create mode 100644 src/main/java/johan/DialogBox.java create mode 100644 src/main/java/johan/Main.java create mode 100644 src/main/java/johan/MainWindow.java create mode 100644 src/main/java/johan/launcher/Launcher.java create mode 100644 src/main/resources/images/Johan.png create mode 100644 src/main/resources/images/User.png create mode 100644 src/main/resources/view/DialogBox.fxml create mode 100644 src/main/resources/view/MainWindow.fxml diff --git a/build.gradle b/build.gradle index 60bd2292f4..001c57e0be 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ test { } application { - mainClass.set("johan.Johan") + mainClass.set("johan.launcher.Launcher") } shadowJar { diff --git a/data/johan.txt b/data/johan.txt index ebffa900ad..e69de29bb2 100644 --- a/data/johan.txt +++ b/data/johan.txt @@ -1,3 +0,0 @@ -T | 0 | read book -D | 0 | return book | 6/6/2025 -E | 0 | fly aorund | 12/3/2020 | 2/2/2021 diff --git a/src/main/java/johan/DialogBox.java b/src/main/java/johan/DialogBox.java new file mode 100644 index 0000000000..4c31bd21d1 --- /dev/null +++ b/src/main/java/johan/DialogBox.java @@ -0,0 +1,78 @@ +package johan; + + +import java.io.IOException; +import java.util.Collections; + +import javafx.collections.FXCollections; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.geometry.Pos; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; + +/** + * Represents a dialog box with text and an image in the Johan GUI. + */ +public class DialogBox extends HBox { + @FXML + private Label dialog; + @FXML + private ImageView displayPicture; + + /** + * Constructs a DialogBox with the specified text and image using FXML. + * + * @param text The text to display + * @param image The image to display + */ + private DialogBox(String text, Image image) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml")); + fxmlLoader.setController(this); + fxmlLoader.setRoot(this); + fxmlLoader.load(); + } catch (IOException e) { + e.printStackTrace(); + } + + dialog.setText(text); + displayPicture.setImage(image); + } + + /** + * Flips the dialog box so the image is on the left and text on the right. + */ + private void flip() { + this.setAlignment(Pos.TOP_LEFT); + var children = FXCollections.observableArrayList(this.getChildren()); + Collections.reverse(children); // Use Collections.reverse() + this.getChildren().setAll(children); + } + + /** + * Creates a dialog box for a user message (image on right). + * + * @param text The user's message text + * @param image The user's avatar image + * @return A new DialogBox instance + */ + public static DialogBox getUserDialog(String text, Image image) { + return new DialogBox(text, image); + } + + /** + * Creates a dialog box for a Johan message (image on left). + * + * @param text Johan's message text + * @param image Johan's avatar image + * @return A new DialogBox instance + */ + public static DialogBox getJohanDialog(String text, Image image) { + DialogBox db = new DialogBox(text, image); + db.flip(); + return db; + } +} diff --git a/src/main/java/johan/Johan.java b/src/main/java/johan/Johan.java index 156c8fd1bd..e50f26ff5f 100644 --- a/src/main/java/johan/Johan.java +++ b/src/main/java/johan/Johan.java @@ -3,6 +3,7 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.function.Consumer; import johan.command.Command; import johan.parser.Parser; @@ -31,9 +32,9 @@ public class Johan { * @param filePath The path to the storage file */ public Johan(String filePath) { - ui = new Ui(); - storage = new Storage(filePath); - parser = new Parser(); + this.ui = new Ui(); + this.storage = new Storage(filePath); + this.parser = new Parser(); ArrayList loadedTasks; try { @@ -45,6 +46,18 @@ public Johan(String filePath) { tasks = new TaskList(loadedTasks); } + /** + * Constructs a Johan instance with explicit dependencies (GUI mode). + * @param storage The storage instance + * @param tasks The task list instance + * @param parser The parser instance + */ + public Johan(Storage storage, TaskList tasks, Parser parser) { + this.storage = storage; + this.tasks = tasks; + this.parser = parser; + this.ui = null; + } /** * Runs the main application loop, processing user commands until exit. */ @@ -66,6 +79,18 @@ public void run() { } ui.showGoodbye(); } + + /** + * Executes a user command and sends output to the provided consumer (GUI mode). + * @param input The user command string + * @param outputConsumer A consumer to handle output messages + * @throws Exception If the command execution fails + */ + public void executeCommand(String input, Consumer outputConsumer) throws Exception { + Ui guiUi = new Ui(outputConsumer); + Command command = parser.parse(input); + command.execute(tasks, guiUi, storage); + } /** * Main entry point for the application. * diff --git a/src/main/java/johan/Main.java b/src/main/java/johan/Main.java new file mode 100644 index 0000000000..5b522d955c --- /dev/null +++ b/src/main/java/johan/Main.java @@ -0,0 +1,50 @@ +package johan; + +import java.io.IOException; +import java.util.ArrayList; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.layout.AnchorPane; +import javafx.stage.Stage; +import johan.parser.Parser; +import johan.storage.Storage; +import johan.task.TaskList; + +/** + * The main JavaFX application class for Johan, providing a GUI interface using FXML. + */ +public class Main extends Application { + private Johan johan; + + @Override + public void start(Stage stage) { + try { + Storage storage = new Storage("./data/johan.txt"); + Parser parser = new Parser(); + ArrayList loadedTasks; + try { + loadedTasks = storage.loadTasks(); + } catch (Exception e) { + loadedTasks = new ArrayList<>(); + } + TaskList tasks = new TaskList(loadedTasks); + this.johan = new Johan(storage, tasks, parser); + + FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml")); + AnchorPane ap = fxmlLoader.load(); + Scene scene = new Scene(ap); + stage.setTitle("Johan Chatbot"); + stage.setResizable(false); + stage.setScene(scene); + + MainWindow controller = fxmlLoader.getController(); + controller.setJohan(johan); + + stage.show(); + } catch (IOException e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/johan/MainWindow.java b/src/main/java/johan/MainWindow.java new file mode 100644 index 0000000000..d103c6934e --- /dev/null +++ b/src/main/java/johan/MainWindow.java @@ -0,0 +1,63 @@ +package johan; + +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.image.Image; +import javafx.scene.layout.VBox; + +/** + * Controller for the main GUI window in Johan. + */ +public class MainWindow { + @FXML + private ScrollPane scrollPane; + @FXML + private VBox dialogContainer; + @FXML + private TextField userInput; + @FXML + private Button sendButton; + + private Johan johan; + private Image userImage = new Image(getClass().getResourceAsStream("/images/User.png")); + private Image johanImage = new Image(getClass().getResourceAsStream("/images/Johan.png")); + + /** + * Initializes the controller after FXML is loaded. + */ + @FXML + public void initialize() { + scrollPane.vvalueProperty().bind(dialogContainer.heightProperty()); + dialogContainer.getChildren() + .add(DialogBox.getJohanDialog("Hello! I'm Johan. What can I do for you?", johanImage)); + } + + /** + * Sets the Johan instance for this controller. + * + * @param j The Johan instance to use + */ + public void setJohan(Johan j) { + this.johan = j; + } + + @FXML + private void handleUserInput() { + String input = userInput.getText().trim(); + if (!input.isEmpty()) { + dialogContainer.getChildren().add(DialogBox.getUserDialog(input, userImage)); + try { + johan.executeCommand(input, message -> dialogContainer.getChildren().add( + DialogBox.getJohanDialog(message, johanImage))); + if (input.equals("bye")) { + javafx.application.Platform.exit(); + } + } catch (Exception e) { + dialogContainer.getChildren().add(DialogBox.getJohanDialog("Oops! " + e.getMessage(), johanImage)); + } + userInput.clear(); + } + } +} diff --git a/src/main/java/johan/launcher/Launcher.java b/src/main/java/johan/launcher/Launcher.java new file mode 100644 index 0000000000..68267c77f5 --- /dev/null +++ b/src/main/java/johan/launcher/Launcher.java @@ -0,0 +1,13 @@ +package johan.launcher; + +import javafx.application.Application; +import johan.Main; + +/** + * A launcher class to workaround classpath issues with JavaFX. + */ +public class Launcher { + public static void main(String[] args) { + Application.launch(Main.class, args); + } +} diff --git a/src/main/java/johan/ui/Ui.java b/src/main/java/johan/ui/Ui.java index a71ef30c7b..d7348ff1d9 100644 --- a/src/main/java/johan/ui/Ui.java +++ b/src/main/java/johan/ui/Ui.java @@ -4,6 +4,7 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Scanner; +import java.util.function.Consumer; import johan.task.Deadline; import johan.task.Event; @@ -15,18 +16,26 @@ */ public class Ui { private final Scanner scanner = new Scanner(System.in); + private final Consumer outputConsumer; + + public Ui() { + this.outputConsumer = System.out::println; + } + public Ui(Consumer outputConsumer) { + this.outputConsumer = outputConsumer; + } /** * Displays a welcome message to the user. */ public void showWelcome() { - System.out.println("Hello! I'm johan.Johan"); - System.out.println("What can I do for you?"); + outputConsumer.accept("Hello! I'm johan.Johan"); + outputConsumer.accept("What can I do for you?"); } /** * Displays a goodbye message to the user. */ public void showGoodbye() { - System.out.println("Bye. Hope to see you again soon!"); + outputConsumer.accept("Bye. Hope to see you again soon!"); } /** * Displays the list of tasks in the provided TaskList. @@ -34,9 +43,9 @@ public void showGoodbye() { * @param tasks The TaskList containing tasks to display */ public void showTaskList(TaskList tasks) { - System.out.println("Here are the tasks in your list:"); + outputConsumer.accept("Here are the tasks in your list:"); for (int i = 0; i < tasks.size(); i++) { - System.out.println((i + 1) + "." + tasks.getTask(i).toString()); + outputConsumer.accept((i + 1) + "." + tasks.getTask(i).toString()); } } /** @@ -46,9 +55,9 @@ public void showTaskList(TaskList tasks) { * @param taskCount The total number of tasks in the list after adding */ public void showTaskAdded(Task task, int taskCount) { - System.out.println("Got it. I've added this task:"); - System.out.println(task.toString()); - System.out.println("Now you have " + taskCount + " tasks in the list."); + outputConsumer.accept("Got it. I've added this task:"); + outputConsumer.accept(task.toString()); + outputConsumer.accept("Now you have " + taskCount + " tasks in the list."); } /** * Displays a confirmation message when a task's completion status is changed. @@ -58,11 +67,11 @@ public void showTaskAdded(Task task, int taskCount) { */ public void showTaskMarked(Task task, boolean isDone) { if (isDone) { - System.out.println("Nice! I've marked this task as done:"); + outputConsumer.accept("Nice! I've marked this task as done:"); } else { - System.out.println("OK, I've marked this task as not done yet:"); + outputConsumer.accept("OK, I've marked this task as not done yet:"); } - System.out.println(task.toString()); + outputConsumer.accept(task.toString()); } /** * Displays a confirmation message when a task is deleted. @@ -71,11 +80,11 @@ public void showTaskMarked(Task task, boolean isDone) { * @param taskCount The total number of tasks remaining in the list */ public void showTaskDeleted(Task task, int taskCount) { - System.out.println("____________________________________________________________"); - System.out.println("Noted. I've removed this task:"); - System.out.println(task.toString()); - System.out.println("Now you have " + taskCount + " tasks in the list."); - System.out.println("____________________________________________________________"); + outputConsumer.accept("____________________________________________________________"); + outputConsumer.accept("Noted. I've removed this task:"); + outputConsumer.accept(task.toString()); + outputConsumer.accept("Now you have " + taskCount + " tasks in the list."); + outputConsumer.accept("____________________________________________________________"); } /** * Displays an error message to the user. @@ -83,9 +92,9 @@ public void showTaskDeleted(Task task, int taskCount) { * @param message The error message to display */ public void showError(String message) { - System.out.println("____________________________________________________________"); - System.out.println(" OOPS!!! " + message); - System.out.println("____________________________________________________________"); + outputConsumer.accept("____________________________________________________________"); + outputConsumer.accept(" OOPS!!! " + message); + outputConsumer.accept("____________________________________________________________"); } /** * Reads a command from the user input. @@ -99,7 +108,7 @@ public String readCommand() { * Displays a horizontal line as a visual separator. */ public void showLine() { - System.out.println("____________________________________________________________"); + outputConsumer.accept("____________________________________________________________"); } /** * Displays tasks occurring on the specified date from the TaskList. @@ -108,14 +117,14 @@ public void showLine() { * @param targetDate The date to filter tasks by */ public void showTasksOnDate(TaskList tasks, LocalDate targetDate) { - System.out.println("Tasks on " + targetDate.format(DateTimeFormatter.ofPattern("d/MM/yyyy")) + ":"); + outputConsumer.accept("Tasks on " + targetDate.format(DateTimeFormatter.ofPattern("d/MM/yyyy")) + ":"); boolean found = false; for (int i = 0; i < tasks.size(); i++) { Task task = tasks.getTask(i); if (task instanceof Deadline) { LocalDate deadline = ((Deadline) task).getBy(); if (deadline != null && deadline.equals(targetDate)) { - System.out.println((i + 1) + "." + task.toString()); + outputConsumer.accept((i + 1) + "." + task.toString()); found = true; } } else if (task instanceof Event) { @@ -123,13 +132,13 @@ public void showTasksOnDate(TaskList tasks, LocalDate targetDate) { LocalDate endDate = ((Event) task).getEndDate(); if (startDate != null && endDate != null && !startDate.isAfter(targetDate) && !endDate.isBefore(targetDate)) { - System.out.println((i + 1) + "." + task.toString()); + outputConsumer.accept((i + 1) + "." + task.toString()); found = true; } } } if (!found) { - System.out.println("No tasks found on this date."); + outputConsumer.accept("No tasks found on this date."); } } @@ -151,3 +160,4 @@ public void showFoundTasks(ArrayList matchingTasks) { System.out.println("____________________________________________________________"); } } + diff --git a/src/main/resources/images/Johan.png b/src/main/resources/images/Johan.png new file mode 100644 index 0000000000000000000000000000000000000000..a1954acf6d2bfb157295eb4bb9a39897c7f5e246 GIT binary patch literal 23228 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≪WW*2W7j-l_^#_vSL%;?K6Gxz82H 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 C!_>q8 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..76c6643ee2e4dd5de22a8217b2e3f7be7a47b597 GIT binary patch literal 26935 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 A9{>OV literal 0 HcmV?d00001 diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml new file mode 100644 index 0000000000..8e4b1fff3e --- /dev/null +++ b/src/main/resources/view/DialogBox.fxml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml new file mode 100644 index 0000000000..1eb272351e --- /dev/null +++ b/src/main/resources/view/MainWindow.fxml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + +