From 3b19ba1790d6035a9e246f5d4ae627bf68778606 Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 01/30] Add Gradle support --- build.gradle | 46 ++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 +++++++++++++++++++++++ gradlew.bat | 103 +++++++++++++ text-ui-test/runtest.sh | 0 6 files changed, 337 insertions(+) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat mode change 100644 => 100755 text-ui-test/runtest.sh diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..b0c5528fb5 --- /dev/null +++ b/build.gradle @@ -0,0 +1,46 @@ +plugins { + id 'java' + id 'application' + id 'checkstyle' + id 'com.github.johnrengelman.shadow' version '5.1.0' +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' +} + +test { + useJUnitPlatform() + + testLogging { + events "passed", "skipped", "failed" + + showExceptions true + exceptionFormat "full" + showCauses true + showStackTraces true + showStandardStreams = false + } +} + +application { + mainClassName = "seedu.duke.Duke" +} + +shadowJar { + archiveBaseName = "duke" + archiveClassifier = null +} + +checkstyle { + toolVersion = '8.23' +} + +run{ + standardInput = System.in +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..b7c8c5dbf5 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000000..2fe81a7d95 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..62bd9b9cce --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh old mode 100644 new mode 100755 From e4b2de5cccee26872b120fc15f5883315f908fea Mon Sep 17 00:00:00 2001 From: geoboom Date: Wed, 19 Aug 2020 01:03:26 +0800 Subject: [PATCH 02/30] point to correct mainClassName --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b0c5528fb5..c53aa2460f 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ test { } application { - mainClassName = "seedu.duke.Duke" + mainClassName = "Duke" } shadowJar { From 61b6dbd780b2ee10284f5e206f519ec4e367af95 Mon Sep 17 00:00:00 2001 From: geoboom Date: Wed, 19 Aug 2020 01:04:46 +0800 Subject: [PATCH 03/30] design docs to track my thoughts --- design-docs/design-docs.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 design-docs/design-docs.md diff --git a/design-docs/design-docs.md b/design-docs/design-docs.md new file mode 100644 index 0000000000..86f6c2a355 --- /dev/null +++ b/design-docs/design-docs.md @@ -0,0 +1,32 @@ +# Week 2 (17 AUG - 23 AUG) + +## Preliminary Design + +The task is to build an extensible terminal chat application named Duke. Having some experience with Android, FullStack web development, and system design, I decided to glance over the future specs and enhancements and read up a bit about JavaFX FXML (the GUI library) before starting. This gives me a feel of the scope and scale of project Duke so I can choose an architectural pattern to roll with. For now, the MVVM (Model-View-ViewModel) pattern seems promising, along with a DAO (Data Access Object) to encapsulate communication with the data layer. + +Since I like microservice architecture and modular applications a lot, my goal is to make the transition from CLI to GUI or file-based storage to DB-based storage as simple as "plug-n-play". Perhaps my design may evolve or change over the next few weeks. We'll see. + +## Project Management + +Just like in AGILE, project milestones are issued and checked in weekly sprints. This is nice because I plan to learn GitHub project board to manage the development process with Epics, User Stories, and issues. + +## Gradle and JUnit + +I think I'll start by migrating the project over to Gradle and conduct testing with JUnit 5 rather than running the `.sh` script over and over. I'll also use gradle to build the `.jar`. If I have time I might set up CircleCI/Travis CI pipeline to automatically test and build the `.jar` and release it using semantic versioning. This too is a great opportunity for me to practice TDD (Test-Driven Development) as well, where unit tests are written before the actual code. + +## Packages + +To be updated. + +# Week 3 (24 AUG - 30 AUG) + +``` + August 2020 +Mo Tu We Th Fr Sa Su + 1 2 + 3 4 5 6 7 8 9 +10 11 12 13 14 15 16 +17 18 19 20 21 22 23 +24 25 26 27 28 29 30 +31 +``` From adaa46963cff22bfb01478c051b25fbbfea3479f Mon Sep 17 00:00:00 2001 From: geoboom Date: Wed, 19 Aug 2020 12:40:59 +0800 Subject: [PATCH 04/30] implement basic echo and exit functionality --- src/main/java/Duke.java | 17 ++++++++++------- text-ui-test/ACTUAL.TXT | 7 +++++++ 2 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 text-ui-test/ACTUAL.TXT diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..72fac3b875 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,10 +1,13 @@ +import java.util.Scanner; + public class Duke { - public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); + public static void main(String[] args) { + System.out.println("Hello! I'm Duke.\nWhat can I do for you?"); + Scanner sc = new Scanner(System.in); + String input; + while (!(input = sc.next()).equals("bye")) { + System.out.println(input); } + System.out.println("Bye. Hope to see you again!"); + } } diff --git a/text-ui-test/ACTUAL.TXT b/text-ui-test/ACTUAL.TXT new file mode 100644 index 0000000000..657e74f6e7 --- /dev/null +++ b/text-ui-test/ACTUAL.TXT @@ -0,0 +1,7 @@ +Hello from + ____ _ +| _ \ _ _| | _____ +| | | | | | | |/ / _ \ +| |_| | |_| | < __/ +|____/ \__,_|_|\_\___| + From a96fe27093aaf9e7691872efdc9eedabad1b72f2 Mon Sep 17 00:00:00 2001 From: geoboom Date: Wed, 19 Aug 2020 12:43:32 +0800 Subject: [PATCH 05/30] test commit --- src/main/java/Duke.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 72fac3b875..7699dce3f9 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -8,6 +8,6 @@ public static void main(String[] args) { while (!(input = sc.next()).equals("bye")) { System.out.println(input); } - System.out.println("Bye. Hope to see you again!"); + System.out.println("Bye. Hope to see you again."); } } From 0dc76f4603992c27aca8c67ac46a5d1dbf9c37d2 Mon Sep 17 00:00:00 2001 From: geoboom Date: Thu, 20 Aug 2020 20:09:22 +0800 Subject: [PATCH 06/30] Add package support and Duke singleton for data access --- README.md | 4 ++-- build.gradle | 2 +- src/main/java/duke/duke/Duke.java | 36 +++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 src/main/java/duke/duke/Duke.java diff --git a/README.md b/README.md index 9d95025bce..fbfccd3dca 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Duke project template +# duke.runner.Runner 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. @@ -15,7 +15,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version. 1. Click `Open or Import`. 1. Select the project directory, and click `OK` 1. If there are any further prompts, accept the defaults. -1. After the importing is complete, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()`. If the setup is correct, you should see something like the below: +1. After the importing is complete, locate the `src/main/java/duke.runner.Runner.java` file, right-click it, and choose `Run duke.runner.Runner.main()`. If the setup is correct, you should see something like the below: ``` Hello from ____ _ diff --git a/build.gradle b/build.gradle index c53aa2460f..06b488d11e 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ test { } application { - mainClassName = "Duke" + mainClassName = "Runner" } shadowJar { diff --git a/src/main/java/duke/duke/Duke.java b/src/main/java/duke/duke/Duke.java new file mode 100644 index 0000000000..5b9fbe1800 --- /dev/null +++ b/src/main/java/duke/duke/Duke.java @@ -0,0 +1,36 @@ +package duke.duke; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * duke.runner.Duke is the singleton class we'll be using to manage the transactions. It will + * encapsulate the task storage and retrieval system. + */ +public class Duke { + + private static Duke duke = null; + private final List tasks; + + private Duke() { + tasks = new ArrayList<>(); + } + + public static Duke getInstance() { + if (duke == null) { + duke = new Duke(); + } + + return duke; + } + + public List addTask(String description) { + tasks.add(description); + return Collections.singletonList(description); + } + + public List getTasks() { + return tasks; + } +} From 54f32bd1ff5d6dc025b26aacb53c5eadd3a77963 Mon Sep 17 00:00:00 2001 From: geoboom Date: Thu, 20 Aug 2020 20:10:26 +0800 Subject: [PATCH 07/30] Add input parser and runner --- design-docs/design-docs.md | 2 +- src/main/java/duke/input/Parser.java | 25 +++++++++++++++++++++++++ src/main/java/duke/runner/Runner.java | 23 +++++++++++++++++++++++ text-ui-test/runtest.bat | 4 ++-- 4 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 src/main/java/duke/input/Parser.java create mode 100644 src/main/java/duke/runner/Runner.java diff --git a/design-docs/design-docs.md b/design-docs/design-docs.md index 86f6c2a355..c19079fd9b 100644 --- a/design-docs/design-docs.md +++ b/design-docs/design-docs.md @@ -2,7 +2,7 @@ ## Preliminary Design -The task is to build an extensible terminal chat application named Duke. Having some experience with Android, FullStack web development, and system design, I decided to glance over the future specs and enhancements and read up a bit about JavaFX FXML (the GUI library) before starting. This gives me a feel of the scope and scale of project Duke so I can choose an architectural pattern to roll with. For now, the MVVM (Model-View-ViewModel) pattern seems promising, along with a DAO (Data Access Object) to encapsulate communication with the data layer. +The task is to build an extensible terminal chat application named duke.runner.Runner. Having some experience with Android, FullStack web development, and system design, I decided to glance over the future specs and enhancements and read up a bit about JavaFX FXML (the GUI library) before starting. This gives me a feel of the scope and scale of project duke.runner.Runner so I can choose an architectural pattern to roll with. For now, the MVVM (Model-View-ViewModel) pattern seems promising, along with a DAO (Data Access Object) to encapsulate communication with the data layer. Since I like microservice architecture and modular applications a lot, my goal is to make the transition from CLI to GUI or file-based storage to DB-based storage as simple as "plug-n-play". Perhaps my design may evolve or change over the next few weeks. We'll see. diff --git a/src/main/java/duke/input/Parser.java b/src/main/java/duke/input/Parser.java new file mode 100644 index 0000000000..df67785601 --- /dev/null +++ b/src/main/java/duke/input/Parser.java @@ -0,0 +1,25 @@ +package duke.input; + +import duke.duke.Duke; +import java.util.List; + +public class Parser { + + public static final String CMD_TERMINATE = "bye"; + public static final String CMD_TASK_LIST = "list"; + + public static boolean isExitCommand(String s) { + return s.toLowerCase().equals(CMD_TERMINATE); + } + + public static List runCommand(String s) { + String[] args = s.split("\\s+", 2); + + switch (args[0].toLowerCase()) { + case CMD_TASK_LIST: + return Duke.getInstance().getTasks(); + default: + return Duke.getInstance().addTask(args[1]); + } + } +} diff --git a/src/main/java/duke/runner/Runner.java b/src/main/java/duke/runner/Runner.java new file mode 100644 index 0000000000..29f23f2b84 --- /dev/null +++ b/src/main/java/duke/runner/Runner.java @@ -0,0 +1,23 @@ +package duke.runner; + +import duke.input.Parser; +import java.util.Scanner; + +public class Runner { + + public static void main(String[] args) { + run(); + } + + public static void run() { + System.out.println("Hi. Duke here.\nHow can I help you?"); + Scanner sc = new Scanner(System.in); + + String input; + while (!Parser.isExitCommand(input = sc.next())) { + System.out.println(Parser.runCommand(input)); + } + + System.out.println("Bye. Hope to see you again."); + } +} diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index d0facc6310..84008d625a 100644 --- a/text-ui-test/runtest.bat +++ b/text-ui-test/runtest.bat @@ -7,7 +7,7 @@ REM delete output from previous run del ACTUAL.TXT REM compile the code into the bin folder -javac -cp ..\src -Xlint:none -d ..\bin ..\src\main\java\Duke.java +javac -cp ..\src -Xlint:none -d ..\bin ..\src\main\java\duke.runner.Runner.java IF ERRORLEVEL 1 ( echo ********** BUILD FAILURE ********** exit /b 1 @@ -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 duke.runner.Runner < input.txt > ACTUAL.TXT REM compare the output to the expected output FC ACTUAL.TXT EXPECTED.TXT From 8cf3ad89ffdcc6654b220eebf5f43e5a1e39bd96 Mon Sep 17 00:00:00 2001 From: geoboom Date: Thu, 20 Aug 2020 20:10:50 +0800 Subject: [PATCH 08/30] Rename Duke to Runner --- src/main/java/Duke.java | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 src/main/java/Duke.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java deleted file mode 100644 index 7699dce3f9..0000000000 --- a/src/main/java/Duke.java +++ /dev/null @@ -1,13 +0,0 @@ -import java.util.Scanner; - -public class Duke { - public static void main(String[] args) { - System.out.println("Hello! I'm Duke.\nWhat can I do for you?"); - Scanner sc = new Scanner(System.in); - String input; - while (!(input = sc.next()).equals("bye")) { - System.out.println(input); - } - System.out.println("Bye. Hope to see you again."); - } -} From f311f840e071ed006402499afda725561fe9a8da Mon Sep 17 00:00:00 2001 From: geoboom Date: Thu, 20 Aug 2020 21:36:24 +0800 Subject: [PATCH 09/30] Rewrite test script to account for packages --- text-ui-test/ACTUAL.TXT | 13 ++++++------- text-ui-test/EXPECTED.TXT | 13 ++++++------- text-ui-test/input.txt | 4 ++++ text-ui-test/runtest.bat | 21 --------------------- text-ui-test/runtest.sh | 13 +++++-------- 5 files changed, 21 insertions(+), 43 deletions(-) delete mode 100644 text-ui-test/runtest.bat diff --git a/text-ui-test/ACTUAL.TXT b/text-ui-test/ACTUAL.TXT index 657e74f6e7..10f068ab90 100644 --- a/text-ui-test/ACTUAL.TXT +++ b/text-ui-test/ACTUAL.TXT @@ -1,7 +1,6 @@ -Hello from - ____ _ -| _ \ _ _| | _____ -| | | | | | | |/ / _ \ -| |_| | |_| | < __/ -|____/ \__,_|_|\_\___| - +Hi. Duke here. +How can I help you? +[read book] +[return book] +[read book, return book] +Bye. Hope to see you again. diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 657e74f6e7..10f068ab90 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,7 +1,6 @@ -Hello from - ____ _ -| _ \ _ _| | _____ -| | | | | | | |/ / _ \ -| |_| | |_| | < __/ -|____/ \__,_|_|\_\___| - +Hi. Duke here. +How can I help you? +[read book] +[return book] +[read book, return book] +Bye. Hope to see you again. diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index e69de29bb2..efe76cbf43 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -0,0 +1,4 @@ +read book +return book +list +bye diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat deleted file mode 100644 index 84008d625a..0000000000 --- a/text-ui-test/runtest.bat +++ /dev/null @@ -1,21 +0,0 @@ -@ECHO OFF - -REM create bin directory if it doesn't exist -if not exist ..\bin mkdir ..\bin - -REM delete output from previous run -del ACTUAL.TXT - -REM compile the code into the bin folder -javac -cp ..\src -Xlint:none -d ..\bin ..\src\main\java\duke.runner.Runner.java -IF ERRORLEVEL 1 ( - echo ********** BUILD FAILURE ********** - exit /b 1 -) -REM no error here, errorlevel == 0 - -REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT -java -classpath ..\bin duke.runner.Runner < input.txt > ACTUAL.TXT - -REM compare the output to the expected output -FC ACTUAL.TXT EXPECTED.TXT diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh index e169618a34..a0270474b5 100755 --- a/text-ui-test/runtest.sh +++ b/text-ui-test/runtest.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +ENTRY_FILENAME='Runner' # create bin directory if it doesn't exist if [ ! -d "../bin" ] @@ -13,21 +14,17 @@ then fi # compile the code into the bin folder, terminates if error occurred -if ! javac -cp ../src -Xlint:none -d ../bin ../src/main/java/Duke.java +if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/duke/runner/Runner.java then echo "********** BUILD FAILURE **********" exit 1 fi # run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT -java -classpath ../bin Duke < input.txt > ACTUAL.TXT - -# convert to UNIX format -cp EXPECTED.TXT EXPECTED-UNIX.TXT -dos2unix ACTUAL.TXT EXPECTED-UNIX.TXT +java -classpath ../bin duke.runner.Runner < input.txt > ACTUAL.TXT # compare the output to the expected output -diff ACTUAL.TXT EXPECTED-UNIX.TXT +diff ACTUAL.TXT EXPECTED.TXT if [ $? -eq 0 ] then echo "Test result: PASSED" @@ -35,4 +32,4 @@ then else echo "Test result: FAILED" exit 1 -fi \ No newline at end of file +fi From 5c28ae88959e4b823db418ac8155a54a1adfac2a Mon Sep 17 00:00:00 2001 From: geoboom Date: Thu, 20 Aug 2020 21:36:57 +0800 Subject: [PATCH 10/30] Add unit tests --- src/test/java/duke/duke/DukeTest.java | 47 ++++++++++++++++++++++++ src/test/java/duke/input/ParserTest.java | 37 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 src/test/java/duke/duke/DukeTest.java create mode 100644 src/test/java/duke/input/ParserTest.java diff --git a/src/test/java/duke/duke/DukeTest.java b/src/test/java/duke/duke/DukeTest.java new file mode 100644 index 0000000000..9219c579df --- /dev/null +++ b/src/test/java/duke/duke/DukeTest.java @@ -0,0 +1,47 @@ +package duke.duke; + +import static org.junit.jupiter.api.Assertions.*; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +class DukeTest { + + @Test + void getInstance_ShouldGiveSingleton() { + Duke duke1 = Duke.getInstance(); + Duke duke2 = Duke.getInstance(); + assertEquals(duke1, duke2); + } + + @Test + void addTask_ShouldReturnCorrectTask() { + List task = Duke.getInstance().addTask("task one"); + List expectedTask = Collections.singletonList("task one"); + assertEquals(expectedTask, task); + } + + @Test + void getTasks_ShouldGiveCorrectAddedTasks() { + Duke.getInstance().addTask("task one"); + Duke.getInstance().addTask("task two"); + Duke.getInstance().addTask("task three"); + List tasks = Duke.getInstance().getTasks(); + List expectedTasks = Arrays.asList("task one", "task two", "task three"); + assertEquals(expectedTasks, tasks); + } + + @Test + void getTasks_ShouldNotGiveWronglyOrderedAddedTasks() { + Duke.getInstance().addTask("task one"); + Duke.getInstance().addTask("task three"); + Duke.getInstance().addTask("task two"); + List tasks = Duke.getInstance().getTasks(); + List expectedTasks = Arrays.asList("task one", "task two", "task three"); + assertNotEquals(expectedTasks, tasks); + } +} \ No newline at end of file diff --git a/src/test/java/duke/input/ParserTest.java b/src/test/java/duke/input/ParserTest.java new file mode 100644 index 0000000000..5d4efed198 --- /dev/null +++ b/src/test/java/duke/input/ParserTest.java @@ -0,0 +1,37 @@ +package duke.input; + +import static org.junit.jupiter.api.Assertions.*; + +import duke.duke.Duke; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +class ParserTest { + + @Test + void isExitCommand_ShouldBeCaseInsensitive() { + assertTrue(Parser.isExitCommand(Parser.CMD_TERMINATE.toLowerCase())); + assertTrue(Parser.isExitCommand(Parser.CMD_TERMINATE.toUpperCase())); + } + + @Test + void runCommand_AddTask_ShouldReturnTask() { + String command = "test task"; + List res = Parser.runCommand(command); + assertEquals(Collections.singletonList(command), res); + } + + @Test + void runCommand_ListTasks_ShouldReturnEmpty_WhenNoTasksAdded() { + List res = Parser.runCommand(Parser.CMD_TASK_LIST); + assertEquals(new ArrayList(), res); + } + +// @Test +// void runCommand_ListTasks_ShouldReturnAddedTasks() { +// Parser.runCommand(Parser.CMD_TASK_LIST); +// } +} \ No newline at end of file From 210e7ddad533054ffb23e7dcb8e85aad07801a0b Mon Sep 17 00:00:00 2001 From: geoboom Date: Thu, 20 Aug 2020 21:37:19 +0800 Subject: [PATCH 11/30] Fix some logic --- src/main/java/duke/input/Parser.java | 2 +- src/main/java/duke/runner/Runner.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/duke/input/Parser.java b/src/main/java/duke/input/Parser.java index df67785601..bcc841ae3e 100644 --- a/src/main/java/duke/input/Parser.java +++ b/src/main/java/duke/input/Parser.java @@ -19,7 +19,7 @@ public static List runCommand(String s) { case CMD_TASK_LIST: return Duke.getInstance().getTasks(); default: - return Duke.getInstance().addTask(args[1]); + return Duke.getInstance().addTask(s); } } } diff --git a/src/main/java/duke/runner/Runner.java b/src/main/java/duke/runner/Runner.java index 29f23f2b84..daaf392e03 100644 --- a/src/main/java/duke/runner/Runner.java +++ b/src/main/java/duke/runner/Runner.java @@ -14,7 +14,7 @@ public static void run() { Scanner sc = new Scanner(System.in); String input; - while (!Parser.isExitCommand(input = sc.next())) { + while (!Parser.isExitCommand(input = sc.nextLine())) { System.out.println(Parser.runCommand(input)); } From 1b93bbe7b61e525f37ed2456e40b99d883b7c48b Mon Sep 17 00:00:00 2001 From: geoboom Date: Thu, 20 Aug 2020 21:44:19 +0800 Subject: [PATCH 12/30] Add some javadocs --- src/main/java/duke/input/Parser.java | 12 ++++++++++++ src/main/java/duke/runner/Runner.java | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/src/main/java/duke/input/Parser.java b/src/main/java/duke/input/Parser.java index bcc841ae3e..5a6313908d 100644 --- a/src/main/java/duke/input/Parser.java +++ b/src/main/java/duke/input/Parser.java @@ -3,15 +3,27 @@ import duke.duke.Duke; import java.util.List; +/** + * duke.input.Parser is the class that handles input parsing. + * Given a string, it should determine what command to execute and execute it. + */ public class Parser { public static final String CMD_TERMINATE = "bye"; public static final String CMD_TASK_LIST = "list"; + /** + * @param s command supplied + * @return true if it's an exit command, ignoring case + */ public static boolean isExitCommand(String s) { return s.toLowerCase().equals(CMD_TERMINATE); } + /** + * @param s command supplied + * @return a list of string (tasks) corresponding to command execution output + */ public static List runCommand(String s) { String[] args = s.split("\\s+", 2); diff --git a/src/main/java/duke/runner/Runner.java b/src/main/java/duke/runner/Runner.java index daaf392e03..936bb9be11 100644 --- a/src/main/java/duke/runner/Runner.java +++ b/src/main/java/duke/runner/Runner.java @@ -3,12 +3,20 @@ import duke.input.Parser; import java.util.Scanner; +/** + * Class that handles the "event loop" of the CLI program, terminating + * when a termination command is detected. + */ public class Runner { public static void main(String[] args) { run(); } + /** + * Prints hello, goodbye, nd output of command executions. + * Also runs the event loop. + */ public static void run() { System.out.println("Hi. Duke here.\nHow can I help you?"); Scanner sc = new Scanner(System.in); From 203f93363de83eaee6a2376762bd835add8b1139 Mon Sep 17 00:00:00 2001 From: geoboom Date: Thu, 20 Aug 2020 22:16:07 +0800 Subject: [PATCH 13/30] Add task class --- src/main/java/duke/task/Task.java | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/main/java/duke/task/Task.java diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java new file mode 100644 index 0000000000..a522c2046f --- /dev/null +++ b/src/main/java/duke/task/Task.java @@ -0,0 +1,23 @@ +package duke.task; + +public class Task { + private String description; + private boolean isDone; + + public Task(String description) { + this.description = description; + this.isDone = false; + } + + public String getDescription() { + return description; + } + + public boolean isDone() { + return isDone; + } + + public void setIsDone(boolean isDone) { + this.isDone = isDone; + } +} From 9a4753ce0b55c2eb1d84f9f44d9cf6247fbfc230 Mon Sep 17 00:00:00 2001 From: geoboom Date: Thu, 20 Aug 2020 22:16:28 +0800 Subject: [PATCH 14/30] Make adjustments to accommodate Task class --- src/main/java/duke/duke/Duke.java | 19 +++++++++---- src/main/java/duke/input/Parser.java | 41 +++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/src/main/java/duke/duke/Duke.java b/src/main/java/duke/duke/Duke.java index 5b9fbe1800..ced28202da 100644 --- a/src/main/java/duke/duke/Duke.java +++ b/src/main/java/duke/duke/Duke.java @@ -1,5 +1,6 @@ package duke.duke; +import duke.task.Task; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -11,7 +12,7 @@ public class Duke { private static Duke duke = null; - private final List tasks; + private final List tasks; private Duke() { tasks = new ArrayList<>(); @@ -25,12 +26,20 @@ public static Duke getInstance() { return duke; } - public List addTask(String description) { - tasks.add(description); - return Collections.singletonList(description); + public List addTask(String description) { + Task task = new Task(description); + tasks.add(task); + return Collections.singletonList(task); } - public List getTasks() { + // TODO: FP. Method parameters is placeholder for now + public List editTask(int id, boolean isDone) { + Task task = tasks.get(id); + task.setIsDone(isDone); + return Collections.singletonList(task); + } + + public List getTasks() { return tasks; } } diff --git a/src/main/java/duke/input/Parser.java b/src/main/java/duke/input/Parser.java index 5a6313908d..ea8c454dc6 100644 --- a/src/main/java/duke/input/Parser.java +++ b/src/main/java/duke/input/Parser.java @@ -1,16 +1,18 @@ package duke.input; import duke.duke.Duke; +import duke.task.Task; import java.util.List; /** - * duke.input.Parser is the class that handles input parsing. - * Given a string, it should determine what command to execute and execute it. + * duke.input.Parser is the class that handles input parsing. Given a string, it should determine + * what command to execute and execute it. */ public class Parser { public static final String CMD_TERMINATE = "bye"; public static final String CMD_TASK_LIST = "list"; + public static final String CMD_TASK_SET_DONE = "done"; /** * @param s command supplied @@ -24,14 +26,39 @@ public static boolean isExitCommand(String s) { * @param s command supplied * @return a list of string (tasks) corresponding to command execution output */ - public static List runCommand(String s) { + public static String runCommand(String s) { String[] args = s.split("\\s+", 2); + List res; + StringBuilder sb = new StringBuilder(); + switch (args[0].toLowerCase()) { - case CMD_TASK_LIST: - return Duke.getInstance().getTasks(); - default: - return Duke.getInstance().addTask(s); + case CMD_TASK_LIST: { + res = Duke.getInstance().getTasks(); + sb.append("Here are the tasks in your list:\n"); + break; + } + case CMD_TASK_SET_DONE: { + res = Duke.getInstance().editTask(Integer.parseInt(args[1]), true); + sb.append("Nice! I've marked this task as done:\n"); + break; + } + default: { + res = Duke.getInstance().addTask(s); + sb.append("You've added task:\n"); + } + } + + for (int i = 0; i < res.size(); ++i) { + sb.append(String + .format("[%s] %s", res.get(i).isDone() ? "DONE" : "NOT DONE", + res.get(i).getDescription())); + if (args[0].toLowerCase().equals(CMD_TASK_LIST)) { + sb.append(String.format(" [id=%d]", i)); + } + sb.append('\n'); } + + return sb.toString(); } } From 3a0bf410185d8031ddca3a5ba552b33823408e34 Mon Sep 17 00:00:00 2001 From: geoboom Date: Sat, 5 Sep 2020 12:21:25 +0800 Subject: [PATCH 15/30] Add Commands as an abstraction to actions, following Command pattern --- src/main/java/duke/command/Command.java | 9 +++++++ src/main/java/duke/command/EventCommand.java | 24 +++++++++++++++++++ .../java/duke/command/ListTasksCommand.java | 18 ++++++++++++++ src/main/java/duke/command/TodoCommand.java | 22 +++++++++++++++++ src/main/java/duke/task/TodoTask.java | 8 +++++++ 5 files changed, 81 insertions(+) create mode 100644 src/main/java/duke/command/Command.java create mode 100644 src/main/java/duke/command/EventCommand.java create mode 100644 src/main/java/duke/command/ListTasksCommand.java create mode 100644 src/main/java/duke/command/TodoCommand.java create mode 100644 src/main/java/duke/task/TodoTask.java diff --git a/src/main/java/duke/command/Command.java b/src/main/java/duke/command/Command.java new file mode 100644 index 0000000000..29dae2a5d2 --- /dev/null +++ b/src/main/java/duke/command/Command.java @@ -0,0 +1,9 @@ +package duke.command; + +import duke.duke.Duke; + +public abstract class Command { + + public abstract void execute(Duke duke); + public abstract void undo(Duke duke); +} diff --git a/src/main/java/duke/command/EventCommand.java b/src/main/java/duke/command/EventCommand.java new file mode 100644 index 0000000000..5bd6c2f530 --- /dev/null +++ b/src/main/java/duke/command/EventCommand.java @@ -0,0 +1,24 @@ +package duke.command; + +import duke.duke.Duke; + +public class EventCommand extends Command { + + private final String desc; + private final String at; + + public EventCommand(String desc, String at) { + this.desc = desc; + this.at = at; + } + + @Override + public void execute(Duke duke) { + duke.addEventTask(desc, at); + } + + @Override + public void undo(Duke duke) { + // stub + } +} diff --git a/src/main/java/duke/command/ListTasksCommand.java b/src/main/java/duke/command/ListTasksCommand.java new file mode 100644 index 0000000000..13361d2202 --- /dev/null +++ b/src/main/java/duke/command/ListTasksCommand.java @@ -0,0 +1,18 @@ +package duke.command; + +import duke.duke.Duke; +import duke.task.Task; +import java.util.List; + +public class ListTasksCommand extends Command { + + @Override + public void execute(Duke duke) { + List tasks = duke.getTasks(); + } + + @Override + public void undo(Duke duke) { + // stub + } +} diff --git a/src/main/java/duke/command/TodoCommand.java b/src/main/java/duke/command/TodoCommand.java new file mode 100644 index 0000000000..62958ce98e --- /dev/null +++ b/src/main/java/duke/command/TodoCommand.java @@ -0,0 +1,22 @@ +package duke.command; + +import duke.duke.Duke; + +public class TodoCommand extends Command { + + private final String desc; + + public TodoCommand(String desc) { + this.desc = desc; + } + + @Override + public void execute(Duke duke) { + duke.addTodoTask(desc); + } + + @Override + public void undo(Duke duke) { + // stub + } +} diff --git a/src/main/java/duke/task/TodoTask.java b/src/main/java/duke/task/TodoTask.java new file mode 100644 index 0000000000..d2822b6b01 --- /dev/null +++ b/src/main/java/duke/task/TodoTask.java @@ -0,0 +1,8 @@ +package duke.task; + +public class TodoTask extends Task { + + public TodoTask(String desc) { + super(desc); + } +} From 79efca05cf23745e796256d081d5699050462010 Mon Sep 17 00:00:00 2001 From: geoboom Date: Sat, 5 Sep 2020 12:22:01 +0800 Subject: [PATCH 16/30] Add CLI Observer to separate rendering of text from program logic --- src/main/java/duke/view/cli/CLI.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/main/java/duke/view/cli/CLI.java diff --git a/src/main/java/duke/view/cli/CLI.java b/src/main/java/duke/view/cli/CLI.java new file mode 100644 index 0000000000..52e127e468 --- /dev/null +++ b/src/main/java/duke/view/cli/CLI.java @@ -0,0 +1,12 @@ +package duke.view.cli; + +public class CLI { + + public CLI() { + System.out.println("Hi. Duke here.\nHow can I help you?"); + } + + public void update(String s) { + System.out.println(s); + } +} From 649cb22d588e77f56a50e3fa53e5171322284d52 Mon Sep 17 00:00:00 2001 From: geoboom Date: Sat, 5 Sep 2020 12:22:17 +0800 Subject: [PATCH 17/30] Add Commands as abstraction --- .../duke/command/CompleteTaskCommand.java | 22 +++++++++++++++++ .../java/duke/command/DeadlineCommand.java | 24 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 src/main/java/duke/command/CompleteTaskCommand.java create mode 100644 src/main/java/duke/command/DeadlineCommand.java diff --git a/src/main/java/duke/command/CompleteTaskCommand.java b/src/main/java/duke/command/CompleteTaskCommand.java new file mode 100644 index 0000000000..7c58040e47 --- /dev/null +++ b/src/main/java/duke/command/CompleteTaskCommand.java @@ -0,0 +1,22 @@ +package duke.command; + +import duke.duke.Duke; + +public class CompleteTaskCommand extends Command { + + int taskId; + + public CompleteTaskCommand(int taskId) { + this.taskId = taskId; + } + + @Override + public void execute(Duke duke) { + duke.markTaskDone(taskId); + } + + @Override + public void undo(Duke duke) { + // stub + } +} diff --git a/src/main/java/duke/command/DeadlineCommand.java b/src/main/java/duke/command/DeadlineCommand.java new file mode 100644 index 0000000000..a98074fdbf --- /dev/null +++ b/src/main/java/duke/command/DeadlineCommand.java @@ -0,0 +1,24 @@ +package duke.command; + +import duke.duke.Duke; + +public class DeadlineCommand extends Command { + + private final String desc; + private final String by; + + public DeadlineCommand(String desc, String by) { + this.desc = desc; + this.by = by; + } + + @Override + public void execute(Duke duke) { + duke.addDeadlineTask(desc, by); + } + + @Override + public void undo(Duke duke) { + // stub + } +} From 3a57b624c134aaa198f925c9e50722eb419fd68a Mon Sep 17 00:00:00 2001 From: geoboom Date: Sat, 5 Sep 2020 12:22:50 +0800 Subject: [PATCH 18/30] Use polymorphism for different task types --- src/main/java/duke/task/DeadlineTask.java | 23 ++++++++++++++++ src/main/java/duke/task/EventTask.java | 23 ++++++++++++++++ src/main/java/duke/task/Task.java | 33 +++++++++++++++++------ 3 files changed, 71 insertions(+), 8 deletions(-) create mode 100644 src/main/java/duke/task/DeadlineTask.java create mode 100644 src/main/java/duke/task/EventTask.java diff --git a/src/main/java/duke/task/DeadlineTask.java b/src/main/java/duke/task/DeadlineTask.java new file mode 100644 index 0000000000..349b39b0d2 --- /dev/null +++ b/src/main/java/duke/task/DeadlineTask.java @@ -0,0 +1,23 @@ +package duke.task; + +public class DeadlineTask extends Task { + + + private final String by; + + public DeadlineTask(String desc, String by) { + super(desc); + this.by = by; + } + + public String getBy() { + return by; + } + + + @Override + public String toString() { + return String + .format("<%d, %s, %s, %s>", getId(), getIsDone() ? "DONE" : "NOT DONE", getDesc(), by); + } +} diff --git a/src/main/java/duke/task/EventTask.java b/src/main/java/duke/task/EventTask.java new file mode 100644 index 0000000000..5f04d7f13f --- /dev/null +++ b/src/main/java/duke/task/EventTask.java @@ -0,0 +1,23 @@ +package duke.task; + +public class EventTask extends Task { + + + private final String at; + + public EventTask(String desc, String at) { + super(desc); + this.at = at; + } + + public String getAt() { + return at; + } + + + @Override + public String toString() { + return String + .format("<%d, %s, %s, %s>", getId(), getIsDone() ? "DONE" : "NOT DONE", getDesc(), at); + } +} diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java index a522c2046f..8c6f2e0ccb 100644 --- a/src/main/java/duke/task/Task.java +++ b/src/main/java/duke/task/Task.java @@ -1,23 +1,40 @@ package duke.task; public class Task { - private String description; - private boolean isDone; - public Task(String description) { - this.description = description; - this.isDone = false; + public static int numTasks = 0; + private final int id; + private final String desc; + private boolean isDone = false; + + public Task(String desc) { + this.desc = desc; + this.id = ++numTasks; + } + + public int getId() { + return id; } - public String getDescription() { - return description; + public String getDesc() { + return desc; } - public boolean isDone() { + + public boolean getIsDone() { return isDone; } public void setIsDone(boolean isDone) { this.isDone = isDone; } + + public void markDone() { + setIsDone(true); + } + + @Override + public String toString() { + return String.format("<%d, %s, %s>", id, isDone ? "DONE" : "NOT DONE", desc); + } } From 6d89193e22f568c58421f7fe20c273b3cdac4960 Mon Sep 17 00:00:00 2001 From: geoboom Date: Sat, 5 Sep 2020 12:23:08 +0800 Subject: [PATCH 19/30] Add exception class to handle parsing issues --- src/main/java/duke/exception/ParserException.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/main/java/duke/exception/ParserException.java diff --git a/src/main/java/duke/exception/ParserException.java b/src/main/java/duke/exception/ParserException.java new file mode 100644 index 0000000000..155d665440 --- /dev/null +++ b/src/main/java/duke/exception/ParserException.java @@ -0,0 +1,9 @@ +package duke.exception; + +public class ParserException extends Exception { + + public ParserException(String message) { + super(message); + } + +} From f0a8f283e8c58efb4680b8e75e52e56cf119ff41 Mon Sep 17 00:00:00 2001 From: geoboom Date: Sat, 5 Sep 2020 12:23:29 +0800 Subject: [PATCH 20/30] Update duke store to fit new implementation of program --- src/main/java/duke/duke/Duke.java | 41 +++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/src/main/java/duke/duke/Duke.java b/src/main/java/duke/duke/Duke.java index ced28202da..2598d2cdf2 100644 --- a/src/main/java/duke/duke/Duke.java +++ b/src/main/java/duke/duke/Duke.java @@ -1,8 +1,11 @@ package duke.duke; +import duke.task.DeadlineTask; +import duke.task.EventTask; import duke.task.Task; +import duke.task.TodoTask; +import duke.view.cli.CLI; import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** @@ -11,6 +14,7 @@ */ public class Duke { + private CLI observer; private static Duke duke = null; private final List tasks; @@ -26,20 +30,41 @@ public static Duke getInstance() { return duke; } - public List addTask(String description) { - Task task = new Task(description); + // TODO: observer list + public void addObserver(CLI observer) { + this.observer = observer; + } + + public void notifyObservers(String s) { + observer.update(s); + } + + public void addTodoTask(String description) { + Task task = new TodoTask(description); + tasks.add(task); + notifyObservers(task.toString()); + } + + public void addEventTask(String description, String at) { + Task task = new EventTask(description, at); + tasks.add(task); + notifyObservers(task.toString()); + } + + public void addDeadlineTask(String description, String by) { + Task task = new DeadlineTask(description, by); tasks.add(task); - return Collections.singletonList(task); + notifyObservers(task.toString()); } - // TODO: FP. Method parameters is placeholder for now - public List editTask(int id, boolean isDone) { + public void markTaskDone(int id) { Task task = tasks.get(id); - task.setIsDone(isDone); - return Collections.singletonList(task); + task.markDone(); + notifyObservers(task.toString()); } public List getTasks() { + notifyObservers(tasks.toString()); return tasks; } } From ed8978444d70ab05a3fa1c022480f06ac77eb25b Mon Sep 17 00:00:00 2001 From: geoboom Date: Sat, 5 Sep 2020 12:23:45 +0800 Subject: [PATCH 21/30] Update parser to return Command object on parsing string --- src/main/java/duke/input/Parser.java | 91 +++++++++++++++++++--------- 1 file changed, 64 insertions(+), 27 deletions(-) diff --git a/src/main/java/duke/input/Parser.java b/src/main/java/duke/input/Parser.java index ea8c454dc6..95e7e63a53 100644 --- a/src/main/java/duke/input/Parser.java +++ b/src/main/java/duke/input/Parser.java @@ -1,8 +1,12 @@ package duke.input; -import duke.duke.Duke; -import duke.task.Task; -import java.util.List; +import duke.command.Command; +import duke.command.CompleteTaskCommand; +import duke.command.DeadlineCommand; +import duke.command.EventCommand; +import duke.command.ListTasksCommand; +import duke.command.TodoCommand; +import duke.exception.ParserException; /** * duke.input.Parser is the class that handles input parsing. Given a string, it should determine @@ -13,6 +17,9 @@ public class Parser { public static final String CMD_TERMINATE = "bye"; public static final String CMD_TASK_LIST = "list"; public static final String CMD_TASK_SET_DONE = "done"; + public static final String CMD_TASK_ADD_TODO = "todo"; + public static final String CMD_TASK_ADD_EVENT = "event"; + public static final String CMD_TASK_ADD_DEADLINE = "deadline"; /** * @param s command supplied @@ -26,39 +33,69 @@ public static boolean isExitCommand(String s) { * @param s command supplied * @return a list of string (tasks) corresponding to command execution output */ - public static String runCommand(String s) { + public static Command parseCommand(String s) throws ParserException { String[] args = s.split("\\s+", 2); - List res; - StringBuilder sb = new StringBuilder(); - switch (args[0].toLowerCase()) { - case CMD_TASK_LIST: { - res = Duke.getInstance().getTasks(); - sb.append("Here are the tasks in your list:\n"); - break; + case CMD_TASK_LIST: + return new ListTasksCommand(); + case CMD_TASK_ADD_TODO: { + String todo = parseTodo(args[1]); + return new TodoCommand(todo); } - case CMD_TASK_SET_DONE: { - res = Duke.getInstance().editTask(Integer.parseInt(args[1]), true); - sb.append("Nice! I've marked this task as done:\n"); - break; + case CMD_TASK_ADD_EVENT: { + String[] inputArr = parseEvent(args[1]); + return new EventCommand(inputArr[0], inputArr[1]); } - default: { - res = Duke.getInstance().addTask(s); - sb.append("You've added task:\n"); + case CMD_TASK_ADD_DEADLINE: { + String[] inputArr = parseDeadline(args[1]); + return new DeadlineCommand(inputArr[0], inputArr[1]); + } + case CMD_TASK_SET_DONE: { + int[] taskIdList = parseMarkDone(args[1]); + return new CompleteTaskCommand(taskIdList[0]); +// for (int taskId : taskIdList) { +// Command command = new CompleteTaskCommand(taskId); +// command.execute(Duke.getInstance()); +// } } + default: + throw new ParserException("No such command!"); } + } - for (int i = 0; i < res.size(); ++i) { - sb.append(String - .format("[%s] %s", res.get(i).isDone() ? "DONE" : "NOT DONE", - res.get(i).getDescription())); - if (args[0].toLowerCase().equals(CMD_TASK_LIST)) { - sb.append(String.format(" [id=%d]", i)); - } - sb.append('\n'); + public static String parseTodo(String s) throws ParserException { + if (s.length() <= 0) { + throw new ParserException("Todo format error."); } + return s; + } - return sb.toString(); + public static String[] parseEvent(String s) throws ParserException { + String[] arr = s.split(" /at "); + if (arr.length <= 1) { + throw new ParserException("Event format error."); + } + return arr; + } + + public static String[] parseDeadline(String s) throws ParserException { + String[] arr = s.split(" /by "); + if (arr.length <= 1) { + throw new ParserException("Deadline format error."); + } + return arr; + } + + public static int[] parseMarkDone(String s) throws ParserException { + String[] arr = s.split(" "); + if (arr.length <= 0) { + throw new ParserException("Mark tasks done format error."); + } + int[] taskIdList = new int[arr.length]; + for (int i = 0; i < arr.length; ++i) { + taskIdList[i] = Integer.parseInt(arr[i]); + } + return taskIdList; } } From a734e0549e2013ce5ff49731b4823488c4f7b41d Mon Sep 17 00:00:00 2001 From: geoboom Date: Sat, 5 Sep 2020 12:24:01 +0800 Subject: [PATCH 22/30] Update to use new implementation of classes and logic --- src/main/java/duke/runner/Runner.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/duke/runner/Runner.java b/src/main/java/duke/runner/Runner.java index 936bb9be11..746fd80ec6 100644 --- a/src/main/java/duke/runner/Runner.java +++ b/src/main/java/duke/runner/Runner.java @@ -1,6 +1,10 @@ package duke.runner; +import duke.command.Command; +import duke.duke.Duke; +import duke.exception.ParserException; import duke.input.Parser; +import duke.view.cli.CLI; import java.util.Scanner; /** @@ -18,12 +22,17 @@ public static void main(String[] args) { * Also runs the event loop. */ public static void run() { - System.out.println("Hi. Duke here.\nHow can I help you?"); Scanner sc = new Scanner(System.in); + Duke.getInstance().addObserver(new CLI()); String input; - while (!Parser.isExitCommand(input = sc.nextLine())) { - System.out.println(Parser.runCommand(input)); + while (!Parser.isExitCommand(input = sc.nextLine().trim())) { + try { + Command command = Parser.parseCommand(input); + command.execute(Duke.getInstance()); + } catch (ParserException e) { + System.out.println(e.getMessage()); + } } System.out.println("Bye. Hope to see you again."); From 1f9790d611ee9c2228ef3c4eb25a3a5334f505f1 Mon Sep 17 00:00:00 2001 From: geoboom Date: Sat, 5 Sep 2020 12:24:11 +0800 Subject: [PATCH 23/30] Misc from testing --- text-ui-test/ACTUAL.TXT | 25 ++++++++++++++++++++++--- text-ui-test/EXPECTED.TXT | 25 ++++++++++++++++++++++--- text-ui-test/input.txt | 3 +++ 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/text-ui-test/ACTUAL.TXT b/text-ui-test/ACTUAL.TXT index 10f068ab90..9ccb0fe2af 100644 --- a/text-ui-test/ACTUAL.TXT +++ b/text-ui-test/ACTUAL.TXT @@ -1,6 +1,25 @@ Hi. Duke here. How can I help you? -[read book] -[return book] -[read book, return book] +You've added task: +[NOT DONE] read book + +You've added task: +[NOT DONE] return book + +You've added task: +[NOT DONE] buy bread + +Here are the tasks in your list: +[NOT DONE] read book [id=0] +[NOT DONE] return book [id=1] +[NOT DONE] buy bread [id=2] + +Nice! I've marked this task as done: +[DONE] return book + +Here are the tasks in your list: +[NOT DONE] read book [id=0] +[DONE] return book [id=1] +[NOT DONE] buy bread [id=2] + Bye. Hope to see you again. diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 10f068ab90..9ccb0fe2af 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,6 +1,25 @@ Hi. Duke here. How can I help you? -[read book] -[return book] -[read book, return book] +You've added task: +[NOT DONE] read book + +You've added task: +[NOT DONE] return book + +You've added task: +[NOT DONE] buy bread + +Here are the tasks in your list: +[NOT DONE] read book [id=0] +[NOT DONE] return book [id=1] +[NOT DONE] buy bread [id=2] + +Nice! I've marked this task as done: +[DONE] return book + +Here are the tasks in your list: +[NOT DONE] read book [id=0] +[DONE] return book [id=1] +[NOT DONE] buy bread [id=2] + Bye. Hope to see you again. diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index efe76cbf43..9b43595e53 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,4 +1,7 @@ read book return book +buy bread +list +done 1 list bye From c1338b25628d9b6a432a8d17d8f84b8c60a63ea5 Mon Sep 17 00:00:00 2001 From: geoboom Date: Tue, 8 Sep 2020 13:24:58 +0800 Subject: [PATCH 24/30] Add deleteTask --- src/main/java/duke/duke/Duke.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/duke/duke/Duke.java b/src/main/java/duke/duke/Duke.java index 2598d2cdf2..34b58dffc9 100644 --- a/src/main/java/duke/duke/Duke.java +++ b/src/main/java/duke/duke/Duke.java @@ -42,25 +42,31 @@ public void notifyObservers(String s) { public void addTodoTask(String description) { Task task = new TodoTask(description); tasks.add(task); - notifyObservers(task.toString()); + notifyObservers("Added TODO: " + task.toString()); } public void addEventTask(String description, String at) { Task task = new EventTask(description, at); tasks.add(task); - notifyObservers(task.toString()); + notifyObservers("Added EVENT: " + task.toString()); } public void addDeadlineTask(String description, String by) { Task task = new DeadlineTask(description, by); tasks.add(task); - notifyObservers(task.toString()); + notifyObservers("Added DEADLINE: " + task.toString()); } public void markTaskDone(int id) { Task task = tasks.get(id); task.markDone(); - notifyObservers(task.toString()); + notifyObservers("Marked DONE:" + task.toString()); + } + + public void deleteTask(int id) { + Task task = tasks.remove(id); + notifyObservers("DELETED:" + task.toString()); + notifyObservers(String.format("You now have %d tasks.", tasks.size())); } public List getTasks() { From 9f3dc2cb3b7c987c064e47147a0ac035fd478769 Mon Sep 17 00:00:00 2001 From: geoboom Date: Tue, 8 Sep 2020 13:25:13 +0800 Subject: [PATCH 25/30] Add parsing of delete task and implement enums --- src/main/java/duke/input/Parser.java | 46 ++++++++++++++++------------ 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/src/main/java/duke/input/Parser.java b/src/main/java/duke/input/Parser.java index 95e7e63a53..0b65b5109f 100644 --- a/src/main/java/duke/input/Parser.java +++ b/src/main/java/duke/input/Parser.java @@ -1,8 +1,10 @@ package duke.input; import duke.command.Command; +import duke.command.CommandEnum; import duke.command.CompleteTaskCommand; import duke.command.DeadlineCommand; +import duke.command.DeleteTaskCommand; import duke.command.EventCommand; import duke.command.ListTasksCommand; import duke.command.TodoCommand; @@ -13,20 +15,12 @@ * what command to execute and execute it. */ public class Parser { - - public static final String CMD_TERMINATE = "bye"; - public static final String CMD_TASK_LIST = "list"; - public static final String CMD_TASK_SET_DONE = "done"; - public static final String CMD_TASK_ADD_TODO = "todo"; - public static final String CMD_TASK_ADD_EVENT = "event"; - public static final String CMD_TASK_ADD_DEADLINE = "deadline"; - /** * @param s command supplied * @return true if it's an exit command, ignoring case */ - public static boolean isExitCommand(String s) { - return s.toLowerCase().equals(CMD_TERMINATE); + public static boolean isTerminate(String s) { + return CommandEnum.valueOf(s.toUpperCase()).equals(CommandEnum.TERMINATE); } /** @@ -35,28 +29,42 @@ public static boolean isExitCommand(String s) { */ public static Command parseCommand(String s) throws ParserException { String[] args = s.split("\\s+", 2); + CommandEnum cmdEnum; + try { + cmdEnum = CommandEnum.valueOf(args[0].toUpperCase()); + } catch (IllegalArgumentException e) { + throw new ParserException("Invalid command."); + } - switch (args[0].toLowerCase()) { - case CMD_TASK_LIST: + switch (cmdEnum) { + case TASK_LIST: return new ListTasksCommand(); - case CMD_TASK_ADD_TODO: { + case TASK_ADD_TODO: { String todo = parseTodo(args[1]); return new TodoCommand(todo); } - case CMD_TASK_ADD_EVENT: { + case TASK_ADD_EVENT: { String[] inputArr = parseEvent(args[1]); return new EventCommand(inputArr[0], inputArr[1]); } - case CMD_TASK_ADD_DEADLINE: { + case TASK_ADD_DEADLINE: { String[] inputArr = parseDeadline(args[1]); return new DeadlineCommand(inputArr[0], inputArr[1]); } - case CMD_TASK_SET_DONE: { - int[] taskIdList = parseMarkDone(args[1]); + case TASK_SET_DONE: { + int[] taskIdList = parseTaskIds(args[1]); return new CompleteTaskCommand(taskIdList[0]); // for (int taskId : taskIdList) { // Command command = new CompleteTaskCommand(taskId); // command.execute(Duke.getInstance()); +// } + } + case TASK_DELETE: { + int[] taskIdList = parseTaskIds(args[1]); + return new DeleteTaskCommand(taskIdList[0]); +// for (int taskId : taskIdList) { +// Command command = new CompleteTaskCommand(taskId); +// command.execute(Duke.getInstance()); // } } default: @@ -87,10 +95,10 @@ public static String[] parseDeadline(String s) throws ParserException { return arr; } - public static int[] parseMarkDone(String s) throws ParserException { + public static int[] parseTaskIds(String s) throws ParserException { String[] arr = s.split(" "); if (arr.length <= 0) { - throw new ParserException("Mark tasks done format error."); + throw new ParserException("Task numbers format error."); } int[] taskIdList = new int[arr.length]; for (int i = 0; i < arr.length; ++i) { From b5a855ccaba8a1a46c63749952a416fb53f5c701 Mon Sep 17 00:00:00 2001 From: geoboom Date: Tue, 8 Sep 2020 13:25:28 +0800 Subject: [PATCH 26/30] Rename (refactor) --- src/main/java/duke/runner/Runner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/duke/runner/Runner.java b/src/main/java/duke/runner/Runner.java index 746fd80ec6..de7e01b6af 100644 --- a/src/main/java/duke/runner/Runner.java +++ b/src/main/java/duke/runner/Runner.java @@ -26,7 +26,7 @@ public static void run() { Duke.getInstance().addObserver(new CLI()); String input; - while (!Parser.isExitCommand(input = sc.nextLine().trim())) { + while (!Parser.isTerminate(input = sc.nextLine().trim())) { try { Command command = Parser.parseCommand(input); command.execute(Duke.getInstance()); From 9879d0f3e9f87091ea83ae8fbb4500ae378fab00 Mon Sep 17 00:00:00 2001 From: geoboom Date: Tue, 8 Sep 2020 13:25:43 +0800 Subject: [PATCH 27/30] Add delete command --- .../java/duke/command/DeleteTaskCommand.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/java/duke/command/DeleteTaskCommand.java diff --git a/src/main/java/duke/command/DeleteTaskCommand.java b/src/main/java/duke/command/DeleteTaskCommand.java new file mode 100644 index 0000000000..a836725bcd --- /dev/null +++ b/src/main/java/duke/command/DeleteTaskCommand.java @@ -0,0 +1,22 @@ +package duke.command; + +import duke.duke.Duke; + +public class DeleteTaskCommand extends Command { + int taskId; + + public DeleteTaskCommand(int taskId) { + this.taskId = taskId; + } + + @Override + public void execute(Duke duke) { + // TODO: make this duke.deleteTask return pos info for undo operation + duke.deleteTask(taskId); + } + + @Override + public void undo(Duke duke) { + // stub + } +} From 46cc08fd2e9398163e11991b877c92480e5244d2 Mon Sep 17 00:00:00 2001 From: geoboom Date: Tue, 8 Sep 2020 13:25:52 +0800 Subject: [PATCH 28/30] Add command enum --- src/main/java/duke/command/CommandEnum.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/main/java/duke/command/CommandEnum.java diff --git a/src/main/java/duke/command/CommandEnum.java b/src/main/java/duke/command/CommandEnum.java new file mode 100644 index 0000000000..c5ca23e419 --- /dev/null +++ b/src/main/java/duke/command/CommandEnum.java @@ -0,0 +1,11 @@ +package duke.command; + +public enum CommandEnum { + TERMINATE, + TASK_LIST, + TASK_SET_DONE, + TASK_DELETE, + TASK_ADD_TODO, + TASK_ADD_EVENT, + TASK_ADD_DEADLINE, +} From 95662288c8320f7ea98970db10952b7be0d0122d Mon Sep 17 00:00:00 2001 From: geoboom Date: Wed, 9 Sep 2020 10:51:42 +0800 Subject: [PATCH 29/30] Add Storage --- src/main/java/duke/duke/Duke.java | 37 ++++++---- src/main/java/duke/runner/Runner.java | 15 ++-- src/main/java/duke/task/DeadlineTask.java | 3 +- src/main/java/duke/task/EventTask.java | 3 +- src/main/java/duke/task/Task.java | 2 +- .../java/duke/{input => utils}/Parser.java | 4 +- src/main/java/duke/utils/Storage.java | 73 +++++++++++++++++++ src/test/java/duke/input/ParserTest.java | 3 +- 8 files changed, 110 insertions(+), 30 deletions(-) rename src/main/java/duke/{input => utils}/Parser.java (97%) create mode 100644 src/main/java/duke/utils/Storage.java diff --git a/src/main/java/duke/duke/Duke.java b/src/main/java/duke/duke/Duke.java index 34b58dffc9..d3c19e3823 100644 --- a/src/main/java/duke/duke/Duke.java +++ b/src/main/java/duke/duke/Duke.java @@ -4,6 +4,7 @@ import duke.task.EventTask; import duke.task.Task; import duke.task.TodoTask; +import duke.utils.Storage; import duke.view.cli.CLI; import java.util.ArrayList; import java.util.List; @@ -15,19 +16,16 @@ public class Duke { private CLI observer; - private static Duke duke = null; private final List tasks; + private Storage storage; - private Duke() { - tasks = new ArrayList<>(); - } - - public static Duke getInstance() { - if (duke == null) { - duke = new Duke(); + public Duke(Storage storage) { + this.storage = storage; + try { + tasks = new ArrayList<>(this.storage.load()); + } catch (Exception e) { + tasks = new ArrayList<>(); } - - return duke; } // TODO: observer list @@ -39,34 +37,43 @@ public void notifyObservers(String s) { observer.update(s); } - public void addTodoTask(String description) { + public void updateStorage() throws Exception { + storage.store(tasks); + } + + public void addTodoTask(String description) throws Exception { Task task = new TodoTask(description); tasks.add(task); notifyObservers("Added TODO: " + task.toString()); + updateStorage(); } - public void addEventTask(String description, String at) { + public void addEventTask(String description, String at) throws Exception { Task task = new EventTask(description, at); tasks.add(task); notifyObservers("Added EVENT: " + task.toString()); + updateStorage(); } - public void addDeadlineTask(String description, String by) { + public void addDeadlineTask(String description, String by) throws Exception { Task task = new DeadlineTask(description, by); tasks.add(task); notifyObservers("Added DEADLINE: " + task.toString()); + updateStorage(); } - public void markTaskDone(int id) { + public void markTaskDone(int id) throws Exception { Task task = tasks.get(id); task.markDone(); notifyObservers("Marked DONE:" + task.toString()); + updateStorage(); } - public void deleteTask(int id) { + public void deleteTask(int id) throws Exception { Task task = tasks.remove(id); notifyObservers("DELETED:" + task.toString()); notifyObservers(String.format("You now have %d tasks.", tasks.size())); + updateStorage(); } public List getTasks() { diff --git a/src/main/java/duke/runner/Runner.java b/src/main/java/duke/runner/Runner.java index de7e01b6af..d9a57a8165 100644 --- a/src/main/java/duke/runner/Runner.java +++ b/src/main/java/duke/runner/Runner.java @@ -3,13 +3,14 @@ import duke.command.Command; import duke.duke.Duke; import duke.exception.ParserException; -import duke.input.Parser; +import duke.utils.Parser; +import duke.utils.Storage; import duke.view.cli.CLI; import java.util.Scanner; /** - * Class that handles the "event loop" of the CLI program, terminating - * when a termination command is detected. + * Class that handles the "event loop" of the CLI program, terminating when a termination command is + * detected. */ public class Runner { @@ -18,18 +19,18 @@ public static void main(String[] args) { } /** - * Prints hello, goodbye, nd output of command executions. - * Also runs the event loop. + * Prints hello, goodbye, nd output of command executions. Also runs the event loop. */ public static void run() { Scanner sc = new Scanner(System.in); - Duke.getInstance().addObserver(new CLI()); + Duke duke = new Duke(new Storage("data/data.txt")); + duke.addObserver(new CLI()); String input; while (!Parser.isTerminate(input = sc.nextLine().trim())) { try { Command command = Parser.parseCommand(input); - command.execute(Duke.getInstance()); + command.execute(duke); } catch (ParserException e) { System.out.println(e.getMessage()); } diff --git a/src/main/java/duke/task/DeadlineTask.java b/src/main/java/duke/task/DeadlineTask.java index 349b39b0d2..0bd8421c95 100644 --- a/src/main/java/duke/task/DeadlineTask.java +++ b/src/main/java/duke/task/DeadlineTask.java @@ -18,6 +18,7 @@ public String getBy() { @Override public String toString() { return String - .format("<%d, %s, %s, %s>", getId(), getIsDone() ? "DONE" : "NOT DONE", getDesc(), by); + .format("%d | %s | %s | %s | %s", getId(), getIsDone() ? "DONE" : "NOT DONE", "DEADLINE", + getDesc(), by); } } diff --git a/src/main/java/duke/task/EventTask.java b/src/main/java/duke/task/EventTask.java index 5f04d7f13f..250a140abf 100644 --- a/src/main/java/duke/task/EventTask.java +++ b/src/main/java/duke/task/EventTask.java @@ -17,7 +17,6 @@ public String getAt() { @Override public String toString() { - return String - .format("<%d, %s, %s, %s>", getId(), getIsDone() ? "DONE" : "NOT DONE", getDesc(), at); + return String.format("%d | %s | %s | %s | %s", getId(), getIsDone() ? "DONE" : "NOT DONE", "EVENT", getDesc(), at); } } diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java index 8c6f2e0ccb..56e8c79590 100644 --- a/src/main/java/duke/task/Task.java +++ b/src/main/java/duke/task/Task.java @@ -35,6 +35,6 @@ public void markDone() { @Override public String toString() { - return String.format("<%d, %s, %s>", id, isDone ? "DONE" : "NOT DONE", desc); + return String.format("%d | %s | %s | %s", id, isDone ? "DONE" : "NOT DONE", "TODO", desc); } } diff --git a/src/main/java/duke/input/Parser.java b/src/main/java/duke/utils/Parser.java similarity index 97% rename from src/main/java/duke/input/Parser.java rename to src/main/java/duke/utils/Parser.java index 0b65b5109f..3014f95e7b 100644 --- a/src/main/java/duke/input/Parser.java +++ b/src/main/java/duke/utils/Parser.java @@ -1,4 +1,4 @@ -package duke.input; +package duke.utils; import duke.command.Command; import duke.command.CommandEnum; @@ -11,7 +11,7 @@ import duke.exception.ParserException; /** - * duke.input.Parser is the class that handles input parsing. Given a string, it should determine + * duke.utils.Parser is the class that handles input parsing. Given a string, it should determine * what command to execute and execute it. */ public class Parser { diff --git a/src/main/java/duke/utils/Storage.java b/src/main/java/duke/utils/Storage.java new file mode 100644 index 0000000000..b4c88af8b7 --- /dev/null +++ b/src/main/java/duke/utils/Storage.java @@ -0,0 +1,73 @@ +package duke.utils; + +import duke.exception.ParserException; +import duke.task.DeadlineTask; +import duke.task.EventTask; +import duke.task.Task; +import duke.task.TodoTask; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Scanner; + +public class Storage { + + private static final int ID_POS = 0; + private static final int DONE_POS = 1; + private static final int TYPE_POS = 2; + private static final int DESC_POS = 3; + private static final int DATE_POS = 4; + + private File file; + + public Storage(String path) { + this.file = new File(path); + } + + private void init() throws IOException { + if (!file.exists()) { + File dir = new File(file.getParent()); + if (!dir.exists()) { + dir.mkdirs(); + } + file.createNewFile(); + } + } + + public void store(List tasks) throws IOException { + init(); + FileWriter fw = new FileWriter(file); + for (Task task : tasks) { + fw.write(task.toString() + '\n'); + } + fw.close(); + } + + public ArrayList load() throws FileNotFoundException, ParserException { + Scanner sc = new Scanner(file); + ArrayList tasks = new ArrayList<>(); + while (sc.hasNextLine()) { + String[] chunks = sc.nextLine().split(" \\| "); + Task task; + switch (chunks[TYPE_POS]) { + case "TODO": + task = new TodoTask(chunks[DESC_POS]); + break; + case "DEADLINE": + task = new DeadlineTask(chunks[DESC_POS], chunks[DATE_POS]); + break; + case "EVENT": + task = new EventTask(chunks[DESC_POS], chunks[DATE_POS]); + break; + default: + throw new ParserException("Invalid task format"); + } + tasks.add(task); + } + sc.close(); + return tasks; + } +} diff --git a/src/test/java/duke/input/ParserTest.java b/src/test/java/duke/input/ParserTest.java index 5d4efed198..5c889a850e 100644 --- a/src/test/java/duke/input/ParserTest.java +++ b/src/test/java/duke/input/ParserTest.java @@ -2,11 +2,10 @@ import static org.junit.jupiter.api.Assertions.*; -import duke.duke.Duke; +import duke.utils.Parser; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; class ParserTest { From b026f49bb0ae57c26644efd613764f6241258d07 Mon Sep 17 00:00:00 2001 From: geoboom Date: Fri, 18 Sep 2020 21:55:58 +0800 Subject: [PATCH 30/30] Implement DateTime stuff --- .project | 17 +++++++ .settings/org.eclipse.buildship.core.prefs | 13 ++++++ data/data.txt | 3 ++ src/main/java/duke/command/ByeCommand.java | 24 ++++++++++ src/main/java/duke/command/Command.java | 4 +- src/main/java/duke/command/CommandEnum.java | 14 +++--- .../duke/command/CompleteTaskCommand.java | 7 ++- .../java/duke/command/DeadlineCommand.java | 8 +++- .../java/duke/command/DeleteTaskCommand.java | 7 ++- src/main/java/duke/command/EventCommand.java | 7 ++- .../java/duke/command/ListTasksCommand.java | 5 ++ src/main/java/duke/command/TodoCommand.java | 7 ++- src/main/java/duke/duke/Duke.java | 20 ++++++-- src/main/java/duke/runner/Runner.java | 12 +++-- src/main/java/duke/task/DeadlineTask.java | 20 +++++--- src/main/java/duke/task/EventTask.java | 22 ++++++--- src/main/java/duke/utils/Parser.java | 46 +++++++++---------- src/main/java/duke/view/cli/CLI.java | 4 ++ 18 files changed, 179 insertions(+), 61 deletions(-) create mode 100644 .project create mode 100644 .settings/org.eclipse.buildship.core.prefs create mode 100644 data/data.txt create mode 100644 src/main/java/duke/command/ByeCommand.java diff --git a/.project b/.project new file mode 100644 index 0000000000..4d9ddc4c72 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + CS2103T-iP + Project CS2103T-iP created by Buildship. + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000000..77c1ccb978 --- /dev/null +++ b/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) +connection.project.dir= +eclipse.preferences.version=1 +gradle.user.home= +java.home=/usr/lib/jvm/java-14-jdk +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/data/data.txt b/data/data.txt new file mode 100644 index 0000000000..60a6cd422a --- /dev/null +++ b/data/data.txt @@ -0,0 +1,3 @@ +2 | NOT DONE | DEADLINE | testing | 12/10/1999 2359 +3 | NOT DONE | EVENT | my name chef | 10/10/2021 1800 +4 | NOT DONE | TODO | mynamechef diff --git a/src/main/java/duke/command/ByeCommand.java b/src/main/java/duke/command/ByeCommand.java new file mode 100644 index 0000000000..5ab196332b --- /dev/null +++ b/src/main/java/duke/command/ByeCommand.java @@ -0,0 +1,24 @@ +package duke.command; + +import duke.duke.Duke; + +public class ByeCommand extends Command { + + public ByeCommand() { + } + + @Override + public void execute(Duke duke) throws Exception { + duke.removeAllObservers(); + } + + @Override + public void undo(Duke duke) { + // stub + } + + @Override + public boolean isExit() { + return true; + } +} diff --git a/src/main/java/duke/command/Command.java b/src/main/java/duke/command/Command.java index 29dae2a5d2..a137c708fd 100644 --- a/src/main/java/duke/command/Command.java +++ b/src/main/java/duke/command/Command.java @@ -3,7 +3,7 @@ import duke.duke.Duke; public abstract class Command { - - public abstract void execute(Duke duke); + public abstract void execute(Duke duke) throws Exception; public abstract void undo(Duke duke); + public abstract boolean isExit(); } diff --git a/src/main/java/duke/command/CommandEnum.java b/src/main/java/duke/command/CommandEnum.java index c5ca23e419..a3378e4407 100644 --- a/src/main/java/duke/command/CommandEnum.java +++ b/src/main/java/duke/command/CommandEnum.java @@ -1,11 +1,11 @@ package duke.command; public enum CommandEnum { - TERMINATE, - TASK_LIST, - TASK_SET_DONE, - TASK_DELETE, - TASK_ADD_TODO, - TASK_ADD_EVENT, - TASK_ADD_DEADLINE, + BYE, + LIST, + DONE, + DELETE, + TODO, + EVENT, + DEADLINE, } diff --git a/src/main/java/duke/command/CompleteTaskCommand.java b/src/main/java/duke/command/CompleteTaskCommand.java index 7c58040e47..98c083009c 100644 --- a/src/main/java/duke/command/CompleteTaskCommand.java +++ b/src/main/java/duke/command/CompleteTaskCommand.java @@ -11,7 +11,7 @@ public CompleteTaskCommand(int taskId) { } @Override - public void execute(Duke duke) { + public void execute(Duke duke) throws Exception { duke.markTaskDone(taskId); } @@ -19,4 +19,9 @@ public void execute(Duke duke) { public void undo(Duke duke) { // stub } + + @Override + public boolean isExit() { + return false; + } } diff --git a/src/main/java/duke/command/DeadlineCommand.java b/src/main/java/duke/command/DeadlineCommand.java index a98074fdbf..63c0b406d3 100644 --- a/src/main/java/duke/command/DeadlineCommand.java +++ b/src/main/java/duke/command/DeadlineCommand.java @@ -4,6 +4,7 @@ public class DeadlineCommand extends Command { + private final String desc; private final String by; @@ -13,7 +14,7 @@ public DeadlineCommand(String desc, String by) { } @Override - public void execute(Duke duke) { + public void execute(Duke duke) throws Exception { duke.addDeadlineTask(desc, by); } @@ -21,4 +22,9 @@ public void execute(Duke duke) { public void undo(Duke duke) { // stub } + + @Override + public boolean isExit() { + return false; + } } diff --git a/src/main/java/duke/command/DeleteTaskCommand.java b/src/main/java/duke/command/DeleteTaskCommand.java index a836725bcd..c1ec2354a6 100644 --- a/src/main/java/duke/command/DeleteTaskCommand.java +++ b/src/main/java/duke/command/DeleteTaskCommand.java @@ -10,7 +10,7 @@ public DeleteTaskCommand(int taskId) { } @Override - public void execute(Duke duke) { + public void execute(Duke duke) throws Exception{ // TODO: make this duke.deleteTask return pos info for undo operation duke.deleteTask(taskId); } @@ -19,4 +19,9 @@ public void execute(Duke duke) { public void undo(Duke duke) { // stub } + + @Override + public boolean isExit() { + return false; + } } diff --git a/src/main/java/duke/command/EventCommand.java b/src/main/java/duke/command/EventCommand.java index 5bd6c2f530..ff955c3fba 100644 --- a/src/main/java/duke/command/EventCommand.java +++ b/src/main/java/duke/command/EventCommand.java @@ -13,7 +13,7 @@ public EventCommand(String desc, String at) { } @Override - public void execute(Duke duke) { + public void execute(Duke duke) throws Exception { duke.addEventTask(desc, at); } @@ -21,4 +21,9 @@ public void execute(Duke duke) { public void undo(Duke duke) { // stub } + + @Override + public boolean isExit() { + return false; + } } diff --git a/src/main/java/duke/command/ListTasksCommand.java b/src/main/java/duke/command/ListTasksCommand.java index 13361d2202..9549a44a4e 100644 --- a/src/main/java/duke/command/ListTasksCommand.java +++ b/src/main/java/duke/command/ListTasksCommand.java @@ -15,4 +15,9 @@ public void execute(Duke duke) { public void undo(Duke duke) { // stub } + + @Override + public boolean isExit() { + return false; + } } diff --git a/src/main/java/duke/command/TodoCommand.java b/src/main/java/duke/command/TodoCommand.java index 62958ce98e..4bdf884024 100644 --- a/src/main/java/duke/command/TodoCommand.java +++ b/src/main/java/duke/command/TodoCommand.java @@ -11,7 +11,7 @@ public TodoCommand(String desc) { } @Override - public void execute(Duke duke) { + public void execute(Duke duke) throws Exception { duke.addTodoTask(desc); } @@ -19,4 +19,9 @@ public void execute(Duke duke) { public void undo(Duke duke) { // stub } + + @Override + public boolean isExit() { + return false; + } } diff --git a/src/main/java/duke/duke/Duke.java b/src/main/java/duke/duke/Duke.java index d3c19e3823..eb61e42edd 100644 --- a/src/main/java/duke/duke/Duke.java +++ b/src/main/java/duke/duke/Duke.java @@ -16,8 +16,8 @@ public class Duke { private CLI observer; - private final List tasks; - private Storage storage; + private List tasks; + private final Storage storage; public Duke(Storage storage) { this.storage = storage; @@ -37,6 +37,16 @@ public void notifyObservers(String s) { observer.update(s); } + public void removeObserver(CLI observer) { + observer.close(); + this.observer = null; + } + + public void removeAllObservers() { + this.observer.close(); + this.observer = null; + } + public void updateStorage() throws Exception { storage.store(tasks); } @@ -45,21 +55,21 @@ public void addTodoTask(String description) throws Exception { Task task = new TodoTask(description); tasks.add(task); notifyObservers("Added TODO: " + task.toString()); - updateStorage(); + updateStorage(); // TODO: storage as observer } public void addEventTask(String description, String at) throws Exception { Task task = new EventTask(description, at); tasks.add(task); notifyObservers("Added EVENT: " + task.toString()); - updateStorage(); + updateStorage(); // TODO: storage as observer } public void addDeadlineTask(String description, String by) throws Exception { Task task = new DeadlineTask(description, by); tasks.add(task); notifyObservers("Added DEADLINE: " + task.toString()); - updateStorage(); + updateStorage(); // TODO: storage as observer } public void markTaskDone(int id) throws Exception { diff --git a/src/main/java/duke/runner/Runner.java b/src/main/java/duke/runner/Runner.java index d9a57a8165..1c16e43479 100644 --- a/src/main/java/duke/runner/Runner.java +++ b/src/main/java/duke/runner/Runner.java @@ -18,7 +18,7 @@ public static void main(String[] args) { run(); } - /** + /* * Prints hello, goodbye, nd output of command executions. Also runs the event loop. */ public static void run() { @@ -27,15 +27,17 @@ public static void run() { duke.addObserver(new CLI()); String input; - while (!Parser.isTerminate(input = sc.nextLine().trim())) { + while (true) { try { + input = sc.nextLine(); Command command = Parser.parseCommand(input); command.execute(duke); - } catch (ParserException e) { + if (command.isExit()) { + break; + } + } catch (Exception e) { // TODO: break up exception catching System.out.println(e.getMessage()); } } - - System.out.println("Bye. Hope to see you again."); } } diff --git a/src/main/java/duke/task/DeadlineTask.java b/src/main/java/duke/task/DeadlineTask.java index 0bd8421c95..c8ab91d2ff 100644 --- a/src/main/java/duke/task/DeadlineTask.java +++ b/src/main/java/duke/task/DeadlineTask.java @@ -1,24 +1,30 @@ package duke.task; +import duke.exception.ParserException; +import duke.utils.Parser; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + public class DeadlineTask extends Task { + private static final DateTimeFormatter DT_FORMAT = DateTimeFormatter.ofPattern("dd/MM/yyyy HHmm"); - private final String by; + private final LocalDateTime by; - public DeadlineTask(String desc, String by) { + public DeadlineTask(String desc, String by) throws ParserException { super(desc); - this.by = by; + this.by = Parser.parseDateTime(by); } - public String getBy() { - return by; - } +// public String getBy() { +// return by; +// } @Override public String toString() { return String .format("%d | %s | %s | %s | %s", getId(), getIsDone() ? "DONE" : "NOT DONE", "DEADLINE", - getDesc(), by); + getDesc(), by.format(DT_FORMAT)); } } diff --git a/src/main/java/duke/task/EventTask.java b/src/main/java/duke/task/EventTask.java index 250a140abf..2f218834b6 100644 --- a/src/main/java/duke/task/EventTask.java +++ b/src/main/java/duke/task/EventTask.java @@ -1,22 +1,30 @@ package duke.task; +import duke.exception.ParserException; +import duke.utils.Parser; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + public class EventTask extends Task { + private static final DateTimeFormatter DT_FORMAT = DateTimeFormatter.ofPattern("dd/MM/yyyy HHmm"); - private final String at; + private final LocalDateTime at; - public EventTask(String desc, String at) { + public EventTask(String desc, String at) throws ParserException { super(desc); - this.at = at; + this.at = Parser.parseDateTime(at); } - public String getAt() { - return at; - } +// public String getAt() { +// return at; +// } @Override public String toString() { - return String.format("%d | %s | %s | %s | %s", getId(), getIsDone() ? "DONE" : "NOT DONE", "EVENT", getDesc(), at); + return String + .format("%d | %s | %s | %s | %s", getId(), getIsDone() ? "DONE" : "NOT DONE", "EVENT", + getDesc(), at.format(DT_FORMAT)); } } diff --git a/src/main/java/duke/utils/Parser.java b/src/main/java/duke/utils/Parser.java index 3014f95e7b..4c636c6b4d 100644 --- a/src/main/java/duke/utils/Parser.java +++ b/src/main/java/duke/utils/Parser.java @@ -1,5 +1,6 @@ package duke.utils; +import duke.command.ByeCommand; import duke.command.Command; import duke.command.CommandEnum; import duke.command.CompleteTaskCommand; @@ -9,26 +10,24 @@ import duke.command.ListTasksCommand; import duke.command.TodoCommand; import duke.exception.ParserException; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; /** * duke.utils.Parser is the class that handles input parsing. Given a string, it should determine * what command to execute and execute it. */ public class Parser { - /** - * @param s command supplied - * @return true if it's an exit command, ignoring case - */ - public static boolean isTerminate(String s) { - return CommandEnum.valueOf(s.toUpperCase()).equals(CommandEnum.TERMINATE); - } + + private static final DateTimeFormatter DT_FORMAT = DateTimeFormatter.ofPattern("dd/MM/yyyy HHmm"); /** * @param s command supplied * @return a list of string (tasks) corresponding to command execution output */ public static Command parseCommand(String s) throws ParserException { - String[] args = s.split("\\s+", 2); + String[] args = s.trim().split("\\s+", 2); CommandEnum cmdEnum; try { cmdEnum = CommandEnum.valueOf(args[0].toUpperCase()); @@ -37,41 +36,42 @@ public static Command parseCommand(String s) throws ParserException { } switch (cmdEnum) { - case TASK_LIST: + case BYE: + return new ByeCommand(); + case LIST: return new ListTasksCommand(); - case TASK_ADD_TODO: { + case TODO: { String todo = parseTodo(args[1]); return new TodoCommand(todo); } - case TASK_ADD_EVENT: { + case EVENT: { String[] inputArr = parseEvent(args[1]); return new EventCommand(inputArr[0], inputArr[1]); } - case TASK_ADD_DEADLINE: { + case DEADLINE: { String[] inputArr = parseDeadline(args[1]); return new DeadlineCommand(inputArr[0], inputArr[1]); - } - case TASK_SET_DONE: { + } case DONE: { int[] taskIdList = parseTaskIds(args[1]); return new CompleteTaskCommand(taskIdList[0]); -// for (int taskId : taskIdList) { -// Command command = new CompleteTaskCommand(taskId); -// command.execute(Duke.getInstance()); -// } } - case TASK_DELETE: { + case DELETE: { int[] taskIdList = parseTaskIds(args[1]); return new DeleteTaskCommand(taskIdList[0]); -// for (int taskId : taskIdList) { -// Command command = new CompleteTaskCommand(taskId); -// command.execute(Duke.getInstance()); -// } } default: throw new ParserException("No such command!"); } } + public static LocalDateTime parseDateTime(String dateTimeString) throws ParserException { + try { + return LocalDateTime.parse(dateTimeString, DT_FORMAT); + } catch (DateTimeParseException e) { + throw new ParserException("DateTime format error."); + } + } + public static String parseTodo(String s) throws ParserException { if (s.length() <= 0) { throw new ParserException("Todo format error."); diff --git a/src/main/java/duke/view/cli/CLI.java b/src/main/java/duke/view/cli/CLI.java index 52e127e468..42bb0bdc0e 100644 --- a/src/main/java/duke/view/cli/CLI.java +++ b/src/main/java/duke/view/cli/CLI.java @@ -9,4 +9,8 @@ public CLI() { public void update(String s) { System.out.println(s); } + + public void close() { + System.out.println("Bye. Hope to see you again."); + } }