From d8398594b7bc43da5eb865321c5a50cec4b3923d Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 001/193] 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 00000000..20c0521c --- /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.29' +} + +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 00000000..b7c8c5db --- /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 00000000..2fe81a7d --- /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 00000000..62bd9b9c --- /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 43f50f9d549eac6292aaa4e444a2d1208193e23d Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 31 Aug 2021 21:54:04 +0800 Subject: [PATCH 002/193] Added Echo function. --- src/main/java/Duke.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334..1dc3bfdc 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,4 +1,22 @@ +import java.util.Scanner; + public class Duke { + + static Scanner in = new Scanner(System.in); + + public static void Echo() { + Boolean stop = false; + while (stop == false) { + String word = in.next(); + if (word.equals("bye")) { + System.out.println("Bye. Hope to see you again!"); + stop = true; + } else { + System.out.println(word); + } + } + } + public static void main(String[] args) { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" @@ -6,5 +24,6 @@ public static void main(String[] args) { + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); + Echo(); } } From 22420920785b0ad2e2c9c4f00b67177a2dce318b Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 31 Aug 2021 22:02:15 +0800 Subject: [PATCH 003/193] Added StartDuke function --- src/main/java/Duke.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 1dc3bfdc..7d70682d 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -4,6 +4,15 @@ public class Duke { static Scanner in = new Scanner(System.in); + public static void StartDuke() { + String logo = " ____ _ \n" + + "| _ \\ _ _| | _____ \n" + + "| | | | | | | |/ / _ \\\n" + + "| |_| | |_| | < __/\n" + + "|____/ \\__,_|_|\\_\\___|\n"; + System.out.println("Welcome to\n" + logo + " chatbot! \n"); + } + public static void Echo() { Boolean stop = false; while (stop == false) { @@ -18,12 +27,7 @@ public static void Echo() { } public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); + StartDuke(); Echo(); } } From 088a1496c4b509c18b8abcff7101adaf758db435 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 31 Aug 2021 22:09:04 +0800 Subject: [PATCH 004/193] Added Greet function. --- src/main/java/Duke.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 7d70682d..2f387082 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -13,6 +13,12 @@ public static void StartDuke() { System.out.println("Welcome to\n" + logo + " chatbot! \n"); } + public static void Greet() { + String start = "Hello, I'm Duke\n" + + "What can I do for you?\n"; + System.out.println(start); + } + public static void Echo() { Boolean stop = false; while (stop == false) { @@ -28,6 +34,7 @@ public static void Echo() { public static void main(String[] args) { StartDuke(); + Greet(); Echo(); } } From a1c46fe7a5538ffb15d1f4cc33de7ffd63424583 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 31 Aug 2021 22:14:47 +0800 Subject: [PATCH 005/193] Added line string to Greet and Echo functions. --- src/main/java/Duke.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 2f387082..c5ece771 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -3,6 +3,7 @@ public class Duke { static Scanner in = new Scanner(System.in); + static String line = "____________________________________________________________\n"; public static void StartDuke() { String logo = " ____ _ \n" @@ -16,7 +17,7 @@ public static void StartDuke() { public static void Greet() { String start = "Hello, I'm Duke\n" + "What can I do for you?\n"; - System.out.println(start); + System.out.println(line + start + line); } public static void Echo() { @@ -24,10 +25,10 @@ public static void Echo() { while (stop == false) { String word = in.next(); if (word.equals("bye")) { - System.out.println("Bye. Hope to see you again!"); + System.out.println(line + "Bye. Hope to see you again!\n" + line); stop = true; } else { - System.out.println(word); + System.out.println(line + word + "\n" + line); } } } From 4ceb83e2031970ecf7cb11bb1d36cbc0aa787d84 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 31 Aug 2021 22:16:14 +0800 Subject: [PATCH 006/193] Added Level1 function. --- src/main/java/Duke.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index c5ece771..1fc18b43 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -33,9 +33,13 @@ public static void Echo() { } } - public static void main(String[] args) { - StartDuke(); + public static void Level1() { Greet(); Echo(); } + + public static void main(String[] args) { + StartDuke(); + Level1(); + } } From 64a87038c434ec45ed02e86da9a94bf6429c6d5b Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 31 Aug 2021 22:57:37 +0800 Subject: [PATCH 007/193] Added Add function. --- src/main/java/Duke.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 1fc18b43..73b07051 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -4,6 +4,8 @@ public class Duke { static Scanner in = new Scanner(System.in); static String line = "____________________________________________________________\n"; + static String[] list = new String[100]; + static int listCount = 0; public static void StartDuke() { String logo = " ____ _ \n" @@ -33,6 +35,22 @@ public static void Echo() { } } + public static void Add() { + Boolean stop = false; + while (stop == false) { + String input = in.nextLine(); + if (input.equals("bye")) { + System.out.println(line + "Bye. Hope to see you again soon!\n" + line); + listCount = 0; + stop = true; + } else { + list[listCount] = input; + listCount++; + System.out.println("added: " + input); + } + } + } + public static void Level1() { Greet(); Echo(); From 71fc3a4f988c3b6835d12ca94e5a32de359c499c Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 31 Aug 2021 23:06:26 +0800 Subject: [PATCH 008/193] Added PrintList function. --- src/main/java/Duke.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 73b07051..0021d196 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -51,6 +51,12 @@ public static void Add() { } } + public static void PrintList() { + for (int i = 0; i < listCount; i++) { + System.out.println(i+1 + ". " + list[i]); + } + } + public static void Level1() { Greet(); Echo(); From fc9e9bc67f1153fb7438156e33a57ac373fbf792 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 31 Aug 2021 23:06:53 +0800 Subject: [PATCH 009/193] Edited Add function. --- src/main/java/Duke.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 0021d196..385cc990 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -43,6 +43,8 @@ public static void Add() { System.out.println(line + "Bye. Hope to see you again soon!\n" + line); listCount = 0; stop = true; + } else if (input.equals("list")){ + PrintList(); } else { list[listCount] = input; listCount++; From b20b42007aec6f543ea42c83a1a6283aa7dbbbf0 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 31 Aug 2021 23:13:16 +0800 Subject: [PATCH 010/193] Added printing of lines to Add and PrintList functions. --- src/main/java/Duke.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 385cc990..f74a2f0a 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -48,15 +48,17 @@ public static void Add() { } else { list[listCount] = input; listCount++; - System.out.println("added: " + input); + System.out.println(line + "added: " + input + "\n" + line); } } } public static void PrintList() { + System.out.println(line); for (int i = 0; i < listCount; i++) { System.out.println(i+1 + ". " + list[i]); } + System.out.println(line); } public static void Level1() { From b7b547da6804a8e224b50c395d6fa3c490716d8e Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 31 Aug 2021 23:13:56 +0800 Subject: [PATCH 011/193] Added Level2 function. --- src/main/java/Duke.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index f74a2f0a..38c55959 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -66,8 +66,14 @@ public static void Level1() { Echo(); } + public static void Level2() { + Greet(); + Add(); + } + public static void main(String[] args) { StartDuke(); - Level1(); + // Level1(); + Level2(); } } From d4b8c0804a75df49f6cf4e5d553a60f9c8f9942e Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 31 Aug 2021 23:15:16 +0800 Subject: [PATCH 012/193] Edited Echo function so it can print inputs with spaces. --- 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 38c55959..5fd5efaf 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -25,7 +25,7 @@ public static void Greet() { public static void Echo() { Boolean stop = false; while (stop == false) { - String word = in.next(); + String word = in.nextLine(); if (word.equals("bye")) { System.out.println(line + "Bye. Hope to see you again!\n" + line); stop = true; From c304110f339d3d19f2671be3f48a7ede15de69c3 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 31 Aug 2021 23:17:36 +0800 Subject: [PATCH 013/193] Changed Add function name to AddDisplayList function. --- src/main/java/Duke.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5fd5efaf..72c71a3e 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -35,7 +35,7 @@ public static void Echo() { } } - public static void Add() { + public static void AddDisplayList() { Boolean stop = false; while (stop == false) { String input = in.nextLine(); @@ -68,7 +68,7 @@ public static void Level1() { public static void Level2() { Greet(); - Add(); + AddDisplayList(); } public static void main(String[] args) { From 4dd50ba1383a69f39d164a0da13ee8c0c64183de Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 7 Sep 2021 20:24:49 +0800 Subject: [PATCH 014/193] Created Task Class with addTask and printChecklist functions. --- src/main/java/Task.java | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/main/java/Task.java diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 00000000..e76fe81a --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,29 @@ +public class Task { + + String Description; + boolean Completed; + static int TaskCount = 0; + static Task[] Checklist = new Task[100]; + + public Task(String newTask) { + this.Description = newTask; + this.Completed = false; + } + + public void addTask(String newTask) { + Task newEntry = new Task(newTask); + Checklist[TaskCount] = newEntry; + TaskCount++; + } + + public void printChecklist() { + System.out.println("Here are the tasks in your list:"); + for (int i = 0; i < TaskCount; i++) { + if (Checklist[i].Completed) { + System.out.println(i + ".[X] " + Checklist[i].Description); + } else { + System.out.println(i + ".[] " + Checklist[i].Description); + } + } + } +} From 60594732b2f19cf1c5bc24ac6a73301e9ed849de Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 8 Sep 2021 01:12:20 +0800 Subject: [PATCH 015/193] Removed addTask and printChecklist functions from and added getDescription and getCompletedSymbol to Task.java --- src/main/java/Task.java | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/main/java/Task.java b/src/main/java/Task.java index e76fe81a..f72a477a 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,29 +1,22 @@ public class Task { - String Description; - boolean Completed; - static int TaskCount = 0; - static Task[] Checklist = new Task[100]; + protected String Description; + protected boolean Completed; public Task(String newTask) { this.Description = newTask; this.Completed = false; } - public void addTask(String newTask) { - Task newEntry = new Task(newTask); - Checklist[TaskCount] = newEntry; - TaskCount++; + public String getDescription() { + return Description; } - public void printChecklist() { - System.out.println("Here are the tasks in your list:"); - for (int i = 0; i < TaskCount; i++) { - if (Checklist[i].Completed) { - System.out.println(i + ".[X] " + Checklist[i].Description); - } else { - System.out.println(i + ".[] " + Checklist[i].Description); - } + public String getCompletedSymbol() { + if (Completed) { + return "[X]"; + } else { + return "[]"; } } } From e1960414ca39cf217737b027d1ac1a485d9c36d3 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 8 Sep 2021 01:13:05 +0800 Subject: [PATCH 016/193] Added TaskList, AddTask, PrintChecklist and Level3 functions to Duke.java --- src/main/java/Duke.java | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 72c71a3e..503eeff2 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -6,6 +6,8 @@ public class Duke { static String line = "____________________________________________________________\n"; static String[] list = new String[100]; static int listCount = 0; + static int TaskCount = 0; + static Task[] Checklist = new Task[100]; public static void StartDuke() { String logo = " ____ _ \n" @@ -61,6 +63,37 @@ public static void PrintList() { System.out.println(line); } + public static void TaskList() { + Boolean stop = false; + while (stop == false) { + String input = in.nextLine(); + if (input.equals("bye")) { + System.out.println(line + "Bye. Hope to see you again soon!\n" + line); + listCount = 0; + stop = true; + } else if (input.equals("list")){ + PrintChecklist(); + } else { + Task newTask = new Task(input); + AddTask(newTask); + System.out.println(line + "added: " + input + "\n" + line); + } + } + } + + public static void AddTask(Task newEntry) { + Checklist[TaskCount] = newEntry; + TaskCount++; + } + + public static void PrintChecklist() { + System.out.println("Here are the tasks in your list:"); + for (int i = 0; i < TaskCount; i++) { + System.out.println((i+1) + "." + Checklist[i].getCompletedSymbol() + + " " + Checklist[i].getDescription()); + } + } + public static void Level1() { Greet(); Echo(); @@ -71,9 +104,15 @@ public static void Level2() { AddDisplayList(); } + public static void Level3() { + Greet(); + TaskList(); + } + public static void main(String[] args) { StartDuke(); // Level1(); - Level2(); + // Level2(); + Level3(); } } From 058787ce32ff06dc18f12895eaa0dba00dde2dea Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 8 Sep 2021 01:55:31 +0800 Subject: [PATCH 017/193] Added getTaskinfo and markCompleted functions in Task.java --- src/main/java/Task.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/Task.java b/src/main/java/Task.java index f72a477a..fd0c78ac 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -19,4 +19,13 @@ public String getCompletedSymbol() { return "[]"; } } + + public String getTaskInfo() { + String TaskInfo = this.getCompletedSymbol() + " " + Description; + return TaskInfo; + } + + public void markCompleted() { + Completed = true; + } } From 576c6a7903fd5e0cb1e0331fa94892de7f19a774 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 8 Sep 2021 01:56:58 +0800 Subject: [PATCH 018/193] Edited Tasklist function to mark tasks as completed. Added MarkTask function. --- src/main/java/Duke.java | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 503eeff2..5a289046 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -6,8 +6,9 @@ public class Duke { static String line = "____________________________________________________________\n"; static String[] list = new String[100]; static int listCount = 0; - static int TaskCount = 0; static Task[] Checklist = new Task[100]; + static int TaskCount = 0; + public static void StartDuke() { String logo = " ____ _ \n" @@ -73,7 +74,16 @@ public static void TaskList() { stop = true; } else if (input.equals("list")){ PrintChecklist(); - } else { + } else if ((input.length() > 3) && (input.substring(0,4)).equals("done") ) { + if (input.length() < 5) { + System.out.println("Input missing the index of the task that is done."); + } else { + int index = Integer.parseInt(input.substring(4).trim()) - 1; + MarkTask(index); + System.out.println("Nice! I've marked this task as done:\n " + + Checklist[index].getTaskInfo()); + } + } else { Task newTask = new Task(input); AddTask(newTask); System.out.println(line + "added: " + input + "\n" + line); @@ -89,11 +99,14 @@ public static void AddTask(Task newEntry) { public static void PrintChecklist() { System.out.println("Here are the tasks in your list:"); for (int i = 0; i < TaskCount; i++) { - System.out.println((i+1) + "." + Checklist[i].getCompletedSymbol() - + " " + Checklist[i].getDescription()); + System.out.println((i+1) + "." + Checklist[i].getTaskInfo()); } } + public static void MarkTask(int index) { + Checklist[index].markCompleted(); + } + public static void Level1() { Greet(); Echo(); From 44d03222f8e0e2c3b76c1a0c87642cc232a7d389 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 8 Sep 2021 02:12:54 +0800 Subject: [PATCH 019/193] Edited Tasklist function to handle index input outside of the array. --- src/main/java/Duke.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5a289046..95f0aac9 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -76,12 +76,17 @@ public static void TaskList() { PrintChecklist(); } else if ((input.length() > 3) && (input.substring(0,4)).equals("done") ) { if (input.length() < 5) { - System.out.println("Input missing the index of the task that is done."); + System.out.println(line + "\nInput missing the index of the task that is done.\n" + + line); } else { int index = Integer.parseInt(input.substring(4).trim()) - 1; - MarkTask(index); - System.out.println("Nice! I've marked this task as done:\n " - + Checklist[index].getTaskInfo()); + if (index < TaskCount) { + MarkTask(index); + System.out.println(line + "Nice! I've marked this task as done:\n " + + Checklist[index].getTaskInfo() + "\n" + line); + } else { + System.out.println(line + "\nInvalid task index number\n" + line); + } } } else { Task newTask = new Task(input); @@ -97,10 +102,11 @@ public static void AddTask(Task newEntry) { } public static void PrintChecklist() { - System.out.println("Here are the tasks in your list:"); + System.out.println(line + "\nHere are the tasks in your list:"); for (int i = 0; i < TaskCount; i++) { System.out.println((i+1) + "." + Checklist[i].getTaskInfo()); } + System.out.println(line); } public static void MarkTask(int index) { From d9176ac2aef0775a27be95bd3b55ed3eaeb1cf58 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 28 Sep 2021 03:01:37 +0800 Subject: [PATCH 020/193] Refactored code in Duke.java --- src/main/java/Duke.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 95f0aac9..c438b691 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -79,14 +79,7 @@ public static void TaskList() { System.out.println(line + "\nInput missing the index of the task that is done.\n" + line); } else { - int index = Integer.parseInt(input.substring(4).trim()) - 1; - if (index < TaskCount) { - MarkTask(index); - System.out.println(line + "Nice! I've marked this task as done:\n " - + Checklist[index].getTaskInfo() + "\n" + line); - } else { - System.out.println(line + "\nInvalid task index number\n" + line); - } + MarkIndex(input); } } else { Task newTask = new Task(input); @@ -109,6 +102,17 @@ public static void PrintChecklist() { System.out.println(line); } + public static void MarkIndex(String input) { + int index = Integer.parseInt(input.substring(4).trim()) - 1; + if (index < TaskCount) { + MarkTask(index); + System.out.println(line + "Nice! I've marked this task as done:\n " + + Checklist[index].getTaskInfo() + "\n" + line); + } else { + System.out.println(line + "\nInvalid task index number\n" + line); + } + } + public static void MarkTask(int index) { Checklist[index].markCompleted(); } From a7c24ea9ae972168d9092b4335bc0cc94c8f6b43 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 28 Sep 2021 03:01:52 +0800 Subject: [PATCH 021/193] Added Todo java class to project --- src/main/java/Todo.java | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/main/java/Todo.java diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 00000000..df5a6195 --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,3 @@ +public class Todo extends Task{ + +} From 27cc70936219a6fcde360a6906c8585212ad4c3d Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 9 Oct 2021 01:27:13 +0800 Subject: [PATCH 022/193] Added Todo constructor method. --- src/main/java/Todo.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index df5a6195..3713e634 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -1,3 +1,7 @@ public class Todo extends Task{ + public Todo(String newTask) { + super(newTask); + } + } From 289f0dedb3601e0c5db7b30c48eb9e6b54d63fda Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 9 Oct 2021 01:32:13 +0800 Subject: [PATCH 023/193] Override getCompleteSymbol method in Todo.java --- src/main/java/Todo.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index 3713e634..ef06e6da 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -3,5 +3,13 @@ public class Todo extends Task{ public Todo(String newTask) { super(newTask); } - + + public String getCompletedSymbol() { + if (Completed) { + return "[T][X]"; + } else { + return "[T][ ]"; + } + } + } From a71bd48ae1c3ab548d011843d9de4d667502e938 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 9 Oct 2021 01:32:34 +0800 Subject: [PATCH 024/193] Aesthetics changes. --- src/main/java/Task.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/Task.java b/src/main/java/Task.java index fd0c78ac..4bc5c95c 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -16,7 +16,7 @@ public String getCompletedSymbol() { if (Completed) { return "[X]"; } else { - return "[]"; + return "[ ]"; } } From bf76cb1bb6c08086abcf011c49203ed266532515 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 9 Oct 2021 01:44:40 +0800 Subject: [PATCH 025/193] Created Deadlines class --- src/main/java/Deadlines.java | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 src/main/java/Deadlines.java diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java new file mode 100644 index 00000000..1656303a --- /dev/null +++ b/src/main/java/Deadlines.java @@ -0,0 +1,2 @@ +public class Deadlines extends Task{ +} From 4fac2ff7a4e62bea3133388f0730700cf6a02731 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 9 Oct 2021 01:55:56 +0800 Subject: [PATCH 026/193] Added deadline class variables and constructor. --- src/main/java/Deadlines.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java index 1656303a..d8d808fd 100644 --- a/src/main/java/Deadlines.java +++ b/src/main/java/Deadlines.java @@ -1,2 +1,8 @@ public class Deadlines extends Task{ + protected String deadline; + + public Deadlines(String newTask, String datetime) { + super(newTask); + deadline = datetime; + } } From f360dbbe7d218727236eadb8a67db0fcbb2ab697 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 9 Oct 2021 02:02:22 +0800 Subject: [PATCH 027/193] Override getCompletedSymbol method in Deadlines.java class. --- src/main/java/Deadlines.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java index d8d808fd..d79c84b7 100644 --- a/src/main/java/Deadlines.java +++ b/src/main/java/Deadlines.java @@ -5,4 +5,13 @@ public Deadlines(String newTask, String datetime) { super(newTask); deadline = datetime; } + + public String getCompletedSymbol() { + if (Completed) { + return "[D][X]"; + } else { + return "[D][ ]"; + } + } + } From f8296ce418545910b7c6c65d91c3820c6c4e3e97 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 9 Oct 2021 02:07:13 +0800 Subject: [PATCH 028/193] Override getTaskInfo method in Deadlines.java class. --- src/main/java/Deadlines.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadlines.java index d79c84b7..d3ce210e 100644 --- a/src/main/java/Deadlines.java +++ b/src/main/java/Deadlines.java @@ -14,4 +14,8 @@ public String getCompletedSymbol() { } } + public String getTaskInfo() { + return super.getTaskInfo() + " ( by: " + deadline + ")"; + } + } From b75732c374fd74cef8513960030dc3ea00a8ec5d Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 9 Oct 2021 16:37:05 +0800 Subject: [PATCH 029/193] Rename Deadlines class to Deadline and changed deadline variable to by. --- src/main/java/{Deadlines.java => Deadline.java} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename src/main/java/{Deadlines.java => Deadline.java} (51%) diff --git a/src/main/java/Deadlines.java b/src/main/java/Deadline.java similarity index 51% rename from src/main/java/Deadlines.java rename to src/main/java/Deadline.java index d3ce210e..684ad1d7 100644 --- a/src/main/java/Deadlines.java +++ b/src/main/java/Deadline.java @@ -1,9 +1,9 @@ -public class Deadlines extends Task{ - protected String deadline; +public class Deadline extends Task{ + protected String by; - public Deadlines(String newTask, String datetime) { + public Deadline(String newTask, String datetime) { super(newTask); - deadline = datetime; + by = datetime; } public String getCompletedSymbol() { @@ -15,7 +15,7 @@ public String getCompletedSymbol() { } public String getTaskInfo() { - return super.getTaskInfo() + " ( by: " + deadline + ")"; + return super.getTaskInfo() + " ( by: " + by + ")"; } } From 0cce455c7c010f960205201ddcf897b976c0376b Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 9 Oct 2021 19:07:17 +0800 Subject: [PATCH 030/193] Created Event class and constructor --- src/main/java/Event.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/main/java/Event.java diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 00000000..4c6d9c49 --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,9 @@ +public class Event extends Task { + protected String at; + + public Event(String newTask, String datetime) { + super(newTask); + at = datetime; + } + +} From 872d2d6c6c3a1cb728cc1dfdf707303941674644 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 10 Oct 2021 01:19:03 +0800 Subject: [PATCH 031/193] Override getCompletedSymbol method in Event.java class. --- src/main/java/Event.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 4c6d9c49..fb806977 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -5,5 +5,13 @@ public Event(String newTask, String datetime) { super(newTask); at = datetime; } + + public String getCompletedSymbol() { + if (Completed) { + return "[E][X]"; + } else { + return "[E][ ]"; + } + } } From 9521b5fe3e5ce5c81935001b194f23e6bbce649f Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 10 Oct 2021 01:20:51 +0800 Subject: [PATCH 032/193] Override getTaskInfo method in Event.java class. --- src/main/java/Event.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/Event.java b/src/main/java/Event.java index fb806977..9a5154f0 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -13,5 +13,9 @@ public String getCompletedSymbol() { return "[E][ ]"; } } - + + public String getTaskInfo() { + return super.getTaskInfo() + " ( at: " + at + ")"; + } + } From b3350ca293e46ce244ed68d78e716662501b0052 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 10 Oct 2021 01:57:32 +0800 Subject: [PATCH 033/193] Added PrintTaskCount method to Duke.java class --- src/main/java/Duke.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index c438b691..e9e6961e 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -117,6 +117,10 @@ public static void MarkTask(int index) { Checklist[index].markCompleted(); } + public static void PrintTaskCount() { + System.out.println("Now you have " + TaskCount + " tasks in the list."); + } + public static void Level1() { Greet(); Echo(); From 66a878c4549513132d23b59dc7a0c36f336fb285 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 10 Oct 2021 18:56:41 +0800 Subject: [PATCH 034/193] Added ExtendTaskList method to duke.java class. --- src/main/java/Duke.java | 72 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index e9e6961e..129502f5 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -117,6 +117,78 @@ public static void MarkTask(int index) { Checklist[index].markCompleted(); } + public static void ExtendTaskList() { + boolean stop = false; + while (stop == false) { + String input = in.nextLine(); + if (input.equals("bye")) { + System.out.println(line + "Bye. Hope to see you again soon!\n" + line); + TaskCount = 0; + stop = true; + } else if (input.equals("list")) { + PrintChecklist(); + } else if (input.contains("todo") && (input.substring(0,4)).equals("todo")) { + if (input.length() < 5) { + System.out.println(line + "\nInvalid input, the task is missing.\n" + + line); + } else { + String newTask = input.substring(4).trim(); + Todo newTodo = new Todo(newTask); + AddTask(newTodo); + System.out.println(line + "\nGot it. I've added this task:\n" + + newTodo.getTaskInfo()); + PrintTaskCount(); + System.out.println(line); + } + } else if (input.contains("deadline") && (input.substring(0,8)).equals("deadline")) { + if (input.contains("/by")) { + String[] parts = input.substring(8).split("/by"); + if (parts.length > 2){ + System.out.println("Invalid input."); + } else if (parts[0].equals("")) { + System.out.println(line + "\nInvalid input, the task is missing.\n" + line); + } else if (parts[1].equals("")) { + System.out.println(line + "\nInvalid input, the deadline is missing.\n" + line); + } else { + Deadline newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); + AddTask(newDeadline); + System.out.println(line + "\nGot it. I've added this task:\n" + + newDeadline.getTaskInfo()); + PrintTaskCount(); + System.out.println(line); + } + } + } else if (input.contains("event") && (input.substring(0,5)).equals("event")) { + if (input.contains("/at")) { + String[] parts = input.substring(5).split("/at"); + if (parts.length > 2) { + System.out.println("Invalid input."); + } else if (parts[0].equals("")) { + System.out.println(line + "\nInvalid input, the task is missing.\n" + line); + } else if (parts[1].equals("")) { + System.out.println(line + "\nInvalid input, the deadline is missing.\n" + line); + } else { + Event newEvent = new Event(parts[0].trim(), parts[1].trim()); + AddTask(newEvent); + System.out.println(line + "\nGot it. I've added this task:\n" + + newEvent.getTaskInfo()); + PrintTaskCount(); + System.out.println(line); + } + } + } else if (input.contains("done") && (input.substring(0,4)).equals("done")) { + if (input.length() < 5) { + System.out.println(line + "\nInput missing the index of the task that is done.\n" + + line); + } else { + MarkIndex(input); + } + } else { + System.out.println("Invalid input"); + } + } + } + public static void PrintTaskCount() { System.out.println("Now you have " + TaskCount + " tasks in the list."); } From 247c692f845d3a3cd61755506ab0537f43da564d Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 10 Oct 2021 19:07:58 +0800 Subject: [PATCH 035/193] Edited ExtendTaskList method in duke.java class --- src/main/java/Duke.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 129502f5..84f9f02d 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -143,11 +143,11 @@ public static void ExtendTaskList() { } else if (input.contains("deadline") && (input.substring(0,8)).equals("deadline")) { if (input.contains("/by")) { String[] parts = input.substring(8).split("/by"); - if (parts.length > 2){ - System.out.println("Invalid input."); - } else if (parts[0].equals("")) { + if (parts.length != 2){ + System.out.println("Invalid deadline input. Missing info."); + } else if (parts[0].trim().equals("")) { System.out.println(line + "\nInvalid input, the task is missing.\n" + line); - } else if (parts[1].equals("")) { + } else if (parts[1].trim().equals("")) { System.out.println(line + "\nInvalid input, the deadline is missing.\n" + line); } else { Deadline newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); @@ -157,15 +157,17 @@ public static void ExtendTaskList() { PrintTaskCount(); System.out.println(line); } + } else { + System.out.println("Invalid deadline input."); } } else if (input.contains("event") && (input.substring(0,5)).equals("event")) { if (input.contains("/at")) { String[] parts = input.substring(5).split("/at"); - if (parts.length > 2) { - System.out.println("Invalid input."); - } else if (parts[0].equals("")) { + if (parts.length != 2) { + System.out.println("Invalid event input. Missing info."); + } else if (parts[0].trim().equals("")) { System.out.println(line + "\nInvalid input, the task is missing.\n" + line); - } else if (parts[1].equals("")) { + } else if (parts[1].trim().equals("")) { System.out.println(line + "\nInvalid input, the deadline is missing.\n" + line); } else { Event newEvent = new Event(parts[0].trim(), parts[1].trim()); @@ -175,6 +177,8 @@ public static void ExtendTaskList() { PrintTaskCount(); System.out.println(line); } + } else { + System.out.println("Invalid event input."); } } else if (input.contains("done") && (input.substring(0,4)).equals("done")) { if (input.length() < 5) { From 04533e7dc08e559920493cb43fc9d9963394d622 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 10 Oct 2021 19:14:43 +0800 Subject: [PATCH 036/193] Created Level4() method in duke.java class. --- src/main/java/Duke.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 84f9f02d..98fe2ab2 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -212,10 +212,16 @@ public static void Level3() { TaskList(); } + public static void Level4() { + Greet(); + ExtendTaskList(); + } + public static void main(String[] args) { StartDuke(); // Level1(); // Level2(); - Level3(); + // Level3(); + Level4(); } } From 9671688e109ac1e9f60e444b8a92b11f5cde55d5 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Mon, 18 Oct 2021 22:20:33 +0800 Subject: [PATCH 037/193] Deleted now unused methods in Duke.java --- src/main/java/Duke.java | 86 +---------------------------------------- 1 file changed, 1 insertion(+), 85 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 98fe2ab2..96fecf35 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -4,8 +4,6 @@ public class Duke { static Scanner in = new Scanner(System.in); static String line = "____________________________________________________________\n"; - static String[] list = new String[100]; - static int listCount = 0; static Task[] Checklist = new Task[100]; static int TaskCount = 0; @@ -25,70 +23,6 @@ public static void Greet() { System.out.println(line + start + line); } - public static void Echo() { - Boolean stop = false; - while (stop == false) { - String word = in.nextLine(); - if (word.equals("bye")) { - System.out.println(line + "Bye. Hope to see you again!\n" + line); - stop = true; - } else { - System.out.println(line + word + "\n" + line); - } - } - } - - public static void AddDisplayList() { - Boolean stop = false; - while (stop == false) { - String input = in.nextLine(); - if (input.equals("bye")) { - System.out.println(line + "Bye. Hope to see you again soon!\n" + line); - listCount = 0; - stop = true; - } else if (input.equals("list")){ - PrintList(); - } else { - list[listCount] = input; - listCount++; - System.out.println(line + "added: " + input + "\n" + line); - } - } - } - - public static void PrintList() { - System.out.println(line); - for (int i = 0; i < listCount; i++) { - System.out.println(i+1 + ". " + list[i]); - } - System.out.println(line); - } - - public static void TaskList() { - Boolean stop = false; - while (stop == false) { - String input = in.nextLine(); - if (input.equals("bye")) { - System.out.println(line + "Bye. Hope to see you again soon!\n" + line); - listCount = 0; - stop = true; - } else if (input.equals("list")){ - PrintChecklist(); - } else if ((input.length() > 3) && (input.substring(0,4)).equals("done") ) { - if (input.length() < 5) { - System.out.println(line + "\nInput missing the index of the task that is done.\n" - + line); - } else { - MarkIndex(input); - } - } else { - Task newTask = new Task(input); - AddTask(newTask); - System.out.println(line + "added: " + input + "\n" + line); - } - } - } - public static void AddTask(Task newEntry) { Checklist[TaskCount] = newEntry; TaskCount++; @@ -197,31 +131,13 @@ public static void PrintTaskCount() { System.out.println("Now you have " + TaskCount + " tasks in the list."); } - public static void Level1() { - Greet(); - Echo(); - } - - public static void Level2() { - Greet(); - AddDisplayList(); - } - - public static void Level3() { - Greet(); - TaskList(); - } - public static void Level4() { - Greet(); ExtendTaskList(); } public static void main(String[] args) { StartDuke(); - // Level1(); - // Level2(); - // Level3(); + Greet(); Level4(); } } From b728fcd80c9ad2caf6f6e15043d109a5936ed995 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Mon, 18 Oct 2021 23:02:11 +0800 Subject: [PATCH 038/193] Refactoring Duke.java --- src/main/java/Duke.java | 112 ++++++++++++++++++++++------------------ 1 file changed, 62 insertions(+), 50 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 96fecf35..e5b7936b 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -62,58 +62,11 @@ public static void ExtendTaskList() { } else if (input.equals("list")) { PrintChecklist(); } else if (input.contains("todo") && (input.substring(0,4)).equals("todo")) { - if (input.length() < 5) { - System.out.println(line + "\nInvalid input, the task is missing.\n" - + line); - } else { - String newTask = input.substring(4).trim(); - Todo newTodo = new Todo(newTask); - AddTask(newTodo); - System.out.println(line + "\nGot it. I've added this task:\n" - + newTodo.getTaskInfo()); - PrintTaskCount(); - System.out.println(line); - } + CheckValidTodo(input); } else if (input.contains("deadline") && (input.substring(0,8)).equals("deadline")) { - if (input.contains("/by")) { - String[] parts = input.substring(8).split("/by"); - if (parts.length != 2){ - System.out.println("Invalid deadline input. Missing info."); - } else if (parts[0].trim().equals("")) { - System.out.println(line + "\nInvalid input, the task is missing.\n" + line); - } else if (parts[1].trim().equals("")) { - System.out.println(line + "\nInvalid input, the deadline is missing.\n" + line); - } else { - Deadline newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); - AddTask(newDeadline); - System.out.println(line + "\nGot it. I've added this task:\n" - + newDeadline.getTaskInfo()); - PrintTaskCount(); - System.out.println(line); - } - } else { - System.out.println("Invalid deadline input."); - } + CheckValidDeadline(input); } else if (input.contains("event") && (input.substring(0,5)).equals("event")) { - if (input.contains("/at")) { - String[] parts = input.substring(5).split("/at"); - if (parts.length != 2) { - System.out.println("Invalid event input. Missing info."); - } else if (parts[0].trim().equals("")) { - System.out.println(line + "\nInvalid input, the task is missing.\n" + line); - } else if (parts[1].trim().equals("")) { - System.out.println(line + "\nInvalid input, the deadline is missing.\n" + line); - } else { - Event newEvent = new Event(parts[0].trim(), parts[1].trim()); - AddTask(newEvent); - System.out.println(line + "\nGot it. I've added this task:\n" - + newEvent.getTaskInfo()); - PrintTaskCount(); - System.out.println(line); - } - } else { - System.out.println("Invalid event input."); - } + CheckValidEvent(input); } else if (input.contains("done") && (input.substring(0,4)).equals("done")) { if (input.length() < 5) { System.out.println(line + "\nInput missing the index of the task that is done.\n" @@ -127,6 +80,65 @@ public static void ExtendTaskList() { } } + public static void CheckValidTodo(String input) { + if (input.length() < 5) { + System.out.println(line + "\nInvalid input, the task is missing.\n" + + line); + } else { + String newTask = input.substring(4).trim(); + Todo newTodo = new Todo(newTask); + AddTask(newTodo); + System.out.println(line + "\nGot it. I've added this task:\n" + + newTodo.getTaskInfo()); + PrintTaskCount(); + System.out.println(line); + } + } + + public static void CheckValidDeadline(String input){ + if (input.contains("/by")) { + String[] parts = input.substring(8).split("/by"); + if (parts.length != 2){ + System.out.println("Invalid deadline input. Missing info."); + } else if (parts[0].trim().equals("")) { + System.out.println(line + "\nInvalid input, the task is missing.\n" + line); + } else if (parts[1].trim().equals("")) { + System.out.println(line + "\nInvalid input, the deadline is missing.\n" + line); + } else { + Deadline newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); + AddTask(newDeadline); + System.out.println(line + "\nGot it. I've added this task:\n" + + newDeadline.getTaskInfo()); + PrintTaskCount(); + System.out.println(line); + } + } else { + System.out.println("Invalid deadline input."); + } + } + + public static void CheckValidEvent(String input) { + if (input.contains("/at")) { + String[] parts = input.substring(5).split("/at"); + if (parts.length != 2) { + System.out.println("Invalid event input. Missing info."); + } else if (parts[0].trim().equals("")) { + System.out.println(line + "\nInvalid input, the task is missing.\n" + line); + } else if (parts[1].trim().equals("")) { + System.out.println(line + "\nInvalid input, the deadline is missing.\n" + line); + } else { + Event newEvent = new Event(parts[0].trim(), parts[1].trim()); + AddTask(newEvent); + System.out.println(line + "\nGot it. I've added this task:\n" + + newEvent.getTaskInfo()); + PrintTaskCount(); + System.out.println(line); + } + } else { + System.out.println("Invalid event input."); + } + } + public static void PrintTaskCount() { System.out.println("Now you have " + TaskCount + " tasks in the list."); } From a36d64eedc72d9ea3d6cfa0e4fe341ab2f980f8a Mon Sep 17 00:00:00 2001 From: ksw95 Date: Mon, 18 Oct 2021 23:10:05 +0800 Subject: [PATCH 039/193] Refactor Duke.java --- src/main/java/Duke.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index e5b7936b..e2855149 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -88,8 +88,7 @@ public static void CheckValidTodo(String input) { String newTask = input.substring(4).trim(); Todo newTodo = new Todo(newTask); AddTask(newTodo); - System.out.println(line + "\nGot it. I've added this task:\n" - + newTodo.getTaskInfo()); + PrintTaskAdded(newTodo); PrintTaskCount(); System.out.println(line); } @@ -107,8 +106,7 @@ public static void CheckValidDeadline(String input){ } else { Deadline newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); AddTask(newDeadline); - System.out.println(line + "\nGot it. I've added this task:\n" - + newDeadline.getTaskInfo()); + PrintTaskAdded(newDeadline); PrintTaskCount(); System.out.println(line); } @@ -129,8 +127,7 @@ public static void CheckValidEvent(String input) { } else { Event newEvent = new Event(parts[0].trim(), parts[1].trim()); AddTask(newEvent); - System.out.println(line + "\nGot it. I've added this task:\n" - + newEvent.getTaskInfo()); + PrintTaskAdded(newEvent); PrintTaskCount(); System.out.println(line); } @@ -143,6 +140,11 @@ public static void PrintTaskCount() { System.out.println("Now you have " + TaskCount + " tasks in the list."); } + public static void PrintTaskAdded(Task newTask) { + System.out.println(line + "\nGot it. I've added this task:\n" + + newTask.getTaskInfo()); + } + public static void Level4() { ExtendTaskList(); } From dcc94641771c1454ef44cb6e3998d2bb731697d7 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Mon, 18 Oct 2021 23:10:18 +0800 Subject: [PATCH 040/193] Edited for aesthetic reasons. --- src/main/java/Deadline.java | 2 +- src/main/java/Event.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 684ad1d7..5c1838e1 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -15,7 +15,7 @@ public String getCompletedSymbol() { } public String getTaskInfo() { - return super.getTaskInfo() + " ( by: " + by + ")"; + return super.getTaskInfo() + " (by: " + by + ")"; } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 9a5154f0..0bfae013 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -15,7 +15,7 @@ public String getCompletedSymbol() { } public String getTaskInfo() { - return super.getTaskInfo() + " ( at: " + at + ")"; + return super.getTaskInfo() + " (at: " + at + ")"; } } From eac94a82d3eb2a180722ef25fdd0c3a064f980c4 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 00:01:16 +0800 Subject: [PATCH 041/193] Created DukeException class with variables and methods. --- src/main/java/DukeException.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/main/java/DukeException.java diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java new file mode 100644 index 00000000..569064c7 --- /dev/null +++ b/src/main/java/DukeException.java @@ -0,0 +1,15 @@ +public class DukeException extends Exception{ + protected String ErrMsg; + + public DukeException() { + this.ErrMsg = ""; + } + + public DukeException(String invalid) { + this.ErrMsg = invalid; + } + + public void printErrMsg() { + System.out.println(ErrMsg); + } +} From 509abcbe6f9a9a03913b12f721dc255988867c81 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 00:03:18 +0800 Subject: [PATCH 042/193] Refactor CheckValidTodo and added AddTodo method with error handling. --- src/main/java/Duke.java | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index e2855149..fb3ca6fc 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -62,7 +62,7 @@ public static void ExtendTaskList() { } else if (input.equals("list")) { PrintChecklist(); } else if (input.contains("todo") && (input.substring(0,4)).equals("todo")) { - CheckValidTodo(input); + AddTodo(input); } else if (input.contains("deadline") && (input.substring(0,8)).equals("deadline")) { CheckValidDeadline(input); } else if (input.contains("event") && (input.substring(0,5)).equals("event")) { @@ -80,17 +80,27 @@ public static void ExtendTaskList() { } } - public static void CheckValidTodo(String input) { + public static void AddTodo(String input) { + try { + if (CheckValidTodo(input)) { + String newTask = input.substring(4).trim(); + Todo newTodo = new Todo(newTask); + AddTask(newTodo); + PrintTaskAdded(newTodo); + PrintTaskCount(); + System.out.println(line); + } + } catch (DukeException e) { + e.printErrMsg(); + } + } + + public static boolean CheckValidTodo(String input) throws DukeException { if (input.length() < 5) { - System.out.println(line + "\nInvalid input, the task is missing.\n" + throw new DukeException(line + "\nInvalid input, the task is missing.\n" + line); } else { - String newTask = input.substring(4).trim(); - Todo newTodo = new Todo(newTask); - AddTask(newTodo); - PrintTaskAdded(newTodo); - PrintTaskCount(); - System.out.println(line); + return true; } } From 313d4d995ad200cee244b99a9c6a3dd677d4a34c Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 00:05:46 +0800 Subject: [PATCH 043/193] Added AddDeadline method and edited CheckValidDeadline to use exceptions to handle errors. --- src/main/java/Duke.java | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index fb3ca6fc..04ebe742 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -104,24 +104,35 @@ public static boolean CheckValidTodo(String input) throws DukeException { } } - public static void CheckValidDeadline(String input){ + public static void AddDeadline(String input) { + try { + if(CheckValidDeadline(input)){ + String[] parts = input.substring(8).split("/by"); + Deadline newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); + AddTask(newDeadline); + PrintTaskAdded(newDeadline); + PrintTaskCount(); + System.out.println(line); + } + } catch (DukeException e) { + e.printErrMsg(); + } + } + + public static boolean CheckValidDeadline(String input) throws DukeException{ if (input.contains("/by")) { String[] parts = input.substring(8).split("/by"); if (parts.length != 2){ - System.out.println("Invalid deadline input. Missing info."); + throw new DukeException("Invalid deadline input. Missing info."); } else if (parts[0].trim().equals("")) { - System.out.println(line + "\nInvalid input, the task is missing.\n" + line); + throw new DukeException(line + "\nInvalid input, the task is missing.\n" + line); } else if (parts[1].trim().equals("")) { - System.out.println(line + "\nInvalid input, the deadline is missing.\n" + line); + throw new DukeException(line + "\nInvalid input, the deadline is missing.\n" + line); } else { - Deadline newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); - AddTask(newDeadline); - PrintTaskAdded(newDeadline); - PrintTaskCount(); - System.out.println(line); + return true; } } else { - System.out.println("Invalid deadline input."); + throw new DukeException("Invalid deadline input."); } } From e1992e1646a24825402e48e8f9824c0c43aafa90 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 00:25:31 +0800 Subject: [PATCH 044/193] Created AddEvent method and edited CheckValidEvent method to use exceptions to handle error. --- src/main/java/Duke.java | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 04ebe742..e5f76af3 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -64,9 +64,9 @@ public static void ExtendTaskList() { } else if (input.contains("todo") && (input.substring(0,4)).equals("todo")) { AddTodo(input); } else if (input.contains("deadline") && (input.substring(0,8)).equals("deadline")) { - CheckValidDeadline(input); + AddDeadline(input); } else if (input.contains("event") && (input.substring(0,5)).equals("event")) { - CheckValidEvent(input); + AddEvent(input); } else if (input.contains("done") && (input.substring(0,4)).equals("done")) { if (input.length() < 5) { System.out.println(line + "\nInput missing the index of the task that is done.\n" @@ -136,24 +136,35 @@ public static boolean CheckValidDeadline(String input) throws DukeException{ } } - public static void CheckValidEvent(String input) { + public static void AddEvent(String input) { + try { + if (CheckValidEvent(input)) { + String[] parts = input.substring(5).split("/at"); + Event newEvent = new Event(parts[0].trim(), parts[1].trim()); + AddTask(newEvent); + PrintTaskAdded(newEvent); + PrintTaskCount(); + System.out.println(line); + } + } catch (DukeException e) { + e.printErrMsg(); + } + } + + public static boolean CheckValidEvent(String input) throws DukeException { if (input.contains("/at")) { String[] parts = input.substring(5).split("/at"); if (parts.length != 2) { - System.out.println("Invalid event input. Missing info."); + throw new DukeException("Invalid event input. Missing info."); } else if (parts[0].trim().equals("")) { - System.out.println(line + "\nInvalid input, the task is missing.\n" + line); + throw new DukeException(line + "\nInvalid input, the task is missing.\n" + line); } else if (parts[1].trim().equals("")) { - System.out.println(line + "\nInvalid input, the deadline is missing.\n" + line); + throw new DukeException(line + "\nInvalid input, the deadline is missing.\n" + line); } else { - Event newEvent = new Event(parts[0].trim(), parts[1].trim()); - AddTask(newEvent); - PrintTaskAdded(newEvent); - PrintTaskCount(); - System.out.println(line); + return true; } } else { - System.out.println("Invalid event input."); + throw new DukeException("Invalid event input."); } } From d99dc26a93527086e0e95f51c4d3db42d2abebe0 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 00:44:03 +0800 Subject: [PATCH 045/193] Created MarkDone method and CheckValidDone method to use exceptions to handle error --- src/main/java/Duke.java | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index e5f76af3..4fb27073 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -68,12 +68,7 @@ public static void ExtendTaskList() { } else if (input.contains("event") && (input.substring(0,5)).equals("event")) { AddEvent(input); } else if (input.contains("done") && (input.substring(0,4)).equals("done")) { - if (input.length() < 5) { - System.out.println(line + "\nInput missing the index of the task that is done.\n" - + line); - } else { - MarkIndex(input); - } + MarkDone(input); } else { System.out.println("Invalid input"); } @@ -168,6 +163,25 @@ public static boolean CheckValidEvent(String input) throws DukeException { } } + public static void MarkDone(String input) { + try { + if(CheckValidDone(input)) { + MarkIndex(input); + } + } catch (DukeException e) { + e.printErrMsg(); + } + } + + public static boolean CheckValidDone(String input) throws DukeException { + if (input.length() < 5) { + throw new DukeException(line + "\nInput missing the index of the task that is done.\n" + + line); + } else { + return true; + } + } + public static void PrintTaskCount() { System.out.println("Now you have " + TaskCount + " tasks in the list."); } From ac596efe24ed02faf273497d2045dc13848222a9 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 00:51:07 +0800 Subject: [PATCH 046/193] Edited error messages for aesthetics. --- src/main/java/Duke.java | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 4fb27073..9db0faa6 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -70,7 +70,7 @@ public static void ExtendTaskList() { } else if (input.contains("done") && (input.substring(0,4)).equals("done")) { MarkDone(input); } else { - System.out.println("Invalid input"); + System.out.println("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); } } } @@ -92,7 +92,7 @@ public static void AddTodo(String input) { public static boolean CheckValidTodo(String input) throws DukeException { if (input.length() < 5) { - throw new DukeException(line + "\nInvalid input, the task is missing.\n" + throw new DukeException(line + "\n☹ OOPS!!! The description of a todo cannot be empty.\n" + line); } else { return true; @@ -118,16 +118,18 @@ public static boolean CheckValidDeadline(String input) throws DukeException{ if (input.contains("/by")) { String[] parts = input.substring(8).split("/by"); if (parts.length != 2){ - throw new DukeException("Invalid deadline input. Missing info."); + throw new DukeException("☹ OOPS!!! Invalid syntax for adding deadline."); } else if (parts[0].trim().equals("")) { - throw new DukeException(line + "\nInvalid input, the task is missing.\n" + line); + throw new DukeException(line + "\n☹ OOPS!!! " + + "The task description of a deadline cannot be empty.\n" + line); } else if (parts[1].trim().equals("")) { - throw new DukeException(line + "\nInvalid input, the deadline is missing.\n" + line); + throw new DukeException(line + "\nI☹ OOPS!!! " + + "The due date/time of a deadline cannot be empty.\n" + line); } else { return true; } } else { - throw new DukeException("Invalid deadline input."); + throw new DukeException("☹ OOPS!!! Invalid syntax for adding deadline."); } } @@ -150,16 +152,18 @@ public static boolean CheckValidEvent(String input) throws DukeException { if (input.contains("/at")) { String[] parts = input.substring(5).split("/at"); if (parts.length != 2) { - throw new DukeException("Invalid event input. Missing info."); + throw new DukeException("☹ OOPS!!! Invalid syntax for adding event."); } else if (parts[0].trim().equals("")) { - throw new DukeException(line + "\nInvalid input, the task is missing.\n" + line); + throw new DukeException(line + "\n☹ OOPS!!! " + + "The task description of an event cannot be empty.\n" + line); } else if (parts[1].trim().equals("")) { - throw new DukeException(line + "\nInvalid input, the deadline is missing.\n" + line); + throw new DukeException(line + "\n☹ OOPS!!! " + + "The date/time of an event cannot be empty.\n" + line); } else { return true; } } else { - throw new DukeException("Invalid event input."); + throw new DukeException("☹ OOPS!!! Invalid syntax for adding event."); } } @@ -175,7 +179,8 @@ public static void MarkDone(String input) { public static boolean CheckValidDone(String input) throws DukeException { if (input.length() < 5) { - throw new DukeException(line + "\nInput missing the index of the task that is done.\n" + throw new DukeException(line + "\n☹ OOPS!!! " + + "The index of the task to delete is missing.\n" + line); } else { return true; From 9d2d0efc5473e57a8f77ff7c9af98daf63825bd0 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 00:54:00 +0800 Subject: [PATCH 047/193] Edited typo. --- 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 9db0faa6..b46f5086 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -123,7 +123,7 @@ public static boolean CheckValidDeadline(String input) throws DukeException{ throw new DukeException(line + "\n☹ OOPS!!! " + "The task description of a deadline cannot be empty.\n" + line); } else if (parts[1].trim().equals("")) { - throw new DukeException(line + "\nI☹ OOPS!!! " + + throw new DukeException(line + "\n☹ OOPS!!! " + "The due date/time of a deadline cannot be empty.\n" + line); } else { return true; From f95a4028b96905b35a8444f8be0df9620a34ba7f Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 00:57:28 +0800 Subject: [PATCH 048/193] Refactoring Duke.java --- src/main/java/Duke.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index b46f5086..f6dc1ee4 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -70,7 +70,8 @@ public static void ExtendTaskList() { } else if (input.contains("done") && (input.substring(0,4)).equals("done")) { MarkDone(input); } else { - System.out.println("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); + System.out.println(line + "☹ OOPS!!! " + + "I'm sorry, but I don't know what that means :-(\n" + line); } } } @@ -196,13 +197,9 @@ public static void PrintTaskAdded(Task newTask) { + newTask.getTaskInfo()); } - public static void Level4() { - ExtendTaskList(); - } - public static void main(String[] args) { StartDuke(); Greet(); - Level4(); + ExtendTaskList(); } } From 7e438327d1c79237840d4281688ca895214a89fe Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 01:18:55 +0800 Subject: [PATCH 049/193] Changed data structure used to store Task from Task Arrays to ArrayList for Task. Also edited the methods which used the task array accordingly. --- src/main/java/Duke.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index f6dc1ee4..ccea5c92 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,13 +1,13 @@ +import java.util.ArrayList; import java.util.Scanner; public class Duke { static Scanner in = new Scanner(System.in); static String line = "____________________________________________________________\n"; - static Task[] Checklist = new Task[100]; + static ArrayList TaskList = new ArrayList<>(); static int TaskCount = 0; - public static void StartDuke() { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" @@ -24,14 +24,14 @@ public static void Greet() { } public static void AddTask(Task newEntry) { - Checklist[TaskCount] = newEntry; + TaskList.add(newEntry); TaskCount++; } public static void PrintChecklist() { System.out.println(line + "\nHere are the tasks in your list:"); for (int i = 0; i < TaskCount; i++) { - System.out.println((i+1) + "." + Checklist[i].getTaskInfo()); + System.out.println((i+1) + "." + TaskList.get(i).getTaskInfo()); } System.out.println(line); } @@ -41,14 +41,14 @@ public static void MarkIndex(String input) { if (index < TaskCount) { MarkTask(index); System.out.println(line + "Nice! I've marked this task as done:\n " - + Checklist[index].getTaskInfo() + "\n" + line); + + TaskList.get(index).getTaskInfo() + "\n" + line); } else { System.out.println(line + "\nInvalid task index number\n" + line); } } public static void MarkTask(int index) { - Checklist[index].markCompleted(); + TaskList.get(index).markCompleted(); } public static void ExtendTaskList() { From ba77502f9bb89002b6b2b54303a9479dac29ce35 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 01:28:01 +0800 Subject: [PATCH 050/193] Edited ExtendTaskList method to include delete capability. --- src/main/java/Duke.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index ccea5c92..351a8939 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -69,6 +69,8 @@ public static void ExtendTaskList() { AddEvent(input); } else if (input.contains("done") && (input.substring(0,4)).equals("done")) { MarkDone(input); + } else if (input.contains("delete") && (input.startsWith("delete"))) { + //DeleteTask(input); } else { System.out.println(line + "☹ OOPS!!! " + "I'm sorry, but I don't know what that means :-(\n" + line); @@ -197,6 +199,7 @@ public static void PrintTaskAdded(Task newTask) { + newTask.getTaskInfo()); } + public static void main(String[] args) { StartDuke(); Greet(); From 0a8c5bc2fc268a9efa4abe6a6b658fd832181fa4 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 01:28:26 +0800 Subject: [PATCH 051/193] Added DeleteTask method to Duke.java --- src/main/java/Duke.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 351a8939..f8ad7979 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -199,7 +199,16 @@ public static void PrintTaskAdded(Task newTask) { + newTask.getTaskInfo()); } - + public static void DeleteTask(String input) { + try { + if (CheckValidDelete(input)) { + DeleteIndex(input); + } + } catch (DukeException e){ + e.printErrMsg(); + } + } + public static void main(String[] args) { StartDuke(); Greet(); From 021b4ec34c37479c7f347ab91cae85aa6b50ae0f Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 01:31:28 +0800 Subject: [PATCH 052/193] Added CheckValidDelete method to Duke.java --- src/main/java/Duke.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index f8ad7979..7c23a4d0 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -209,6 +209,16 @@ public static void DeleteTask(String input) { } } + public static boolean CheckValidDelete(String input) throws DukeException { + if (input.length() < 7) { + throw new DukeException(line + "\n☹ OOPS!!! " + + "The index of the task to delete is missing.\n" + + line); + } else { + return true; + } + } + public static void main(String[] args) { StartDuke(); Greet(); From 9923f6e2c3860917f73ad37e7399a9ebedd0f4fc Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 01:37:21 +0800 Subject: [PATCH 053/193] Added DeleteIndex method to Duke.java --- src/main/java/Duke.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 7c23a4d0..80bff5a2 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -219,6 +219,19 @@ public static boolean CheckValidDelete(String input) throws DukeException { } } + public static void DeleteIndex(String input) { + int index = Integer.parseInt(input.substring(6).trim()) - 1; + if (index < TaskCount) { + String DeletedInfo = TaskList.get(index).getTaskInfo(); + RemoveTask(index); + System.out.println(line + "Noted! I've removed this task:\n " + + DeletedInfo + "\n" + line); + } else { + System.out.println(line + "\nInvalid task index number\n" + line); + } + } + + public static void main(String[] args) { StartDuke(); Greet(); From 00f5dddf9d950ddf77f752e51bbd82fb843d9914 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 01:37:33 +0800 Subject: [PATCH 054/193] Added RemoveTask method to Duke.java --- src/main/java/Duke.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 80bff5a2..2c4e05fc 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -231,6 +231,9 @@ public static void DeleteIndex(String input) { } } + public static void RemoveTask(int index) { + TaskList.remove(index); + } public static void main(String[] args) { StartDuke(); From 945d2737a03cf98dca45aacb4fccde222742fb2d Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 01:41:22 +0800 Subject: [PATCH 055/193] Bug fix to prevent exception outofbounds. --- src/main/java/Duke.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 2c4e05fc..eb0201a0 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -70,7 +70,7 @@ public static void ExtendTaskList() { } else if (input.contains("done") && (input.substring(0,4)).equals("done")) { MarkDone(input); } else if (input.contains("delete") && (input.startsWith("delete"))) { - //DeleteTask(input); + DeleteTask(input); } else { System.out.println(line + "☹ OOPS!!! " + "I'm sorry, but I don't know what that means :-(\n" + line); @@ -233,6 +233,7 @@ public static void DeleteIndex(String input) { public static void RemoveTask(int index) { TaskList.remove(index); + TaskCount--; } public static void main(String[] args) { From 8e4acdfd2474e7bb841ffbfeee3d2750fa8b607d Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 01:43:26 +0800 Subject: [PATCH 056/193] Edited printed strings. --- src/main/java/Duke.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index eb0201a0..d7c8e021 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -183,7 +183,7 @@ public static void MarkDone(String input) { public static boolean CheckValidDone(String input) throws DukeException { if (input.length() < 5) { throw new DukeException(line + "\n☹ OOPS!!! " + - "The index of the task to delete is missing.\n" + "The index of the task to be marked as done is missing.\n" + line); } else { return true; @@ -226,6 +226,7 @@ public static void DeleteIndex(String input) { RemoveTask(index); System.out.println(line + "Noted! I've removed this task:\n " + DeletedInfo + "\n" + line); + PrintTaskCount(); } else { System.out.println(line + "\nInvalid task index number\n" + line); } From 938d7f3c1162306de4d053b82896d754f5052712 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 01:48:01 +0800 Subject: [PATCH 057/193] Added more error handling --- src/main/java/Duke.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index d7c8e021..226833fd 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -36,14 +36,15 @@ public static void PrintChecklist() { System.out.println(line); } - public static void MarkIndex(String input) { + public static void MarkIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(4).trim()) - 1; if (index < TaskCount) { MarkTask(index); System.out.println(line + "Nice! I've marked this task as done:\n " + TaskList.get(index).getTaskInfo() + "\n" + line); } else { - System.out.println(line + "\nInvalid task index number\n" + line); + throw new DukeException(line + "\n☹ OOPS!!! " + + "The index number of the task to be done is invalid\n" + line); } } @@ -219,7 +220,7 @@ public static boolean CheckValidDelete(String input) throws DukeException { } } - public static void DeleteIndex(String input) { + public static void DeleteIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(6).trim()) - 1; if (index < TaskCount) { String DeletedInfo = TaskList.get(index).getTaskInfo(); @@ -228,7 +229,8 @@ public static void DeleteIndex(String input) { + DeletedInfo + "\n" + line); PrintTaskCount(); } else { - System.out.println(line + "\nInvalid task index number\n" + line); + throw new DukeException(line + "\n☹ OOPS!!! " + + "The index number of the task to delete is invalid!\n" + line); } } From 3522d70cc7ff7005778be7cef715c283c54fb6ae Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 01:49:14 +0800 Subject: [PATCH 058/193] Edited for aesthetic reasons. --- 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 226833fd..caadeed7 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -44,7 +44,7 @@ public static void MarkIndex(String input) throws DukeException { + TaskList.get(index).getTaskInfo() + "\n" + line); } else { throw new DukeException(line + "\n☹ OOPS!!! " + - "The index number of the task to be done is invalid\n" + line); + "The index number of the task to be done is invalid!\n" + line); } } From fdd1df5e4af1865b3ddec601001346191a6f1c67 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 11:33:31 +0800 Subject: [PATCH 059/193] Refactoring ExtendTaskList method --- src/main/java/Duke.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index caadeed7..7134fa97 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -62,13 +62,13 @@ public static void ExtendTaskList() { stop = true; } else if (input.equals("list")) { PrintChecklist(); - } else if (input.contains("todo") && (input.substring(0,4)).equals("todo")) { + } else if (input.contains("todo") && (input).startsWith("todo")) { AddTodo(input); - } else if (input.contains("deadline") && (input.substring(0,8)).equals("deadline")) { + } else if (input.contains("deadline") && (input).startsWith("deadline")) { AddDeadline(input); - } else if (input.contains("event") && (input.substring(0,5)).equals("event")) { + } else if (input.contains("event") && (input).startsWith("event")) { AddEvent(input); - } else if (input.contains("done") && (input.substring(0,4)).equals("done")) { + } else if (input.contains("done") && (input).startsWith("done")) { MarkDone(input); } else if (input.contains("delete") && (input.startsWith("delete"))) { DeleteTask(input); From 29d0894bc6f7f1aa5d7262734c315fadc0d3a30a Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 11:48:52 +0800 Subject: [PATCH 060/193] Refactoring ExtendTaskList method in Duke.java --- src/main/java/Duke.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 7134fa97..08e9a372 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -60,17 +60,17 @@ public static void ExtendTaskList() { System.out.println(line + "Bye. Hope to see you again soon!\n" + line); TaskCount = 0; stop = true; - } else if (input.equals("list")) { + } else if (input.equals("list ")) { PrintChecklist(); - } else if (input.contains("todo") && (input).startsWith("todo")) { + } else if (input.startsWith("todo ")) { AddTodo(input); - } else if (input.contains("deadline") && (input).startsWith("deadline")) { + } else if (input.startsWith("deadline ")) { AddDeadline(input); - } else if (input.contains("event") && (input).startsWith("event")) { + } else if (input.startsWith("event ")) { AddEvent(input); - } else if (input.contains("done") && (input).startsWith("done")) { + } else if (input.startsWith("done ")) { MarkDone(input); - } else if (input.contains("delete") && (input.startsWith("delete"))) { + } else if (input.startsWith("delete ")) { DeleteTask(input); } else { System.out.println(line + "☹ OOPS!!! " + From 4e36e335a815955125f0c5325c09ed0f45e720bc Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 11:49:40 +0800 Subject: [PATCH 061/193] Added more invalid todo input and error handling for CheckValidTodo method in Duke.java --- src/main/java/Duke.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 08e9a372..ae3e12c7 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -98,6 +98,9 @@ public static boolean CheckValidTodo(String input) throws DukeException { if (input.length() < 5) { throw new DukeException(line + "\n☹ OOPS!!! The description of a todo cannot be empty.\n" + line); + } else if (input.substring(4).trim().equals("")) { + throw new DukeException(line + "\n☹ OOPS!!! The description of a todo cannot be empty.\n" + + line); } else { return true; } From 157d71ebbc0e7dfdcf6cf6ad026b37975857e767 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 12:03:52 +0800 Subject: [PATCH 062/193] Added more error handling for DeleteIndex method in Duke.java --- src/main/java/Duke.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index ae3e12c7..1c5ea966 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -224,8 +224,14 @@ public static boolean CheckValidDelete(String input) throws DukeException { } public static void DeleteIndex(String input) throws DukeException { - int index = Integer.parseInt(input.substring(6).trim()) - 1; - if (index < TaskCount) { + int index = TaskCount + 1; + try { + index = Integer.parseInt(input.substring(6).trim()) - 1; + } catch (NumberFormatException e) { + throw new DukeException(line + "\n☹ OOPS!!! " + + "The index number of the task to delete is invalid!\n" + line); + } + if (index < TaskCount && index > -1) { String DeletedInfo = TaskList.get(index).getTaskInfo(); RemoveTask(index); System.out.println(line + "Noted! I've removed this task:\n " From 3ad545d671dd9178c4201c4b41298b8160b3c0ab Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 13:48:57 +0800 Subject: [PATCH 063/193] Refactoring DeleteIndex, decopling index from TaskCount variable --- src/main/java/Duke.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 1c5ea966..54a9f474 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -224,12 +224,12 @@ public static boolean CheckValidDelete(String input) throws DukeException { } public static void DeleteIndex(String input) throws DukeException { - int index = TaskCount + 1; + int index = -1; try { index = Integer.parseInt(input.substring(6).trim()) - 1; } catch (NumberFormatException e) { throw new DukeException(line + "\n☹ OOPS!!! " + - "The index number of the task to delete is invalid!\n" + line); + "The index of the task to delete has to be an integer!\n" + line); } if (index < TaskCount && index > -1) { String DeletedInfo = TaskList.get(index).getTaskInfo(); From e8fa0323b185299f10ead07fd74d75096894b825 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 18:28:25 +0800 Subject: [PATCH 064/193] Refactored DeleteIndex and CheckValidDelete methods in Duke.java for better cohesion --- src/main/java/Duke.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 54a9f474..ecb089b3 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -219,18 +219,18 @@ public static boolean CheckValidDelete(String input) throws DukeException { "The index of the task to delete is missing.\n" + line); } else { + try { + int test = Integer.parseInt(input.substring(6).trim()) - 1; + } catch (NumberFormatException e) { + throw new DukeException(line + "\n☹ OOPS!!! " + + "The index of the task to delete has to be an integer!\n" + line); + } return true; } } public static void DeleteIndex(String input) throws DukeException { - int index = -1; - try { - index = Integer.parseInt(input.substring(6).trim()) - 1; - } catch (NumberFormatException e) { - throw new DukeException(line + "\n☹ OOPS!!! " + - "The index of the task to delete has to be an integer!\n" + line); - } + int index = Integer.parseInt(input.substring(6).trim()) - 1; if (index < TaskCount && index > -1) { String DeletedInfo = TaskList.get(index).getTaskInfo(); RemoveTask(index); From 4cecd4cad50465cb74821725e555ab5ae6f91ad6 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 19 Oct 2021 18:59:02 +0800 Subject: [PATCH 065/193] Edited MarkIndex and CheckValidDone methods for better error handling. --- src/main/java/Duke.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index ecb089b3..2cd6818b 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -38,7 +38,7 @@ public static void PrintChecklist() { public static void MarkIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(4).trim()) - 1; - if (index < TaskCount) { + if (index < TaskCount && index > -1) { MarkTask(index); System.out.println(line + "Nice! I've marked this task as done:\n " + TaskList.get(index).getTaskInfo() + "\n" + line); @@ -190,6 +190,12 @@ public static boolean CheckValidDone(String input) throws DukeException { "The index of the task to be marked as done is missing.\n" + line); } else { + try { + int index = Integer.parseInt(input.substring(4).trim()) - 1; + } catch (NumberFormatException e) { + throw new DukeException(line + "\n☹ OOPS!!! " + + "The index of the task to mark as done has to be an integer!\n" + line); + } return true; } } From 27cce97628094abcb9604bd5ea49e93309757375 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 18:50:20 +0800 Subject: [PATCH 066/193] Refactoring methods in multiple classes. --- src/main/java/Deadline.java | 4 ++++ src/main/java/Duke.java | 20 ++++++++++---------- src/main/java/Event.java | 4 ++++ src/main/java/Todo.java | 4 ++++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 5c1838e1..05705a9a 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -18,4 +18,8 @@ public String getTaskInfo() { return super.getTaskInfo() + " (by: " + by + ")"; } + @Override + public String getTaskType() { + return "D"; + } } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 2cd6818b..bb002d7d 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -31,7 +31,7 @@ public static void AddTask(Task newEntry) { public static void PrintChecklist() { System.out.println(line + "\nHere are the tasks in your list:"); for (int i = 0; i < TaskCount; i++) { - System.out.println((i+1) + "." + TaskList.get(i).getTaskInfo()); + System.out.println((i + 1) + "." + TaskList.get(i).getTaskInfo()); } System.out.println(line); } @@ -39,7 +39,7 @@ public static void PrintChecklist() { public static void MarkIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(4).trim()) - 1; if (index < TaskCount && index > -1) { - MarkTask(index); + MarkTask(TaskList.get(index)); System.out.println(line + "Nice! I've marked this task as done:\n " + TaskList.get(index).getTaskInfo() + "\n" + line); } else { @@ -48,8 +48,8 @@ public static void MarkIndex(String input) throws DukeException { } } - public static void MarkTask(int index) { - TaskList.get(index).markCompleted(); + public static void MarkTask(Task inputTask) { + inputTask.markCompleted(); } public static void ExtendTaskList() { @@ -60,7 +60,7 @@ public static void ExtendTaskList() { System.out.println(line + "Bye. Hope to see you again soon!\n" + line); TaskCount = 0; stop = true; - } else if (input.equals("list ")) { + } else if (input.trim().equals("list")) { PrintChecklist(); } else if (input.startsWith("todo ")) { AddTodo(input); @@ -108,7 +108,7 @@ public static boolean CheckValidTodo(String input) throws DukeException { public static void AddDeadline(String input) { try { - if(CheckValidDeadline(input)){ + if (CheckValidDeadline(input)) { String[] parts = input.substring(8).split("/by"); Deadline newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); AddTask(newDeadline); @@ -121,10 +121,10 @@ public static void AddDeadline(String input) { } } - public static boolean CheckValidDeadline(String input) throws DukeException{ + public static boolean CheckValidDeadline(String input) throws DukeException { if (input.contains("/by")) { String[] parts = input.substring(8).split("/by"); - if (parts.length != 2){ + if (parts.length != 2) { throw new DukeException("☹ OOPS!!! Invalid syntax for adding deadline."); } else if (parts[0].trim().equals("")) { throw new DukeException(line + "\n☹ OOPS!!! " + @@ -176,7 +176,7 @@ public static boolean CheckValidEvent(String input) throws DukeException { public static void MarkDone(String input) { try { - if(CheckValidDone(input)) { + if (CheckValidDone(input)) { MarkIndex(input); } } catch (DukeException e) { @@ -214,7 +214,7 @@ public static void DeleteTask(String input) { if (CheckValidDelete(input)) { DeleteIndex(input); } - } catch (DukeException e){ + } catch (DukeException e) { e.printErrMsg(); } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 0bfae013..9dba1c90 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -18,4 +18,8 @@ public String getTaskInfo() { return super.getTaskInfo() + " (at: " + at + ")"; } + @Override + public String getTaskType() { + return "E"; + } } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index ef06e6da..11972fb3 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -12,4 +12,8 @@ public String getCompletedSymbol() { } } + @Override + public String getTaskType() { + return "T"; + } } From 476a3fd6d74c4a77990812cbb184a185bf1ebcbb Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 18:51:39 +0800 Subject: [PATCH 067/193] Refactoring method in Task.java --- src/main/java/Task.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 4bc5c95c..c0f9d8f0 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -28,4 +28,8 @@ public String getTaskInfo() { public void markCompleted() { Completed = true; } + + public String getTaskType() { + return ""; + } } From e60b6698924e24fccc96947295844b81e7c104d0 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 18:52:53 +0800 Subject: [PATCH 068/193] Added getAdditionalInfo method to Task, Event and Deadline class. --- src/main/java/Deadline.java | 4 ++++ src/main/java/Event.java | 4 ++++ src/main/java/Task.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 05705a9a..46690beb 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -6,6 +6,10 @@ public Deadline(String newTask, String datetime) { by = datetime; } + public String getAdditionalInfo() { + return by; + } + public String getCompletedSymbol() { if (Completed) { return "[D][X]"; diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 9dba1c90..711d8363 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -6,6 +6,10 @@ public Event(String newTask, String datetime) { at = datetime; } + public String getAdditionalInfo() { + return at; + } + public String getCompletedSymbol() { if (Completed) { return "[E][X]"; diff --git a/src/main/java/Task.java b/src/main/java/Task.java index c0f9d8f0..1ec66283 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -12,6 +12,10 @@ public String getDescription() { return Description; } + public String getAdditionalInfo() { + return ""; + } + public String getCompletedSymbol() { if (Completed) { return "[X]"; From 33919ea0e56ef776d5e6f14863bf1ff017cc453d Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 19:57:16 +0800 Subject: [PATCH 069/193] Created OpenStorageFile method and RunDuke method on Duke.java --- src/main/java/Duke.java | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index bb002d7d..efd62b9e 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,5 @@ +import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Scanner; @@ -254,9 +256,31 @@ public static void RemoveTask(int index) { TaskCount--; } - public static void main(String[] args) { + public static File OpenStorageFile() throws DukeException { + File newFile = new File("data\\storage.txt"); + if (!newFile.exists()) { + try { + newFile = CreateStorageFile(); + } catch (DukeException e) { + throw new DukeException("Duke will run without any prior stored task information"); + } + } + return newFile; + } + + + public static void RunDuke() { + try { + File StorageFile = OpenStorageFile(); + } catch (DukeException e) { + e.printErrMsg(); + } StartDuke(); Greet(); + } + + public static void main(String[] args) throws IOException { + RunDuke(); ExtendTaskList(); } } From 97822a8bb22d633542b0099b0c8a23a3f6a2de7b Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 19:58:28 +0800 Subject: [PATCH 070/193] Created CreateStorageFile method in Duke.java --- src/main/java/Duke.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index efd62b9e..6f2bcb7a 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -268,6 +268,18 @@ public static File OpenStorageFile() throws DukeException { return newFile; } + public static File CreateStorageFile() throws DukeException { + File newFile = new File("data\\Storage.txt"); + try { + newFile.getParentFile().mkdirs(); + newFile.createNewFile(); + System.out.println("New Storage.txt file created."); + return newFile; + } catch (IOException err) { + throw new DukeException("Failed to create new Storage.txt file."); + } + } + public static void RunDuke() { try { From 5a790e3bf2783709bd4a5d1dd0f2f0bcc8016756 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 19:59:37 +0800 Subject: [PATCH 071/193] Created ReadFileToArray method and edited RunDuke method in Duke.java --- src/main/java/Duke.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 6f2bcb7a..12511474 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,4 +1,5 @@ import java.io.File; +import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; import java.util.Scanner; @@ -280,10 +281,27 @@ public static File CreateStorageFile() throws DukeException { } } + public static void ReadFileToArray(File storageFile) { + try { + Scanner s = new Scanner(storageFile); + while (s.hasNext()) { + try { + AddTask(ParseStorageLine(s.nextLine())); + } catch (DukeException e) { + e.printErrMsg(); + } + } + } catch (FileNotFoundException e) { + System.out.println("File cannot be opened, " + + "Duke will not have any prior stored task information"); + } + } + public static void RunDuke() { try { File StorageFile = OpenStorageFile(); + ReadFileToArray(StorageFile); } catch (DukeException e) { e.printErrMsg(); } From 92216c9183a58288a99708f92801f616dfae6747 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 20:06:54 +0800 Subject: [PATCH 072/193] Created ParseStorageLine method in Duke.java class --- src/main/java/Duke.java | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 12511474..428d2dcc 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -297,6 +297,29 @@ public static void ReadFileToArray(File storageFile) { } } + public static Task ParseStorageLine(String FileLine) throws DukeException { + String[] parts = FileLine.split("\\|"); + if (parts[0].trim().equals("T")) { + if(CheckTodoLine(parts)) { + Todo newTodo = getTodoFromLine(parts); + return newTodo; + } + } else if (parts[0].trim().equals("D")) { + if(CheckDeadlineLine(parts)) { + Deadline newDeadline = getDeadlineFromLine(parts); + return newDeadline; + } + } else if (parts[0].trim().equals("E")) { + if (CheckEventLine(parts)) { + Event newEvent = getEventFromLine(parts); + return newEvent; + } + } else { + System.out.println("Line is invalid"); + } + throw new DukeException("A line from storage file is invalid and will not be added to Duke."); + } + public static void RunDuke() { try { From d8ff6125a2810a5cf1c4b8085a6cbd2912eb8004 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 20:08:26 +0800 Subject: [PATCH 073/193] Created getTodoFromLine method in Duke.java --- src/main/java/Duke.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 428d2dcc..535a1e3d 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -320,6 +320,13 @@ public static Task ParseStorageLine(String FileLine) throws DukeException { throw new DukeException("A line from storage file is invalid and will not be added to Duke."); } + public static Todo getTodoFromLine(String[] parts) { + Todo newTodo = new Todo(parts[2].trim()); + if (parts[1].trim().equals("1")) { + MarkTask(newTodo); + } + return newTodo; + } public static void RunDuke() { try { From 65cd710eff47031c783c40d2f831e118ffc8d78b Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 20:08:56 +0800 Subject: [PATCH 074/193] Created getDeadlineFromLine method in Duke.java --- src/main/java/Duke.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 535a1e3d..23bc3b8c 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -328,6 +328,14 @@ public static Todo getTodoFromLine(String[] parts) { return newTodo; } + public static Deadline getDeadlineFromLine(String[] parts) { + Deadline newDeadline = new Deadline(parts[2].trim(), parts[3].trim()); + if (parts[1].trim().equals("1")) { + MarkTask(newDeadline); + } + return newDeadline; + } + public static void RunDuke() { try { File StorageFile = OpenStorageFile(); From 597c23727b284f3d84a4368297b6654596b64aa3 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 20:09:18 +0800 Subject: [PATCH 075/193] Created getEventFromLine in Duke.java class --- src/main/java/Duke.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 23bc3b8c..8109bd61 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -336,6 +336,14 @@ public static Deadline getDeadlineFromLine(String[] parts) { return newDeadline; } + public static Event getEventFromLine(String[] parts) { + Event newEvent = new Event(parts[2].trim(), parts[3].trim()); + if (parts[1].trim().equals("1")) { + MarkTask(newEvent); + } + return newEvent; + } + public static void RunDuke() { try { File StorageFile = OpenStorageFile(); From 5cb0a58032431041106be6e6cb35373d0226dcce Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 20:10:08 +0800 Subject: [PATCH 076/193] Created CheckTodoLine method in Duke.java --- src/main/java/Duke.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 8109bd61..49525e6f 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -344,6 +344,18 @@ public static Event getEventFromLine(String[] parts) { return newEvent; } + public static boolean CheckTodoLine(String[] parts) { + if (parts.length != 3) { + return false; + } else if (parts[2].trim().equals("")) { + return false; + } else if (!parts[1].trim().equals("1") && !parts[1].trim().equals("0")) { + return false; + } + return true; + } + + public static void RunDuke() { try { File StorageFile = OpenStorageFile(); From 899448b1c3a240f7ff0d1d875bc21c0bf2e72a0a Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 20:10:35 +0800 Subject: [PATCH 077/193] Created CheckDeadlineLine in Duke.java --- src/main/java/Duke.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 49525e6f..b22b40fc 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -355,6 +355,16 @@ public static boolean CheckTodoLine(String[] parts) { return true; } + public static boolean CheckDeadlineLine(String[] parts) { + if (parts.length != 4) { + return false; + } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { + return false; + } else if (!parts[1].trim().equals("1") && !parts[1].trim().equals("0")) { + return false; + } + return true; + } public static void RunDuke() { try { From a9c2382af5e3bd9425f86f64bb5387b4e3fe6465 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 20:11:09 +0800 Subject: [PATCH 078/193] Created CheckEventLine method in Duke.java --- src/main/java/Duke.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index b22b40fc..e671e897 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -366,6 +366,17 @@ public static boolean CheckDeadlineLine(String[] parts) { return true; } + public static boolean CheckEventLine(String[] parts) { + if (parts.length != 4) { + return false; + } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { + return false; + } else if (!parts[1].trim().equals("1") && !parts[1].trim().equals("0")) { + return false; + } + return true; + } + public static void RunDuke() { try { File StorageFile = OpenStorageFile(); From f0ef684ea72de1f49ec9a1661857f99403fb1166 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 26 Oct 2021 20:12:16 +0800 Subject: [PATCH 079/193] Added new constructor to Task class --- src/main/java/Task.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 1ec66283..c71bcbe7 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -8,6 +8,18 @@ public Task(String newTask) { this.Completed = false; } + public Task(String newTask, String toComplete) throws DukeException { + this.Description = newTask; + if (toComplete.equals("1")){ + this.Completed = true; + } else if (toComplete.equals("0")) { + this.Completed = false; + } else { + throw new DukeException("Invalid input"); + } + } + + public String getDescription() { return Description; } From 59253a42668c1fec76efa524c5ae9446b9b9c187 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 27 Oct 2021 01:50:02 +0800 Subject: [PATCH 080/193] Created writeListToFile method in Duke.java --- src/main/java/Duke.java | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index e671e897..f59bfecf 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,5 +1,6 @@ import java.io.File; import java.io.FileNotFoundException; +import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; import java.util.Scanner; @@ -377,6 +378,28 @@ public static boolean CheckEventLine(String[] parts) { return true; } + public static void writeListToFile(File FileWrite) { + try { + FileWriter fw = new FileWriter(FileWrite, false); + for (int i = 0; i < TaskList.size(); i++) { + String typeCheck = TaskList.get(i).getTaskType(); + String newLine = ""; + if (typeCheck.equals("T")) { + newLine = buildStorageLine(TaskList.get(i)); // buildTodoLine(TaskList.get(i)); + } else if (typeCheck.equals("D")) { + newLine = buildStorageLine(TaskList.get(i)); //buildDeadlineLine(TaskList.get(i)); + } else if (typeCheck.equals("E")) { + newLine = buildStorageLine(TaskList.get(i)); //buildEventLine(TaskList.get(i)); + } + fw.write(newLine + System.getProperty("line.separator")); + } + fw.close(); + } catch (IOException e) { + System.out.println("Write to file failed"); + } + } + + public static void RunDuke() { try { File StorageFile = OpenStorageFile(); @@ -391,5 +414,10 @@ public static void RunDuke() { public static void main(String[] args) throws IOException { RunDuke(); ExtendTaskList(); + try { + writeListToFile(OpenStorageFile()); + } catch (DukeException e) { + System.out.println("Failed to write to file"); + } } } From dcf399fb4a2aab37e397a95725f043c1b7e47856 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 27 Oct 2021 01:50:29 +0800 Subject: [PATCH 081/193] Created buildStorageLine method in Duke.java --- src/main/java/Duke.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index f59bfecf..00cbd15b 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -399,6 +399,21 @@ public static void writeListToFile(File FileWrite) { } } + public static String buildStorageLine(Task targetTask) { + String divider = " | "; + String initial = targetTask.getTaskType(); + String newLine = initial + divider; + if (targetTask.Completed) { + newLine = newLine + "1" + divider; + } else { + newLine = newLine + "0" + divider; + } + newLine = newLine + targetTask.Description; + + if (initial.equals("D") || initial.equals("E")) + newLine = newLine + divider + targetTask.getAdditionalInfo(); + return newLine; + } public static void RunDuke() { try { From dc0226fcd4f7cbd802825e6e7a19c8afd86b4f6c Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 28 Oct 2021 00:13:28 +0800 Subject: [PATCH 082/193] Added Ui.java class --- src/main/java/Ui.java | 2 ++ 1 file changed, 2 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 00000000..30d98a70 --- /dev/null +++ b/src/main/java/Ui.java @@ -0,0 +1,2 @@ +public class Ui { +} From 1f712959c731831b911a0a60053b86be715ad992 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 28 Oct 2021 00:28:03 +0800 Subject: [PATCH 083/193] Refactoring and moving code in Duke.java to Ui.java --- src/main/java/Duke.java | 63 ++++++++++++++++------------------------- src/main/java/Ui.java | 14 +++++++++ 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 00cbd15b..8a51ac0c 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -9,43 +9,28 @@ public class Duke { static Scanner in = new Scanner(System.in); static String line = "____________________________________________________________\n"; - static ArrayList TaskList = new ArrayList<>(); + static ArrayList DukeList = new ArrayList<>(); static int TaskCount = 0; - public static void StartDuke() { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Welcome to\n" + logo + " chatbot! \n"); - } - - public static void Greet() { - String start = "Hello, I'm Duke\n" - + "What can I do for you?\n"; - System.out.println(line + start + line); - } - - public static void AddTask(Task newEntry) { - TaskList.add(newEntry); + public static void addTaskToList(Task newEntry) { + DukeList.add(newEntry); TaskCount++; } - public static void PrintChecklist() { + public static void printTaskList() { System.out.println(line + "\nHere are the tasks in your list:"); for (int i = 0; i < TaskCount; i++) { - System.out.println((i + 1) + "." + TaskList.get(i).getTaskInfo()); + System.out.println((i + 1) + "." + DukeList.get(i).getTaskInfo()); } System.out.println(line); } - public static void MarkIndex(String input) throws DukeException { + public static void markTaskAtIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(4).trim()) - 1; if (index < TaskCount && index > -1) { - MarkTask(TaskList.get(index)); + MarkTask(DukeList.get(index)); System.out.println(line + "Nice! I've marked this task as done:\n " - + TaskList.get(index).getTaskInfo() + "\n" + line); + + DukeList.get(index).getTaskInfo() + "\n" + line); } else { throw new DukeException(line + "\n☹ OOPS!!! " + "The index number of the task to be done is invalid!\n" + line); @@ -58,14 +43,14 @@ public static void MarkTask(Task inputTask) { public static void ExtendTaskList() { boolean stop = false; - while (stop == false) { + while (!stop) { String input = in.nextLine(); if (input.equals("bye")) { System.out.println(line + "Bye. Hope to see you again soon!\n" + line); TaskCount = 0; stop = true; } else if (input.trim().equals("list")) { - PrintChecklist(); + printTaskList(); } else if (input.startsWith("todo ")) { AddTodo(input); } else if (input.startsWith("deadline ")) { @@ -88,7 +73,7 @@ public static void AddTodo(String input) { if (CheckValidTodo(input)) { String newTask = input.substring(4).trim(); Todo newTodo = new Todo(newTask); - AddTask(newTodo); + addTaskToList(newTodo); PrintTaskAdded(newTodo); PrintTaskCount(); System.out.println(line); @@ -115,7 +100,7 @@ public static void AddDeadline(String input) { if (CheckValidDeadline(input)) { String[] parts = input.substring(8).split("/by"); Deadline newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); - AddTask(newDeadline); + addTaskToList(newDeadline); PrintTaskAdded(newDeadline); PrintTaskCount(); System.out.println(line); @@ -149,7 +134,7 @@ public static void AddEvent(String input) { if (CheckValidEvent(input)) { String[] parts = input.substring(5).split("/at"); Event newEvent = new Event(parts[0].trim(), parts[1].trim()); - AddTask(newEvent); + addTaskToList(newEvent); PrintTaskAdded(newEvent); PrintTaskCount(); System.out.println(line); @@ -181,7 +166,7 @@ public static boolean CheckValidEvent(String input) throws DukeException { public static void MarkDone(String input) { try { if (CheckValidDone(input)) { - MarkIndex(input); + markTaskAtIndex(input); } } catch (DukeException e) { e.printErrMsg(); @@ -242,7 +227,7 @@ public static boolean CheckValidDelete(String input) throws DukeException { public static void DeleteIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(6).trim()) - 1; if (index < TaskCount && index > -1) { - String DeletedInfo = TaskList.get(index).getTaskInfo(); + String DeletedInfo = DukeList.get(index).getTaskInfo(); RemoveTask(index); System.out.println(line + "Noted! I've removed this task:\n " + DeletedInfo + "\n" + line); @@ -254,7 +239,7 @@ public static void DeleteIndex(String input) throws DukeException { } public static void RemoveTask(int index) { - TaskList.remove(index); + DukeList.remove(index); TaskCount--; } @@ -287,7 +272,7 @@ public static void ReadFileToArray(File storageFile) { Scanner s = new Scanner(storageFile); while (s.hasNext()) { try { - AddTask(ParseStorageLine(s.nextLine())); + addTaskToList(ParseStorageLine(s.nextLine())); } catch (DukeException e) { e.printErrMsg(); } @@ -381,15 +366,15 @@ public static boolean CheckEventLine(String[] parts) { public static void writeListToFile(File FileWrite) { try { FileWriter fw = new FileWriter(FileWrite, false); - for (int i = 0; i < TaskList.size(); i++) { - String typeCheck = TaskList.get(i).getTaskType(); + for (int i = 0; i < DukeList.size(); i++) { + String typeCheck = DukeList.get(i).getTaskType(); String newLine = ""; if (typeCheck.equals("T")) { - newLine = buildStorageLine(TaskList.get(i)); // buildTodoLine(TaskList.get(i)); + newLine = buildStorageLine(DukeList.get(i)); // buildTodoLine(TaskList.get(i)); } else if (typeCheck.equals("D")) { - newLine = buildStorageLine(TaskList.get(i)); //buildDeadlineLine(TaskList.get(i)); + newLine = buildStorageLine(DukeList.get(i)); //buildDeadlineLine(TaskList.get(i)); } else if (typeCheck.equals("E")) { - newLine = buildStorageLine(TaskList.get(i)); //buildEventLine(TaskList.get(i)); + newLine = buildStorageLine(DukeList.get(i)); //buildEventLine(TaskList.get(i)); } fw.write(newLine + System.getProperty("line.separator")); } @@ -422,8 +407,8 @@ public static void RunDuke() { } catch (DukeException e) { e.printErrMsg(); } - StartDuke(); - Greet(); + Ui.StartDuke(); + Ui.Greet(); } public static void main(String[] args) throws IOException { diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index 30d98a70..fdb9a24c 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -1,2 +1,16 @@ public class Ui { + public static void StartDuke() { + String logo = " ____ _ \n" + + "| _ \\ _ _| | _____ \n" + + "| | | | | | | |/ / _ \\\n" + + "| |_| | |_| | < __/\n" + + "|____/ \\__,_|_|\\_\\___|\n"; + System.out.println("Welcome to\n" + logo + " chatbot! \n"); + } + + public static void Greet() { + String start = "Hello, I'm Duke\n" + + "What can I do for you?\n"; + System.out.println(Duke.line + start + Duke.line); + } } From f451c381918e664c6529e08d72786c7f3b2cb99f Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 28 Oct 2021 00:42:35 +0800 Subject: [PATCH 084/193] Refactoring Duke.java and Ui.java --- src/main/java/Duke.java | 87 +++++++++++++++++++---------------------- src/main/java/Ui.java | 4 +- 2 files changed, 44 insertions(+), 47 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 8a51ac0c..5aa06dfc 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -8,32 +8,29 @@ public class Duke { static Scanner in = new Scanner(System.in); - static String line = "____________________________________________________________\n"; static ArrayList DukeList = new ArrayList<>(); - static int TaskCount = 0; public static void addTaskToList(Task newEntry) { DukeList.add(newEntry); - TaskCount++; } public static void printTaskList() { - System.out.println(line + "\nHere are the tasks in your list:"); - for (int i = 0; i < TaskCount; i++) { + System.out.println(Ui.line + "\nHere are the tasks in your list:"); + for (int i = 0; i < DukeList.size(); i++) { System.out.println((i + 1) + "." + DukeList.get(i).getTaskInfo()); } - System.out.println(line); + System.out.println(Ui.line); } public static void markTaskAtIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(4).trim()) - 1; - if (index < TaskCount && index > -1) { + if (index < DukeList.size() && index > -1) { MarkTask(DukeList.get(index)); - System.out.println(line + "Nice! I've marked this task as done:\n " - + DukeList.get(index).getTaskInfo() + "\n" + line); + System.out.println(Ui.line + "Nice! I've marked this task as done:\n " + + DukeList.get(index).getTaskInfo() + "\n" + Ui.line); } else { - throw new DukeException(line + "\n☹ OOPS!!! " + - "The index number of the task to be done is invalid!\n" + line); + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The index number of the task to be done is invalid!\n" + Ui.line); } } @@ -46,8 +43,7 @@ public static void ExtendTaskList() { while (!stop) { String input = in.nextLine(); if (input.equals("bye")) { - System.out.println(line + "Bye. Hope to see you again soon!\n" + line); - TaskCount = 0; + System.out.println(Ui.line + "Bye. Hope to see you again soon!\n" + Ui.line); stop = true; } else if (input.trim().equals("list")) { printTaskList(); @@ -62,8 +58,8 @@ public static void ExtendTaskList() { } else if (input.startsWith("delete ")) { DeleteTask(input); } else { - System.out.println(line + "☹ OOPS!!! " + - "I'm sorry, but I don't know what that means :-(\n" + line); + System.out.println(Ui.line + "☹ OOPS!!! " + + "I'm sorry, but I don't know what that means :-(\n" + Ui.line); } } } @@ -76,7 +72,7 @@ public static void AddTodo(String input) { addTaskToList(newTodo); PrintTaskAdded(newTodo); PrintTaskCount(); - System.out.println(line); + System.out.println(Ui.line); } } catch (DukeException e) { e.printErrMsg(); @@ -85,11 +81,11 @@ public static void AddTodo(String input) { public static boolean CheckValidTodo(String input) throws DukeException { if (input.length() < 5) { - throw new DukeException(line + "\n☹ OOPS!!! The description of a todo cannot be empty.\n" - + line); + throw new DukeException(Ui.line + "\n☹ OOPS!!! The description of a todo cannot be empty.\n" + + Ui.line); } else if (input.substring(4).trim().equals("")) { - throw new DukeException(line + "\n☹ OOPS!!! The description of a todo cannot be empty.\n" - + line); + throw new DukeException(Ui.line + "\n☹ OOPS!!! The description of a todo cannot be empty.\n" + + Ui.line); } else { return true; } @@ -103,7 +99,7 @@ public static void AddDeadline(String input) { addTaskToList(newDeadline); PrintTaskAdded(newDeadline); PrintTaskCount(); - System.out.println(line); + System.out.println(Ui.line); } } catch (DukeException e) { e.printErrMsg(); @@ -116,11 +112,11 @@ public static boolean CheckValidDeadline(String input) throws DukeException { if (parts.length != 2) { throw new DukeException("☹ OOPS!!! Invalid syntax for adding deadline."); } else if (parts[0].trim().equals("")) { - throw new DukeException(line + "\n☹ OOPS!!! " + - "The task description of a deadline cannot be empty.\n" + line); + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The task description of a deadline cannot be empty.\n" + Ui.line); } else if (parts[1].trim().equals("")) { - throw new DukeException(line + "\n☹ OOPS!!! " + - "The due date/time of a deadline cannot be empty.\n" + line); + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The due date/time of a deadline cannot be empty.\n" + Ui.line); } else { return true; } @@ -137,7 +133,7 @@ public static void AddEvent(String input) { addTaskToList(newEvent); PrintTaskAdded(newEvent); PrintTaskCount(); - System.out.println(line); + System.out.println(Ui.line); } } catch (DukeException e) { e.printErrMsg(); @@ -150,11 +146,11 @@ public static boolean CheckValidEvent(String input) throws DukeException { if (parts.length != 2) { throw new DukeException("☹ OOPS!!! Invalid syntax for adding event."); } else if (parts[0].trim().equals("")) { - throw new DukeException(line + "\n☹ OOPS!!! " + - "The task description of an event cannot be empty.\n" + line); + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The task description of an event cannot be empty.\n" + Ui.line); } else if (parts[1].trim().equals("")) { - throw new DukeException(line + "\n☹ OOPS!!! " + - "The date/time of an event cannot be empty.\n" + line); + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The date/time of an event cannot be empty.\n" + Ui.line); } else { return true; } @@ -175,26 +171,26 @@ public static void MarkDone(String input) { public static boolean CheckValidDone(String input) throws DukeException { if (input.length() < 5) { - throw new DukeException(line + "\n☹ OOPS!!! " + + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + "The index of the task to be marked as done is missing.\n" - + line); + + Ui.line); } else { try { int index = Integer.parseInt(input.substring(4).trim()) - 1; } catch (NumberFormatException e) { - throw new DukeException(line + "\n☹ OOPS!!! " + - "The index of the task to mark as done has to be an integer!\n" + line); + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The index of the task to mark as done has to be an integer!\n" + Ui.line); } return true; } } public static void PrintTaskCount() { - System.out.println("Now you have " + TaskCount + " tasks in the list."); + System.out.println("Now you have " + DukeList.size() + " tasks in the list."); } public static void PrintTaskAdded(Task newTask) { - System.out.println(line + "\nGot it. I've added this task:\n" + System.out.println(Ui.line + "\nGot it. I've added this task:\n" + newTask.getTaskInfo()); } @@ -210,15 +206,15 @@ public static void DeleteTask(String input) { public static boolean CheckValidDelete(String input) throws DukeException { if (input.length() < 7) { - throw new DukeException(line + "\n☹ OOPS!!! " + + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + "The index of the task to delete is missing.\n" - + line); + + Ui.line); } else { try { int test = Integer.parseInt(input.substring(6).trim()) - 1; } catch (NumberFormatException e) { - throw new DukeException(line + "\n☹ OOPS!!! " + - "The index of the task to delete has to be an integer!\n" + line); + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The index of the task to delete has to be an integer!\n" + Ui.line); } return true; } @@ -226,21 +222,20 @@ public static boolean CheckValidDelete(String input) throws DukeException { public static void DeleteIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(6).trim()) - 1; - if (index < TaskCount && index > -1) { + if (index < DukeList.size() && index > -1) { String DeletedInfo = DukeList.get(index).getTaskInfo(); RemoveTask(index); - System.out.println(line + "Noted! I've removed this task:\n " - + DeletedInfo + "\n" + line); + System.out.println(Ui.line + "Noted! I've removed this task:\n " + + DeletedInfo + "\n" + Ui.line); PrintTaskCount(); } else { - throw new DukeException(line + "\n☹ OOPS!!! " + - "The index number of the task to delete is invalid!\n" + line); + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The index number of the task to delete is invalid!\n" + Ui.line); } } public static void RemoveTask(int index) { DukeList.remove(index); - TaskCount--; } public static File OpenStorageFile() throws DukeException { diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index fdb9a24c..804ce450 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -1,4 +1,6 @@ public class Ui { + static String line = "____________________________________________________________\n"; + public static void StartDuke() { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" @@ -11,6 +13,6 @@ public static void StartDuke() { public static void Greet() { String start = "Hello, I'm Duke\n" + "What can I do for you?\n"; - System.out.println(Duke.line + start + Duke.line); + System.out.println(line + start + line); } } From 73f605f49cd1b293e9f27149ceb2357737f7428e Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 28 Oct 2021 23:40:37 +0800 Subject: [PATCH 085/193] Refactor code from Duke.java to Ui.java --- src/main/java/Ui.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index 804ce450..6bf86cfe 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -15,4 +15,13 @@ public static void Greet() { + "What can I do for you?\n"; System.out.println(line + start + line); } + + public static void PrintTaskCount() { + System.out.println("Now you have " + TaskList.DukeList.size() + " tasks in the list."); + } + + public static void PrintTaskAdded(Task newTask) { + System.out.println(line + "\nGot it. I've added this task:\n" + + newTask.getTaskInfo()); + } } From 32b0c8a8b192c9191e622de18c5001062ea7718a Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 28 Oct 2021 23:41:12 +0800 Subject: [PATCH 086/193] Refactor checking methods from Duke.java to Parser.java --- src/main/java/Parser.java | 84 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 src/main/java/Parser.java diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java new file mode 100644 index 00000000..cd9c096b --- /dev/null +++ b/src/main/java/Parser.java @@ -0,0 +1,84 @@ +public class Parser { + + public static boolean CheckValidTodo(String input) throws DukeException { + if (input.length() < 5) { + throw new DukeException(Ui.line + "\n☹ OOPS!!! The description of a todo cannot be empty.\n" + + Ui.line); + } else if (input.substring(4).trim().equals("")) { + throw new DukeException(Ui.line + "\n☹ OOPS!!! The description of a todo cannot be empty.\n" + + Ui.line); + } else { + return true; + } + } + + public static boolean CheckValidDeadline(String input) throws DukeException { + if (input.contains("/by")) { + String[] parts = input.substring(8).split("/by"); + if (parts.length != 2) { + throw new DukeException("☹ OOPS!!! Invalid syntax for adding deadline."); + } else if (parts[0].trim().equals("")) { + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The task description of a deadline cannot be empty.\n" + Ui.line); + } else if (parts[1].trim().equals("")) { + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The due date/time of a deadline cannot be empty.\n" + Ui.line); + } else { + return true; + } + } else { + throw new DukeException("☹ OOPS!!! Invalid syntax for adding deadline."); + } + } + + public static boolean CheckValidEvent(String input) throws DukeException { + if (input.contains("/at")) { + String[] parts = input.substring(5).split("/at"); + if (parts.length != 2) { + throw new DukeException("☹ OOPS!!! Invalid syntax for adding event."); + } else if (parts[0].trim().equals("")) { + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The task description of an event cannot be empty.\n" + Ui.line); + } else if (parts[1].trim().equals("")) { + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The date/time of an event cannot be empty.\n" + Ui.line); + } else { + return true; + } + } else { + throw new DukeException("☹ OOPS!!! Invalid syntax for adding event."); + } + } + + public static boolean CheckValidDone(String input) throws DukeException { + if (input.length() < 5) { + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The index of the task to be marked as done is missing.\n" + + Ui.line); + } else { + try { + int index = Integer.parseInt(input.substring(4).trim()) - 1; + } catch (NumberFormatException e) { + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The index of the task to mark as done has to be an integer!\n" + Ui.line); + } + return true; + } + } + + public static boolean CheckValidDelete(String input) throws DukeException { + if (input.length() < 7) { + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The index of the task to delete is missing.\n" + + Ui.line); + } else { + try { + int test = Integer.parseInt(input.substring(6).trim()) - 1; + } catch (NumberFormatException e) { + throw new DukeException(Ui.line + "\n☹ OOPS!!! " + + "The index of the task to delete has to be an integer!\n" + Ui.line); + } + return true; + } + } +} From eeba68018c961c0c4823de052fe08735c755a90d Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 28 Oct 2021 23:41:39 +0800 Subject: [PATCH 087/193] Refactor create and open file methods from Duke.java to Storage.java --- src/main/java/Storage.java | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/main/java/Storage.java diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java new file mode 100644 index 00000000..a94103ac --- /dev/null +++ b/src/main/java/Storage.java @@ -0,0 +1,29 @@ +import java.io.File; +import java.io.IOException; + +public class Storage { + + public static File CreateStorageFile() throws DukeException { + File newFile = new File("data\\Storage.txt"); + try { + newFile.getParentFile().mkdirs(); + newFile.createNewFile(); + System.out.println("New Storage.txt file created."); + return newFile; + } catch (IOException err) { + throw new DukeException("Failed to create new Storage.txt file."); + } + } + + public static File OpenStorageFile() throws DukeException { + File newFile = new File("data\\storage.txt"); + if (!newFile.exists()) { + try { + newFile = CreateStorageFile(); + } catch (DukeException e) { + throw new DukeException("Duke will run without any prior stored task information"); + } + } + return newFile; + } +} From cc10e7e43887e27c2a1971593722ff35c68207d7 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 02:37:56 +0800 Subject: [PATCH 088/193] Refactored Duke.java --- src/main/java/Duke.java | 248 ++++++++-------------------------------- 1 file changed, 46 insertions(+), 202 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5aa06dfc..4ce8fe5c 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,5 +1,4 @@ import java.io.File; -import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; @@ -8,29 +7,23 @@ public class Duke { static Scanner in = new Scanner(System.in); - static ArrayList DukeList = new ArrayList<>(); - - public static void addTaskToList(Task newEntry) { - DukeList.add(newEntry); - } public static void printTaskList() { - System.out.println(Ui.line + "\nHere are the tasks in your list:"); - for (int i = 0; i < DukeList.size(); i++) { - System.out.println((i + 1) + "." + DukeList.get(i).getTaskInfo()); + System.out.println("Here are the tasks in your list:"); + for (int i = 0; i < TaskList.DukeList.size(); i++) { + System.out.println((i + 1) + "." + TaskList.DukeList.get(i).getTaskInfo()); } - System.out.println(Ui.line); } public static void markTaskAtIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(4).trim()) - 1; - if (index < DukeList.size() && index > -1) { - MarkTask(DukeList.get(index)); - System.out.println(Ui.line + "Nice! I've marked this task as done:\n " - + DukeList.get(index).getTaskInfo() + "\n" + Ui.line); + if (index < TaskList.DukeList.size() && index > -1) { + MarkTask(TaskList.DukeList.get(index)); + System.out.println("Nice! I've marked this task as done:\n " + + TaskList.DukeList.get(index).getTaskInfo()); } else { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The index number of the task to be done is invalid!\n" + Ui.line); + throw new DukeException("☹ OOPS!!! " + + "The index number of the task to be done is invalid!"); } } @@ -39,129 +32,65 @@ public static void MarkTask(Task inputTask) { } public static void ExtendTaskList() { - boolean stop = false; - while (!stop) { + while (true) { String input = in.nextLine(); + System.out.println(Ui.line); if (input.equals("bye")) { - System.out.println(Ui.line + "Bye. Hope to see you again soon!\n" + Ui.line); - stop = true; - } else if (input.trim().equals("list")) { - printTaskList(); - } else if (input.startsWith("todo ")) { - AddTodo(input); - } else if (input.startsWith("deadline ")) { - AddDeadline(input); - } else if (input.startsWith("event ")) { - AddEvent(input); - } else if (input.startsWith("done ")) { - MarkDone(input); - } else if (input.startsWith("delete ")) { - DeleteTask(input); + System.out.println("Bye. Hope to see you again soon!"); + System.out.println(Ui.line); + break; } else { - System.out.println(Ui.line + "☹ OOPS!!! " + - "I'm sorry, but I don't know what that means :-(\n" + Ui.line); + Parser.parseInput(input); } + System.out.println(Ui.line + "\n"); } } public static void AddTodo(String input) { try { - if (CheckValidTodo(input)) { + if (Parser.CheckValidTodo(input)) { String newTask = input.substring(4).trim(); Todo newTodo = new Todo(newTask); - addTaskToList(newTodo); - PrintTaskAdded(newTodo); - PrintTaskCount(); - System.out.println(Ui.line); + TaskList.addTaskToList(newTodo); + Ui.PrintTaskAdded(newTodo); + Ui.PrintTaskCount(); } } catch (DukeException e) { e.printErrMsg(); } } - public static boolean CheckValidTodo(String input) throws DukeException { - if (input.length() < 5) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! The description of a todo cannot be empty.\n" - + Ui.line); - } else if (input.substring(4).trim().equals("")) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! The description of a todo cannot be empty.\n" - + Ui.line); - } else { - return true; - } - } - public static void AddDeadline(String input) { try { - if (CheckValidDeadline(input)) { + if (Parser.CheckValidDeadline(input)) { String[] parts = input.substring(8).split("/by"); Deadline newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); - addTaskToList(newDeadline); - PrintTaskAdded(newDeadline); - PrintTaskCount(); - System.out.println(Ui.line); + TaskList.addTaskToList(newDeadline); + Ui.PrintTaskAdded(newDeadline); + Ui.PrintTaskCount(); } } catch (DukeException e) { e.printErrMsg(); } } - public static boolean CheckValidDeadline(String input) throws DukeException { - if (input.contains("/by")) { - String[] parts = input.substring(8).split("/by"); - if (parts.length != 2) { - throw new DukeException("☹ OOPS!!! Invalid syntax for adding deadline."); - } else if (parts[0].trim().equals("")) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The task description of a deadline cannot be empty.\n" + Ui.line); - } else if (parts[1].trim().equals("")) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The due date/time of a deadline cannot be empty.\n" + Ui.line); - } else { - return true; - } - } else { - throw new DukeException("☹ OOPS!!! Invalid syntax for adding deadline."); - } - } - public static void AddEvent(String input) { try { - if (CheckValidEvent(input)) { + if (Parser.CheckValidEvent(input)) { String[] parts = input.substring(5).split("/at"); Event newEvent = new Event(parts[0].trim(), parts[1].trim()); - addTaskToList(newEvent); - PrintTaskAdded(newEvent); - PrintTaskCount(); - System.out.println(Ui.line); + TaskList.addTaskToList(newEvent); + Ui.PrintTaskAdded(newEvent); + Ui.PrintTaskCount(); } } catch (DukeException e) { e.printErrMsg(); } } - public static boolean CheckValidEvent(String input) throws DukeException { - if (input.contains("/at")) { - String[] parts = input.substring(5).split("/at"); - if (parts.length != 2) { - throw new DukeException("☹ OOPS!!! Invalid syntax for adding event."); - } else if (parts[0].trim().equals("")) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The task description of an event cannot be empty.\n" + Ui.line); - } else if (parts[1].trim().equals("")) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The date/time of an event cannot be empty.\n" + Ui.line); - } else { - return true; - } - } else { - throw new DukeException("☹ OOPS!!! Invalid syntax for adding event."); - } - } - public static void MarkDone(String input) { try { - if (CheckValidDone(input)) { + if (Parser.CheckValidDone(input)) { markTaskAtIndex(input); } } catch (DukeException e) { @@ -169,34 +98,9 @@ public static void MarkDone(String input) { } } - public static boolean CheckValidDone(String input) throws DukeException { - if (input.length() < 5) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The index of the task to be marked as done is missing.\n" - + Ui.line); - } else { - try { - int index = Integer.parseInt(input.substring(4).trim()) - 1; - } catch (NumberFormatException e) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The index of the task to mark as done has to be an integer!\n" + Ui.line); - } - return true; - } - } - - public static void PrintTaskCount() { - System.out.println("Now you have " + DukeList.size() + " tasks in the list."); - } - - public static void PrintTaskAdded(Task newTask) { - System.out.println(Ui.line + "\nGot it. I've added this task:\n" - + newTask.getTaskInfo()); - } - public static void DeleteTask(String input) { try { - if (CheckValidDelete(input)) { + if (Parser.CheckValidDelete(input)) { DeleteIndex(input); } } catch (DukeException e) { @@ -204,77 +108,15 @@ public static void DeleteTask(String input) { } } - public static boolean CheckValidDelete(String input) throws DukeException { - if (input.length() < 7) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The index of the task to delete is missing.\n" - + Ui.line); - } else { - try { - int test = Integer.parseInt(input.substring(6).trim()) - 1; - } catch (NumberFormatException e) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The index of the task to delete has to be an integer!\n" + Ui.line); - } - return true; - } - } - public static void DeleteIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(6).trim()) - 1; - if (index < DukeList.size() && index > -1) { - String DeletedInfo = DukeList.get(index).getTaskInfo(); - RemoveTask(index); - System.out.println(Ui.line + "Noted! I've removed this task:\n " - + DeletedInfo + "\n" + Ui.line); - PrintTaskCount(); + if (index < TaskList.DukeList.size() && index > -1) { + String DeletedInfo = TaskList.DukeList.get(index).getTaskInfo(); + TaskList.RemoveTask(index); + System.out.println("Noted! I've removed this task:\n " + DeletedInfo); + Ui.PrintTaskCount(); } else { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The index number of the task to delete is invalid!\n" + Ui.line); - } - } - - public static void RemoveTask(int index) { - DukeList.remove(index); - } - - public static File OpenStorageFile() throws DukeException { - File newFile = new File("data\\storage.txt"); - if (!newFile.exists()) { - try { - newFile = CreateStorageFile(); - } catch (DukeException e) { - throw new DukeException("Duke will run without any prior stored task information"); - } - } - return newFile; - } - - public static File CreateStorageFile() throws DukeException { - File newFile = new File("data\\Storage.txt"); - try { - newFile.getParentFile().mkdirs(); - newFile.createNewFile(); - System.out.println("New Storage.txt file created."); - return newFile; - } catch (IOException err) { - throw new DukeException("Failed to create new Storage.txt file."); - } - } - - public static void ReadFileToArray(File storageFile) { - try { - Scanner s = new Scanner(storageFile); - while (s.hasNext()) { - try { - addTaskToList(ParseStorageLine(s.nextLine())); - } catch (DukeException e) { - e.printErrMsg(); - } - } - } catch (FileNotFoundException e) { - System.out.println("File cannot be opened, " + - "Duke will not have any prior stored task information"); + throw new DukeException("☹ OOPS!!! The index number of the task to delete is invalid!"); } } @@ -361,15 +203,17 @@ public static boolean CheckEventLine(String[] parts) { public static void writeListToFile(File FileWrite) { try { FileWriter fw = new FileWriter(FileWrite, false); - for (int i = 0; i < DukeList.size(); i++) { - String typeCheck = DukeList.get(i).getTaskType(); + ArrayList list = TaskList.DukeList; + for (int i = 0; i < list.size(); i++) { + Task taskAtIndex = list.get(i); + String typeCheck = taskAtIndex.getTaskType(); String newLine = ""; if (typeCheck.equals("T")) { - newLine = buildStorageLine(DukeList.get(i)); // buildTodoLine(TaskList.get(i)); + newLine = buildStorageLine(taskAtIndex); } else if (typeCheck.equals("D")) { - newLine = buildStorageLine(DukeList.get(i)); //buildDeadlineLine(TaskList.get(i)); + newLine = buildStorageLine(taskAtIndex); } else if (typeCheck.equals("E")) { - newLine = buildStorageLine(DukeList.get(i)); //buildEventLine(TaskList.get(i)); + newLine = buildStorageLine(taskAtIndex); } fw.write(newLine + System.getProperty("line.separator")); } @@ -397,8 +241,8 @@ public static String buildStorageLine(Task targetTask) { public static void RunDuke() { try { - File StorageFile = OpenStorageFile(); - ReadFileToArray(StorageFile); + File StorageFile = Storage.OpenStorageFile(); + Storage.ReadFileToArray(StorageFile); } catch (DukeException e) { e.printErrMsg(); } @@ -410,7 +254,7 @@ public static void main(String[] args) throws IOException { RunDuke(); ExtendTaskList(); try { - writeListToFile(OpenStorageFile()); + writeListToFile(Storage.OpenStorageFile()); } catch (DukeException e) { System.out.println("Failed to write to file"); } From 4d134700b89947e5cd3917f2d34fa6ce5fd9bf34 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 02:38:37 +0800 Subject: [PATCH 089/193] Refactored Parser.java and moved parseInput method from Duke.java to Parser.java --- src/main/java/Parser.java | 54 +++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index cd9c096b..62be87da 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -1,12 +1,28 @@ public class Parser { + static void parseInput(String input) { + if (input.trim().equals("list")) { + Duke.printTaskList(); + } else if (input.startsWith("todo ")) { + Duke.AddTodo(input); + } else if (input.startsWith("deadline ")) { + Duke.AddDeadline(input); + } else if (input.startsWith("event ")) { + Duke.AddEvent(input); + } else if (input.startsWith("done ")) { + Duke.MarkDone(input); + } else if (input.startsWith("delete ")) { + Duke.DeleteTask(input); + } else { + System.out.println("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); + } + } + public static boolean CheckValidTodo(String input) throws DukeException { if (input.length() < 5) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! The description of a todo cannot be empty.\n" - + Ui.line); + throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); } else if (input.substring(4).trim().equals("")) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! The description of a todo cannot be empty.\n" - + Ui.line); + throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); } else { return true; } @@ -18,11 +34,9 @@ public static boolean CheckValidDeadline(String input) throws DukeException { if (parts.length != 2) { throw new DukeException("☹ OOPS!!! Invalid syntax for adding deadline."); } else if (parts[0].trim().equals("")) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The task description of a deadline cannot be empty.\n" + Ui.line); + throw new DukeException("☹ OOPS!!! The task description of a deadline cannot be empty."); } else if (parts[1].trim().equals("")) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The due date/time of a deadline cannot be empty.\n" + Ui.line); + throw new DukeException("☹ OOPS!!! The due date/time of a deadline cannot be empty."); } else { return true; } @@ -37,11 +51,9 @@ public static boolean CheckValidEvent(String input) throws DukeException { if (parts.length != 2) { throw new DukeException("☹ OOPS!!! Invalid syntax for adding event."); } else if (parts[0].trim().equals("")) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The task description of an event cannot be empty.\n" + Ui.line); + throw new DukeException("☹ OOPS!!! The task description of an event cannot be empty."); } else if (parts[1].trim().equals("")) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The date/time of an event cannot be empty.\n" + Ui.line); + throw new DukeException("☹ OOPS!!! The date/time of an event cannot be empty."); } else { return true; } @@ -52,15 +64,13 @@ public static boolean CheckValidEvent(String input) throws DukeException { public static boolean CheckValidDone(String input) throws DukeException { if (input.length() < 5) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The index of the task to be marked as done is missing.\n" - + Ui.line); + throw new DukeException("☹ OOPS!!! The index of the task to be marked as done is missing."); } else { try { int index = Integer.parseInt(input.substring(4).trim()) - 1; } catch (NumberFormatException e) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The index of the task to mark as done has to be an integer!\n" + Ui.line); + throw new DukeException("☹ OOPS!!! " + + "The index of the task to mark as done has to be an integer!"); } return true; } @@ -68,17 +78,17 @@ public static boolean CheckValidDone(String input) throws DukeException { public static boolean CheckValidDelete(String input) throws DukeException { if (input.length() < 7) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The index of the task to delete is missing.\n" - + Ui.line); + throw new DukeException("☹ OOPS!!! The index of the task to delete is missing."); } else { try { int test = Integer.parseInt(input.substring(6).trim()) - 1; } catch (NumberFormatException e) { - throw new DukeException(Ui.line + "\n☹ OOPS!!! " + - "The index of the task to delete has to be an integer!\n" + Ui.line); + throw new DukeException("☹ OOPS!!! " + + "The index of the task to delete has to be an integer!"); } return true; } } + + } From 38e3fa57186aa32ab34cb41eaea58fa247fc7da5 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 02:38:53 +0800 Subject: [PATCH 090/193] Refactored Ui.java --- src/main/java/Ui.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index 6bf86cfe..71383918 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -1,5 +1,5 @@ public class Ui { - static String line = "____________________________________________________________\n"; + static String line = "____________________________________________________________"; public static void StartDuke() { String logo = " ____ _ \n" @@ -7,13 +7,13 @@ public static void StartDuke() { + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Welcome to\n" + logo + " chatbot! \n"); + System.out.println(line + "\nWelcome to\n" + logo + " chatbot!"); } public static void Greet() { String start = "Hello, I'm Duke\n" + "What can I do for you?\n"; - System.out.println(line + start + line); + System.out.println(line + "\n" + start + line + "\n"); } public static void PrintTaskCount() { @@ -21,7 +21,7 @@ public static void PrintTaskCount() { } public static void PrintTaskAdded(Task newTask) { - System.out.println(line + "\nGot it. I've added this task:\n" + System.out.println("Got it. I've added this task:\n" + newTask.getTaskInfo()); } } From 4ec073066f141abce1c688e7082f1f40054dba43 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 02:52:31 +0800 Subject: [PATCH 091/193] Created TaskList.java and moved TaskList methods from Duke.java --- src/main/java/TaskList.java | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/main/java/TaskList.java diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java new file mode 100644 index 00000000..4ee14ffa --- /dev/null +++ b/src/main/java/TaskList.java @@ -0,0 +1,47 @@ +import java.util.ArrayList; + +public class TaskList { + static ArrayList DukeList = new ArrayList<>(); + + public static void addTaskToList(Task newEntry) { + DukeList.add(newEntry); + } + + public static void RemoveTask(int index) { + DukeList.remove(index); + } + + public static void printTaskList() { + System.out.println("Here are the tasks in your list:"); + for (int i = 0; i < DukeList.size(); i++) { + System.out.println((i + 1) + "." + DukeList.get(i).getTaskInfo()); + } + } + + public static void MarkDone(String input) { + try { + if (Parser.CheckValidDone(input)) { + markTaskAtIndex(input); + } + } catch (DukeException e) { + e.printErrMsg(); + } + } + + public static void markTaskAtIndex(String input) throws DukeException { + int index = Integer.parseInt(input.substring(4).trim()) - 1; + if (index < DukeList.size() && index > -1) { + MarkTask(DukeList.get(index)); + System.out.println("Nice! I've marked this task as done:\n " + + DukeList.get(index).getTaskInfo()); + } else { + throw new DukeException("☹ OOPS!!! " + + "The index number of the task to be done is invalid!"); + } + } + + public static void MarkTask(Task inputTask) { + inputTask.markCompleted(); + } + +} From 3d84975af49be9ac580e8564e8de12afa13bf440 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 02:53:14 +0800 Subject: [PATCH 092/193] Refactored methods from Duke.java to TaskList.java --- src/main/java/Duke.java | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 4ce8fe5c..8b5849a8 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -8,29 +8,6 @@ public class Duke { static Scanner in = new Scanner(System.in); - public static void printTaskList() { - System.out.println("Here are the tasks in your list:"); - for (int i = 0; i < TaskList.DukeList.size(); i++) { - System.out.println((i + 1) + "." + TaskList.DukeList.get(i).getTaskInfo()); - } - } - - public static void markTaskAtIndex(String input) throws DukeException { - int index = Integer.parseInt(input.substring(4).trim()) - 1; - if (index < TaskList.DukeList.size() && index > -1) { - MarkTask(TaskList.DukeList.get(index)); - System.out.println("Nice! I've marked this task as done:\n " - + TaskList.DukeList.get(index).getTaskInfo()); - } else { - throw new DukeException("☹ OOPS!!! " + - "The index number of the task to be done is invalid!"); - } - } - - public static void MarkTask(Task inputTask) { - inputTask.markCompleted(); - } - public static void ExtendTaskList() { while (true) { String input = in.nextLine(); @@ -88,16 +65,6 @@ public static void AddEvent(String input) { } } - public static void MarkDone(String input) { - try { - if (Parser.CheckValidDone(input)) { - markTaskAtIndex(input); - } - } catch (DukeException e) { - e.printErrMsg(); - } - } - public static void DeleteTask(String input) { try { if (Parser.CheckValidDelete(input)) { @@ -146,7 +113,7 @@ public static Task ParseStorageLine(String FileLine) throws DukeException { public static Todo getTodoFromLine(String[] parts) { Todo newTodo = new Todo(parts[2].trim()); if (parts[1].trim().equals("1")) { - MarkTask(newTodo); + TaskList.MarkTask(newTodo); } return newTodo; } @@ -154,7 +121,7 @@ public static Todo getTodoFromLine(String[] parts) { public static Deadline getDeadlineFromLine(String[] parts) { Deadline newDeadline = new Deadline(parts[2].trim(), parts[3].trim()); if (parts[1].trim().equals("1")) { - MarkTask(newDeadline); + TaskList.MarkTask(newDeadline); } return newDeadline; } @@ -162,7 +129,7 @@ public static Deadline getDeadlineFromLine(String[] parts) { public static Event getEventFromLine(String[] parts) { Event newEvent = new Event(parts[2].trim(), parts[3].trim()); if (parts[1].trim().equals("1")) { - MarkTask(newEvent); + TaskList.MarkTask(newEvent); } return newEvent; } From c4402ccff27bf9f10c948b16f2843c849504d2ab Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 10:51:10 +0800 Subject: [PATCH 093/193] Refactored and added Parse Storage Lines methods to Parser.java --- src/main/java/Parser.java | 153 +++++++++++++++++++++++--------------- 1 file changed, 94 insertions(+), 59 deletions(-) diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 62be87da..ae0ae824 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -2,93 +2,128 @@ public class Parser { static void parseInput(String input) { if (input.trim().equals("list")) { - Duke.printTaskList(); + TaskList.printTaskList(); } else if (input.startsWith("todo ")) { - Duke.AddTodo(input); + AddTodo(input); } else if (input.startsWith("deadline ")) { - Duke.AddDeadline(input); + AddDeadline(input); } else if (input.startsWith("event ")) { - Duke.AddEvent(input); + AddEvent(input); } else if (input.startsWith("done ")) { - Duke.MarkDone(input); + MarkDone(input); } else if (input.startsWith("delete ")) { - Duke.DeleteTask(input); + DeleteTask(input); } else { System.out.println("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); } } - public static boolean CheckValidTodo(String input) throws DukeException { - if (input.length() < 5) { - throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); - } else if (input.substring(4).trim().equals("")) { - throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); - } else { - return true; + public static void AddTodo(String input) { + try { + if (InputChecker.CheckValidTodo(input)) { + String newTask = input.substring(4).trim(); + Todo newTodo = new Todo(newTask); + TaskList.addTaskToList(newTodo); + Ui.PrintTaskAdded(newTodo); + Ui.PrintTaskCount(); + } + } catch (DukeException e) { + e.printErrMsg(); } } - public static boolean CheckValidDeadline(String input) throws DukeException { - if (input.contains("/by")) { - String[] parts = input.substring(8).split("/by"); - if (parts.length != 2) { - throw new DukeException("☹ OOPS!!! Invalid syntax for adding deadline."); - } else if (parts[0].trim().equals("")) { - throw new DukeException("☹ OOPS!!! The task description of a deadline cannot be empty."); - } else if (parts[1].trim().equals("")) { - throw new DukeException("☹ OOPS!!! The due date/time of a deadline cannot be empty."); - } else { - return true; + public static void AddDeadline(String input) { + try { + if (InputChecker.CheckValidDeadline(input)) { + String[] parts = input.substring(8).split("/by"); + Deadline newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); + TaskList.addTaskToList(newDeadline); + Ui.PrintTaskAdded(newDeadline); + Ui.PrintTaskCount(); } - } else { - throw new DukeException("☹ OOPS!!! Invalid syntax for adding deadline."); + } catch (DukeException e) { + e.printErrMsg(); } } - public static boolean CheckValidEvent(String input) throws DukeException { - if (input.contains("/at")) { - String[] parts = input.substring(5).split("/at"); - if (parts.length != 2) { - throw new DukeException("☹ OOPS!!! Invalid syntax for adding event."); - } else if (parts[0].trim().equals("")) { - throw new DukeException("☹ OOPS!!! The task description of an event cannot be empty."); - } else if (parts[1].trim().equals("")) { - throw new DukeException("☹ OOPS!!! The date/time of an event cannot be empty."); - } else { - return true; + public static void AddEvent(String input) { + try { + if (InputChecker.CheckValidEvent(input)) { + String[] parts = input.substring(5).split("/at"); + Event newEvent = new Event(parts[0].trim(), parts[1].trim()); + TaskList.addTaskToList(newEvent); + Ui.PrintTaskAdded(newEvent); + Ui.PrintTaskCount(); } - } else { - throw new DukeException("☹ OOPS!!! Invalid syntax for adding event."); + } catch (DukeException e) { + e.printErrMsg(); } } - public static boolean CheckValidDone(String input) throws DukeException { - if (input.length() < 5) { - throw new DukeException("☹ OOPS!!! The index of the task to be marked as done is missing."); - } else { - try { - int index = Integer.parseInt(input.substring(4).trim()) - 1; - } catch (NumberFormatException e) { - throw new DukeException("☹ OOPS!!! " + - "The index of the task to mark as done has to be an integer!"); + public static void MarkDone(String input) { + try { + if (InputChecker.CheckValidDone(input)) { + TaskList.markTaskAtIndex(input); } - return true; + } catch (DukeException e) { + e.printErrMsg(); } } - public static boolean CheckValidDelete(String input) throws DukeException { - if (input.length() < 7) { - throw new DukeException("☹ OOPS!!! The index of the task to delete is missing."); - } else { - try { - int test = Integer.parseInt(input.substring(6).trim()) - 1; - } catch (NumberFormatException e) { - throw new DukeException("☹ OOPS!!! " + - "The index of the task to delete has to be an integer!"); + public static void DeleteTask(String input) { + try { + if (InputChecker.CheckValidDelete(input)) { + TaskList.DeleteIndex(input); + } + } catch (DukeException e) { + e.printErrMsg(); + } + } + + public static Task ParseStorageLine(String FileLine) throws DukeException { + String[] parts = FileLine.split("\\|"); + if (parts[0].trim().equals("T")) { + if(FileLineChecker.CheckTodoLine(parts)) { + Todo newTodo = getTodoFromLine(parts); + return newTodo; } - return true; + } else if (parts[0].trim().equals("D")) { + if(FileLineChecker.CheckDeadlineLine(parts)) { + Deadline newDeadline = getDeadlineFromLine(parts); + return newDeadline; + } + } else if (parts[0].trim().equals("E")) { + if (FileLineChecker.CheckEventLine(parts)) { + Event newEvent = getEventFromLine(parts); + return newEvent; + } + } else { + System.out.println("Line is invalid"); + } + throw new DukeException("A line from storage file is invalid and will not be added to Duke."); + } + + public static Todo getTodoFromLine(String[] parts) { + Todo newTodo = new Todo(parts[2].trim()); + if (parts[1].trim().equals("1")) { + TaskList.MarkTask(newTodo); } + return newTodo; } + public static Deadline getDeadlineFromLine(String[] parts) { + Deadline newDeadline = new Deadline(parts[2].trim(), parts[3].trim()); + if (parts[1].trim().equals("1")) { + TaskList.MarkTask(newDeadline); + } + return newDeadline; + } + public static Event getEventFromLine(String[] parts) { + Event newEvent = new Event(parts[2].trim(), parts[3].trim()); + if (parts[1].trim().equals("1")) { + TaskList.MarkTask(newEvent); + } + return newEvent; + } } From c32c320a46aa3686033c7b3977ad99e83f1508db Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 10:51:26 +0800 Subject: [PATCH 094/193] Moved Storage methods from Duke.java to Storage.java --- src/main/java/Storage.java | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index a94103ac..36e3abb7 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -1,5 +1,9 @@ import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileWriter; import java.io.IOException; +import java.util.ArrayList; +import java.util.Scanner; public class Storage { @@ -26,4 +30,59 @@ public static File OpenStorageFile() throws DukeException { } return newFile; } + + public static void ReadFileToArray(File storageFile) { + try { + Scanner s = new Scanner(storageFile); + while (s.hasNext()) { + try { + TaskList.addTaskToList(Parser.ParseStorageLine(s.nextLine())); + } catch (DukeException e) { + e.printErrMsg(); + } + } + } catch (FileNotFoundException e) { + System.out.println("File cannot be opened, " + + "Duke will not have any prior stored task information"); + } + } + + public static void writeListToFile(File FileWrite) { + try { + FileWriter fw = new FileWriter(FileWrite, false); + ArrayList list = TaskList.DukeList; + for (int i = 0; i < list.size(); i++) { + Task taskAtIndex = list.get(i); + String typeCheck = taskAtIndex.getTaskType(); + String newLine = ""; + if (typeCheck.equals("T")) { + newLine = buildStorageLine(taskAtIndex); + } else if (typeCheck.equals("D")) { + newLine = buildStorageLine(taskAtIndex); + } else if (typeCheck.equals("E")) { + newLine = buildStorageLine(taskAtIndex); + } + fw.write(newLine + System.getProperty("line.separator")); + } + fw.close(); + } catch (IOException e) { + System.out.println("Write to file failed"); + } + } + + public static String buildStorageLine(Task targetTask) { + String divider = " | "; + String initial = targetTask.getTaskType(); + String newLine = initial + divider; + if (targetTask.Completed) { + newLine = newLine + "1" + divider; + } else { + newLine = newLine + "0" + divider; + } + newLine = newLine + targetTask.Description; + + if (initial.equals("D") || initial.equals("E")) + newLine = newLine + divider + targetTask.getAdditionalInfo(); + return newLine; + } } From 63203102981d7c38554a71407eb1aca9d2ecc9fb Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 10:52:09 +0800 Subject: [PATCH 095/193] Moved DeleteIndex Method from Duke.java to TaskList.java --- src/main/java/TaskList.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 4ee14ffa..27594369 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -44,4 +44,15 @@ public static void MarkTask(Task inputTask) { inputTask.markCompleted(); } + public static void DeleteIndex(String input) throws DukeException { + int index = Integer.parseInt(input.substring(6).trim()) - 1; + if (index < DukeList.size() && index > -1) { + String DeletedInfo = DukeList.get(index).getTaskInfo(); + RemoveTask(index); + System.out.println("Noted! I've removed this task:\n " + DeletedInfo); + Ui.PrintTaskCount(); + } else { + throw new DukeException("☹ OOPS!!! The index number of the task to delete is invalid!"); + } + } } From 403aa4dde74d541269b049300422d1ccd1a42581 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 10:52:39 +0800 Subject: [PATCH 096/193] Refactored TaskList.java --- src/main/java/TaskList.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 27594369..864f5e60 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -18,16 +18,6 @@ public static void printTaskList() { } } - public static void MarkDone(String input) { - try { - if (Parser.CheckValidDone(input)) { - markTaskAtIndex(input); - } - } catch (DukeException e) { - e.printErrMsg(); - } - } - public static void markTaskAtIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(4).trim()) - 1; if (index < DukeList.size() && index > -1) { From 40add9e1fea472b56f60f7474a07169945b6c3e4 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 10:53:16 +0800 Subject: [PATCH 097/193] Created InputChecker class and moved all the input checking methods from Duke.java to InputChecker.java --- src/main/java/InputChecker.java | 74 +++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 src/main/java/InputChecker.java diff --git a/src/main/java/InputChecker.java b/src/main/java/InputChecker.java new file mode 100644 index 00000000..a092e9e5 --- /dev/null +++ b/src/main/java/InputChecker.java @@ -0,0 +1,74 @@ +public class InputChecker { + + public static boolean CheckValidTodo(String input) throws DukeException { + if (input.length() < 5) { + throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); + } else if (input.substring(4).trim().equals("")) { + throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); + } else { + return true; + } + } + + public static boolean CheckValidDeadline(String input) throws DukeException { + if (input.contains("/by")) { + String[] parts = input.substring(8).split("/by"); + if (parts.length != 2) { + throw new DukeException("☹ OOPS!!! Invalid syntax for adding deadline."); + } else if (parts[0].trim().equals("")) { + throw new DukeException("☹ OOPS!!! The task description of a deadline cannot be empty."); + } else if (parts[1].trim().equals("")) { + throw new DukeException("☹ OOPS!!! The due date/time of a deadline cannot be empty."); + } else { + return true; + } + } else { + throw new DukeException("☹ OOPS!!! Invalid syntax for adding deadline."); + } + } + + public static boolean CheckValidEvent(String input) throws DukeException { + if (input.contains("/at")) { + String[] parts = input.substring(5).split("/at"); + if (parts.length != 2) { + throw new DukeException("☹ OOPS!!! Invalid syntax for adding event."); + } else if (parts[0].trim().equals("")) { + throw new DukeException("☹ OOPS!!! The task description of an event cannot be empty."); + } else if (parts[1].trim().equals("")) { + throw new DukeException("☹ OOPS!!! The date/time of an event cannot be empty."); + } else { + return true; + } + } else { + throw new DukeException("☹ OOPS!!! Invalid syntax for adding event."); + } + } + + public static boolean CheckValidDone(String input) throws DukeException { + if (input.length() < 5) { + throw new DukeException("☹ OOPS!!! The index of the task to be marked as done is missing."); + } else { + try { + int index = Integer.parseInt(input.substring(4).trim()) - 1; + } catch (NumberFormatException e) { + throw new DukeException("☹ OOPS!!! " + + "The index of the task to mark as done has to be an integer!"); + } + return true; + } + } + + public static boolean CheckValidDelete(String input) throws DukeException { + if (input.length() < 7) { + throw new DukeException("☹ OOPS!!! The index of the task to delete is missing."); + } else { + try { + int test = Integer.parseInt(input.substring(6).trim()) - 1; + } catch (NumberFormatException e) { + throw new DukeException("☹ OOPS!!! " + + "The index of the task to delete has to be an integer!"); + } + return true; + } + } +} From a568db6ad1cc077b9305e707cf263340c34798d8 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 10:53:41 +0800 Subject: [PATCH 098/193] Created FileLineChecker class and moved all the file line checking methods from Duke.java to FileLineChecker.java --- src/main/java/FileLineChecker.java | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/main/java/FileLineChecker.java diff --git a/src/main/java/FileLineChecker.java b/src/main/java/FileLineChecker.java new file mode 100644 index 00000000..5d0e19ad --- /dev/null +++ b/src/main/java/FileLineChecker.java @@ -0,0 +1,34 @@ +public class FileLineChecker { + public static boolean CheckTodoLine(String[] parts) { + if (parts.length != 3) { + return false; + } else if (parts[2].trim().equals("")) { + return false; + } else if (!parts[1].trim().equals("1") && !parts[1].trim().equals("0")) { + return false; + } + return true; + } + + public static boolean CheckDeadlineLine(String[] parts) { + if (parts.length != 4) { + return false; + } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { + return false; + } else if (!parts[1].trim().equals("1") && !parts[1].trim().equals("0")) { + return false; + } + return true; + } + + public static boolean CheckEventLine(String[] parts) { + if (parts.length != 4) { + return false; + } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { + return false; + } else if (!parts[1].trim().equals("1") && !parts[1].trim().equals("0")) { + return false; + } + return true; + } +} From d2098100fb935404067cb93a002c0d012954065b Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 10:53:50 +0800 Subject: [PATCH 099/193] Refactored Duke.java --- src/main/java/Duke.java | 187 +--------------------------------------- 1 file changed, 1 insertion(+), 186 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 8b5849a8..1fd3f038 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,7 +1,5 @@ import java.io.File; -import java.io.FileWriter; import java.io.IOException; -import java.util.ArrayList; import java.util.Scanner; public class Duke { @@ -23,189 +21,6 @@ public static void ExtendTaskList() { } } - public static void AddTodo(String input) { - try { - if (Parser.CheckValidTodo(input)) { - String newTask = input.substring(4).trim(); - Todo newTodo = new Todo(newTask); - TaskList.addTaskToList(newTodo); - Ui.PrintTaskAdded(newTodo); - Ui.PrintTaskCount(); - } - } catch (DukeException e) { - e.printErrMsg(); - } - } - - public static void AddDeadline(String input) { - try { - if (Parser.CheckValidDeadline(input)) { - String[] parts = input.substring(8).split("/by"); - Deadline newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); - TaskList.addTaskToList(newDeadline); - Ui.PrintTaskAdded(newDeadline); - Ui.PrintTaskCount(); - } - } catch (DukeException e) { - e.printErrMsg(); - } - } - - public static void AddEvent(String input) { - try { - if (Parser.CheckValidEvent(input)) { - String[] parts = input.substring(5).split("/at"); - Event newEvent = new Event(parts[0].trim(), parts[1].trim()); - TaskList.addTaskToList(newEvent); - Ui.PrintTaskAdded(newEvent); - Ui.PrintTaskCount(); - } - } catch (DukeException e) { - e.printErrMsg(); - } - } - - public static void DeleteTask(String input) { - try { - if (Parser.CheckValidDelete(input)) { - DeleteIndex(input); - } - } catch (DukeException e) { - e.printErrMsg(); - } - } - - public static void DeleteIndex(String input) throws DukeException { - int index = Integer.parseInt(input.substring(6).trim()) - 1; - if (index < TaskList.DukeList.size() && index > -1) { - String DeletedInfo = TaskList.DukeList.get(index).getTaskInfo(); - TaskList.RemoveTask(index); - System.out.println("Noted! I've removed this task:\n " + DeletedInfo); - Ui.PrintTaskCount(); - } else { - throw new DukeException("☹ OOPS!!! The index number of the task to delete is invalid!"); - } - } - - public static Task ParseStorageLine(String FileLine) throws DukeException { - String[] parts = FileLine.split("\\|"); - if (parts[0].trim().equals("T")) { - if(CheckTodoLine(parts)) { - Todo newTodo = getTodoFromLine(parts); - return newTodo; - } - } else if (parts[0].trim().equals("D")) { - if(CheckDeadlineLine(parts)) { - Deadline newDeadline = getDeadlineFromLine(parts); - return newDeadline; - } - } else if (parts[0].trim().equals("E")) { - if (CheckEventLine(parts)) { - Event newEvent = getEventFromLine(parts); - return newEvent; - } - } else { - System.out.println("Line is invalid"); - } - throw new DukeException("A line from storage file is invalid and will not be added to Duke."); - } - - public static Todo getTodoFromLine(String[] parts) { - Todo newTodo = new Todo(parts[2].trim()); - if (parts[1].trim().equals("1")) { - TaskList.MarkTask(newTodo); - } - return newTodo; - } - - public static Deadline getDeadlineFromLine(String[] parts) { - Deadline newDeadline = new Deadline(parts[2].trim(), parts[3].trim()); - if (parts[1].trim().equals("1")) { - TaskList.MarkTask(newDeadline); - } - return newDeadline; - } - - public static Event getEventFromLine(String[] parts) { - Event newEvent = new Event(parts[2].trim(), parts[3].trim()); - if (parts[1].trim().equals("1")) { - TaskList.MarkTask(newEvent); - } - return newEvent; - } - - public static boolean CheckTodoLine(String[] parts) { - if (parts.length != 3) { - return false; - } else if (parts[2].trim().equals("")) { - return false; - } else if (!parts[1].trim().equals("1") && !parts[1].trim().equals("0")) { - return false; - } - return true; - } - - public static boolean CheckDeadlineLine(String[] parts) { - if (parts.length != 4) { - return false; - } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { - return false; - } else if (!parts[1].trim().equals("1") && !parts[1].trim().equals("0")) { - return false; - } - return true; - } - - public static boolean CheckEventLine(String[] parts) { - if (parts.length != 4) { - return false; - } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { - return false; - } else if (!parts[1].trim().equals("1") && !parts[1].trim().equals("0")) { - return false; - } - return true; - } - - public static void writeListToFile(File FileWrite) { - try { - FileWriter fw = new FileWriter(FileWrite, false); - ArrayList list = TaskList.DukeList; - for (int i = 0; i < list.size(); i++) { - Task taskAtIndex = list.get(i); - String typeCheck = taskAtIndex.getTaskType(); - String newLine = ""; - if (typeCheck.equals("T")) { - newLine = buildStorageLine(taskAtIndex); - } else if (typeCheck.equals("D")) { - newLine = buildStorageLine(taskAtIndex); - } else if (typeCheck.equals("E")) { - newLine = buildStorageLine(taskAtIndex); - } - fw.write(newLine + System.getProperty("line.separator")); - } - fw.close(); - } catch (IOException e) { - System.out.println("Write to file failed"); - } - } - - public static String buildStorageLine(Task targetTask) { - String divider = " | "; - String initial = targetTask.getTaskType(); - String newLine = initial + divider; - if (targetTask.Completed) { - newLine = newLine + "1" + divider; - } else { - newLine = newLine + "0" + divider; - } - newLine = newLine + targetTask.Description; - - if (initial.equals("D") || initial.equals("E")) - newLine = newLine + divider + targetTask.getAdditionalInfo(); - return newLine; - } - public static void RunDuke() { try { File StorageFile = Storage.OpenStorageFile(); @@ -221,7 +36,7 @@ public static void main(String[] args) throws IOException { RunDuke(); ExtendTaskList(); try { - writeListToFile(Storage.OpenStorageFile()); + Storage.writeListToFile(Storage.OpenStorageFile()); } catch (DukeException e) { System.out.println("Failed to write to file"); } From 9738eadce467db5e2181d227ddd8ebe5173ce7f2 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 11:44:58 +0800 Subject: [PATCH 100/193] Created Duke Package and moved classes into package. --- README.md | 4 ++-- src/main/java/{ => Duke}/Duke.java | 2 ++ src/main/java/{ => Duke}/DukeException.java | 2 ++ src/main/java/{ => Duke}/Parser.java | 7 ++++++- src/main/java/{ => Duke}/Storage.java | 20 +++++++++++++------- src/main/java/{ => Duke}/TaskList.java | 6 ++++++ src/main/java/{ => Duke}/Ui.java | 6 +++++- text-ui-test/runtest.bat | 2 +- 8 files changed, 37 insertions(+), 12 deletions(-) rename src/main/java/{ => Duke}/Duke.java (98%) rename src/main/java/{ => Duke}/DukeException.java (95%) rename src/main/java/{ => Duke}/Parser.java (96%) rename src/main/java/{ => Duke}/Storage.java (81%) rename src/main/java/{ => Duke}/TaskList.java (95%) rename src/main/java/{ => Duke}/Ui.java (91%) diff --git a/README.md b/README.md index 8715d4d9..63d0ad6b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Duke project template +# Duke.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 11, update Intellij to the most recent version. 1. If there are any further prompts, accept the defaults. 1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).
In the same dialog, set the **Project language level** field to the `SDK default` option. -3. After that, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output: +3. After that, locate the `src/main/java/Duke.Duke.java` file, right-click it, and choose `Run Duke.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/src/main/java/Duke.java b/src/main/java/Duke/Duke.java similarity index 98% rename from src/main/java/Duke.java rename to src/main/java/Duke/Duke.java index 1fd3f038..8345a219 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -1,3 +1,5 @@ +package Duke; + import java.io.File; import java.io.IOException; import java.util.Scanner; diff --git a/src/main/java/DukeException.java b/src/main/java/Duke/DukeException.java similarity index 95% rename from src/main/java/DukeException.java rename to src/main/java/Duke/DukeException.java index 569064c7..502972ea 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/Duke/DukeException.java @@ -1,3 +1,5 @@ +package Duke; + public class DukeException extends Exception{ protected String ErrMsg; diff --git a/src/main/java/Parser.java b/src/main/java/Duke/Parser.java similarity index 96% rename from src/main/java/Parser.java rename to src/main/java/Duke/Parser.java index ae0ae824..9a559b29 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Duke/Parser.java @@ -1,3 +1,8 @@ +package Duke; +import Duke.Models.*; +import Duke.Checker.FileLineChecker; +import Duke.Checker.InputChecker; + public class Parser { static void parseInput(String input) { @@ -100,7 +105,7 @@ public static Task ParseStorageLine(String FileLine) throws DukeException { } else { System.out.println("Line is invalid"); } - throw new DukeException("A line from storage file is invalid and will not be added to Duke."); + throw new DukeException("A line from storage file is invalid and will not be added to Duke.Duke."); } public static Todo getTodoFromLine(String[] parts) { diff --git a/src/main/java/Storage.java b/src/main/java/Duke/Storage.java similarity index 81% rename from src/main/java/Storage.java rename to src/main/java/Duke/Storage.java index 36e3abb7..2c06df12 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Duke/Storage.java @@ -1,3 +1,9 @@ +package Duke; + +import Duke.DukeException; +import Duke.Parser; +import Duke.TaskList; +import Duke.Models.*; import java.io.File; import java.io.FileNotFoundException; import java.io.FileWriter; @@ -8,14 +14,14 @@ public class Storage { public static File CreateStorageFile() throws DukeException { - File newFile = new File("data\\Storage.txt"); + File newFile = new File("data\\Duke.Storage.txt"); try { newFile.getParentFile().mkdirs(); newFile.createNewFile(); - System.out.println("New Storage.txt file created."); + System.out.println("New Duke.Storage.txt file created."); return newFile; } catch (IOException err) { - throw new DukeException("Failed to create new Storage.txt file."); + throw new DukeException("Failed to create new Duke.Storage.txt file."); } } @@ -25,7 +31,7 @@ public static File OpenStorageFile() throws DukeException { try { newFile = CreateStorageFile(); } catch (DukeException e) { - throw new DukeException("Duke will run without any prior stored task information"); + throw new DukeException("Duke.Duke will run without any prior stored task information"); } } return newFile; @@ -43,7 +49,7 @@ public static void ReadFileToArray(File storageFile) { } } catch (FileNotFoundException e) { System.out.println("File cannot be opened, " + - "Duke will not have any prior stored task information"); + "Duke.Duke will not have any prior stored task information"); } } @@ -74,12 +80,12 @@ public static String buildStorageLine(Task targetTask) { String divider = " | "; String initial = targetTask.getTaskType(); String newLine = initial + divider; - if (targetTask.Completed) { + if (targetTask.isCompleted()) { newLine = newLine + "1" + divider; } else { newLine = newLine + "0" + divider; } - newLine = newLine + targetTask.Description; + newLine = newLine + targetTask.getDescription(); if (initial.equals("D") || initial.equals("E")) newLine = newLine + divider + targetTask.getAdditionalInfo(); diff --git a/src/main/java/TaskList.java b/src/main/java/Duke/TaskList.java similarity index 95% rename from src/main/java/TaskList.java rename to src/main/java/Duke/TaskList.java index 864f5e60..3734c3ca 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/Duke/TaskList.java @@ -1,3 +1,9 @@ +package Duke; + +import Duke.Models.*; +import Duke.DukeException; +import Duke.Ui; + import java.util.ArrayList; public class TaskList { diff --git a/src/main/java/Ui.java b/src/main/java/Duke/Ui.java similarity index 91% rename from src/main/java/Ui.java rename to src/main/java/Duke/Ui.java index 71383918..45abc3ae 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Duke/Ui.java @@ -1,3 +1,7 @@ +package Duke; + +import Duke.Models.Task; + public class Ui { static String line = "____________________________________________________________"; @@ -11,7 +15,7 @@ public static void StartDuke() { } public static void Greet() { - String start = "Hello, I'm Duke\n" + String start = "Hello, I'm Duke.Duke\n" + "What can I do for you?\n"; System.out.println(line + "\n" + start + line + "\n"); } diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 08737446..cecfdb11 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 Duke.Duke < input.txt > ACTUAL.TXT REM compare the output to the expected output FC ACTUAL.TXT EXPECTED.TXT From d6fb30c17ffb223a215f6fddc296e98c894f02b4 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 11:45:33 +0800 Subject: [PATCH 101/193] Created Models package and moved all Task classes into the package. --- src/main/java/{ => Duke/Models}/Deadline.java | 4 +++- src/main/java/{ => Duke/Models}/Event.java | 2 ++ src/main/java/{ => Duke/Models}/Task.java | 11 +++++++++-- src/main/java/{ => Duke/Models}/Todo.java | 6 +++++- 4 files changed, 19 insertions(+), 4 deletions(-) rename src/main/java/{ => Duke/Models}/Deadline.java (90%) rename src/main/java/{ => Duke/Models}/Event.java (96%) rename src/main/java/{ => Duke/Models}/Task.java (87%) rename src/main/java/{ => Duke/Models}/Todo.java (78%) diff --git a/src/main/java/Deadline.java b/src/main/java/Duke/Models/Deadline.java similarity index 90% rename from src/main/java/Deadline.java rename to src/main/java/Duke/Models/Deadline.java index 46690beb..3f3f06d0 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Duke/Models/Deadline.java @@ -1,4 +1,6 @@ -public class Deadline extends Task{ +package Duke.Models; + +public class Deadline extends Task { protected String by; public Deadline(String newTask, String datetime) { diff --git a/src/main/java/Event.java b/src/main/java/Duke/Models/Event.java similarity index 96% rename from src/main/java/Event.java rename to src/main/java/Duke/Models/Event.java index 711d8363..35cd9d7a 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Duke/Models/Event.java @@ -1,3 +1,5 @@ +package Duke.Models; + public class Event extends Task { protected String at; diff --git a/src/main/java/Task.java b/src/main/java/Duke/Models/Task.java similarity index 87% rename from src/main/java/Task.java rename to src/main/java/Duke/Models/Task.java index c71bcbe7..5a5b17cc 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Duke/Models/Task.java @@ -1,3 +1,7 @@ +package Duke.Models; + +import Duke.DukeException; + public class Task { protected String Description; @@ -19,12 +23,15 @@ public Task(String newTask, String toComplete) throws DukeException { } } - public String getDescription() { return Description; } - public String getAdditionalInfo() { + public boolean isCompleted() { + return Completed; + } + + public String getAdditionalInfo() { return ""; } diff --git a/src/main/java/Todo.java b/src/main/java/Duke/Models/Todo.java similarity index 78% rename from src/main/java/Todo.java rename to src/main/java/Duke/Models/Todo.java index 11972fb3..e95e7572 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Duke/Models/Todo.java @@ -1,4 +1,8 @@ -public class Todo extends Task{ +package Duke.Models; + +import Duke.Models.Task; + +public class Todo extends Task { public Todo(String newTask) { super(newTask); From da097ef591a9b5e7ffeda840a23c1a27b1b809f8 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 11:46:13 +0800 Subject: [PATCH 102/193] Created Checker package and moved Checker classes into package. --- src/main/java/{ => Duke/Checker}/FileLineChecker.java | 2 ++ src/main/java/{ => Duke/Checker}/InputChecker.java | 3 +++ 2 files changed, 5 insertions(+) rename src/main/java/{ => Duke/Checker}/FileLineChecker.java (97%) rename src/main/java/{ => Duke/Checker}/InputChecker.java (98%) diff --git a/src/main/java/FileLineChecker.java b/src/main/java/Duke/Checker/FileLineChecker.java similarity index 97% rename from src/main/java/FileLineChecker.java rename to src/main/java/Duke/Checker/FileLineChecker.java index 5d0e19ad..bad95467 100644 --- a/src/main/java/FileLineChecker.java +++ b/src/main/java/Duke/Checker/FileLineChecker.java @@ -1,3 +1,5 @@ +package Duke.Checker; + public class FileLineChecker { public static boolean CheckTodoLine(String[] parts) { if (parts.length != 3) { diff --git a/src/main/java/InputChecker.java b/src/main/java/Duke/Checker/InputChecker.java similarity index 98% rename from src/main/java/InputChecker.java rename to src/main/java/Duke/Checker/InputChecker.java index a092e9e5..133d032f 100644 --- a/src/main/java/InputChecker.java +++ b/src/main/java/Duke/Checker/InputChecker.java @@ -1,3 +1,6 @@ +package Duke.Checker; +import Duke.DukeException; + public class InputChecker { public static boolean CheckValidTodo(String input) throws DukeException { From 37202df8604b4d101c351bc1d94ad50368c7e421 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 11:59:47 +0800 Subject: [PATCH 103/193] Created Ui package and moved Ui class into the package --- src/main/java/Duke/{ => Ui}/Ui.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename src/main/java/Duke/{ => Ui}/Ui.java (78%) diff --git a/src/main/java/Duke/Ui.java b/src/main/java/Duke/Ui/Ui.java similarity index 78% rename from src/main/java/Duke/Ui.java rename to src/main/java/Duke/Ui/Ui.java index 45abc3ae..71f79b31 100644 --- a/src/main/java/Duke/Ui.java +++ b/src/main/java/Duke/Ui/Ui.java @@ -1,9 +1,10 @@ -package Duke; +package Duke.Ui; import Duke.Models.Task; +import Duke.TaskList; public class Ui { - static String line = "____________________________________________________________"; + public static String line = "____________________________________________________________"; public static void StartDuke() { String logo = " ____ _ \n" @@ -21,7 +22,7 @@ public static void Greet() { } public static void PrintTaskCount() { - System.out.println("Now you have " + TaskList.DukeList.size() + " tasks in the list."); + System.out.println("Now you have " + TaskList.size() + " tasks in the list."); } public static void PrintTaskAdded(Task newTask) { From 59ff4a3a0ea2d388e902e676d624a3523b5d844c Mon Sep 17 00:00:00 2001 From: ksw95 Date: Fri, 29 Oct 2021 12:00:33 +0800 Subject: [PATCH 104/193] Imported relevant packages and refactored parameters --- src/main/java/Duke/Duke.java | 3 +++ src/main/java/Duke/{ => Parser}/Parser.java | 7 +++++-- src/main/java/Duke/Storage.java | 4 +--- src/main/java/Duke/TaskList.java | 7 +++++-- 4 files changed, 14 insertions(+), 7 deletions(-) rename src/main/java/Duke/{ => Parser}/Parser.java (96%) diff --git a/src/main/java/Duke/Duke.java b/src/main/java/Duke/Duke.java index 8345a219..9258684b 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -1,5 +1,8 @@ package Duke; +import Duke.Parser.*; +import Duke.Ui.Ui; + import java.io.File; import java.io.IOException; import java.util.Scanner; diff --git a/src/main/java/Duke/Parser.java b/src/main/java/Duke/Parser/Parser.java similarity index 96% rename from src/main/java/Duke/Parser.java rename to src/main/java/Duke/Parser/Parser.java index 9a559b29..06d5eae6 100644 --- a/src/main/java/Duke/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -1,11 +1,14 @@ -package Duke; +package Duke.Parser; +import Duke.DukeException; import Duke.Models.*; import Duke.Checker.FileLineChecker; import Duke.Checker.InputChecker; +import Duke.TaskList; +import Duke.Ui.Ui; public class Parser { - static void parseInput(String input) { + public static void parseInput(String input) { if (input.trim().equals("list")) { TaskList.printTaskList(); } else if (input.startsWith("todo ")) { diff --git a/src/main/java/Duke/Storage.java b/src/main/java/Duke/Storage.java index 2c06df12..112b61b3 100644 --- a/src/main/java/Duke/Storage.java +++ b/src/main/java/Duke/Storage.java @@ -1,8 +1,6 @@ package Duke; -import Duke.DukeException; -import Duke.Parser; -import Duke.TaskList; +import Duke.Parser.Parser; import Duke.Models.*; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/main/java/Duke/TaskList.java b/src/main/java/Duke/TaskList.java index 3734c3ca..457859e4 100644 --- a/src/main/java/Duke/TaskList.java +++ b/src/main/java/Duke/TaskList.java @@ -1,14 +1,17 @@ package Duke; import Duke.Models.*; -import Duke.DukeException; -import Duke.Ui; +import Duke.Ui.Ui; import java.util.ArrayList; public class TaskList { static ArrayList DukeList = new ArrayList<>(); + public static int size() { + return DukeList.size(); + } + public static void addTaskToList(Task newEntry) { DukeList.add(newEntry); } From 3e71489c81397a61badcd77b6fc14ff8725ce3ae Mon Sep 17 00:00:00 2001 From: ksw95 Date: Mon, 1 Nov 2021 22:32:19 +0800 Subject: [PATCH 105/193] Added LocalDate and LocalTime variable to Deadline class and Event class --- src/main/java/Duke/Models/Deadline.java | 5 +++++ src/main/java/Duke/Models/Event.java | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/main/java/Duke/Models/Deadline.java b/src/main/java/Duke/Models/Deadline.java index 3f3f06d0..059de03e 100644 --- a/src/main/java/Duke/Models/Deadline.java +++ b/src/main/java/Duke/Models/Deadline.java @@ -1,7 +1,12 @@ package Duke.Models; +import java.time.LocalDate; +import java.time.LocalTime; + public class Deadline extends Task { protected String by; + protected LocalDate date; + protected LocalTime time; public Deadline(String newTask, String datetime) { super(newTask); diff --git a/src/main/java/Duke/Models/Event.java b/src/main/java/Duke/Models/Event.java index 35cd9d7a..55235d1a 100644 --- a/src/main/java/Duke/Models/Event.java +++ b/src/main/java/Duke/Models/Event.java @@ -1,7 +1,13 @@ package Duke.Models; +import java.time.LocalDate; +import java.time.LocalTime; + public class Event extends Task { protected String at; + protected LocalDate date; + protected LocalTime time; + public Event(String newTask, String datetime) { super(newTask); From 374098388686b123078fb65f1b1e1284055e74a6 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 2 Nov 2021 01:11:21 +0800 Subject: [PATCH 106/193] Added new constructors to Deadline and Event classes --- src/main/java/Duke/Models/Deadline.java | 11 +++++++++++ src/main/java/Duke/Models/Event.java | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/main/java/Duke/Models/Deadline.java b/src/main/java/Duke/Models/Deadline.java index 059de03e..552b409c 100644 --- a/src/main/java/Duke/Models/Deadline.java +++ b/src/main/java/Duke/Models/Deadline.java @@ -13,6 +13,17 @@ public Deadline(String newTask, String datetime) { by = datetime; } + public Deadline(String newTask, LocalDate newDate) { + super(newTask); + date = newDate; + } + + public Deadline(String newTask, LocalDate newDate, LocalTime newTime) { + super(newTask); + date = newDate; + time = newTime; + } + public String getAdditionalInfo() { return by; } diff --git a/src/main/java/Duke/Models/Event.java b/src/main/java/Duke/Models/Event.java index 55235d1a..04921a29 100644 --- a/src/main/java/Duke/Models/Event.java +++ b/src/main/java/Duke/Models/Event.java @@ -14,6 +14,17 @@ public Event(String newTask, String datetime) { at = datetime; } + public Event(String newTask, LocalDate newDate) { + super(newTask); + date = newDate; + } + + public Event(String newTask, LocalDate newDate, LocalTime newTime) { + super(newTask); + date = newDate; + time = newTime; + } + public String getAdditionalInfo() { return at; } From 275503472bb6581bb9ba0988a285b26bcfef417a Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 2 Nov 2021 01:12:12 +0800 Subject: [PATCH 107/193] Edited getTaskInfo method in Deadline and Event to return LocalDate and LocalTime variables if they exist. --- src/main/java/Duke/Models/Deadline.java | 13 ++++++++++++- src/main/java/Duke/Models/Event.java | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke/Models/Deadline.java b/src/main/java/Duke/Models/Deadline.java index 552b409c..358d2e4b 100644 --- a/src/main/java/Duke/Models/Deadline.java +++ b/src/main/java/Duke/Models/Deadline.java @@ -2,6 +2,7 @@ import java.time.LocalDate; import java.time.LocalTime; +import java.time.format.DateTimeFormatter; public class Deadline extends Task { protected String by; @@ -37,7 +38,17 @@ public String getCompletedSymbol() { } public String getTaskInfo() { - return super.getTaskInfo() + " (by: " + by + ")"; + String info = super.getTaskInfo() + " (by: "; + if (date == null) { + info = info + by; + } else { + info = info + date.format(DateTimeFormatter.ofPattern("MMM dd yyyy")).toString(); + if (time != null) { + info = info + " " + time.toString(); + } + } + info = info + ")"; + return info; } @Override diff --git a/src/main/java/Duke/Models/Event.java b/src/main/java/Duke/Models/Event.java index 04921a29..dacc1f17 100644 --- a/src/main/java/Duke/Models/Event.java +++ b/src/main/java/Duke/Models/Event.java @@ -2,6 +2,7 @@ import java.time.LocalDate; import java.time.LocalTime; +import java.time.format.DateTimeFormatter; public class Event extends Task { protected String at; @@ -38,7 +39,17 @@ public String getCompletedSymbol() { } public String getTaskInfo() { - return super.getTaskInfo() + " (at: " + at + ")"; + String info = super.getTaskInfo() + " (at: "; + if (date == null) { + info = info + at; + } else { + info = info + date.format(DateTimeFormatter.ofPattern("MMM dd yyyy")); + if (time != null) { + info = info + " " + time; + } + } + info = info + ")"; + return info; } @Override From 4a8c853f0b357791e75f04b3a0206053affd41f6 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 3 Nov 2021 01:38:44 +0800 Subject: [PATCH 108/193] Edited getAdditionalInfo method in Deadline and Event class --- src/main/java/Duke/Models/Deadline.java | 15 ++++++++++++--- src/main/java/Duke/Models/Event.java | 11 ++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke/Models/Deadline.java b/src/main/java/Duke/Models/Deadline.java index 358d2e4b..9d36f406 100644 --- a/src/main/java/Duke/Models/Deadline.java +++ b/src/main/java/Duke/Models/Deadline.java @@ -26,7 +26,16 @@ public Deadline(String newTask, LocalDate newDate, LocalTime newTime) { } public String getAdditionalInfo() { - return by; + String info; + if (date == null) { + info = by; + } else { + info = date.toString(); + if (time != null) { + info = info + " " + time; + } + } + return info; } public String getCompletedSymbol() { @@ -42,9 +51,9 @@ public String getTaskInfo() { if (date == null) { info = info + by; } else { - info = info + date.format(DateTimeFormatter.ofPattern("MMM dd yyyy")).toString(); + info = info + date.format(DateTimeFormatter.ofPattern("MMM dd yyyy")); if (time != null) { - info = info + " " + time.toString(); + info = info + " " + time; } } info = info + ")"; diff --git a/src/main/java/Duke/Models/Event.java b/src/main/java/Duke/Models/Event.java index dacc1f17..392225ac 100644 --- a/src/main/java/Duke/Models/Event.java +++ b/src/main/java/Duke/Models/Event.java @@ -27,7 +27,16 @@ public Event(String newTask, LocalDate newDate, LocalTime newTime) { } public String getAdditionalInfo() { - return at; + String info; + if (date == null) { + info = at; + } else { + info = date.toString(); + if (time != null) { + info = info + " " + time; + } + } + return info; } public String getCompletedSymbol() { From 15bf76fd727bf3fc4b2c2b4007d0506a7e67b18e Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 3 Nov 2021 01:41:32 +0800 Subject: [PATCH 109/193] Edited getEventFromline method to parse lines from storage file with date and time. --- src/main/java/Duke/Parser/Parser.java | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index 06d5eae6..8299f016 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -128,10 +128,34 @@ public static Deadline getDeadlineFromLine(String[] parts) { } public static Event getEventFromLine(String[] parts) { - Event newEvent = new Event(parts[2].trim(), parts[3].trim()); + String[] datetime = parts[3].trim().split(" "); + Event newEvent; + if (datetime.length > 2 ) { + newEvent = new Event(parts[2].trim(), parts[3].trim()); + } else { + LocalDate newDate = null; + LocalTime newTime = null; + try { + newDate = LocalDate.parse(datetime[0]); + newTime = LocalTime.parse(datetime[1]); + } catch (DateTimeParseException e) { + e.getMessage(); + } catch (ArrayIndexOutOfBoundsException e) { + e.getMessage(); + } + if (newDate != null && newTime != null) { + newEvent = new Event(parts[2].trim(), newDate, newTime); + } else if (newDate != null) { + newEvent = new Event(parts[2].trim(), newDate); + } else { + newEvent = new Event(parts[2].trim(), parts[3].trim()); + } + } if (parts[1].trim().equals("1")) { TaskList.MarkTask(newEvent); } return newEvent; } + } + From cb26294b8b3109431a5bcc7e9892f468e2c99b44 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 3 Nov 2021 01:42:37 +0800 Subject: [PATCH 110/193] Edited getDeadlineFromLine method to parse lines from storage file with date and time. --- src/main/java/Duke/Parser/Parser.java | 28 ++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index 8299f016..8b578f0a 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -6,6 +6,10 @@ import Duke.TaskList; import Duke.Ui.Ui; +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.format.DateTimeParseException; + public class Parser { public static void parseInput(String input) { @@ -120,7 +124,29 @@ public static Todo getTodoFromLine(String[] parts) { } public static Deadline getDeadlineFromLine(String[] parts) { - Deadline newDeadline = new Deadline(parts[2].trim(), parts[3].trim()); + String[] datetime = parts[3].trim().split(" "); + Deadline newDeadline; + if (datetime.length > 2 ) { + newDeadline = new Deadline(parts[2].trim(), parts[3].trim()); + } else { + LocalDate newDate = null; + LocalTime newTime = null; + try { + newDate = LocalDate.parse(datetime[0]); + newTime = LocalTime.parse(datetime[1]); + } catch (DateTimeParseException e) { + e.getMessage(); + } catch (ArrayIndexOutOfBoundsException e) { + e.getMessage(); + } + if (newDate != null && newTime != null) { + newDeadline = new Deadline(parts[2].trim(), newDate, newTime); + } else if (newDate != null) { + newDeadline = new Deadline(parts[2].trim(), newDate); + } else { + newDeadline = new Deadline(parts[2].trim(), parts[3].trim()); + } + } if (parts[1].trim().equals("1")) { TaskList.MarkTask(newDeadline); } From 49bdedf7de1f31526447ccaa0fc5011a6c539319 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 3 Nov 2021 01:45:06 +0800 Subject: [PATCH 111/193] Created checkTimeInput method to check for valid time format inputs and created buildTaskTime method to initialize LocalTime object using valid time format inputs. --- src/main/java/Duke/Parser/Parser.java | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index 8b578f0a..be1ea30f 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -183,5 +183,31 @@ public static Event getEventFromLine(String[] parts) { return newEvent; } + public static boolean checkTimeInput(String timeInput) { + if (timeInput.equals("")) { + return false; + } + try { + int time = Integer.parseInt(timeInput); + int hour = time/100; + int mins = time%100; + if (hour < 24 && hour > -1 && mins < 60 && mins > -1) { + return true; + } else { + return false; + } + } catch (NumberFormatException e) { + return false; + } + } + + public static LocalTime buildTaskTime(String timeInput) { + int time = Integer.parseInt(timeInput); + int hour = time/100; + int mins = time%100; + LocalTime taskTime = LocalTime.of(hour, mins); + return taskTime; + } + } From 6615cd411c2a99abd60e04cc3b7dade661156d11 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 3 Nov 2021 01:47:27 +0800 Subject: [PATCH 112/193] Created checkDateInput method to check for date inputs with valid format and created buildTaskDate to initialize LocalDate object with date input with valid format. --- src/main/java/Duke/Parser/Parser.java | 42 +++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index be1ea30f..2401525a 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -209,5 +209,47 @@ public static LocalTime buildTaskTime(String timeInput) { return taskTime; } + public static boolean checkDateInput(String[] details) { + if (details.length != 3) { + return false; + } + try { + int day = Integer.parseInt(details[0].trim()); + int month = Integer.parseInt(details[1].trim()); + int year = Integer.parseInt(details[2].trim()); + if (day > 31 || day < 1) { + return false; + } else if (month > 12 || month < 1) { + return false; + } else if (year < 0) { + return false; + } else { + return true; + } + } catch (NumberFormatException e) { + return false; + } + } + + public static LocalDate buildTaskDate(String[] details) { + String day = details[0].trim(); + if (day.length() == 1) { + day = "0" + day; + } + String month = details[1].trim(); + if (month.length() == 1) { + month = "0" + month; + } + String year = details[2].trim(); + if (year.length() < 4) { + for (int i = year.length(); i < 4; i ++) { + year = "0" + year; + } + } + String newDateFormat = year + "-" + month + "-" + day; + LocalDate taskDate = LocalDate.parse(newDateFormat); + return taskDate; + } + } From 12c3753ba216572c1ac4657d4af27a32981542b6 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 3 Nov 2021 01:48:41 +0800 Subject: [PATCH 113/193] Created buildDeadline method which initializes and returns a deadline object based on the details of the user's input. --- src/main/java/Duke/Parser/Parser.java | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index 2401525a..26c4a186 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -251,5 +251,30 @@ public static LocalDate buildTaskDate(String[] details) { return taskDate; } + public static Deadline buildDeadline(String input) { + String[] parts = input.substring(8).split("/by"); + String[] datetime = parts[1].trim().split(" "); + Deadline newDeadline = null; + if (datetime.length > 2) { + newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); + } else { + String[] dateDetails = datetime[0].split("/"); + if (checkDateInput(dateDetails)) { + LocalDate taskDate = buildTaskDate(dateDetails); + if (datetime.length == 2 && checkTimeInput(datetime[1])) { + LocalTime taskTime = buildTaskTime(datetime[1]); + newDeadline = new Deadline(parts[0].trim(), taskDate, taskTime); + } else { + newDeadline = new Deadline(parts[0].trim(), taskDate); + } + } else { + newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); + } + } + return newDeadline; + } + + + } From e1d22df8fa2c50304d69b3e0155237ba7b29198e Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 3 Nov 2021 01:49:38 +0800 Subject: [PATCH 114/193] Created buildEvent method which initializes and returns an event object based on the details of the user's input. --- src/main/java/Duke/Parser/Parser.java | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index 26c4a186..edd6a83e 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -274,7 +274,28 @@ public static Deadline buildDeadline(String input) { return newDeadline; } - + public static Event buildEvent(String input) { + String[] parts = input.substring(5).split("/at"); + String[] datetime = parts[1].trim().split(" "); + Event newEvent = null; + if (datetime.length > 2) { + newEvent = new Event(parts[0].trim(), parts[1].trim()); + } else { + String[] dateDetails = datetime[0].split("/"); + if (checkDateInput(dateDetails)) { + LocalDate taskDate = buildTaskDate(dateDetails); + if (datetime.length == 2 && checkTimeInput(datetime[1])) { + LocalTime taskTime = buildTaskTime(datetime[1]); + newEvent = new Event(parts[0].trim(), taskDate, taskTime); + } else { + newEvent = new Event(parts[0].trim(), taskDate); + } + } else { + newEvent = new Event(parts[0].trim(), parts[1].trim()); + } + } + return newEvent; + } } From cc07342d47f4dc2474b117958c33bfddb3b009bc Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 3 Nov 2021 01:51:33 +0800 Subject: [PATCH 115/193] Replaced the logic to build a newDeadline object with the buildDeadline method in the AddDeadline method. --- src/main/java/Duke/Parser/Parser.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index edd6a83e..ffc53f2d 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -47,8 +47,7 @@ public static void AddTodo(String input) { public static void AddDeadline(String input) { try { if (InputChecker.CheckValidDeadline(input)) { - String[] parts = input.substring(8).split("/by"); - Deadline newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); + Deadline newDeadline = buildDeadline(input); TaskList.addTaskToList(newDeadline); Ui.PrintTaskAdded(newDeadline); Ui.PrintTaskCount(); From edf83df3cc2036507ad116869943ba215242ecb7 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 3 Nov 2021 01:52:06 +0800 Subject: [PATCH 116/193] Replaced the logic to build a newEvent object with the buildEvent method in the AddEvent method. --- src/main/java/Duke/Parser/Parser.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index ffc53f2d..6b80aa59 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -60,8 +60,7 @@ public static void AddDeadline(String input) { public static void AddEvent(String input) { try { if (InputChecker.CheckValidEvent(input)) { - String[] parts = input.substring(5).split("/at"); - Event newEvent = new Event(parts[0].trim(), parts[1].trim()); + Event newEvent = buildEvent(input); TaskList.addTaskToList(newEvent); Ui.PrintTaskAdded(newEvent); Ui.PrintTaskCount(); From 3372e1210c928bdd24fbd9c8b19bf0288c9de133 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 3 Nov 2021 01:52:20 +0800 Subject: [PATCH 117/193] Refactor Parser.java --- src/main/java/Duke/Parser/Parser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index 6b80aa59..37371b1b 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -110,7 +110,7 @@ public static Task ParseStorageLine(String FileLine) throws DukeException { } else { System.out.println("Line is invalid"); } - throw new DukeException("A line from storage file is invalid and will not be added to Duke.Duke."); + throw new DukeException("A line from storage file is invalid and will not be added to Duke."); } public static Todo getTodoFromLine(String[] parts) { From 9a77f3129adbd96875a4c9c66a5974953fa7e715 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 3 Nov 2021 01:56:21 +0800 Subject: [PATCH 118/193] Added printDate method to Deadline and Event class. --- src/main/java/Duke/Models/Deadline.java | 4 ++++ src/main/java/Duke/Models/Event.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/Duke/Models/Deadline.java b/src/main/java/Duke/Models/Deadline.java index 9d36f406..16d9bc21 100644 --- a/src/main/java/Duke/Models/Deadline.java +++ b/src/main/java/Duke/Models/Deadline.java @@ -64,4 +64,8 @@ public String getTaskInfo() { public String getTaskType() { return "D"; } + + public void printDate() { + System.out.println(date.format(DateTimeFormatter.ofPattern("MMM dd yyyy"))); + } } diff --git a/src/main/java/Duke/Models/Event.java b/src/main/java/Duke/Models/Event.java index 392225ac..56b26139 100644 --- a/src/main/java/Duke/Models/Event.java +++ b/src/main/java/Duke/Models/Event.java @@ -65,4 +65,8 @@ public String getTaskInfo() { public String getTaskType() { return "E"; } + + public void printDate() { + System.out.println(date.format(DateTimeFormatter.ofPattern("MMM dd yyyy"))); + } } From 250c3f9461ad14a5846c00b184ccb4d2dfebc0c9 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 01:07:36 +0800 Subject: [PATCH 119/193] Added comments to the class and methods in Duke.java --- src/main/java/Duke/Duke.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/Duke/Duke.java b/src/main/java/Duke/Duke.java index 9258684b..5b7a1d7c 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -7,10 +7,19 @@ import java.io.IOException; import java.util.Scanner; +/** + * Duke is a program that opens a storage file, + * parses the tasks in the file into a list in Duke + * and that allows users to do CRUD operations on tasks. + */ public class Duke { static Scanner in = new Scanner(System.in); + /** + * Continuously read input from the user of Duke + * and parse the different inputs. + */ public static void ExtendTaskList() { while (true) { String input = in.nextLine(); @@ -26,6 +35,11 @@ public static void ExtendTaskList() { } } + /** + * Starts Duke by opening storage file + * and updating the duke list using th information from the file. + * Then print the duke start up message and a greeting from the program. + */ public static void RunDuke() { try { File StorageFile = Storage.OpenStorageFile(); @@ -37,6 +51,11 @@ public static void RunDuke() { Ui.Greet(); } + /** + * Runs the main logic of Duke program. + * @param args + * @throws IOException + */ public static void main(String[] args) throws IOException { RunDuke(); ExtendTaskList(); From 50b6afeaa620dd3f4296525abb0c8fee5395ed83 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 01:07:49 +0800 Subject: [PATCH 120/193] Added comments to the class and methods in DukeException.java --- src/main/java/Duke/DukeException.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/Duke/DukeException.java b/src/main/java/Duke/DukeException.java index 502972ea..8a931e48 100644 --- a/src/main/java/Duke/DukeException.java +++ b/src/main/java/Duke/DukeException.java @@ -1,16 +1,30 @@ package Duke; +/** + * An exception class that represents the errors that are thrown when using duke. + */ public class DukeException extends Exception{ protected String ErrMsg; + /** + * DukeException constructor that creates a DukeException + * with an empty error message. + */ public DukeException() { this.ErrMsg = ""; } + /** + * DukeException constructor takes in a custom error message. + * @param invalid + */ public DukeException(String invalid) { this.ErrMsg = invalid; } + /** + * Prints the custom error message of a DukeException if any. + */ public void printErrMsg() { System.out.println(ErrMsg); } From f15021f9fd940997dc77107ec4da2a8394626c40 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 01:07:55 +0800 Subject: [PATCH 121/193] Added comments to the class and methods in Storage.java --- src/main/java/Duke/Storage.java | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke/Storage.java b/src/main/java/Duke/Storage.java index 112b61b3..8d27b49c 100644 --- a/src/main/java/Duke/Storage.java +++ b/src/main/java/Duke/Storage.java @@ -9,8 +9,16 @@ import java.util.ArrayList; import java.util.Scanner; +/** + * Storage class contains the methods related to the storage file. + */ public class Storage { + /** + * Creates a new file and directory. + * @return the new File object. + * @throws DukeException + */ public static File CreateStorageFile() throws DukeException { File newFile = new File("data\\Duke.Storage.txt"); try { @@ -23,6 +31,12 @@ public static File CreateStorageFile() throws DukeException { } } + /** + * Opens and returns storage file. + * If a storage file does not exist, create one and return that. + * @return an opened File object. + * @throws DukeException + */ public static File OpenStorageFile() throws DukeException { File newFile = new File("data\\storage.txt"); if (!newFile.exists()) { @@ -35,6 +49,11 @@ public static File OpenStorageFile() throws DukeException { return newFile; } + /** + * Takes a file and parse the contents into task objects + * The parsed task objects will then be added to Duke's task list. + * @param storageFile + */ public static void ReadFileToArray(File storageFile) { try { Scanner s = new Scanner(storageFile); @@ -47,10 +66,15 @@ public static void ReadFileToArray(File storageFile) { } } catch (FileNotFoundException e) { System.out.println("File cannot be opened, " + - "Duke.Duke will not have any prior stored task information"); + "Duke will not have any prior stored task information"); } } + /** + * Retrieves information of all the tasks inside Duke task list + * and converts each into a string to store inside storage file. + * @param FileWrite + */ public static void writeListToFile(File FileWrite) { try { FileWriter fw = new FileWriter(FileWrite, false); @@ -74,6 +98,12 @@ public static void writeListToFile(File FileWrite) { } } + /** + * Takes in a task object using it to build + * and return a string with the format of lines in storage file. + * @param targetTask + * @return a String with task information in storage line format. + */ public static String buildStorageLine(Task targetTask) { String divider = " | "; String initial = targetTask.getTaskType(); From 7cb848631f5e7a90e745e30d4e2ca249a878f206 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 01:08:03 +0800 Subject: [PATCH 122/193] Added comments to the class and methods in TaskList.java --- src/main/java/Duke/TaskList.java | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/main/java/Duke/TaskList.java b/src/main/java/Duke/TaskList.java index 457859e4..c89e45fb 100644 --- a/src/main/java/Duke/TaskList.java +++ b/src/main/java/Duke/TaskList.java @@ -5,17 +5,34 @@ import java.util.ArrayList; +/** + * Represents the list that contains the task inputted by using Duke. + * + */ public class TaskList { static ArrayList DukeList = new ArrayList<>(); + /** + * Returns the number of tasks inside the task list. + * @return int of the size of task list. + */ public static int size() { return DukeList.size(); } + /** + * Takes in a new Task + * and adds it to the task list. + * @param newEntry + */ public static void addTaskToList(Task newEntry) { DukeList.add(newEntry); } + /** + * Takes in a index and removes the task at the index from the task list. + * @param index + */ public static void RemoveTask(int index) { DukeList.remove(index); } @@ -27,6 +44,13 @@ public static void printTaskList() { } } + /** + * Takes in a valid "done" input and gets the index. + * If index is valid, marks the task at that index of the list as completed. + * + * @param input + * @throws DukeException + */ public static void markTaskAtIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(4).trim()) - 1; if (index < DukeList.size() && index > -1) { @@ -39,10 +63,21 @@ public static void markTaskAtIndex(String input) throws DukeException { } } + /** + * Mark the task given as a parameter as completed. + * @param inputTask + */ public static void MarkTask(Task inputTask) { inputTask.markCompleted(); } + /** + * Takes in a valid "delete" input and gets the index. + * If index is valid, the task at that index of the list is deleted from the list. + * + * @param input + * @throws DukeException + */ public static void DeleteIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(6).trim()) - 1; if (index < DukeList.size() && index > -1) { From 03a98828436ecbfdc02317d85dbe45ff57eb9934 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 01:08:10 +0800 Subject: [PATCH 123/193] Added comments to the class and methods in FileLineChecker.java --- .../java/Duke/Checker/FileLineChecker.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/main/java/Duke/Checker/FileLineChecker.java b/src/main/java/Duke/Checker/FileLineChecker.java index bad95467..01b73ed8 100644 --- a/src/main/java/Duke/Checker/FileLineChecker.java +++ b/src/main/java/Duke/Checker/FileLineChecker.java @@ -1,6 +1,18 @@ package Duke.Checker; +/** + * FileLine Checker contains methods to check whether + * the lines from the files + * contains valid task information. + */ public class FileLineChecker { + + /** + * Takes a string array and checks whether + * it contains parts with information of a "to do" object. + * @param parts + * @return boolean + */ public static boolean CheckTodoLine(String[] parts) { if (parts.length != 3) { return false; @@ -12,6 +24,12 @@ public static boolean CheckTodoLine(String[] parts) { return true; } + /** + * Takes a string array and checks whether + * it contains parts with information of a "deadline" object. + * @param parts + * @return boolean + */ public static boolean CheckDeadlineLine(String[] parts) { if (parts.length != 4) { return false; @@ -23,6 +41,12 @@ public static boolean CheckDeadlineLine(String[] parts) { return true; } + /** + * Takes a string array and checks whether + * it contains parts with information of a "event" object. + * @param parts + * @return boolean + */ public static boolean CheckEventLine(String[] parts) { if (parts.length != 4) { return false; From 4da432d13d07324278fd58cc99e68485b3942600 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 01:08:19 +0800 Subject: [PATCH 124/193] Added comments to the class and methods in InputChecker.java --- src/main/java/Duke/Checker/InputChecker.java | 39 ++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/main/java/Duke/Checker/InputChecker.java b/src/main/java/Duke/Checker/InputChecker.java index 133d032f..2a3d8626 100644 --- a/src/main/java/Duke/Checker/InputChecker.java +++ b/src/main/java/Duke/Checker/InputChecker.java @@ -1,8 +1,19 @@ package Duke.Checker; import Duke.DukeException; +/** + * Checks whether the input by the Duke user + * contains valid task information. + */ public class InputChecker { + /** + * Check whether input contains all the parts of a "to do" object. + * Returns true if it contains all the respective parts. + * @param input + * @return boolean + * @throws DukeException + */ public static boolean CheckValidTodo(String input) throws DukeException { if (input.length() < 5) { throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); @@ -13,6 +24,13 @@ public static boolean CheckValidTodo(String input) throws DukeException { } } + /** + * Checks whether input contains all that parts of a "deadline" object. + * Returns true if it contains all the respective parts. + * @param input + * @return boolean + * @throws DukeException + */ public static boolean CheckValidDeadline(String input) throws DukeException { if (input.contains("/by")) { String[] parts = input.substring(8).split("/by"); @@ -30,6 +48,13 @@ public static boolean CheckValidDeadline(String input) throws DukeException { } } + /** + * Checks whether input contains all that parts of a "event" object. + * Returns true if it contains all the respective parts. + * @param input + * @return boolean + * @throws DukeException + */ public static boolean CheckValidEvent(String input) throws DukeException { if (input.contains("/at")) { String[] parts = input.substring(5).split("/at"); @@ -47,6 +72,13 @@ public static boolean CheckValidEvent(String input) throws DukeException { } } + /** + * Checks whether input contains the enough and correct information + * to mark a task as done. + * @param input + * @return boolean + * @throws DukeException + */ public static boolean CheckValidDone(String input) throws DukeException { if (input.length() < 5) { throw new DukeException("☹ OOPS!!! The index of the task to be marked as done is missing."); @@ -61,6 +93,13 @@ public static boolean CheckValidDone(String input) throws DukeException { } } + /** + * Checks whether input contains the enough and correct information + * to delete a task. + * @param input + * @return boolean + * @throws DukeException + */ public static boolean CheckValidDelete(String input) throws DukeException { if (input.length() < 7) { throw new DukeException("☹ OOPS!!! The index of the task to delete is missing."); From e034a42f1318de12d86ea7344a9ceb1b16e106f4 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 01:08:25 +0800 Subject: [PATCH 125/193] Added comments to the class and methods in Deadline.java --- src/main/java/Duke/Models/Deadline.java | 49 +++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/main/java/Duke/Models/Deadline.java b/src/main/java/Duke/Models/Deadline.java index 16d9bc21..ae743dd4 100644 --- a/src/main/java/Duke/Models/Deadline.java +++ b/src/main/java/Duke/Models/Deadline.java @@ -4,27 +4,58 @@ import java.time.LocalTime; import java.time.format.DateTimeFormatter; +/** + * Represents a task with a deadline + * with a description of the task + * and the date and time when it is due. + */ public class Deadline extends Task { protected String by; protected LocalDate date; protected LocalTime time; + /** + * A constructor for deadline object that takes in two strings + * one as the task description + * and the other as the deadline of the deadline object. + * @param newTask + * @param datetime + */ public Deadline(String newTask, String datetime) { super(newTask); by = datetime; } + /** + * A constructor for deadline object that takes in a string and LocalDate object + * where the string is the task description + * and the LocalDate is the date the task is due. + * @param newTask + * @param newDate + */ public Deadline(String newTask, LocalDate newDate) { super(newTask); date = newDate; } + /** + * A constructor for deadline object that takes in a string and LocalDate object + * where the string is the task description, + * the LocalDate is the date the task is due + * and the LocalTime is the time the task is due. + * @param newTask + * @param newDate + */ public Deadline(String newTask, LocalDate newDate, LocalTime newTime) { super(newTask); date = newDate; time = newTime; } + /** + * Get the date and time of the deadline. + * @return + */ public String getAdditionalInfo() { String info; if (date == null) { @@ -38,6 +69,11 @@ public String getAdditionalInfo() { return info; } + /** + * Gets a string with task type symbol + * and a cross symbol to indicate whether a task is complete. + * @return String with task type and completed symbol. + */ public String getCompletedSymbol() { if (Completed) { return "[D][X]"; @@ -46,6 +82,11 @@ public String getCompletedSymbol() { } } + /** + * Return string of deadline information. + * Date is given in a new format if event has a LocalDate object. + * @return String with information on the deadline of the task. + */ public String getTaskInfo() { String info = super.getTaskInfo() + " (by: "; if (date == null) { @@ -60,11 +101,19 @@ public String getTaskInfo() { return info; } + /** + * Returns task type symbol. + * @return String with initials of the task type. + */ @Override public String getTaskType() { return "D"; } + /** + * Prints event date in "MMM, dd, yyyy" format. + * Only works if event object has a LocalTime variable. + */ public void printDate() { System.out.println(date.format(DateTimeFormatter.ofPattern("MMM dd yyyy"))); } From 07c33b947ef8eca3050c3240db698e0a1359a3ae Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 01:08:30 +0800 Subject: [PATCH 126/193] Added comments to the class and methods in Event.java --- src/main/java/Duke/Models/Event.java | 48 ++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/main/java/Duke/Models/Event.java b/src/main/java/Duke/Models/Event.java index 56b26139..2e21df27 100644 --- a/src/main/java/Duke/Models/Event.java +++ b/src/main/java/Duke/Models/Event.java @@ -4,28 +4,58 @@ import java.time.LocalTime; import java.time.format.DateTimeFormatter; +/** + * Represents Events the user has to attend + * with the description of the event and date and time of the event. + */ public class Event extends Task { protected String at; protected LocalDate date; protected LocalTime time; + /** + * A constructor for event object that takes in two strings + * one as the task description + * and the other as the date/time of event. + * @param newTask + * @param datetime + */ public Event(String newTask, String datetime) { super(newTask); at = datetime; } + /** + * A constructor for event object that takes in a string and LocalDate object + * where the string is the task description + * and the LocalDate is the date of the event. + * @param newTask + * @param newDate + */ public Event(String newTask, LocalDate newDate) { super(newTask); date = newDate; } + /** + * A constructor for event object that takes in a string, LocalDate and LocalTime object + * where the string is the task description, + * the LocalDate is the date of the event + * and the LocalTime is the time of the event. + * @param newTask + * @param newDate + */ public Event(String newTask, LocalDate newDate, LocalTime newTime) { super(newTask); date = newDate; time = newTime; } + /** + * Get the date and time information of the event. + * @return String with date and time of the event. + */ public String getAdditionalInfo() { String info; if (date == null) { @@ -39,6 +69,11 @@ public String getAdditionalInfo() { return info; } + /** + * Gets a string with task type symbol + * and a cross symbol to indicate whether a task is complete. + * @return String with task type and completed symbol. + */ public String getCompletedSymbol() { if (Completed) { return "[E][X]"; @@ -47,6 +82,11 @@ public String getCompletedSymbol() { } } + /** + * Return string of date time information. + * Date is given in a new format if event has a LocalDate object. + * @return String with information on the event of the task. + */ public String getTaskInfo() { String info = super.getTaskInfo() + " (at: "; if (date == null) { @@ -61,11 +101,19 @@ public String getTaskInfo() { return info; } + /** + * Returns task type symbol. + * @return String with initials of the task type. + */ @Override public String getTaskType() { return "E"; } + /** + * Prints event date in "MMM, dd, yyyy" format. + * Only works if event object has a LocalTime variable. + */ public void printDate() { System.out.println(date.format(DateTimeFormatter.ofPattern("MMM dd yyyy"))); } From 8d7d59ad9b0e68d7704538f3c5f3eef3cdecf0d1 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 01:08:37 +0800 Subject: [PATCH 127/193] Added comments to the class and methods in Task.java --- src/main/java/Duke/Models/Task.java | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/main/java/Duke/Models/Task.java b/src/main/java/Duke/Models/Task.java index 5a5b17cc..ea9281bf 100644 --- a/src/main/java/Duke/Models/Task.java +++ b/src/main/java/Duke/Models/Task.java @@ -2,16 +2,33 @@ import Duke.DukeException; +/** + * Represents a Task with information regarding the + * description of the task and whether it is completed. + */ public class Task { protected String Description; protected boolean Completed; + /** + * Task constructor method that takes in a string as description + * and sets task as uncompleted. + * @param newTask + */ public Task(String newTask) { this.Description = newTask; this.Completed = false; } + /** + * Task constructor method that takes in two strings + * one as the description of the task + * and the other as an indication whether task is completed. + * @param newTask + * @param toComplete + * @throws DukeException + */ public Task(String newTask, String toComplete) throws DukeException { this.Description = newTask; if (toComplete.equals("1")){ @@ -23,18 +40,35 @@ public Task(String newTask, String toComplete) throws DukeException { } } + /** + * Returns description of the task as a string. + * @return String with description of the task. + */ public String getDescription() { return Description; } + /** + * Returns a boolean variable based on whether the task is completed. + * @return boolean + */ public boolean isCompleted() { return Completed; } + /** + * Gets additional info from task object if any. + * @return String with additional info. + */ public String getAdditionalInfo() { return ""; } + /** + * Returns a "[X]" symbol as a string if task is completed. + * If uncompleted, return "[ ]" as a string. + * @return String indicating whether a task is completed. + */ public String getCompletedSymbol() { if (Completed) { return "[X]"; @@ -43,15 +77,26 @@ public String getCompletedSymbol() { } } + /** + * Returns string with task information regarding completion and description. + * @return String with information on Task. + */ public String getTaskInfo() { String TaskInfo = this.getCompletedSymbol() + " " + Description; return TaskInfo; } + /** + * Marks "Completed" variable as true. + */ public void markCompleted() { Completed = true; } + /** + * Gets the task type of a task object. + * @return String of initials of task type in any. + */ public String getTaskType() { return ""; } From eb9c7e817a81931e0247027832bd2ab7ddbb1a5b Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 01:08:44 +0800 Subject: [PATCH 128/193] Added comments to the class and methods in Todo.java --- src/main/java/Duke/Models/Todo.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke/Models/Todo.java b/src/main/java/Duke/Models/Todo.java index e95e7572..6c1a1e2f 100644 --- a/src/main/java/Duke/Models/Todo.java +++ b/src/main/java/Duke/Models/Todo.java @@ -1,13 +1,24 @@ package Duke.Models; -import Duke.Models.Task; - +/** + * Represents a task that are to be done + * with the description of the task. + */ public class Todo extends Task { + /** + * Constructor method for To do object. + * @param newTask + */ public Todo(String newTask) { super(newTask); } + /** + * Gets a string with task type symbol + * and a cross symbol to indicate whether a task is complete. + * @return String with task type and completed symbol. + */ public String getCompletedSymbol() { if (Completed) { return "[T][X]"; @@ -16,6 +27,10 @@ public String getCompletedSymbol() { } } + /** + * Returns task type symbol. + * @return String with the initials of task type. + */ @Override public String getTaskType() { return "T"; From 71934b876139d330730bd9f52c0b321ec9b51548 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 01:08:51 +0800 Subject: [PATCH 129/193] Added comments to the class and methods in Parser.java --- src/main/java/Duke/Parser/Parser.java | 105 ++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index 37371b1b..92469980 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -10,8 +10,17 @@ import java.time.LocalTime; import java.time.format.DateTimeParseException; +/** + * Represents a parser that make sense of inputs and retrieved lines. + */ public class Parser { + /** + * Reads the input + * create a task object based on the input + * and adds it into the task list of Duke. + * @param input + */ public static void parseInput(String input) { if (input.trim().equals("list")) { TaskList.printTaskList(); @@ -30,6 +39,12 @@ public static void parseInput(String input) { } } + /** + * If input contains valid information for a "To do" object, + * method creates the "to do" Object from the input + * and adds it to duke task list + * @param input + */ public static void AddTodo(String input) { try { if (InputChecker.CheckValidTodo(input)) { @@ -44,6 +59,12 @@ public static void AddTodo(String input) { } } + /** + * If input contains valid information for a "deadline" object, + * method creates the "deadline" Object from the input + * and adds it to duke task list + * @param input + */ public static void AddDeadline(String input) { try { if (InputChecker.CheckValidDeadline(input)) { @@ -57,6 +78,12 @@ public static void AddDeadline(String input) { } } + /** + * If input contains valid information for an "event" object, + * method creates the "event" Object from the input + * and adds it to duke task list + * @param input + */ public static void AddEvent(String input) { try { if (InputChecker.CheckValidEvent(input)) { @@ -70,6 +97,11 @@ public static void AddEvent(String input) { } } + /** + * If input contain valid information to identify a task in the list, + * mark said task object as completed. + * @param input + */ public static void MarkDone(String input) { try { if (InputChecker.CheckValidDone(input)) { @@ -80,6 +112,11 @@ public static void MarkDone(String input) { } } + /** + * If input contain valid information to identify a task in the list, + * delete said task object. + * @param input + */ public static void DeleteTask(String input) { try { if (InputChecker.CheckValidDelete(input)) { @@ -90,6 +127,14 @@ public static void DeleteTask(String input) { } } + /** + * Takes and parse a line from the storage file, + * uses the information from the line to create + * and return the respective task object based on the line. + * @param FileLine + * @return Task object created from file line. + * @throws DukeException + */ public static Task ParseStorageLine(String FileLine) throws DukeException { String[] parts = FileLine.split("\\|"); if (parts[0].trim().equals("T")) { @@ -113,6 +158,12 @@ public static Task ParseStorageLine(String FileLine) throws DukeException { throw new DukeException("A line from storage file is invalid and will not be added to Duke."); } + /** + * Takes in the parsed parts of a line from the storage file + * and return a new "To do" object created from the parts. + * @param parts + * @return "To do" object created from information parsed from a file line. + */ public static Todo getTodoFromLine(String[] parts) { Todo newTodo = new Todo(parts[2].trim()); if (parts[1].trim().equals("1")) { @@ -121,6 +172,13 @@ public static Todo getTodoFromLine(String[] parts) { return newTodo; } + /** + * Takes in the parsed parts of a line from the storage file, + * checks whether it has a date and time and creates and returns + * a new "Deadline" object using the correct constructor based on the checks. + * @param parts + * @return Deadline object created from information parsed from a file line. + */ public static Deadline getDeadlineFromLine(String[] parts) { String[] datetime = parts[3].trim().split(" "); Deadline newDeadline; @@ -151,6 +209,13 @@ public static Deadline getDeadlineFromLine(String[] parts) { return newDeadline; } + /** + * Takes in the parsed parts of a line from the storage file, + * checks whether it has a date and time and creates and returns + * a new "Event" object using the correct constructor based on the checks. + * @param parts + * @return an Event object created from information parsed from a file line. + */ public static Event getEventFromLine(String[] parts) { String[] datetime = parts[3].trim().split(" "); Event newEvent; @@ -181,6 +246,12 @@ public static Event getEventFromLine(String[] parts) { return newEvent; } + /** + * Takes in a string and checks whether it is in an input representing time. + * If it is in valid format, return true. + * @param timeInput + * @return boolean on whether input is represented in a valid time format. + */ public static boolean checkTimeInput(String timeInput) { if (timeInput.equals("")) { return false; @@ -199,6 +270,13 @@ public static boolean checkTimeInput(String timeInput) { } } + /** + * Takes and parse a string representing time + * and return a new LocalTime object + * created from the parsed parts of the string. + * @param timeInput + * @return LocalTime object created from a valid time format input. + */ public static LocalTime buildTaskTime(String timeInput) { int time = Integer.parseInt(timeInput); int hour = time/100; @@ -207,6 +285,13 @@ public static LocalTime buildTaskTime(String timeInput) { return taskTime; } + /** + * Takes in a string array and checks whether it contains valid strings + * that represent date, month and year. + * If valid, the method returns true. + * @param details + * @return boolean whether input contains the correct details to represent date. + */ public static boolean checkDateInput(String[] details) { if (details.length != 3) { return false; @@ -229,6 +314,12 @@ public static boolean checkDateInput(String[] details) { } } + /** Takes a string array with details on a specific date + * and return a LocalDate object + * created using the details. + * @param details + * @return LocalDate object created from the parts of a valid date format input. + */ public static LocalDate buildTaskDate(String[] details) { String day = details[0].trim(); if (day.length() == 1) { @@ -249,6 +340,13 @@ public static LocalDate buildTaskDate(String[] details) { return taskDate; } + /** + * Takes in a valid input with information on a deadline, + * parse the parts of the input + * and returns a new Deadline object created using the relevant constructor. + * @param input + * @return Deadline object created from a valid input with deadline information. + */ public static Deadline buildDeadline(String input) { String[] parts = input.substring(8).split("/by"); String[] datetime = parts[1].trim().split(" "); @@ -272,6 +370,13 @@ public static Deadline buildDeadline(String input) { return newDeadline; } + /** + * Takes in a valid input with information on an event, + * parse the parts of the input + * and returns a new Event object created using the relevant constructor. + * @param input + * @return a Event object created from a valid input with event information. + */ public static Event buildEvent(String input) { String[] parts = input.substring(5).split("/at"); String[] datetime = parts[1].trim().split(" "); From c58d1fdcaf9dc0b76008f7892b7c2b55d891819f Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 01:08:57 +0800 Subject: [PATCH 130/193] Added comments to the class and methods in Ui.java --- src/main/java/Duke/Ui/Ui.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke/Ui/Ui.java b/src/main/java/Duke/Ui/Ui.java index 71f79b31..15bf65ec 100644 --- a/src/main/java/Duke/Ui/Ui.java +++ b/src/main/java/Duke/Ui/Ui.java @@ -3,9 +3,15 @@ import Duke.Models.Task; import Duke.TaskList; +/** + * Ui class holds Ui display methods that interact with the user. + */ public class Ui { public static String line = "____________________________________________________________"; + /** + * Prints the opening message of Duke. + */ public static void StartDuke() { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" @@ -15,16 +21,26 @@ public static void StartDuke() { System.out.println(line + "\nWelcome to\n" + logo + " chatbot!"); } + /** + * Prints a greeting from Duke. + */ public static void Greet() { - String start = "Hello, I'm Duke.Duke\n" + String start = "Hello, I'm Duke.\n" + "What can I do for you?\n"; System.out.println(line + "\n" + start + line + "\n"); } + /** + * Prints a message with the number of task inside the task list of Duke. + */ public static void PrintTaskCount() { System.out.println("Now you have " + TaskList.size() + " tasks in the list."); } + /** + * Prints a message that a Task that has been added. + * @param newTask + */ public static void PrintTaskAdded(Task newTask) { System.out.println("Got it. I've added this task:\n" + newTask.getTaskInfo()); From be0dd73ddcd8a5754bfe686f94325a9bc85db6a6 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 01:31:18 +0800 Subject: [PATCH 131/193] Added comment for printTaskList method in TaskList.java --- src/main/java/Duke/TaskList.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/Duke/TaskList.java b/src/main/java/Duke/TaskList.java index c89e45fb..6b38c21b 100644 --- a/src/main/java/Duke/TaskList.java +++ b/src/main/java/Duke/TaskList.java @@ -37,6 +37,9 @@ public static void RemoveTask(int index) { DukeList.remove(index); } + /** + * Prints all the task in the task list with their information. + */ public static void printTaskList() { System.out.println("Here are the tasks in your list:"); for (int i = 0; i < DukeList.size(); i++) { From bb859456c5a4187900f2028fc1743926992b5f4b Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 7 Nov 2021 20:23:36 +0800 Subject: [PATCH 132/193] Changed the main class location in build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 20c0521c..73b1f710 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ test { } application { - mainClassName = "seedu.duke.Duke" + mainClassName = "Duke.Duke" } shadowJar { From 464cd0d2e82de94c344bb9e961e02fd920c36e76 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Mon, 8 Nov 2021 16:55:02 +0800 Subject: [PATCH 133/193] Created FileLineCheckerTest.java and JUnit tests to test methods from FileLineChecker.java --- .../Duke/Checker/FileLineCheckerTest.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/test/java/Duke/Checker/FileLineCheckerTest.java diff --git a/src/test/java/Duke/Checker/FileLineCheckerTest.java b/src/test/java/Duke/Checker/FileLineCheckerTest.java new file mode 100644 index 00000000..42ff2720 --- /dev/null +++ b/src/test/java/Duke/Checker/FileLineCheckerTest.java @@ -0,0 +1,30 @@ +package Duke.Checker; + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static Duke.Checker.FileLineChecker.*; + +public class FileLineCheckerTest { + + @Test + public void checkTodoLineTest() { + assertEquals(true,CheckTodoLine(new String[]{"T", "1", "Homework"})); + assertEquals(false, CheckTodoLine(new String[]{"", "", ""})); + } + + @Test + public void checkDeadlineLineTest() { + assertEquals(true, + CheckDeadlineLine(new String[]{"D", "0", "Submit Project", "Sunday"})); + assertEquals(false, + CheckDeadlineLine(new String[]{"D", "3", "Do task", "Today"})); + } + + @Test + public void checkEventLineTest() { + assertEquals(true, + CheckEventLine(new String[]{"E", "1", "Party", "Friend's house"})); + assertEquals(false, + CheckEventLine(new String[]{"E", "0", "", "Nowhere"})); + } +} From 7b7eb6dc284c4cdff51a0f4e0af53f6ca2813e80 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Mon, 8 Nov 2021 16:55:16 +0800 Subject: [PATCH 134/193] Created InputCheckerTest.java and JUnit tests to test methods from InputChecker.java --- .../java/Duke/Checker/InputCheckerTest.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/test/java/Duke/Checker/InputCheckerTest.java diff --git a/src/test/java/Duke/Checker/InputCheckerTest.java b/src/test/java/Duke/Checker/InputCheckerTest.java new file mode 100644 index 00000000..744f7322 --- /dev/null +++ b/src/test/java/Duke/Checker/InputCheckerTest.java @@ -0,0 +1,34 @@ +package Duke.Checker; + +import Duke.DukeException; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static Duke.Checker.InputChecker.*; +import static org.junit.jupiter.api.Assertions.assertThrows; + +public class InputCheckerTest { + + @Test + public void checkValidTodoTest() throws DukeException { + assertEquals(true, CheckValidTodo("todo task 1")); + assertThrows(DukeException.class, () -> CheckValidTodo("tod")); + assertThrows(DukeException.class, () -> CheckValidTodo("todo ")); + } + + @Test + public void checkValidDeadlineTest() throws DukeException { + assertEquals(true, CheckValidDeadline("deadline homework /by today")); + assertThrows(DukeException.class, () -> CheckValidDeadline("deadli")); + assertThrows(DukeException.class, () -> CheckValidDeadline("deadline return book /by")); + assertThrows(DukeException.class, () -> CheckValidDeadline("deadline /by tomorrow")); + + } + + @Test + public void checkValidEventTest() throws DukeException { + assertEquals(true, CheckValidEvent("event assembly /at school")); + assertThrows(DukeException.class, () -> CheckValidEvent("eve")); + assertThrows(DukeException.class, () -> CheckValidEvent("event birthday /at")); + assertThrows(DukeException.class, () -> CheckValidEvent("event /at home")); + } +} From 29d493c7d7fa1a1f0597de5deeda41ef5d0e2655 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Mon, 8 Nov 2021 16:55:37 +0800 Subject: [PATCH 135/193] Created DeadlineTest.java and JUnit tests to test methods from Deadline.java --- src/test/java/Duke/Models/DeadlineTest.java | 60 +++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 src/test/java/Duke/Models/DeadlineTest.java diff --git a/src/test/java/Duke/Models/DeadlineTest.java b/src/test/java/Duke/Models/DeadlineTest.java new file mode 100644 index 00000000..12bc53bf --- /dev/null +++ b/src/test/java/Duke/Models/DeadlineTest.java @@ -0,0 +1,60 @@ +package Duke.Models; + +import org.junit.jupiter.api.Test; + +import java.time.LocalDate; +import java.time.LocalTime; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class DeadlineTest { + Deadline Test1 = new Deadline("Task 1", "tomorrow"); + Deadline Test2 = new Deadline("Task 2", LocalDate.parse("2010-10-19")); + Deadline Test3 = new Deadline("Task 3", + LocalDate.parse("2012-01-20"), LocalTime.parse("18:00")); + + @Test + public void getAdditionalInfoTest() { + assertEquals("tomorrow", Test1.getAdditionalInfo()); + assertEquals("2010-10-19", Test2.getAdditionalInfo()); + assertEquals("2012-01-20 18:00", Test3.getAdditionalInfo()); + } + + @Test + public void isCompletedTest() { + assertEquals(false, Test1.isCompleted()); + assertEquals(false, Test2.isCompleted()); + assertEquals(false, Test3.isCompleted()); + Test1.markCompleted(); + Test3.markCompleted(); + assertEquals(true, Test1.isCompleted()); + assertEquals(true, Test3.isCompleted()); + } + + @Test + public void getTaskTypeTest(){ + assertEquals("D", Test1.getTaskType()); + assertEquals("D", Test2.getTaskType()); + assertEquals("D", Test3.getTaskType()); + } + + @Test + public void getCompletedSymbolTest() { + assertEquals("[D][ ]", Test1.getCompletedSymbol()); + assertEquals("[D][ ]", Test2.getCompletedSymbol()); + assertEquals("[D][ ]", Test3.getCompletedSymbol()); + Test1.markCompleted(); + Test2.markCompleted(); + assertEquals("[D][X]", Test1.getCompletedSymbol()); + assertEquals("[D][X]", Test2.getCompletedSymbol()); + } + + @Test + public void getTaskInfoTest() { + assertEquals("[D][ ] Task 1 (by: tomorrow)", Test1.getTaskInfo()); + assertEquals("[D][ ] Task 2 (by: Oct 19 2010)", Test2.getTaskInfo()); + assertEquals("[D][ ] Task 3 (by: Jan 20 2012 18:00)", Test3.getTaskInfo()); + Test2.markCompleted(); + assertEquals("[D][X] Task 2 (by: Oct 19 2010)", Test2.getTaskInfo()); + } +} From c17f1cc59f7c875ca23d037cf1f44860f51657d6 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Mon, 8 Nov 2021 16:55:55 +0800 Subject: [PATCH 136/193] Created EventTest.java and JUnit tests to test methods from Event.java --- src/test/java/Duke/Models/EventTest.java | 61 ++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 src/test/java/Duke/Models/EventTest.java diff --git a/src/test/java/Duke/Models/EventTest.java b/src/test/java/Duke/Models/EventTest.java new file mode 100644 index 00000000..b6676373 --- /dev/null +++ b/src/test/java/Duke/Models/EventTest.java @@ -0,0 +1,61 @@ +package Duke.Models; + +import org.junit.jupiter.api.Test; + +import java.time.LocalDate; +import java.time.LocalTime; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class EventTest { + Event Test1 = new Event("Task 1", "School"); + Event Test2 = new Event("Task 2", LocalDate.parse("2020-06-15")); + Event Test3 = new Event("Task 3", + LocalDate.parse("2021-11-14"), LocalTime.parse("23:59")); + + @Test + public void getAdditionalInfoTest() { + assertEquals("School", Test1.getAdditionalInfo()); + assertEquals("2020-06-15", Test2.getAdditionalInfo()); + assertEquals("2021-11-14 23:59", Test3.getAdditionalInfo()); + } + + @Test + public void isCompletedTest() { + assertEquals(false, Test1.isCompleted()); + assertEquals(false, Test2.isCompleted()); + assertEquals(false, Test3.isCompleted()); + Test2.markCompleted(); + Test3.markCompleted(); + assertEquals(true, Test2.isCompleted()); + assertEquals(true, Test3.isCompleted()); + } + + @Test + public void getTaskTypeTest(){ + assertEquals("E", Test1.getTaskType()); + assertEquals("E", Test2.getTaskType()); + assertEquals("E", Test3.getTaskType()); + } + + @Test + public void getCompletedSymbolTest() { + assertEquals("[E][ ]", Test1.getCompletedSymbol()); + assertEquals("[E][ ]", Test2.getCompletedSymbol()); + assertEquals("[E][ ]", Test3.getCompletedSymbol()); + Test1.markCompleted(); + Test3.markCompleted(); + assertEquals("[E][X]", Test1.getCompletedSymbol()); + assertEquals("[E][X]", Test3.getCompletedSymbol()); + } + + @Test + public void getTaskInfoTest() { + assertEquals("[E][ ] Task 1 (at: School)", Test1.getTaskInfo()); + assertEquals("[E][ ] Task 2 (at: Jun 15 2020)", Test2.getTaskInfo()); + assertEquals("[E][ ] Task 3 (at: Nov 14 2021 23:59)", Test3.getTaskInfo()); + Test1.markCompleted(); + assertEquals("[E][X] Task 1 (at: School)", Test1.getTaskInfo()); + } +} + From 425ae3164e50a8ddd6ab5de5afe2bada67b71ee6 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Mon, 8 Nov 2021 16:56:09 +0800 Subject: [PATCH 137/193] Created TaskTest.java and JUnit tests to test methods from Task.java --- src/test/java/Duke/Models/TaskTest.java | 97 +++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 src/test/java/Duke/Models/TaskTest.java diff --git a/src/test/java/Duke/Models/TaskTest.java b/src/test/java/Duke/Models/TaskTest.java new file mode 100644 index 00000000..2d536100 --- /dev/null +++ b/src/test/java/Duke/Models/TaskTest.java @@ -0,0 +1,97 @@ +package Duke.Models; + +import Duke.DukeException; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class TaskTest { + Task Test1 = new Task("Task 1"); + Task Test2 = new Task("Task 2"); + + @Test + public void getDescriptionTest() { + assertEquals("Task 1", Test1.getDescription()); + assertEquals("Task 2", Test2.getDescription()); + try { + Task Test3 = new Task("Task 3", "0"); + assertEquals("Task 3", Test3.getDescription()); + } catch (DukeException e) { + System.out.println("Task creation failed"); + } + } + + @Test + public void completedTest() { + assertEquals(false, Test1.isCompleted()); + assertEquals(false, Test2.isCompleted()); + + Test2.markCompleted(); + assertEquals(true, Test2.isCompleted()); + + try { + Task Test3 = new Task("Task 3", "1"); + assertEquals(true, Test3.isCompleted()); + } catch (DukeException e) { + System.out.println("Task creation failed"); + } + + try { + Task Test4 = new Task("Task 4", "0"); + assertEquals(false, Test4.isCompleted()); + Test4.markCompleted(); + assertEquals(true, Test4.isCompleted()); + } catch (DukeException e) { + System.out.println("Task creation failed"); + } + } + + @Test + public void getCompleteSymbolTest() { + assertEquals("[ ]", Test1.getCompletedSymbol()); + assertEquals("[ ]", Test2.getCompletedSymbol()); + + Test1.markCompleted(); + assertEquals("[X]", Test1.getCompletedSymbol()); + + try { + Task Test3 = new Task("Task 3", "0"); + assertEquals("[ ]", Test3.getCompletedSymbol()); + Test3.markCompleted(); + assertEquals("[X]", Test3.getCompletedSymbol()); + } catch (DukeException e) { + System.out.println("Task creation failed"); + } + + try { + Task Test4 = new Task("Task 4", "0"); + assertEquals("[ ]", Test4.getCompletedSymbol()); + } catch (DukeException e) { + System.out.println("Task creation failed"); + } + } + + @Test + public void getTaskInfoTest() { + assertEquals("[ ] Task 1", Test1.getTaskInfo()); + assertEquals("[ ] Task 2", Test2.getTaskInfo()); + Test2.markCompleted(); + assertEquals("[X] Task 2", Test2.getTaskInfo()); + + try { + Task Test3 = new Task("Task 3", "0"); + assertEquals("[ ] Task 3", Test3.getTaskInfo()); + Test3.markCompleted(); + assertEquals("[X] Task 3", Test3.getTaskInfo()); + } catch (DukeException e) { + System.out.println("Task creation failed"); + } + + try { + Task Test4 = new Task("Task 4", "1"); + assertEquals("[X] Task 4", Test4.getTaskInfo()); + } catch (DukeException e) { + System.out.println("Task creation failed"); + } + } +} From e416b65727600b96c1f5368d96db8ab31da2fad6 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Mon, 8 Nov 2021 16:56:20 +0800 Subject: [PATCH 138/193] Created TodoTest.java and JUnit tests to test methods from Todo.java --- src/test/java/Duke/Models/TodoTest.java | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/test/java/Duke/Models/TodoTest.java diff --git a/src/test/java/Duke/Models/TodoTest.java b/src/test/java/Duke/Models/TodoTest.java new file mode 100644 index 00000000..60ea87dc --- /dev/null +++ b/src/test/java/Duke/Models/TodoTest.java @@ -0,0 +1,38 @@ +package Duke.Models; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class TodoTest { + Todo Test1 = new Todo("Task 1"); + Todo Test2 = new Todo("Task 2"); + Todo Test3 = new Todo("Task 3"); + + @Test + public void getTaskTypeTest(){ + assertEquals("T", Test1.getTaskType()); + assertEquals("T", Test2.getTaskType()); + assertEquals("T", Test3.getTaskType()); + } + + @Test + public void getCompletedSymbolTest() { + assertEquals("[T][ ]", Test1.getCompletedSymbol()); + assertEquals("[T][ ]", Test2.getCompletedSymbol()); + assertEquals("[T][ ]", Test3.getCompletedSymbol()); + Test2.markCompleted(); + Test3.markCompleted(); + assertEquals("[T][X]", Test2.getCompletedSymbol()); + assertEquals("[T][X]", Test3.getCompletedSymbol()); + } + + @Test + public void getTaskInfoTest() { + assertEquals("[T][ ] Task 1", Test1.getTaskInfo()); + assertEquals("[T][ ] Task 2", Test2.getTaskInfo()); + assertEquals("[T][ ] Task 3", Test3.getTaskInfo()); + Test3.markCompleted(); + assertEquals("[T][X] Task 3", Test3.getTaskInfo()); + } +} From f017e0ff925f557b2cdf863e4f02c41b3eb9f960 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Mon, 8 Nov 2021 19:47:10 +0800 Subject: [PATCH 139/193] Refactored Duke.java --- src/main/java/Duke/Duke.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke/Duke.java b/src/main/java/Duke/Duke.java index 5b7a1d7c..ad9ec08b 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -16,13 +16,22 @@ public class Duke { static Scanner in = new Scanner(System.in); + /** + * Scans and returns user input as String. + * @return + */ + public static String getInput() { + String input = in.nextLine(); + return input; + } + /** * Continuously read input from the user of Duke * and parse the different inputs. */ public static void ExtendTaskList() { while (true) { - String input = in.nextLine(); + String input = getInput(); System.out.println(Ui.line); if (input.equals("bye")) { System.out.println("Bye. Hope to see you again soon!"); From e65f1cf850c5fb261b14d6eb94d8d0f435007230 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Mon, 8 Nov 2021 19:53:19 +0800 Subject: [PATCH 140/193] Added enum for priority level. --- src/main/java/Duke/PriorityLevel.java | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/main/java/Duke/PriorityLevel.java diff --git a/src/main/java/Duke/PriorityLevel.java b/src/main/java/Duke/PriorityLevel.java new file mode 100644 index 00000000..442594e1 --- /dev/null +++ b/src/main/java/Duke/PriorityLevel.java @@ -0,0 +1,8 @@ +package Duke; + +/** + * Represents the priority levels of tasks. + */ +public enum PriorityLevel { + HIGH, MEDIUM, LOW, NIL +} From 3d39b946096e28d353f8333597d0e0f7174dd241 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 9 Nov 2021 20:14:43 +0800 Subject: [PATCH 141/193] Updated Task.java to have a priority variable and the methods to set it. --- src/main/java/Duke/Models/Task.java | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/main/java/Duke/Models/Task.java b/src/main/java/Duke/Models/Task.java index ea9281bf..46e84df6 100644 --- a/src/main/java/Duke/Models/Task.java +++ b/src/main/java/Duke/Models/Task.java @@ -1,6 +1,7 @@ package Duke.Models; import Duke.DukeException; +import Duke.PriorityLevel; /** * Represents a Task with information regarding the @@ -10,6 +11,7 @@ public class Task { protected String Description; protected boolean Completed; + protected PriorityLevel Priority; /** * Task constructor method that takes in a string as description @@ -19,6 +21,7 @@ public class Task { public Task(String newTask) { this.Description = newTask; this.Completed = false; + this.Priority = PriorityLevel.NIL; } /** @@ -100,4 +103,34 @@ public void markCompleted() { public String getTaskType() { return ""; } + + /** + * Sets the priority level of the task + * based on the parameter passed. + * @param level + */ + public void setPriority(String level) { + try { + this.Priority = PriorityLevel.valueOf(level.trim()); + } catch (IllegalArgumentException e) { + switch (level.trim()) { + case "3": + this.Priority = PriorityLevel.HIGH; + break; + case "2": + this.Priority = PriorityLevel.MEDIUM; + break; + case "1": + this.Priority = PriorityLevel.LOW; + break; + default: + this.Priority = PriorityLevel.NIL; + } + } + } + + public PriorityLevel getPriority() { + return Priority; + + } } From 34545a4d0fb39c90081e53f3c947622b1b74e962 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 9 Nov 2021 20:16:08 +0800 Subject: [PATCH 142/193] Updated Deadline, Event and Todo classes to return priority level along with the original information in getTaskInfo method. --- src/main/java/Duke/Models/Deadline.java | 1 + src/main/java/Duke/Models/Event.java | 1 + src/main/java/Duke/Models/Todo.java | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/src/main/java/Duke/Models/Deadline.java b/src/main/java/Duke/Models/Deadline.java index ae743dd4..39844119 100644 --- a/src/main/java/Duke/Models/Deadline.java +++ b/src/main/java/Duke/Models/Deadline.java @@ -98,6 +98,7 @@ public String getTaskInfo() { } } info = info + ")"; + info = info + " - with " + Priority + " priority"; return info; } diff --git a/src/main/java/Duke/Models/Event.java b/src/main/java/Duke/Models/Event.java index 2e21df27..7bac5cd8 100644 --- a/src/main/java/Duke/Models/Event.java +++ b/src/main/java/Duke/Models/Event.java @@ -98,6 +98,7 @@ public String getTaskInfo() { } } info = info + ")"; + info = info + " - with " + Priority + " priority"; return info; } diff --git a/src/main/java/Duke/Models/Todo.java b/src/main/java/Duke/Models/Todo.java index 6c1a1e2f..a67d1136 100644 --- a/src/main/java/Duke/Models/Todo.java +++ b/src/main/java/Duke/Models/Todo.java @@ -35,4 +35,11 @@ public String getCompletedSymbol() { public String getTaskType() { return "T"; } + + @Override + public String getTaskInfo() { + String info = super.getTaskInfo(); + info = info + " - with " + Priority + " priority"; + return info; + } } From fa0427476a397d5e88857044f1e9b8886daa6da7 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 9 Nov 2021 20:17:14 +0800 Subject: [PATCH 143/193] Created addPriorityToTask method to add a priority to a task. --- src/main/java/Duke/Parser/Parser.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index 92469980..d300e869 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -97,6 +97,17 @@ public static void AddEvent(String input) { } } + /** + * Takes in a task object and request priority level of task from user. + * Set the priority level of the task object based on the input from user. + * @param newTask + */ + public static void addPriorityToTask(Task newTask) { + Ui.requestPriorityLevel(); + String level = Duke.getInput(); + newTask.setPriority(level); + } + /** * If input contain valid information to identify a task in the list, * mark said task object as completed. From eb1d20ba80c76b12b03cf46cf28fd6223df8a41e Mon Sep 17 00:00:00 2001 From: ksw95 Date: Tue, 9 Nov 2021 20:18:56 +0800 Subject: [PATCH 144/193] Edited the addEvent, addDeadline and addTodo methods so that a priority level is added to the newly created task. --- src/main/java/Duke/Parser/Parser.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index d300e869..115265a0 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -51,6 +51,7 @@ public static void AddTodo(String input) { String newTask = input.substring(4).trim(); Todo newTodo = new Todo(newTask); TaskList.addTaskToList(newTodo); + addPriorityToTask(newTodo); Ui.PrintTaskAdded(newTodo); Ui.PrintTaskCount(); } @@ -70,6 +71,7 @@ public static void AddDeadline(String input) { if (InputChecker.CheckValidDeadline(input)) { Deadline newDeadline = buildDeadline(input); TaskList.addTaskToList(newDeadline); + addPriorityToTask(newDeadline); Ui.PrintTaskAdded(newDeadline); Ui.PrintTaskCount(); } @@ -89,6 +91,7 @@ public static void AddEvent(String input) { if (InputChecker.CheckValidEvent(input)) { Event newEvent = buildEvent(input); TaskList.addTaskToList(newEvent); + addPriorityToTask(newEvent); Ui.PrintTaskAdded(newEvent); Ui.PrintTaskCount(); } From e1b01d1cd520f9e28fe377daca2deb7584234080 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 10 Nov 2021 00:05:55 +0800 Subject: [PATCH 145/193] Adds priority information of a task into current storage line format by editing buildStorageLine method. --- src/main/java/Duke/Storage.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/Duke/Storage.java b/src/main/java/Duke/Storage.java index 8d27b49c..f076226b 100644 --- a/src/main/java/Duke/Storage.java +++ b/src/main/java/Duke/Storage.java @@ -117,6 +117,9 @@ public static String buildStorageLine(Task targetTask) { if (initial.equals("D") || initial.equals("E")) newLine = newLine + divider + targetTask.getAdditionalInfo(); + + newLine = newLine + divider + targetTask.getPriority(); + return newLine; } } From 30ae57fd6cc0c8b80f08bb71e1256a6330c9497d Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 10 Nov 2021 00:06:50 +0800 Subject: [PATCH 146/193] Edited storage line check methods in FineLineChecker.java to consider priority level information. --- src/main/java/Duke/Checker/FileLineChecker.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/Duke/Checker/FileLineChecker.java b/src/main/java/Duke/Checker/FileLineChecker.java index 01b73ed8..2fcda03e 100644 --- a/src/main/java/Duke/Checker/FileLineChecker.java +++ b/src/main/java/Duke/Checker/FileLineChecker.java @@ -14,7 +14,7 @@ public class FileLineChecker { * @return boolean */ public static boolean CheckTodoLine(String[] parts) { - if (parts.length != 3) { + if (parts.length != 4) { return false; } else if (parts[2].trim().equals("")) { return false; @@ -31,7 +31,7 @@ public static boolean CheckTodoLine(String[] parts) { * @return boolean */ public static boolean CheckDeadlineLine(String[] parts) { - if (parts.length != 4) { + if (parts.length != 5) { return false; } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { return false; @@ -48,7 +48,7 @@ public static boolean CheckDeadlineLine(String[] parts) { * @return boolean */ public static boolean CheckEventLine(String[] parts) { - if (parts.length != 4) { + if (parts.length != 5) { return false; } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { return false; From d4bd49a6dc4c8d75d67b51908340bb0595079f8f Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 10 Nov 2021 00:07:38 +0800 Subject: [PATCH 147/193] Added requestPriorityLevel method to print message to ask user to add priority level of task --- src/main/java/Duke/Ui/Ui.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/Duke/Ui/Ui.java b/src/main/java/Duke/Ui/Ui.java index 15bf65ec..55ef0a54 100644 --- a/src/main/java/Duke/Ui/Ui.java +++ b/src/main/java/Duke/Ui/Ui.java @@ -42,7 +42,15 @@ public static void PrintTaskCount() { * @param newTask */ public static void PrintTaskAdded(Task newTask) { + System.out.println(line); System.out.println("Got it. I've added this task:\n" + newTask.getTaskInfo()); } + + public static void requestPriorityLevel() { + System.out.println("What is the priority level of this task?" + + "\n(enter 1 - LOW priority, 2 - MEDIUM priority, 3 - HIGH priority." + + "\nOther inputs will assume task has NIL priority level.)"); + System.out.println(line); + } } From 3fbec57994a0f071e564ddf1413c496eaea0fdb8 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 10 Nov 2021 00:08:22 +0800 Subject: [PATCH 148/193] Edited parser methods to include priority level to the task object built using information from storage lines. --- src/main/java/Duke/Parser/Parser.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index 115265a0..09f62639 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -5,6 +5,7 @@ import Duke.Checker.InputChecker; import Duke.TaskList; import Duke.Ui.Ui; +import Duke.Duke; import java.time.LocalDate; import java.time.LocalTime; @@ -183,6 +184,7 @@ public static Todo getTodoFromLine(String[] parts) { if (parts[1].trim().equals("1")) { TaskList.MarkTask(newTodo); } + newTodo.setPriority(parts[3]); return newTodo; } @@ -220,6 +222,7 @@ public static Deadline getDeadlineFromLine(String[] parts) { if (parts[1].trim().equals("1")) { TaskList.MarkTask(newDeadline); } + newDeadline.setPriority(parts[4]); return newDeadline; } @@ -257,6 +260,7 @@ public static Event getEventFromLine(String[] parts) { if (parts[1].trim().equals("1")) { TaskList.MarkTask(newEvent); } + newEvent.setPriority(parts[4]); return newEvent; } From e48f31e0d90480a9c983b988ee7df9d6190346bd Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 10 Nov 2021 00:32:22 +0800 Subject: [PATCH 149/193] Edited old unit tests and added new unit tests to test new methods and updated methods related to priority variable. --- .../Duke/Checker/FileLineCheckerTest.java | 10 +++---- src/test/java/Duke/Models/DeadlineTest.java | 27 ++++++++++++++--- src/test/java/Duke/Models/EventTest.java | 27 ++++++++++++++--- src/test/java/Duke/Models/TaskTest.java | 8 +++++ src/test/java/Duke/Models/TodoTest.java | 29 ++++++++++++++++--- 5 files changed, 84 insertions(+), 17 deletions(-) diff --git a/src/test/java/Duke/Checker/FileLineCheckerTest.java b/src/test/java/Duke/Checker/FileLineCheckerTest.java index 42ff2720..0e1b37fb 100644 --- a/src/test/java/Duke/Checker/FileLineCheckerTest.java +++ b/src/test/java/Duke/Checker/FileLineCheckerTest.java @@ -8,23 +8,23 @@ public class FileLineCheckerTest { @Test public void checkTodoLineTest() { - assertEquals(true,CheckTodoLine(new String[]{"T", "1", "Homework"})); + assertEquals(true,CheckTodoLine(new String[]{"T", "1", "Homework", "MEDIUM"})); assertEquals(false, CheckTodoLine(new String[]{"", "", ""})); } @Test public void checkDeadlineLineTest() { assertEquals(true, - CheckDeadlineLine(new String[]{"D", "0", "Submit Project", "Sunday"})); + CheckDeadlineLine(new String[]{"D", "0", "Submit Project", "Sunday", "HIGH"})); assertEquals(false, - CheckDeadlineLine(new String[]{"D", "3", "Do task", "Today"})); + CheckDeadlineLine(new String[]{"D", "3", "Do task", "Today", "LOW"})); } @Test public void checkEventLineTest() { assertEquals(true, - CheckEventLine(new String[]{"E", "1", "Party", "Friend's house"})); + CheckEventLine(new String[]{"E", "1", "Party", "Friend's house", "LOW"})); assertEquals(false, - CheckEventLine(new String[]{"E", "0", "", "Nowhere"})); + CheckEventLine(new String[]{"E", "0", "", "Nowhere", "NIL"})); } } diff --git a/src/test/java/Duke/Models/DeadlineTest.java b/src/test/java/Duke/Models/DeadlineTest.java index 12bc53bf..27a44b45 100644 --- a/src/test/java/Duke/Models/DeadlineTest.java +++ b/src/test/java/Duke/Models/DeadlineTest.java @@ -49,12 +49,31 @@ public void getCompletedSymbolTest() { assertEquals("[D][X]", Test2.getCompletedSymbol()); } + @Test + public void setPriorityTest() { + Test1.setPriority("MEDIUM"); + Test2.setPriority("1"); + Test3.setPriority("abc"); + assertEquals("MEDIUM", Test1.getPriority().toString()); + assertEquals("LOW", Test2.getPriority().toString()); + assertEquals("NIL", Test3.getPriority().toString()); + } + @Test public void getTaskInfoTest() { - assertEquals("[D][ ] Task 1 (by: tomorrow)", Test1.getTaskInfo()); - assertEquals("[D][ ] Task 2 (by: Oct 19 2010)", Test2.getTaskInfo()); - assertEquals("[D][ ] Task 3 (by: Jan 20 2012 18:00)", Test3.getTaskInfo()); + assertEquals("[D][ ] Task 1 (by: tomorrow) " + + "- with NIL priority", Test1.getTaskInfo()); + Test1.setPriority("LOW"); + Test2.setPriority("3"); + Test3.setPriority("NIL"); + assertEquals("[D][ ] Task 1 (by: tomorrow) " + + "- with LOW priority", Test1.getTaskInfo()); + assertEquals("[D][ ] Task 2 (by: Oct 19 2010) " + + "- with HIGH priority", Test2.getTaskInfo()); + assertEquals("[D][ ] Task 3 (by: Jan 20 2012 18:00) " + + "- with NIL priority", Test3.getTaskInfo()); Test2.markCompleted(); - assertEquals("[D][X] Task 2 (by: Oct 19 2010)", Test2.getTaskInfo()); + assertEquals("[D][X] Task 2 (by: Oct 19 2010) " + + "- with HIGH priority", Test2.getTaskInfo()); } } diff --git a/src/test/java/Duke/Models/EventTest.java b/src/test/java/Duke/Models/EventTest.java index b6676373..740e1963 100644 --- a/src/test/java/Duke/Models/EventTest.java +++ b/src/test/java/Duke/Models/EventTest.java @@ -49,13 +49,32 @@ public void getCompletedSymbolTest() { assertEquals("[E][X]", Test3.getCompletedSymbol()); } + @Test + public void setPriorityTest() { + Test1.setPriority("3"); + Test2.setPriority("1"); + Test3.setPriority("MEDIUM"); + assertEquals("HIGH", Test1.getPriority().toString()); + assertEquals("LOW", Test2.getPriority().toString()); + assertEquals("MEDIUM", Test3.getPriority().toString()); + } + @Test public void getTaskInfoTest() { - assertEquals("[E][ ] Task 1 (at: School)", Test1.getTaskInfo()); - assertEquals("[E][ ] Task 2 (at: Jun 15 2020)", Test2.getTaskInfo()); - assertEquals("[E][ ] Task 3 (at: Nov 14 2021 23:59)", Test3.getTaskInfo()); + assertEquals("[E][ ] Task 1 (at: School) " + + "- with NIL priority", Test1.getTaskInfo()); + Test1.setPriority("2"); + Test2.setPriority("testing"); + Test3.setPriority("HIGH"); + assertEquals("[E][ ] Task 1 (at: School) " + + "- with MEDIUM priority", Test1.getTaskInfo()); + assertEquals("[E][ ] Task 2 (at: Jun 15 2020) " + + "- with NIL priority", Test2.getTaskInfo()); + assertEquals("[E][ ] Task 3 (at: Nov 14 2021 23:59) " + + "- with HIGH priority", Test3.getTaskInfo()); Test1.markCompleted(); - assertEquals("[E][X] Task 1 (at: School)", Test1.getTaskInfo()); + assertEquals("[E][X] Task 1 (at: School) " + + "- with MEDIUM priority", Test1.getTaskInfo()); } } diff --git a/src/test/java/Duke/Models/TaskTest.java b/src/test/java/Duke/Models/TaskTest.java index 2d536100..884b1a8b 100644 --- a/src/test/java/Duke/Models/TaskTest.java +++ b/src/test/java/Duke/Models/TaskTest.java @@ -71,6 +71,14 @@ public void getCompleteSymbolTest() { } } + @Test + public void setPriorityTest() { + Test1.setPriority("1"); + Test2.setPriority("123"); + assertEquals("LOW", Test1.getPriority().toString()); + assertEquals("NIL", Test2.getPriority().toString()); + } + @Test public void getTaskInfoTest() { assertEquals("[ ] Task 1", Test1.getTaskInfo()); diff --git a/src/test/java/Duke/Models/TodoTest.java b/src/test/java/Duke/Models/TodoTest.java index 60ea87dc..3103ed50 100644 --- a/src/test/java/Duke/Models/TodoTest.java +++ b/src/test/java/Duke/Models/TodoTest.java @@ -27,12 +27,33 @@ public void getCompletedSymbolTest() { assertEquals("[T][X]", Test3.getCompletedSymbol()); } + @Test + public void setPriorityTest() { + Test1.setPriority("2"); + Test2.setPriority("random"); + Test3.setPriority("HIGH"); + assertEquals("MEDIUM", Test1.getPriority().toString()); + assertEquals("NIL", Test2.getPriority().toString()); + assertEquals("HIGH", Test3.getPriority().toString()); + } + @Test public void getTaskInfoTest() { - assertEquals("[T][ ] Task 1", Test1.getTaskInfo()); - assertEquals("[T][ ] Task 2", Test2.getTaskInfo()); - assertEquals("[T][ ] Task 3", Test3.getTaskInfo()); + assertEquals("[T][ ] Task 1 " + + "- with NIL priority", Test1.getTaskInfo()); + Test1.setPriority("HIGH"); + Test2.setPriority("0"); + Test3.setPriority("LOW"); + assertEquals("[T][ ] Task 1 " + + "- with HIGH priority", Test1.getTaskInfo()); + assertEquals("[T][ ] Task 2 " + + "- with NIL priority", Test2.getTaskInfo()); + assertEquals("[T][ ] Task 3 " + + "- with LOW priority", Test3.getTaskInfo()); + Test3.markCompleted(); - assertEquals("[T][X] Task 3", Test3.getTaskInfo()); + Test3.setPriority(""); + assertEquals("[T][X] Task 3 " + + "- with NIL priority", Test3.getTaskInfo()); } } From 0a21620d413130195ce275c584e433bc11c7959b Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 10 Nov 2021 01:19:23 +0800 Subject: [PATCH 150/193] Added method to check for valid find inputs --- src/main/java/Duke/Checker/InputChecker.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/Duke/Checker/InputChecker.java b/src/main/java/Duke/Checker/InputChecker.java index 2a3d8626..f39969a6 100644 --- a/src/main/java/Duke/Checker/InputChecker.java +++ b/src/main/java/Duke/Checker/InputChecker.java @@ -113,4 +113,12 @@ public static boolean CheckValidDelete(String input) throws DukeException { return true; } } + + public static boolean checkValidFind(String[] parts) throws DukeException { + if (parts.length != 2) { + throw new DukeException("☹ OOPS!!! The keyword to find is missing."); + } else { + return true; + } + } } From 865e830f1811e61918efdd2b2d663347b6d058a6 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 10 Nov 2021 01:20:21 +0800 Subject: [PATCH 151/193] Added method to check whether descriptions of tasks in the list contains a keyword --- src/main/java/Duke/TaskList.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/Duke/TaskList.java b/src/main/java/Duke/TaskList.java index 6b38c21b..31fc94c9 100644 --- a/src/main/java/Duke/TaskList.java +++ b/src/main/java/Duke/TaskList.java @@ -92,4 +92,21 @@ public static void DeleteIndex(String input) throws DukeException { throw new DukeException("☹ OOPS!!! The index number of the task to delete is invalid!"); } } + + public static void printTaskWithDesc(String desc) { + int count = 0; + for (int i = 0; i < TaskList.size(); i++) { + Task currentTask = DukeList.get(i); + if (currentTask.getDescription().contains(desc)) { + if (count == 0) { + System.out.println("Here are the matching tasks in your list:"); + } + count++; + System.out.println(count + ". " + currentTask.getTaskInfo()); + } + } + if (count == 0) { + System.out.println("There are no matching tasks in your list."); + } + } } From 0b3a4662af89a9cef59fca9fb2eca29fced1d1ee Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 10 Nov 2021 01:22:21 +0800 Subject: [PATCH 152/193] Created a method to check whether an input is a find input and check the list in duke whether the keyword from the input exists and print out the task info. --- src/main/java/Duke/Parser/Parser.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index 09f62639..6c321587 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -418,5 +418,16 @@ public static Event buildEvent(String input) { return newEvent; } + public static void findTask(String input) { + String[] parts = input.split(" "); + try { + if (InputChecker.checkValidFind(parts)) { + TaskList.printTaskWithDesc(parts[1]); + } + } catch (DukeException e) { + e.printErrMsg(); + } + } + } From d049ebf9f1093de92061dd1aca38fafb53895f52 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 10 Nov 2021 01:22:39 +0800 Subject: [PATCH 153/193] Edited parser to accept "find" inputs. --- src/main/java/Duke/Parser/Parser.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index 6c321587..c027a85b 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -35,6 +35,8 @@ public static void parseInput(String input) { MarkDone(input); } else if (input.startsWith("delete ")) { DeleteTask(input); + } else if (input.startsWith("find ")) { + findTask(input); } else { System.out.println("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); } From 70e2828be6745d75310429dce96251bac0013870 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 10 Nov 2021 01:28:36 +0800 Subject: [PATCH 154/193] Edited method to find task using keywords regardless of capitaizations --- src/main/java/Duke/TaskList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/Duke/TaskList.java b/src/main/java/Duke/TaskList.java index 31fc94c9..9b3abfb9 100644 --- a/src/main/java/Duke/TaskList.java +++ b/src/main/java/Duke/TaskList.java @@ -97,7 +97,7 @@ public static void printTaskWithDesc(String desc) { int count = 0; for (int i = 0; i < TaskList.size(); i++) { Task currentTask = DukeList.get(i); - if (currentTask.getDescription().contains(desc)) { + if (currentTask.getDescription().toLowerCase().contains(desc.toLowerCase())) { if (count == 0) { System.out.println("Here are the matching tasks in your list:"); } From a8a37cd59fa098572547c9b1e9e5e0a9c0ea4018 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Wed, 10 Nov 2021 01:33:33 +0800 Subject: [PATCH 155/193] Added test methods to InputCheckerTest.java to test the checkValidFind method. --- src/test/java/Duke/Checker/InputCheckerTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/java/Duke/Checker/InputCheckerTest.java b/src/test/java/Duke/Checker/InputCheckerTest.java index 744f7322..0b8983af 100644 --- a/src/test/java/Duke/Checker/InputCheckerTest.java +++ b/src/test/java/Duke/Checker/InputCheckerTest.java @@ -31,4 +31,12 @@ public void checkValidEventTest() throws DukeException { assertThrows(DukeException.class, () -> CheckValidEvent("event birthday /at")); assertThrows(DukeException.class, () -> CheckValidEvent("event /at home")); } + + @Test + public void checkValidFindTest() throws DukeException { + assertEquals(true, checkValidFind(new String[]{"find","task"})); + assertThrows(DukeException.class, () -> checkValidFind(new String[]{"find"})); + assertThrows(DukeException.class, () -> checkValidFind(new String[]{})); + + } } From f1e5e50959084d08fab57c1136353e1911614b39 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:03:05 +0800 Subject: [PATCH 156/193] Repackaging of some java class files. --- src/main/java/Duke/{ => DukeLogic}/DukeException.java | 0 src/main/java/Duke/{ => DukeLogic}/Storage.java | 0 src/main/java/Duke/{ => DukeLogic}/TaskList.java | 0 src/main/java/Duke/{Ui => DukeLogic}/Ui.java | 0 src/main/java/Duke/{ => Models}/PriorityLevel.java | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename src/main/java/Duke/{ => DukeLogic}/DukeException.java (100%) rename src/main/java/Duke/{ => DukeLogic}/Storage.java (100%) rename src/main/java/Duke/{ => DukeLogic}/TaskList.java (100%) rename src/main/java/Duke/{Ui => DukeLogic}/Ui.java (100%) rename src/main/java/Duke/{ => Models}/PriorityLevel.java (100%) diff --git a/src/main/java/Duke/DukeException.java b/src/main/java/Duke/DukeLogic/DukeException.java similarity index 100% rename from src/main/java/Duke/DukeException.java rename to src/main/java/Duke/DukeLogic/DukeException.java diff --git a/src/main/java/Duke/Storage.java b/src/main/java/Duke/DukeLogic/Storage.java similarity index 100% rename from src/main/java/Duke/Storage.java rename to src/main/java/Duke/DukeLogic/Storage.java diff --git a/src/main/java/Duke/TaskList.java b/src/main/java/Duke/DukeLogic/TaskList.java similarity index 100% rename from src/main/java/Duke/TaskList.java rename to src/main/java/Duke/DukeLogic/TaskList.java diff --git a/src/main/java/Duke/Ui/Ui.java b/src/main/java/Duke/DukeLogic/Ui.java similarity index 100% rename from src/main/java/Duke/Ui/Ui.java rename to src/main/java/Duke/DukeLogic/Ui.java diff --git a/src/main/java/Duke/PriorityLevel.java b/src/main/java/Duke/Models/PriorityLevel.java similarity index 100% rename from src/main/java/Duke/PriorityLevel.java rename to src/main/java/Duke/Models/PriorityLevel.java From dac6e65352356bcd84cfc94720ee06c7613eee0c Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:05:11 +0800 Subject: [PATCH 157/193] Updated java files to reflect the repackaging done in previous commit. --- src/main/java/Duke/Checker/InputChecker.java | 2 +- src/main/java/Duke/Duke.java | 4 +++- src/main/java/Duke/DukeLogic/DukeException.java | 2 +- src/main/java/Duke/DukeLogic/Storage.java | 2 +- src/main/java/Duke/DukeLogic/TaskList.java | 3 +-- src/main/java/Duke/Models/PriorityLevel.java | 2 +- src/test/java/Duke/Checker/InputCheckerTest.java | 2 +- src/test/java/Duke/Models/TaskTest.java | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/Duke/Checker/InputChecker.java b/src/main/java/Duke/Checker/InputChecker.java index f39969a6..d532cdb5 100644 --- a/src/main/java/Duke/Checker/InputChecker.java +++ b/src/main/java/Duke/Checker/InputChecker.java @@ -1,5 +1,5 @@ package Duke.Checker; -import Duke.DukeException; +import Duke.DukeLogic.DukeException; /** * Checks whether the input by the Duke user diff --git a/src/main/java/Duke/Duke.java b/src/main/java/Duke/Duke.java index ad9ec08b..c5b5b46e 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -1,7 +1,9 @@ package Duke; +import Duke.DukeLogic.DukeException; +import Duke.DukeLogic.Storage; import Duke.Parser.*; -import Duke.Ui.Ui; +import Duke.DukeLogic.Ui; import java.io.File; import java.io.IOException; diff --git a/src/main/java/Duke/DukeLogic/DukeException.java b/src/main/java/Duke/DukeLogic/DukeException.java index 8a931e48..3d1da4bd 100644 --- a/src/main/java/Duke/DukeLogic/DukeException.java +++ b/src/main/java/Duke/DukeLogic/DukeException.java @@ -1,4 +1,4 @@ -package Duke; +package Duke.DukeLogic; /** * An exception class that represents the errors that are thrown when using duke. diff --git a/src/main/java/Duke/DukeLogic/Storage.java b/src/main/java/Duke/DukeLogic/Storage.java index f076226b..6f41d27e 100644 --- a/src/main/java/Duke/DukeLogic/Storage.java +++ b/src/main/java/Duke/DukeLogic/Storage.java @@ -1,4 +1,4 @@ -package Duke; +package Duke.DukeLogic; import Duke.Parser.Parser; import Duke.Models.*; diff --git a/src/main/java/Duke/DukeLogic/TaskList.java b/src/main/java/Duke/DukeLogic/TaskList.java index 9b3abfb9..6e8ff968 100644 --- a/src/main/java/Duke/DukeLogic/TaskList.java +++ b/src/main/java/Duke/DukeLogic/TaskList.java @@ -1,7 +1,6 @@ -package Duke; +package Duke.DukeLogic; import Duke.Models.*; -import Duke.Ui.Ui; import java.util.ArrayList; diff --git a/src/main/java/Duke/Models/PriorityLevel.java b/src/main/java/Duke/Models/PriorityLevel.java index 442594e1..ec65acd2 100644 --- a/src/main/java/Duke/Models/PriorityLevel.java +++ b/src/main/java/Duke/Models/PriorityLevel.java @@ -1,4 +1,4 @@ -package Duke; +package Duke.Models; /** * Represents the priority levels of tasks. diff --git a/src/test/java/Duke/Checker/InputCheckerTest.java b/src/test/java/Duke/Checker/InputCheckerTest.java index 0b8983af..839b217e 100644 --- a/src/test/java/Duke/Checker/InputCheckerTest.java +++ b/src/test/java/Duke/Checker/InputCheckerTest.java @@ -1,6 +1,6 @@ package Duke.Checker; -import Duke.DukeException; +import Duke.DukeLogic.DukeException; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static Duke.Checker.InputChecker.*; diff --git a/src/test/java/Duke/Models/TaskTest.java b/src/test/java/Duke/Models/TaskTest.java index 884b1a8b..af40fb9f 100644 --- a/src/test/java/Duke/Models/TaskTest.java +++ b/src/test/java/Duke/Models/TaskTest.java @@ -1,6 +1,6 @@ package Duke.Models; -import Duke.DukeException; +import Duke.DukeLogic.DukeException; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; From 304462ff62a2c253509fec5f4ce84a06c2adb4c9 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:07:28 +0800 Subject: [PATCH 158/193] Improved the coding standard of Ui.java --- src/main/java/Duke/DukeLogic/Ui.java | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/Duke/DukeLogic/Ui.java b/src/main/java/Duke/DukeLogic/Ui.java index 55ef0a54..8eedd9f5 100644 --- a/src/main/java/Duke/DukeLogic/Ui.java +++ b/src/main/java/Duke/DukeLogic/Ui.java @@ -1,39 +1,38 @@ -package Duke.Ui; +package Duke.DukeLogic; import Duke.Models.Task; -import Duke.TaskList; /** * Ui class holds Ui display methods that interact with the user. */ public class Ui { - public static String line = "____________________________________________________________"; + public final static String LINE = "____________________________________________________________"; /** * Prints the opening message of Duke. */ - public static void StartDuke() { + public static void startDuke() { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println(line + "\nWelcome to\n" + logo + " chatbot!"); + System.out.println(LINE + "\nWelcome to\n" + logo + " chatbot!"); } /** * Prints a greeting from Duke. */ - public static void Greet() { + public static void greet() { String start = "Hello, I'm Duke.\n" + "What can I do for you?\n"; - System.out.println(line + "\n" + start + line + "\n"); + System.out.println(LINE + "\n" + start + LINE + "\n"); } /** * Prints a message with the number of task inside the task list of Duke. */ - public static void PrintTaskCount() { + public static void printTaskCount() { System.out.println("Now you have " + TaskList.size() + " tasks in the list."); } @@ -41,8 +40,8 @@ public static void PrintTaskCount() { * Prints a message that a Task that has been added. * @param newTask */ - public static void PrintTaskAdded(Task newTask) { - System.out.println(line); + public static void printTaskAdded(Task newTask) { + System.out.println(LINE); System.out.println("Got it. I've added this task:\n" + newTask.getTaskInfo()); } @@ -51,6 +50,6 @@ public static void requestPriorityLevel() { System.out.println("What is the priority level of this task?" + "\n(enter 1 - LOW priority, 2 - MEDIUM priority, 3 - HIGH priority." + "\nOther inputs will assume task has NIL priority level.)"); - System.out.println(line); + System.out.println(LINE); } } From 1b55eb58f1af8073a45152830df2ef7fc1ffaa72 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:08:16 +0800 Subject: [PATCH 159/193] Improved the coding standard of TaskList.java --- src/main/java/Duke/DukeLogic/TaskList.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke/DukeLogic/TaskList.java b/src/main/java/Duke/DukeLogic/TaskList.java index 6e8ff968..43933b79 100644 --- a/src/main/java/Duke/DukeLogic/TaskList.java +++ b/src/main/java/Duke/DukeLogic/TaskList.java @@ -32,7 +32,7 @@ public static void addTaskToList(Task newEntry) { * Takes in a index and removes the task at the index from the task list. * @param index */ - public static void RemoveTask(int index) { + public static void removeTask(int index) { DukeList.remove(index); } @@ -56,7 +56,7 @@ public static void printTaskList() { public static void markTaskAtIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(4).trim()) - 1; if (index < DukeList.size() && index > -1) { - MarkTask(DukeList.get(index)); + markTask(DukeList.get(index)); System.out.println("Nice! I've marked this task as done:\n " + DukeList.get(index).getTaskInfo()); } else { @@ -69,7 +69,7 @@ public static void markTaskAtIndex(String input) throws DukeException { * Mark the task given as a parameter as completed. * @param inputTask */ - public static void MarkTask(Task inputTask) { + public static void markTask(Task inputTask) { inputTask.markCompleted(); } @@ -80,13 +80,13 @@ public static void MarkTask(Task inputTask) { * @param input * @throws DukeException */ - public static void DeleteIndex(String input) throws DukeException { + public static void deleteIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(6).trim()) - 1; if (index < DukeList.size() && index > -1) { String DeletedInfo = DukeList.get(index).getTaskInfo(); - RemoveTask(index); + removeTask(index); System.out.println("Noted! I've removed this task:\n " + DeletedInfo); - Ui.PrintTaskCount(); + Ui.printTaskCount(); } else { throw new DukeException("☹ OOPS!!! The index number of the task to delete is invalid!"); } From 157c830f78c4900387ff597dbe342a7d69dff1cb Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:09:12 +0800 Subject: [PATCH 160/193] Improved the coding standard of Storage.java --- src/main/java/Duke/DukeLogic/Storage.java | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/Duke/DukeLogic/Storage.java b/src/main/java/Duke/DukeLogic/Storage.java index 6f41d27e..b6fc6a03 100644 --- a/src/main/java/Duke/DukeLogic/Storage.java +++ b/src/main/java/Duke/DukeLogic/Storage.java @@ -19,15 +19,15 @@ public class Storage { * @return the new File object. * @throws DukeException */ - public static File CreateStorageFile() throws DukeException { - File newFile = new File("data\\Duke.Storage.txt"); + public static File createStorageFile() throws DukeException { + File newFile = new File("data\\Duke.DukeLogic.Storage.txt"); try { newFile.getParentFile().mkdirs(); newFile.createNewFile(); - System.out.println("New Duke.Storage.txt file created."); + System.out.println("New Duke.DukeLogic.Storage.txt file created."); return newFile; } catch (IOException err) { - throw new DukeException("Failed to create new Duke.Storage.txt file."); + throw new DukeException("Failed to create new Duke.DukeLogic.Storage.txt file."); } } @@ -37,11 +37,11 @@ public static File CreateStorageFile() throws DukeException { * @return an opened File object. * @throws DukeException */ - public static File OpenStorageFile() throws DukeException { + public static File openStorageFile() throws DukeException { File newFile = new File("data\\storage.txt"); if (!newFile.exists()) { try { - newFile = CreateStorageFile(); + newFile = createStorageFile(); } catch (DukeException e) { throw new DukeException("Duke.Duke will run without any prior stored task information"); } @@ -54,12 +54,13 @@ public static File OpenStorageFile() throws DukeException { * The parsed task objects will then be added to Duke's task list. * @param storageFile */ - public static void ReadFileToArray(File storageFile) { + public static void readFileToArray(File storageFile) { try { Scanner s = new Scanner(storageFile); while (s.hasNext()) { try { - TaskList.addTaskToList(Parser.ParseStorageLine(s.nextLine())); + Task taskFromLine = Parser.ParseStorageLine(s.nextLine()); + TaskList.addTaskToList(taskFromLine); } catch (DukeException e) { e.printErrMsg(); } @@ -115,8 +116,9 @@ public static String buildStorageLine(Task targetTask) { } newLine = newLine + targetTask.getDescription(); - if (initial.equals("D") || initial.equals("E")) - newLine = newLine + divider + targetTask.getAdditionalInfo(); + if (initial.equals("D") || initial.equals("E")) { + newLine = newLine + divider + targetTask.getAdditionalInfo(); + } newLine = newLine + divider + targetTask.getPriority(); From a56c59761cae70206c7087e9e414ae6939e18180 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:09:33 +0800 Subject: [PATCH 161/193] Improved the coding standard of Duke.java --- src/main/java/Duke/Duke.java | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/Duke/Duke.java b/src/main/java/Duke/Duke.java index c5b5b46e..21fb0660 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -31,18 +31,18 @@ public static String getInput() { * Continuously read input from the user of Duke * and parse the different inputs. */ - public static void ExtendTaskList() { + public static void useDuke() { while (true) { String input = getInput(); - System.out.println(Ui.line); + System.out.println(Ui.LINE); if (input.equals("bye")) { System.out.println("Bye. Hope to see you again soon!"); - System.out.println(Ui.line); + System.out.println(Ui.LINE); break; } else { Parser.parseInput(input); } - System.out.println(Ui.line + "\n"); + System.out.println(Ui.LINE + "\n"); } } @@ -51,15 +51,15 @@ public static void ExtendTaskList() { * and updating the duke list using th information from the file. * Then print the duke start up message and a greeting from the program. */ - public static void RunDuke() { + public static void runDuke() { try { - File StorageFile = Storage.OpenStorageFile(); - Storage.ReadFileToArray(StorageFile); + File StorageFile = Storage.openStorageFile(); + Storage.readFileToArray(StorageFile); } catch (DukeException e) { e.printErrMsg(); } - Ui.StartDuke(); - Ui.Greet(); + Ui.startDuke(); + Ui.greet(); } /** @@ -68,10 +68,10 @@ public static void RunDuke() { * @throws IOException */ public static void main(String[] args) throws IOException { - RunDuke(); - ExtendTaskList(); + runDuke(); + useDuke(); try { - Storage.writeListToFile(Storage.OpenStorageFile()); + Storage.writeListToFile(Storage.openStorageFile()); } catch (DukeException e) { System.out.println("Failed to write to file"); } From 7558dcafd1d1f7251013a7fe13e0fba9cd1ebcca Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:09:53 +0800 Subject: [PATCH 162/193] Improved the coding standard of FileLineChecker.java --- src/main/java/Duke/Checker/FileLineChecker.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/Duke/Checker/FileLineChecker.java b/src/main/java/Duke/Checker/FileLineChecker.java index 2fcda03e..dfc3549b 100644 --- a/src/main/java/Duke/Checker/FileLineChecker.java +++ b/src/main/java/Duke/Checker/FileLineChecker.java @@ -13,7 +13,7 @@ public class FileLineChecker { * @param parts * @return boolean */ - public static boolean CheckTodoLine(String[] parts) { + public static boolean checkTodoLine(String[] parts) { if (parts.length != 4) { return false; } else if (parts[2].trim().equals("")) { @@ -30,7 +30,7 @@ public static boolean CheckTodoLine(String[] parts) { * @param parts * @return boolean */ - public static boolean CheckDeadlineLine(String[] parts) { + public static boolean checkDeadlineLine(String[] parts) { if (parts.length != 5) { return false; } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { @@ -47,7 +47,7 @@ public static boolean CheckDeadlineLine(String[] parts) { * @param parts * @return boolean */ - public static boolean CheckEventLine(String[] parts) { + public static boolean checkEventLine(String[] parts) { if (parts.length != 5) { return false; } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { From 98ea50ffe20f6e96f69867d13170cbffd064cd1e Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:10:12 +0800 Subject: [PATCH 163/193] Improved the coding standard of InputChecker.java --- src/main/java/Duke/Checker/InputChecker.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/Duke/Checker/InputChecker.java b/src/main/java/Duke/Checker/InputChecker.java index d532cdb5..c7c40891 100644 --- a/src/main/java/Duke/Checker/InputChecker.java +++ b/src/main/java/Duke/Checker/InputChecker.java @@ -14,7 +14,7 @@ public class InputChecker { * @return boolean * @throws DukeException */ - public static boolean CheckValidTodo(String input) throws DukeException { + public static boolean checkValidTodo(String input) throws DukeException { if (input.length() < 5) { throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); } else if (input.substring(4).trim().equals("")) { @@ -31,7 +31,7 @@ public static boolean CheckValidTodo(String input) throws DukeException { * @return boolean * @throws DukeException */ - public static boolean CheckValidDeadline(String input) throws DukeException { + public static boolean checkValidDeadline(String input) throws DukeException { if (input.contains("/by")) { String[] parts = input.substring(8).split("/by"); if (parts.length != 2) { @@ -55,7 +55,7 @@ public static boolean CheckValidDeadline(String input) throws DukeException { * @return boolean * @throws DukeException */ - public static boolean CheckValidEvent(String input) throws DukeException { + public static boolean checkValidEvent(String input) throws DukeException { if (input.contains("/at")) { String[] parts = input.substring(5).split("/at"); if (parts.length != 2) { @@ -79,7 +79,7 @@ public static boolean CheckValidEvent(String input) throws DukeException { * @return boolean * @throws DukeException */ - public static boolean CheckValidDone(String input) throws DukeException { + public static boolean checkValidDone(String input) throws DukeException { if (input.length() < 5) { throw new DukeException("☹ OOPS!!! The index of the task to be marked as done is missing."); } else { @@ -100,7 +100,7 @@ public static boolean CheckValidDone(String input) throws DukeException { * @return boolean * @throws DukeException */ - public static boolean CheckValidDelete(String input) throws DukeException { + public static boolean checkValidDelete(String input) throws DukeException { if (input.length() < 7) { throw new DukeException("☹ OOPS!!! The index of the task to delete is missing."); } else { From 125793a55756b6b2307ed548116f52a24e101c66 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:11:02 +0800 Subject: [PATCH 164/193] Edited Task.java and Parser.java to reflect repackaging of classes. --- src/main/java/Duke/Models/Task.java | 3 +-- src/main/java/Duke/Parser/Parser.java | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/Duke/Models/Task.java b/src/main/java/Duke/Models/Task.java index 46e84df6..7de9e34c 100644 --- a/src/main/java/Duke/Models/Task.java +++ b/src/main/java/Duke/Models/Task.java @@ -1,7 +1,6 @@ package Duke.Models; -import Duke.DukeException; -import Duke.PriorityLevel; +import Duke.DukeLogic.DukeException; /** * Represents a Task with information regarding the diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index c027a85b..7c434611 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -1,10 +1,10 @@ package Duke.Parser; -import Duke.DukeException; +import Duke.DukeLogic.DukeException; import Duke.Models.*; import Duke.Checker.FileLineChecker; import Duke.Checker.InputChecker; -import Duke.TaskList; -import Duke.Ui.Ui; +import Duke.DukeLogic.TaskList; +import Duke.DukeLogic.Ui; import Duke.Duke; import java.time.LocalDate; From 8214b08d52eb347e1611f62a5d4a1fed421e0ba7 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:11:55 +0800 Subject: [PATCH 165/193] Updated Parser.java regarding refactored methods from other classes. --- src/main/java/Duke/Parser/Parser.java | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/Parser.java index 7c434611..8a3a2997 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/Parser.java @@ -50,13 +50,13 @@ public static void parseInput(String input) { */ public static void AddTodo(String input) { try { - if (InputChecker.CheckValidTodo(input)) { + if (InputChecker.checkValidTodo(input)) { String newTask = input.substring(4).trim(); Todo newTodo = new Todo(newTask); TaskList.addTaskToList(newTodo); addPriorityToTask(newTodo); - Ui.PrintTaskAdded(newTodo); - Ui.PrintTaskCount(); + Ui.printTaskAdded(newTodo); + Ui.printTaskCount(); } } catch (DukeException e) { e.printErrMsg(); @@ -71,12 +71,12 @@ public static void AddTodo(String input) { */ public static void AddDeadline(String input) { try { - if (InputChecker.CheckValidDeadline(input)) { + if (InputChecker.checkValidDeadline(input)) { Deadline newDeadline = buildDeadline(input); TaskList.addTaskToList(newDeadline); addPriorityToTask(newDeadline); - Ui.PrintTaskAdded(newDeadline); - Ui.PrintTaskCount(); + Ui.printTaskAdded(newDeadline); + Ui.printTaskCount(); } } catch (DukeException e) { e.printErrMsg(); @@ -91,12 +91,12 @@ public static void AddDeadline(String input) { */ public static void AddEvent(String input) { try { - if (InputChecker.CheckValidEvent(input)) { + if (InputChecker.checkValidEvent(input)) { Event newEvent = buildEvent(input); TaskList.addTaskToList(newEvent); addPriorityToTask(newEvent); - Ui.PrintTaskAdded(newEvent); - Ui.PrintTaskCount(); + Ui.printTaskAdded(newEvent); + Ui.printTaskCount(); } } catch (DukeException e) { e.printErrMsg(); @@ -121,7 +121,7 @@ public static void addPriorityToTask(Task newTask) { */ public static void MarkDone(String input) { try { - if (InputChecker.CheckValidDone(input)) { + if (InputChecker.checkValidDone(input)) { TaskList.markTaskAtIndex(input); } } catch (DukeException e) { @@ -136,8 +136,8 @@ public static void MarkDone(String input) { */ public static void DeleteTask(String input) { try { - if (InputChecker.CheckValidDelete(input)) { - TaskList.DeleteIndex(input); + if (InputChecker.checkValidDelete(input)) { + TaskList.deleteIndex(input); } } catch (DukeException e) { e.printErrMsg(); @@ -155,17 +155,17 @@ public static void DeleteTask(String input) { public static Task ParseStorageLine(String FileLine) throws DukeException { String[] parts = FileLine.split("\\|"); if (parts[0].trim().equals("T")) { - if(FileLineChecker.CheckTodoLine(parts)) { + if(FileLineChecker.checkTodoLine(parts)) { Todo newTodo = getTodoFromLine(parts); return newTodo; } } else if (parts[0].trim().equals("D")) { - if(FileLineChecker.CheckDeadlineLine(parts)) { + if(FileLineChecker.checkDeadlineLine(parts)) { Deadline newDeadline = getDeadlineFromLine(parts); return newDeadline; } } else if (parts[0].trim().equals("E")) { - if (FileLineChecker.CheckEventLine(parts)) { + if (FileLineChecker.checkEventLine(parts)) { Event newEvent = getEventFromLine(parts); return newEvent; } @@ -184,7 +184,7 @@ public static Task ParseStorageLine(String FileLine) throws DukeException { public static Todo getTodoFromLine(String[] parts) { Todo newTodo = new Todo(parts[2].trim()); if (parts[1].trim().equals("1")) { - TaskList.MarkTask(newTodo); + TaskList.markTask(newTodo); } newTodo.setPriority(parts[3]); return newTodo; @@ -222,7 +222,7 @@ public static Deadline getDeadlineFromLine(String[] parts) { } } if (parts[1].trim().equals("1")) { - TaskList.MarkTask(newDeadline); + TaskList.markTask(newDeadline); } newDeadline.setPriority(parts[4]); return newDeadline; @@ -260,7 +260,7 @@ public static Event getEventFromLine(String[] parts) { } } if (parts[1].trim().equals("1")) { - TaskList.MarkTask(newEvent); + TaskList.markTask(newEvent); } newEvent.setPriority(parts[4]); return newEvent; From df8d85f1c0cb428a10788cee6eb400e9ad35abba Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:12:29 +0800 Subject: [PATCH 166/193] Updated FileLineCheckerTest.java to reflect refactored methods from other classes. --- src/test/java/Duke/Checker/FileLineCheckerTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/Duke/Checker/FileLineCheckerTest.java b/src/test/java/Duke/Checker/FileLineCheckerTest.java index 0e1b37fb..879603e6 100644 --- a/src/test/java/Duke/Checker/FileLineCheckerTest.java +++ b/src/test/java/Duke/Checker/FileLineCheckerTest.java @@ -8,23 +8,23 @@ public class FileLineCheckerTest { @Test public void checkTodoLineTest() { - assertEquals(true,CheckTodoLine(new String[]{"T", "1", "Homework", "MEDIUM"})); - assertEquals(false, CheckTodoLine(new String[]{"", "", ""})); + assertEquals(true, checkTodoLine(new String[]{"T", "1", "Homework", "MEDIUM"})); + assertEquals(false, checkTodoLine(new String[]{"", "", ""})); } @Test public void checkDeadlineLineTest() { assertEquals(true, - CheckDeadlineLine(new String[]{"D", "0", "Submit Project", "Sunday", "HIGH"})); + checkDeadlineLine(new String[]{"D", "0", "Submit Project", "Sunday", "HIGH"})); assertEquals(false, - CheckDeadlineLine(new String[]{"D", "3", "Do task", "Today", "LOW"})); + checkDeadlineLine(new String[]{"D", "3", "Do task", "Today", "LOW"})); } @Test public void checkEventLineTest() { assertEquals(true, - CheckEventLine(new String[]{"E", "1", "Party", "Friend's house", "LOW"})); + checkEventLine(new String[]{"E", "1", "Party", "Friend's house", "LOW"})); assertEquals(false, - CheckEventLine(new String[]{"E", "0", "", "Nowhere", "NIL"})); + checkEventLine(new String[]{"E", "0", "", "Nowhere", "NIL"})); } } From 1d75de72ce63bb1b370b27cd71077c9ab05aaa71 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:12:43 +0800 Subject: [PATCH 167/193] Updated InputCheckerTest.java to reflect refactored methods from other classes. --- .../java/Duke/Checker/InputCheckerTest.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/test/java/Duke/Checker/InputCheckerTest.java b/src/test/java/Duke/Checker/InputCheckerTest.java index 839b217e..53ecde36 100644 --- a/src/test/java/Duke/Checker/InputCheckerTest.java +++ b/src/test/java/Duke/Checker/InputCheckerTest.java @@ -10,26 +10,26 @@ public class InputCheckerTest { @Test public void checkValidTodoTest() throws DukeException { - assertEquals(true, CheckValidTodo("todo task 1")); - assertThrows(DukeException.class, () -> CheckValidTodo("tod")); - assertThrows(DukeException.class, () -> CheckValidTodo("todo ")); + assertEquals(true, checkValidTodo("todo task 1")); + assertThrows(DukeException.class, () -> checkValidTodo("tod")); + assertThrows(DukeException.class, () -> checkValidTodo("todo ")); } @Test public void checkValidDeadlineTest() throws DukeException { - assertEquals(true, CheckValidDeadline("deadline homework /by today")); - assertThrows(DukeException.class, () -> CheckValidDeadline("deadli")); - assertThrows(DukeException.class, () -> CheckValidDeadline("deadline return book /by")); - assertThrows(DukeException.class, () -> CheckValidDeadline("deadline /by tomorrow")); + assertEquals(true, checkValidDeadline("deadline homework /by today")); + assertThrows(DukeException.class, () -> checkValidDeadline("deadli")); + assertThrows(DukeException.class, () -> checkValidDeadline("deadline return book /by")); + assertThrows(DukeException.class, () -> checkValidDeadline("deadline /by tomorrow")); } @Test public void checkValidEventTest() throws DukeException { - assertEquals(true, CheckValidEvent("event assembly /at school")); - assertThrows(DukeException.class, () -> CheckValidEvent("eve")); - assertThrows(DukeException.class, () -> CheckValidEvent("event birthday /at")); - assertThrows(DukeException.class, () -> CheckValidEvent("event /at home")); + assertEquals(true, checkValidEvent("event assembly /at school")); + assertThrows(DukeException.class, () -> checkValidEvent("eve")); + assertThrows(DukeException.class, () -> checkValidEvent("event birthday /at")); + assertThrows(DukeException.class, () -> checkValidEvent("event /at home")); } @Test From b20a2af451c564ba57c020b486abc537a0740450 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:44:37 +0800 Subject: [PATCH 168/193] Created FileLineParser.java and moved file line related methods from Parser class into FileLineParser class --- src/main/java/Duke/Parser/FileLineParser.java | 139 ++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 src/main/java/Duke/Parser/FileLineParser.java diff --git a/src/main/java/Duke/Parser/FileLineParser.java b/src/main/java/Duke/Parser/FileLineParser.java new file mode 100644 index 00000000..9ce3e74e --- /dev/null +++ b/src/main/java/Duke/Parser/FileLineParser.java @@ -0,0 +1,139 @@ +package Duke.Parser; + +import Duke.Checker.FileLineChecker; + +import Duke.DukeLogic.DukeException; +import Duke.DukeLogic.TaskList; + +import Duke.Models.Deadline; +import Duke.Models.Event; +import Duke.Models.Task; +import Duke.Models.Todo; + +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.format.DateTimeParseException; + +public class FileLineParser { + /** + * Takes and parse a line from the storage file, + * uses the information from the line to create + * and return the respective task object based on the line. + * @param FileLine + * @return Task object created from file line. + * @throws DukeException + */ + public static Task ParseStorageLine(String FileLine) throws DukeException { + String[] parts = FileLine.split("\\|"); + if (parts[0].trim().equals("T")) { + if(FileLineChecker.checkTodoLine(parts)) { + Todo newTodo = getTodoFromLine(parts); + return newTodo; + } + } else if (parts[0].trim().equals("D")) { + if(FileLineChecker.checkDeadlineLine(parts)) { + Deadline newDeadline = getDeadlineFromLine(parts); + return newDeadline; + } + } else if (parts[0].trim().equals("E")) { + if (FileLineChecker.checkEventLine(parts)) { + Event newEvent = getEventFromLine(parts); + return newEvent; + } + } else { + System.out.println("Line is invalid"); + } + throw new DukeException("A line from storage file is invalid and will not be added to Duke."); + } + + /** + * Takes in the parsed parts of a line from the storage file + * and return a new "To do" object created from the parts. + * @param parts + * @return "To do" object created from information parsed from a file line. + */ + public static Todo getTodoFromLine(String[] parts) { + Todo newTodo = new Todo(parts[2].trim()); + if (parts[1].trim().equals("1")) { + TaskList.markTask(newTodo); + } + newTodo.setPriority(parts[3]); + return newTodo; + } + + /** + * Takes in the parsed parts of a line from the storage file, + * checks whether it has a date and time and creates and returns + * a new "Deadline" object using the correct constructor based on the checks. + * @param parts + * @return Deadline object created from information parsed from a file line. + */ + public static Deadline getDeadlineFromLine(String[] parts) { + String[] datetime = parts[3].trim().split(" "); + Deadline newDeadline; + if (datetime.length > 2 ) { + newDeadline = new Deadline(parts[2].trim(), parts[3].trim()); + } else { + LocalDate newDate = null; + LocalTime newTime = null; + try { + newDate = LocalDate.parse(datetime[0]); + newTime = LocalTime.parse(datetime[1]); + } catch (DateTimeParseException e) { + e.getMessage(); + } catch (ArrayIndexOutOfBoundsException e) { + e.getMessage(); + } + if (newDate != null && newTime != null) { + newDeadline = new Deadline(parts[2].trim(), newDate, newTime); + } else if (newDate != null) { + newDeadline = new Deadline(parts[2].trim(), newDate); + } else { + newDeadline = new Deadline(parts[2].trim(), parts[3].trim()); + } + } + if (parts[1].trim().equals("1")) { + TaskList.markTask(newDeadline); + } + newDeadline.setPriority(parts[4]); + return newDeadline; + } + + /** + * Takes in the parsed parts of a line from the storage file, + * checks whether it has a date and time and creates and returns + * a new "Event" object using the correct constructor based on the checks. + * @param parts + * @return an Event object created from information parsed from a file line. + */ + public static Event getEventFromLine(String[] parts) { + String[] datetime = parts[3].trim().split(" "); + Event newEvent; + if (datetime.length > 2 ) { + newEvent = new Event(parts[2].trim(), parts[3].trim()); + } else { + LocalDate newDate = null; + LocalTime newTime = null; + try { + newDate = LocalDate.parse(datetime[0]); + newTime = LocalTime.parse(datetime[1]); + } catch (DateTimeParseException e) { + e.getMessage(); + } catch (ArrayIndexOutOfBoundsException e) { + e.getMessage(); + } + if (newDate != null && newTime != null) { + newEvent = new Event(parts[2].trim(), newDate, newTime); + } else if (newDate != null) { + newEvent = new Event(parts[2].trim(), newDate); + } else { + newEvent = new Event(parts[2].trim(), parts[3].trim()); + } + } + if (parts[1].trim().equals("1")) { + TaskList.markTask(newEvent); + } + newEvent.setPriority(parts[4]); + return newEvent; + } +} From 17e0b1133370ccaaa0e2cef00c86a57525d82b52 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 01:45:10 +0800 Subject: [PATCH 169/193] Refactored Parser class into InputParser class and removed the methods moved to FileLineParser class --- .../Parser/{Parser.java => InputParser.java} | 136 ++---------------- 1 file changed, 9 insertions(+), 127 deletions(-) rename src/main/java/Duke/Parser/{Parser.java => InputParser.java} (67%) diff --git a/src/main/java/Duke/Parser/Parser.java b/src/main/java/Duke/Parser/InputParser.java similarity index 67% rename from src/main/java/Duke/Parser/Parser.java rename to src/main/java/Duke/Parser/InputParser.java index 8a3a2997..7553a1b5 100644 --- a/src/main/java/Duke/Parser/Parser.java +++ b/src/main/java/Duke/Parser/InputParser.java @@ -1,20 +1,24 @@ package Duke.Parser; -import Duke.DukeLogic.DukeException; -import Duke.Models.*; -import Duke.Checker.FileLineChecker; + import Duke.Checker.InputChecker; + +import Duke.Models.Deadline; +import Duke.Models.Event; +import Duke.Models.Task; +import Duke.Models.Todo; + +import Duke.DukeLogic.DukeException; import Duke.DukeLogic.TaskList; import Duke.DukeLogic.Ui; import Duke.Duke; import java.time.LocalDate; import java.time.LocalTime; -import java.time.format.DateTimeParseException; /** * Represents a parser that make sense of inputs and retrieved lines. */ -public class Parser { +public class InputParser { /** * Reads the input @@ -144,128 +148,6 @@ public static void DeleteTask(String input) { } } - /** - * Takes and parse a line from the storage file, - * uses the information from the line to create - * and return the respective task object based on the line. - * @param FileLine - * @return Task object created from file line. - * @throws DukeException - */ - public static Task ParseStorageLine(String FileLine) throws DukeException { - String[] parts = FileLine.split("\\|"); - if (parts[0].trim().equals("T")) { - if(FileLineChecker.checkTodoLine(parts)) { - Todo newTodo = getTodoFromLine(parts); - return newTodo; - } - } else if (parts[0].trim().equals("D")) { - if(FileLineChecker.checkDeadlineLine(parts)) { - Deadline newDeadline = getDeadlineFromLine(parts); - return newDeadline; - } - } else if (parts[0].trim().equals("E")) { - if (FileLineChecker.checkEventLine(parts)) { - Event newEvent = getEventFromLine(parts); - return newEvent; - } - } else { - System.out.println("Line is invalid"); - } - throw new DukeException("A line from storage file is invalid and will not be added to Duke."); - } - - /** - * Takes in the parsed parts of a line from the storage file - * and return a new "To do" object created from the parts. - * @param parts - * @return "To do" object created from information parsed from a file line. - */ - public static Todo getTodoFromLine(String[] parts) { - Todo newTodo = new Todo(parts[2].trim()); - if (parts[1].trim().equals("1")) { - TaskList.markTask(newTodo); - } - newTodo.setPriority(parts[3]); - return newTodo; - } - - /** - * Takes in the parsed parts of a line from the storage file, - * checks whether it has a date and time and creates and returns - * a new "Deadline" object using the correct constructor based on the checks. - * @param parts - * @return Deadline object created from information parsed from a file line. - */ - public static Deadline getDeadlineFromLine(String[] parts) { - String[] datetime = parts[3].trim().split(" "); - Deadline newDeadline; - if (datetime.length > 2 ) { - newDeadline = new Deadline(parts[2].trim(), parts[3].trim()); - } else { - LocalDate newDate = null; - LocalTime newTime = null; - try { - newDate = LocalDate.parse(datetime[0]); - newTime = LocalTime.parse(datetime[1]); - } catch (DateTimeParseException e) { - e.getMessage(); - } catch (ArrayIndexOutOfBoundsException e) { - e.getMessage(); - } - if (newDate != null && newTime != null) { - newDeadline = new Deadline(parts[2].trim(), newDate, newTime); - } else if (newDate != null) { - newDeadline = new Deadline(parts[2].trim(), newDate); - } else { - newDeadline = new Deadline(parts[2].trim(), parts[3].trim()); - } - } - if (parts[1].trim().equals("1")) { - TaskList.markTask(newDeadline); - } - newDeadline.setPriority(parts[4]); - return newDeadline; - } - - /** - * Takes in the parsed parts of a line from the storage file, - * checks whether it has a date and time and creates and returns - * a new "Event" object using the correct constructor based on the checks. - * @param parts - * @return an Event object created from information parsed from a file line. - */ - public static Event getEventFromLine(String[] parts) { - String[] datetime = parts[3].trim().split(" "); - Event newEvent; - if (datetime.length > 2 ) { - newEvent = new Event(parts[2].trim(), parts[3].trim()); - } else { - LocalDate newDate = null; - LocalTime newTime = null; - try { - newDate = LocalDate.parse(datetime[0]); - newTime = LocalTime.parse(datetime[1]); - } catch (DateTimeParseException e) { - e.getMessage(); - } catch (ArrayIndexOutOfBoundsException e) { - e.getMessage(); - } - if (newDate != null && newTime != null) { - newEvent = new Event(parts[2].trim(), newDate, newTime); - } else if (newDate != null) { - newEvent = new Event(parts[2].trim(), newDate); - } else { - newEvent = new Event(parts[2].trim(), parts[3].trim()); - } - } - if (parts[1].trim().equals("1")) { - TaskList.markTask(newEvent); - } - newEvent.setPriority(parts[4]); - return newEvent; - } - /** * Takes in a string and checks whether it is in an input representing time. * If it is in valid format, return true. From bc569cd7c94c310ccffa295cb506f38c8c2e4904 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 02:05:01 +0800 Subject: [PATCH 170/193] Updated class name to reflect previous refactoring --- src/main/java/Duke/DukeLogic/Storage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke/DukeLogic/Storage.java b/src/main/java/Duke/DukeLogic/Storage.java index b6fc6a03..5e0e887d 100644 --- a/src/main/java/Duke/DukeLogic/Storage.java +++ b/src/main/java/Duke/DukeLogic/Storage.java @@ -1,6 +1,6 @@ package Duke.DukeLogic; -import Duke.Parser.Parser; +import Duke.Parser.FileLineParser; import Duke.Models.*; import java.io.File; import java.io.FileNotFoundException; @@ -59,7 +59,7 @@ public static void readFileToArray(File storageFile) { Scanner s = new Scanner(storageFile); while (s.hasNext()) { try { - Task taskFromLine = Parser.ParseStorageLine(s.nextLine()); + Task taskFromLine = FileLineParser.ParseStorageLine(s.nextLine()); TaskList.addTaskToList(taskFromLine); } catch (DukeException e) { e.printErrMsg(); From 4505a70b13c519587ffd451332b3aa129db06459 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 02:05:24 +0800 Subject: [PATCH 171/193] Updated class name from previous refactoring --- src/main/java/Duke/Duke.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/Duke/Duke.java b/src/main/java/Duke/Duke.java index 21fb0660..59154b4b 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -40,7 +40,7 @@ public static void useDuke() { System.out.println(Ui.LINE); break; } else { - Parser.parseInput(input); + InputParser.parseInput(input); } System.out.println(Ui.LINE + "\n"); } From 109bfcfa2501f1c2676b81309dcb4c9b6368b1ad Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 02:05:50 +0800 Subject: [PATCH 172/193] Refactored variable name for better coding standard for Storage.java --- src/main/java/Duke/DukeLogic/Storage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke/DukeLogic/Storage.java b/src/main/java/Duke/DukeLogic/Storage.java index 5e0e887d..aab39170 100644 --- a/src/main/java/Duke/DukeLogic/Storage.java +++ b/src/main/java/Duke/DukeLogic/Storage.java @@ -82,13 +82,13 @@ public static void writeListToFile(File FileWrite) { ArrayList list = TaskList.DukeList; for (int i = 0; i < list.size(); i++) { Task taskAtIndex = list.get(i); - String typeCheck = taskAtIndex.getTaskType(); + String taskType = taskAtIndex.getTaskType(); String newLine = ""; - if (typeCheck.equals("T")) { + if (taskType.equals("T")) { newLine = buildStorageLine(taskAtIndex); - } else if (typeCheck.equals("D")) { + } else if (taskType.equals("D")) { newLine = buildStorageLine(taskAtIndex); - } else if (typeCheck.equals("E")) { + } else if (taskType.equals("E")) { newLine = buildStorageLine(taskAtIndex); } fw.write(newLine + System.getProperty("line.separator")); From d7c7e311f2cb48f607b6102f2459df219048de9b Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 02:46:27 +0800 Subject: [PATCH 173/193] Refactored and Restructured code in InputParser class for better Code standard and quality. --- src/main/java/Duke/Parser/InputParser.java | 192 ++++++++++----------- 1 file changed, 94 insertions(+), 98 deletions(-) diff --git a/src/main/java/Duke/Parser/InputParser.java b/src/main/java/Duke/Parser/InputParser.java index 7553a1b5..f8374aa3 100644 --- a/src/main/java/Duke/Parser/InputParser.java +++ b/src/main/java/Duke/Parser/InputParser.java @@ -1,17 +1,14 @@ package Duke.Parser; import Duke.Checker.InputChecker; - import Duke.Models.Deadline; import Duke.Models.Event; import Duke.Models.Task; import Duke.Models.Todo; - import Duke.DukeLogic.DukeException; import Duke.DukeLogic.TaskList; import Duke.DukeLogic.Ui; import Duke.Duke; - import java.time.LocalDate; import java.time.LocalTime; @@ -30,17 +27,17 @@ public static void parseInput(String input) { if (input.trim().equals("list")) { TaskList.printTaskList(); } else if (input.startsWith("todo ")) { - AddTodo(input); + parseTodoInput(input); } else if (input.startsWith("deadline ")) { - AddDeadline(input); + parseDeadlineInput(input); } else if (input.startsWith("event ")) { - AddEvent(input); + parseEventInput(input); } else if (input.startsWith("done ")) { - MarkDone(input); + parseDoneInput(input); } else if (input.startsWith("delete ")) { - DeleteTask(input); + parseDeleteInput(input); } else if (input.startsWith("find ")) { - findTask(input); + parseFindInput(input); } else { System.out.println("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); } @@ -52,9 +49,9 @@ public static void parseInput(String input) { * and adds it to duke task list * @param input */ - public static void AddTodo(String input) { + public static void parseTodoInput(String input) { try { - if (InputChecker.checkValidTodo(input)) { + if (InputChecker.isValidTodoInput(input)) { String newTask = input.substring(4).trim(); Todo newTodo = new Todo(newTask); TaskList.addTaskToList(newTodo); @@ -73,9 +70,9 @@ public static void AddTodo(String input) { * and adds it to duke task list * @param input */ - public static void AddDeadline(String input) { + public static void parseDeadlineInput(String input) { try { - if (InputChecker.checkValidDeadline(input)) { + if (InputChecker.isValidDeadlineInput(input)) { Deadline newDeadline = buildDeadline(input); TaskList.addTaskToList(newDeadline); addPriorityToTask(newDeadline); @@ -87,15 +84,45 @@ public static void AddDeadline(String input) { } } + /** + * Takes in a valid input with information on a deadline, + * parse the parts of the input + * and returns a new Deadline object created using the relevant constructor. + * @param input + * @return Deadline object created from a valid input with deadline information. + */ + public static Deadline buildDeadline(String input) { + String[] parts = input.substring(8).split("/by"); + String[] datetime = parts[1].trim().split(" "); + Deadline newDeadline; + if (datetime.length > 2) { + newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); + } else { + String[] dateDetails = datetime[0].split("/"); + if (checkDateInput(dateDetails)) { + LocalDate taskDate = buildTaskDate(dateDetails); + if (datetime.length == 2 && checkTimeInput(datetime[1])) { + LocalTime taskTime = buildTaskTime(datetime[1]); + newDeadline = new Deadline(parts[0].trim(), taskDate, taskTime); + } else { + newDeadline = new Deadline(parts[0].trim(), taskDate); + } + } else { + newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); + } + } + return newDeadline; + } + /** * If input contains valid information for an "event" object, * method creates the "event" Object from the input * and adds it to duke task list * @param input */ - public static void AddEvent(String input) { + public static void parseEventInput(String input) { try { - if (InputChecker.checkValidEvent(input)) { + if (InputChecker.isValidEventInput(input)) { Event newEvent = buildEvent(input); TaskList.addTaskToList(newEvent); addPriorityToTask(newEvent); @@ -108,46 +135,34 @@ public static void AddEvent(String input) { } /** - * Takes in a task object and request priority level of task from user. - * Set the priority level of the task object based on the input from user. - * @param newTask - */ - public static void addPriorityToTask(Task newTask) { - Ui.requestPriorityLevel(); - String level = Duke.getInput(); - newTask.setPriority(level); - } - - /** - * If input contain valid information to identify a task in the list, - * mark said task object as completed. - * @param input - */ - public static void MarkDone(String input) { - try { - if (InputChecker.checkValidDone(input)) { - TaskList.markTaskAtIndex(input); - } - } catch (DukeException e) { - e.printErrMsg(); - } - } - - /** - * If input contain valid information to identify a task in the list, - * delete said task object. + * Takes in a valid input with information on an event, + * parse the parts of the input + * and returns a new Event object created using the relevant constructor. * @param input + * @return a Event object created from a valid input with event information. */ - public static void DeleteTask(String input) { - try { - if (InputChecker.checkValidDelete(input)) { - TaskList.deleteIndex(input); + public static Event buildEvent(String input) { + String[] parts = input.substring(5).split("/at"); + String[] datetime = parts[1].trim().split(" "); + Event newEvent; + if (datetime.length > 2) { + newEvent = new Event(parts[0].trim(), parts[1].trim()); + } else { + String[] dateDetails = datetime[0].split("/"); + if (checkDateInput(dateDetails)) { + LocalDate taskDate = buildTaskDate(dateDetails); + if (datetime.length == 2 && checkTimeInput(datetime[1])) { + LocalTime taskTime = buildTaskTime(datetime[1]); + newEvent = new Event(parts[0].trim(), taskDate, taskTime); + } else { + newEvent = new Event(parts[0].trim(), taskDate); + } + } else { + newEvent = new Event(parts[0].trim(), parts[1].trim()); } - } catch (DukeException e) { - e.printErrMsg(); } + return newEvent; } - /** * Takes in a string and checks whether it is in an input representing time. * If it is in valid format, return true. @@ -243,69 +258,50 @@ public static LocalDate buildTaskDate(String[] details) { } /** - * Takes in a valid input with information on a deadline, - * parse the parts of the input - * and returns a new Deadline object created using the relevant constructor. + * Takes in a task object and request priority level of task from user. + * Set the priority level of the task object based on the input from user. + * @param newTask + */ + public static void addPriorityToTask(Task newTask) { + Ui.requestPriorityLevel(); + String level = Duke.getInput(); + newTask.setPriority(level); + } + + /** + * If input contain valid information to identify a task in the list, + * mark said task object as completed. * @param input - * @return Deadline object created from a valid input with deadline information. */ - public static Deadline buildDeadline(String input) { - String[] parts = input.substring(8).split("/by"); - String[] datetime = parts[1].trim().split(" "); - Deadline newDeadline = null; - if (datetime.length > 2) { - newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); - } else { - String[] dateDetails = datetime[0].split("/"); - if (checkDateInput(dateDetails)) { - LocalDate taskDate = buildTaskDate(dateDetails); - if (datetime.length == 2 && checkTimeInput(datetime[1])) { - LocalTime taskTime = buildTaskTime(datetime[1]); - newDeadline = new Deadline(parts[0].trim(), taskDate, taskTime); - } else { - newDeadline = new Deadline(parts[0].trim(), taskDate); - } - } else { - newDeadline = new Deadline(parts[0].trim(), parts[1].trim()); + public static void parseDoneInput(String input) { + try { + if (InputChecker.isValidDoneInput(input)) { + TaskList.markTaskAtIndex(input); } + } catch (DukeException e) { + e.printErrMsg(); } - return newDeadline; } /** - * Takes in a valid input with information on an event, - * parse the parts of the input - * and returns a new Event object created using the relevant constructor. + * If input contain valid information to identify a task in the list, + * delete said task object. * @param input - * @return a Event object created from a valid input with event information. */ - public static Event buildEvent(String input) { - String[] parts = input.substring(5).split("/at"); - String[] datetime = parts[1].trim().split(" "); - Event newEvent = null; - if (datetime.length > 2) { - newEvent = new Event(parts[0].trim(), parts[1].trim()); - } else { - String[] dateDetails = datetime[0].split("/"); - if (checkDateInput(dateDetails)) { - LocalDate taskDate = buildTaskDate(dateDetails); - if (datetime.length == 2 && checkTimeInput(datetime[1])) { - LocalTime taskTime = buildTaskTime(datetime[1]); - newEvent = new Event(parts[0].trim(), taskDate, taskTime); - } else { - newEvent = new Event(parts[0].trim(), taskDate); - } - } else { - newEvent = new Event(parts[0].trim(), parts[1].trim()); + public static void parseDeleteInput(String input) { + try { + if (InputChecker.isValidDeleteInput(input)) { + TaskList.deleteTaskAtIndex(input); } + } catch (DukeException e) { + e.printErrMsg(); } - return newEvent; } - public static void findTask(String input) { + public static void parseFindInput(String input) { String[] parts = input.split(" "); try { - if (InputChecker.checkValidFind(parts)) { + if (InputChecker.isValidFindInput(parts)) { TaskList.printTaskWithDesc(parts[1]); } } catch (DukeException e) { From 22c27982ee3666a97b0bd0336257e44815816b4a Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 02:49:38 +0800 Subject: [PATCH 174/193] Refactored methods in InputChecker class for better code standard and quality --- src/main/java/Duke/Checker/InputChecker.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke/Checker/InputChecker.java b/src/main/java/Duke/Checker/InputChecker.java index c7c40891..38e6331e 100644 --- a/src/main/java/Duke/Checker/InputChecker.java +++ b/src/main/java/Duke/Checker/InputChecker.java @@ -14,7 +14,7 @@ public class InputChecker { * @return boolean * @throws DukeException */ - public static boolean checkValidTodo(String input) throws DukeException { + public static boolean isValidTodoInput(String input) throws DukeException { if (input.length() < 5) { throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); } else if (input.substring(4).trim().equals("")) { @@ -31,7 +31,7 @@ public static boolean checkValidTodo(String input) throws DukeException { * @return boolean * @throws DukeException */ - public static boolean checkValidDeadline(String input) throws DukeException { + public static boolean isValidDeadlineInput(String input) throws DukeException { if (input.contains("/by")) { String[] parts = input.substring(8).split("/by"); if (parts.length != 2) { @@ -55,7 +55,7 @@ public static boolean checkValidDeadline(String input) throws DukeException { * @return boolean * @throws DukeException */ - public static boolean checkValidEvent(String input) throws DukeException { + public static boolean isValidEventInput(String input) throws DukeException { if (input.contains("/at")) { String[] parts = input.substring(5).split("/at"); if (parts.length != 2) { @@ -79,7 +79,7 @@ public static boolean checkValidEvent(String input) throws DukeException { * @return boolean * @throws DukeException */ - public static boolean checkValidDone(String input) throws DukeException { + public static boolean isValidDoneInput(String input) throws DukeException { if (input.length() < 5) { throw new DukeException("☹ OOPS!!! The index of the task to be marked as done is missing."); } else { @@ -100,7 +100,7 @@ public static boolean checkValidDone(String input) throws DukeException { * @return boolean * @throws DukeException */ - public static boolean checkValidDelete(String input) throws DukeException { + public static boolean isValidDeleteInput(String input) throws DukeException { if (input.length() < 7) { throw new DukeException("☹ OOPS!!! The index of the task to delete is missing."); } else { @@ -114,7 +114,7 @@ public static boolean checkValidDelete(String input) throws DukeException { } } - public static boolean checkValidFind(String[] parts) throws DukeException { + public static boolean isValidFindInput(String[] parts) throws DukeException { if (parts.length != 2) { throw new DukeException("☹ OOPS!!! The keyword to find is missing."); } else { From 6646b3331c4dea1584ee2da55bc87bf0efd0f6c4 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 02:49:52 +0800 Subject: [PATCH 175/193] Refactored methods in FileLineChecker class for better code standard and quality --- src/main/java/Duke/Checker/FileLineChecker.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/Duke/Checker/FileLineChecker.java b/src/main/java/Duke/Checker/FileLineChecker.java index dfc3549b..7a5d3923 100644 --- a/src/main/java/Duke/Checker/FileLineChecker.java +++ b/src/main/java/Duke/Checker/FileLineChecker.java @@ -13,7 +13,7 @@ public class FileLineChecker { * @param parts * @return boolean */ - public static boolean checkTodoLine(String[] parts) { + public static boolean isValidTodoLine(String[] parts) { if (parts.length != 4) { return false; } else if (parts[2].trim().equals("")) { @@ -30,7 +30,7 @@ public static boolean checkTodoLine(String[] parts) { * @param parts * @return boolean */ - public static boolean checkDeadlineLine(String[] parts) { + public static boolean isValidDeadlineLine(String[] parts) { if (parts.length != 5) { return false; } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { @@ -47,7 +47,7 @@ public static boolean checkDeadlineLine(String[] parts) { * @param parts * @return boolean */ - public static boolean checkEventLine(String[] parts) { + public static boolean isValidEventLine(String[] parts) { if (parts.length != 5) { return false; } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { From 7ce768464b2e5cdc1f9d03b88a09d48b90762cf0 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 02:50:34 +0800 Subject: [PATCH 176/193] Refactored and restructured code in Duke.java class for better code standard and quality. --- src/main/java/Duke/Duke.java | 41 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/main/java/Duke/Duke.java b/src/main/java/Duke/Duke.java index 59154b4b..9d22ce6f 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -6,7 +6,6 @@ import Duke.DukeLogic.Ui; import java.io.File; -import java.io.IOException; import java.util.Scanner; /** @@ -15,7 +14,6 @@ * and that allows users to do CRUD operations on tasks. */ public class Duke { - static Scanner in = new Scanner(System.in); /** @@ -27,6 +25,22 @@ public static String getInput() { return input; } + /** + * Starts Duke by opening storage file + * and updating the duke list using th information from the file. + * Then print the duke start up message and a greeting from the program. + */ + public static void runDuke() { + try { + File StorageFile = Storage.openStorageFile(); + Storage.readFileToArray(StorageFile); + } catch (DukeException e) { + e.printErrMsg(); + } + Ui.startDuke(); + Ui.greet(); + } + /** * Continuously read input from the user of Duke * and parse the different inputs. @@ -36,8 +50,7 @@ public static void useDuke() { String input = getInput(); System.out.println(Ui.LINE); if (input.equals("bye")) { - System.out.println("Bye. Hope to see you again soon!"); - System.out.println(Ui.LINE); + endDuke(); break; } else { InputParser.parseInput(input); @@ -46,28 +59,16 @@ public static void useDuke() { } } - /** - * Starts Duke by opening storage file - * and updating the duke list using th information from the file. - * Then print the duke start up message and a greeting from the program. - */ - public static void runDuke() { - try { - File StorageFile = Storage.openStorageFile(); - Storage.readFileToArray(StorageFile); - } catch (DukeException e) { - e.printErrMsg(); - } - Ui.startDuke(); - Ui.greet(); + public static void endDuke() { + System.out.println("Bye. Hope to see you again soon!"); + System.out.println(Ui.LINE); } /** * Runs the main logic of Duke program. * @param args - * @throws IOException */ - public static void main(String[] args) throws IOException { + public static void main(String[] args) { runDuke(); useDuke(); try { From 88a99e97fe31cc1f792685c05d32684a6909a851 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 02:51:37 +0800 Subject: [PATCH 177/193] Refactored and edited methods in FileLineParser.java class for better code standard and quality. --- src/main/java/Duke/Parser/FileLineParser.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke/Parser/FileLineParser.java b/src/main/java/Duke/Parser/FileLineParser.java index 9ce3e74e..dd952a07 100644 --- a/src/main/java/Duke/Parser/FileLineParser.java +++ b/src/main/java/Duke/Parser/FileLineParser.java @@ -23,20 +23,20 @@ public class FileLineParser { * @return Task object created from file line. * @throws DukeException */ - public static Task ParseStorageLine(String FileLine) throws DukeException { + public static Task parseLineFromFile(String FileLine) throws DukeException { String[] parts = FileLine.split("\\|"); if (parts[0].trim().equals("T")) { - if(FileLineChecker.checkTodoLine(parts)) { + if(FileLineChecker.isValidTodoLine(parts)) { Todo newTodo = getTodoFromLine(parts); return newTodo; } } else if (parts[0].trim().equals("D")) { - if(FileLineChecker.checkDeadlineLine(parts)) { + if(FileLineChecker.isValidDeadlineLine(parts)) { Deadline newDeadline = getDeadlineFromLine(parts); return newDeadline; } } else if (parts[0].trim().equals("E")) { - if (FileLineChecker.checkEventLine(parts)) { + if (FileLineChecker.isValidEventLine(parts)) { Event newEvent = getEventFromLine(parts); return newEvent; } From 9910075a4651ba20519cb9d9e99050562e0e775f Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 02:52:09 +0800 Subject: [PATCH 178/193] Created and refactored methods in TaskList.java for better code standard and quality. --- src/main/java/Duke/DukeLogic/TaskList.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke/DukeLogic/TaskList.java b/src/main/java/Duke/DukeLogic/TaskList.java index 43933b79..287509f9 100644 --- a/src/main/java/Duke/DukeLogic/TaskList.java +++ b/src/main/java/Duke/DukeLogic/TaskList.java @@ -9,7 +9,11 @@ * */ public class TaskList { - static ArrayList DukeList = new ArrayList<>(); + protected static ArrayList DukeList = new ArrayList<>(); + + public static ArrayList getDukeList() { + return DukeList; + } /** * Returns the number of tasks inside the task list. @@ -80,7 +84,7 @@ public static void markTask(Task inputTask) { * @param input * @throws DukeException */ - public static void deleteIndex(String input) throws DukeException { + public static void deleteTaskAtIndex(String input) throws DukeException { int index = Integer.parseInt(input.substring(6).trim()) - 1; if (index < DukeList.size() && index > -1) { String DeletedInfo = DukeList.get(index).getTaskInfo(); From e9a8ca563a5958b112e36c81b6e7448f84a9005b Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 02:52:40 +0800 Subject: [PATCH 179/193] Edited code in Storage.java to reflect refactoring and edits made in other classes. --- src/main/java/Duke/DukeLogic/Storage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke/DukeLogic/Storage.java b/src/main/java/Duke/DukeLogic/Storage.java index aab39170..084cdca2 100644 --- a/src/main/java/Duke/DukeLogic/Storage.java +++ b/src/main/java/Duke/DukeLogic/Storage.java @@ -59,7 +59,7 @@ public static void readFileToArray(File storageFile) { Scanner s = new Scanner(storageFile); while (s.hasNext()) { try { - Task taskFromLine = FileLineParser.ParseStorageLine(s.nextLine()); + Task taskFromLine = FileLineParser.parseLineFromFile(s.nextLine()); TaskList.addTaskToList(taskFromLine); } catch (DukeException e) { e.printErrMsg(); @@ -79,7 +79,7 @@ public static void readFileToArray(File storageFile) { public static void writeListToFile(File FileWrite) { try { FileWriter fw = new FileWriter(FileWrite, false); - ArrayList list = TaskList.DukeList; + ArrayList list = TaskList.getDukeList(); for (int i = 0; i < list.size(); i++) { Task taskAtIndex = list.get(i); String taskType = taskAtIndex.getTaskType(); From 7b215fecedc8bace753c9fe960b992798bf998ed Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 02:53:14 +0800 Subject: [PATCH 180/193] Edited method calls in FileLineCheckerTest class to reflect refactoring and edits done to FileLineChecker class --- src/test/java/Duke/Checker/FileLineCheckerTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/Duke/Checker/FileLineCheckerTest.java b/src/test/java/Duke/Checker/FileLineCheckerTest.java index 879603e6..61f8b734 100644 --- a/src/test/java/Duke/Checker/FileLineCheckerTest.java +++ b/src/test/java/Duke/Checker/FileLineCheckerTest.java @@ -8,23 +8,23 @@ public class FileLineCheckerTest { @Test public void checkTodoLineTest() { - assertEquals(true, checkTodoLine(new String[]{"T", "1", "Homework", "MEDIUM"})); - assertEquals(false, checkTodoLine(new String[]{"", "", ""})); + assertEquals(true, isValidTodoLine(new String[]{"T", "1", "Homework", "MEDIUM"})); + assertEquals(false, isValidTodoLine(new String[]{"", "", ""})); } @Test public void checkDeadlineLineTest() { assertEquals(true, - checkDeadlineLine(new String[]{"D", "0", "Submit Project", "Sunday", "HIGH"})); + isValidDeadlineLine(new String[]{"D", "0", "Submit Project", "Sunday", "HIGH"})); assertEquals(false, - checkDeadlineLine(new String[]{"D", "3", "Do task", "Today", "LOW"})); + isValidDeadlineLine(new String[]{"D", "3", "Do task", "Today", "LOW"})); } @Test public void checkEventLineTest() { assertEquals(true, - checkEventLine(new String[]{"E", "1", "Party", "Friend's house", "LOW"})); + isValidEventLine(new String[]{"E", "1", "Party", "Friend's house", "LOW"})); assertEquals(false, - checkEventLine(new String[]{"E", "0", "", "Nowhere", "NIL"})); + isValidEventLine(new String[]{"E", "0", "", "Nowhere", "NIL"})); } } From 560e0ca75708f024c0683acf6b68db79521d6507 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 02:53:35 +0800 Subject: [PATCH 181/193] Edited method calls in InputCheckerTest class to reflect refactoring and edits done to InputChecker class --- .../java/Duke/Checker/InputCheckerTest.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/test/java/Duke/Checker/InputCheckerTest.java b/src/test/java/Duke/Checker/InputCheckerTest.java index 53ecde36..c87cefce 100644 --- a/src/test/java/Duke/Checker/InputCheckerTest.java +++ b/src/test/java/Duke/Checker/InputCheckerTest.java @@ -10,33 +10,33 @@ public class InputCheckerTest { @Test public void checkValidTodoTest() throws DukeException { - assertEquals(true, checkValidTodo("todo task 1")); - assertThrows(DukeException.class, () -> checkValidTodo("tod")); - assertThrows(DukeException.class, () -> checkValidTodo("todo ")); + assertEquals(true, isValidTodoInput("todo task 1")); + assertThrows(DukeException.class, () -> isValidTodoInput("tod")); + assertThrows(DukeException.class, () -> isValidTodoInput("todo ")); } @Test public void checkValidDeadlineTest() throws DukeException { - assertEquals(true, checkValidDeadline("deadline homework /by today")); - assertThrows(DukeException.class, () -> checkValidDeadline("deadli")); - assertThrows(DukeException.class, () -> checkValidDeadline("deadline return book /by")); - assertThrows(DukeException.class, () -> checkValidDeadline("deadline /by tomorrow")); + assertEquals(true, isValidDeadlineInput("deadline homework /by today")); + assertThrows(DukeException.class, () -> isValidDeadlineInput("deadli")); + assertThrows(DukeException.class, () -> isValidDeadlineInput("deadline return book /by")); + assertThrows(DukeException.class, () -> isValidDeadlineInput("deadline /by tomorrow")); } @Test public void checkValidEventTest() throws DukeException { - assertEquals(true, checkValidEvent("event assembly /at school")); - assertThrows(DukeException.class, () -> checkValidEvent("eve")); - assertThrows(DukeException.class, () -> checkValidEvent("event birthday /at")); - assertThrows(DukeException.class, () -> checkValidEvent("event /at home")); + assertEquals(true, isValidEventInput("event assembly /at school")); + assertThrows(DukeException.class, () -> isValidEventInput("eve")); + assertThrows(DukeException.class, () -> isValidEventInput("event birthday /at")); + assertThrows(DukeException.class, () -> isValidEventInput("event /at home")); } @Test public void checkValidFindTest() throws DukeException { - assertEquals(true, checkValidFind(new String[]{"find","task"})); - assertThrows(DukeException.class, () -> checkValidFind(new String[]{"find"})); - assertThrows(DukeException.class, () -> checkValidFind(new String[]{})); + assertEquals(true, isValidFindInput(new String[]{"find","task"})); + assertThrows(DukeException.class, () -> isValidFindInput(new String[]{"find"})); + assertThrows(DukeException.class, () -> isValidFindInput(new String[]{})); } } From e406221838785fbb5f5bb78bb5b9c62a5b362e39 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 19:38:31 +0800 Subject: [PATCH 182/193] Reformat code for better coding standard and quality --- src/main/java/Duke/Duke.java | 1 - src/main/java/Duke/Models/Task.java | 22 +++++++++---------- src/main/java/Duke/Parser/FileLineParser.java | 2 -- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/main/java/Duke/Duke.java b/src/main/java/Duke/Duke.java index 9d22ce6f..d83e7f0e 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -4,7 +4,6 @@ import Duke.DukeLogic.Storage; import Duke.Parser.*; import Duke.DukeLogic.Ui; - import java.io.File; import java.util.Scanner; diff --git a/src/main/java/Duke/Models/Task.java b/src/main/java/Duke/Models/Task.java index 7de9e34c..69947f63 100644 --- a/src/main/java/Duke/Models/Task.java +++ b/src/main/java/Duke/Models/Task.java @@ -113,17 +113,17 @@ public void setPriority(String level) { this.Priority = PriorityLevel.valueOf(level.trim()); } catch (IllegalArgumentException e) { switch (level.trim()) { - case "3": - this.Priority = PriorityLevel.HIGH; - break; - case "2": - this.Priority = PriorityLevel.MEDIUM; - break; - case "1": - this.Priority = PriorityLevel.LOW; - break; - default: - this.Priority = PriorityLevel.NIL; + case "3": + this.Priority = PriorityLevel.HIGH; + break; + case "2": + this.Priority = PriorityLevel.MEDIUM; + break; + case "1": + this.Priority = PriorityLevel.LOW; + break; + default: + this.Priority = PriorityLevel.NIL; } } } diff --git a/src/main/java/Duke/Parser/FileLineParser.java b/src/main/java/Duke/Parser/FileLineParser.java index dd952a07..f7307fd5 100644 --- a/src/main/java/Duke/Parser/FileLineParser.java +++ b/src/main/java/Duke/Parser/FileLineParser.java @@ -4,12 +4,10 @@ import Duke.DukeLogic.DukeException; import Duke.DukeLogic.TaskList; - import Duke.Models.Deadline; import Duke.Models.Event; import Duke.Models.Task; import Duke.Models.Todo; - import java.time.LocalDate; import java.time.LocalTime; import java.time.format.DateTimeParseException; From 61f18da02406c66c8be6e0313c91e5ca9171277c Mon Sep 17 00:00:00 2001 From: ksw95 Date: Thu, 11 Nov 2021 19:38:47 +0800 Subject: [PATCH 183/193] Refactored for better code quality --- src/main/java/Duke/DukeLogic/Storage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke/DukeLogic/Storage.java b/src/main/java/Duke/DukeLogic/Storage.java index 084cdca2..4cf66c1c 100644 --- a/src/main/java/Duke/DukeLogic/Storage.java +++ b/src/main/java/Duke/DukeLogic/Storage.java @@ -43,7 +43,8 @@ public static File openStorageFile() throws DukeException { try { newFile = createStorageFile(); } catch (DukeException e) { - throw new DukeException("Duke.Duke will run without any prior stored task information"); + throw new DukeException("Duke.Duke will run without " + + "any prior stored task information"); } } return newFile; From 8dfc383a970017d1ca0823b4098bec47666eb5da Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 13 Nov 2021 23:26:07 +0800 Subject: [PATCH 184/193] Created DoWithin class and methods --- src/main/java/Duke/Models/DoWithin.java | 96 +++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 src/main/java/Duke/Models/DoWithin.java diff --git a/src/main/java/Duke/Models/DoWithin.java b/src/main/java/Duke/Models/DoWithin.java new file mode 100644 index 00000000..7f060ac3 --- /dev/null +++ b/src/main/java/Duke/Models/DoWithin.java @@ -0,0 +1,96 @@ +package Duke.Models; + +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; + +public class DoWithin extends Task { + protected String start; + protected LocalDate startDate; + protected LocalTime startTime; + protected String end; + protected LocalDate endDate; + protected LocalTime endTime; + + public DoWithin(String newTask, String newStart, String newEnd) { + super(newTask); + start = newStart; + end = newEnd; + } + + public DoWithin (String newTask, String newStart, String newEnd, LocalDate newStartDate, + LocalTime newStartTime, LocalDate newEndDate, LocalTime newEndTime) { + super(newTask.trim()); + if (newStartDate != null) { + startDate = newStartDate; + startTime = newStartTime; + } else { + start = newStart.trim(); + } + if (newEndTime != null) { + endDate = newEndDate; + endTime = newEndTime; + } else { + end = newEnd.trim(); + } + } + + public String getAdditionalInfo() { + String info; + if (startDate == null) { + info = start; + } else { + info = startDate.toString(); + if (startTime != null) { + info = info + " " + startTime; + } + } + info = info + " | "; + if (endDate == null) { + info = info + end; + } else { + info = info + endDate.toString(); + if (endTime != null) + info = info + " " + endTime; + } + return info; + } + + public String getCompletedSymbol() { + if (Completed) { + return "[W][X]"; + } else { + return "[W][ ]"; + } + } + + public String getTaskInfo() { + String info = super.getTaskInfo() + " (between: "; + if (startDate == null) { + info = info + start; + } else { + info = info + startDate.format(DateTimeFormatter.ofPattern("MMM dd yyyy")); + if (startTime != null) { + info = info + " " + startTime; + } + } + info = info + " and "; + if (endDate == null) { + info = info + end; + } else { + info = info + endDate.format(DateTimeFormatter.ofPattern("MMM dd yyyy")); + if (endTime != null) { + info = info + " " + endTime; + } + } + info = info + ")"; + info = info + " - with " + Priority + " priority"; + return info; + } + + @Override + public String getTaskType() { + return "W"; + } + +} From 4b7f4caeda7408fc8ca06269f90d646ea2afb961 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 13 Nov 2021 23:27:11 +0800 Subject: [PATCH 185/193] Created isValidDoWithinInput method to check whether DoWithin input is valid --- src/main/java/Duke/Checker/InputChecker.java | 30 ++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/java/Duke/Checker/InputChecker.java b/src/main/java/Duke/Checker/InputChecker.java index 38e6331e..a58c6ccb 100644 --- a/src/main/java/Duke/Checker/InputChecker.java +++ b/src/main/java/Duke/Checker/InputChecker.java @@ -72,6 +72,36 @@ public static boolean isValidEventInput(String input) throws DukeException { } } + public static boolean isValidDoWithinInput(String input) throws DukeException { + if (input.contains("/start")) { + String[] parts = input.substring(8).split("/start"); + String[] startEnd; + if (parts[1].contains("/end")) { + startEnd = parts[1].split("/end"); + } else { + throw new DukeException("☹ OOPS!!! Invalid syntax for adding dowithin."); + } + if (parts.length != 2) { + throw new DukeException("☹ OOPS!!! Invalid syntax for adding dowithin."); + } else if (parts[0].trim().equals("")) { + throw new DukeException("☹ OOPS!!! The task description of " + + "an dowithin cannot be empty."); + } + if (startEnd.length != 2) { + throw new DukeException("☹ OOPS!!! Invalid syntax for adding dowithin."); + } else if (startEnd[0].trim().equals("")) { + throw new DukeException("☹ OOPS!!! The start date/time " + + "of a dowithin cannot be empty."); + } else if (startEnd[1].trim().equals("")) { + throw new DukeException("☹ OOPS!!! The end date/time " + + "of a dowithin cannot be empty."); + } + return true; + } else { + throw new DukeException("☹ OOPS!!! Invalid syntax for adding dowithin."); + } + } + /** * Checks whether input contains the enough and correct information * to mark a task as done. From 52769e291b041cbb974151ab64a771306a2db86a Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 13 Nov 2021 23:40:42 +0800 Subject: [PATCH 186/193] Created methods in InputParser.java to parse DoWithin inputs and add them into tasklist. --- src/main/java/Duke/Parser/InputParser.java | 57 ++++++++++++++++++++-- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke/Parser/InputParser.java b/src/main/java/Duke/Parser/InputParser.java index f8374aa3..1ae2a64c 100644 --- a/src/main/java/Duke/Parser/InputParser.java +++ b/src/main/java/Duke/Parser/InputParser.java @@ -1,10 +1,7 @@ package Duke.Parser; import Duke.Checker.InputChecker; -import Duke.Models.Deadline; -import Duke.Models.Event; -import Duke.Models.Task; -import Duke.Models.Todo; +import Duke.Models.*; import Duke.DukeLogic.DukeException; import Duke.DukeLogic.TaskList; import Duke.DukeLogic.Ui; @@ -38,6 +35,8 @@ public static void parseInput(String input) { parseDeleteInput(input); } else if (input.startsWith("find ")) { parseFindInput(input); + } else if (input.startsWith("dowithin ")) { + parseDoWithinInput(input); } else { System.out.println("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); } @@ -163,6 +162,56 @@ public static Event buildEvent(String input) { } return newEvent; } + + public static void parseDoWithinInput(String input) { + try { + if (InputChecker.isValidDoWithinInput(input)) { + DoWithin newDoWithin = buildDoWithin(input); + TaskList.addTaskToList(newDoWithin); + addPriorityToTask(newDoWithin); + Ui.printTaskAdded(newDoWithin); + Ui.printTaskCount(); + } + } catch (DukeException e) { + e.printErrMsg(); + } + } + + public static DoWithin buildDoWithin(String input) { + String[] parts = input.substring(8).split("/start"); + String[] startEnd = parts[1].split("/end"); + String[] startDateTime = startEnd[0].trim().split(" "); + String[] endDateTime = startEnd[1].trim().split(" "); + DoWithin newDoWithin; + LocalDate newStartDate = null, newEndDate = null; + LocalTime newStartTime = null, newEndTime = null; + if (startDateTime.length > 2 && endDateTime.length > 2) { + newDoWithin = new DoWithin(parts[0], startEnd[0], startEnd[1]); + } else { + if (startDateTime.length < 3) { + String[] startDateDetails = startDateTime[0].trim().split("/"); + if (checkDateInput(startDateDetails)) { + newStartDate = buildTaskDate(startDateDetails); + if (startDateTime.length == 2 && checkTimeInput(startDateTime[1])) { + newStartTime = buildTaskTime(startDateTime[1]); + } + } + } + if (endDateTime.length < 3) { + String[] endDateDetails = endDateTime[0].trim().split("/"); + if (checkDateInput(endDateDetails)) { + newEndDate = buildTaskDate(endDateDetails); + if (endDateTime.length == 2 && checkTimeInput(endDateTime[1])) { + newEndTime = buildTaskTime(endDateTime[1]); + } + } + } + newDoWithin = new DoWithin(parts[0], startEnd[0], startEnd[1], newStartDate, newStartTime, + newEndDate, newEndTime); + } + return newDoWithin; + } + /** * Takes in a string and checks whether it is in an input representing time. * If it is in valid format, return true. From ce128a3fa292084eb876fc0c92f6e07890a77e0d Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 13 Nov 2021 23:41:44 +0800 Subject: [PATCH 187/193] Added methods to Storage.java to build storage lines for DoWithin objects. --- src/main/java/Duke/DukeLogic/Storage.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke/DukeLogic/Storage.java b/src/main/java/Duke/DukeLogic/Storage.java index 4cf66c1c..b91d8818 100644 --- a/src/main/java/Duke/DukeLogic/Storage.java +++ b/src/main/java/Duke/DukeLogic/Storage.java @@ -91,6 +91,8 @@ public static void writeListToFile(File FileWrite) { newLine = buildStorageLine(taskAtIndex); } else if (taskType.equals("E")) { newLine = buildStorageLine(taskAtIndex); + } else if (taskType.equals("W")) { + newLine = buildStorageLine(taskAtIndex); } fw.write(newLine + System.getProperty("line.separator")); } @@ -117,7 +119,7 @@ public static String buildStorageLine(Task targetTask) { } newLine = newLine + targetTask.getDescription(); - if (initial.equals("D") || initial.equals("E")) { + if (initial.equals("D") || initial.equals("E") || initial.equals("W")) { newLine = newLine + divider + targetTask.getAdditionalInfo(); } From 9129aec4ab154d3142bd1f8cbf335173d53d2d83 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 13 Nov 2021 23:42:18 +0800 Subject: [PATCH 188/193] Created isValidDoWithinLine method to check whether a DoWithin line from storage is valid. --- src/main/java/Duke/Checker/FileLineChecker.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/Duke/Checker/FileLineChecker.java b/src/main/java/Duke/Checker/FileLineChecker.java index 7a5d3923..5396e5e6 100644 --- a/src/main/java/Duke/Checker/FileLineChecker.java +++ b/src/main/java/Duke/Checker/FileLineChecker.java @@ -57,4 +57,16 @@ public static boolean isValidEventLine(String[] parts) { } return true; } + + public static boolean isValidDoWithinLine(String[] parts) { + if (parts.length != 6) { + return false; + } else if (parts[2].trim().equals("") || parts[3].trim().equals("") + || parts[4].trim().equals("")) { + return false; + } else if (!parts[1].trim().equals("1") && !parts[1].trim().equals("0")) { + return false; + } + return true; + } } From fd05d1328f3c216770202b9ceac8b830b5747ed1 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 13 Nov 2021 23:43:04 +0800 Subject: [PATCH 189/193] Created methods in FileLineParser to parse DoWithin lines and get the DoWithin object. --- src/main/java/Duke/Parser/FileLineParser.java | 42 +++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke/Parser/FileLineParser.java b/src/main/java/Duke/Parser/FileLineParser.java index f7307fd5..ce66a03d 100644 --- a/src/main/java/Duke/Parser/FileLineParser.java +++ b/src/main/java/Duke/Parser/FileLineParser.java @@ -4,10 +4,8 @@ import Duke.DukeLogic.DukeException; import Duke.DukeLogic.TaskList; -import Duke.Models.Deadline; -import Duke.Models.Event; -import Duke.Models.Task; -import Duke.Models.Todo; +import Duke.Models.*; + import java.time.LocalDate; import java.time.LocalTime; import java.time.format.DateTimeParseException; @@ -38,6 +36,11 @@ public static Task parseLineFromFile(String FileLine) throws DukeException { Event newEvent = getEventFromLine(parts); return newEvent; } + } else if (parts[0].trim().equals("W")) { + if (FileLineChecker.isValidDoWithinLine(parts)) { + DoWithin newDoWithin = getDoWithinFromLine(parts); + return newDoWithin; + } } else { System.out.println("Line is invalid"); } @@ -134,4 +137,35 @@ public static Event getEventFromLine(String[] parts) { newEvent.setPriority(parts[4]); return newEvent; } + + public static DoWithin getDoWithinFromLine(String[] parts) { + String[] startDateTime = parts[3].trim().split(" "); + String[] endDateTime = parts[4].trim().split(" "); + DoWithin newDoWithin; + LocalDate newStartDate = null, newEndDate = null; + LocalTime newStartTime = null, newEndTime = null; + try { + newStartDate = LocalDate.parse(startDateTime[0]); + newStartTime = LocalTime.parse(startDateTime[1]); + } catch (DateTimeParseException e) { + e.getMessage(); + } catch (ArrayIndexOutOfBoundsException e) { + e.getMessage(); + } + try { + newEndDate = LocalDate.parse(endDateTime[0]); + newEndTime = LocalTime.parse(endDateTime[1]); + } catch (DateTimeParseException e) { + e.getMessage(); + } catch (ArrayIndexOutOfBoundsException e) { + e.getMessage(); + } + newDoWithin = new DoWithin(parts[2].trim(), parts[3].trim(), parts[4].trim(), + newStartDate, newStartTime, newEndDate, newEndTime); + if (parts[1].trim().equals("1")) { + TaskList.markTask(newDoWithin); + } + newDoWithin.setPriority(parts[5]); + return newDoWithin; + } } From 5e315901da0261163b4dd2e6b474e967585f7698 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sat, 13 Nov 2021 23:59:44 +0800 Subject: [PATCH 190/193] Added comments for methods related to "DoWithin" objects. --- .../java/Duke/Checker/FileLineChecker.java | 12 ++++-- src/main/java/Duke/Checker/InputChecker.java | 16 ++++++- src/main/java/Duke/Models/DoWithin.java | 42 +++++++++++++++++++ src/main/java/Duke/Parser/FileLineParser.java | 8 ++++ src/main/java/Duke/Parser/InputParser.java | 16 ++++++- 5 files changed, 89 insertions(+), 5 deletions(-) diff --git a/src/main/java/Duke/Checker/FileLineChecker.java b/src/main/java/Duke/Checker/FileLineChecker.java index 5396e5e6..ca08c8af 100644 --- a/src/main/java/Duke/Checker/FileLineChecker.java +++ b/src/main/java/Duke/Checker/FileLineChecker.java @@ -9,7 +9,7 @@ public class FileLineChecker { /** * Takes a string array and checks whether - * it contains parts with information of a "to do" object. + * it contains parts with valid information of a "to do" object. * @param parts * @return boolean */ @@ -26,7 +26,7 @@ public static boolean isValidTodoLine(String[] parts) { /** * Takes a string array and checks whether - * it contains parts with information of a "deadline" object. + * it contains parts with valid information of a "deadline" object. * @param parts * @return boolean */ @@ -43,7 +43,7 @@ public static boolean isValidDeadlineLine(String[] parts) { /** * Takes a string array and checks whether - * it contains parts with information of a "event" object. + * it contains parts with valid information of an "event" object. * @param parts * @return boolean */ @@ -58,6 +58,12 @@ public static boolean isValidEventLine(String[] parts) { return true; } + /** + * Takes a string array and checks whether + * it contains parts with valid information of a "dowithin" object. + * @param parts + * @return + */ public static boolean isValidDoWithinLine(String[] parts) { if (parts.length != 6) { return false; diff --git a/src/main/java/Duke/Checker/InputChecker.java b/src/main/java/Duke/Checker/InputChecker.java index a58c6ccb..17e62554 100644 --- a/src/main/java/Duke/Checker/InputChecker.java +++ b/src/main/java/Duke/Checker/InputChecker.java @@ -49,7 +49,7 @@ public static boolean isValidDeadlineInput(String input) throws DukeException { } /** - * Checks whether input contains all that parts of a "event" object. + * Checks whether input contains all that parts of an "event" object. * Returns true if it contains all the respective parts. * @param input * @return boolean @@ -72,6 +72,13 @@ public static boolean isValidEventInput(String input) throws DukeException { } } + /** + * Checks whether input contains all that parts of a "dowithin" object. + * Returns true if it contains all the respective parts. + * @param input + * @return boolean + * @throws DukeException + */ public static boolean isValidDoWithinInput(String input) throws DukeException { if (input.contains("/start")) { String[] parts = input.substring(8).split("/start"); @@ -144,6 +151,13 @@ public static boolean isValidDeleteInput(String input) throws DukeException { } } + /** + * Checks whether input contains enough and correct information + * to find a task with a keyword. + * @param parts + * @return + * @throws DukeException + */ public static boolean isValidFindInput(String[] parts) throws DukeException { if (parts.length != 2) { throw new DukeException("☹ OOPS!!! The keyword to find is missing."); diff --git a/src/main/java/Duke/Models/DoWithin.java b/src/main/java/Duke/Models/DoWithin.java index 7f060ac3..8c288afc 100644 --- a/src/main/java/Duke/Models/DoWithin.java +++ b/src/main/java/Duke/Models/DoWithin.java @@ -12,12 +12,35 @@ public class DoWithin extends Task { protected LocalDate endDate; protected LocalTime endTime; + /** + * A constructor for dowithin object that takes in three strings + * one as the task description + * and the other two as the start date/time and end date/time + * of the "dowithin" task. + * @param newTask + * @param newStart + * @param newEnd + */ public DoWithin(String newTask, String newStart, String newEnd) { super(newTask); start = newStart; end = newEnd; } + /** + * A constructor for dowithin that takes in + * three strings, two localtime and two localdate objects + * newTask string representing the task description + * newStart, newStartDate and newStartTime representing the starting date/time of task + * newEnd, newEndDate and newEndTime representing the ending date/time of task + * @param newTask + * @param newStart + * @param newEnd + * @param newStartDate + * @param newStartTime + * @param newEndDate + * @param newEndTime + */ public DoWithin (String newTask, String newStart, String newEnd, LocalDate newStartDate, LocalTime newStartTime, LocalDate newEndDate, LocalTime newEndTime) { super(newTask.trim()); @@ -35,6 +58,11 @@ public DoWithin (String newTask, String newStart, String newEnd, LocalDate newSt } } + /** + * Get the start date and time + * and end date and time of the deadline. + * @return + */ public String getAdditionalInfo() { String info; if (startDate == null) { @@ -56,6 +84,11 @@ public String getAdditionalInfo() { return info; } + /** + * Gets a string with task type symbol + * and a cross symbol to indicate whether a task is complete. + * @return String with task type and completed symbol. + */ public String getCompletedSymbol() { if (Completed) { return "[W][X]"; @@ -64,6 +97,11 @@ public String getCompletedSymbol() { } } + /** + * Return string of start and end date time information. + * Date is given in a new format if "dowithin" has a LocalDate object. + * @return String with information on the event of the task. + */ public String getTaskInfo() { String info = super.getTaskInfo() + " (between: "; if (startDate == null) { @@ -88,6 +126,10 @@ public String getTaskInfo() { return info; } + /** + * Returns task type symbol. + * @return String with initials of the task type. + */ @Override public String getTaskType() { return "W"; diff --git a/src/main/java/Duke/Parser/FileLineParser.java b/src/main/java/Duke/Parser/FileLineParser.java index ce66a03d..503fa559 100644 --- a/src/main/java/Duke/Parser/FileLineParser.java +++ b/src/main/java/Duke/Parser/FileLineParser.java @@ -138,6 +138,14 @@ public static Event getEventFromLine(String[] parts) { return newEvent; } + /** + * Takes in the parsed parts of a line from the storage file, + * checks whether it have start date, start time, end date and end time + * and creates and returns + * a new "DoWithin" object using the correct constructor based on the checks. + * @param parts + * @return an DoWithin object created from information parsed from a file line. + */ public static DoWithin getDoWithinFromLine(String[] parts) { String[] startDateTime = parts[3].trim().split(" "); String[] endDateTime = parts[4].trim().split(" "); diff --git a/src/main/java/Duke/Parser/InputParser.java b/src/main/java/Duke/Parser/InputParser.java index 1ae2a64c..20a1ebf5 100644 --- a/src/main/java/Duke/Parser/InputParser.java +++ b/src/main/java/Duke/Parser/InputParser.java @@ -138,7 +138,7 @@ public static void parseEventInput(String input) { * parse the parts of the input * and returns a new Event object created using the relevant constructor. * @param input - * @return a Event object created from a valid input with event information. + * @return an Event object created from a valid input with event information. */ public static Event buildEvent(String input) { String[] parts = input.substring(5).split("/at"); @@ -163,6 +163,12 @@ public static Event buildEvent(String input) { return newEvent; } + /** + * If input contains valid information for a "dowithin" object, + * method creates the "dowithin" Object from the input + * and adds it to duke task list + * @param input + */ public static void parseDoWithinInput(String input) { try { if (InputChecker.isValidDoWithinInput(input)) { @@ -177,6 +183,14 @@ public static void parseDoWithinInput(String input) { } } + /** + * Takes in a valid input with information on + * a "dowithin" task that has to be done within a period of time, + * parse the parts of the input + * and returns a new DoWithin object created using the relevant constructor. + * @param input + * @return a DoWithin object created from a valid input with dowithin information. + */ public static DoWithin buildDoWithin(String input) { String[] parts = input.substring(8).split("/start"); String[] startEnd = parts[1].split("/end"); From 3c953ec35a91e07350d65a764b051f368dcaeea3 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 14 Nov 2021 01:15:14 +0800 Subject: [PATCH 191/193] Refactored some methods and edited comments of various methods. --- src/main/java/Duke/Duke.java | 7 +------ src/main/java/Duke/DukeLogic/TaskList.java | 4 ++++ src/main/java/Duke/DukeLogic/Ui.java | 12 ++++++++++++ src/main/java/Duke/Models/Deadline.java | 2 +- src/main/java/Duke/Models/DoWithin.java | 2 +- src/main/java/Duke/Models/Event.java | 2 +- src/main/java/Duke/Models/Todo.java | 4 ++++ src/main/java/Duke/Parser/InputParser.java | 5 +++++ 8 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/main/java/Duke/Duke.java b/src/main/java/Duke/Duke.java index d83e7f0e..310697cf 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -49,7 +49,7 @@ public static void useDuke() { String input = getInput(); System.out.println(Ui.LINE); if (input.equals("bye")) { - endDuke(); + Ui.endDuke(); break; } else { InputParser.parseInput(input); @@ -58,11 +58,6 @@ public static void useDuke() { } } - public static void endDuke() { - System.out.println("Bye. Hope to see you again soon!"); - System.out.println(Ui.LINE); - } - /** * Runs the main logic of Duke program. * @param args diff --git a/src/main/java/Duke/DukeLogic/TaskList.java b/src/main/java/Duke/DukeLogic/TaskList.java index 287509f9..ad163d7a 100644 --- a/src/main/java/Duke/DukeLogic/TaskList.java +++ b/src/main/java/Duke/DukeLogic/TaskList.java @@ -96,6 +96,10 @@ public static void deleteTaskAtIndex(String input) throws DukeException { } } + /** + * Prints tasks with description matching the input string. + * @param desc + */ public static void printTaskWithDesc(String desc) { int count = 0; for (int i = 0; i < TaskList.size(); i++) { diff --git a/src/main/java/Duke/DukeLogic/Ui.java b/src/main/java/Duke/DukeLogic/Ui.java index 8eedd9f5..5a4d7fba 100644 --- a/src/main/java/Duke/DukeLogic/Ui.java +++ b/src/main/java/Duke/DukeLogic/Ui.java @@ -46,10 +46,22 @@ public static void printTaskAdded(Task newTask) { + newTask.getTaskInfo()); } + /** + * Prints a request for user to choose priority leve + * of a newly added task. + */ public static void requestPriorityLevel() { System.out.println("What is the priority level of this task?" + "\n(enter 1 - LOW priority, 2 - MEDIUM priority, 3 - HIGH priority." + "\nOther inputs will assume task has NIL priority level.)"); System.out.println(LINE); } + + /** + * Prints the closing message of Duke. + */ + public static void endDuke() { + System.out.println("Bye. Hope to see you again soon!"); + System.out.println(LINE); + } } diff --git a/src/main/java/Duke/Models/Deadline.java b/src/main/java/Duke/Models/Deadline.java index 39844119..a15ca583 100644 --- a/src/main/java/Duke/Models/Deadline.java +++ b/src/main/java/Duke/Models/Deadline.java @@ -83,7 +83,7 @@ public String getCompletedSymbol() { } /** - * Return string of deadline information. + * Return string with information of the deadline. * Date is given in a new format if event has a LocalDate object. * @return String with information on the deadline of the task. */ diff --git a/src/main/java/Duke/Models/DoWithin.java b/src/main/java/Duke/Models/DoWithin.java index 8c288afc..c1a6ada8 100644 --- a/src/main/java/Duke/Models/DoWithin.java +++ b/src/main/java/Duke/Models/DoWithin.java @@ -98,7 +98,7 @@ public String getCompletedSymbol() { } /** - * Return string of start and end date time information. + * Return string with information of the "do within" task. * Date is given in a new format if "dowithin" has a LocalDate object. * @return String with information on the event of the task. */ diff --git a/src/main/java/Duke/Models/Event.java b/src/main/java/Duke/Models/Event.java index 7bac5cd8..d0493e66 100644 --- a/src/main/java/Duke/Models/Event.java +++ b/src/main/java/Duke/Models/Event.java @@ -83,7 +83,7 @@ public String getCompletedSymbol() { } /** - * Return string of date time information. + * Return string with information of the event. * Date is given in a new format if event has a LocalDate object. * @return String with information on the event of the task. */ diff --git a/src/main/java/Duke/Models/Todo.java b/src/main/java/Duke/Models/Todo.java index a67d1136..4b73a5d1 100644 --- a/src/main/java/Duke/Models/Todo.java +++ b/src/main/java/Duke/Models/Todo.java @@ -36,6 +36,10 @@ public String getTaskType() { return "T"; } + /** + * Return a string with information of the "to do" task + * @return + */ @Override public String getTaskInfo() { String info = super.getTaskInfo(); diff --git a/src/main/java/Duke/Parser/InputParser.java b/src/main/java/Duke/Parser/InputParser.java index 20a1ebf5..fa02d087 100644 --- a/src/main/java/Duke/Parser/InputParser.java +++ b/src/main/java/Duke/Parser/InputParser.java @@ -361,6 +361,11 @@ public static void parseDeleteInput(String input) { } } + /** + * If input contain a valid keyword to search for task, + * print tasks with the keyword in their descriptions. + * @param input + */ public static void parseFindInput(String input) { String[] parts = input.split(" "); try { From 9ef49b427886200b13c7d6455166ae70e9809ab7 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 14 Nov 2021 16:51:52 +0800 Subject: [PATCH 192/193] Added assertions --- src/main/java/Duke/Checker/FileLineChecker.java | 4 ++++ src/main/java/Duke/Checker/InputChecker.java | 7 +++++++ src/main/java/Duke/DukeLogic/Storage.java | 1 + src/main/java/Duke/DukeLogic/TaskList.java | 4 ++++ src/main/java/Duke/DukeLogic/Ui.java | 1 + src/main/java/Duke/Parser/FileLineParser.java | 4 ++++ src/main/java/Duke/Parser/InputParser.java | 14 ++++++++++++++ 7 files changed, 35 insertions(+) diff --git a/src/main/java/Duke/Checker/FileLineChecker.java b/src/main/java/Duke/Checker/FileLineChecker.java index ca08c8af..d887cf04 100644 --- a/src/main/java/Duke/Checker/FileLineChecker.java +++ b/src/main/java/Duke/Checker/FileLineChecker.java @@ -14,6 +14,7 @@ public class FileLineChecker { * @return boolean */ public static boolean isValidTodoLine(String[] parts) { + assert(parts[0].trim().equals("T")); if (parts.length != 4) { return false; } else if (parts[2].trim().equals("")) { @@ -31,6 +32,7 @@ public static boolean isValidTodoLine(String[] parts) { * @return boolean */ public static boolean isValidDeadlineLine(String[] parts) { + assert(parts[0].trim().equals("D")); if (parts.length != 5) { return false; } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { @@ -48,6 +50,7 @@ public static boolean isValidDeadlineLine(String[] parts) { * @return boolean */ public static boolean isValidEventLine(String[] parts) { + assert(parts[0].trim().equals("E")); if (parts.length != 5) { return false; } else if (parts[2].trim().equals("") || parts[3].trim().equals("")) { @@ -65,6 +68,7 @@ public static boolean isValidEventLine(String[] parts) { * @return */ public static boolean isValidDoWithinLine(String[] parts) { + assert(parts[0].trim().equals("W")); if (parts.length != 6) { return false; } else if (parts[2].trim().equals("") || parts[3].trim().equals("") diff --git a/src/main/java/Duke/Checker/InputChecker.java b/src/main/java/Duke/Checker/InputChecker.java index 17e62554..2bf08022 100644 --- a/src/main/java/Duke/Checker/InputChecker.java +++ b/src/main/java/Duke/Checker/InputChecker.java @@ -15,6 +15,7 @@ public class InputChecker { * @throws DukeException */ public static boolean isValidTodoInput(String input) throws DukeException { + assert(input.startsWith("todo ")); if (input.length() < 5) { throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); } else if (input.substring(4).trim().equals("")) { @@ -32,6 +33,7 @@ public static boolean isValidTodoInput(String input) throws DukeException { * @throws DukeException */ public static boolean isValidDeadlineInput(String input) throws DukeException { + assert(input.startsWith("deadline ")); if (input.contains("/by")) { String[] parts = input.substring(8).split("/by"); if (parts.length != 2) { @@ -56,6 +58,7 @@ public static boolean isValidDeadlineInput(String input) throws DukeException { * @throws DukeException */ public static boolean isValidEventInput(String input) throws DukeException { + assert(input.startsWith("event ")); if (input.contains("/at")) { String[] parts = input.substring(5).split("/at"); if (parts.length != 2) { @@ -80,6 +83,7 @@ public static boolean isValidEventInput(String input) throws DukeException { * @throws DukeException */ public static boolean isValidDoWithinInput(String input) throws DukeException { + assert(input.startsWith("dowithin ")); if (input.contains("/start")) { String[] parts = input.substring(8).split("/start"); String[] startEnd; @@ -117,6 +121,7 @@ public static boolean isValidDoWithinInput(String input) throws DukeException { * @throws DukeException */ public static boolean isValidDoneInput(String input) throws DukeException { + assert(input.startsWith("done ")); if (input.length() < 5) { throw new DukeException("☹ OOPS!!! The index of the task to be marked as done is missing."); } else { @@ -138,6 +143,7 @@ public static boolean isValidDoneInput(String input) throws DukeException { * @throws DukeException */ public static boolean isValidDeleteInput(String input) throws DukeException { + assert(input.startsWith("delete ")); if (input.length() < 7) { throw new DukeException("☹ OOPS!!! The index of the task to delete is missing."); } else { @@ -159,6 +165,7 @@ public static boolean isValidDeleteInput(String input) throws DukeException { * @throws DukeException */ public static boolean isValidFindInput(String[] parts) throws DukeException { + assert(parts[0].trim().equals("find")); if (parts.length != 2) { throw new DukeException("☹ OOPS!!! The keyword to find is missing."); } else { diff --git a/src/main/java/Duke/DukeLogic/Storage.java b/src/main/java/Duke/DukeLogic/Storage.java index b91d8818..839ac8ed 100644 --- a/src/main/java/Duke/DukeLogic/Storage.java +++ b/src/main/java/Duke/DukeLogic/Storage.java @@ -109,6 +109,7 @@ public static void writeListToFile(File FileWrite) { * @return a String with task information in storage line format. */ public static String buildStorageLine(Task targetTask) { + assert(targetTask != null); String divider = " | "; String initial = targetTask.getTaskType(); String newLine = initial + divider; diff --git a/src/main/java/Duke/DukeLogic/TaskList.java b/src/main/java/Duke/DukeLogic/TaskList.java index ad163d7a..bae15ed7 100644 --- a/src/main/java/Duke/DukeLogic/TaskList.java +++ b/src/main/java/Duke/DukeLogic/TaskList.java @@ -29,6 +29,7 @@ public static int size() { * @param newEntry */ public static void addTaskToList(Task newEntry) { + assert(newEntry != null); DukeList.add(newEntry); } @@ -37,6 +38,7 @@ public static void addTaskToList(Task newEntry) { * @param index */ public static void removeTask(int index) { + assert(index < DukeList.size()); DukeList.remove(index); } @@ -74,6 +76,7 @@ public static void markTaskAtIndex(String input) throws DukeException { * @param inputTask */ public static void markTask(Task inputTask) { + assert(inputTask != null); inputTask.markCompleted(); } @@ -101,6 +104,7 @@ public static void deleteTaskAtIndex(String input) throws DukeException { * @param desc */ public static void printTaskWithDesc(String desc) { + assert(desc.trim() != ""); int count = 0; for (int i = 0; i < TaskList.size(); i++) { Task currentTask = DukeList.get(i); diff --git a/src/main/java/Duke/DukeLogic/Ui.java b/src/main/java/Duke/DukeLogic/Ui.java index 5a4d7fba..cc2e7561 100644 --- a/src/main/java/Duke/DukeLogic/Ui.java +++ b/src/main/java/Duke/DukeLogic/Ui.java @@ -41,6 +41,7 @@ public static void printTaskCount() { * @param newTask */ public static void printTaskAdded(Task newTask) { + assert(newTask != null); System.out.println(LINE); System.out.println("Got it. I've added this task:\n" + newTask.getTaskInfo()); diff --git a/src/main/java/Duke/Parser/FileLineParser.java b/src/main/java/Duke/Parser/FileLineParser.java index 503fa559..f3f76772 100644 --- a/src/main/java/Duke/Parser/FileLineParser.java +++ b/src/main/java/Duke/Parser/FileLineParser.java @@ -54,6 +54,7 @@ public static Task parseLineFromFile(String FileLine) throws DukeException { * @return "To do" object created from information parsed from a file line. */ public static Todo getTodoFromLine(String[] parts) { + assert(parts[0].trim().equals("T")); Todo newTodo = new Todo(parts[2].trim()); if (parts[1].trim().equals("1")) { TaskList.markTask(newTodo); @@ -70,6 +71,7 @@ public static Todo getTodoFromLine(String[] parts) { * @return Deadline object created from information parsed from a file line. */ public static Deadline getDeadlineFromLine(String[] parts) { + assert(parts[0].trim().equals("D")); String[] datetime = parts[3].trim().split(" "); Deadline newDeadline; if (datetime.length > 2 ) { @@ -108,6 +110,7 @@ public static Deadline getDeadlineFromLine(String[] parts) { * @return an Event object created from information parsed from a file line. */ public static Event getEventFromLine(String[] parts) { + assert(parts[0].trim().equals("E")); String[] datetime = parts[3].trim().split(" "); Event newEvent; if (datetime.length > 2 ) { @@ -147,6 +150,7 @@ public static Event getEventFromLine(String[] parts) { * @return an DoWithin object created from information parsed from a file line. */ public static DoWithin getDoWithinFromLine(String[] parts) { + assert(parts[0].trim().equals("W")); String[] startDateTime = parts[3].trim().split(" "); String[] endDateTime = parts[4].trim().split(" "); DoWithin newDoWithin; diff --git a/src/main/java/Duke/Parser/InputParser.java b/src/main/java/Duke/Parser/InputParser.java index fa02d087..0040c451 100644 --- a/src/main/java/Duke/Parser/InputParser.java +++ b/src/main/java/Duke/Parser/InputParser.java @@ -49,6 +49,7 @@ public static void parseInput(String input) { * @param input */ public static void parseTodoInput(String input) { + assert(input.startsWith("todo ")); try { if (InputChecker.isValidTodoInput(input)) { String newTask = input.substring(4).trim(); @@ -70,6 +71,7 @@ public static void parseTodoInput(String input) { * @param input */ public static void parseDeadlineInput(String input) { + assert(input.startsWith("deadline ")); try { if (InputChecker.isValidDeadlineInput(input)) { Deadline newDeadline = buildDeadline(input); @@ -91,6 +93,7 @@ public static void parseDeadlineInput(String input) { * @return Deadline object created from a valid input with deadline information. */ public static Deadline buildDeadline(String input) { + assert(input.startsWith("deadline ")); String[] parts = input.substring(8).split("/by"); String[] datetime = parts[1].trim().split(" "); Deadline newDeadline; @@ -120,6 +123,7 @@ public static Deadline buildDeadline(String input) { * @param input */ public static void parseEventInput(String input) { + assert(input.startsWith("event ")); try { if (InputChecker.isValidEventInput(input)) { Event newEvent = buildEvent(input); @@ -141,6 +145,7 @@ public static void parseEventInput(String input) { * @return an Event object created from a valid input with event information. */ public static Event buildEvent(String input) { + assert(input.startsWith("event ")); String[] parts = input.substring(5).split("/at"); String[] datetime = parts[1].trim().split(" "); Event newEvent; @@ -170,6 +175,7 @@ public static Event buildEvent(String input) { * @param input */ public static void parseDoWithinInput(String input) { + assert(input.startsWith("dowithin ")); try { if (InputChecker.isValidDoWithinInput(input)) { DoWithin newDoWithin = buildDoWithin(input); @@ -192,6 +198,7 @@ public static void parseDoWithinInput(String input) { * @return a DoWithin object created from a valid input with dowithin information. */ public static DoWithin buildDoWithin(String input) { + assert(input.startsWith("dowithin ")); String[] parts = input.substring(8).split("/start"); String[] startEnd = parts[1].split("/end"); String[] startDateTime = startEnd[0].trim().split(" "); @@ -328,6 +335,10 @@ public static LocalDate buildTaskDate(String[] details) { public static void addPriorityToTask(Task newTask) { Ui.requestPriorityLevel(); String level = Duke.getInput(); + if (level.equals("HIGH") || level.equals("MEDIUM") + || level.equals("LOW") || level.equals("NIL")) { + level = "0"; + } newTask.setPriority(level); } @@ -337,6 +348,7 @@ public static void addPriorityToTask(Task newTask) { * @param input */ public static void parseDoneInput(String input) { + assert(input.startsWith("done ")); try { if (InputChecker.isValidDoneInput(input)) { TaskList.markTaskAtIndex(input); @@ -352,6 +364,7 @@ public static void parseDoneInput(String input) { * @param input */ public static void parseDeleteInput(String input) { + assert(input.startsWith("delete ")); try { if (InputChecker.isValidDeleteInput(input)) { TaskList.deleteTaskAtIndex(input); @@ -367,6 +380,7 @@ public static void parseDeleteInput(String input) { * @param input */ public static void parseFindInput(String input) { + assert(input.startsWith("find ")); String[] parts = input.split(" "); try { if (InputChecker.isValidFindInput(parts)) { From 25f8416728836b35dfcc1ff3e8509a0df6b47287 Mon Sep 17 00:00:00 2001 From: ksw95 Date: Sun, 14 Nov 2021 22:48:47 +0800 Subject: [PATCH 193/193] Edited Test methods to response correctly to the assertions. --- src/test/java/Duke/Checker/FileLineCheckerTest.java | 6 +++++- src/test/java/Duke/Checker/InputCheckerTest.java | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/test/java/Duke/Checker/FileLineCheckerTest.java b/src/test/java/Duke/Checker/FileLineCheckerTest.java index 61f8b734..2d68aa7f 100644 --- a/src/test/java/Duke/Checker/FileLineCheckerTest.java +++ b/src/test/java/Duke/Checker/FileLineCheckerTest.java @@ -1,15 +1,19 @@ package Duke.Checker; +import Duke.DukeLogic.DukeException; import org.junit.jupiter.api.Test; + +import static Duke.Checker.InputChecker.isValidTodoInput; import static org.junit.jupiter.api.Assertions.assertEquals; import static Duke.Checker.FileLineChecker.*; +import static org.junit.jupiter.api.Assertions.assertThrows; public class FileLineCheckerTest { @Test public void checkTodoLineTest() { assertEquals(true, isValidTodoLine(new String[]{"T", "1", "Homework", "MEDIUM"})); - assertEquals(false, isValidTodoLine(new String[]{"", "", ""})); + assertThrows(AssertionError.class, () -> isValidTodoLine(new String[]{"", "", ""})); } @Test diff --git a/src/test/java/Duke/Checker/InputCheckerTest.java b/src/test/java/Duke/Checker/InputCheckerTest.java index c87cefce..2535cf49 100644 --- a/src/test/java/Duke/Checker/InputCheckerTest.java +++ b/src/test/java/Duke/Checker/InputCheckerTest.java @@ -11,14 +11,14 @@ public class InputCheckerTest { @Test public void checkValidTodoTest() throws DukeException { assertEquals(true, isValidTodoInput("todo task 1")); - assertThrows(DukeException.class, () -> isValidTodoInput("tod")); + assertThrows(AssertionError.class, () -> isValidTodoInput("tod")); assertThrows(DukeException.class, () -> isValidTodoInput("todo ")); } @Test public void checkValidDeadlineTest() throws DukeException { assertEquals(true, isValidDeadlineInput("deadline homework /by today")); - assertThrows(DukeException.class, () -> isValidDeadlineInput("deadli")); + assertThrows(AssertionError.class, () -> isValidDeadlineInput("deadli")); assertThrows(DukeException.class, () -> isValidDeadlineInput("deadline return book /by")); assertThrows(DukeException.class, () -> isValidDeadlineInput("deadline /by tomorrow")); @@ -27,7 +27,7 @@ public void checkValidDeadlineTest() throws DukeException { @Test public void checkValidEventTest() throws DukeException { assertEquals(true, isValidEventInput("event assembly /at school")); - assertThrows(DukeException.class, () -> isValidEventInput("eve")); + assertThrows(AssertionError.class, () -> isValidEventInput("eve")); assertThrows(DukeException.class, () -> isValidEventInput("event birthday /at")); assertThrows(DukeException.class, () -> isValidEventInput("event /at home")); } @@ -36,7 +36,7 @@ public void checkValidEventTest() throws DukeException { public void checkValidFindTest() throws DukeException { assertEquals(true, isValidFindInput(new String[]{"find","task"})); assertThrows(DukeException.class, () -> isValidFindInput(new String[]{"find"})); - assertThrows(DukeException.class, () -> isValidFindInput(new String[]{})); + assertThrows(ArrayIndexOutOfBoundsException.class, () -> isValidFindInput(new String[]{})); } }