From 65f72a8d7407cfc1d4ded97e87a8cbbbe6d16d8b Mon Sep 17 00:00:00 2001 From: Jeffry Lum <22460123+j-lum@users.noreply.github.com> Date: Tue, 6 Aug 2019 15:24:53 +0800 Subject: [PATCH 01/55] Add support for Gradle workflow --- build.gradle | 16 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 55190 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 172 +++++++++++++++++++++++ gradlew.bat | 84 +++++++++++ settings.gradle | 1 + 6 files changed, 278 insertions(+) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..e5b8ce7e49 --- /dev/null +++ b/build.gradle @@ -0,0 +1,16 @@ +plugins { + id 'java' + id 'application' +} + +group 'seedu.duke' +version '0.1.0' + +repositories { + mavenCentral() +} + +application { + // Change this to your main class. + mainClassName = "seedu.duke.Duke" +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..87b738cbd051603d91cc39de6cb000dd98fe6b02 GIT binary patch literal 55190 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 z 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 \(.*\)$'` + 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"' + +# 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, switch paths to Windows format before running java +if $cygwin ; 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=$((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" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..6d57edc706 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@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 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" + +@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/settings.gradle b/settings.gradle new file mode 100644 index 0000000000..d1e92fe5db --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'duke' From 0112efe4f745ecd1985e5362f85e8ddc5facb02c Mon Sep 17 00:00:00 2001 From: Jeffry Lum <22460123+j-lum@users.noreply.github.com> Date: Mon, 12 Aug 2019 18:09:24 +0800 Subject: [PATCH 02/55] Add sample checkstyle configuration Add toolVersion block in to Gradle code sample to prevent errors. --- config/checkstyle/checkstyle.xml | 257 +++++++++++++++++++++++++++++++ tutorials/gradleTutorial.md | 7 +- 2 files changed, 263 insertions(+), 1 deletion(-) create mode 100644 config/checkstyle/checkstyle.xml diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 0000000000..b1a57ba6c0 --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tutorials/gradleTutorial.md b/tutorials/gradleTutorial.md index d16b72179a..fd6b043bf7 100644 --- a/tutorials/gradleTutorial.md +++ b/tutorials/gradleTutorial.md @@ -74,11 +74,16 @@ plugins { id 'application' id 'checkstyle' } + +checkstyle { + toolVersion = '8.23' +} + // ... ``` Checkstyle expects configuration files for checkstyle to be in `./config/checkstyle/` by convention. -For example, you can copy [these files from se-edu/addressbook-level3](https://github.com/se-edu/addressbook-level3/blob/master/config/checkstyle/) to your project. +A sample checkstyle rule configuration is provided in the branch. The plugin adds a few _tasks_ to your project. Run `gradlew checkstyleMain checkstyleTest` to verify that you have set up Checkstyle properly (the command will check your main code and test code against the style rules). From cfd6da79bab287c74d4b7f5666e61e686674fb29 Mon Sep 17 00:00:00 2001 From: Jeffry Lum <22460123+j-lum@users.noreply.github.com> Date: Sun, 18 Aug 2019 23:25:53 +0800 Subject: [PATCH 03/55] Change file mode on `gradle` to be executable --- gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From a3ca5a4e3fe35013f5690cacd168b19f7370a013 Mon Sep 17 00:00:00 2001 From: Jeffry Lum <22460123+j-lum@users.noreply.github.com> Date: Wed, 21 Aug 2019 00:32:40 +0800 Subject: [PATCH 04/55] Add configuration for console applications Gradle defaults to an empty stdin which results in runtime exceptions when attempting to read from `System.in`. Let's add some sensible defaults for students who may still need to work with the standard input stream. --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index e5b8ce7e49..ce97c7ba2e 100644 --- a/build.gradle +++ b/build.gradle @@ -14,3 +14,7 @@ application { // Change this to your main class. mainClassName = "seedu.duke.Duke" } + +run { + standardInput = System.in +} \ No newline at end of file From 4a8623d2dc2c77d30f4a0a75e4d94ead151aaf71 Mon Sep 17 00:00:00 2001 From: kerwin97 Date: Thu, 22 Aug 2019 17:32:04 +0800 Subject: [PATCH 05/55] level1 code --- src/main/java/Duke.java | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..774cbc9f1a 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,10 +1,41 @@ +import java.util.Scanner; + public class Duke { + static Scanner sc = new Scanner(System.in); + public static void main(String[] args) { - String logo = " ____ _ \n" + /*String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); + */ + printLine(); + System.out.println("Hello! I'm Duke"); + System.out.println("What can I do for you?"); + printLineS(); + + while (sc.hasNext()) { + String command = sc.nextLine(); + if (command.equals("bye")) { + printLine(); + System.out.println("Bye. Hope to see you again soon!"); + printLineS(); + break; + } else { + printLine(); + System.out.println(command); + printLineS(); + } + } + } + + public static void printLine() { + System.out.println("____________________________________________________________"); + } + + public static void printLineS() { + System.out.println("____________________________________________________________\n"); + } } From adf5e4d53f83a1482bada60c3589aa50959848ae Mon Sep 17 00:00:00 2001 From: kerwin97 Date: Thu, 22 Aug 2019 17:39:31 +0800 Subject: [PATCH 06/55] Level2 Code --- src/main/java/Duke.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 774cbc9f1a..483e8bcb49 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -14,6 +14,8 @@ public static void main(String[] args) { System.out.println("Hello! I'm Duke"); System.out.println("What can I do for you?"); printLineS(); + String[] cmd = new String[100]; + int count = 0; while (sc.hasNext()) { String command = sc.nextLine(); @@ -22,10 +24,19 @@ public static void main(String[] args) { System.out.println("Bye. Hope to see you again soon!"); printLineS(); break; + } else if (command.equals("list")) { + printLine(); + for (int i = 0; i < count; i ++) { + int num = i + 1; + System.out.println(num + ". " + cmd[i]); + } + printLineS(); } else { + cmd[count] = command; printLine(); - System.out.println(command); + System.out.println("added: " + command); printLineS(); + count++; } } } From 41cb22d10418f775e7fe65bb16b0d8df07629fd6 Mon Sep 17 00:00:00 2001 From: kerwin97 Date: Thu, 22 Aug 2019 19:55:42 +0800 Subject: [PATCH 07/55] Level3 code --- src/main/java/Duke.class | Bin 0 -> 2357 bytes src/main/java/Duke.java | 24 ++++++++++++++++++------ src/main/java/Task.class | Bin 0 -> 1141 bytes src/main/java/Task.java | 27 +++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 src/main/java/Duke.class create mode 100644 src/main/java/Task.class create mode 100644 src/main/java/Task.java diff --git a/src/main/java/Duke.class b/src/main/java/Duke.class new file mode 100644 index 0000000000000000000000000000000000000000..32e50602aff8776188df87959d62a3c7928677c3 GIT binary patch literal 2357 zcmbtV+iw(A9R6l^+nHSkTDIMCD`g4=y3}o@N|D`Gqy_A1Dd1L+i1kegS~ zHgUn6HwS8-RT{|UP1_dLjDqH2%eK7d6@+_}Clo}+oPto$GGWqw!8&QFNp2d&wvRD&nyTX1<s8Il5#h}_ z1-GRc=QYggn1iL`0*YiSI5yoc=_te2;YcsHPg;2)gPRvd*{l{tfi^7HH)5DBVJH?dh0;wJRD+hYL?SS!1ZOQp}1E^4sR<%mtBWF4Z#= zvM}tzWs5;iJt|soJyB-CoEo(fK?7ROz%kie#0#@bjyB)Gqhi|dyRO96P4qVITy@TL zC&eW)a|@hiYufw?TDHA6xl)IFMqI3!CHFDPAgWCAbPV%&lW{BkhN56y*({1N$IhGH zNz0q#%=Jv$qxPoWY!H7#BT=_D!zSYXlDjUOZ3qf7?HadwBZ^ZC7102`{2+Xgwv`lPW~r33JdsiH9=G_4_!{}9pzHr} z=;ozi@M2(CdeiXZ&Rs>xJbU&QLGXs@fS3EBxr2Ewm3&t0__#OgC?!G*P$EK?YJv(K?@FTVLlLXs1#)u|5}IQn#_ex5V`;AsQQ$ zSqVXA~a*ort3g?aWmI{gmv*I;624qog{7jTpx!94Bgu={`%O zU{Q)J%Vo|#U{O9~IX+@JJ|+L>WciXgzkwv<-G#fn(7)y7_8l*%AIbg`2JkbU#;@3o z-!O>Zu?K(feoxZBE@*$FOT{kbK9VZ>?xRDwhpkP2VeB5Zgjh{pl0h|TEkq3%$0oB+(GB5>)3n~T{jS2G8Ob$gs1_c cLX7Kejxicsz&m)0`5TkkTscVDA^&^yKP+-R_5c6? literal 0 HcmV?d00001 diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 483e8bcb49..8d557be060 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -14,7 +14,7 @@ public static void main(String[] args) { System.out.println("Hello! I'm Duke"); System.out.println("What can I do for you?"); printLineS(); - String[] cmd = new String[100]; + Task[] cmd = new Task[100]; int count = 0; while (sc.hasNext()) { @@ -26,17 +26,29 @@ public static void main(String[] args) { break; } else if (command.equals("list")) { printLine(); + System.out.println("Here are the tasks in your list:"); for (int i = 0; i < count; i ++) { int num = i + 1; System.out.println(num + ". " + cmd[i]); } printLineS(); } else { - cmd[count] = command; - printLine(); - System.out.println("added: " + command); - printLineS(); - count++; + if (command.substring(0, 4).equals("done")) { + String num = command.substring(5, 6); + int res = Integer.parseInt(num); + Task t = cmd[res - 1]; + t.markAsDone(); + printLine(); + System.out.println("Nice! I've marked this task as done: "); + System.out.println(t); + printLineS(); + } else { + cmd[count] = new Task(command); + printLine(); + System.out.println("added: " + command); + printLineS(); + count++; + } } } } diff --git a/src/main/java/Task.class b/src/main/java/Task.class new file mode 100644 index 0000000000000000000000000000000000000000..91128ecaea057291c9f05b40f5c81b0b5c9c556e GIT binary patch literal 1141 zcmaJgw9(F$NoOABEckiEn7rz0lVa-MccQddsp_fSu_bg1= zbezr;V9vw?6Au{%sv`12zoC2?FyzaJ{FpD-d9c4+QK28~7a7uiv>^k*z&_IDr62g} z6~joO7d!u+Az6}D!e+~UAl^2Q_C&bD_v#cG+!v~%xN1gQp3XH~nD12}7-78HHgB|O zCJHfgLv&o)M?9>pw@oDqI;*8*?3cl=$Y$t?OFNJ17i+s3^;Hw$dLH^ z^>b@Ib&$spL+-VdDpDbDYzuWDt5G(Mc?+(C1uRlwT8dDe4!zqu6rQ>gicQ#fge8X5 zF8ega7)FnHO_XHdarMDh2Xu-Q4^+hPqE8cho6@IGCYH6W6^7Z4A3r#jHPQZYalTFN zDH)!act*djEM=|PU~smAK!l|_k0L=PPP~+=^xkB7IX^1}X z-7b9Gykd84ZHW@E*DJmfMH9~%=6dSu=Z#_VdK{){^fNU129kOR=# Date: Thu, 22 Aug 2019 23:30:55 +0800 Subject: [PATCH 08/55] Level4 Code --- src/main/java/Deadline.class | Bin 0 -> 890 bytes src/main/java/Deadline.java | 14 +++++++ src/main/java/Duke.class | Bin 2357 -> 3641 bytes src/main/java/Duke.java | 69 +++++++++++++++++++++++++++++++++++ src/main/java/Event.class | Bin 0 -> 884 bytes src/main/java/Event.java | 14 +++++++ src/main/java/Todo.class | Bin 0 -> 735 bytes src/main/java/Todo.java | 11 ++++++ 8 files changed, 108 insertions(+) create mode 100644 src/main/java/Deadline.class create mode 100644 src/main/java/Deadline.java create mode 100644 src/main/java/Event.class create mode 100644 src/main/java/Event.java create mode 100644 src/main/java/Todo.class create mode 100644 src/main/java/Todo.java diff --git a/src/main/java/Deadline.class b/src/main/java/Deadline.class new file mode 100644 index 0000000000000000000000000000000000000000..38672353a02e3de004a93b81123d5844d8f1bc22 GIT binary patch literal 890 zcmaJ<%Wl&^6g@YkcH+8C2rZ>NN`SOY97LBOf>@BM0x7^E5iBYe<7Cvjac3fXQYnAJ zXMhB%)CC{FMvHA3Z;)+RQQ7{8U~ zL=WS#g?mM8ySR@U=ldhTp86sl5jJv)NGw;bDu3^v%7Jn401pZ7(ZMIGHT>!G8Z`-< zXJRBfS`CEx7?=~@#YQL-6Q1P=XA8`!*~X*9?H-|inX9Fb+!=shuEKvWe)sk0iQltd$G2; zL`Q^SFEFxg!z1iu>dW&+*#19`KW3Rb8Q@P%x`B5E-k0F;yuzmzpO<)D@md!k@9}pO zzRut-&ugO2Ko7qCOBq;-B2@JKJ~ubMNW3 zK1xq~bz|TnfKt5gL;)(Cn1RX^EW{#-#ZD~2Qi){>TyA1T3a=}j@L`pj9+Y^n<;H_If@C|nm|jF3x#;V zg)Thq!V@@1aMZVlTzC>s*=J~L=F<|-xbQ3vxo{ZIu}v@*WmiXBIEv?8uu*ImiRp<> zyuh+}EEpq@*M(zvQQ{?K__B(_xC=!%K$x&N7WanZc}%M<#nTucI zxUzYLpoiK*(KvyBpCdoO8-1Yyl$R3(84Lx2k#IDmr1kA&K~@eU60a&3uh~&?OrFH+ z%Hj?C9>**(W}`hr8*5iOK6bo`Q?^6pMGkV4LKwBU`5{NeBSI2jS zqYd^a+D_vwMXSdy)u++Bc0ljd-Xmn&9eTE1ZcI*_!FN(6D^)por}Lg`%5#a`VT{Wt zWz66c_*SG~CT1xKs~L=@0OFe6Yh(-Yx&56nNr+SSkTF+?TD#0#kPvA;huH_qx~~r- zjw9l;Jbg&@YaUH2^y?n&qSlQ}y~J=Eyg!BU9>&~8;Q-PAzusj~&&{j3=@*b*2<> zGUQecXck(TNxcGf(CP~PhTGKZN~Bv3(_(sVIZVswl8ROjrh3@dX^cpE@asJoouqI6 zP2Wtg;t9n+i}`zueoVgG3~2ybF*u zzJ5#_Hu4Q%`t2fd*?NZjXZcnMZj7K#)Y)gveTmD+!%xV^HSUAI^35DXAxRX_NR(14 zX3_-AqHOpn53{KNbEphuG!JvB3guLTd9)exDS!nOK?Sv=lKn2EBUnTydF{p$>cKMl z0L$q-R??TO_cf~MGFH>~sHUH>CPBYoE&YadG=%knTdlBABT}(JOvFZ!iA}Oo?i660BTtQ-wxQe~-^MC0=+7Kq1oac2+Gco5n#?c@@mp@T)1KB3Z7-Jyq z4;0;m7cz;=CPr_`lo+^PM=6a3)0^+(i;>!cG28CimaLq?1j$c+5+hgt)U{3U?ayjl2L~%{k=tBmYCB t{1fX|H_}*ZK5Gdqz-eBc9I+ek;B9!Ymd~lsu#U0y$$4vXZcNU*{sN#Ge|G=? delta 801 zcmZvZ*-KSX6vlt&-0MC2oDLZVQaN4qs;N1anU-2=rOl;fW@*>i9Bw&gW%kf>5Sw25 z2ZCNA!!(VE9-Cf+=s6Gq^VMuvN23TjaQ51Jt?ygk8lJ^Z$4tKdG4}!}=9WW{0*53D zZML&RQRJ|bV#O}cSz=LYi{0%I&mQk6Q}0a@j`6;+#tp=MAE3 zI{Nw|$-&x;{$TY;Z->PNmu6ZFVjH@{!@;)jK(IF09tn0v27}{~kqVa_LI(c&@KCQy zGAS+>3A?n?X5ecb?{I0SLoXR^DV>Tgmu`AoF3~HT_Q-$;^ttpi;1VIEN6oAa&0Ka# zrA2YYLl5c#-#s67N^trP55^=sPOO z=j~-Wm2NPQMHWJV0$}Tt5Pa8 zg#or`$7~T@PtI7Cb5=to(s-#*WKF**lmBqy{=+E~PKErre>mwf9Pe8{PkiGP2{R-< n!TzhYHbB3i@&si{W7owxqBzb3*JLJD9$O;S*arK>7##lvB%6bo diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 8d557be060..0fd6401343 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -42,6 +42,75 @@ public static void main(String[] args) { System.out.println("Nice! I've marked this task as done: "); System.out.println(t); printLineS(); + } else if (command.substring(0, 4).equals("todo")) { + String[] td = command.split(" "); + String com = td[1]; + if (td.length > 1) { + for (int i = 2; i < td.length; i ++) { + com = com + " " + td[i]; + } + } else { + + } + cmd[count] = new Todo(com); + printLine(); + System.out.println("Got it. I've added this task:"); + System.out.println(cmd[count]); + count++; + System.out.println("Now you have " + count + " tasks in the list."); + printLineS(); + } else if (command.substring(0, 5).equals("event")) { + String[] eve = command.split(" "); + String com = ""; + String eventdate = ""; + for (int i = 1; i < eve.length; i ++) { + if (eve[i].equals("/at")) { + eventdate = eve[i+1]; + for (int j = i+2; j < eve.length; j ++) { + eventdate = eventdate + " " + eve[j]; + } + break; + } else { + if (com == "") { + com = eve[i]; + } else { + com = com + " " + eve[i]; + } + } + } + cmd[count] = new Event(com, eventdate); + printLine(); + System.out.println("Got it. I've added this task:"); + System.out.println(cmd[count]); + count++; + System.out.println("Now you have " + count + " tasks in the list."); + printLineS(); + } else if (command.substring(0, 8).equals("deadline")) { + String[] eve = command.split(" "); + String com = ""; + String deadline = ""; + for (int i = 1; i < eve.length; i ++) { + if (eve[i].equals("/by")) { + deadline = eve[i+1]; + for (int j = i+2; j < eve.length; j ++) { + deadline = deadline + " " + eve[j]; + } + break; + } else { + if (com == "") { + com = eve[i]; + } else { + com = com + " " + eve[i]; + } + } + } + cmd[count] = new Deadline(com, deadline); + printLine(); + System.out.println("Got it. I've added this task:"); + System.out.println(cmd[count]); + count++; + System.out.println("Now you have " + count + " tasks in the list."); + printLineS(); } else { cmd[count] = new Task(command); printLine(); diff --git a/src/main/java/Event.class b/src/main/java/Event.class new file mode 100644 index 0000000000000000000000000000000000000000..5dc88b18142001a0a5d5f96ea4fe1bb78da951c2 GIT binary patch literal 884 zcmaJ<%Wl&^6g}4^cH){QgqBhsB|zFH4x&pCK`e+`ffQho2o@EKNiu5PxHFMGiPS&g zGe81W>Vgm8qY&3|M1yRxn8&?y&bjB#%&*^L%Y}^_B@|F~aTDuR&fa#g<=_s% z5{6Lio{E{+4~073@0lo2$8CcBGEjkeMc8X(kF%NPN5Zv^9!WyE8z}jHdNzC_1?3;X2j`mDgIE*hFITPMQ-v zipw_c7qRW(0cwQ8oXu|fA|4Yqa_lE&D_1>#7@W$Xaq$q32;R}bXR0-Xc~PS#Ve?Fk zWk;)_FrNZ*!n@cAWn#kf9N}zhIo&#VoLJo>)UP}QYNp3>as6q%LoqZuI(NV}?5@`1 z>4fdQRZ2#kP{grh6JM51EHu(vc_Y*)lyN;JwzJNbGXD_!=M$L&KU%`47uH_xZ6VPS zVb}|dY&-A?JDL9Syb-qlkK>0a@E->FQIoI0JB#-vxIC|N)Z%!B*HyoD0rH>xfc0$- z_jq2LAK5J7Frmm4{zVJo?p%m5{smV2@31bp0>1v`+KdA{Rw(mop@Lmrld^R*u!AjZ LaGYq~;<5P$5eMMv literal 0 HcmV?d00001 diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 0000000000..49d2f3ec54 --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,14 @@ +public class Event extends Task { + + protected String at; + + public Event (String description, String at) { + super(description); + this.at = at; + } + + @Override + public String toString() { + return "[E]" + super.toString() + " (at: " + at + ")"; + } +} \ No newline at end of file diff --git a/src/main/java/Todo.class b/src/main/java/Todo.class new file mode 100644 index 0000000000000000000000000000000000000000..102cf150147b7183027b78a48f8c075ad3b101fe GIT binary patch literal 735 zcmaJ<%TB^T6g?NU#ahMp`-y0LB)W8gaUqG(1a$$?g>f;!L<(hww1bI%;%DfJgoPjA zM;UK{CG0nh?jaeIW1nbmOo;f4T?PV+CSseR9 zJssyv;Hjtd{vBaBqf3&I$a+fNG-?GIN)X!gPNbJ;)zn{-rJl&>wpEw}px Date: Thu, 22 Aug 2019 23:47:16 +0800 Subject: [PATCH 09/55] Level5 code and fixed some bugs from level4 --- src/main/java/Deadline.class | Bin 890 -> 868 bytes src/main/java/Duke.class | Bin 3641 -> 3806 bytes src/main/java/Duke.java | 56 +++++++++++++++++------------- src/main/java/DukeException.class | Bin 0 -> 361 bytes src/main/java/DukeException.java | 13 +++++++ src/main/java/Event.class | Bin 884 -> 862 bytes 6 files changed, 45 insertions(+), 24 deletions(-) create mode 100644 src/main/java/DukeException.class create mode 100644 src/main/java/DukeException.java diff --git a/src/main/java/Deadline.class b/src/main/java/Deadline.class index 38672353a02e3de004a93b81123d5844d8f1bc22..d88e61b963aa5915720358c28be7fbfe12dda095 100644 GIT binary patch delta 160 zcmeyx_JmF4)W2Q(7#JAL88o>V*cb#k8CV&FKrCS)pr|-Ig9JN+PM1+8%66_3;>Tg4tJ-K*j;IX>>gJ`DMwLRS%$h%ps$1wzGs zA1W{$07F8-0UwrNSjA`n94Qrs3R6W|!9gEZAfv)kVJpb`uu?vasW_zKu!5W<`-J54 z6$M8W9A)5EjA35i0ewtw&f1A&^FT~D43TMP@N^`MguRxbq^^DkgR9Go3x=}3gdzH~ zsi?>d>d_=gTq!+aFf6FslZQ#_#&Gk1okK5t25*{l zY>CIO z^qDkvD(?YXN%@RWH*7RX=TeD2ls3weL!m>%TS7d~y(`Ap)MYxtm zN~E6Aq(+#be7$MfmYvbln}t1M#;r0BzMHBGn3K|_QI=JszLQD6HZ&ss23%w-^%!9TMemNwZE9cefNs(C<^s<3f*9)G5p* z&CwhQHrx`l&!j8EYnho$Zj~0z+D=4`T3Z`6%tP8C8E0GGQbIQ@E!(cEX(izIgP*ylfPUUQg9uP4)9c53SOiU`o8H@R{qKYk2Yqu-r zEL)`LEX^!o1@o1eFq^l^k|PwMrwDnTWA=72S$1kMNqG{iD_+vdh;H?Z!-Pz|VK>Ff zpoe@R&#$YWy@#5KIGELw)*X;}U)$?<`*0RNqSIha8e>?P(nm#?X~cAUXTlz#nPuyS zO}i`VBKcD(YQ$}&lL;bKTa0$m6Z2ZxC>0~MD%rpyk)p8q2s*)u7`7M|8S*%-XDmUF zcX*T!PFjhCEh@05Jes*szeB+}S^Ga`sF}|1gfV80ioy#b zALJfAW}BIug10D9`b={)n`ZDwgZYJRbMopF{N2VtnX?iutd!GANvkX9syquV z=yDCUO8lU^A?Rwkh`9i*kGt5!jlYt)37&2Y1ST;r>a^e#VyF#k@77Ifp3o68LF%b5QD@5?`4V9O$WLL;D1#O^UwK{LLp|XX{j&nu~ zDlcNG<%mjpuS!Q&kRu^w3bl9b z%AXweb$7|W{{PB;Wr2OeU9(^4#C(;EdDux5w+zYk`giE#_zK(39z_NJn18}Qp)Y6- zDi`(=;#4%HD8U@ugEGuRITldHRw6)IF(0)EqKPDJSV#r62_V<1%!xW~^Z?Sj)obWLrvyFz;Zz%F(b zyV-T@;co2ZbMP3Si^q8t_HhkEycs%gLzK58#yb(`n;`g3?B_!m<_1Ri5gL!-06&f- zKZO*31tvd7dT+tv7hv;C$nxJ}jDLVb{6ie(e?g9ageUmNI6~1l%0I=E{GT|+Kf^QV zposhoORi(FLSA1(y@IvZuz>h2bzeh7LFYBp(EU2fXobWTH|W$nB$4_ga%P>NX~k7| z`3;JR_s&&EjsDT#8kR{2US4_??$6NrziAVjiqFXg^;`M}lJB<^c1|t;Ug`>gM(Q5Z z?b+unouHonEN!7b9mTdZ71?r`$S)>fOY delta 1950 zcmbu9S!`5Q7{`C-%*?%~(_wL7z@Y_(Ld#NyWrPAlq3p5G}w3A-!AZr%vtGThy+2lU;>n3-K0v3~zge z?|9J#4>64GZf9SCwbz5+bxVDDzG3Wh7y9yZ4exp2`-)QcoG;=2;0wBc_~x7a9PsQ8 z9xwOjD&Gejaw`Ml-HU;(?!iF9ontkHOm!-iP9OW zUwz^(vrqUxRTR38UFeQ8ee#CLbwS!_yfcwiK-O~HGM2cG>C$V2V3zEVhUGAlQJzH9 zEJ1TXUw4~Lk^0KLY+~w=d&`tLm2sclOgP-BnRa^_6*nC%*(Uu_|0z0`1d1a8e=3o* zqJl&vY4X5H1{y8Zbo*Ly{u%NsqJfiipVJnnM{Ato{DcH*)JkIJpQa}W?!{Gy<38i% z9?Ql(aVKuLS27^KykT6y9eEMfaBQ zzbbG*I&imyzHKG+yYCWudzG7t_(}S=*~CvX;7*UEYfU$kU&wvb!gi=_RLQ!X+|Kso z(t%FykGV6PJrr_)B8~{*9Hk$}=`TGVz*&kp&p^HruDQe@er7P&g${p{SI|O28HTF% zj8NSesk$>t6_Qkg7_EjU!zjbp4Tr%Y8aPAy@)s%CWNh9a;kKt%xRYCRit!=v~FOf-XVHBS*`a`qxZ8$AE8!%j+2pRwN{^Hoj%8U z{WTl(_tfc&)axs3)IYIFUuCnt#uk!tdX41Wq=zka-k`rt=?%K57I|QQGw~LMHe&=6 zAnz}R-6n>~BBPa{tujvxH|Xst>5lDM90Gq*a+_ZFp_^50p{Eu)5sGi67ipgyiF`R8 zJrv9H^g6D*juXs^o)yM(#AUK7U`9{3+N+r*|({&9D0isasSU;8t}D~>VfB!iEW u^KYzH=JSizc+t{KkQ?P?pg7FOd_ 1) { - for (int i = 2; i < td.length; i ++) { - com = com + " " + td[i]; - } - } else { - - } - cmd[count] = new Todo(com); - printLine(); - System.out.println("Got it. I've added this task:"); - System.out.println(cmd[count]); - count++; - System.out.println("Now you have " + count + " tasks in the list."); - printLineS(); - } else if (command.substring(0, 5).equals("event")) { + try { + if (td.length == 1) { + throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); + } + String com = td[1]; + if (td.length > 1) { + for (int i = 2; i < td.length; i ++) { + com = com + " " + td[i]; + } + } else { + + } + cmd[count] = new Todo(com); + printLine(); + System.out.println("Got it. I've added this task:"); + System.out.println(cmd[count]); + count++; + System.out.println("Now you have " + count + " tasks in the list."); + printLineS(); + } catch (DukeException e){ + System.out.println(e); + } + } else if (ls[0].equals("event")) { String[] eve = command.split(" "); String com = ""; String eventdate = ""; @@ -85,7 +93,7 @@ public static void main(String[] args) { count++; System.out.println("Now you have " + count + " tasks in the list."); printLineS(); - } else if (command.substring(0, 8).equals("deadline")) { + } else if (ls[0].equals("deadline")) { String[] eve = command.split(" "); String com = ""; String deadline = ""; @@ -112,11 +120,11 @@ public static void main(String[] args) { System.out.println("Now you have " + count + " tasks in the list."); printLineS(); } else { - cmd[count] = new Task(command); - printLine(); - System.out.println("added: " + command); - printLineS(); - count++; + try { + throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); + } catch (DukeException e) { + System.out.println(e); + } } } } diff --git a/src/main/java/DukeException.class b/src/main/java/DukeException.class new file mode 100644 index 0000000000000000000000000000000000000000..3ee8fa08475d0c51775f54510fc2ba6a347a66fc GIT binary patch literal 361 zcmZXPK~KU!5QX2=+Cp1Eiyl3AgEo<)2aOlh6Y+xazTl==g{>*A@n>nGG4bFJ;71u> z(O?XReY5jszRAq;>*Eu^F}eXJd;GNaQd^Pee#yx^cq=ocw&*!%e*+V*cb#k8CV&FKrCS)pr|-Ig9JN+PM1+8%66_3;> Date: Fri, 23 Aug 2019 00:00:18 +0800 Subject: [PATCH 10/55] Level6 code --- src/main/java/Duke.class | Bin 3806 -> 4037 bytes src/main/java/Duke.java | 16 ++++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/main/java/Duke.class b/src/main/java/Duke.class index 0ee02bb3c3ef26342dd69968442f662584a9c09b..4cc5b9a0abc4bda6970e8f796a3a2828c1781f10 100644 GIT binary patch delta 1330 zcmb7DT~t(66#mXVGxwaibIF=yT(d^uqM!mrNrXTmh^9=5q-cUx2Fyi>pD`FHQXCCT zAT{xrrdgT&O#i8@kR>har5Af@`J9hE)l)CY8l-)owOXs?OJ}XS&)(lT-*@-fXP?_k ze#%VTynFoyfYrEc;c;xTP=sn9B6v#TX$zZCBe6w;wF1xhXx?gJ6}D+pC$Zf^C3Z+W zE3s3eK0rdxNj$I77bN!R`9%wjXtE&DED_a;u0)H#UWrx<;d-un86^Rm*+NeUQz!4j7;3&g_YPX{!mgPiNbUGV)+g*WS8zUHH2<~icj62PZT~5S_ z#+;T|x6>c%t+25kr3{|!jXmu)im}?pn>c3UI8HF|rheDPTR6$!RQ0%?PD zkLwa!`HhvX%Fu|7BI#9P~X zoH(Ujruz6T`4K+0QG!p#w|e}He~RSz9`7w?ex_x=QY9jneWRMhcb;zc`y2!tA2@eu9zo~A>WXajzhm2X` zExwMW0BKA@B(Z1;;f6rLH7xm|Osj^ny(F1TOnZlZhq zXa4|8{DJ+(pEzJlW5AffLGDF@KY&Ag5f1ZA4Dvh-@gkbbaFmy0m`5Kq27Lcro!eGPcb393tzq1sHVyAzDE@!DXHZT`2}+ZbO7IRAQi9<- z^jGQxdUNxgfE+5A9zK0*k5I+0P{4EzsX_G88EUSxM4@MPFUq6$pqwYl1^PCiwCNwt za%w<5?wi7@hN~#NhR4R?`}be-P3oatPtq;}8}TL07O_9a*Z2Yf zK#Cv=?RZzbE1)I~oLGzyee%UOqsBKAUU(rsnm|1j*R+Yo%TD&1wf?pKHS03pR{Sz+ z@Vh_0`WndbdBim=j%eVvklR^eX^yyqrItHAc$eYsP|kZI>bcj8WtNtRMwVMvSXNr@ z%SfUJEDw70AtX<=;!#d^cz5f!YpbY{?Ouyk8` zEWL&&B5HWjveB~1&=*nXt<9FFEL#j)eYH>ff}SyKGxQJt+-C+1gNA3_a@ACqB^PrO zIm7mt9qd%hSd#DR>X}{HJZD4YqQ1_&;klSy47rmksk)h*BDJDzV`t2@%#Yd4^D%qa zs|eb+=3`!9pZi^{nfs#UrI`I3P^ik7VMc`4(bFvsw-*OiQwN-C>^`Ii1-<q>yn0^=+c07keNk%R6p$Q0@)~-`jV2&jarl zwx>!}@Btqd_NRYPB_H`5huu0;t3Guj=8M#4ifT7%s$H+GN*ZLdKCSf)iIx^!rXun> zH)?0jzFx2ru^=F10XKM$gtZGAfj;L>+iI$C>rbg7h(hvh)~bhbC%|%7#y?m1-45Zz!uq&h4W43~!2SAH2J~<2&}Z4njZ)w!6%&*j7OEn(hQ=Z@)i{@?i!>XW zid2c5V1{@EPR>iiC4%^PfhM&kL`}vC^?Aw(|LvU&Yjg*vUo!Yl+LS|vROB+BTVF73 zob*|;a&dA_(#h!Ll}(L~YH7%Sp|qX3a*Xs*F_iC7ChA>7vW?wBk>~b*lzC$e{D-qw zIQ!(k Date: Fri, 23 Aug 2019 00:15:27 +0800 Subject: [PATCH 11/55] fixed bugs for LEvel6 --- src/main/java/Duke.class | Bin 4037 -> 4171 bytes src/main/java/Duke.java | 30 +++++++++++++----------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/main/java/Duke.class b/src/main/java/Duke.class index 4cc5b9a0abc4bda6970e8f796a3a2828c1781f10..4cac3ba2bb0c6e7eb81da61e80257d1746be787b 100644 GIT binary patch literal 4171 zcmcInYitzP75?tbu4i^wW3#ZB4H(9}Y-6y4lNeYN9ySA@yh_#;inpE(X1hi79U#Crs5F|kD^^ghnRd!!A=b- zniX{V=>1C?>2!(P<0^J(Xuxh2dsIB3qFc!A6*nV5&|JknvEHkqPdwuq_M=~ehJ=a% zVZ&5mDHv37K*JIw17L6zq%cLaf~Pf9;E0N6R6MKTISp0f z?Wl_9g~qUoV=7)y@nr=sif~>Mp1!Q$D+*p=knAYK+@}4;kWrO#;)$yEs9~BsS<8^O zF>c14O$>5b`A!B;y%pmO1x<02x1Ovyy$Jg-~;Ni4;_^9KDC@d|=Q?SBhPEOT~x6*N;RBNyv{Mh-?+_ zAi=m(neoer#iqLzR`EljbDqJ=hqy`UC*sRh1`WL1#e_h-xMA9Qcug6@#_lihV|efjXm@K2bEYVptye#OgddA6jZ)slZW5DRA-5V^d-n4v zB~#heBxp^=J#8^ls#FI#>i2fRwC(T#O1+gLtYD_v<5pFhC}Tq5#sDE_%IWrLvh3D( zg18kd%iSiFKErO|hX|Sa&EvGSCcR{u!@RQcnL5;<_<@v>u7$YD7^XvpO3NbC9Jys_+Eljf z5pC_kM4arE=886FqJ4I%hw7fXrs$=S+uWRl&1}58rxDZPy*x>Y8Z?qNr`J0YkyR40 zYoZZswYO2}-yw7>2I|u?6Tz>~;qc4=r{{3eIho3up`?Y1Mzq2{gE|nK>UW~~iFQ{x zV;3e7a%C%radI{Y+oKG2+PgP0W9J2a( z_UOv&e}fTqtYlij6*AdmS^cR&27g4Hko5_}wmFgF)bxyHF*3co(J*5PZZFR$*3OJ% z+RSZ=9qB=yLwq`KZf)F5h5a<9L$I>mv7WH|GOMY=$}q4{f8mGi9?Y_ zUK-OWO!qDHR!mQ7+wiU$13OOxhOKnZb0;u z%GH4d8NiT7EhG;^;k;1ZMch-PR0I`Ij1WG97FI**C>CaIE+ROxAf}34z+*1XVi)K5 zEpURl?0FaYm$0NOppT*CN+{1$9ahBjIV|B&nqrr zSyxCI!}3wA=*${knK4{ZOkR=gVVRK|#p5V-BNVP6KdcDX6j~l(e{=mRbNw2h^ea#v zR_IbaHNK$F^&m?2ebs?guHahn;@MjrR)aq8-Wn~aWxXVCgId;0byyQ#j-V_=Snng> zMF^7vbKGcrlhOD{?j4Gzf}#njV_1Dx@vv2H2y6b=5GwzlAyj2Uxc9C?K(8CZTGz83 zAun;@7Q?dJTAkh2EZ=DBvedh;b6CDPV~dMiM%^zM6&6en5o?P_CN7<)?}i)f0CTWJ z?vxGLpf3zb6e+t5i%NAiWE46VKG4Ml_(IH!o%UFe9&2i60@Sb|*0Duc&q}d@JwVS|Y+~XsdlR;>4s2!JsAD~-XC}6> z1K2^4ZD&JhU`No%UPXkR#6#?DJj~9ZiG6@(Hi{N@1+DB?Xk%CD`3F48{)`UxS3Jh9 zp;MC4B>AvQ3Sqaj2z#XEctWZ|w^WV2(k2+vR`f`1h)P|ENqfL01N)=|dZje_q@##S zuVcS-hMwn;kVariAHk9?;(+uslKUl6((f=N{T>IU&v8ilJJQlM9F`fLls$M#o{OjD z5RS+?o{^W~S-Aqw$s2G~uEX>4b_~mp;F#Qj7vxU7NIUnE9L39WKVFkf9H;#Nt`+`;)(9E$-sTW7zO9W=)yO99>?LdYGgn fV*F3&sgc2P%JwCygC2UHN9$3Vi@A5(y&w7ylpgjs literal 4037 zcmcInU2qfE75?t7q+JOa8)0D-8(8yeV{8{Um>^^R%#THkO^|^YNbp*^*uv7T(5?(h zAPK}YKuMaWDS;$yDJ5~6rfou7AkfmzG&7yaWSZB`bcX5lfxaY9eQ3kjrRS~$Hdxc4 zlc{F3_wKppp7WjGd-s!nU%LTdIX>`V88-RwDB8VeDLrim}%R9eqBih^dGRiCo1#1^p@pe5gbs z0ER&YNgw7Qp&}K41XD#?#Q_x=1(pvBVXMfh7*cT1hsEOUkcym&XH-0^;;@1v0`hYL z)$bAU)2;U34>uq&F;LIq;B*#M(s?(=x-4lOQN4sqHf}TF%U__M;6e2!FS34f@fH<$invMKkxW=Naklde*L3>Z1N0}k zmPSm(p3wwHn4xT)Y1)>Z(bHSFJz&PIQV+hZ;x#|MgV!0D=Erw&h9t&Kg8;mNvkK1n z@h0B#<81+VL1!Yyg_T2GOX-yO(#RiQ6d#gTkGQ*Po?c#gYfz(72g+F ze;^#^2%oiycoKF)9+Do9Pec?}abB?hkipG|xIs>$OqLsUnz%Ozf)ILvVjkyuoT5%) zmK*zWL|A{1;ED4jw`pZ|r)l$eK~sjO%%S^qF|xQL;>uVTR?)?fshSsmJd#{gS+N3J<<43qC9P|!(Tf~s^$6<16tgCN7 zkC7jh-5nx@sbnWC<_nN&yGT{u&zQ4po+7WCS&|jZ*KopY+$xHbq;Ne&lBYXr?GsO|6rSv_ezATn=jOYJTn-o*%c zgEeT3p(3RZ@;1|m>GsZqJwP+d)(x9>SJp)GUMZ@?ZKab50=1|Z?4lm?TG>7-TWV^e z)kPvj#pWaE1SewHyq{;t;#1@dV7hBIwNaS~gC8pb zc(NCZf~)SNyceBoK&RHh#@mzVRiZmJ2<62ME9R#nY6+$!&VunQiWuqacoxkppr<^V zxKO)8!H-3kc%NbZcz!30A#;!yj*@(kH|jCl%;XgOoD!wOGzYV327g4HSZzt&vN%Ql z>_it8WaN8oyKcmj+?t=?*fQCG36%RbcIVQ(2>ZlDxf`j;BHHw1GMcb?i-KQJ`<`T9 zF>KW8{yQJ4>6WpKZW5GW;^?B8o91*X(lbnNvuLDV3-{tHU>`b+E%fv_L>XSJL~EYa z6C$b)ko&Jfx&%4kx(v4%Jv3g0QWpO$)DF4z61IfwGXwyAmc z5xKfPQ0lCN3oB)`A~(B&uBr>rf-YBYvydNj*9Bco*DwvB^X=Q^@UJ6xkcd$daBN23Z)v0j$n4sBXXmTQe!%i@(CCn_K-I}AC~S+3VVf}Br4@Dxkv7y`@IAzPWA~hRH7x2F%?r#is>lB462VR1Ski~ zu?Rsl5M??npr89vspCG!%EhO zR@Q`7ER5Bx4Qtp&tYzD*eCU(UotQt9j5UZ_Djc+lujchoq;J`B)<1xNmpS@*O8U}fFbEq z9F#u8A?Yv3NjLF~^aY-k{(-~NZ5)xt@SN<%^YS#jAXnh1JO?kzi!m%eN@Ex=$*njc zM{rW^z$v*4rzwgr%e(Q49K&n!K03-)Q6ztld1IKZke5bLt6v-pgry7twY*&;8ER_z!{0&x!y5 diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 7c576ea216..38e17ef97a 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,4 +1,5 @@ import java.util.Scanner; +import java.util.ArrayList; public class Duke { static Scanner sc = new Scanner(System.in); @@ -14,6 +15,7 @@ public static void main(String[] args) { System.out.println("Hello! I'm Duke"); System.out.println("What can I do for you?"); printLineS(); + ArrayList tasks = new ArrayList(); Task[] cmd = new Task[100]; int count = 0; @@ -27,9 +29,9 @@ public static void main(String[] args) { } else if (command.equals("list")) { printLine(); System.out.println("Here are the tasks in your list:"); - for (int i = 0; i < count; i ++) { + for (int i = 0; i < tasks.size(); i ++) { int num = i + 1; - System.out.println(num + ". " + cmd[i]); + System.out.println(num + ". " + tasks.get(i)); } printLineS(); } else { @@ -37,7 +39,7 @@ public static void main(String[] args) { if (ls[0].equals("done")) { String num = command.substring(5, 6); int res = Integer.parseInt(num); - Task t = cmd[res - 1]; + Task t = tasks.get(res - 1); t.markAsDone(); printLine(); System.out.println("Nice! I've marked this task as done: "); @@ -57,10 +59,10 @@ public static void main(String[] args) { } else { } - cmd[count] = new Todo(com); + tasks.add(new Todo(com)); printLine(); System.out.println("Got it. I've added this task:"); - System.out.println(cmd[count]); + System.out.println(tasks.get(count)); count++; System.out.println("Now you have " + count + " tasks in the list."); printLineS(); @@ -86,10 +88,10 @@ public static void main(String[] args) { } } } - cmd[count] = new Event(com, eventdate); + tasks.add(new Event(com, eventdate)); printLine(); System.out.println("Got it. I've added this task:"); - System.out.println(cmd[count]); + System.out.println(tasks.get(count)); count++; System.out.println("Now you have " + count + " tasks in the list."); printLineS(); @@ -112,10 +114,10 @@ public static void main(String[] args) { } } } - cmd[count] = new Deadline(com, deadline); + tasks.add(new Deadline(com, deadline)); printLine(); System.out.println("Got it. I've added this task:"); - System.out.println(cmd[count]); + System.out.println(tasks.get(count)); count++; System.out.println("Now you have " + count + " tasks in the list."); printLineS(); @@ -124,14 +126,8 @@ public static void main(String[] args) { int dnum = Integer.parseInt(dnumber); printLine(); System.out.println("Noted. I've removed this task:"); - System.out.println(cmd[dnum-1]); - if (dnum == count) { - cmd[dnum] = null; - } else { - for (int i = dnum; i < cmd.length; dnum ++) { - cmd[dnum] = cmd[dnum-1]; - } - } + System.out.println(tasks.get(dnum-1)); + tasks.remove(dnum-1); count--; System.out.println("Now you have " + count + " tasks in the list."); printLineS(); From d11d252a95f79afea3ff1921533a34335d01ad67 Mon Sep 17 00:00:00 2001 From: kerwin97 Date: Wed, 28 Aug 2019 03:47:41 +0800 Subject: [PATCH 12/55] Level-7 code --- src/main/java/Duke.class | Bin 4171 -> 6271 bytes src/main/java/Duke.java | 131 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 127 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke.class b/src/main/java/Duke.class index 4cac3ba2bb0c6e7eb81da61e80257d1746be787b..359e437c3f32ff8110babd0200c7da920949afb7 100644 GIT binary patch literal 6271 zcmcgw4}28Wo&Ua>-JQu~!=HsEY!#g#kdVJMEm1cSl>lZX3G@;{Y858gAz8B7O?M}R zSn8h|X>F_5tJNB%R`E|xOIt;oAXKDU`$t=?+Ex#3&!X1a>q$AUtzabgeX~mvWWBqO z{oDoiy*Kau{{MY5PafU97r+@pH?Rgh23F(Kc}O9x!!gi{O*;DI=4K8326Xi3xJ<)m z4CG^r96l?D%XM6#<4O%z8JLdG$>C}_3`mS?B>Gml`n(*zkjKYsb$ro4Bfg~L%Q~*p zalJhH#{ea{LC4qR(TzH8lJnOM+>AjDw-{J}TXk%cQhh_xyiLb9HQcV_4g=-b5`e&+ z8tyXiQEbt1cK`~8bo{f9dv)BW;adjIzz!YX*6|$;-!)JxpYGT3faJYX$AdZ^((yeF z!v^XliID(Q+$kR(mcwohdkjSI{Qx}JtKm@{`vUMvh}C#Z$KyJFsN)G8KavLgu{6L> zH2hS-=4B9$8NRKT_jfi z0f0Ht$-5=ik+7WJ6nQk{M6Ekfsl~MmbCIiSlrq#VmZpoPmnNk?!7R<=Z1PE}R@WZS zTGwbv_NLmidgd+d?XoMSH~jb{F7~4x7i;*LA3w*_w0(mek0*=FNO89*0X011$1m_K zjlZVTa!k6;jF{1+xgnV{`;)!r_z}g$^zVdw$8ATyL@mdvib{sgW=Fv9LdB9*(&Uo; zvwl2>=l%F4o)?&wu=~snJTWu&j*@`AnNFaa-F<=S6Kt|kB&qz$k6%kFFW^N#{ssH} z=s>3*FUh@^@f$xb!dk{yTR(aJ7W)OvCH;1#*^un9O($ulZCk2hS{;lsGo4H(iWqWn zGA3k$ow7}fKc|yF8387N2%a(}MA(mi#VeG3NiylAos`wnWILV7XnLv-zteHRk5}=U zfH3`d9ls~pD4piV8~B5UH~sh{{*8Omseb%P+Hrn!tlgI8-(;KJR;tU6l5s5UayG3r zEuXN%B=!sZyB{_-5Zg&cleCod)_BYd)Ev0^VRPlmRV_tDMP@5ykJ{<>RLso?Gr7UE zs5#vzQ!(k7ZMJE5_c;BPI^L2ZACywLbmyGU7+1gTWZJtti8h@v2s}^>btC_=YcP$8Covr!*%WJDTN`vb&R;j^pLW z+tSjtlNFO;nog!t{pDs`uj58$qS!IJ63ITZPsXbwhi=(vzwHqpnrQ5kI;R=XxoBG=Nw}7aZ7jgCFl=RC?z}Eq&R7;?`=d(@Hnnve@VePMMlNvm{$iCz*$0sSM}$G0!MoE4gX0 z^fH+fv`;#AnT*_$g%K&!r+clql&Qm(Dwjki)6U`>IEpbMib_)m6n0x(c6~C@ZaHgW zPA6As$4WS)QCt$4RQ!)IpR|>2a!jXmPdr9`#ktCTPA}!9d)ru%SUhFtj2tKCIN3}= zb{NrENaG&o)^kX#_*ort@-jpkq4Fd#aGipP5786BV3n!*St?nwiG3 zGIug1OfgY@Wi6J~xAFx0kK^XDQx3K=$TFoy%4<+wZ=Xy{&h7DJnzKPSH`(d5)xn3t zmSi{UyKG2(tZrssDw*gAOEnkdP&21eiXgNiuQL& z0QJ3HP_GW0%xY9?d}YHZ9E5KO zd0fq|@$E!NVyc(83!;X!z(yR4e(H!^aob1slJW^})pe|``$K0Uq zSznV!=E1zOpgxRKcf$k-G@y&2v6ravkaCDriiR;atcP^9I&hjxus)>e(LbI|}xo zd~JX>t$Z|;=cx`Ga{DgK_15GE^SR!R!Vvd@`PI8o1%!=(dC%E( z=G7VIWkJe%Dg_wu38}4bH$LX-c}yS_gbgXAL6{+N)Rpezu5|mxr3)+y8~o*aYWzXJ zD@Qw}@K*>U0Km3gwUB%nzZJSmY{l*8f(K@c*SEwOK{#K7=BOyNaCc%GVgu85PIk zF6-#U#~huBLb@>)E)h@RQt<-TiTzkF-hd_k zh&J&SY+9#Xyp5=M7aJ4<9m))JDuswCCt;(q0A0$*5LfEZtz3YFauMfC(W6*MDV<0w zDfB8=5^gK{m78#xGKkM8cVLV1ZG2X_AD1hS;0k3Qu2g=AtCZ*QIpt+st-OK(-6rWeU_<}kE*Q!OFi}5A36xXSz<9f9gUr{5tMqP=osq1i~+J>9djrh8{2{)_# z7*x077WG=(s$Pd}>Nb2s-HzMTd+|+m2X0p%!X4^k*seZ>JJqLgm--U!R)33o)B_k& zU&pNT=j3Mvu4I#)&lHh=GLZu3F&ifut>GR$$gcbl zQTQbx7s`?xC?iC9m?(S&CJD*q4@^BD=gvK-UmIYtU)mU0)FfFhBfh$LPO012s^+k- zd4ir&w!chI3w!6>g1nHoX$b!Ekasth15E=ei|jLH<-<6it*BuLGnz@NVi*_f#tOGT zJU~%bpq1B)2qloWh9#KB@%u3F2nw*5$^R&Qv5!gp119ieOxnkppif{K_gCPjScNBv z|8r7!ikFk0@uS7lZrGdx-%%85sF$995A&px4@0M$R%nP!Jz!<&Bj#fq3HB zO@#Uu-Xcay)nS~o4~ z0WS^kW~OuUUgCDnifLN)F033xVHu4wd%UT8LtZxZA<-aduX1T`leGEslD;qKlk_jD z2>Pl6pKy;$fX=wRk`8wJ$M;UPcIU=%6pp&} zZ;Wk_)o{ENvMkC{bOfOzC{vDNR<=5gVs@rB`5E+wQSm`XW2k_Vp(pJXbFH?KWr3eO zvX$gi?vn+y(m)HnzJp8QW~+P07c*$s?(wp-fHg$^O_A5}ooF4wg%2V$QLZxY1v;S; rgi??c65aq`>4aA(Z1G>=^8(hPeA@yh_#;inpE(X1hi79U#Crs5F|kD^^ghnRd!!A=b- zniX{V=>1C?>2!(P<0^J(Xuxh2dsIB3qFc!A6*nV5&|JknvEHkqPdwuq_M=~ehJ=a% zVZ&5mDHv37K*JIw17L6zq%cLaf~Pf9;E0N6R6MKTISp0f z?Wl_9g~qUoV=7)y@nr=sif~>Mp1!Q$D+*p=knAYK+@}4;kWrO#;)$yEs9~BsS<8^O zF>c14O$>5b`A!B;y%pmO1x<02x1Ovyy$Jg-~;Ni4;_^9KDC@d|=Q?SBhPEOT~x6*N;RBNyv{Mh-?+_ zAi=m(neoer#iqLzR`EljbDqJ=hqy`UC*sRh1`WL1#e_h-xMA9Qcug6@#_lihV|efjXm@K2bEYVptye#OgddA6jZ)slZW5DRA-5V^d-n4v zB~#heBxp^=J#8^ls#FI#>i2fRwC(T#O1+gLtYD_v<5pFhC}Tq5#sDE_%IWrLvh3D( zg18kd%iSiFKErO|hX|Sa&EvGSCcR{u!@RQcnL5;<_<@v>u7$YD7^XvpO3NbC9Jys_+Eljf z5pC_kM4arE=886FqJ4I%hw7fXrs$=S+uWRl&1}58rxDZPy*x>Y8Z?qNr`J0YkyR40 zYoZZswYO2}-yw7>2I|u?6Tz>~;qc4=r{{3eIho3up`?Y1Mzq2{gE|nK>UW~~iFQ{x zV;3e7a%C%radI{Y+oKG2+PgP0W9J2a( z_UOv&e}fTqtYlij6*AdmS^cR&27g4Hko5_}wmFgF)bxyHF*3co(J*5PZZFR$*3OJ% z+RSZ=9qB=yLwq`KZf)F5h5a<9L$I>mv7WH|GOMY=$}q4{f8mGi9?Y_ zUK-OWO!qDHR!mQ7+wiU$13OOxhOKnZb0;u z%GH4d8NiT7EhG;^;k;1ZMch-PR0I`Ij1WG97FI**C>CaIE+ROxAf}34z+*1XVi)K5 zEpURl?0FaYm$0NOppT*CN+{1$9ahBjIV|B&nqrr zSyxCI!}3wA=*${knK4{ZOkR=gVVRK|#p5V-BNVP6KdcDX6j~l(e{=mRbNw2h^ea#v zR_IbaHNK$F^&m?2ebs?guHahn;@MjrR)aq8-Wn~aWxXVCgId;0byyQ#j-V_=Snng> zMF^7vbKGcrlhOD{?j4Gzf}#njV_1Dx@vv2H2y6b=5GwzlAyj2Uxc9C?K(8CZTGz83 zAun;@7Q?dJTAkh2EZ=DBvedh;b6CDPV~dMiM%^zM6&6en5o?P_CN7<)?}i)f0CTWJ z?vxGLpf3zb6e+t5i%NAiWE46VKG4Ml_(IH!o%UFe9&2i60@Sb|*0Duc&q}d@JwVS|Y+~XsdlR;>4s2!JsAD~-XC}6> z1K2^4ZD&JhU`No%UPXkR#6#?DJj~9ZiG6@(Hi{N@1+DB?Xk%CD`3F48{)`UxS3Jh9 zp;MC4B>AvQ3Sqaj2z#XEctWZ|w^WV2(k2+vR`f`1h)P|ENqfL01N)=|dZje_q@##S zuVcS-hMwn;kVariAHk9?;(+uslKUl6((f=N{T>IU&v8ilJJQlM9F`fLls$M#o{OjD z5RS+?o{^W~S-Aqw$s2G~uEX>4b_~mp;F#Qj7vxU7NIUnE9L39WKVFkf9H;#Nt`+`;)(9E$-sTW7zO9W=)yO99>?LdYGgn fV*F3&sgc2P%JwCygC2UHN9$3Vi@A5(y&w7ylpgjs diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 38e17ef97a..1664782cff 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,10 +1,13 @@ import java.util.Scanner; import java.util.ArrayList; +import java.io.File; +import java.io.IOException; +import java.io.FileWriter; public class Duke { static Scanner sc = new Scanner(System.in); - public static void main(String[] args) { + public static void main(String[] args) throws IOException { /*String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" + "| | | | | | | |/ / _ \\\n" @@ -16,9 +19,33 @@ public static void main(String[] args) { System.out.println("What can I do for you?"); printLineS(); ArrayList tasks = new ArrayList(); - Task[] cmd = new Task[100]; + ArrayList filetasks = new ArrayList(); + + String fileloc = "data/duke.txt"; + File tempFile = new File(fileloc); + boolean exists = tempFile.exists(); + + if (tempFile.createNewFile()) { //no file yet so create + + } else { // there is already a file so just print + Scanner s = new Scanner(tempFile); + while (s.hasNext()) { + String t = s.nextLine(); + System.out.println(t); + filetasks.add(t); + } + tasks = createTasks(filetasks); + // transfer the list to the new list + } + int count = 0; + if (tasks.isEmpty()) { + + } else { + count = tasks.size(); + } + while (sc.hasNext()) { String command = sc.nextLine(); if (command.equals("bye")) { @@ -45,6 +72,7 @@ public static void main(String[] args) { System.out.println("Nice! I've marked this task as done: "); System.out.println(t); printLineS(); + saveFile(tasks); } else if (ls[0].equals("todo")) { String[] td = command.split(" "); try { @@ -66,6 +94,7 @@ public static void main(String[] args) { count++; System.out.println("Now you have " + count + " tasks in the list."); printLineS(); + saveFile(tasks); } catch (DukeException e){ System.out.println(e); } @@ -94,7 +123,8 @@ public static void main(String[] args) { System.out.println(tasks.get(count)); count++; System.out.println("Now you have " + count + " tasks in the list."); - printLineS(); + printLineS(); + saveFile(tasks); } else if (ls[0].equals("deadline")) { String[] eve = command.split(" "); String com = ""; @@ -120,7 +150,8 @@ public static void main(String[] args) { System.out.println(tasks.get(count)); count++; System.out.println("Now you have " + count + " tasks in the list."); - printLineS(); + printLineS(); + saveFile(tasks); } else if (ls[0].equals("delete")) { String dnumber = ls[1]; int dnum = Integer.parseInt(dnumber); @@ -131,6 +162,7 @@ public static void main(String[] args) { count--; System.out.println("Now you have " + count + " tasks in the list."); printLineS(); + saveFile(tasks); } else { try { throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); @@ -150,4 +182,95 @@ public static void printLineS() { System.out.println("____________________________________________________________\n"); } + + public static void saveFile(ArrayList tasks) throws IOException { + FileWriter fw = new FileWriter("data/duke.txt"); + String texttoadd = ""; + System.out.println("These will be saved"); + for (int i = 0; i < tasks.size(); i ++) { + int num = i + 1; + String textpart = num + ". " + tasks.get(i); + if (i == 0) { + texttoadd = textpart; + } else { + texttoadd = texttoadd + "\n" + textpart; + } + } + try { + fw.write(texttoadd); + fw.close(); + } catch (IOException e) { + System.out.println("Something went wrong: " + e.getMessage()); + } + } + + public static ArrayList createTasks(ArrayList filetasks) { + ArrayList tasks = new ArrayList(); + while (!filetasks.isEmpty()) { + String tas = filetasks.remove(0); + String[] splittedtas = tas.split(""); + if (splittedtas[4].equals("T")) { + String word = ""; + for (int i = 10; i < splittedtas.length; i ++) { + word = word + splittedtas[i]; + } + tasks.add(new Todo(word)); + if (isDone(splittedtas[7])) { + Task t = tasks.get(tasks.size()-1); + t.markAsDone(); + } + } else if (splittedtas[4].equals("D")) { + String word = ""; + String deadline = ""; + for (int i = 10; i < splittedtas.length; i ++) { + if (splittedtas[i].equals("(")) { + for (int j = i+5; j < splittedtas.length-1; j++) { + deadline = deadline + splittedtas[j]; + } + break; + } else { + if (splittedtas[i+1].equals("(")) { + + } else { + word = word + splittedtas[i]; + } + } + } + tasks.add(new Deadline(word, deadline)); + if (isDone(splittedtas[7])) { + Task t = tasks.get(tasks.size()-1); + t.markAsDone(); + } + } else if (splittedtas[4].equals("E")) { + String word = ""; + String date = ""; + for (int i = 10; i < splittedtas.length; i ++) { + if (splittedtas[i].equals("(")) { + for (int j = i+5; j < splittedtas.length-1; j++) { + date = date + splittedtas[j]; + } + break; + } else { + if (splittedtas[i+1].equals("(")) { + + } else { + word = word + splittedtas[i]; + } + } + } + tasks.add(new Event(word, date)); + if (isDone(splittedtas[7])) { + Task t = tasks.get(tasks.size()-1); + t.markAsDone(); + } + } else { + + } + } + return tasks; + } + + public static boolean isDone(String op) { + return (op.equals("\u2713")); + } } From 1bd9d78812e17f1667470fdac6a95287dbd42c8c Mon Sep 17 00:00:00 2001 From: kerwin97 Date: Mon, 2 Sep 2019 19:07:48 +0800 Subject: [PATCH 13/55] Level-8 code --- src/.idea/encodings.xml | 4 + src/.idea/misc.xml | 4 + src/.idea/modules.xml | 8 + src/.idea/vcs.xml | 6 + src/.idea/workspace.xml | 297 ++++++++++++++++++++++++++++++++++++ src/main/java/Duke.class | Bin 4171 -> 5319 bytes src/main/java/Duke.java | 34 ++++- src/main/java/data/duke.txt | 5 + 8 files changed, 356 insertions(+), 2 deletions(-) create mode 100644 src/.idea/encodings.xml create mode 100644 src/.idea/misc.xml create mode 100644 src/.idea/modules.xml create mode 100644 src/.idea/vcs.xml create mode 100644 src/.idea/workspace.xml create mode 100644 src/main/java/data/duke.txt diff --git a/src/.idea/encodings.xml b/src/.idea/encodings.xml new file mode 100644 index 0000000000..15a15b218a --- /dev/null +++ b/src/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml new file mode 100644 index 0000000000..f37474b41c --- /dev/null +++ b/src/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/.idea/modules.xml b/src/.idea/modules.xml new file mode 100644 index 0000000000..f669a0e594 --- /dev/null +++ b/src/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml new file mode 100644 index 0000000000..6c0b863585 --- /dev/null +++ b/src/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml new file mode 100644 index 0000000000..efc8105f35 --- /dev/null +++ b/src/.idea/workspace.xml @@ -0,0 +1,297 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1566886208925 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.8 + + + + + + + + 11 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/Duke.class b/src/main/java/Duke.class index 4cac3ba2bb0c6e7eb81da61e80257d1746be787b..b05ac9549dd864fc7a296b0545e3dfda3542df96 100644 GIT binary patch delta 2795 zcmb7`33yc16@dTy-psr=FOLL90v)yt*svuKh#;7V6bP6=Adx`B4nt;00!fA>6Do>~ zA}AK9#iuB=MWQHz8=!;~D%jSgLanrR$1Ym2wQ3g;i%5y*O;YIMXFuP3-?`_Wd(OFM zzjHkF;-JK_3x|#Xqxi_8mJq{-!5;exLOMD>j(tK9ROOjf&V!s2Fbv9MTUlDO5qWUa|MgWF7Qx5!|9 z0L51gHdtKFdRNazlT86M?lk$j$!3$g3>??0yDhS~$7GAiy$1JL40Cr|O}4pW-!S>6 z$+t|lo7``*!(u+o77KX5~o#oZ}61C)083znn3=TRm)w6R-Wi(z8jz?!y*G3in2Rc2BOus>^!M6<#IqOyb z!V*etW>ac#*ycMtqev@^*3`uMhKdH%h6xALlRJX8^`3l)VTvCxuO zLuh5JX{^m0N}Uf?#uuhC&E~s&&*u9)r_dL#jM_ZU3(gR&r07L{VDl2k6rIP%V)4d! zLwNbrXuK*GX-xBR+~kKgFY_aX3fa8E356#Ts}lu3<|hWP+WeHC+5B9tdR`l>ALSR$ z``YyGB|K~LOIPw&A}}KsiP`*GZk((48+6hozozg;S48XL3dy6M6Bfif(Iwc-Wu8q5 zzj2!NLjAWKbKcdDCRC2XjO0wsSt*~*@A$pV>%5`x7t0rFlF#N3yeWo8L}6iVt$Th- zv{ntRtqq&JgZXITGdCa6IQIJ(i>21D>;r zOsCE4GW7X+rCurH zRzv($M~I2HU1atJ#J9`j*OhLh(?{SJNpz<_L2~FJFGWwr(Tf6!Sg{Gcim`7ik zp8cqlq1`AVE6HS|;CG2#_c4fO2J^T~>w{!-gdrSfC?`bYt1`1sGF%!wm$$frGmPK@ zS1K=~R2o;Qbn;ZM1o>(JSF4e-<}*$eFISJ`Z_b!o0O|}n5E7zN7E_M{4CIVu~5rk zkv4#^mdItXHj)Z$91*R6s8+@jZ61}{BC50q)mn_D+A5Z5>!{HjYPDurcM;R}P_ONy zK|4%bdrA0S;d<>2R%)lXL3@uIwX>|!KISIfV6|?M(1YBpXK;(&pEdd*Zqx~p>x z@Sb-comuC}6!=flPCGasNMRMCma+@@oJdW*+CKaTKOW=22NJ~w)?Pw(__ec+K5l(pq|C>{a zJuphz;8F*-i)?lO4~U4oK$$D;xYCpD zNv_^(Z*IaR_ySk8l9y))bI@odKhF%Bfvbho!k9e2;Ma8ER$#2lm@*`o(#n_e?4TVO zmpmGu*D2lO*+E*+I>ZFXvvx5o-Q(?`6tq+Nq?X z4W{lDCz4Gp@#rS_b{SXq)0rL8!p+jD4@fsYC|$Qxy6Yjv@GwQ}l45y8Lb00&dsxn+ ztl%-$NQbWH3GU`ewy{?@_Y3y4{7pH)%!H^OhNn%qQZH7CTSQ7KWxm0J_IgO-3k8>H z(#4dhFS?kd{t|KbOFc~C?EMrSWb#v_T*{O?kP!);u&f%3`9M}nsPFS3`KM(9T`z=O dVOc4}8Y+u?oPr-lkl-5d^`!C_yo6eeGvcv delta 1729 zcmb7^X;4;W6vuzh^YC&n*DEM!ic28wpy0k1Dk_VjAYw$Kh=2@>z3!>G<#n%I z$}%f8HNhaIzSK?8fVG~JC_`tY5dZidCxh|Ip=@Qv;5EdS^rz{ zq0d_yZUQ6u#9=Jc9L6v`f*f*fW;oTIcLY=Dix+HWJET)& zGskAGO|hRh&le@pQo7t`fgfLJv&h$r9V%Gj;81B3TIx5cvI$x&vsvyC$BJkaH5Mx! zda}Z=v&v?5G@4qQwKnT))>~|FNMfT@u-Rm>*&)SWZL!(vBevOWx7lIyqQy@CJiGj@ z?zVWzVvj;smnveiD@wc!RT00}VxPr+MZ~fdi>qp~7gv=loJaOduf6V*n94YpOvYIp zaCw=7im1%;%F1Am_^iH5<0q|LQf}e79OAH7qPv1c|)P%UC#2RBCIS} zB?aE%oWGlB$`9K=dCk&ol-e$bHPVm6hMBkEa-AcI^Hn};qUwI%bpw7 z)ueL8O9{&~S2^Xa4QukeKnME+uDPUA=Uocqcsb#BO+DAIj<)KQcgh(R{-F=P;eGG) zS52PP=9>E0yU`{)Z;TKJc`_S0tXKiD<+enQmsNMs%J(MLqb`e~m>@E|)fq+vX-pJ* zytrZn+6GL}o9!m6G;g?qv0?_q&^`wtJJ>9&P(;Y`_eO?pH_DaT>gfkqMp? zSt=VH;GJ$eFj6J9h6g?lt7Px%$fAgp!dNTTu4j;>C0h$yvj%%rQC&hq>IhuHBz3gH z%IfG)NB4*3(1LB|fke7D&=(}@I@UQlH4;}CJ*=J{O=H3(8XGQ%bIpyHg`h2JxvC+~ z6qpiIB2?D?S=CK~a^gq~QF6X^#L%9nh~{ardJ*bCA6cf*Nf_E$0I^J>3)yrP+IExa z=uVNO7E8H>#8XWVYDr*^*aroEOwea!e;4RSJ^i^!BDZ8TzG491Fp%3M^OIEnnL*rR zFf9yK0fwn4MyQUARNX?1Qhgb%hKn9csuJd^Y{sj6Ca7Z4)O;qYDkiDrWXRbjt5u|{ zjby65WT_)eQ74$HPLi$8GfmYoT{V%Tz9d)O7X2f6>JItp7iOt@6lg=Xj$pQqrAT*U zj_$==9ZI2C4`H58r9@9)zRsmo7gDC@P_9c@petFZYgweXuvj0ULZ1|UmP&n&Dt(cl zzRq&}spNgZO8p(H^bf4ocUhxEqVXQYXY%sBGH1UK?Pd1q(Hk;9G37Isu zn#pW4GuUqO*3 Date: Mon, 2 Sep 2019 19:42:11 +0800 Subject: [PATCH 14/55] Level7 and 8 bug fixes --- src/.idea/workspace.xml | 77 +++++++++++++++++++++++++----------- src/main/java/Duke.class | Bin 6271 -> 7308 bytes src/main/java/Duke.java | 3 +- src/main/java/data/duke.txt | 4 +- 4 files changed, 58 insertions(+), 26 deletions(-) diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml index efc8105f35..2e59c754e7 100644 --- a/src/.idea/workspace.xml +++ b/src/.idea/workspace.xml @@ -2,8 +2,9 @@ - + + - @@ -100,7 +116,7 @@ - + @@ -143,20 +159,16 @@ - + - - - - - - + - - - - + + + + + @@ -164,14 +176,18 @@ - - - - - + + + + + + + + + @@ -233,12 +249,25 @@ + + + + + + + + + + + - - + + + + diff --git a/src/main/java/Duke.class b/src/main/java/Duke.class index 359e437c3f32ff8110babd0200c7da920949afb7..4109a9b1822f8c19b9b5a19cb206cdecd1434db3 100644 GIT binary patch literal 7308 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 rgi??c65aq`>4aA(Z1G>=^8(hPe createTasks(ArrayList filetasks) { } public static boolean isDone(String op) { - return (op.equals("\u2713")); + return (op.equals("\u2713")); + } public static String getDateTime(String deadline) { String[] datetime = deadline.split(" "); diff --git a/src/main/java/data/duke.txt b/src/main/java/data/duke.txt index 3d1b8803df..f1985cd798 100644 --- a/src/main/java/data/duke.txt +++ b/src/main/java/data/duke.txt @@ -2,4 +2,6 @@ 2. [D][✓] fwoc (by: 6th aug) 3. [T][✘] jeanne 4. [E][✓] fwoc (at: 6aug 6pm) -5. [T][✘] me \ No newline at end of file +5. [T][✘] me +6. [D][✘] (by: 2/12/2019 1800) +7. [D][✘] fwoc (by: 2nd of December 2019, 6.00PM) \ No newline at end of file From 7634709e8f19678159651452532e28c09665d574 Mon Sep 17 00:00:00 2001 From: kerwin97 Date: Wed, 4 Sep 2019 16:35:20 +0800 Subject: [PATCH 15/55] A-MoreOOP --- src/.idea/workspace.xml | 244 +++++++++++++++++++++------- src/main/java/Duke.class | Bin 7308 -> 717 bytes src/main/java/Duke.java | 300 ++--------------------------------- src/main/java/Parser.class | Bin 0 -> 5272 bytes src/main/java/Parser.java | 186 ++++++++++++++++++++++ src/main/java/Storage.class | Bin 0 -> 4031 bytes src/main/java/Storage.java | 148 +++++++++++++++++ src/main/java/Tasklist.class | Bin 0 -> 891 bytes src/main/java/Tasklist.java | 35 ++++ src/main/java/UI.class | Bin 0 -> 1656 bytes src/main/java/UI.java | 47 ++++++ src/main/java/data/duke.txt | 7 +- 12 files changed, 619 insertions(+), 348 deletions(-) create mode 100644 src/main/java/Parser.class create mode 100644 src/main/java/Parser.java create mode 100644 src/main/java/Storage.class create mode 100644 src/main/java/Storage.java create mode 100644 src/main/java/Tasklist.class create mode 100644 src/main/java/Tasklist.java create mode 100644 src/main/java/UI.class create mode 100644 src/main/java/UI.java diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml index 2e59c754e7..72bb89e3ea 100644 --- a/src/.idea/workspace.xml +++ b/src/.idea/workspace.xml @@ -2,7 +2,12 @@ + + + + + @@ -16,49 +21,127 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + printLine + Now you have + listcou + save + createTasks + tasks2 + returnTask + - + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -243,6 +405,20 @@ + + + + + + + + + + + + + + @@ -253,27 +429,28 @@ - + - + - - - - - - - - - - - + + + + + + + + + + + + @@ -283,6 +460,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + - + - - + - - + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + - + + + + - - + + + + + + + - - + + @@ -387,33 +656,20 @@ - + - - + + - - - - - - - - - - - - - - + - + - - + + @@ -423,6 +679,30 @@ + + + + + + + + + + + No facets are configured + + + + + @@ -446,6 +726,19 @@ + + + src + + + + + 11 diff --git a/src/main/java/Duke.class b/src/main/java/Duke.class index d101ae4a2fa8418faf481233e2c1ca5b9c0a5fc1..d13d0ab4ebdfdb095f2f676258fbebcace5021f1 100644 GIT binary patch delta 59 zcmdnSx{Y;%785Hs0|x`oWPPSMO+E$|27U&120;c924My*AgRY7${@+W02F6rkOE>^ JAe)In4gle@1sMPU delta 59 zcmdnSx{Y;%789!w0|$ffWPPSMO;H9G1~CS91_=fc1}O$D25AO81{nrP1_q!wBT$5q LK^DknVvqv>>2?KC diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 67b338e7f4..64b3263ef0 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,11 +1,4 @@ -import java.util.Scanner; -import java.util.ArrayList; -import java.io.File; import java.io.IOException; -import java.io.FileWriter; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.time.LocalTime; public class Duke { diff --git a/src/test/java/DukeTest.java b/src/test/java/DukeTest.java new file mode 100644 index 0000000000..8a14575adc --- /dev/null +++ b/src/test/java/DukeTest.java @@ -0,0 +1,10 @@ +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class DukeTest { + @Test + public void dummyTest(){ + assertEquals(2, 2); + } +} \ No newline at end of file diff --git a/src/test/java/ParserTest.java b/src/test/java/ParserTest.java new file mode 100644 index 0000000000..2aca62727c --- /dev/null +++ b/src/test/java/ParserTest.java @@ -0,0 +1,13 @@ +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class ParserTest { + @Test + public void parsertest() { + String test = "20/12/2019 1845"; + String output = Parser.getDateTime(test); + + assertEquals("20th of December 2019, 06.45pm", output); + } +} \ No newline at end of file diff --git a/src/test/java/StorageTest.java b/src/test/java/StorageTest.java new file mode 100644 index 0000000000..9fa229e34b --- /dev/null +++ b/src/test/java/StorageTest.java @@ -0,0 +1,15 @@ +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class StorageTest { + @Test + public void storagetest() { + String test1 = "✓"; + String test2 = "✘"; + boolean output1 = Storage.isDone(test1); + boolean output2 = Storage.isDone(test2); + assertEquals(true, output1); + assertEquals(false, output2); + } +} From 5bf85dcd123c020706bb9aaa7696bfb7935eda74 Mon Sep 17 00:00:00 2001 From: kerwin97 Date: Wed, 4 Sep 2019 22:36:18 +0800 Subject: [PATCH 18/55] fixes --- src/main/java/Duke.java | 4 ++++ src/main/java/Parser.java | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 64b3263ef0..fa00326363 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -11,6 +11,10 @@ public static void main(String[] args) throws IOException { new Duke(); } + /** + * Constructor for Duke + * Creates new Storage instance and Parser + */ public Duke() throws IOException { UI.start(); //ArrayList tasks = new ArrayList(); diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 8158a745ea..68666d5a9b 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -15,6 +15,15 @@ public class Parser { private static int count; public Tasklist tasklist; + /** + * Parser constructor + * + * @param tasklist tasklist containing the list of tasks + * @param ui the ui to be used + * @param storage where the tasks will be stored + * + */ + public Parser(Tasklist tasklist, UI ui, Storage storage) { this.tasklist = tasklist; this.ui = ui; From 2a6429b37770b947311b6176a34e34faf95f4ecd Mon Sep 17 00:00:00 2001 From: kerwin97 Date: Wed, 4 Sep 2019 22:49:50 +0800 Subject: [PATCH 19/55] A-JavaDoc --- src/.idea/artifacts/src_jar.xml | 8 ++++++++ src/main/java/Deadline.class | Bin 868 -> 868 bytes src/main/java/Deadline.java | 7 +++++++ src/main/java/Duke.class | Bin 694 -> 694 bytes src/main/java/Event.class | Bin 862 -> 862 bytes src/main/java/Event.java | 7 +++++++ src/main/java/META-INF/MANIFEST.MF | 3 +++ src/main/java/Parser.class | Bin 5265 -> 5265 bytes src/main/java/Parser.java | 13 +++++++++++++ src/main/java/Storage.class | Bin 4001 -> 4001 bytes src/main/java/Storage.java | 26 ++++++++++++++++++++++++++ src/main/java/Task.class | Bin 1141 -> 1141 bytes src/main/java/Task.java | 12 ++++++++++++ 13 files changed, 76 insertions(+) create mode 100644 src/.idea/artifacts/src_jar.xml create mode 100644 src/main/java/META-INF/MANIFEST.MF diff --git a/src/.idea/artifacts/src_jar.xml b/src/.idea/artifacts/src_jar.xml new file mode 100644 index 0000000000..b863c632cf --- /dev/null +++ b/src/.idea/artifacts/src_jar.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/../out/artifacts/src_jar + + + + + \ No newline at end of file diff --git a/src/main/java/Deadline.class b/src/main/java/Deadline.class index d88e61b963aa5915720358c28be7fbfe12dda095..48a64f2f94de3e312bdb3b15baa8f367d303b28b 100644 GIT binary patch delta 27 icmaFD_JnQ2e1}+Bv$sEkajKY&`m^A=oiUp?t delta 27 icmaFD_JnQ2eq@V;& delta 49 zcmdnSx{Y;1FOw!80}BH`13QBtg9w8#gBFm~V-RJKWMBY_Gcrg4u`H0y#2^O%p|}J# diff --git a/src/main/java/Event.class b/src/main/java/Event.class index ecfdccd4b97a7c1eac1d8c33d620522b89d39422..4301c3b3dd14957d315368ff4228c706ccde7d6a 100644 GIT binary patch delta 27 icmcb|c8_htPbN-Y237_>1}+Bv$xO_~jKY)6m^A=mh6RZL delta 27 icmcb|c8_htPbN+_237`k1}+AU$xO_~j69Rgm^A=lCrFQ7(S=N-p~(kNr}>0V$_KDmf?t4oRcsWvb)~hb6=j>7iPB zjeEi|8Roc*P$Odm{ERPMzR}e&eQ2(xp>$ z>tA}@bZ)sgZl}5g?zlwmIuG|;1`k{&51o%kE}LGLLto_I%w{QiMiddV^qkq&WfB9X z@C9C8ny*3g@ydE0vMOIw${Q+pYgXP-%X`lAfhLCO;3GYJG9#lrWz5LW?US>@{{e)t BeSH7` delta 554 zcmWNOOGp%85XXNrUtofyttCl`o0+w=J>8153?r+pw1;jIia}Z0!?Ie8irln^rkSo9 zr1Y?t+QV8}45Chf(OEhOK_Fd{qI-v^;XC}lnfc9SeoMW~&I>B$1#b zvt2ywkW5M>i=C29vG~~~dF+-#_DB(XB}l21QYHroNe%lXOt~~!wydJS+|3pt}D zmSu#soCdApoYrt&!^U0Ul6KOl-9+>@mvxvXjnS-cxuWm5s-L)~U%0LlwCFclb&?x8 zMVtPm-A(7FOQFN-(zxZ)>2x`CIUn6FmmU|O*X47^70?&|H?u=RcS+!$S-Nj3ADE>9 z^YqYsJhHn#w%a}-$Wt>jNF_s5Gi+9#(ZF+>c|j{L>1Bj|UKtVNHE;Mpyk{~s_8(d; BbvXb4 diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 68666d5a9b..f22909fa90 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -37,6 +37,12 @@ public Parser(Tasklist tasklist, UI ui, Storage storage) { } } + /** + * Reads the user input and converts it to instructions. + * + * @throws IOException if the user input is wrong + */ + public void parserRead() throws IOException { while (sc.hasNext()) { String command = sc.nextLine(); @@ -161,6 +167,13 @@ public void parserRead() throws IOException { } } + /** + * Returns String of the Date and Time in the user friendly format + * + * @param deadline deadline of event or deadline + * @return String in user friendly format + */ + public static String getDateTime(String deadline) { String[] datetime = deadline.split(" "); String[] date = datetime[0].split("/"); diff --git a/src/main/java/Storage.class b/src/main/java/Storage.class index 7f715444e189da9102d082e032e670b076859305..9006fd7d670f3c6066e9327303b8841dd7774e97 100644 GIT binary patch delta 369 zcmWlTNhrht6vlrK#Ta|CL^FmErR*jd#*zyPiGz|XgR+gaVUU!vOpHHSli@-+h=YrZ zaw0buB}W%0H%Cve-uK@7zWTj@HDJA&HQ5pfA&Cf*i6w;uQc1@`4p#E9QA~z$U}};q zbW_bZwZ>z3uhbivX1l4G zFj|PC-Ef)Rwr<^eh^JTieWcM(HZJlQ&<_TcF?9E9wgfE=6UqoNj4FIgpByI(Hw8>6 z&P^Rtv@xx~8Le67@vz1mKArq{IbnfI7P)7MC)H<`d1Zx9R{2){hjj^NLn7IfOnj2d zme|>r3jE?^M;b~oq=Q{?u_u$N9`?n{q4+qFBMqE!CbtCSfpdA|Lf*NQ53Y=tsAIV{ I2BORV01DGh+yDRo delta 369 zcmWNLNhri&7>A!1#Td)jNp^!7DSJakY9z~`#xgSYVWb=kG1ioW<$(BKgk)}x;^5+< zoXE{Z$CV>*Yo_sdEvankJ^8(CD6O)WXbnW?koDBzdoRs6D0=MoxRNA9ajT!-P^6s5hQs{nB7q%?^{3 z7@F1UG6LpcL7V>CNu@)5o#fM{47aknwLy JHD(hV{{ilFM%n-X diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index ac338a69eb..5b28abd167 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -13,6 +13,12 @@ public class Storage { private File tempFile; private Tasklist tasklist; + /** + * Constructor for Storage instance + * + * @param fileloc takes in the fileloc to know where to store + * @throws IOException If file is wrong + */ public Storage(String fileloc) throws IOException { //ArrayList tasks = new ArrayList(); Tasklist tasklist = new Tasklist(); @@ -32,6 +38,13 @@ public Tasklist getTasks() { return tasklist; } + /** + * Saves the current tasks at hand into the txt file + * + * @param tasks ArrayList of the tasks + * @throws IOException If file is wrong + */ + public void saveFile(ArrayList tasks) throws IOException { FileWriter fw = new FileWriter(fileloc); String texttoadd = ""; @@ -57,6 +70,12 @@ public boolean hasFile() { return tempFile.exists(); } + /** + * Creates a file for the data to be saved + * + * @throws IOException If file is wrong + */ + public void createFile() throws IOException { boolean exists = tempFile.exists(); if (tempFile.createNewFile()) { //no file yet so create @@ -66,6 +85,13 @@ public void createFile() throws IOException { } } + /** + * Reads a file and prints the data. + * Also calls a createTasks function to save those on the list to Tasklist. + * + * @throws FileNotFoundException If file is wrong + */ + public void readFile() throws FileNotFoundException { ArrayList filetasks = new ArrayList(); diff --git a/src/main/java/Task.class b/src/main/java/Task.class index 91128ecaea057291c9f05b40f5c81b0b5c9c556e..aa98bff9791c7009cabad911b67e9811d9c6dc6c 100644 GIT binary patch delta 57 zcmey$@s(pkCNnP&0}BH$11AF?5b{qhV>V$FpS+scoKbr6V`gnuc?MPng~`G!rmQMJ KdDY3jEE)h&z6zB9 delta 57 zcmey$@s(pkCNnQ90}BHi11AGJ10Ms& Date: Wed, 4 Sep 2019 23:17:26 +0800 Subject: [PATCH 20/55] fixes --- src/.idea/workspace.xml | 189 +++++++++++++++++++++---------------- src/main/java/Duke.java | 2 +- src/main/java/Parser.class | Bin 5265 -> 5265 bytes src/main/java/Parser.java | 5 +- 4 files changed, 112 insertions(+), 84 deletions(-) diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml index 428786422f..8b8765dcc7 100644 --- a/src/.idea/workspace.xml +++ b/src/.idea/workspace.xml @@ -2,14 +2,9 @@ - - - - - - + @@ -282,7 +311,7 @@ - + @@ -541,7 +570,7 @@ - + @@ -569,15 +598,7 @@ - - - - - - - - - + @@ -594,84 +615,92 @@ - + + - - + + + + + + + - + - - + + + + + - + + + + - - - - - + + - - + + + + + + - + - - - - - - - + + - + - - + + - - - - - - - + + - + - - + + - + + - + - - + + + + + + diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index fa00326363..e642407e3e 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -16,7 +16,7 @@ public static void main(String[] args) throws IOException { * Creates new Storage instance and Parser */ public Duke() throws IOException { - UI.start(); + UI.start(); //ArrayList tasks = new ArrayList(); storage = new Storage("data/duke.txt"); diff --git a/src/main/java/Parser.class b/src/main/java/Parser.class index d5200e92342eb0bfe2c0ad16987803229c746ca6..2d1e50b9af892dcd4fa7727103253b244bf4d235 100644 GIT binary patch delta 560 zcmWNOT};gZ7>A$t{o9f?C22c8)>%7inv<^%qln`pOW3F*l=9J3GZP)5=qwB?sne+_ zOfJNYIUGg4HN|yv(PpzXHyU&A!g%*y{PynmT>YMKW;ioCn6SXbH0Bb|JQA7D9MbIE zWROl4p4fOohZD-OdND~X!NpR8mKm~~g=Dh`pEWD&R+7sqHn5uQbdmSf~m z%R1^gBxpXi`5R-Co?WRp1a$Tde>ku6}OjyV0)GtJIf-e0=w@%WdQ{2$M z+;pbX>m%m`+L2VBYXm_ZWJBoo7Y=CXhk z(r}Z`V%(7lSGyBfYU5?ZvYbR#7@TQ{mxZik5vy3jYWuArn=CfkyN$J!u#Pfvs9`;| zY~Uz9>TKG`CYspHRdVSekNa%lG5LfkV1TU*+x94hOju4*#1D%38L)G|*)BqrVTJL-AQc|Op>2%UVSmrrJ7jHiqn`8hN-=a9HU I1@U?R0e855djJ3c diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index f22909fa90..59eec8faa9 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -1,8 +1,7 @@ import java.util.Scanner; -import java.util.ArrayList; -import java.io.File; + import java.io.IOException; -import java.io.FileWriter; + import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.LocalTime; From 60e95081ff37433d4f36573d7ebd4e9927901712 Mon Sep 17 00:00:00 2001 From: kerwin97 Date: Wed, 4 Sep 2019 23:22:00 +0800 Subject: [PATCH 21/55] A-CodingStandard --- src/.idea/workspace.xml | 140 ++++++++++++++++++++++--------------- src/main/java/Parser.java | 2 +- src/main/java/Storage.java | 6 ++ src/main/java/Task.java | 1 + src/main/java/Todo.java | 6 ++ 5 files changed, 96 insertions(+), 59 deletions(-) diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml index 8b8765dcc7..de90a07a2c 100644 --- a/src/.idea/workspace.xml +++ b/src/.idea/workspace.xml @@ -2,10 +2,10 @@ - - - + + + @@ -311,7 +325,7 @@ - + @@ -565,16 +579,6 @@ - - - - - - - - - - @@ -648,24 +652,14 @@ - - - - - - - - - - - - - - - + - - + + + + + + @@ -680,31 +674,61 @@ - + + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + + + + + + + + diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 59eec8faa9..f4aa3db530 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -12,7 +12,7 @@ public class Parser { private static UI ui; private static Storage storage; private static int count; - public Tasklist tasklist; + private Tasklist tasklist; /** * Parser constructor diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index 5b28abd167..0b682da383 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -34,6 +34,12 @@ public Storage(String fileloc) throws IOException { } } + /** + * Method to retrieve Tasklist to get tasks + * + * @return tasklist of tasks + */ + public Tasklist getTasks() { return tasklist; } diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 584d726268..9dc795b6f1 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,4 +1,5 @@ public class Task { + protected String description; protected boolean isDone; diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index 04ccefa20e..0c7b6d7c39 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -1,5 +1,11 @@ public class Todo extends Task { + /** + * Constructor for Todoinstance + * + * @param description is a string of the description of the Task + * + */ public Todo (String description) { super(description); } From 56e163e9973866e9af60952be49c4fc93e93013b Mon Sep 17 00:00:00 2001 From: kerwin97 Date: Wed, 4 Sep 2019 23:46:11 +0800 Subject: [PATCH 22/55] Level-9 --- src/.idea/workspace.xml | 232 +++++++++++++++++------------------ src/main/java/Parser.class | Bin 5265 -> 5420 bytes src/main/java/Parser.java | 6 + src/main/java/Storage.class | Bin 4001 -> 4001 bytes src/main/java/Task.class | Bin 1141 -> 1142 bytes src/main/java/Task.java | 2 +- src/main/java/Tasklist.class | Bin 1811 -> 2638 bytes src/main/java/Tasklist.java | 33 +++++ src/main/java/Todo.class | Bin 735 -> 735 bytes src/main/java/UI.class | Bin 1670 -> 1782 bytes src/main/java/UI.java | 5 + 11 files changed, 159 insertions(+), 119 deletions(-) diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml index de90a07a2c..bc6d3d12d9 100644 --- a/src/.idea/workspace.xml +++ b/src/.idea/workspace.xml @@ -2,10 +2,11 @@ + - - + + - - - - - - - - - - - - - - - - - - - - - - - @@ -632,100 +603,125 @@ - + - - + + - + - - + + - + + - + - - - - - - + + - + - - + + + + + + + + + - - + - - - - + - - + + + + + + + + - + - - + + - + - - + + - + - - + + + + + + - + + + + - - + + + + + + + + + + + + + - - - - - + - - + + + + + + + diff --git a/src/main/java/Parser.class b/src/main/java/Parser.class index 2d1e50b9af892dcd4fa7727103253b244bf4d235..5ae5255cc6327120e5394fd33ea33efcad54fc8a 100644 GIT binary patch delta 2358 zcmZvdd3Y7o6~KRI<|Q+4GFf<#v`-)eihKcrP!??ih(WQS0n$K07J)|+k^o6C3CN;6 z(5e&{gb|g97?%>-LRlgqfPkVPBG}g2N^6T+yNFu4TcIGHJMd@U_r7z^J=;C^Y_qoa z);`JOU+y~yTqnIeCeRqAl!XQ?GT=^+G8TI*VW~MTGsn9Ob+^ZOmK%_CS>aK|N{@2x zako^W{5 zWrIf^O)-selfyF}J!vwQ&Bo?g6WVizdfw#)mmj)pc4+Z5!Yv;C_>s~4vCB_fwmNL{ z7<8HSQ7JM^+7JB`jRmsW#cG`@Bls?BAOOS{Wnk6QM5)Un^?C4&#R9CSJ4v4EFd zUNQJU4B^!nmI1Z_5d%^<=J1Aj*m0AqHyutmoD{5vGNEJf+{B__o@^fQmc!2+elBxg^`#Ywa>35;J;~u04sWYq)Z(&=1&!5pwG9rx42rC8JMTFB%Hh|+N-IA(gG!(2 z-0m}p$v(F+#phj4IsC@wx4h>wm1#b|+=QYf)cxQ_zcbqStIM}8XFqx6AQ*xG*;D>H)N*rKbH$W7x_}Jm{?a{ z=W|K$MU2O@V)S0cGZMjdY zcnZ{mr0Mn3Bjc04r2CQ~nL@N!e|Zb_=S!A!&=;DlkFKdP@|ciPbxlo8!j+CDs2W!~ zxsvTljw@eNhJ0Pn%Nl z{%N}-R|{7MS$=Mi>h~R5s*{U0n`^48lxNx?#M%iV*7_^9OphpzXtT~>rovgle1AkT zp}Zby4V_iig(zLgB$sTu(@iD4bm;mioUIx;SeKNHIFve+Ig~p(tfZ>1IaKNmvow&? zVJz5lb`fpE+hETOiL~OrF~5!U4Mf|?XtBrijb)l+HaYENwbP-`i&$;M+UeM0_X$R% zm&&`ry7XqbHW-v~LaNtgo{){f$;_F_VFmWUSYha@n=vYg3~XcQxORq_Q@=Kb8y{rv zCvQsZ`aSeGG;SANl;5@G!ls=XWwUgX9^~02_EdYS?iUNqfwWPhFYK@HA3zr0B+fw1 z#vskXVDcG4U#{gEt|K{wZ!wfYMk*Z3FirY!P4M-)+D5308+0KQ(V)_0+{kin;z35S zftzV&G@BX24sK;P#q3w>BaGv1#iz80A8P?WRc~jRq-{T0qTD8#OpzE2SkAG;a#(6*u*`~amzBfaRvyc(0+QBXR#-(OS6btgn8>}> zWbU(OaKBZ_DyvZym-3LchKH?nJYub9jkSeGtsSh@vaYlC5?Duh%zB6Q)+rvhPVbr<$GqpK7oomNTT+81;7!$6~H_l9{u4+D*Ez%&cjLCG_Kv zsggr|Vx8K^F7B&+JR&$A>z=%!ouWcV&vB=nk%eyDjoqlMHf}16Dn057?Zs|3ifR4g zY3+Qc(2x7E(V=KeVS08X(oAOD+s7?X=(R8)JCbsRbL(YJZgwQ~3a9uo$2a<8Nvc8I zi$~+>`?Mb^%!p^~&^W`n(62|1(tB{wIb|=M*r(~*uUp|I3OJw>a!?20kS6zKZQfUO z%N*9v=&L#gudzrQ{2q?7ir4kievBsG&=Gi(?VMEWx5By&AdlC^6D}PtPrB@K_?D*;e%qsvrwsCGmrj>w z9KPc*{(|beF3-9=r;Anayup0WGoJckINpzdtLfm_IfO(-({cSy%B`{ z5iCP&Lqdim@v_4!W*djh$$a18RfogDGU*<7#NjoE*9EV!qN%yMsjRx9O0Y-g&2spG z!y9Uty1cTwv8A@5zS-f;V1{*#bJXF74nGP4Yjk`rl|HvI$ES=LJ~O%1=g0iS;io=7 z zIG2xwjN*odmgbhGipJ^HEj0~Q&FRVf!{who|Ki`e#LR}O2A}_M+UJa!@qNzve8OOG z${vSxVsffHq|#h&S2{0v)1Mr_Lvwu8r0%cLtfmD(Zc!Pc~+QXG`0AC=ai zAfr5Ha>iyStLn+Nb$UP|H>Net{ycrkHD(PE1d)NYCk7^`1x_lW1fz&0H5}6;oKF zu#H?#J2%k5mw1{R>7s;QzRZ4Y$-_+3Zn>Fbnv~<3k`FW~Cz&b2trBLIq%&J0+$JNq zT|=HDmuvP5m?tsrkSWZUsgz3z3uFcrQqDqIq+QcOm8>ORDfe-wY@kNAP%ArGBAp6+ zo(4HYqa0?LyiSw6O|!g5i=3cUKBP^~aF^w<+)87G6=9{7%_=LG)m8y_TN7AgO(AZT zDxb+(Yc}^<^I2ytV!hR(xRq?MHnY*%%Kg^%I1gCQu*vFTvnK38Yad&zBW$(aBCw9J z&3cFJ*1PPmPVkU*j)!fRb~}Teb~caLQ69BN@tB>*6Pln7dje0|MLcCs((^L~)=mzC zGykdXUSMo+DLNa+c_MO2%BQzbZB8hdAV(C9IV>94Aqk7cJ_dU+__6Xt9>- z|0xAsCf7`8rTb?|I!);(l$YpCXK*a;)KE;HEYh0M`ytUQ(}!FtMM3qD%i`DeGco4m z+gC=NekR4-s2iEAsy?oZg;kz%QT8Im2AEP9P3h=~cHzZ6`W2sr8PzUKzZ$K-D znAgd;tWeTL&5ai{Ia#6Pi<+A*Xncb&A+8QlFB*=f4rr|rON*v;X}pPA*UrvXxeJHg zTI=0hLXRHH9_`;=3h2{n->cQ!uhZ<)`X11Z-LHSi7qzxuqKyOG!$JLFzRWgWVJC+) zEwAzdM-=f|B0=K_#m_4$?SBtcM02p%VabIPPsmGEhRjS?ua-K!9Q3-;z((mm%sgq@ zB6GT#wwLKWgm temp = tasklist.find(ls[1]); + UI.find(); + tasklist.listfind(temp); + UI.printLineS(); } else { try { throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); diff --git a/src/main/java/Storage.class b/src/main/java/Storage.class index 9006fd7d670f3c6066e9327303b8841dd7774e97..5795d4bb6d1cad92f94f3d14ddbb485eaca068aa 100644 GIT binary patch delta 331 zcmWNKNhrht6oBd->Bw11EH*5Zk&K;8%E`r{iBqqFN?bH* z-b58{s%fQ;c53LLmSO6R$CyrOG_uS#Qw!0$NTkj1m`Bn*>bgmyhZK5AqmLZ=DPVv? z1}SFf?$4YW5f~*3FA0n(e4Gp>$i_zzlZy5!a++pl6zJDxR=)tN%n@Xs4Hh_Hkqef% zXPGC}XI6OC#V2e0X#dN)M6w}qY)Te}^SQz*iI2rhXq`>4dW)nt<$*Y;o8D%CvX4Ym^ WU|?lXoGi>@%Bl*KSDWn1q5%Mdkq>qN delta 67 zcmeyy@s(r3RW{!A)DoA}jd%K(czGCD7qbd#oKdSwaGeBm?tPuq2RZP!f8xZYZx zH=J30zCn$w*Xy%(-DbqRCWMkOPf~kv#jrdHN?!9NU%!p|3x-~AFpPwBUTbfHQ^z1A zOH@wmd-8>D$XMHf?k63XqYDO8r}C9Tzykre=2uKfG!=rY8x6zbHbx7UD>q21-J(mn z>glzm8NC_8ONx_6rd5})H{Z1!;h*bzv|f)-U=XAbS~hfRp;+}C(^@F~7tG`DYrCF^ zNEUT>&URStu`b>LfDO6t$showYPX!4amf@dO^XHy++$++RP4tA34L7#QN=D~RLtRy ziecO(ox)SaD8^LW!(AEoReX*I5_X)oZO`=_y*Xoei+0`Jp1>DLe5v9gbQ$w1YN)F) z@JPicn2;dlWGtvygsI{&?r@^oMKPFPijU&P{9~iWw)NfL3XRR?wDAsg5)n9*3ipJb z)3G^}n0&`rwpYkQN1p1c>lw?8=nqMFD^0t2lMVFPMnhjNDOf^-97tn1iPO8RFB#Le zRnxsW(_5tEdb;Itu8-v_Thn${5{^Zi^NnfP;-*O2ur?uU4->oD!|A_ZxHZRYdZtao zUF{3g+4_wD{ZZtL$89!D654Hg3SCJ~7*ASy!fkYi-=W#yIJ??3 zx|nw&YLCX&5Yu|2Q8hiIB!ko(*@CZIZ4&nXza0+p?cc`_LJVvWGF*3a7r`F>??t~a z@56xq97L8+l{UPLTyxxw(=Nhi@6by~KO=JYC8FBU@K1<+Pp!oGJY#fV8&{QoY3xJ~ zPY&UOFvig^hBEXcV#8~Q&%N^%pDoZseAU=h9C>e_41IRf`Y4XQw@*KP_R%_z0`umW zIm?~IXI#|w9fbf=!dGTPvWB=D#t2v8ayW#e3YUR3Bz}Rs+4CT6`GN{Pa(s#;N#U`E z*v@vnu(tnS;Nj}NX5ouFOYf~XC;4TVqz3JOS#OSY*)xmg}3!8 z*}2A&G%{3SLvHz{^dR~cX&EI++9PU-vP=sI2|klCWe!_( z#LUr@*}DJ>Q}3ajf+ z9;O_iowCS6$c2=PEV*t_>%SCnIpqq=Ay-qbaos%*M%>HbQE-EsZn*F~3RyA09hVi` z-d(p?eCyqF--^pKWep7lJftVvugs^ae+L73JV-6~I~kIXh0%nvnR`|mZSK-pReabc zo9Zj8M@97pyK~e;nAHtsS4Xv2c#l1d{HHpoYE9=&_Wr6q{ll%RYRaSRQ?E?j8p=HR zV&@Ho*9trgUdj&}y~~U#Yq4L}C`PqGQln&>ls*vt%WMj(Mdyrl@<~l4GRh{=E5&~c znLvl}9FC;61d^UWyteThzqNz5?$HtYU~iA@Xm-WMu2Gadqzz7J^e$tH$C;9~z5Czs fy|0=pP}v@-%We5Yjc&2Vs-ESP@<{oN{?k7Jqy9jQ diff --git a/src/main/java/Tasklist.java b/src/main/java/Tasklist.java index 8558eaceb2..2f73c78c50 100644 --- a/src/main/java/Tasklist.java +++ b/src/main/java/Tasklist.java @@ -47,4 +47,37 @@ public void listout() { System.out.println(num + ". " + tasks.get(i)); } } + + public void listfind(ArrayList found) { + for (int i = 0; i < found.size(); i ++) { + int num = i + 1; + System.out.println(num + ". " + found.get(i)); + } + } + + public ArrayList find(String word) { + ArrayList temp = new ArrayList(); + for (int i = 0; i < tasks.size(); i ++) { + Task t = tasks.get(i); + String des = t.getDescription(); + if (hasWord(des, word)) { + temp.add(t); + } + } + return temp; + } + + public boolean hasWord(String description, String word) { + String[] ls = description.split(" "); + boolean a = false; + for (int i = 0; i < ls.length; i ++) { + if (ls[i].equals(word)) { + a = true; + break; + } else { + + } + } + return a; + } } \ No newline at end of file diff --git a/src/main/java/Todo.class b/src/main/java/Todo.class index 102cf150147b7183027b78a48f8c075ad3b101fe..c809d9654255b5858a08dec0c2c00ec157243404 100644 GIT binary patch delta 23 ecmcc5dY^Se6B8>J11kgf711kgT!ACu3r~ zo4I=QAJD`f@!%hz@$SFj#iQ|!kPyvoGV|u`yzgh;dowRnzf#`U-=Dt#sA9{(NlZBy zz_g9C$aBm%n8h4NLH#UplsM)&&T*78q`1Jb#8Kh6Xkpnx^;PY8XzYdUT?Xe~)ax{Y zTG$F0tOs8CvH!$(kwMnQDP%2Na&Z|~82al$s})TOZ}vcJ^!5V_S6!^&8pH5*(~m{N zZwpWCMq)4Oh^JBShKmto8CK*XtH@QxWx!tB*Ewio6>HMbHVcJ%&gcv zu>DBHes{ks!nVS6L@VsZ@~-wmU&l@PL)$sAp#XKctQXj(e5k)S?l9!#nvs)LqqIIi ztx=x?rmCQMki1ENk&OBdIa1y#eD_L(9ysdN?{y*$RUjhiW*A> z_a%U*2s}-a(*#kOelv5=jx(KsOYg!acw(lh1YnVXC6eTlCFul7nIsD&nK+c}P(|}c v4RJp~Q$6YbN0z2~=~dFaL{(SF3i36&rQ2lH&E0~B8g*-dd`|v(8jF7bMy_F- delta 586 zcmZvYO-mbL5Xb*dHk*BRyD@f?MiZ?*G0m&5eKS_uMx(|=a&PD@Xhbk=K0VtvFU=Yed1SuO6 zNJ~6%kU>@==O^q{NiRjyZ{^63;9=xA5Y$esp>bVbU?O?BMVZp^KEDFTm?Y2Itt=30XSKD2+)7@8x-Gj1=A$WRD{Ii!NUb}dM zw>lQs)F*)>ql{%eU^GK3etKPZjDpzEUyL83rW?UVCBg&z$A$nmp^Y+1(F=OBcnwz=Z1djU-!;@z)@4{n{ z1l#^Wev5u@CKLV9!&DPghkNR0Q;C@VY9_2iFZ1VC{RHdNtWRR(nkGVHjXo_47dfh< y_pcYeXT2hUlWck18@CrqmioXMs Date: Fri, 6 Sep 2019 16:55:12 +0800 Subject: [PATCH 23/55] Test fixes --- build.gradle | 12 +- src/.idea/workspace.xml | 372 +++++++++++++++------------------- src/main/java/Storage.class | Bin 4001 -> 3987 bytes src/main/java/Storage.java | 8 +- src/test/java/DukeTest.java | 2 +- src/test/java/ParserTest.java | 2 +- 6 files changed, 182 insertions(+), 214 deletions(-) diff --git a/build.gradle b/build.gradle index ce97c7ba2e..7a95e5eda6 100644 --- a/build.gradle +++ b/build.gradle @@ -10,11 +10,19 @@ repositories { mavenCentral() } +dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0' +} + application { // Change this to your main class. - mainClassName = "seedu.duke.Duke" + mainClassName = "Duke" } run { standardInput = System.in -} \ No newline at end of file +} + +test { + useJUnitPlatform() +} diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml index bc6d3d12d9..18c53d4cf8 100644 --- a/src/.idea/workspace.xml +++ b/src/.idea/workspace.xml @@ -2,11 +2,9 @@ + - - - - + - + - + - - + + - - + + - - + + + + + - + - - - - - - - - - - - + + - + - - + + - - + - - - - - - + + + + + + - + - - + + - - - + - - - - - + + - - - - - - - - - - + + - - + + - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - - + + @@ -185,7 +137,7 @@ - + @@ -198,7 +150,7 @@ - + @@ -210,8 +162,8 @@ @@ -235,8 +187,6 @@ @@ -255,10 +210,9 @@