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/28] 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/28] 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/28] 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/28] 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 2d9466424d424beedd6c0132f9fa3f19b6d80697 Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Wed, 28 Aug 2019 18:13:36 +0800 Subject: [PATCH 05/28] Level-1 --- src/main/java/Main.class | Bin 0 -> 1926 bytes src/main/java/Main.java | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 src/main/java/Main.class create mode 100644 src/main/java/Main.java diff --git a/src/main/java/Main.class b/src/main/java/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..638069c0d280629f47725bb0636c50de277b72a1 GIT binary patch literal 1926 zcmbtUT~`}L7=8vqcG)ZtLK8x@b*Z$3&s1&gM=DjQNNfVtAP80KkPKwYW@pWAdW^UJ z1uyI`=xyyq=%Gh{fPcd)|AI$b-$_zQ3dfu7#mvt8@x0IbG4uQL!`}d0foE2hzE9&oRKd#}ra?TjIfe+MiL1}O5_)v*I z(y*vw$v_;pbbPE~S;Hp`;TyJV2MY|nsi_Ty(2^_(hM}D8iq%?WM^xAOjzg00uB=vg zz;GdzyU!o+w8P!KbRnqP?p|ipI5w0yn#1OjKgAxE=n2rL6v)X5tL=g9||L@ z<5Ls2l{)ci9*eczT~TEiZYpYl?W7Au?z*C?P$x{}kT}k_QltLt)P;$!@ePBuSQqowiu8mPNXr*OxmtXWYGC?~5hr7J0B~2W9&61MUVsgI4DLs`#Fgpkdu+&|NyH zNo6>dI&lUy#m8a>O(XX_;g%R?Pa3&nQ`Q=V3`1Yhk!n))K(>axtEh##ABYO^ku_o! zZ^76yeTS|^K=y)H2xFw#&2BMe<0&JDy40gub>y6Nz1op;vdx#=I~D4(hQ)U^?oeU6 zu2HMenW=3JbQ^Ai$WI)NlkGl``=WhuTUB1>#Xwf;8ukb>C*^+4V=%L7?w1_y`+_3; z+*!3YM(a|oaJS?Lf1>4>IabL|Ntfe#-4mV4_FK|9o-b4B0Bu7oamOjxfyihmGn_w` z-$~pU&i=n0#_63rO;0b-2c{kpTF=nw4DC!wrw_n>p&x>xHQW^TLRXib{*~!8?aI`c zeu|z$^a79nvmaE)CUhA6wCfb`rQZ*v3z7EHGlaGd(3g9L@D_#B^0N)-50Rj)e|2W= z5C+gdWb@IBKS^ZHG%%nd^fVcrBTOJdtBGL@Ac;X@HG~wRm?23TF`Od{6FvW6SVKrd zc#N#+(P{IaBqYT@@&tpF!cYUzql67o0tuopN(r3Dg|^dAM81zS*A(d|7(PHO7aMts zQ_<3|i06A3h-Lrv&{!yzXkhdqBC#YXA0aXpQu~WPRESmv^TZz1gb0;CO578aSCXo9 zmTHwE?sLTTB89$8!LMSnnN1wM&yl25G)%I;F{&Z{7c}COYQj#TM7u#;cd&~h^>~)f NgA{O%Wb@7S^1om1%cB4Q literal 0 HcmV?d00001 diff --git a/src/main/java/Main.java b/src/main/java/Main.java new file mode 100644 index 0000000000..f8e0c06bbe --- /dev/null +++ b/src/main/java/Main.java @@ -0,0 +1,40 @@ +import java.util.Scanner; + +public class Main { + static String format(String command) { + return " ____________________________________________________________\n" + + indent(command) + + " ____________________________________________________________\n"; + } + + static String indent(String command) { + StringBuffer strb = new StringBuffer(); + Scanner sc = new Scanner(command); + while(sc.hasNext()) { + String temp = sc.nextLine(); + strb.append(" " + temp + "\n"); + } + sc.close(); + return strb.toString(); + } + + static void response(String command) { + System.out.println(format(command)); + } + + public static void main(String[] args) { + Scanner sc = new Scanner(System.in); + response("Hello! I'm Duke\n" + + "What can I do for you?"); + String[] list = new String[100]; + int len = 0; + while(true) { + String in = sc.nextLine(); + if(in.equals("bye")) { + response("Bye. Hope to see you again soon!"); + break; + } + response(in); + } + } +} \ No newline at end of file From 706bf7e697be8a3a4acd22737b36fcc617e231b0 Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Wed, 28 Aug 2019 18:38:17 +0800 Subject: [PATCH 06/28] Level-2 --- src/main/java/Main.class | Bin 1926 -> 2157 bytes src/main/java/Main.java | 11 ++++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/Main.class b/src/main/java/Main.class index 638069c0d280629f47725bb0636c50de277b72a1..a7ddeee1a0da7ec5dffbffb83c0afbb9c480aa47 100644 GIT binary patch delta 810 zcmXAm*-leY6o$Xuo{8f@pir3awBC3bbl8CM1g7;0-y6 ziFd{uu89!|CO&}5TX5?O5JmT{=VGn1*1!MtuVFRoSN8JvgPm_cD@mJT8f=Pa^vOiC z$w?cH29r}Z2B(#2QKr?0pjlyUDr{GOXEQj*c}4E9xxhsgb}F>XqFbdeneL?-T5azbS9fmB19Yz>+xT{LsW60#b!vh{V z9H-o5%wb#+B1|ZmNq0}wl~oaxN=iC38=0R9g;PuM`6+>S;(5#=O3ZEYRAtS^lPQZw zN_om++6{Y}jW{!c*Y2*T>(j31t;iJUqOnxif?##u`erc4ibSKaXnUzJd90WTH=@;u zMR!g6ESB6(y+5}|-a>u4T(z8A+EVv}p6@S{IYUOswOOk9H1b0)ELO;2nf=c($dFu1 ztt+N-3#bjWNwqUfj^+_ zPzW-pFAiwo6|cnKZOZx{R2PHfxjAO}as};F(oGfpvd=N;W3r<;YFVI;7u2&%1Fs12 zh9>zEIi-2P5fj6tR{W;G#Qz7si6-_b*~i`|$0L_hmzJt$UV2-OI4cXz5s-zDJ!`U< P-~>6!ok<5*)3*N~&t!lv delta 684 zcmYL{$xl;J6vlt|wSD*X@lq-guvVbTP$){B5RgFu#Q`b`&f-v^3dUH&;KB_HjVlvl zu3MMJtwT^kqJMz@h704u1zV%&xlN;YamMdE=esxeNBl|U@|TUZ&p;P*K3mE7BxtXa zLRPceCrn1O$H!%_HT$gDUxgxTdk1XVWuxvWJsh;;UY|btZ8~7Phdd73@}OqOW7wyf zBOXUJBbs9h_xaP6;o}N_vbZ!qT^O0WTTn!E`MG-?ck&PN0ZFz6Y$v6N4;71x3ybsl z`?v?IbCh7UQx5=Wn^qQA&+QJMBYfWi>;HaPQ0?!%tzE)2^95W-BK}xXBA0op&9WO>StDQ z)(F9yfB2Y9OQT();ywE^W!^*Sg)y^kpQ<;n-1O8Afd)9g*`x_;+=Rg8dS!STr?jTx z9WmKd`GNRpx#D(J5W1g9@{z8z-9S z6jC>7tcq$v8*C8?nzZ^wt)}`XT4uGDh;7V>_hrXTZZR#NWvApZ8M#Yp9VOfO7qSUk AlK=n! diff --git a/src/main/java/Main.java b/src/main/java/Main.java index f8e0c06bbe..2178b31c43 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -33,8 +33,17 @@ public static void main(String[] args) { if(in.equals("bye")) { response("Bye. Hope to see you again soon!"); break; + } else if(in.equals("list")) { + StringBuffer listBuffer = new StringBuffer(); + for(int i = 0; i < len; i++) { + listBuffer.append((i + 1) + ". " + list[i] + "\n"); + } + response(listBuffer.toString()); + } else { + response("added: " + in); + list[len] = in; + len++; } - response(in); } } } \ No newline at end of file From 219746451e4142296d12e2627c8f97d48c7467f5 Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Wed, 28 Aug 2019 18:58:08 +0800 Subject: [PATCH 07/28] Level-3 --- src/main/java/Main.class | Bin 2157 -> 2662 bytes src/main/java/Main.java | 49 +++++++++++++++++++++++++++------------ src/main/java/Task.class | Bin 0 -> 770 bytes src/main/java/Task.java | 25 ++++++++++++++++++++ 4 files changed, 59 insertions(+), 15 deletions(-) create mode 100644 src/main/java/Task.class create mode 100644 src/main/java/Task.java diff --git a/src/main/java/Main.class b/src/main/java/Main.class index a7ddeee1a0da7ec5dffbffb83c0afbb9c480aa47..b04968cc08b04dddfec67e1ec7bcffb4a4831a21 100644 GIT binary patch delta 1424 zcmYLJTTmNS82--gW_PnJkcNh`1;s#FncwJC`tg(jG!*o%@1 zc&T@1pE_PG5aR6ML=T0;#++z>FsS&wpf z)D004H|_qo8x9_^1_u=!R}g*c;^ycH1+xlb4BAxsbY?a_l3a*0I47dXRN!QEDXPPZ z4jsGE#o!uBr*qj{Cb~Eg&n42aY_*KIiYIlqsD}<0R%)Ea*6el#Vpt zViEHSp3;#)R!1kg6y$WAMz?j9b%uiIW{{3Vv-3KZ@HCHlM#otYJcsiP;)%0y9naud zVl5=IIdZXd${G+_O%=;LfxM0jIIrV5bf{QSvC0S6R6K8Ggl->$a&(+;-%rQj=L#-F zQ**(oTqc>C)9?abWLP!nv#tvLpZ_K-vRWw>KSOcUL^PWiPRHn0#17x6H7&J>5(`+% zQeaHsl+hHiv{TW{{9yJ_Iz>F+WO6p%Y>s-D;wB%D$IM(JnKg41-;8EW$~+!6HPd7a z0wdGcVfh`6*4v_CeJoYUFY(l0wXR4$_PX_p^aXpvdeMjdCWI2n0_(T=RUFz|%W#rcdC70BJ4bU8tb{zk z{MJXZHy0@EDIsUkc-&yDeZ{E z)I_l5Kgi#KV9N^mA@r=jN5039-E~D6m(VVTlmbk`J8fJmaqJ>oZ)4dJQas8hv}Tza z|9H9vwN`4!+zphRm=8$>tZqS?*?=RgiXo@R+3*3H4AtY5j(2*TJw-H@unQ=nVtUQV z3O9Z-)FLWraRFm=f+i^za^57GxB1P0P4F2GqBu)*41_g9E1|`n>1^0S&5YsL$fI>? zO<;xc-^A1T-3oTiS71`Vo^Em%-DMLh(TqCUrJgo0=>YBYmb^pKd7s4dAt|Cj+E}M5 ze@V6enhN+W`R@pSPgVH=d+;MYF25p#Kj~fj3w`*Pd>Q*$o}r&rVSv>k!dh{Fc`?ZR z7-9hogKMJ~l{a`E3ic@2%Sa)lhcbTzd+BG@)%s5DIx0v!>>8S{K{NkBn?U6Y*=N~@ mSIBFmjEi^;FVpph3AdA``)OjeE(7l<& z#FdE~b|#_}0zvow1NX*+g@1qudcScN_s+fN+}HVj)&6!Ze?Qpz3ZMri6@Eli_z=}8 z(Iw-A3IP!rCsjx|#Z5OiJvtb=IM&O$+%H}c*j$}HUkItu`r!@p{L_;%z z46gn{pnjDl2%*XU{5_Gk0vAqKYi$KUdk;nE69!5=0hlH1~z5`B8LAPdKw+eiPf-Q*&2b zXGQb9l&JBM`ur0~T)LEOqj?~?jV8)T6oG_N__`L-E;sl&a+tFJYa}?RR^b9!jI=z+ zn#@(XwV{O=8f^QhmLbTHyu_m8EY_~I?GF~gwyA5G{17cjXcT0xk{{Wv? zG$dg%Y)D;OsK+uYaE`7>Z1wL?uUNq$tAXJaw$K1j5cYe8)QX+(x1VSg8~DP*s3ltu zCy`tvots4S(8>Wq+eoGe$AdWl1WAf`-3_e#y$*Ej_o0^2XznCHWEE#Z4ySFyh>u_sN({>)QE2-P&0<(mOX9R IYnDy?1F5!(NB{r; diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 2178b31c43..8363f6927b 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -2,9 +2,9 @@ public class Main { static String format(String command) { - return " ____________________________________________________________\n" + - indent(command) + - " ____________________________________________________________\n"; + return " ____________________________________________________________\n" + + indent(command) + + " ____________________________________________________________\n"; } static String indent(String command) { @@ -23,27 +23,46 @@ static void response(String command) { } public static void main(String[] args) { - Scanner sc = new Scanner(System.in); - response("Hello! I'm Duke\n" + - "What can I do for you?"); - String[] list = new String[100]; + + response("Hello! I'm Duke\n" + + "What can I do for you?"); + + Task[] list = new Task[100]; int len = 0; - while(true) { - String in = sc.nextLine(); - if(in.equals("bye")) { + + Scanner sc = new Scanner(System.in); + boolean isRunning = true; + while(isRunning) { + String in = sc.next(); + switch (in) { + case "bye": response("Bye. Hope to see you again soon!"); + isRunning = false; break; - } else if(in.equals("list")) { + case "list": StringBuffer listBuffer = new StringBuffer(); for(int i = 0; i < len; i++) { - listBuffer.append((i + 1) + ". " + list[i] + "\n"); + listBuffer.append((i + 1) + + "." + + list[i].toString() + + "\n"); } response(listBuffer.toString()); - } else { - response("added: " + in); - list[len] = in; + break; + case "done": + int item = sc.nextInt() - 1; + list[item].markAsDone(); + response("Nice! I've marked this task as done: \n " + + list[item].toString()); + break; + default: + String description = in + sc.nextLine(); + response("added: " + description); + list[len] = new Task(in); len++; + break; } } + sc.close(); } } \ No newline at end of file diff --git a/src/main/java/Task.class b/src/main/java/Task.class new file mode 100644 index 0000000000000000000000000000000000000000..8f60024ab1926f39a3aa7db299293587de627181 GIT binary patch literal 770 zcmZuv-D=c87(J8!&8FR&ws!q*tE;;ate_xL5sD%RRWDM7>Qy$4OS;{pB(uJVHwxZ+ ztI(d(@>`6hGbeCIo7CO>|C{SM$30v9&UHQ?gBDi<6qJ6LhBYU83y z;F61z=-9X{(A-JNxJdV9nr8z3=5F*VTHA}V!CEMbG#ji7SZR4b&k_OgoSQpomdd*V zi{0bg-ZKH?UcN(aYctJ~$Kz2yDYl~i9+8a8taj$eytYenn2(D%d624^jjgC0UQ?Mow9xj@gy&%fvjY0h zcdx7ZM!@Wp%bikS?qB*R{oN#%9_F#&p^F}aDXj_4pOMzfyck7N;P#X|dGTM!T6BF% zZmjTGY(Aa_Lz(24p?q>R!P~?f>j~~|kfCvH1)m{;tB246{Sf*`LVP|}pN*=?fQ1Gn zXW{UKF^&Xoaut=p0raK!|PRKpzT}cH`v>H@Ci=1Z3G9JoQn Ih-o Date: Wed, 28 Aug 2019 20:21:11 +0800 Subject: [PATCH 08/28] Level-4 --- src/main/java/Deadline.class | Bin 0 -> 657 bytes src/main/java/Deadline.java | 14 +++++ src/main/java/Event.class | Bin 0 -> 651 bytes src/main/java/Event.java | 14 +++++ src/main/java/Main.class | Bin 2662 -> 3924 bytes src/main/java/Main.java | 98 ++++++++++++++++++++++++++--------- src/main/java/Task.class | Bin 770 -> 900 bytes src/main/java/Task.java | 13 ++++- src/main/java/Todo.class | Bin 0 -> 272 bytes src/main/java/Todo.java | 7 +++ 10 files changed, 120 insertions(+), 26 deletions(-) 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..b8e1a5ae6b38de098229e404ba268f68e2a5cc0c GIT binary patch literal 657 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 delta 1322 zcmX|BU2GIp6#nk)?983%l(w_o(xHFbZht9dYoSZKr3kHnU9+VhV{GdeVLlO^59I_F?E*Bbxl-FS;4!a1U z*Jbv{T!dA{2)3IzY9j4h;tl_bR&AL$X5tAG8UJIgLN=kP<%XnI-QtEPmUx8XHJeyj@Wn!FMqb8pA-IW zvn#GoX3wyU98FJ;_D^N9?4h}3kARUqaVkAAEf8(?f0Pk%*#E$su>>?B1iG62tFp>p z7MA}*xVV&MWIB_{W>PU>;-YHkvR@}##1(%)ey(2?Xz<&tYCmqZMjE&o>IoBg&X}~t zPg`Zt_0$=ZK%k_WTwu9uRa7a<8fx#v7_b;C6*Pgzx7N;nES@Tg%T6G3B#i|5ef1P*p+iCkIlUS%E;HU(p~6KRzR$>Y5{q|E%^d& zapo&T2132dFor%w=^~>0^rRluuZhC8JjzmGFPt*8r0E%Xto?`yv7aXdF?)l&4vF|Y zc^^8izfIoZ8E$zVbKW&HhLUCuF)G&OLAgv7T5Im#M>R7;rZsEN~3kGV#^=5KN<-XUu5aq2lDcbzzYNwmKqQs0xWQ2v>y z{DMvRmGAu@Na9a^a{fXW{v}^UHy5-=tie`Mj$ToZZK4S~#Cr6Jjpz?{pc93+RUalc znb^#gHMn=H$nyKt$)6}Ha@N_mP{1t_H&J^NcI+QCXv8lWTxJViCAYa5m+%^1;rLUO Y8@azd)NKuDe?T7z=%WEW641y01LCpNumAu6 diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 8363f6927b..23463cb168 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,4 +1,5 @@ import java.util.Scanner; +import java.util.ArrayList; public class Main { static String format(String command) { @@ -8,61 +9,110 @@ static String format(String command) { } static String indent(String command) { - StringBuffer strb = new StringBuffer(); - Scanner sc = new Scanner(command); - while(sc.hasNext()) { - String temp = sc.nextLine(); - strb.append(" " + temp + "\n"); + StringBuffer stringBuffer = new StringBuffer(); + Scanner scanner = new Scanner(command); + while(scanner.hasNext()) { + String temp = scanner.nextLine(); + stringBuffer.append(" " + temp + "\n"); } - sc.close(); - return strb.toString(); + scanner.close(); + return stringBuffer.toString(); } static void response(String command) { System.out.println(format(command)); } - public static void main(String[] args) { + static Todo createTodo(String input) { + String description = input.substring(1); + return new Todo(description); + } + + static Deadline createDeadline(String input) { + StringBuffer stringBuffer = new StringBuffer(); + Scanner scanner = new Scanner(input); + String temp = scanner.next(); + while(!temp.equals("/by")) { + stringBuffer.append(" " + temp); + temp = scanner.next(); + } + String description = stringBuffer.toString().substring(1); + String date = scanner.nextLine(); + scanner.close(); + return new Deadline(description, date); + } + + static Event createEvent(String input) { + StringBuffer stringBuffer = new StringBuffer(); + Scanner scanner = new Scanner(input); + String temp = scanner.next(); + while(!temp.equals("/at")) { + stringBuffer.append(" " + temp); + temp = scanner.next(); + } + String description = stringBuffer.toString().substring(1); + String date = scanner.nextLine(); + scanner.close(); + return new Event(description, date); + } + static void addToList(Task task, ArrayList list) { + list.add(task); + response("Got it. I've added this task:\n " + + task.toString() + "\n" + + "Now you have " + list.size() +" tasks in the list."); + } + + public static void main(String[] args) { response("Hello! I'm Duke\n" + "What can I do for you?"); - Task[] list = new Task[100]; - int len = 0; + ArrayList list = new ArrayList<>(); - Scanner sc = new Scanner(System.in); + Scanner scanner = new Scanner(System.in); boolean isRunning = true; while(isRunning) { - String in = sc.next(); - switch (in) { + String cmd = scanner.next(); + switch (cmd) { case "bye": response("Bye. Hope to see you again soon!"); isRunning = false; break; case "list": StringBuffer listBuffer = new StringBuffer(); + listBuffer.append("Here are the tasks in your list:\n"); + + int len = list.size(); for(int i = 0; i < len; i++) { - listBuffer.append((i + 1) - + "." - + list[i].toString() + listBuffer.append((i + 1) + "." + + list.get(i).toString() + "\n"); } response(listBuffer.toString()); break; case "done": - int item = sc.nextInt() - 1; - list[item].markAsDone(); + int itemId = scanner.nextInt() - 1; + list.get(itemId).markAsDone(); response("Nice! I've marked this task as done: \n " - + list[item].toString()); + + list.get(itemId).toString()); + break; + case "todo": + Task t = createTodo(scanner.nextLine()); + addToList(t, list); + break; + case "deadline": + t = createDeadline(scanner.nextLine()); + addToList(t, list); + break; + case "event": + t = createEvent(scanner.nextLine()); + addToList(t, list); break; default: - String description = in + sc.nextLine(); - response("added: " + description); - list[len] = new Task(in); - len++; + break; } } - sc.close(); + scanner.close(); } } \ No newline at end of file diff --git a/src/main/java/Task.class b/src/main/java/Task.class index 8f60024ab1926f39a3aa7db299293587de627181..1ea783215959b5f350aa43f2084c0c5fe7b67a7e 100644 GIT binary patch literal 900 zcma)4+iDY06kTWTlT4a6R&8oi+iGeuz4;)BRD_}ygsKmzLiA~pjA5E)CS)dp-{Fgb z@4hM+6+u71&+tRUb!O@%G!HVc_Bs2kv(DOk_V=G(z5%$7t2x+Mwc%h*!X*ipB~&e} zTexDOW}=>B!p&h38zwddwB*IW7bqPZdC$F_V=wIPG?HNuc6SBx9Y1algFzBRA(1^y>fe@x-qQHOfPgCO)DjQTBqc<8l`nJIMrq>*^Z zD8AR04(4n1)0(7_)9&5(2I(~uTLQVhH|*`57*%WX6(>tQ3N!as5@mIg+=xcQw!a_9 zH|;|&?rqCvI5>kP2L;SHC`y=>Fo%+W`s2;Z6kqW|HLk`h5(H-dHt}KW$ZsbO&SSyB zHg;I1RG#4cHefu9hJ7!Y-o>Z?l$?p~PU!+x`CDy{fyR%P(-mE(k;ct&|Gy4{XGu_&Jh=35N*=spyeqlTU5XTS3(wgB6*Eb zkXdv;Kz|LZWW0r5GT$+!q(Vk|JclwfCKPASq_)5XED@!tH4>$Q;c62Oa?FDaoiYNI zDf~&t8NW=v)L;JNa6fGVuwJsvudtgcohpr{=6>WbG8lRDu#Qy$4OS;{pB(uJVHwxZ+ ztI(d(@>`6hGbeCIo7CO>|C{SM$30v9&UHQ?gBDi<6qJ6LhBYU83y z;F61z=-9X{(A-JNxJdV9nr8z3=5F*VTHA}V!CEMbG#ji7SZR4b&k_OgoSQpomdd*V zi{0bg-ZKH?UcN(aYctJ~$Kz2yDYl~i9+8a8taj$eytYenn2(D%d624^jjgC0UQ?Mow9xj@gy&%fvjY0h zcdx7ZM!@Wp%bikS?qB*R{oN#%9_F#&p^F}aDXj_4pOMzfyck7N;P#X|dGTM!T6BF% zZmjTGY(Aa_Lz(24p?q>R!P~?f>j~~|kfCvH1)m{;tB246{Sf*`LVP|}pN*=?fQ1Gn zXW{UKF^&Xoaut=p0raK!|PRKpzT}cH`v>H@Ci=1Z3G9JoQn Ih-ofjU8-$W)%Egl1>46IbCKM4EX1IhScN?uLZoEQ?}7 zZ6VWmc{y(4JP?}$6Wh-&`8J+QRaik5WdpT-l3Q8p literal 0 HcmV?d00001 diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 0000000000..6645715398 --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,7 @@ +import java.util.Scanner; + +public class Todo extends Task { + public Todo(String description) { + super("[T]", description, ""); + } +} From f05edca351c0363378b607495f099481cc22fd95 Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Wed, 28 Aug 2019 21:48:52 +0800 Subject: [PATCH 09/28] Level-5 --- src/main/java/DukeException.class | Bin 0 -> 226 bytes src/main/java/DukeException.java | 5 +++++ src/main/java/Main.class | Bin 3924 -> 4378 bytes src/main/java/Main.java | 29 ++++++++++++++++++++++------- 4 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 src/main/java/DukeException.class create mode 100644 src/main/java/DukeException.java diff --git a/src/main/java/DukeException.class b/src/main/java/DukeException.class new file mode 100644 index 0000000000000000000000000000000000000000..24fdd1d968267e6e52d9f6fb280d3014b905fd7f GIT binary patch literal 226 zcmX^0Z`VEs1_pBmUM>b^1}=66ZgvJ9Mg}&U%)HDJJ4Oak4WF#UvPAuy#JqI<;F6-u zymV{LFh&Lz=lqmZMh1SL%)C^;(%hufqL9R-9H0nSaDHh~a;jS6lGO}0MSCxG!-#)g%yxxSC>Wbxuup_ z=A+w7dRb;`rY1fXgi4pQ3||}UKMPJ^k>nVk#`5*ifmEk%FYj!u%AJx>}v3? z4z&dQ?fO+#s1LGZW(jZUM@%lc92F{NVWxiFAQRn!Q@1x4j|QV!+b^D>aW63N!|^2G3%@KM>MZcr|a^>d?Be48j6(s5pZ| z4CaCr)P;Tqxx(vd^tJfCD#|gy9i9+_rE;y;A5!rl`c!;`Q!>u-cb!x5Fsk)~<}%xP ze9TW=Q1J;)=|7n}!x!->zr)ksD&rE5zO3R3f6P@>$hf9rHs+{!6bn_%!y_u@V*x|) zy|>KDYSY>S!Qi?v+KP^lHcM*^__IPuGyXzKf};f zp0%C=pMF$GbulE=RmXIXzo}q;DA?j}nxfz{e17t}u%6jOpV!|MYNmH)=giWp#LPI+ zyQahAYiCHx)^ExQ@k=PN-`hn+Flme-D_h?!r|M_K(%mU z;TFSaJ>Qz9kFw?^l+ir#KP!z3F@t2K?y)+OW{^!J4a7p3_uKI7w7OEcX9)2-=9lQC zND)LRBjTd9lFiT+CCl{?MW`_Sfp`gm1kp)R)C(i3S{WYZc@&x{U>L2*#LK+$iF^A>~FO=L%8StMlv$Q6%nzZ2(ENc1JIUof|-MZC)>&$LW9xJZ%a=0$h+V z9C1iRJWXo~Mj(SmmBX^Z9G6=mq2_laki=ZF2?Q*OKv1VSM6#SE8_%;`zhO-br_9N> zyXfj}IP&uQDKVmmTQnw$lsS<*-{(b<+6{#kTLf`@;b`3g`K@jXNp%2ewNAll>BWe9 zKntltz-YQQlR##{foy`AgIxL*VhoCrk5Y^!(8UFWavT<5yzzoW2!n9M3QI3=*{b+E zWKPk4MX&uY^yzoekNi9OiF9odp`S$PClmT&!tN&YQ)xGi(3cS4@N`07O4!Q&6FrUE zT>_NT$_X$mj~Fm&5s3^c>gax|6Z(+VLoRk-t1GEdGpOBF)b5!`puK|_xrm}nSWFBp zuf>vBUCb8hDixhwwr5kK0p!&7BDZ<~V(keKi^j|rN>cZ+2yd)ga0+gVsYrBMqR7{K z)ajnF2Kg46i^K@#IxY4BL!TjVy_EEEhF)ah`Z&_Z8+xY5b&d2wLw87AA4>WIhAzrQ zVv=~6;QpY`v$--Z(e69@1j1)7iQvir1OjPsOHRo?k+Y7MLf>N>rWBpWBq~imChI-6 zgm6{_8whx@&{$;6OR`20^SkfcQ|uI@goK~D70%B-Om!o_v=)&*6^*O{URH%BR)c0%hZa_k zRm?|gz>8KEL>ucsfNjQVwhiqBV-4GZAlroy+l#fV8=Y)Fy4V4%XGgGsoxnzR8k<=^ z!t5NjunXAAE@7KNQy&rsks=|7zFuq)^Jv8AU%x#hIeZ6+h?7uv*BSHhucbtDz$7Hy zA=XL%5D*{#E378^ye*|*6CT42S{35vm-q_T;ly&%Gl|X~vaK*=iy=1{a*H8fh`C?+ E6Xa*aJ^%m! delta 1982 zcma)7TX0iV6kR8|H}}ztkYH=mQlK<#X=5q05+IgB3oQaIuTn|@fk1*3OHH@JD zZHa7;Sg65F3-zcI7*!vSCwdb-k?!VLVskv&JJJJN$D0-oqt5obE0Z;7uy6!#S$G?L zI{GcVgLf^wCsVwSJ`G1Le1H!v%toDtV-}9ffRAuOKv^D-#w~n|J^^>-hFum?IH}_k z0ex;P67B5hib*V|m*q*3UN$K$VGmfif-@GbVy2Ek3yqj(p&5%TJc9Wa7NW^+Q7d#4L-<@^ zzkNfkzjQ;LD(rw3P?fIO&V=2l71`ZdjpCkIHviHoZJzLaAv1qv-_*;*H+G?MS@~9= z*se8-?OR5mHcax#pFwW1wv@Hh3OEbSYWV=f1ug_;QFsmWv<`>AF`^cKi zzQ$A@day^1N1xdsX4$`(rTKH{VZrq`yc!e@9zVTU9LK9LYfMt+G09Tk0nWMH<^AO@ zEkWj&J0r`LG`vki@U;gAF#0@A8EBcnd>%c9fh^bUz~iK%hhEEuptKJ_WvHi}x6+y) zOymAV6~62=a{7@ItVj;>T%?iJ=Io?y{TfVTggh>+&|-vDN^1zY?S93t4!|!DcR6(_ zCthGY4=#ik6OhAqFb)BfqZm~vWnm|>9%Z~wIb;<^!ZnPXOcgXN$Y>{wXwD`C|Y^7z#>N^R}FS;>hkR3BEjL!K0t_*Gw- zqcSRf#vdvf3c(Fp{qfG>`QdDscQLn*jF&AsZJggOqu}-YUda)J}(aAZE4Wb88u^Tb5 z51YgRY!(O6A#7|BN6;ybVyifTE^!jQ;xrQC9JV Date: Wed, 28 Aug 2019 21:59:19 +0800 Subject: [PATCH 10/28] Level-6 --- src/main/java/Deadline.class | Bin 657 -> 659 bytes src/main/java/Deadline.java | 4 ++-- src/main/java/Duke.class | Bin 0 -> 1038 bytes src/main/java/Duke.java | 3 +++ src/main/java/Event.class | Bin 651 -> 653 bytes src/main/java/Event.java | 4 ++-- src/main/java/Main.class | Bin 4378 -> 4541 bytes src/main/java/Main.java | 15 +++++++++++---- src/main/java/Task.class | Bin 900 -> 904 bytes src/main/java/Task.java | 2 +- src/main/java/Todo.class | Bin 272 -> 270 bytes src/main/java/Todo.java | 2 +- 12 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 src/main/java/Duke.class diff --git a/src/main/java/Deadline.class b/src/main/java/Deadline.class index b8e1a5ae6b38de098229e404ba268f68e2a5cc0c..45d39fdc528db94b89c1112e32bbdbb3602ea7a5 100644 GIT binary patch delta 29 icmbQpI+=CC5g|qw9tIu;1x5y;Xw~9a5Z-uYFCzeINeBo4 delta 27 jcmbQtI+1n45dr3CmslPK9tH(Q20qnd)#8oU_A&whVPywS diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index b75575889d..937cee4271 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -2,11 +2,11 @@ public class Deadline extends Task { public Deadline(String description, String date) { - super("[D]", description, date); + super("D", description, date); } public String toString() { - return String.format("%s%s %s(by:%s)", this.type, + return String.format("[%s][%s] %s(by:%s)", this.type, this.getStatusIcon(), this.description, this.date); diff --git a/src/main/java/Duke.class b/src/main/java/Duke.class new file mode 100644 index 0000000000000000000000000000000000000000..670c535be55e2906187cd127993b8ff978eecafa GIT binary patch literal 1038 zcmaJ=>rN9v6#j;mZdq50REj8tK>^D}*1JDS{9%<~(yB>`#7MFk+7Xs+cbeTPNs~T^ zuc1H0VB!P#P{uPY5t=s6Wapec^PS6gX6E;wvtIz7dn8vfZ+A8*>)& zHd4r%W!}Pq1@MdX-=~jcmv?(8 zkCS;|y4*D|WA35)E9YC}<+*m(#CG|<=WTejweOMUb!`ia4({MC!{ke)bgU!Msz`mL z>TxE8r8Jfutl*x7f`e785yc8obg*s;P8tT}dBOGF!Lh9A0aLXTYuTjMsWxp)_Z#CY z_dRt*Q*Web7Hw?cK7+F(gFx}mk!sqEVWue>vZTVA(0jf{3` zs;_0y!c&IjA%3H3W0?Ox4vUzeM`gwsn7PxmUZuZ0Nk(#f?G)@QDGb+WP4$fQ5Rkzn z=?40mToWYoQ)A_CNUWbB34F)+PozGc!m4cS{XqI6L=NKwPS8wK5F0a;b&m2TaGmU9 Yn8HJnHU)R_7!NQ@2oRRxCVjJi0UvDyGXMYp literal 0 HcmV?d00001 diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..a12bd35519 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -6,5 +6,8 @@ public static void main(String[] args) { + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); + + Main main = new Main(); + main.run(); } } diff --git a/src/main/java/Event.class b/src/main/java/Event.class index b707e506425ad048e0cb030e94fb5c9a3bbd8a48..0e04e85428e37935e88bd4a43e19bcff0cb450dc 100644 GIT binary patch delta 29 icmeBX?PZ;CP>9i$hk=JdfssKdTD3S9gg0K?#Rvdsw+Hk9 delta 27 icmeBW?Pi^DP=GnwHI|2ghe3gnflswqwRq#@U5o%#+ z2pA79*^o0F_ci1eQo$rJ`D3sfKuzsHoA9(8d^DCa~NMOB-ROipMnczzTt=ij^9A zVugk@tkN(P3+1ZT4J%g5L~8`rs(4%)i)8k7vY7QU*9L)&0#67$DX>Z4DS@X2o)OqA zU`Y38Rcvu{(a&+j5Nwm&+ug9q64J2K%`|3$7i5-QQoJa|O9H!9)T`KIq|h09+4zwz zUa&W>)4BZ0&nPe6Z>@>kQ4{8PsJe}hjB#5Ll~#xEgeT? zKn#sKnsAH&9mmm3aOEs13yfYmFR&;Q3~_PZ@3tK?>aD}G-^MQ3@ffEFg6Y%-V zgB1Z;7L6P>w}yYS zQXZ`2XvH6@U}X0P$^#K&rQ**%hx2Tn>Z>dh_&_qX==e~Ud;wzwKGJa!=LIh5n1snX zW?-g{shFl?ItmHHWaV9L0ioezTqe{R*KDJXT(h;a_Twbsz`{@!XUm-siUj-vlJZik z0!eK~e^R70SeX>zw3$gsMvK~8sQ5&t|J?XZq|ui~PsdT^D?%?L%hAiYjd8A<}e;>Om}86#};Q| zZ^_|;)tRHB;7@d5i79MSm?WM9xQ8a)Rp(+3$k#KHWk5$Lt?1O2lq0&j#>hA!n|<3m z#c0vTb3}sc|0DQCnFWPieb{@aD>3>o^II^BfAs9XyJz)rJvy5;cb_JtHY06jBhtq; z!#?vc`Zl6pzA~cQcKWGr3|%Jl&r~d4n@5SE|30STi3ik!^Vdia2Cev+^(YKXu4O$J zgAeXvT>x)sF6&y`*=TqNFY0?JS7)%^>`~kUV(7RXC04Jk0Y1h9OjRCiBnaHdomtk;?6?iIL7yySZ&V%@wUBD&dSq~U@AEPKtF!G{M7NY zpP$e8`GtM#?)$hK))5W3-VB9XV#~C9>~3!i&cgHqpa%n#w8c{SJ)w!|BX^@Ap0L{k-4%o;^3E z>#pe4p}z9~a`26Yg{an0fORfr)X1pSAfZ}@UxOVR1*sFH-UUL9kZlsML7ajrHltA( zhcq-{i-t0U1!-0g5qpb_Rs~x%xUo^jHVt1wv}s7jP6h2Uq8jeR zP7N7&RO1AL;`EpcR_qpmIutxE;|am67SZ>JWS$hU_A2|Xjhib3&&n`doZfRn_PlU% zzy+I#Re(-Gx&(Pqke3v^EaRYzSB#l-i4GaR(O`|V*%xReBu%X<+2m{WWe0tYb=k`! z;Xq^Eyo^;cUL|PDLoMMNe{mq_C#a>YKV7KmScF0y_hSiR^ukam(i{o!*Lxagp0RuRL0vn-oZ&7i?Kw;DIMLy z;55$YIEy#|I(pDca2B>S_=~pH_?seu5GOu+zOmn$SMV;560F%9xYm6HrO@xI4F($h zBFBCq@I?r=qE>%nM8|vR)o~7I6r30NUC{9$N{mFQzOTL^B z@ex5<;cISCFd!^0>$oBk`xu1^uIeboLpoMsm5!xYreir)5a!M|CfoeUgfX`%tcFkU zDPgxUXj^!C(3W6TWPBz(Uo+;Y8T6I0K|L#dO-MDOYO1k7ONkb6=ZZ(=#^kayEn+m0 zcP|AvwVO-{iYO+Zg=!}6LRHJ`g{6->3@2~uj}p+dk~x5#?f6nh?6$K^ zg7K4~D-=igIR2?9t5zTwD>wn4oWAgQxYJDZ*eZq#+~? z=fV~foQs8>B5q+sJH>D~OWC5*`TrJtgJwdfol{x+N9Uwy1^c&PH5a84YlJtzYU6x# zuJmQs)Lx|bBcrkhnI-+OS9T+-2h&QW{E3|un-<6TT*)Kl+ALnX#}>!k$JrS_oxJ#h z+JE6a57|?8@xB(bP9EgF1m1dafkE3qxC@BlsbuN<)y!z~*j&@&7~6?eRm&v zE|vsdz<7p~_MUF}6)uIACQ zdU0P2^Ku=oBvU+dSeAcFHffkM{}#t7I2Eo1!eFS1fqn`^E!07KxXUc&0Ci&;zi&yD zYf;7>xs>~L8OC!N@KZ-n~>_r81^jl{%1p<4Lcu$Hwgco<*suJMR`jxR9? b57skI<3{%}Z-Yq#Cf#AuT_)Xc(ii>(Dw%W# diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 74039548c5..126fa57027 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -28,7 +28,7 @@ static Todo createTodo(String input) throws DukeException { ? input : input.substring(1); if(description.equals("")) { - throw new DukeException("? OOPS!!! The description of a todo cannot be empty."); + throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); } return new Todo(description); } @@ -72,7 +72,7 @@ static void addToList(Task task, ArrayList list) { + "Now you have " + list.size() +" tasks in the list."); } - public static void main(String[] args) { + public static void run() { response("Hello! I'm Duke\n" + "What can I do for you?"); @@ -105,13 +105,20 @@ public static void main(String[] args) { response("Nice! I've marked this task as done: \n " + list.get(itemId).toString()); break; + case "delete": + itemId = scanner.nextInt() - 1; + Task item = list.remove(itemId); + response("Noted. I've removed this task: \n " + + item.toString() + "\n" + + "Now you have " + list.size() +" tasks in the list."); + break; case "todo": Task t = null; try { t = createTodo(scanner.nextLine()); addToList(t, list); } catch(DukeException e) { - response("? OOPS!!! The description of a todo cannot be empty."); + response("☹ OOPS!!! The description of a todo cannot be empty."); } break; case "deadline": @@ -124,7 +131,7 @@ public static void main(String[] args) { break; default: scanner.nextLine(); - response("? OOPS!!! I'm sorry, but I don't know what that means :-("); + response("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); break; } } diff --git a/src/main/java/Task.class b/src/main/java/Task.class index 1ea783215959b5f350aa43f2084c0c5fe7b67a7e..deeb116310d0c397e86ae6f426a5ccfa6ec74574 100644 GIT binary patch delta 21 ZcmZo+?_l3h&&bIety&xl!i!rNnE*uj1}gvn delta 17 YcmeBRZ(-k1&&bNDTC7^UxPy@i04%Enw*UYD diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 832fbe310c..13cafa330c 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -26,7 +26,7 @@ public void markAsUnDone() { } public String toString() { - return String.format("%s%s %s%s", this.type, + return String.format("[%s][%s] %s%s", this.type, this.getStatusIcon(), this.description, this.date); diff --git a/src/main/java/Todo.class b/src/main/java/Todo.class index 7ce1c9d31fe162ebb4bf813f22047692a18dffcf..ac1068b06a10cb4395c999ff6fdb4f0cc8fc4d79 100644 GIT binary patch delta 12 TcmbQh)W Date: Thu, 29 Aug 2019 21:35:52 +0800 Subject: [PATCH 11/28] Level-7 --- src/main/java/Main.class | Bin 4541 -> 3953 bytes src/main/java/Main.java | 129 ++++++++++++++--------------------- src/main/java/Parser.class | Bin 0 -> 3842 bytes src/main/java/Parser.java | 122 +++++++++++++++++++++++++++++++++ src/main/java/Task.class | Bin 904 -> 932 bytes src/main/java/Task.java | 3 +- src/main/java/TodoList.class | Bin 0 -> 1549 bytes src/main/java/TodoList.java | 31 +++++++++ 8 files changed, 207 insertions(+), 78 deletions(-) create mode 100644 src/main/java/Parser.class create mode 100644 src/main/java/Parser.java create mode 100644 src/main/java/TodoList.class create mode 100644 src/main/java/TodoList.java diff --git a/src/main/java/Main.class b/src/main/java/Main.class index 5ef1b4899650820289d7d14be589dcaa52e3200b..1485121acb61a8be8ce5b58336b445fea6dc0fea 100644 GIT binary patch literal 3953 zcmbtXYjhlC8Ga_&WG0g-ZMQ9LT3RN(h=7ybFUdB$GwaT5 z+q8-zqJk)1P+D(@3Q-j7MU#>!0^Sfs(R#rjp5yTxf8gyi2VkM5~IBsG!CWV|3a#Dz=P_vK5F7)vQU~| z__)k{LdYkhg#NHFe_Dp0iJ}Y->o{fLw1LmcX`eIjc^zNS@kI@#?ZaIfv>px1Iy~18 z95*=Rq;jg1)}losv7W&p>1*tF_V;y3zeGcMXIHFiC>)h?WoX~vL0O4tFns5z8gPPf z4bj*U=cvtSUeYy0A$__arDbAFS zdfBuSXsD^XQcV4oQ{0hs6Uya|WrKkepXhZm1yM#;`57ulscV)JCNKmwch<#*yo47^ z`azqZ)44P7vRtw1>KB#>KAUrOJW6$U$5RD`%t0@gjjR1hfnU+Uf>5=C)2BfaWCO7FUOY*JZ9m`vV8S_+N(V`I;yf7R)!0?Aem|zj61HYvLf|1 z3tz!kEj*4V3`|-08oqAfNjdBrctXcFEj)#%Eev8v$G0q;!EGAWg_4q9i@@y91({qx z*C;1#p%;A`*3Yl^j~r3)U@=EO&RRH!^A^610S&7b;C3C4t4xseTsh`E%`$IB4ONRJ z_PCdi)UbAbP0$prh<4wxFpU}dzgwkJUbWp*o3=Z16Usb1?gTciVE5Pw&t{m|lU{DG zg~MWy+wl%Y!hn zg=g`73(w(s9WNO8frTH+(8g2 zvHSZ62CJ*9?V)jHCzK!0CPNe1-l**m1;L9iy}%w(wn}G$$z~00#T!Ls-^*qvo9vNX z5bEpJ2KI#O9kY*#6#^k?<+#4xy1mZAFy786YHn`H|0kTlX-N=Sb8wt_5s{c=5H7ea z@8m^O`9wAGOT41tUYmb+y@5Ydd*c$YHtkF(R;RcV98Lz~^L5H+evUhSpAy|zO{luz zav-Hd!)hk%f})qpk1lv@&18@`nT&E18k&}>30LgRry>hjSv=)QDKP>sFLkl`CjCIA ziO0(k)tbB*rrQ9^Um?>dBcC~or>RXwm{N36RRIz?iZd{*NtMU4$w19}Zc#zYPljA& zqp6(F8oX{nQc-?|EGE-FF)wGaxe9_blt{oVXi+RegPD;u3+MhzW#zT9xm#tG?eGhj z27%*G_%?Hn*_X9bth24A#%dW#>h#2MX4=V4?DO-3NL`QA;nFchYgTX&8=?eSFe0sn z`o3gbNo_c)Y}uz0JSORf=h%+V0^zDw+oZ=eROSy+DHZUT@~ldGQu8Bz@&p?O5Yg`M z^8%G<&I`-d!vx8G{mx&Sok9`zIduykKIN#wKD6`2)WJ~+Iyvqt z8t>=$K+(9H}Yr^X?ZwlkeQb~ z`@-75R#?r33n-c8JCQf@JpWZPggkjyp@OX;&y&Kw6I_dM^@ce_hG$R~n?w09kJEdb zreU1M)od#I8n@5F1aIid!&8@DctlGEuKT8=g~5QB?)>HM9zdwG#Dw)HiUx zk+_@a?iO-w$2K%`bX}-{j*^6qDxEm^_$c7GkB@FaxML0*XvAv{&SB&595&@KT{{Ci z#*?d`!-j)wHy43vI71NzU+?vo(d2EpgR?tn$z9mYA2u~;CC5#~b~CO=TZm)@N-l9y z(`joGLaM+W^P!{tm3|ei{t?}B0b4I%8!^=oTW#pzbEum^eQ#vX#?yFNJlq;-tcpyd zVOQCjvM0F>PYdCn#KvZRP5j#U-NEmkXd`8o?wP^^v~klcO~kj?)+w9}g*5LfZ&*`4 zjh2vJH;wCO@umXDaLBQvz;Q#XUZr!LQg+T#)x4CQAgHOv_1$LrXs<4&#Os_HHLvDsP?`6sJ^!NcZD#-=d3StFu*&Lg^zLiw7p soKf*kdawize#6!z_pb@&BBL+CaSf#@&W(mN9nuFv`cOze71Brk4YdivkN^Mx literal 4541 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 Ge*Qn%dOr>T diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 126fa57027..780b40041c 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,7 +1,19 @@ import java.util.Scanner; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.util.ArrayList; public class Main { + public static final int BYE = 0; + public static final int LIST = 1; + public static final int DONE = 2; + public static final int DELETE = 3; + public static final int TASK = 4; + + protected static String savePath = "../../../data/duke.txt"; + static String format(String command) { return " ____________________________________________________________\n" + indent(command) @@ -23,117 +35,80 @@ static void response(String command) { System.out.println(format(command)); } - static Todo createTodo(String input) throws DukeException { - String description = input.length() == 0 - ? input - : input.substring(1); - if(description.equals("")) { - throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); + static void save(TodoList list) { + try { + FileOutputStream fout=new FileOutputStream(savePath); + ObjectOutputStream out=new ObjectOutputStream(fout); + out.writeObject(list); + out.flush(); + out.close(); + } catch(Exception e) { + System.out.println(e); } - return new Todo(description); } - static Deadline createDeadline(String input) { - StringBuffer stringBuffer = new StringBuffer(); - Scanner scanner = new Scanner(input); - String temp = scanner.next(); - while(!temp.equals("/by")) { - stringBuffer.append(" " + temp); - temp = scanner.next(); + static TodoList restore() { + TodoList list = new TodoList(); + try { + ObjectInputStream in = new ObjectInputStream(new FileInputStream(savePath)); + list = (TodoList) in.readObject(); + in.close(); + } catch(Exception e) { + System.out.println(e); } - String description = stringBuffer.length() == 0 - ? stringBuffer.toString() - : stringBuffer.toString().substring(1); - String date = scanner.nextLine(); - scanner.close(); - return new Deadline(description, date); - } - - static Event createEvent(String input) { - StringBuffer stringBuffer = new StringBuffer(); - Scanner scanner = new Scanner(input); - String temp = scanner.next(); - while(!temp.equals("/at")) { - stringBuffer.append(" " + temp); - temp = scanner.next(); - } - String description = stringBuffer.length() == 0 - ? stringBuffer.toString() - : stringBuffer.toString().substring(1); - String date = scanner.nextLine(); - scanner.close(); - return new Event(description, date); - } - - static void addToList(Task task, ArrayList list) { - list.add(task); - response("Got it. I've added this task:\n " - + task.toString() + "\n" - + "Now you have " + list.size() +" tasks in the list."); + return list; } public static void run() { response("Hello! I'm Duke\n" + "What can I do for you?"); - ArrayList list = new ArrayList<>(); - + TodoList list = restore(); + Parser parser = new Parser(); Scanner scanner = new Scanner(System.in); + boolean isRunning = true; while(isRunning) { - String cmd = scanner.next(); - switch (cmd) { - case "bye": + String input = scanner.nextLine(); + int command = parser.parseInput(input); + switch (command) { + case BYE: response("Bye. Hope to see you again soon!"); isRunning = false; break; - case "list": - StringBuffer listBuffer = new StringBuffer(); - listBuffer.append("Here are the tasks in your list:\n"); - - int len = list.size(); - for(int i = 0; i < len; i++) { - listBuffer.append((i + 1) + "." - + list.get(i).toString() - + "\n"); - } - response(listBuffer.toString()); + case LIST: + response("Here are the tasks in your list:\n" + + list.toString()); break; - case "done": - int itemId = scanner.nextInt() - 1; - list.get(itemId).markAsDone(); + case DONE: + int itemId = parser.parseDone(input); + list.markAsDone(itemId); response("Nice! I've marked this task as done: \n " + list.get(itemId).toString()); break; - case "delete": - itemId = scanner.nextInt() - 1; + case DELETE: + itemId = parser.parseDelete(input); Task item = list.remove(itemId); response("Noted. I've removed this task: \n " + item.toString() + "\n" + "Now you have " + list.size() +" tasks in the list."); break; - case "todo": - Task t = null; + case TASK: try { - t = createTodo(scanner.nextLine()); - addToList(t, list); + Task task = parser.parseTask(input); + list.add(task); + response("Got it. I've added this task:\n " + + task.toString() + "\n" + + "Now you have " + list.size() +" tasks in the list."); } catch(DukeException e) { response("☹ OOPS!!! The description of a todo cannot be empty."); } break; - case "deadline": - t = createDeadline(scanner.nextLine()); - addToList(t, list); - break; - case "event": - t = createEvent(scanner.nextLine()); - addToList(t, list); - break; default: - scanner.nextLine(); response("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); break; } + save(list); } scanner.close(); } diff --git a/src/main/java/Parser.class b/src/main/java/Parser.class new file mode 100644 index 0000000000000000000000000000000000000000..f584a940ca1cf624c6e48b1d6685b04e20d723b1 GIT binary patch literal 3842 zcmbtWX;<9V8GZzsku1dGVF}>a8DflCj7e;Vra)brEyf;}mWeS=8zN>dFlNwL?|Yy7ysPxD z_iw!o;1l?Vfo{xbc*;NtX7(TqOUJB+gn=p~<)qLtr(<5nf{v7qOF9W z3`CHX!(}-*5+!F~018?dv>dL;Va1@<7v%6oIebaOmvwx_Kohb$zN+JE z8oq9z1z8Q>Fwlw_9p8+Q@^_{1j2sBlitkD2XEl7^z(aUW#}738(70 zDD9sfQlN||C?Ck!IoGn?^Hw@9N{I#qYHVaOE}s=X4~~xw$>$OU;lZKUP~4MBxe`A; zc}}jVTuCe?N3E=a>ewY~+3L!>sdU#FE4RSOUIlw5Q}edv<{hD+=T412e=2R+^Iem! zld|V~12ZGGE9QmMdy+ua%~mca95+SQgQ=V~n-)nLa*+)BQg+HcN!wc6&Xe3gCdtDp zV<}sV<(FoK6PL;gjI8D4#E6~Ey9#Ps1LqV@Zj)Y_bgjf9xqF*5{FEkm`vx<%#2C7g z5Lu6ef--+Wq=m~RUoCFs78Nw^h8~k^w8Tg_!g57ClgxaiCfBH0;cE^GE19M>3J&aw zTU_UkGJnU=vao67zFpP5Me6E(38H$QGbS^6Cn1JY(oba*(ofD&8BP-;IICdq9icTb zfI+%^c7;2_{tgpA!_Q4Tk6$nf=~Rvk)THOOaI)Ye)%C2_lUpW*gyd@Cm$+Iy$IFI7 z>`lCY)#8GeTayXPwuK{^{mR6z@uG>};H-(qaK^-M@jC_e9$OFPbTMa!94Es)zsIVH zKgi*aa`+SeY~nnoOkBXUiHmrG88Db%6kB0d5E-$Tt#m3Gbs4^B%1&k zKJA)aQBc*N$+$V!v9hDWUC1PJm0|ov$C`=1;%_Ei!pkPEN#p;H7a7Z94oJ7WA~7s_ zKjej4!>cB)<27P#A2~jINhGKenDSXD&}eR6jL#{kYaM9|lu5B13Gda=qrvp@0fW_B zmvGJ(r(lWZ0}E!VVV|jxz8%-cV2yWgES3$yyZb zwF%3eO1Z@HyDm@PVSZufuDrumHY;qlyCXq|edG>5kz|Ft8DEKy(jwUs6&&6LBoO5y zEWKH|oi77vwqIrhlRV{!xL^juFJW8YEf3@C)ILWhc`j*X(Z$CR~Aez?K~w<11OQi~17* z{bC9PrV0=PRysYIaz(F(O$CSUux~eR?ALeKI@VG7E+WOpf1+v~d#`OGGTpI( z>d_D-}9D-J0T~ue%1d_3+U4_H1c;p4w6+X4&VqLz&KYbP}=w& zIyFQzOq}9p2tGqzC7w?+=7;fcozX zydQ5+BPKb&fR@tk&>EtY%RRYHm2ws33QrD)xH?FZox(tASSwuj3sO=Kgi; zzkvhSJ0ylLJV1c}z7V~>iKgkugBv*bjt3wU^+D(yd+3c`dZUl&c@od?kmu3QPl`dj zieb+y)cb(bVNL!|_(9?W>#VZUY&6aP!Q6^j6EXSyQAnLM&6i|5+eu^-=8QK<;fn$3p6j5h{+?c?19i6wB3s}dIDF(ApvIsj@ zVeocz4Q28sx%bHI?&=9~tlh*z(+z4vXaf&#(>_Lj0C9TaaZ;XQnO|U;O*7puGUq7G<6Cw|RZ%LybaefdBvi literal 0 HcmV?d00001 diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java new file mode 100644 index 0000000000..fa2d8d264c --- /dev/null +++ b/src/main/java/Parser.java @@ -0,0 +1,122 @@ +import java.util.Scanner; +import java.util.HashMap; + +public class Parser { + public static final int BYE = 0; + public static final int LIST = 1; + public static final int DONE = 2; + public static final int DELETE = 3; + public static final int TASK = 4; + + protected HashMap cmdMap; + + public Parser() { + this.cmdMap = new HashMap<>(); + cmdMap.put("bye", BYE); + cmdMap.put("list", LIST); + cmdMap.put("done", DONE); + cmdMap.put("delete", DELETE); + cmdMap.put("todo", TASK); + cmdMap.put("deadline", TASK); + cmdMap.put("event", TASK); + } + + public int parseInput(String input) { + if(cmdMap.get(input) != null) { + return cmdMap.get(input); + } else { + Scanner scanner = new Scanner(input); + String cmd = scanner.next(); + scanner.close(); + return (cmdMap.get(cmd) != null) ? cmdMap.get(cmd) : -1; + } + } + + public int parseDone(String input) throws AssertionError { + Scanner scanner = new Scanner(input); + + String cmd = scanner.next(); + assert(cmd.equals("done")); + + int itemId = scanner.nextInt(); + scanner.close(); + return itemId; + } + + public int parseDelete(String input) throws AssertionError { + Scanner scanner = new Scanner(input); + + String cmd = scanner.next(); + assert(cmd.equals("delete")); + + int itemId = scanner.nextInt(); + scanner.close(); + return itemId; + } + + public Task parseTask(String input) throws DukeException { + Scanner scanner = new Scanner(input); + String type = scanner.next(); + scanner.close(); + + switch(type) { + case "todo": + return createTodo(input.substring("todo".length())); + case "deadline": + return createDeadline(input.substring("deadline".length())); + case "event": + return createEvent(input.substring("event".length())); + } + throw new DukeException("Invalid task input"); + } + + static Todo createTodo(String input) throws DukeException { + String description = input.length() == 0 + ? input + : input.substring(1); + if(description.equals("")) { + throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); + } + return new Todo(description); + } + + static Deadline createDeadline(String input) { + StringBuffer stringBuffer = new StringBuffer(); + Scanner scanner = new Scanner(input); + + String temp = scanner.next(); + while(!temp.equals("/by")) { + stringBuffer.append(" " + temp); + temp = scanner.next(); + } + + String description = stringBuffer.length() == 0 + ? stringBuffer.toString() + : stringBuffer.toString().substring(1); + + String date = scanner.nextLine(); + + scanner.close(); + return new Deadline(description, date); + } + + static Event createEvent(String input) { + StringBuffer stringBuffer = new StringBuffer(); + Scanner scanner = new Scanner(input); + + String temp = scanner.next(); + while(!temp.equals("/at")) { + stringBuffer.append(" " + temp); + temp = scanner.next(); + } + + String description = stringBuffer.length() == 0 + ? stringBuffer.toString() + : stringBuffer.toString().substring(1); + + String date = scanner.nextLine(); + + scanner.close(); + return new Event(description, date); + } +} \ No newline at end of file diff --git a/src/main/java/Task.class b/src/main/java/Task.class index deeb116310d0c397e86ae6f426a5ccfa6ec74574..37e882cbe25b4746a047cf81d2ab507c7ac95cf1 100644 GIT binary patch delta 441 zcmZvYy-UMT6vfX=le{#ht;T9UG^tjt8b4yC&_yV24sNnVI5C zWS0WHMO2wo)S9^I=&&l*QuGGv365{S!1DDgM+O9BXU9H)fQI26YQ9%t5dl>QO&Wz@ zN9H@MF>uUQk}eNGi^WbM{3no`1pfHz^veZ}$%<(w*A0YLM2;Hr7c_WfNXHU;1Ixdv Cd?*0` delta 349 zcmYk1J5Iwu5Qe|CP5fY!0Kst_;$X}(;Ss3PAR#(R3OWizO$mpfMZN+x2cX~pP;(DX zfcV!+fmZrvXXgKRW?#eS@ci@l{R5bDnh>)UW2qdr9d;acBlaTpBMw3)i3-z%A%`JH zFBjkDxK7Pg)?;L8)3J0NRvcDYtDnqSH)CKqVP*(!?jIlOFLO78Kt~3R4xFcnvNcgo z#U%_q*2T2G^`?`)YC~FLERWlES$Zo?n}KcyO={F{URgPHOBvcD7ehRI8R`MU2BSvy u<7K&%C3s@0fqm7BMYr_-cXM@}cf1&J?avG6?cj@remtg9G;AvODE|Pb(;SBY diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 13cafa330c..235402ffc9 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,6 +1,7 @@ +import java.io.Serializable; import java.util.Scanner; -public class Task { +public class Task implements Serializable { protected String type; protected String description; protected String date; diff --git a/src/main/java/TodoList.class b/src/main/java/TodoList.class new file mode 100644 index 0000000000000000000000000000000000000000..e3dac3fecbdb8942a5ecac7dc3e1ad0547e874cc GIT binary patch literal 1549 zcmaJ>%Tg0T6g>??CX5q61yLSB5Htx$e4wa76oP0p=pvMqy0J-G91>{HFz|LGAZl+kfVkHuQxz@X&zkVz3^r>LhRE_trC>=xB=Zat zhxoOsjUoPj97gGlJqiZ(B1dVb*`&3Po`z{>w0ETTz&_G}29wr^Z`5e*$4OchG>$g< z(Oqh?j<)v)u*!pmHpHGmyN^AR8q`XAX#WcB!vP0_pftCw9XeV#bP;sOFIZKR3Nv&y zGSm@iFfjc5#}Fg3BoIczM6c+Brjh^5XXsD%5Y4CR=)9@T4-dUXd~#TOo*J&hsN={d zm_Qw|wb$+J-LLP&xl2)K^Ys}c89}Eg=@TP`dVTH#n4mpL&uOajG$CSW`-yHHI%7XD z(zBr6|FDpToP%|AA5=#pEPXdxVU0srA~fcgb_V1AK7o6*D}|SFA9pFz1$tJUzexW} FzX9DAOJD#1 literal 0 HcmV?d00001 diff --git a/src/main/java/TodoList.java b/src/main/java/TodoList.java new file mode 100644 index 0000000000..04d998161a --- /dev/null +++ b/src/main/java/TodoList.java @@ -0,0 +1,31 @@ +import java.io.Serializable; +import java.util.ArrayList; + +public class TodoList extends ArrayList implements Serializable { + public boolean addTask(Task task) { + return this.add(task); + } + + public Task get(int itemId) { + return super.get(itemId - 1); + } + + public Task remove(int itemId) { + return super.remove(itemId - 1); + } + + public void markAsDone(int itemId) { + super.get(itemId - 1).markAsDone(); + } + + public String toString() { + StringBuffer listBuffer = new StringBuffer(); + int len = this.size(); + for(int i = 1; i <= len; i++) { + listBuffer.append((i + 1) + "." + + this.get(i).toString() + + "\n"); + } + return listBuffer.toString(); + } +} \ No newline at end of file From 2da0089c6769eb2baf9818ca6418c5dbd8dfb9bf Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Thu, 29 Aug 2019 23:25:03 +0800 Subject: [PATCH 12/28] Level-8 --- src/main/java/Deadline.class | Bin 659 -> 713 bytes src/main/java/Deadline.java | 7 ++++--- src/main/java/Event.class | Bin 653 -> 707 bytes src/main/java/Event.java | 7 ++++--- src/main/java/Main.class | Bin 4541 -> 5205 bytes src/main/java/Main.java | 22 ++++++++++++++++++---- src/main/java/Task.class | Bin 904 -> 959 bytes src/main/java/Task.java | 9 +++++---- src/main/java/Todo.class | Bin 270 -> 642 bytes src/main/java/Todo.java | 9 ++++++++- 10 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/main/java/Deadline.class b/src/main/java/Deadline.class index 45d39fdc528db94b89c1112e32bbdbb3602ea7a5..4d229fea1bf378afbd7b28f060d233fae7200113 100644 GIT binary patch delta 391 zcmZ9IPfG$(6vfXS)ES?nmRg#XjpfwXA6*(5Z4z2!ZHyL1!H9!Q*#ylP1VNucX4#i$ z715%7eTTkEbYJd#a1V#y<(+qUVe~8d{Qdj!37~Nz2Dc-MCb z>9*@Rr=#26_^F*wVvUfyF#St8hUptt?{Uu<{}gsBFm~rar&9<-w+yB*q};!>iw`wN2Mv&B&7a(Pg;gAbd^o;C&;6KkVJ|#9qLNa zoM9%I0x@V%nR5-fWpaWjJD?gKE9Kf7;+=PhR|W)mErSTFV4pylLrwOCEHeeUKaX@p AEC2ui delta 294 zcmWlUxlRK?42C~1B)eILkPyyrBw5%TqKK#vhiE`4XegjS0wgvNP!6Tp2npT-&5KYX z3VNt`B7|oo|G)j&qw#!aZ06+W@AC`TqZP0aGQ(oPlFxFEkd;tn)n#QTYa#1w_-y)A zgzQm&+@Bl^4ZADx+wktjP!;B{P4Rw(ISKCp<|8$KWRP!_{uMLidB1T*=A(=~v35jOWQKj+=+LI)*u%IQa5GH~l q6 zgf|g)5OI@x?$0^*USQgxNTtAx#jK4()lrzsy7>$i92Qx!ShiRZ z@(2C6pEQLqN}EzG-ge{OPCL2l$Gze8WyPf?c;~_3BFkDZh`P!C@T0n2$9Gw!?6Q`1 z0lr1UB_tBe!~3f^5pt*9!Hux@?VPs6`|qB1bHcGgUkI*sAlCGno1U&&({r diff --git a/src/main/java/Event.java b/src/main/java/Event.java index cb4945d44f..2a5d057d93 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,14 +1,15 @@ +import java.util.Date; import java.util.Scanner; public class Event extends Task { - public Event(String description, String date) { + public Event(String description, Date date) { super("E", description, date); } public String toString() { - return String.format("[%s][%s] %s(at:%s)", this.type, + return String.format("[%s][%s] %s (at: %s)", this.type, this.getStatusIcon(), this.description, - this.date); + this.date.toString()); } } diff --git a/src/main/java/Main.class b/src/main/java/Main.class index 5ef1b4899650820289d7d14be589dcaa52e3200b..4a5731c895a7ac1bded4f78abb4b343d8947abe3 100644 GIT binary patch literal 5205 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 delta 2323 zcmbtVX>e0j6#j1Vl6Uj+YRM}JO`#No+BT(>MOp~5RA>u=R0>!sC=IlhLMcnju7pKd z6~*TU?zlw74Uo3Bg5ZXtqA0kIjx&xp`a}HV3_qm!-B%QKM*o;(&b{Bc_n!0Jv)r7@ zKG-LItfTD^fI@s}pcu0Zj7612MYWC^0~%)OxY2+YwMxuYqRxUqwOX66V7;0x@Sy<< z)!{`37GsHlax^N@B(YSD%XBQ4SYaTDS{*A5q;^`2uaa18!PRN7QOC^&dSZ=4T*q1i zy|KnX4%QhMiUn%6-hvyqC`Y$SY}BzyDQ79~n-!TY%GXwjZ4$Rh+%BDaB~al1y`Zx3)q z#1r-m*Uz#9r6wj~f<4(C@;xc>l!*k@~3u`%PSh2|8XjaX=ktMvIA7ydnS-ZD_a0Y2`()Vvm43fA&g=g937FO{}`UuA#<6 z2@a`+Sd)OKcv($DlZn^RZsIUnB#tO9ubY^JGW%PtDCrHnsZP9Q;%&6p{XJ`kAH_QY z+SFL%e2I6}?qeq2Qv}{esl*2+j^iDP4^3Qy$tI?w(!^9uGjS~{>>oYlnPs!*)y$#q zF7sl`V)^y4hT8loO-t$;ST7&pgusSg{Mb9Z(fyme!$i8bzNVqJX)YOO=ZqKdH7=dq z=xi4VX4|7=$UZIeM3%inrr70vYk#5dY2p1?@%q&M-pCQ3+sXa|+7|+u_AmaP_Gy3a z$g!+j_3^PRnG4EsMClwEKzJf85PLZh7*FYSlp3T8Ip^c-GP8TSTDgRU)w!81;^iE?2fA1S!n+2J~efDTQEH_Y7(zGEjjsYhJd zF<9Bp@SNGpvcZR!TFv?nF{Mf|XXN1>Ih2M`~qm z3&Jn)fXlgB8c74)p`!=Xe--d+#M(<7t!ftnPHZ3!&V+HX3Ge`YZZ1BW+UR{13U!NZ$p6Ls9~MH7K@GjqARs zhth0E&&seC_Ou}5BGEyNA&^P8myu)^LX2PrTQ9=zAoRm9&`XsV-)sN|^3arh6P~ zuY_F2<2o8}VFqisXyzZ?;Epk?47$s(vT3LtIh8GlOlXI0Dxtz##692X~IN>2w=KM zL8S;`hRDE7k%b#X9%hL`REg1uiAfyGiKnAlRG~)9L9LjNxneo$#45}an>lX7e6bx1 z;^JO3h{v!{JdQ;ofyLrQ&i7%7IDjV6ie=&mmW!iUMT#rL`&cPXV6`}jo5j~yBfca5 z(^x0YV7>Si8^l@MD$Ze}%Y`j254O5|*yeOW9YP&Q(~-l+QFLG$JD5L_oSbaGl9C>G z)E9KTJal%K&=EYZ-sB6X{#*_O&cf&7t9iXs^EcoWM}tqnC-@8}5k`!-A8pL0ZjK}8 SIr1h)ZgAwij@;$Q2Y&~ycd<|a diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 126fa57027..880634d5d5 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,4 +1,5 @@ import java.util.Scanner; +import java.util.Date; import java.util.ArrayList; public class Main { @@ -23,6 +24,19 @@ static void response(String command) { System.out.println(format(command)); } + static Date parseDate(String date) { + String[] dayAndTime = date.trim().split(" "); + String[] ddMmYy = dayAndTime[0].split("/"); + String hhSs = dayAndTime[1]; + int day = Integer.parseInt(ddMmYy[0]); + int month = Integer.parseInt(ddMmYy[1]); + int year = Integer.parseInt(ddMmYy[2]); + int hour = Integer.parseInt(hhSs.substring(0, 2)); + int min = Integer.parseInt(hhSs.substring(2)); + System.out.println(String.format("%d %d %d %d %d", day, month, year, hour, min)); + return new Date(year - 1900, month - 1, day, hour, min); + } + static Todo createTodo(String input) throws DukeException { String description = input.length() == 0 ? input @@ -44,9 +58,9 @@ static Deadline createDeadline(String input) { String description = stringBuffer.length() == 0 ? stringBuffer.toString() : stringBuffer.toString().substring(1); - String date = scanner.nextLine(); + String date = scanner.nextLine().substring(1); scanner.close(); - return new Deadline(description, date); + return new Deadline(description, parseDate(date)); } static Event createEvent(String input) { @@ -60,9 +74,9 @@ static Event createEvent(String input) { String description = stringBuffer.length() == 0 ? stringBuffer.toString() : stringBuffer.toString().substring(1); - String date = scanner.nextLine(); + String date = scanner.nextLine().substring(1); scanner.close(); - return new Event(description, date); + return new Event(description, parseDate(date)); } static void addToList(Task task, ArrayList list) { diff --git a/src/main/java/Task.class b/src/main/java/Task.class index deeb116310d0c397e86ae6f426a5ccfa6ec74574..6abd347e212393f49e4a8573fad389362526a413 100644 GIT binary patch delta 563 zcmZutO)mpc6g_X+>9o`7*HEg8wp!Xji&nZIp^1eBu@DIni;_k(Wz({?wQXjjiM_;% z1Q8K7R(^&bBF>wxh`gC|XYM`so^#)&_O4YwzhB+}RIs4KhjAYQ$VkXan2<2(Mb3-7 z7nX)8or!53Gbrdtpr~QCvs8+N*BiC-TJfxX+$^rv+V#cGNldBaI^9g@Po?v^E#_=f ztnEfIY9NS^fv|)KOap!B7jS)D+YVj{1oyJ7efcJ{Ej|KaN2pmlJt}Sw zm^Y9_+&~Fs`&J}E!QY1L53yDXa6!P$Ls{pG%1)%X6RFRrLLiC(;-I~(SQjzo;_wi4 z_WC(R8V}HI5HU^=(t>1@QDzj3A?pEZ7hcnI1J%^-m{Ldv$H=mYVWI}bsA{}Nff0-n z<%BeelH#%4k5KP{9sbHrodwXAN}9mfKMk&4!!LfE{9$HzJ47k4;VcN`?G;z5@C5(X ZGYo04Cu4F)aCn#!DW0q&lwwXn`UkfXMqK~^ delta 526 zcmZutOG^S#7(Lf<9_pB{9%^c8`N$py1`$XggtRM=Ac__iB1&kav~Al~W>e6;ltbv?? zypDM{8wEF_SkSRJsFcE5tGC(hGz7%HfL3mGTKx@y_55HM9y|s;C-qLVSnHp)I?chy zu2{12VrwUam zm_pdZGK$ulh*@8vS~7VBz{!v5c18m`(!-9lVN@Xy!Z>ll>N*M+lk7#I5nY^>58)x- zB*%*|Ga;=cn~YUP!RRa8L%oI()NY{$^*gp4kV2Y$96*G*4u@IMsVy*#7*Q&uNt6m& z!TA7n2<)+xlWrb>6qS`g{GS13H1LNXAzvCKepjs87X-4_sglaop5T$&jXcJnFpu-m N6I>+D?hI=Ol0W9AJy!q# diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 13cafa330c..739ca28080 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,12 +1,13 @@ +import java.util.Date; import java.util.Scanner; public class Task { protected String type; protected String description; - protected String date; + protected Date date; protected boolean isDone; - public Task(String type, String description, String date) { + public Task(String type, String description, Date date) { this.type = type; this.description = description; this.date = date; @@ -26,9 +27,9 @@ public void markAsUnDone() { } public String toString() { - return String.format("[%s][%s] %s%s", this.type, + return String.format("[%s][%s] %s %s", this.type, this.getStatusIcon(), this.description, - this.date); + this.date.toString()); } } \ No newline at end of file diff --git a/src/main/java/Todo.class b/src/main/java/Todo.class index ac1068b06a10cb4395c999ff6fdb4f0cc8fc4d79..35330d5e2e02aad82d8d0e4c3cb3d04033fd2c37 100644 GIT binary patch literal 642 zcmZva*-FDu5QhKhlC&|lHCp$rYPAd4OA$pc6hRQZND)f$B5h-d)^iO^_6X_R$(40ym0FhDESbW0+~!XHoDezi8a5$$;<)x{`=)05WvkX=B__OX z7-1rpA511_rq}lC_K_pQ<7KbmZORq|Diabv-P*!wl@2Xo>lnp~G^>P>YBso#&vG^( zr2etaYFBn$=vYHm$2trh8_252>BytNsIrB8S-~|SoRj!lL&h3p?J7N(?%?A7mbs0= zXu@dI7N)R7J2&J!74p3Zv) zua^;!V4GyGh$t&SvS3j04WUX0;SM5?EHMjPc^?3U6I52lVEiWTb0YDdB_pc5L#c!d lPf*QDr0|TGS&6b2H(#JV^a>>q{wbG|7mCXg#@P>H;v1zCjo1JH delta 160 zcmZo-?PHQY^>5cc1_lOm1|bdx9u5XxE(TTxK6VCvb_RioRyGr7$VxEqFt9NQGBU7) zKTDN1|Xjs0E_1o{{R30 diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index 5561f08916..5e5850122d 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -1,7 +1,14 @@ +import java.util.Date; import java.util.Scanner; public class Todo extends Task { public Todo(String description) { - super("T", description, ""); + super("T", description, new Date()); + } + + public String toString() { + return String.format("[%s][%s] %s", this.type, + this.getStatusIcon(), + this.description); } } From e85119966dece0b32b2ed8af4cc03f56ed2fc22d Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Sun, 1 Sep 2019 18:18:52 +0800 Subject: [PATCH 13/28] Completed A-MoreOOP --- src/main/java/AddCommand.class | Bin 0 -> 1523 bytes src/main/java/AddCommand.java | 29 ++++++++ src/main/java/Command.class | Bin 0 -> 391 bytes src/main/java/Command.java | 7 ++ src/main/java/DeleteCommand.class | Bin 0 -> 1350 bytes src/main/java/DeleteCommand.java | 25 +++++++ src/main/java/DoneCommand.class | Bin 0 -> 1312 bytes src/main/java/DoneCommand.java | 24 ++++++ src/main/java/Duke.class | Bin 1038 -> 1072 bytes src/main/java/Duke.java | 2 +- src/main/java/ExitCommand.class | Bin 0 -> 636 bytes src/main/java/ExitCommand.java | 21 ++++++ src/main/java/ListCommand.class | Bin 0 -> 1151 bytes src/main/java/ListCommand.java | 22 ++++++ src/main/java/Main.class | Bin 3953 -> 1076 bytes src/main/java/Main.java | 117 ++++++------------------------ src/main/java/Parser.class | Bin 4522 -> 4658 bytes src/main/java/Parser.java | 64 ++++++++-------- src/main/java/Storage.class | Bin 0 -> 1198 bytes src/main/java/Storage.java | 36 +++++++++ src/main/java/Ui.class | Bin 0 -> 1902 bytes src/main/java/Ui.java | 44 +++++++++++ 22 files changed, 262 insertions(+), 129 deletions(-) create mode 100644 src/main/java/AddCommand.class create mode 100644 src/main/java/AddCommand.java create mode 100644 src/main/java/Command.class create mode 100644 src/main/java/Command.java create mode 100644 src/main/java/DeleteCommand.class create mode 100644 src/main/java/DeleteCommand.java create mode 100644 src/main/java/DoneCommand.class create mode 100644 src/main/java/DoneCommand.java create mode 100644 src/main/java/ExitCommand.class create mode 100644 src/main/java/ExitCommand.java create mode 100644 src/main/java/ListCommand.class create mode 100644 src/main/java/ListCommand.java create mode 100644 src/main/java/Storage.class create mode 100644 src/main/java/Storage.java create mode 100644 src/main/java/Ui.class create mode 100644 src/main/java/Ui.java diff --git a/src/main/java/AddCommand.class b/src/main/java/AddCommand.class new file mode 100644 index 0000000000000000000000000000000000000000..a8bf96f69e212301188d5ffee26cefaa0e160ed6 GIT binary patch literal 1523 zcmaJ>ZFdtz6n-X6v&nW#N(okqz@)S`O`sK2)CN%qEd`rV)55Ak?s6KJ$KoSdDxGxzPe&%K$y{(1EWfY0!48W(Jgg4@U< zpCM_+!bKain6vRA=4}+PV5H(C*)Q5y!bcXaq;b`T18(7ChSYUG^z{vfk;1|QhGa!~ zk|A63L%H5sq+YHPP;;wO96B+19=aBf{!OD|^0< zu|8(7>#Eyv<*IM+Wp8?3Kii@K%0MMfAZM174nD!B&8j^c5ayx#EpR1=_aIHMWT@i*#^KHpxtF8AJiJd-lhOwvJAb5M4JWe{%uqir` z>@Z~7MlfW?tRC-AOf-?7enU7>Cp_#-EoR6S7KUL+M*a`P zIt@+L#vR;csNA8Fe7(r4^ShE$7U^-_@FT7X-?Gg)v)9%4d|!2WLy!fF6%qGCGLt-@ zaUde5TB0c{Ds+W@=<5bakrtt*=Fblqu{36=U6_@ z+rZ6#9Jlt{a)|kp0sA*i8o26*sE8n_`&!ZrZ!*jst8W-KhV$>XL!MrfEWH|_o&FCv zNvnB9E+Rn^U==6XArdc0WH?2uO$uNHDI{ZuT;HKc_eNtE4>3|K{f6X`&k3?e>|r5; zG5O0IHAWwmDAg}?=%q^04vf({h4;zG;QEowM`^!W{1wUHky=ic&Lj_D zJ-lSLbm;(@SA-D<82bs?<>YHPk0!?tapKPxakLrC(SwnQODP&dsyRbdPf+wz^qWEs z7f7BVX^vpd6VNM^{R~-JNYI2iW0<$nQ#WMK>d literal 0 HcmV?d00001 diff --git a/src/main/java/AddCommand.java b/src/main/java/AddCommand.java new file mode 100644 index 0000000000..3313315e8a --- /dev/null +++ b/src/main/java/AddCommand.java @@ -0,0 +1,29 @@ +public class AddCommand extends Command { + public AddCommand() { + this(""); + } + + public AddCommand(String fullCommand) { + this.fullCommand = fullCommand; + } + + public Command clone(String fullCommand) { + return new AddCommand(fullCommand); + } + + public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException { + try { + Task task = Parser.parseTask(this.fullCommand); + tasks.add(task); + ui.printResponse("Got it. I've added this task:\n " + + task.toString() + "\n" + + "Now you have " + tasks.size() +" tasks in the list."); + } catch(DukeException e) { + throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); + } + } + + public boolean isExit() { + return false; + } +} \ No newline at end of file diff --git a/src/main/java/Command.class b/src/main/java/Command.class new file mode 100644 index 0000000000000000000000000000000000000000..16d99c41bd1ae30347ae36962db06036e53315d4 GIT binary patch literal 391 zcmZWlJx>Bb6r6>FQ$7UoGbR*vU?HW&85_iEqXlSTw;U^3IQGolp5bp`b5|7wSz7B4y`;u}h4d z2Ljb=V~x8JDEInL0^Ts5X@QnBR^Mluh%-v94F6u za-!0uG^q>ZqY32L#fh5hAlIpl)}elNCbp@M6WTE8Xl-0!YGr4qQ!+x3D zZ=edFGTW`%e@i_~7dj+I^EO-Rt$=rq5r&G|6#kZ8(uP231-U2~1f;YGUO@@oC?ItrI=1Mjze2l0AWb^Swt`RML-<2y z6dauK0emROlQs(2YCGLMyXX7P`SzUCA3u-21DMC77=~m-a88DT^Kr6hqsS!0m+9xv4dA&1g>(eQS4(-WG$VQP9o zIIgk98{wj+x3Xu7hMZRna>1#&CBAC<5>m_D;(`Y;XM8yf^xQ5a{iR#MWy~;ioq|c2 zRd5AYC0tW*9XBN0R4|8m1-EdUp=Zf)geP31`k0Gtr|c!7ScpMWu!uVn?kc#4B&iRQ zGIYMFS=OIZs{8+Fk|AE0Vw)^a7`E^jCfoF#w71L(L&t_m&8gDl zh-ciZQV1?#$uIOO!}u}5wCm0;4`!^HbJZx(jO03k#XZV-|IAw&1R zN6s7~l*xWU_?Xj8cr+Li;)oF=g);$flzcuf{tc0rSxWVh4$V|i+JR15d(jubi;dL4 zc;++0UlE-PXZykjkQO4-gOLNovImGCkw_e%^H{(LB#M-vXMfLT0=VL(R&S9BP-8mH5sh9Mo-VCqO> zSS=$uMlqJ4__U4;vKl5CqVtwx$pwZ`D*cinoOertp{rmyVxv~s5#AQxvFWBaRoLeT zeA?#D?)0YgEN3^T0Fk2YI^-Wb&tJ&9l?r!CIR;G}iegPtq^x>vY~Q=$mfMD~eT1QMj;7m4b{@iVOoa+ktMibQ-vhDTel@APv(7 zZs4YdTLy09j)A+F(J*V^9_~}VCD)a{^mz5Dkb7>)?}}nBhMa+UJkYRU;32w+c~Fva zzpL5yA1l!+2+8@Jd%o}(;#GA}Wd5PuIz#NY4%BFcd*wyH5g$&iD``W!f`o{ZQ5TFv z3@ZTPq}zA_hMrWqm4=Q-SY$|VSVfUE*C!5ysnUy*DfcYjl$6BezF8u2bEa;ZjG@26 z%cQMS=%U3Fr5^SIzmGnF+wD8 zF~B9sr*QFah`i2HsgGndN=0c0+G*`UZxFsg;SstW&U{ArE21;uY;X7&+GKr;9V329 z6mg99v+@H}8q`&s8t6hdl}=!Y_GFzzANqsb1GKA(ZJ`geHgo8ss+W`pm$5>-PTo8o PW0~x6vQ$B*$Qp(1{!iKKJ!eXLLh(tw4(w%=GsoC)-kZ6-i z`~W{noMGX9yyv{P84ZXsK|EwO3Y9O-hZ)rJI_s_KV(5@ou@9P=A zrWfvm&V!|)q&zA(Dl9Eli4Erms8?|mF+t-usE80}O#C4A5M4H8658<_dSOTi`h-6) zP7~$;t5NI|`PWDimh7O$63wbjN;*i(-#WqIG{&ikwMBlD9k%3sTDT=VC3ofrUOF(o delta 344 zcmYL@%`QVx6otQYPw!8!ORJ@n-uf;2gQ7I15;J#38Y5|tkcf(QV8k0p>W;kw5-KGg zz(a|BO`Man);@c$v(|ZX?w#8APyY+3v*qHFb{L5>N+u<}371K7Hol8RI)c2-l+ARv zeyj)Zx{o*8Gaj?dDUv&_R;S&$Ze9haowL?SJ7F>JQ1Dn_(Pqh`NJ$Y3n&+1uWxVi0 z1-im=_^BSOl}NT8?i)o_3vZ3r*ruWo9_f5|pv!l0`B=0J6cQ^qC^uhN37e%J>RAfK zkf8O~RK!V;lsb~`%2O@ur;NQ9bh%Fq-Y`F~4tv-^rSXpQZ;`&tzSTQaq`wKMIDh2=m diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index a12bd35519..44eb04e1d8 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -7,7 +7,7 @@ public static void main(String[] args) { + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); - Main main = new Main(); + Main main = new Main("../../../data/duke.txt"); main.run(); } } diff --git a/src/main/java/ExitCommand.class b/src/main/java/ExitCommand.class new file mode 100644 index 0000000000000000000000000000000000000000..264defc22286888549c8fe725a281d73fefc18af GIT binary patch literal 636 zcmZutyH4Xk6g}fOwqp_k;hlxWfhGh5B}EVg2(*PoL13lbZb*h`z?q3+8^J$OKmkY~ z@d11k;!dytvD?gjopbJ)`||qu3}6$>9;SWdG2_F-Y=N>l7gY~Ge9U9P#ZLxjODdUc zGvw+kzZvXZ-4P7sP%3ed_D;m$h@V8%nW~3p{DN;pTy-~E$v~=Z(-89QNGqBz{BIua z>RyklPLshEm!h2}gsj%XBOafJGESP|v22E|L=SjZ4CNdd?_J7dXy-43-_q%zE%v3c zFlHv1;<_=zfFcSgna3|;5dp)<7Z5|Rb0yY;U%D@XLPgh6|Mcmga7O2sAJvuumGUJHe5vrD9Q3kk;3VVQc zODQAYAb>@04i4-gp_CCC)Hf5q@qk=o^$zwYXO!?5GF)2W5n~kPj8~(X;T4{c|FcS~ zZm4))T~8B16g|_HZo8~4R1iVI77CUYLGhb4KG;YwSv9esQJ9pZFtu z&<7#G#2?^~GTv=hskZT9X70>A=iYPg%kj+vStiiF>w{M zIRX?+%wxeoks4_JeR$chpyzbJ;WXU<;hkVWD-ribG z`_kL9L&8YIRUY|ghxwhVYPGnxYcm+)NHjW{kTWG`n+Hut2HJLZr0vwS^7)?VhD*xe z>5Jz1Opncwc zF7&?I4YEm;Q>a*2!3_he7S@maBF|~)eHzq+ATPcAG1ZuNskRN1F-*01Q&g4L;QEc!`(y>0dpclP8rtH4TVaUp zNQMh-x+DEc1Z|2S46KK>-eV}96Qp;jnj*T*Udm10pxZb$@PM9%qg1ogX0V=lp75(K z4+23tKKAQ~V)WX&MR)Crpx7hYgN^7r`HQ%H+!jON@B8pC>j$Et?f&jYA*$SUYf=l_ zz(a<`f%=ANW0?Ct4h8yX()6u>R(gmSrP-q00%BwVMmfh$5&J?WHJfIW96%gNB)Wu5 zL@3jF=rPNuh?gs0kvQjM2#+qqpkygxWHA=;3gioU>2DZ$TcK2+Y12!Uq!nF737HH%xP-g3 VnuNPeKbbq2#vJWK+1F^~e*xf=2uuI~ literal 0 HcmV?d00001 diff --git a/src/main/java/ListCommand.java b/src/main/java/ListCommand.java new file mode 100644 index 0000000000..ddccf0f3f0 --- /dev/null +++ b/src/main/java/ListCommand.java @@ -0,0 +1,22 @@ +public class ListCommand extends Command { + public ListCommand() { + this(""); + } + + public ListCommand(String fullCommand) { + this.fullCommand = fullCommand; + } + + public Command clone(String fullCommand) { + return new ListCommand(fullCommand); + } + + public void execute(TaskList tasks, Ui ui, Storage storage) { + ui.printResponse("Here are the tasks in your list:\n" + + tasks.toString()); + } + + public boolean isExit() { + return false; + } +} \ No newline at end of file diff --git a/src/main/java/Main.class b/src/main/java/Main.class index acc6a7247d6a3b3d7b512984b10988c632759393..3bc34b4026f99f81f88ea14328c482ae3ca55ab2 100644 GIT binary patch literal 1076 zcmZuv*-{fx5IvLal3_>)5Ox$rF$n^q2pR}3EQ(HoRzM5ihALC`bYlB+<~H)-gW>oMr7SqcLBmPI?XXjLtb`SFClXS_3}%SN?0o%bB8T3krJ zB5v88>OsNW_bj`r;jv6^`_qet zW$A}r7>;W?8dk8XVGU0No@!XfGY!w7YskuQ4x?;F@=(xu(dov{o>}nz2{oH1xNIA{ z3baJ>Z}B?axAuFTHxy{qacoCHy9~WH%LTi_UfUhh*j=_O6{E`R9%f&>*3y-8*_V_R zjQme^y_L=Ji1R|iJTMD2k2!;h3qEp)=i`>Lhb(vXz+yw3!W&MZXnI-Gb(@PJc{VuX z3b(GGOX}weQF2;7DR|@0u{8dQoCp+Rfe#1}3uIC!P*SJxZJ)q@i~!Bx_QVN7#}KL1 zCx|-QjuAdYZq6f;$*JVzD8NBgy6U;VR3GBh0gd#UtGBC~sqo#fj)b3f-7N z4;ImjF`~NRJL82p oYm8#eva>X4W#}!D=sIm3FB?5X;Qxu3KvXG_euTAeu$B*r-)`2??f?J) literal 3953 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 BcS`^O literal 4522 zcmbtXi(eGi75;{u-5HiqWMxsX>Ka9nhgdWi(HIplq6oH2wP<+N9%;N5>m8OY# zH%;G7(;Az;(uZwg6JwGErHM%&woM=D`;orWNB)NXeofNv%q+5)jrI2nFn8{`_ndRT z@7#0G9iD&n{4)SH;N>8;z}Aooq6Bs+0vOYAL_<1=dC171qa&;1sE+sPIHqG<$NOdY zCJi4Dotrh>5=02crMXp_+r-Q5K^(#z8tx2YA#54GOGfUN=7ZAQ6QtIMq`6m`4{P{{ zj*kYh499hROvlGHd?JXIIIiK7LDa$4@u?6Ye@2AQN<%kwI3cbd&~Q?md@hK!cu>dZ zHGCn6^>|Pg`l606$@|MX9umM`5#g()_!_>hyaYP6x3K-wNVUJf^_6 zy}wg|(xqTdd&gcSZZ8udv_I+tVri5(R;d&hE}WSMqVDZ(DS? z%&44+jmGzwV+!VXA2yGg%~>arY~E>RhB>%NL1{EGWSdSlZ7FDby~bv5C~4Y5%~2WTYPjL zi&A?GDjxCSlTijt1lH#y`d)Os5#fu?6Ayul57+# zDe8B6o)%@EMdwk=Cdoxb)!j+z=6Ml{f)zzIXEwBhS~Sr&#|Xp?b}*XCreoHQgoL(i zuY@+eMhpz>!+r%7GsgLBFt8VI<1P)1(<0zm72hrFoDVG2{#?1G1IoKv>-cY;5?=bd>i`>^x+)_p2jl@ z7P@F%FWaWmtTUZX(dGgs4LmE&bJBbV-!%|J+<=8a149^Q(sX1;tV@}pAk<|aHIs>W z#Nm!d5?;pfbhW;8;#{P+cW-prvSpFJVJi~1GO={R&8J9eFk(i8YedkdoXCI`u|~(7 z@ilVb+!$2Np!8C9dvxq2Xq-C9yjiTj5 ziji#{qvOiDLO1zx!#Ky1sf-*3>qyp2W-fCxjh7`(6E~#GT^nX;^(tH-Y1u;#)2}p> z9pJXJc#4NvA<8cm#GmmO1tk%d^#!Bmh{f6;GoAejhrYa9fUD1eP z*K+H$8$M=GvG~l+yYY-;aUoyIy(m17iB$7mM%bZK%N!+_z+fspDu-ob5gdgurnj*e zvia^=nC+XpJtiw9Z6YUJ{s{Z>nPb(Sm8Iza3kfN1#%bVT?O)P%H0L>9?CrhaxYZ5_~`HLuD|HKg>vz*ALJPCO1AH$ z^eBAn0qOb)DD_h)>7Rh_DX8^NLJj$SlhAU|_q$T5S||nmg;H6dP%^YaY0fNZ?zHqc zS5?r@ww{=PxkOyf-+5S!3N-LzbR*_74wXb5=G|9?BUnI-12~w+elM}BwA>}|8geMV zh|qNRSl?&{kekcsFsCxG_x;m!CQGIgkBlp6TkOa!ui8I)I0>n)G>a6l!5g?!$7wJ^%A z9>!Y2Xd#SsgmEoFv=YXKE5k4`;6+0TGa3@hbF-r%gqzybl2(7Un!}<;r~zgysNFg& zXJEPiV)`WC?Mu`bB~#Z`t09A!AHYgqtN#=tl;^l|l`8T)%5z;g;BWPZ{SVV-Df?v7Fsg+5DylTpc~M?8=SCr>%NO$1 z(pmSW=&YZibM57H5(ILXbdsbqN;)>_q(~=CIvLV&NarZ&93!3aE7IY&a-Pl$+}u(U zzmL1n8rqP95Dg{8Vj`_-`2^=Q98EEPT49|%jmj`nL|UEY(pA&0F~*w!BoRA|X~*ssRJ zYM8SV*e>)7EBei>>$k9mA7|aZmGp08ExVni;|{dpPTqER;U?V85RF{Ajn>m%ekwwN z9NL-xDyy>Z2~^2t;iY)MRq?yg@}tDq$}bNFSf)qu65n#a{SE)b-+AKiqpVZ@G@twb E2l@#p-T(jq diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 371e798148..aaa7a87f9f 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -3,59 +3,59 @@ import java.util.Date; public class Parser { - public static final int BYE = 0; - public static final int LIST = 1; - public static final int DONE = 2; - public static final int DELETE = 3; - public static final int TASK = 4; - - protected HashMap cmdMap; + protected static HashMap keywordToCommand; public Parser() { - this.cmdMap = new HashMap<>(); - cmdMap.put("bye", BYE); - cmdMap.put("list", LIST); - cmdMap.put("done", DONE); - cmdMap.put("delete", DELETE); - cmdMap.put("todo", TASK); - cmdMap.put("deadline", TASK); - cmdMap.put("event", TASK); + keywordToCommand = new HashMap<>(); + keywordToCommand.put("bye", new ExitCommand()); + keywordToCommand.put("list", new ListCommand()); + keywordToCommand.put("done", new DoneCommand()); + keywordToCommand.put("delete", new DeleteCommand()); + keywordToCommand.put("todo", new AddCommand()); + keywordToCommand.put("deadline", new AddCommand()); + keywordToCommand.put("event", new AddCommand()); } - public int parseInput(String input) { - if(cmdMap.get(input) != null) { - return cmdMap.get(input); + public static Command parse(String input) throws DukeException { + if(keywordToCommand.get(input) != null) { + return keywordToCommand.get(input); } else { Scanner scanner = new Scanner(input); - String cmd = scanner.next(); + String keyword = scanner.next(); scanner.close(); - return (cmdMap.get(cmd) != null) ? cmdMap.get(cmd) : -1; + Command command; + try { + command = keywordToCommand.get(keyword).clone(input); + } catch(NullPointerException e) { + throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); + } + return command; } } - public int parseDone(String input) throws AssertionError { + public static int parseDone(String input) throws AssertionError { Scanner scanner = new Scanner(input); - String cmd = scanner.next(); - assert(cmd.equals("done")); + String command = scanner.next(); + assert(command.equals("done")); int itemId = scanner.nextInt(); scanner.close(); return itemId; } - public int parseDelete(String input) throws AssertionError { + public static int parseDelete(String input) throws AssertionError { Scanner scanner = new Scanner(input); - String cmd = scanner.next(); - assert(cmd.equals("delete")); + String command = scanner.next(); + assert(command.equals("delete")); int itemId = scanner.nextInt(); scanner.close(); return itemId; } - public Task parseTask(String input) throws DukeException { + public static Task parseTask(String input) throws DukeException { Scanner scanner = new Scanner(input); String type = scanner.next(); scanner.close(); @@ -68,10 +68,10 @@ public Task parseTask(String input) throws DukeException { case "event": return createEvent(input.substring("event".length())); } - throw new DukeException("Invalid task input"); + throw new DukeException("Invalid task input."); } - static Todo createTodo(String input) throws DukeException { + public static Todo createTodo(String input) throws DukeException { String description = input.length() == 0 ? input : input.substring(1); @@ -81,7 +81,7 @@ static Todo createTodo(String input) throws DukeException { return new Todo(description); } - static Deadline createDeadline(String input) { + public static Deadline createDeadline(String input) { StringBuffer stringBuffer = new StringBuffer(); Scanner scanner = new Scanner(input); @@ -101,7 +101,7 @@ static Deadline createDeadline(String input) { return new Deadline(description, parseDate(date)); } - static Event createEvent(String input) { + public static Event createEvent(String input) { StringBuffer stringBuffer = new StringBuffer(); Scanner scanner = new Scanner(input); @@ -121,7 +121,7 @@ static Event createEvent(String input) { return new Event(description, parseDate(date)); } - static Date parseDate(String date) { + public static Date parseDate(String date) { String[] dayAndTime = date.trim().split(" "); String[] ddMmYy = dayAndTime[0].split("/"); String hhSs = dayAndTime[1]; diff --git a/src/main/java/Storage.class b/src/main/java/Storage.class new file mode 100644 index 0000000000000000000000000000000000000000..c98ebfa9b93bfb595a32ae6c6066b7933e93f9e5 GIT binary patch literal 1198 zcmZWpZBr6a6n-u*E-s62h>G??T8bdpn^|F5zLf>)3{EqATw%3U++|>~n*Kun!>`$t z%*0IfxgS+M7evs8*|YcVdG0ySdCs}~{`36@fO%w8gc0q=2&NUpRJajWFr&hYgfvNM zW~I5U;7&L0;+~58m{agTMF3F+^9mlS=tEpZFCIzrSQ^4pJ}jsR$$(E3JQeWmnnhzv zcisvNr1$kBeYU7ud$U=mY+8FMfvyG9G93a#(f{4kZv;HccEJ$nO`DdnQ9ax-%G>%* zkzYI&{fMtXG`+1?4$@}DNlAPl>*)D|j9zNNind-5(4y0AoPfIeK5vv9)3z$yWbJA> zZ>*6ifmz2c>w890lGShpiyB5TCNR=qZ`!jGw^?;cRfkm=`k@3}6&P*#H+S}pymJ}x zOv7_5X;_v4SFk7$Y|C-ZM!~9vHM~&pQo}lyC}68Pf$+r)>()61f#H@GRN=tizp)eTAzAPo@rUZl;E=jYRwuO5zkg zKHbOgXTHEca|-Q*r-5d;~|&OOM(N0r8?(*)B@vF;f8#;L#@xkxraxc*A{6pSeRHxXo}k}@a@o6TpE IYZs>e0WZw|Z2$lO literal 0 HcmV?d00001 diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java new file mode 100644 index 0000000000..c1c2facadc --- /dev/null +++ b/src/main/java/Storage.java @@ -0,0 +1,36 @@ +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; + +public class Storage { + protected String filePath; + + public Storage(String filePath) { + this.filePath = filePath; + } + + public void save(TaskList list) { + try { + FileOutputStream fout = new FileOutputStream(this.filePath); + ObjectOutputStream out = new ObjectOutputStream(fout); + out.writeObject(list); + out.flush(); + out.close(); + } catch(Exception e) { + System.out.println(e); + } + } + + public TaskList load() throws DukeException { + TaskList list = new TaskList(); + try { + ObjectInputStream in = new ObjectInputStream(new FileInputStream(this.filePath)); + list = (TaskList) in.readObject(); + in.close(); + } catch(Exception e) { + throw new DukeException("Save data not found."); + } + return list; + } +} \ No newline at end of file diff --git a/src/main/java/Ui.class b/src/main/java/Ui.class new file mode 100644 index 0000000000000000000000000000000000000000..4f1b1e018602f97b61f1fde0608f7f5a3d1da83a GIT binary patch literal 1902 zcmbtU*>W326g?x$8hJe4lz0h_!^n2L$QuceKpYaV5@UnB5ZN(KfY6rO@kFC(m1bmc z6>t1R_yS%b4|3sD@d11WFMI{dX-VZ(#Y?2B+tc^nbMDf&`;UK)eg|+H!a_eLE%YIk zpkmgw4s<53gaRpp`x4UA1>UWk1$ z=L!G$TsADb{`2|Ciz*^qKQDbEIF70J0@@Z8p z3O{e)@~_oXNC=xl~t8;PAWFpWMdg4aeQXub7X9+=wPcDF|lT29beeEiXjt^Y-BZH1DhJk^2e5>=c%N#JYIAj zR0`7C+7qEec4yhiD~IRd9H`2D8xE2N2LF8do3pmIo=ql`&Z=@k5flO^5c@JeYap`e zvbdA%*LGgWTxeknUmEz);qTcS{4C?m8PH!81({ZUPJ~--xW}&`6n+@+p!P(tD!=C> zaYmmQi2K~=0i{U?b_|QtCQ2o#=VZFsG+mg_`oYZ`Xw7*_4`Do1^+h?AY}~tgw-!Y%ROJH`&)9{GQiV#%fW54TFztyTkZj@0(@kk`)F*t2m&=pE zXdO6zp;4zbXMh_AC3)J|cnY4LVyI8qnb)B~krtkpbwfFC;#&jPFVxp8Hv`xH-w#Q? zZT);MfjD19-fGIXxEtbXaBWQ;!uXXRye^cnnzDtGH;_`hP9efS(4LyAB65Tl;Fn`S zr{1EK4l!6JaAYOcn8;Fum!$#z9^q7d6hz&9mJ_3yr zCYXsX!G48KT}4+F-6us`HCrDe^wWPBBMsC|qI7i$o%bvB93qh+xNT+neEoyOUS&4A zWuwPE9wD#pv6)I-s^aqbfJwGYhq`{8<}d*|&6v*dg8vwsIZpqvW&wJe08$Jv#R|qr c8Nmd;;%brL3BJKol1y>mNy{{KGd20%e<2&O7ytkO literal 0 HcmV?d00001 diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java new file mode 100644 index 0000000000..94f4a742a0 --- /dev/null +++ b/src/main/java/Ui.java @@ -0,0 +1,44 @@ +import java.util.Scanner; + +public class Ui { + public String format(String command) { + return " ____________________________________________________________\n" + + indent(command) + + " ____________________________________________________________\n"; + } + + public String indent(String command) { + StringBuffer stringBuffer = new StringBuffer(); + Scanner scanner = new Scanner(command); + while(scanner.hasNext()) { + String temp = scanner.nextLine(); + stringBuffer.append(" " + temp + "\n"); + } + scanner.close(); + return stringBuffer.toString(); + } + + public void printResponse(String command) { + System.out.println(format(command)); + } + + public String readCommand() { + // Unable to close scanner - will trigger NullException error on scanner.nextLine() + Scanner scanner = new Scanner(System.in); + String fullCommand = scanner.nextLine(); + return fullCommand; + } + + public void showWelcome() { + this.printResponse("Hello! I'm Duke\n" + + "What can I do for you?"); + } + + public void showError(String message) { + this.printResponse(message); + } + + public void showLoadingError() { + this.printResponse("☹ OOPS!!! No tasks saved."); + } +} \ No newline at end of file From c9337bd0f66c40838e73a2cc581e8cd101921fd0 Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Mon, 2 Sep 2019 16:10:05 +0800 Subject: [PATCH 14/28] Completed A-Packages --- src/main/java/AddCommand.class | Bin 1523 -> 0 bytes src/main/java/AddCommand.java | 9 +++++++++ src/main/java/Command.class | Bin 391 -> 0 bytes src/main/java/Command.java | 7 +++++++ src/main/java/Deadline.class | Bin 713 -> 0 bytes src/main/java/Deadline.java | 2 ++ src/main/java/DeleteCommand.class | Bin 1350 -> 0 bytes src/main/java/DeleteCommand.java | 9 +++++++++ src/main/java/DoneCommand.class | Bin 1312 -> 0 bytes src/main/java/DoneCommand.java | 9 +++++++++ src/main/java/Duke.java | 2 ++ src/main/java/DukeException.class | Bin 226 -> 0 bytes src/main/java/DukeException.java | 2 ++ src/main/java/Event.class | Bin 707 -> 0 bytes src/main/java/Event.java | 2 ++ src/main/java/ExitCommand.class | Bin 636 -> 0 bytes src/main/java/ExitCommand.java | 6 ++++++ src/main/java/ListCommand.class | Bin 1151 -> 0 bytes src/main/java/ListCommand.java | 6 ++++++ src/main/java/Main.class | Bin 1076 -> 0 bytes src/main/java/Main.java | 8 ++++++++ src/main/java/Parser.class | Bin 4658 -> 0 bytes src/main/java/Parser.java | 5 +++++ src/main/java/Storage.class | Bin 1198 -> 0 bytes src/main/java/Storage.java | 4 ++++ src/main/java/Task.class | Bin 987 -> 0 bytes src/main/java/Task.java | 2 ++ src/main/java/TaskList.class | Bin 1547 -> 0 bytes src/main/java/TaskList.java | 3 +++ src/main/java/Todo.class | Bin 642 -> 0 bytes src/main/java/Todo.java | 2 ++ src/main/java/Ui.java | 2 ++ src/main/java/{ => duke}/Duke.class | Bin 1072 -> 1082 bytes src/main/java/duke/DukeException.class | Bin 0 -> 231 bytes src/main/java/duke/Main.class | Bin 0 -> 1167 bytes src/main/java/duke/Parser.class | Bin 0 -> 4842 bytes src/main/java/duke/Storage.class | Bin 0 -> 1223 bytes src/main/java/duke/TaskList.class | Bin 0 -> 1592 bytes src/main/java/{ => duke}/Ui.class | Bin 1902 -> 1907 bytes src/main/java/duke/command/AddCommand.class | Bin 0 -> 1617 bytes src/main/java/duke/command/Command.class | Bin 0 -> 437 bytes .../java/duke/command/DeleteCommand.class | Bin 0 -> 1439 bytes src/main/java/duke/command/DoneCommand.class | Bin 0 -> 1401 bytes src/main/java/duke/command/ExitCommand.class | Bin 0 -> 695 bytes src/main/java/duke/command/ListCommand.class | Bin 0 -> 1215 bytes src/main/java/duke/task/Deadline.class | Bin 0 -> 733 bytes src/main/java/duke/task/Event.class | Bin 0 -> 727 bytes src/main/java/duke/task/Task.class | Bin 0 -> 997 bytes src/main/java/duke/task/Todo.class | Bin 0 -> 662 bytes 49 files changed, 80 insertions(+) delete mode 100644 src/main/java/AddCommand.class delete mode 100644 src/main/java/Command.class delete mode 100644 src/main/java/Deadline.class delete mode 100644 src/main/java/DeleteCommand.class delete mode 100644 src/main/java/DoneCommand.class delete mode 100644 src/main/java/DukeException.class delete mode 100644 src/main/java/Event.class delete mode 100644 src/main/java/ExitCommand.class delete mode 100644 src/main/java/ListCommand.class delete mode 100644 src/main/java/Main.class delete mode 100644 src/main/java/Parser.class delete mode 100644 src/main/java/Storage.class delete mode 100644 src/main/java/Task.class delete mode 100644 src/main/java/TaskList.class delete mode 100644 src/main/java/Todo.class rename src/main/java/{ => duke}/Duke.class (69%) create mode 100644 src/main/java/duke/DukeException.class create mode 100644 src/main/java/duke/Main.class create mode 100644 src/main/java/duke/Parser.class create mode 100644 src/main/java/duke/Storage.class create mode 100644 src/main/java/duke/TaskList.class rename src/main/java/{ => duke}/Ui.class (70%) create mode 100644 src/main/java/duke/command/AddCommand.class create mode 100644 src/main/java/duke/command/Command.class create mode 100644 src/main/java/duke/command/DeleteCommand.class create mode 100644 src/main/java/duke/command/DoneCommand.class create mode 100644 src/main/java/duke/command/ExitCommand.class create mode 100644 src/main/java/duke/command/ListCommand.class create mode 100644 src/main/java/duke/task/Deadline.class create mode 100644 src/main/java/duke/task/Event.class create mode 100644 src/main/java/duke/task/Task.class create mode 100644 src/main/java/duke/task/Todo.class diff --git a/src/main/java/AddCommand.class b/src/main/java/AddCommand.class deleted file mode 100644 index a8bf96f69e212301188d5ffee26cefaa0e160ed6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1523 zcmaJ>ZFdtz6n-X6v&nW#N(okqz@)S`O`sK2)CN%qEd`rV)55Ak?s6KJ$KoSdDxGxzPe&%K$y{(1EWfY0!48W(Jgg4@U< zpCM_+!bKain6vRA=4}+PV5H(C*)Q5y!bcXaq;b`T18(7ChSYUG^z{vfk;1|QhGa!~ zk|A63L%H5sq+YHPP;;wO96B+19=aBf{!OD|^0< zu|8(7>#Eyv<*IM+Wp8?3Kii@K%0MMfAZM174nD!B&8j^c5ayx#EpR1=_aIHMWT@i*#^KHpxtF8AJiJd-lhOwvJAb5M4JWe{%uqir` z>@Z~7MlfW?tRC-AOf-?7enU7>Cp_#-EoR6S7KUL+M*a`P zIt@+L#vR;csNA8Fe7(r4^ShE$7U^-_@FT7X-?Gg)v)9%4d|!2WLy!fF6%qGCGLt-@ zaUde5TB0c{Ds+W@=<5bakrtt*=Fblqu{36=U6_@ z+rZ6#9Jlt{a)|kp0sA*i8o26*sE8n_`&!ZrZ!*jst8W-KhV$>XL!MrfEWH|_o&FCv zNvnB9E+Rn^U==6XArdc0WH?2uO$uNHDI{ZuT;HKc_eNtE4>3|K{f6X`&k3?e>|r5; zG5O0IHAWwmDAg}?=%q^04vf({h4;zG;QEowM`^!W{1wUHky=ic&Lj_D zJ-lSLbm;(@SA-D<82bs?<>YHPk0!?tapKPxakLrC(SwnQODP&dsyRbdPf+wz^qWEs z7f7BVX^vpd6VNM^{R~-JNYI2iW0<$nQ#WMK>d diff --git a/src/main/java/AddCommand.java b/src/main/java/AddCommand.java index 3313315e8a..ba8db355e4 100644 --- a/src/main/java/AddCommand.java +++ b/src/main/java/AddCommand.java @@ -1,3 +1,12 @@ +package duke.command; + +import duke.DukeException; +import duke.Parser; +import duke.Ui; +import duke.Storage; +import duke.TaskList; +import duke.task.Task; + public class AddCommand extends Command { public AddCommand() { this(""); diff --git a/src/main/java/Command.class b/src/main/java/Command.class deleted file mode 100644 index 16d99c41bd1ae30347ae36962db06036e53315d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmZWlJx>Bb6r6>FQ$7UoGbR*vU?HW&85_iEqXlSTw;U^3IQGolp5bp`b5|7wSz7B4y`;u}h4d z2Ljb=V~x8JDEInL0^Ts5X@QnBR^Mluh%-v94F6u za-!0uG^q>ZqY32L#fh5hAlIpl)}elNCbp@M6WTE8Xl-0!YGr4qQ!+x3D zZ=edFGTW`%e@i_~7dj+I^EO-Rt$=rq59_DVEd+#}C=Fi{Xw*WR!)-h?o#77;UG)$#2f@y=yOdQR|X3oGo z77Q#Rry;Lli9y};d{2I3unW7V{5!97x!4`VRgpcl5pwijQ|)C6yLX-GL<%fMqjX#`8f= z^&|+-xn%e<1p3i`Xa>Smhlr0nJ-cR$BXs#1$okf~-MT z0Tntls*tMpEqh2&1UObwyMfY37O#r&G|6#kZ8(uP231-U2~1f;YGUO@@oC?ItrI=1Mjze2l0AWb^Swt`RML-<2y z6dauK0emROlQs(2YCGLMyXX7P`SzUCA3u-21DMC77=~m-a88DT^Kr6hqsS!0m+9xv4dA&1g>(eQS4(-WG$VQP9o zIIgk98{wj+x3Xu7hMZRna>1#&CBAC<5>m_D;(`Y;XM8yf^xQ5a{iR#MWy~;ioq|c2 zRd5AYC0tW*9XBN0R4|8m1-EdUp=Zf)geP31`k0Gtr|c!7ScpMWu!uVn?kc#4B&iRQ zGIYMFS=OIZs{8+Fk|AE0Vw)^a7`E^jCfoF#w71L(L&t_m&8gDl zh-ciZQV1?#$uIOO!}u}5wCm0;4`!^HbJZx(jO03k#XZV-|IAw&1R zN6s7~l*xWU_?Xj8cr+Li;)oF=g);$flzcuf{tc0rSxWVh4$V|i+JR15d(jubi;dL4 zc;++0UlE-PXZykjkQO4-gOLNovImGCkw_e%^H{(LB#M-vXMfLT0=VL(R&S9BP-8mH5sh9Mo-VCqO> zSS=$uMlqJ4__U4;vKl5CqVtwx$pwZ`D*cinoOertp{rmyVxv~s5#AQxvFWBaRoLeT zeA?#D?)0YgEN3^T0Fk2YI^-Wb&tJ&9l?r!CIR;G}iegPtq^x>vY~Q=$mfMD~eT1QMj;7m4b{@iVOoa+ktMibQ-vhDTel@APv(7 zZs4YdTLy09j)A+F(J*V^9_~}VCD)a{^mz5Dkb7>)?}}nBhMa+UJkYRU;32w+c~Fva zzpL5yA1l!+2+8@Jd%o}(;#GA}Wd5PuIz#NY4%BFcd*wyH5g$&iD``W!f`o{ZQ5TFv z3@ZTPq}zA_hMrWqm4=Q-SY$|VSVfUE*C!5ysnUy*DfcYjl$6BezF8u2bEa;ZjG@26 z%cQMS=%U3Fr5^SIzmGnF+wD8 zF~B9sr*QFah`i2HsgGndN=0c0+G*`UZxFsg;SstW&U{ArE21;uY;X7&+GKr;9V329 z6mg99v+@H}8q`&s8t6hdl}=!Y_GFzzANqsb1GKA(ZJ`geHgo8ss+W`pm$5>-PTo8o PW0~x6vQb^1}=66ZgvJ9Mg}&U%)HDJJ4Oak4WF#UvPAuy#JqI<;F6-u zymV{LFh&Lz=lqmZMh1SL%)C^;(%hufqL9R-9H0nSaDHh~a;jSV>776;hAPm$t!7c5!#fhkNMA)kMDh|R{wO{F}pi}uEl&pGR3EKOpDG8&y zK`8fn-MWnTMZLonQ$_tY!eq&NK8#@bQ7>-Dk3o9f+BuP-+Dvy6XvfAdmbml4O}?e4 z;3kEVP;c3Lgs~@RU+QhyP&Ss~+E{^OV>OLR@C=k~jKeXoW@8;2gxviO#=I|*Bf{1{ zDgKwVIz490&LCF9EvbAZR4@6|h(f|pQznf#I95TLX-yW63H&W3VdS3Eqqu*Nd=OGU zjN-0Pgf|1AAN+=?rcX+x$U*42V@8VLQs13k_NJ`LaW6>sQE}bHXUtT6`7I zVZz`FOZuzjGjbdOo|83xK&xfT7s&ZFt$YdHujM#1{F=_ryhPr=hIRHh(&26C;4wy1 OWE3vPgbA)?F!>Wr^PedI diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 2a5d057d93..41f6721e84 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,3 +1,5 @@ +package duke.task; + import java.util.Date; import java.util.Scanner; diff --git a/src/main/java/ExitCommand.class b/src/main/java/ExitCommand.class deleted file mode 100644 index 264defc22286888549c8fe725a281d73fefc18af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 636 zcmZutyH4Xk6g}fOwqp_k;hlxWfhGh5B}EVg2(*PoL13lbZb*h`z?q3+8^J$OKmkY~ z@d11k;!dytvD?gjopbJ)`||qu3}6$>9;SWdG2_F-Y=N>l7gY~Ge9U9P#ZLxjODdUc zGvw+kzZvXZ-4P7sP%3ed_D;m$h@V8%nW~3p{DN;pTy-~E$v~=Z(-89QNGqBz{BIua z>RyklPLshEm!h2}gsj%XBOafJGESP|v22E|L=SjZ4CNdd?_J7dXy-43-_q%zE%v3c zFlHv1;<_=zfFcSgna3|;5dp)<7Z5|Rb0yY;U%D@XLPgh6|Mcmga7O2sAJvuumGUJHe5vrD9Q3kk;3VVQc zODQAYAb>@04i4-gp_CCC)Hf5q@qk=o^$zwYXO!?5GF)2W5n~kPj8~(X;T4{c|FcS~ zZm4))T~8B16g|_HZo8~4R1iVI77CUYLGhb4KG;YwSv9esQJ9pZFtu z&<7#G#2?^~GTv=hskZT9X70>A=iYPg%kj+vStiiF>w{M zIRX?+%wxeoks4_JeR$chpyzbJ;WXU<;hkVWD-ribG z`_kL9L&8YIRUY|ghxwhVYPGnxYcm+)NHjW{kTWG`n+Hut2HJLZr0vwS^7)?VhD*xe z>5Jz1Opncwc zF7&?I4YEm;Q>a*2!3_he7S@maBF|~)eHzq+ATPcAG1ZuNskRN1F-*01Q&g4L;QEc!`(y>0dpclP8rtH4TVaUp zNQMh-x+DEc1Z|2S46KK>-eV}96Qp;jnj*T*Udm10pxZb$@PM9%qg1ogX0V=lp75(K z4+23tKKAQ~V)WX&MR)Crpx7hYgN^7r`HQ%H+!jON@B8pC>j$Et?f&jYA*$SUYf=l_ zz(a<`f%=ANW0?Ct4h8yX()6u>R(gmSrP-q00%BwVMmfh$5&J?WHJfIW96%gNB)Wu5 zL@3jF=rPNuh?gs0kvQjM2#+qqpkygxWHA=;3gioU>2DZ$TcK2+Y12!Uq!nF737HH%xP-g3 VnuNPeKbbq2#vJWK+1F^~e*xf=2uuI~ diff --git a/src/main/java/ListCommand.java b/src/main/java/ListCommand.java index ddccf0f3f0..7ae6cc0158 100644 --- a/src/main/java/ListCommand.java +++ b/src/main/java/ListCommand.java @@ -1,3 +1,9 @@ +package duke.command; + +import duke.Ui; +import duke.Storage; +import duke.TaskList; + public class ListCommand extends Command { public ListCommand() { this(""); diff --git a/src/main/java/Main.class b/src/main/java/Main.class deleted file mode 100644 index 3bc34b4026f99f81f88ea14328c482ae3ca55ab2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1076 zcmZuv*-{fx5IvLal3_>)5Ox$rF$n^q2pR}3EQ(HoRzM5ihALC`bYlB+<~H)-gW>oMr7SqcLBmPI?XXjLtb`SFClXS_3}%SN?0o%bB8T3krJ zB5v88>OsNW_bj`r;jv6^`_qet zW$A}r7>;W?8dk8XVGU0No@!XfGY!w7YskuQ4x?;F@=(xu(dov{o>}nz2{oH1xNIA{ z3baJ>Z}B?axAuFTHxy{qacoCHy9~WH%LTi_UfUhh*j=_O6{E`R9%f&>*3y-8*_V_R zjQme^y_L=Ji1R|iJTMD2k2!;h3qEp)=i`>Lhb(vXz+yw3!W&MZXnI-Gb(@PJc{VuX z3b(GGOX}weQF2;7DR|@0u{8dQoCp+Rfe#1}3uIC!P*SJxZJ)q@i~!Bx_QVN7#}KL1 zCx|-QjuAdYZq6f;$*JVzD8NBgy6U;VR3GBh0gd#UtGBC~sqo#fj)b3f-7N z4;ImjF`~NRJL82p oYm8#eva>X4W#}!D=sIm3FB?5X;Qxu3KvXG_euTAeu$B*r-)`2??f?J) diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 991c5cafc8..cf31cbc0dd 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,3 +1,11 @@ +package duke; + +import duke.DukeException; +import duke.Parser; +import duke.Ui; +import duke.Storage; +import duke.TaskList; +import duke.command.Command; import java.util.Scanner; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/src/main/java/Parser.class b/src/main/java/Parser.class deleted file mode 100644 index cdbd35d2024c5b59de0f4b73760bea09eff38520..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4658 zcmbtYX?PRY6+L5(G~?0O27%0u1u?Plf~k|5fC;Nv9K4X)4K*}r#?oL5%QK2J0^Bqq zAtc?GG+l_>rfs^=hNLB=u?cE`bfIm!r2CTY>5}ft&wgJTdftpA%b+BDUv2BH_uhBT zefQn>{to4QxhBegE=cMA+P27Hx$~+3J)K^kmG0=}^kk z=r__M66TlE=n``zsYO$!;h6n)%zjBp&QY?`lk6~!Sb{_)EG}s`KTnOIr?F+fX*m)W zloWR-DVw86C=zN*N>1%?2c@W@u8k6iyAN8Qok>N_t#RS?;7;N7)C!@X;|A=KFmp;d z7alrx;(Bi2;F!?Zaxm`XwqD0+WVxq_c$%PtU91XWCdb?@2#TF330n&adLUj<1R0>!SDu zp4JhAsbepObPOZTL)B^RHxlt!#9{nJ;#M-_tdIZ+ZN>2Vhs{XLOh;33_XtGny%8fK z+!+xrv7N}E88Jtb&KPxNFLtY^V0njmQ)cg8GsP`#860EM*ks#I+DRG7ZqpgIW9g~@ zzNz9{I=+qX=y(R-)$u*y;qT)dLn|M}I`&~iY`_nMA%hX&cOzEE4~3i*(eWevn2i<% zKhg11+$?DSOu@4{evV)8)GUidiv9>>3TN-&J~PS)_$7X&fRczW2@^sOZjYil#QhwlZ*Ro5oKX-mAKuqlU{eY zkZFvPpTZNKF?;t)pv_{><(8#LV6UAT6~}3H3HZh6^D$70&@A_qOkbX>Ck2>=fT;|0Ja@+aAdzCFq?ZYrD&sw0E?aVa|q^gSPYSk}%V?o?`I<&Fxtc>1m4nV@b1w z_$&A=XJWIFNc6>dgDUtJqwW%ZrLaxAZl*!WaljJ3_qOvrSO)iIWkP?A+v}S#SKJ+J zYaHWc%<^^YWg)W#9BP<^lttOVBz%uSJ_$MG&mzFCG68j$=$B`qu^-I$^(-pbugv$W zvY5gC%zQtT#Vqz`=lkJ{`qf4KM+rf~0Lumf1XRK*M>d=PO1W;B4Y&Ic<`8$W>b8!V<*>zY*xf)6?LOVydAcEHu z$U^wS7bxLVaHE2GEFmda`~rdsHE*JX@O%wPya6}oNQ{z%%$b$b@t(xeam;QC=@YnO z9KkGV>DOgvN#n|Og3F?ZspFxX&u=lnGFq*pv+CJu;BO;c*yN%LLi#V3Uk*-ElJA!H*AZ z!&_M|@t;qPvtGYgepZCU%H~jrVDCq*uT4IN#m%9x+YQU2Th$z@cDn(8n;e!Oq5^+5 zdlgZL9R!y1)7BvD)K6gfDKwmD5LUcSBRjO=b($Dt44-BZK2-9yV<{sU42yECr6;aM z2O=vZ7c4uV@QYm#-8@k}n2%n5CB5E7 zRRLeHgGgS$ED^rN82FN8^a?LO#fTL#7tNxTVR=5RQB9X^(Gbe`enmeW=D zF+w(kHcntuSEH{rw3&_WM!B`8$=7-c9c^-x?AHD!zgq{Ief|k-5mQPtTa5gUHuWU7 zhPJ6sV*7wEET2MW-+&zE*0A=618yA%D{ifXRZ*Y9braZ;Mb|($FjGmy!hSgxmcyK# zM7N+{obzvEYQ3HRQ#r)sdI#y>$rN@NEx3#Sy*Ppn+>Kjt4_%ZfTwYgGU;NAr^-Q3b z@y}x|^ZHsUt`qM723!%p>n%UZ^bLGi(79sT!rxen>+mo52mZ=ben0yv`{Vq4=zsT( BcS`^O diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index aaa7a87f9f..e789ecc617 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -1,3 +1,8 @@ +package duke; + +import duke.command.*; +import duke.DukeException; +import duke.task.*; import java.util.Scanner; import java.util.HashMap; import java.util.Date; diff --git a/src/main/java/Storage.class b/src/main/java/Storage.class deleted file mode 100644 index c98ebfa9b93bfb595a32ae6c6066b7933e93f9e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1198 zcmZWpZBr6a6n-u*E-s62h>G??T8bdpn^|F5zLf>)3{EqATw%3U++|>~n*Kun!>`$t z%*0IfxgS+M7evs8*|YcVdG0ySdCs}~{`36@fO%w8gc0q=2&NUpRJajWFr&hYgfvNM zW~I5U;7&L0;+~58m{agTMF3F+^9mlS=tEpZFCIzrSQ^4pJ}jsR$$(E3JQeWmnnhzv zcisvNr1$kBeYU7ud$U=mY+8FMfvyG9G93a#(f{4kZv;HccEJ$nO`DdnQ9ax-%G>%* zkzYI&{fMtXG`+1?4$@}DNlAPl>*)D|j9zNNind-5(4y0AoPfIeK5vv9)3z$yWbJA> zZ>*6ifmz2c>w890lGShpiyB5TCNR=qZ`!jGw^?;cRfkm=`k@3}6&P*#H+S}pymJ}x zOv7_5X;_v4SFk7$Y|C-ZM!~9vHM~&pQo}lyC}68Pf$+r)>()61f#H@GRN=tizp)eTAzAPo@rUZl;E=jYRwuO5zkg zKHbOgXTHEca|-Q*r-5d;~|&OOM(N0r8?(*)B@vF;f8#;L#@xkxraxc*A{6pSeRHxXo}k}@a@o6TpE IYZs>e0WZw|Z2$lO diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index c1c2facadc..cf13dad8c7 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -1,3 +1,7 @@ +package duke; + +import duke.TaskList; +import duke.DukeException; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.ObjectInputStream; diff --git a/src/main/java/Task.class b/src/main/java/Task.class deleted file mode 100644 index a8ab2087ef2b88268af46c47e3c929c80c839383..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 987 zcmZ`%ZEw<07(EwC3#`1z=5%8Uq9}AP_%bDC#$<7tm~8r?(*zekbgYsN)-I)(=-=>* zCVuy;CNhnQ{s4c5Kg4)$i*Cy>rO(ZM?%_P=oZg?mzx@EvL^F*PE~St`RhG-LT#==g zL_G;3iFpkRX*L$qSVAL>bGWMEnuhBFO7Lpm7AUOmS}(0e&vH8rGw>a^vm!9DWB1#> zvmZE~OXQ9f5SfpVgTU!E*4QCVb^2?b%QNwen>&u{1a}3RwUeCx>m0JxpK{VYZ-;ET zb;q?I4feKef79CTv6Jc8ff-oAp#QKfB~8`pCm9JNrrq7J_QStvxFL|EXQno-es@WxqhlH+9XaH6oRX!0NgY!-EfD|p{!Lil z3S_sc{pa#6SNr@ivBPK|Z|~aeK*ubK8kTijKvBm{+@fbWhK@q4<26j%cdVZCIx>EQ z;;+bTi2N5EgMZ=qdsZNDdra_KM{%Tg0T6g>@NCX5r__yB_Pk|aFh`xQhXibR7hLP@EsCTUg}1)M2J=@-95L@eVlXe%-0_uKLfadRRcY^V4xdQ>XgutRC~&R zhG`u$2K3;1R$=CpIo(U1SJcH-wWQU>H67P=+|Y58Au?~-mRw+HPb8l)Xj!Ku7`pP7 zEuPeNH-x*!H!5V&d8xFi=m$-qYOT(Rryk%O_z-SVP$-?8aI zBLqc{N~a)Q%idz>PbBj@e2=Fq+}=tD)(k_eAbGL8%Bx}80TsG|d%CeBijr_01#8RZ zvgT6oD*>P;tx9^)b@_hY^5lF_&_X7-w48K7xE8Ni2Z|3xFbYo1EsAAJv5P52%56^N zGSP>A6Sr{N#953|`Rdxl5JpW5qo3haqoknprP}7Ea7|<|uY3kgjNlwY_mbmCPrAIi zD&)3P^133p6UBmwySQg!5lbrSASv^^0ERw4_TOwsFW-8E1~q`%!Z46Hu90ew=2-{C zj#`^Dki~tnusLQhoZjVSk#+1Mm+O|?rjsYREj@;*M6M}T*q7!O{ApE$SF6IN>@&^T z|LGAZl+p1(kLhRE_trC>=xB=ZcD$N06X zjbY^fIE>O8+XDvmB1dVb*`#%Vp5nAK+E1ho!9LJ|29wr^Z`5c#jWe_==m^^AM|Y{| zI@;bH!72|L+7LUAb{~5(HKdge(f$S6`y&npL1}JVJDh0Y&`Ho?zhG5OD$LN?$WTY5 z!NBnI_aa7QNg$jH6YbLnO(XxypP)ZKL^PkOqvMXY5FdVn;puoPUWZY~$&WCBI%4au z+S%Km--vOiBGBfmGe#nUPEk@PM*8#<^D{(coc1X?%~F-;2@ylv4|M6!8T*cS_o90H z!!jCT4%N|hR2z-3^wnsEHI8A4&X`}?I41mk5-YSTeV6eF4=K_`dRBeEME}db0P(I$ A=l}o! diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 41f5ffdc14..759f31f17a 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -1,3 +1,6 @@ +package duke; + +import duke.task.Task; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/Todo.class b/src/main/java/Todo.class deleted file mode 100644 index 35330d5e2e02aad82d8d0e4c3cb3d04033fd2c37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 642 zcmZva*-FDu5QhKhlC&|lHCp$rYPAd4OA$pc6hRQZND)f$B5h-d)^iO^_6X_R$(40ym0FhDESbW0+~!XHoDezi8a5$$;<)x{`=)05WvkX=B__OX z7-1rpA511_rq}lC_K_pQ<7KbmZORq|Diabv-P*!wl@2Xo>lnp~G^>P>YBso#&vG^( zr2etaYFBn$=vYHm$2trh8_252>BytNsIrB8S-~|SoRj!lL&h3p?J7N(?%?A7mbs0= zXu@dI7N)R7J2&J!74p3Zv) zua^;!V4GyGh$t&SvS3j04WUX0;SM5?EHMjPc^?3U6I52lVEiWTb0YDdB_pc5L#c!d lPf*QDr0|TGS&6b2H(#JV^a>>q{wbG|7mCXg#@P>H;v1zCjo1JH diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index 5e5850122d..51313c3dcc 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -1,3 +1,5 @@ +package duke.task; + import java.util.Date; import java.util.Scanner; diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index 94f4a742a0..acb5cd58f2 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -1,3 +1,5 @@ +package duke; + import java.util.Scanner; public class Ui { diff --git a/src/main/java/Duke.class b/src/main/java/duke/Duke.class similarity index 69% rename from src/main/java/Duke.class rename to src/main/java/duke/Duke.class index d77c24be2b64e15d60fdb089829d923424148357..44c7c157b5cc4ec316c604e27d3b1d1ce156b2c0 100644 GIT binary patch delta 58 zcmdnMv5RAa3nLq6N@;eg{$y81O(=77KBEg0BlF}f%+7+W49pB%4Ezi{43Z4I46+P- IlQ~#40I-4!kN^Mx delta 48 zcmdnRv4LZQ3nL@TWG_ZdMwZQ$j4n)!jFa~b^1}=66ZgvJ9Mg}&U%)HDJJ4Oak4WF#UvPAuy#JqI<;F6-u zymV{LFh&Lz=lqmZMh1SL%)C^;(%hufqL9R-9H0nSaDHh~a;jS4(#g48g| literal 0 HcmV?d00001 diff --git a/src/main/java/duke/Main.class b/src/main/java/duke/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..6be127f63790b0edbda594209c66bb61aaa1c6a3 GIT binary patch literal 1167 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 literal 0 HcmV?d00001 diff --git a/src/main/java/duke/Storage.class b/src/main/java/duke/Storage.class new file mode 100644 index 0000000000000000000000000000000000000000..fb2941c0c9615aa1bb7d75fbf0012f9f0a357cbd GIT binary patch literal 1223 zcmZWoYflqF6g^W4(=N-iEl}`*pio-c`a)Dtl$W9{kd&D8)6o^fa-3x>U$%(x}X-klTZn73@pB`_5E-#zt4z`Nw+O@W@2Wt;1jgKe|4Wo#Gt z$6GcI`RR|O@|Arvxn-31Q&!oXQ-``Tu94eM8^sp3;23#u%KfYBLYM9IxHuta2pl3SaDg8X&flfRe|A_e`9;k z%(<5l&vZP;qK+jMa2X2%fiq!F*+{JDSj7v8mpaz4$f7RPDGea6ljYm;ls@? zQk?T;*PGJ$u4K7p3xA>Cjh}T?`%a-!=Criu3Qn0_IF~B(q3oImOyyKu4oqWSm}!%< z)a(E!sv+jZ-vY9zKn0uKJEM3`n0juFP0Y6l201L3%bddv-kLCP5$8`016OTav+cCk zxQoKW2hgHbh-mB^JjZqPb=q!X!5ie|%Fp{EFv@t1b06vR(wnHEEgSs`PZi#D4ei#ichW4@A5!O4-+>_)I0mxnn9RL6T literal 0 HcmV?d00001 diff --git a/src/main/java/duke/TaskList.class b/src/main/java/duke/TaskList.class new file mode 100644 index 0000000000000000000000000000000000000000..9422fccf286d5d56b079f1e30bbeec2eb0b256f4 GIT binary patch literal 1592 zcmaJ>O>-MX5Pf4ST6wdw9b%IYTMmvLEXj!lAt8WlC$@r#K!$@{q=3^{nm8NDyQPnW~N92OnSV@BZJKFwIpcK68> z6*wqk-FRPhuz+g<)7!qULmkM@uF_BaW;m6`Mh2S>?&E=jEo_^pS4kzx^_C9{9wj&} zlZA|Khg7jg?4iJH{%r9~2UDT@oMJf#RT~vN(`71?grU9BjxCUE17zERu+7XBZHMZVq_AYk7540nzy*IAx&+y(b@#S@5E zeBg9)O-Gj&*Gss})j$_8#vg6P)gH!v8NyBw#mP;uOBj!^=ZkZx<_X4sN9yH}LzYku z?`Vf}BOHu?`G~M#Q%o{U_A~U5?kljP{IkeX4-15ANupzZ{ZjP5{VS~RPLQb;dzjcr zZRX~G!u)EknCrpr;rwejKo8l+FUG~sfB#9vlSaT;RGsTABB(Y)`dNyYA+O71w#0pf z=UaG>KhQSz22&O+A^t*cdW)vTghs!Zb3IHA*Ty22ACXa5`wW(Hu1D0CupI3-@QAxj T?;U)JFBs_qo=x9B$ literal 0 HcmV?d00001 diff --git a/src/main/java/Ui.class b/src/main/java/duke/Ui.class similarity index 70% rename from src/main/java/Ui.class rename to src/main/java/duke/Ui.class index 4f1b1e018602f97b61f1fde0608f7f5a3d1da83a..b5c67a3ed7998b0358a2e9e6b4c30087a8a35f14 100644 GIT binary patch delta 127 zcmaFI_nB`)BoiBZN@;eg{^lqqDP~62$)&6Yoa_ut3>*wx4D6HFu|~`C0@-{Ff(-l& z5)1+iazK_AgAju*gD`_3gUDnxHfL4|25tt)$$4z%oU%Zc98i_~1|zZ0bZ delta 122 zcmey&_l|EvBoiak=6EJ4W=7`8RjdY_tPD&HYz$lstdlphM$2+Da4_&N2r}?8NHFj* z$T9FUXfX&d=mJFy8H6TlvpKVhF>o`8PcCLN=adGrWPq}=lQ*;JuqpygQJ(ySO`BDX Vft5jhvIx5ls}@j9d$KFL9srEL5yAif diff --git a/src/main/java/duke/command/AddCommand.class b/src/main/java/duke/command/AddCommand.class new file mode 100644 index 0000000000000000000000000000000000000000..7ffea5911a5c52a838678cefd55530b044f0aac6 GIT binary patch literal 1617 zcmaJ>T~`}b6x|mBlMDlCk&3joy`dnGRAQ@ECAHe7(4yf(L+z?QU1n}!N-~p`xk2#N zKhb~Siw|}!1#Q=|@BJD65SM!lR z3uG&PpjTVF5?o2@)iyQ)}I!B(+qntrfViVX(bS{P8D@1?JJtsPx-!+Ko> zUa{QXO9GbO({9VqY;LxV*-+6=#g9y>eSF||gsKUfYD*`fhO0)oJ1eTup=2-axw>Ke zFo>9kA1&_rCduPl0lONunyy~*WA548p4SOJA15Ke^v_@{Ud}rB03QmBpP+hdVBvbMcF~zPUDV)GVWSfbg+amfzibK zT~_0Wv%rnNp8g@%*4C@JTuyFmYw798ZTd+@GJGtRG@%ztR|P?6-M0^KavR1|5ldD_jU*j>v#(qQhfPdG8f8DdLtB#AZ zs@1B#(H#7Bf$3BE_2MRQ>Hl%a@n4nYKMCCVh;Wu`{ExbVK1zU<9~Fn_dqz><4X!p7 z@v9xgaAGjlG05{i*4X(&^ydq|A$4psf_`eUNHIVr32_c@cIOSNXmB4@KmK5dZ)H literal 0 HcmV?d00001 diff --git a/src/main/java/duke/command/Command.class b/src/main/java/duke/command/Command.class new file mode 100644 index 0000000000000000000000000000000000000000..f32f6921cbe17b4be1d3d44841289c745f9c9182 GIT binary patch literal 437 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 nLi`M+pLHnm4X(@|tA8 z7kFvl6>2K#DwY_^yI~Z{Hw?CO(C25|8}g{<`7#NkUUOW@WH|I%T#BaqkwMvu1HmwJ z5JuvCHtLAvkavbu(PTVsW0-f`hlep3ew-y;u^;B!D=oo;Asw=nk7Zyj6BR5|^O2n% z=YP#kYfk5UhrG*By+ik*(-&Q7Vg$kL0bWhKAkG0^zW8;C{YBsR#E*5rCn@%LdkC{jVqM>c8N08Z aFfMM7v}hU#N0kuNX}(P{!yMHLnEwe<@~H3t literal 0 HcmV?d00001 diff --git a/src/main/java/duke/task/Event.class b/src/main/java/duke/task/Event.class new file mode 100644 index 0000000000000000000000000000000000000000..c9249f82402f454b96a6b78f11260712d71209b7 GIT binary patch literal 727 zcmah{YfIxm6g|_XO&a4XKGyZw?ryZHk9-vE;ujwv`1lYJiuhsL&X#CRB$){QD+N&z z^at#Z5^t<;D-!0;y@$DT&pDa@_cwO{<}s&XK!<@r4L?*2<|f9KFz2W&{ zD?X}O;$Mw|{;mf&XCIeeF(23vFxo1WD$;w+% zzR2Yw?KVTtE4A(Ffv8CXe_$DyglS+Z$%?R5lnnI3R55K}2D3!69v=!v^61ccoW{`g zitG@~F#o0OZ;g9lF6oLu8=yX zf>==0=_sJlmm`F1ernl7hBCl5)9NjhO1gA`j9XDkm&m%63{|RI$BIjO1KYO{- Vq-h`?J;b0u^DW95`Up#*{{hs@ro8|F literal 0 HcmV?d00001 diff --git a/src/main/java/duke/task/Task.class b/src/main/java/duke/task/Task.class new file mode 100644 index 0000000000000000000000000000000000000000..83b577aa48a75f521811d58ff8c9b8d07844dcfd GIT binary patch literal 997 zcmZ`%T~8B16g|^!yKULhvH}Xor&QbJWBovh!I%)y#02zV(WDX|mUbme%P!eYP4sX0 zqKWUmYGTot=nwE`_(P0mc2OW;+TPo_bLQN0&&+M{KpH>~t?|lC8Av z2i~LZ-nJKQy4!75iaVZkq$|6fhYclZuv$CKNEk7V)`q(uAJcI|ps?pgt<^)B>8k2t zB&8=oqCF?WWN?C=up2eJ2fpf=-*h{zMdglxVN4n*p=@A41rz5C3}Q$i{pP(;tKU?m!!I2>vi9-zuGf$TMlq&i$-p$m4BW&mo@#bmo-NtSRt-5@e98}P$BTTo z?Y~YeI7aqYZhwsYXCbfPMHub5QsDL(SFm-=u|&?w875L$k*|unpz*_*`P4KucAPnR zoH;ymhPYvzXS~4GeWZv4MyxLo)?5!MYrcoHwa|lRrF+PH;-MZ){pti)I* z@c?N|B52YfwvGRp5ZF( i)U!<50s5S;FqHPh1T%JPnxoHpV}rw*#0*xhVRe2!iNCicrLdv^|z+O(Z$F;9n_-ilQHI zKT6!kI?_I5=j?U%u-4w^|I5QOfK^m=jA$4&kieJ$6XQB2G)!hOfGLB`v^vcgn8loi zc?}DM%(~}$a)U5Z+BWu(8CuA8Jg7u!b$%(`_ ub5=U@giJkIxq;@?Q Date: Tue, 3 Sep 2019 15:20:01 +0800 Subject: [PATCH 15/28] Completed A-JUnit --- .classpath | 18 +++ .project | 23 +++ .settings/org.eclipse.buildship.core.prefs | 2 + build.gradle | 15 +- src/main/java/AddCommand.java | 14 +- src/main/java/Deadline.java | 1 - src/main/java/DeleteCommand.java | 10 +- src/main/java/DoneCommand.java | 8 +- src/main/java/Event.java | 1 - src/main/java/Main.java | 1 - src/main/java/Parser.java | 153 +++++++----------- src/main/java/Task.java | 1 - src/main/java/Todo.java | 1 - src/main/java/duke/Main.class | Bin 1167 -> 1144 bytes src/main/java/duke/Parser.class | Bin 4842 -> 4198 bytes src/main/java/duke/command/AddCommand.class | Bin 1617 -> 1488 bytes .../java/duke/command/DeleteCommand.class | Bin 1439 -> 1715 bytes src/main/java/duke/command/DoneCommand.class | Bin 1401 -> 1677 bytes src/main/java/duke/task/Deadline.class | Bin 733 -> 733 bytes src/main/java/duke/task/Event.class | Bin 727 -> 727 bytes src/main/java/duke/task/Task.class | Bin 997 -> 997 bytes src/main/java/duke/task/Todo.class | Bin 662 -> 662 bytes src/test/java/duke/ParserTest.java | 15 ++ src/test/java/duke/TaskListTest.java | 17 ++ 24 files changed, 164 insertions(+), 116 deletions(-) create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/org.eclipse.buildship.core.prefs create mode 100644 src/test/java/duke/ParserTest.java create mode 100644 src/test/java/duke/TaskListTest.java diff --git a/.classpath b/.classpath new file mode 100644 index 0000000000..4021bf2b52 --- /dev/null +++ b/.classpath @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000000..6fb94a8c8b --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + duke + Project duke created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000000..e8895216fd --- /dev/null +++ b/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir= +eclipse.preferences.version=1 diff --git a/build.gradle b/build.gradle index ce97c7ba2e..2a154d5cca 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,19 @@ plugins { id 'java' id 'application' + id 'checkstyle' +} + +checkstyle { + toolVersion = '8.23' +} + +dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0' +} + +test { + useJUnitPlatform() } group 'seedu.duke' @@ -12,7 +25,7 @@ repositories { application { // Change this to your main class. - mainClassName = "seedu.duke.Duke" + mainClassName = "duke.Duke" } run { diff --git a/src/main/java/AddCommand.java b/src/main/java/AddCommand.java index ba8db355e4..662cd671e8 100644 --- a/src/main/java/AddCommand.java +++ b/src/main/java/AddCommand.java @@ -21,15 +21,11 @@ public Command clone(String fullCommand) { } public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException { - try { - Task task = Parser.parseTask(this.fullCommand); - tasks.add(task); - ui.printResponse("Got it. I've added this task:\n " - + task.toString() + "\n" - + "Now you have " + tasks.size() +" tasks in the list."); - } catch(DukeException e) { - throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); - } + Task task = Parser.parseTask(this.fullCommand); + tasks.add(task); + ui.printResponse("Got it. I've added this task:\n " + + task.toString() + "\n" + + "Now you have " + tasks.size() +" tasks in the list."); } public boolean isExit() { diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 6a5ab4794e..d8094cfd57 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,7 +1,6 @@ package duke.task; import java.util.Date; -import java.util.Scanner; public class Deadline extends Task { public Deadline(String description, Date date) { diff --git a/src/main/java/DeleteCommand.java b/src/main/java/DeleteCommand.java index f6053484ab..514c955a2a 100644 --- a/src/main/java/DeleteCommand.java +++ b/src/main/java/DeleteCommand.java @@ -20,12 +20,16 @@ public Command clone(String fullCommand) { return new DeleteCommand(fullCommand); } - public void execute(TaskList tasks, Ui ui, Storage storage) { + public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException { int itemId = Parser.parseDelete(this.fullCommand); - Task item = tasks.remove(itemId); - ui.printResponse("Noted. I've removed this task: \n " + try { + Task item = tasks.remove(itemId); + ui.printResponse("Noted. I've removed this task: \n " + item.toString() + "\n" + "Now you have " + tasks.size() +" tasks in the list."); + } catch(IndexOutOfBoundsException e) { + throw new DukeException("☹ OOPS!!! There is no item " + itemId + "."); + } } public boolean isExit() { diff --git a/src/main/java/DoneCommand.java b/src/main/java/DoneCommand.java index 80508d6154..0393626eae 100644 --- a/src/main/java/DoneCommand.java +++ b/src/main/java/DoneCommand.java @@ -20,9 +20,13 @@ public Command clone(String fullCommand) { return new DoneCommand(fullCommand); } - public void execute(TaskList tasks, Ui ui, Storage storage) { + public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException { int itemId = Parser.parseDone(this.fullCommand); - tasks.markAsDone(itemId); + try { + tasks.markAsDone(itemId); + } catch(IndexOutOfBoundsException e) { + throw new DukeException("☹ OOPS!!! There is no item " + itemId + "."); + } ui.printResponse("Nice! I've marked this task as done: \n " + tasks.get(itemId).toString()); } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 41f6721e84..3024b01900 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,7 +1,6 @@ package duke.task; import java.util.Date; -import java.util.Scanner; public class Event extends Task { public Event(String description, Date date) { diff --git a/src/main/java/Main.java b/src/main/java/Main.java index cf31cbc0dd..d106b1ffd7 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -32,7 +32,6 @@ public Main(String filePath) { public void run() { this.ui.showWelcome(); - Parser parser = new Parser(); boolean isExit = false; while(!isExit) { try { diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index e789ecc617..03bfda73b0 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -3,15 +3,16 @@ import duke.command.*; import duke.DukeException; import duke.task.*; -import java.util.Scanner; import java.util.HashMap; +import java.text.SimpleDateFormat; import java.util.Date; public class Parser { - protected static HashMap keywordToCommand; + protected static HashMap keywordToCommand = createMap(); + protected static SimpleDateFormat dateFormatter = new SimpleDateFormat("dd/MM/yyyy HHmm"); - public Parser() { - keywordToCommand = new HashMap<>(); + static HashMap createMap() { + HashMap keywordToCommand = new HashMap<>(); keywordToCommand.put("bye", new ExitCommand()); keywordToCommand.put("list", new ListCommand()); keywordToCommand.put("done", new DoneCommand()); @@ -19,123 +20,83 @@ public Parser() { keywordToCommand.put("todo", new AddCommand()); keywordToCommand.put("deadline", new AddCommand()); keywordToCommand.put("event", new AddCommand()); + return keywordToCommand; } public static Command parse(String input) throws DukeException { - if(keywordToCommand.get(input) != null) { + if(keywordToCommand.containsKey(input)) { return keywordToCommand.get(input); } else { - Scanner scanner = new Scanner(input); - String keyword = scanner.next(); - scanner.close(); + String keyword = input.split(" ")[0]; Command command; - try { + if(keywordToCommand.containsKey(keyword)) { command = keywordToCommand.get(keyword).clone(input); - } catch(NullPointerException e) { + } else { throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); } return command; } } - public static int parseDone(String input) throws AssertionError { - Scanner scanner = new Scanner(input); - - String command = scanner.next(); - assert(command.equals("done")); - - int itemId = scanner.nextInt(); - scanner.close(); + public static int parseDone(String input) throws DukeException { + String[] words = input.split(" "); + int itemId; + try { + assert(words.length == 2); + String command = words[0]; + assert(command.equals("done")); + itemId = Integer.parseInt(words[1]); + } catch(AssertionError e) { + throw new DukeException("☹ OOPS!!! Incorrect format for done command."); + } return itemId; } - public static int parseDelete(String input) throws AssertionError { - Scanner scanner = new Scanner(input); - - String command = scanner.next(); - assert(command.equals("delete")); - - int itemId = scanner.nextInt(); - scanner.close(); + public static int parseDelete(String input) throws DukeException { + String[] words = input.split(" "); + int itemId; + try { + assert(words.length == 2); + String command = words[0]; + assert(command.equals("delete")); + itemId = Integer.parseInt(words[1]); + } catch(AssertionError e) { + throw new DukeException("☹ OOPS!!! Incorrect format for delete command."); + } return itemId; } public static Task parseTask(String input) throws DukeException { - Scanner scanner = new Scanner(input); - String type = scanner.next(); - scanner.close(); - + String[] words = input.split(" "); + String type = words[0]; + + String info = input.substring((type + " ").length()); switch(type) { case "todo": - return createTodo(input.substring("todo".length())); + if(info.equals("")) { + throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); + } + return new Todo(info); case "deadline": - return createDeadline(input.substring("deadline".length())); + String[] args = info.split("/by"); + String description = args[0].trim(); + Date date; + try { + date = dateFormatter.parse(args[1].trim()); + } catch(Exception e) { + throw new DukeException("☹ OOPS!!! Incorrect date format."); + } + return new Deadline(description, date); case "event": - return createEvent(input.substring("event".length())); + args = info.split("/at"); + description = args[0].trim(); + try { + date = dateFormatter.parse(args[1].trim()); + } catch(Exception e) { + throw new DukeException("☹ OOPS!!! Incorrect date format."); + } + return new Event(description, date); } throw new DukeException("Invalid task input."); } - - public static Todo createTodo(String input) throws DukeException { - String description = input.length() == 0 - ? input - : input.substring(1); - if(description.equals("")) { - throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); - } - return new Todo(description); - } - - public static Deadline createDeadline(String input) { - StringBuffer stringBuffer = new StringBuffer(); - Scanner scanner = new Scanner(input); - - String temp = scanner.next(); - while(!temp.equals("/by")) { - stringBuffer.append(" " + temp); - temp = scanner.next(); - } - - String description = stringBuffer.length() == 0 - ? stringBuffer.toString() - : stringBuffer.toString().substring(1); - - String date = scanner.nextLine(); - - scanner.close(); - return new Deadline(description, parseDate(date)); - } - - public static Event createEvent(String input) { - StringBuffer stringBuffer = new StringBuffer(); - Scanner scanner = new Scanner(input); - - String temp = scanner.next(); - while(!temp.equals("/at")) { - stringBuffer.append(" " + temp); - temp = scanner.next(); - } - - String description = stringBuffer.length() == 0 - ? stringBuffer.toString() - : stringBuffer.toString().substring(1); - - String date = scanner.nextLine(); - - scanner.close(); - return new Event(description, parseDate(date)); - } - - public static Date parseDate(String date) { - String[] dayAndTime = date.trim().split(" "); - String[] ddMmYy = dayAndTime[0].split("/"); - String hhSs = dayAndTime[1]; - int day = Integer.parseInt(ddMmYy[0]); - int month = Integer.parseInt(ddMmYy[1]); - int year = Integer.parseInt(ddMmYy[2]); - int hour = Integer.parseInt(hhSs.substring(0, 2)); - int min = Integer.parseInt(hhSs.substring(2)); - System.out.println(String.format("%d %d %d %d %d", day, month, year, hour, min)); - return new Date(year - 1900, month - 1, day, hour, min); - } } \ No newline at end of file diff --git a/src/main/java/Task.java b/src/main/java/Task.java index f80374ea69..db3db10f1e 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -2,7 +2,6 @@ import java.io.Serializable; import java.util.Date; -import java.util.Scanner; public class Task implements Serializable { protected String type; diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index 51313c3dcc..b3c27f592c 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -1,7 +1,6 @@ package duke.task; import java.util.Date; -import java.util.Scanner; public class Todo extends Task { public Todo(String description) { diff --git a/src/main/java/duke/Main.class b/src/main/java/duke/Main.class index 6be127f63790b0edbda594209c66bb61aaa1c6a3..2d4f80e0d671b439fdae0d5ef8da6f0684b53dc1 100644 GIT binary patch delta 563 zcmXAmJ8u&~6otRp4H|YbHpIca@*p85o7n3Z62Jt^D-WJ_6p27@fdy71f@~wvxuBp# zXhlOqnTi4ltq=tgE&PN0k`xGYXQR>1+;i`lbI;s;AM79Q|Ni&mCs1X>aGX#xXYdFE z^2}?BhC`Gbh+I^5(SoMpIOjDN43^M=MYk;(E^^6mnX22a7!1pQ6I z-cn@i&t7l0Dj(kU)%94bus=aT>S^+E+cL(u!lv-i!5zy4la>>lwA|pP(*sxlO^c!m4J?vd$gNUCTZ0TORPx2Gm)#G?Q75$6mP&h zo+ht3i_(~!&}Jw&vJgHqBnwuG-xx~B`n9o7R1d(BM)aMd8)ZR(%gCn_M#>4f+U{Vl z;c`*JXu`4G!Jn_9n4!X=4BlgkO(e7;J&l%zfwaspEB`PQ?{gHzR)t77MV2VZR3n+v Wg0Nv2|1W`hA#SsxdQMUvv;P52-&fWE delta 578 zcmXAmO>a^`6o#Lr;b8~=cR#f{>b%VK8E`=0llIrGk+;rG$buYccu0L$F-IEt^yc{un{ z(&RM@9zz5coVHQHMrSl&EOyobTJU{Q0yBR&92Hd^+$$R)cKJv=U3)fG)iv!c+g z_D-|*hN%k{QM6_ON#6ib5<;Z10rH9Z00@_=@I)*{P7nKm)+9%M~VY7Q3<}1EJiXB!BNY}(mh5q zQZZKA>;JA;GU$=&ab&Om^FW%Xo=~JD&O1y?|0PCbpF%SupEFBBW=N40qvwV3StKX= gKq~UAupn*(lqpCKVz_@vXyU3N^T(ulR#=Dm|EUdHLjV8( diff --git a/src/main/java/duke/Parser.class b/src/main/java/duke/Parser.class index 61838a6bf05e4dba51d7fe327be8f61c75525406..cb414771ddda17d5e1dbfe5864cbfde7b5d7f937 100644 GIT binary patch literal 4198 zcmbVPTUZq58GeV|Wrkq{Tmi*X21Nw~SBW8(^%#&y1=K)eFlpkjJHpED%w~30p{F!G zx9K50t39Mm($Xfj^^h(`s`i+RK6#!zy>0J$)63p^VQb%iW?6P+V{75zpa1*j`@aAE zj{orIe_y`|;8DDz;s8#{FjQ3Fq=Io7F%==46m(pHDdUuiD)DMU#-s{OY!fn0tEd&* zDH%x>VX;jqu&NM+Ep*djd0vL2AfsXwu8JmPWt>rPR>e9@3&|N7A5qaPP8-EXReTH| zSMUi1FN6v1(}MXKv3yo6pHuL81z(WyMHQWxR`4akeMy-4vWmUP zEBJrcOw%?NRZ57|acU4NClW|_b1)(!7<9ib7rp%eMwi6$npqFv>O>oq|!;VuOLA26)i?4V>)iawlaN*j4_@x2~#>D zp>lV^O1OI^1X|mklo0H-4}7f*0!badCIo8jQB`(O@h_Tq8C`WFAx*-lR8+IOkUiDGom$OZjg@zB} zu!QAHN`yHWpP}%olB^$`PPqBZYj_1eVvdrDjC-%xAbExQ3&uTXOAUzt6eKF+c|TW| z9M7W>PvJBijuD3 zC-|v`Sv(;j>Qk0| zRzEvwxVkHrlxbKQy{EHP#Q0|#4q}W(>f@$vrqb>V!PR&n z^~=*sVjwa;qv6-cY3Rq}8jfL(b73(yMUmf7eCR+S5@O`!!@&dmoOuWI<%>W>{Tiz{ zVz4}G7Xcg;mBGUXtTRS35!Z#1p0Ltcmv*W>Iln(-yshCn<~0oCh=kQ1y0SA(*pEks zh9Wck(GML;r8tNeojEdonz<`s`6HDmo?bdy7%orO8`xrS(g~uIu&cQ9eWTGL^*kp( z4ZRY}v*=gMwp=4&We%G&_spFIHICoFgvnzzmpP`a(NHFxOi*DlTq>6`{BV~T^siW%4rPr2DOH?9i%Ac0A+Vcp^{(#hw>blu6#B{^b;;DAQfPaN88$ znC~~NOVi7{YEzjA`cMl+5EU06Ebd!Uj99C zEGj0fGdAyW-xoh}{YK2S9e%+4k>5ij?Y8)$`CuE%T|GdDN1s^Qq`(jg@(~k5c*=p2#DAiD3y) zyZ;Ir+jCfX9yR`M)o;;ssXe?phc$t&LGreGZyWrbcuVoML$g>mk9A|=^>cXWR)@e; z;YDdZg9)sGinTLMH$$(0fox{5Hr(18=o zUgR+{_Ao}xdBlDc+sW-D?rnGo5p-iaWge!~4wg_COJk>pd?SK)utvsH|H5i2jNT>S z3O>n!B%}EbRH?+9vH#nfn)`dR`M%!lBDg5M*-dZu(3`zn573)^-g=nrAoB3Q-kiYG zer_rv%#6y;=*Z`Wc^GQ%xQ;DA4y`$~4R`beE4o8X!5rG(_q!C6!OVX-=?F*@{fsh^ov+_m!q!IuT*bk$&PZ!)z)gO!^&N3fO79k)-+k7tRKFEY8lVmM)m(D zc$ZEDi_Ouw#THla;lijL_GS<(F&xcd_XWtoSp)-Dp#3R1Upr#!d4)4532X&x;bzdScJvcYLbs^;`G@IJ59c(hBJp`S+>+02cZj3IG5A literal 4842 zcmbtYX?Ppe6+L5(G~@Buj%CYpFRjHQXKSe_Bm zD2YpfHtf)i(j~YpZRz5cr46Cj29>P~ZRtYyh3<5r`|`8jN1^Al67hJIg12g@6^~b|xJIa5tKe-4-makm$3%0TXs*|=3^ypaQNc|rZq~3G z$HbbqXt)fwD!5HUlUTI@?+`QZ6wSLt^KOk&?-9-IqIs{1J5;<+#rqX}K*L5HQ}96z z9Rk4dAc=ig3_chuuAvKetN4V1PiokLyTt;ZQt@fgr}hR@<2 zF}SxJ_u+mOpHuL8F?m8vKA_+X+bCd~Gz zXSO|OzIzL8)ixRFw3%|^ww3OUr;X8s$#taz5(1m!R@~Vl!PmTgp9Hzbj&Z%}{)bQ2~DLmJSYwY+JzLkYtfWxIOeb&vrj{ZQq-yPbb3uAmY^pj zG{44Lc}eP4c)B|do0cPC?Q1ByV${mHf|-<|x6ro2L!gnN-x=85dhs zF(|ewwLvK8*oXZRY8I7q0j6URmvGldr>L>4C~$ThjXSyE(eVhfjEY1&O)kY^{hV6} zVL9e*VzGqS*ae9|EVqTrix%s3XBVVo$K9r-MKarBu>}D&wy-CDQ@B{i7xAcsx+0AQ z@dDyQQNyy#l<>%7Iv&RpI-bOS9bdww5>~kma+7HwlSmBOamz7N3$ZF8=-TgPf)z}5 zKX?4$@ZP8x8?J6M=E6#>{s!Wj<1R4>!SGvp4JhAspBBVbc`d;so~j&I{TI-bFIb$m}a z{QGz!?@HHtK5cXy!i3nF9|)5MW374-f}0{bekgRMu#O+$$9!m4@Dm+B#TCLSKU46m zj-TTf#J)BbF8D`qi`e&$9x|hhm|x;oI)07cDEO_8=kOS{Tp_mti|i6me#cC5L3rt; z;P*QIfIk))^qfJ=^tpud3v=CDtGl3D=4RHPIz1hO*M+wurKjw@Tb@AEehEE@T>$ zCD3M}=W@$ZByiA9O^WQ=R04h>`g{zOB2??9O7ZesJt@E>ERrK5euUGi7gMh%!5avn zu>{3aW^AF%@rK}J_<{j;K*66y#rQiB`Xr;=s~@z?NM&P0!qNDRe! zZY%f~qwW-brLYwpOGQv}9MH&n>Mq`6%ix~ptog5ZM?*`NiQ|RO8s~TgVEaanvXJ=% zT-!1SDT}g^Irtugd=hfdpGAN}WftmwF)q(S5CaVFb!^m!+LeQd%SbaQ40*5XYBvI4%)OC0+Y zT&AFbEhGi2UOV^i}9YsnrYOv1@&2+IgN@en&{WH zkCVn(TLhPt_ff|~xtzbggcHlrM)yUCrJbXVbm7@9stQQ|#o8R6JcuTW8>b7R`gB2@ zORMJ*#Q6l#MG)NtvH8_Oj3VlJLaNGb=R?Jw5Nz89$~xu9EY{sirWf<;L+AKT_Kp6h zQq$}&TqQp%LSkbi7$n#`(d6rtXRs;~47tOQEQZyQV7)sG_&ep0d=C})>G3+E5IYF0 z=eM&(*lC`{`gydRXc1PtK`RHe;SJgtWDK8(2p=kW+pz{JpSRKz+vthyjNx8fkDa)k zNqQG{<6iz06v46@>PvKve<4=*z_hHYs#vM(|6wlYw@SndZ+o7XkRW$~G{P8eo`%vg z1GPma(Eiro2A5o=3#wg!%3|Y4>m1HLv4GACmO&`E1Qje4H5g)W4>Oqexu`1PtLPt0w-5s_n~YxJG1BHqw@?mx16rJgAuYdxNR2O z`&)e-!5%*BX_Y$$+I$`J=6qXyJvB67X2fkK#h`!h5T|XB!~ER4toUs!kT}K zrS&>i`0KG0H<12~EUh=OeBI3IaSQY2R+7JsE=nvMUguC>d}@LNv)Ie{XIjfVzSfB2 t#7n?{E26pH@}o@O%8Lai-PacW#$FtUf5AWSSN=!OogAwiPxJes{{fANzK#F@ diff --git a/src/main/java/duke/command/AddCommand.class b/src/main/java/duke/command/AddCommand.class index 7ffea5911a5c52a838678cefd55530b044f0aac6..bbf378abf959b26c1fde60a1cd42df9440eeff3b 100644 GIT binary patch delta 525 zcmYLFxlUU_6g~5vpT`~s8=J+(U=}-uu$nc5tk{G-RD1#ASqeh%5H=D8QobRYijsy3 z3WN|61r1#)$QSSf`~t}tT%?$L&z*Dbxp(GKKQzq!e!0B^FoX37Iu$%*6*Rh{MBNfS z3cbiF3}ZxM^w-)&Of4L3RrYJ!!CqCOXqv_3P9qW;jfiQCVO${P zAMR9&Tfy$`=AK_H`Tl$zN=#@>VoG9K;~i!s-fPU_gT_aE5@;$1L9JRl*xX;Q)P4kh zH6F(22)<~1#hgS*ql|?4E85MKXf65yYNDYgv>+hC$zN7k}2xQuaxsExjI zNi@GIN?xYdD#EOQ7RDB|(#sCpV3)_7H^*M?=l@wyyX=>`LXPE5_$317PZ(X0-!#Nqt&}W%hkzK?pme~82b%gbRH5~j0vQ0rM delta 658 zcmYLFOHUI~7(I7p+9|^=EwzY3k(ok4ri$_qwfMj)iehaIY+MfQ7>L?w+F9s|g+IVF zvvJ|Vm2NbV1!>eoS8iNs;xF(&xH2)G8A)8+@BN)~?)R<#yIlYJ=ffueXK^=yaRV`! z22!y480B?L7??!Cz!atp9LG!;*%{8y8aRd1I_46XHy~l^Sm>_29ZhcdPW?f}X>B@N z4_yIc^>N*8`8!^-)BU}WOd~6i#-PL^&IHRMS6-6jKBwcnLH+SG1}e+O?vZ5X5tZ!rOd5un={(Sx$bP~Z@)!3KDoIFivq_F%zgJ?t2E z52{_(Ge5ps>PmLu30#u?{fa`G6ana#oC6u$?>)gk*i z4$2b*5**FZhU_Esp(aIrLn{^|j(;*IDQqlk5%D&?!NFU&gLUE-nJ1W^;5+#jdI4Mh diff --git a/src/main/java/duke/command/DeleteCommand.class b/src/main/java/duke/command/DeleteCommand.class index cc991672591e94d1672243ae7edfffdad84afcfc..37fe67cf898212ba20f97cfdb7022b8511dd2a29 100644 GIT binary patch delta 786 zcmYjPTTc@~7(KJwcIdiGFH)rx?AF#oL8(_j@PY^`NNH`0!V_8P3boj+-No?6Pe9xk zA547H7fm$A5Fycbe}=FA2lbmZL6hC@cFufrzL|M_e{#X5uPMHRT@(S0iIl(bg6-gL^Q-J& z5NOOppZgL^0_}uMHUuBtYmiWeV>m7tR80{k)&>vYUmn_n^nnrvu`ECy6ftxoP9#Bp zMf3pqF<17dx8I^`+GBoEXhh#uNJLA74W`k+&s zCY!|xdSgj?fhl5ue(5(A{akzrj$V#F2F9U=i3u8md1EHawD|87J>-R0Nq$H6fB6{_ doDv95qC#FF^d1&brjdpz?<6EowX>eR^an8cft~;W delta 573 zcmY*V-A)rh7(Kh~?zGEnOKTNq0Sk-DpH>k?K?PbsAxMb91TGu92@TS1*yX}29)Xa# z@`@MGL}LsI8o2ivd=-di3JJ2weBXDz^D~qE;U2cl{5d~90Wg831o93n6dXu&Cpq;9 z^g6hWqJuv4JMb`|r#o5dha3!JL}2t_^{euX@jVwA2^T4e`*>g=U)$aCOCN&m?P{Y| zn)5&Ukzct$0wsxucqA|;@fhO*Pb8jVLgE>o8)z>FK@>(i)#h72+6-!8+Qwu8QxY%m zQs9-uG%^Nq*Dk0WoY<;tZlv7SdaW96E!V?HeKxDH8O*9PbH6BB)cd*tx4BbqMDP5t z88kv)psceO)Zf^U@kZJ4pT?s49be&Ae->y!iZxB-!Q=#p;jD24^E*dAnbjcy{yCds zZOCYYTDA)7noS|bnns-3WQ)t2l#@rCtfX*SXfy@s+1XMl*1qC+Q0J*HJ!W^{AS`2sm0xz(M zG4aNDBZf3bA4h+fv=?MZo-BroGA`kA7z{%);uz)_IhcIYrRE)dqr9kB z3i|zRgX0RvD90FsJiE7HRGgA!+6O-d)h0w0G$E{D99P|b*1msD!F5b1n8XxA@}d4n z&ur`FW@g?j8hhDYC;MR9+BJ*zzdQ`#;%?c<%#b+&hNdmcv7M@3Su~t2t7ta{Fdf7V z1v8jca1*yU<`m51b`WGu#nA}}oWMa3HUD@4Zp$B@>e z;t^GYL!A23Pt<-5N)74})qolr-%&D&DhVS<3B8YWQw;imgf_z4iHQ*&M-m@X`S++G^`vXsfkGTVt$=k3=SsAPix~N8=axpy$3aSojZy$b;Wo`9^hl~pkDHrFkq9NCQ*$wK?!d|b{Z`ZfO zey}yE9n@W%#{~zgF4l0-#U-pe*l=+fS2Rp*hG87V!`9$I5I+ywQQF4U1g^QbjvEec zy10dmJksW5Lq8~aW0%LRsC&N?#TrDfHS9JcWv9Vh-u0inGxjZk2AXo;SdqW=ynJQ& zOU_t#(9z%xhMj)=D2N7OKMEXdDx*8{hv92?A`mJws4^%pFfu4HFfcGNC<6d4IttGK delta 83 zcmaFL{*-;gNhVQV1{MZB22KWkASu8g%pk}h!5}pG9+L^9=wxAL3sy-6RtBlb0nFO0 hvOt#H;M1& diff --git a/src/test/java/duke/ParserTest.java b/src/test/java/duke/ParserTest.java new file mode 100644 index 0000000000..d9e56789b7 --- /dev/null +++ b/src/test/java/duke/ParserTest.java @@ -0,0 +1,15 @@ +import duke.Parser; +import duke.DukeException; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +public class ParserTest { + @Test + void parserTest() { + assertThrows(DukeException.class, () -> Parser.parse("asdfgh")); + } + + +} \ No newline at end of file diff --git a/src/test/java/duke/TaskListTest.java b/src/test/java/duke/TaskListTest.java new file mode 100644 index 0000000000..a8ec49e0b9 --- /dev/null +++ b/src/test/java/duke/TaskListTest.java @@ -0,0 +1,17 @@ +import duke.TaskList; +import duke.task.Todo; +import duke.DukeException; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +public class TaskListTest { + @Test + void addTaskTest() { + TaskList taskList = new TaskList(); + taskList.add(new Todo("description")); + assertEquals(1, taskList.size()); + taskList.remove(1); + } +} \ No newline at end of file From cf63234344c84b53a740bee78f23063645b47c83 Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Tue, 3 Sep 2019 15:34:32 +0800 Subject: [PATCH 16/28] Completed A-Jar --- build.gradle | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.gradle b/build.gradle index 2a154d5cca..7deb70c7e5 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,14 @@ plugins { id 'java' id 'application' id 'checkstyle' + id 'com.github.johnrengelman.shadow' version '5.1.0' +} + +shadowJar { + archiveBaseName = "duke" + archiveVersion = "0.1.3" + archiveClassifier = null + archiveAppendix = null } checkstyle { From fa2bb0c0d7b9961f086d7c90c186d60503060393 Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Tue, 3 Sep 2019 23:04:06 +0800 Subject: [PATCH 17/28] Completed A-JavaDoc --- src/main/java/AddCommand.java | 30 ++++++++++++++++++++++++++- src/main/java/Command.java | 24 ++++++++++++++++++++++ src/main/java/Deadline.java | 14 +++++++++++++ src/main/java/DeleteCommand.java | 28 +++++++++++++++++++++++++ src/main/java/DoneCommand.java | 28 +++++++++++++++++++++++++ src/main/java/Duke.java | 8 ++++++++ src/main/java/DukeException.java | 8 ++++++++ src/main/java/Event.java | 14 +++++++++++++ src/main/java/ExitCommand.java | 28 +++++++++++++++++++++++++ src/main/java/ListCommand.java | 28 +++++++++++++++++++++++++ src/main/java/Main.java | 12 +++++++++++ src/main/java/Parser.java | 35 ++++++++++++++++++++++++++++++++ src/main/java/Storage.java | 19 +++++++++++++++++ src/main/java/Task.java | 27 +++++++++++++++++++++--- src/main/java/TaskList.java | 31 ++++++++++++++++++++++++++++ src/main/java/Todo.java | 13 ++++++++++++ src/main/java/Ui.java | 32 +++++++++++++++++++++++------ 17 files changed, 369 insertions(+), 10 deletions(-) diff --git a/src/main/java/AddCommand.java b/src/main/java/AddCommand.java index 662cd671e8..63e1ab47bf 100644 --- a/src/main/java/AddCommand.java +++ b/src/main/java/AddCommand.java @@ -7,20 +7,43 @@ import duke.TaskList; import duke.task.Task; +/** + * Command containing method for adding Task to TaskList. + */ public class AddCommand extends Command { + /** + * Constructor for AddCommand without parameters. + */ public AddCommand() { this(""); } + /** + * Constructor for AddCommand with String parameter. + * + * @param fullCommand Input entered by user. + */ public AddCommand(String fullCommand) { this.fullCommand = fullCommand; } + /** + * Returns an AddCommand as initialized by the constructor. + * + * @param input Input entered by user. + */ public Command clone(String fullCommand) { return new AddCommand(fullCommand); } - public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException { + /** + * Adds a Task to the TaskList. + * + * @param tasks TaskList to add Task to. + * @param ui Ui for printing responses to the console. + * @param storage Storage that stores the modified TaskList. + */ + public void execute(TaskList tasks, Ui ui, Storage storage) { Task task = Parser.parseTask(this.fullCommand); tasks.add(task); ui.printResponse("Got it. I've added this task:\n " @@ -28,6 +51,11 @@ public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException + "Now you have " + tasks.size() +" tasks in the list."); } + /** + * Returns boolean to initiate exit of program. + * + * @return false so program does not exit. + */ public boolean isExit() { return false; } diff --git a/src/main/java/Command.java b/src/main/java/Command.java index 2ba1035872..9a631e0401 100644 --- a/src/main/java/Command.java +++ b/src/main/java/Command.java @@ -5,10 +5,34 @@ import duke.Storage; import duke.DukeException; +/** + * Abstract Command class that contains execute() for + * interacting with TaskList, Ui and Storage objects based on input. + */ public abstract class Command { protected String fullCommand; + /** + * Public method to initialize Command objects. + * + * @param fullCommand Input entered by user. + * @return Command object initialized by constructor. + */ public abstract Command clone(String fullCommand); + + /** + * Interacts with TaskList, Ui and Storage objects based on input. + * + * @param tasks TaskList to add Task to. + * @param ui Ui for printing responses to the console. + * @param storage Storage that stores the modified TaskList. + */ public abstract void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException; + + /** + * Returns boolean to initiate exit of program. + * + * @return Boolean to initiate exit of program. + */ public abstract boolean isExit(); } \ No newline at end of file diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index d8094cfd57..b1a438b698 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -2,11 +2,25 @@ import java.util.Date; +/** + * Task containing information about a deadline. + */ public class Deadline extends Task { + /** + * Constructor for Deadline object. + * + * @param description Description of deadline. + * @param date Date of deadline. + */ public Deadline(String description, Date date) { super("D", description, date); } + /** + * Returns String containing information about the deadline. + * + * @return String containing status, description and date of deadline. + */ public String toString() { return String.format("[%s][%s] %s (by: %s)", this.type, this.getStatusIcon(), diff --git a/src/main/java/DeleteCommand.java b/src/main/java/DeleteCommand.java index 514c955a2a..b6a2fd39b1 100644 --- a/src/main/java/DeleteCommand.java +++ b/src/main/java/DeleteCommand.java @@ -7,19 +7,42 @@ import duke.TaskList; import duke.task.Task; +/** + * Command containing method for deleting Task from TaskList. + */ public class DeleteCommand extends Command { + /** + * Constructor for DeleteCommand without parameters. + */ public DeleteCommand() { this(""); } + /** + * Constructor for DeleteCommand with String parameter. + * + * @param fullCommand Input entered by user. + */ public DeleteCommand(String fullCommand) { this.fullCommand = fullCommand; } + /** + * Returns a DeleteCommand as initialized by the constructor. + * + * @param input Input entered by user. + */ public Command clone(String fullCommand) { return new DeleteCommand(fullCommand); } + /** + * Deletes a Task from the TaskList. + * + * @param tasks TaskList to delete Task from. + * @param ui Ui for printing responses to the console. + * @param storage Storage that stores the modified TaskList. + */ public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException { int itemId = Parser.parseDelete(this.fullCommand); try { @@ -32,6 +55,11 @@ public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException } } + /** + * Returns boolean to initiate exit of program. + * + * @return false so program does not exit. + */ public boolean isExit() { return false; } diff --git a/src/main/java/DoneCommand.java b/src/main/java/DoneCommand.java index 0393626eae..415459c35e 100644 --- a/src/main/java/DoneCommand.java +++ b/src/main/java/DoneCommand.java @@ -7,19 +7,42 @@ import duke.TaskList; import duke.task.Task; +/** + * Command containing method for marking Task from TaskList as done. + */ public class DoneCommand extends Command { + /** + * Constructor for DoneCommand without parameters. + */ public DoneCommand() { this(""); } + /** + * Constructor for DoneCommand with String parameter. + * + * @param fullCommand Input entered by user. + */ public DoneCommand(String fullCommand) { this.fullCommand = fullCommand; } + /** + * Returns a DoneCommand as initialized by the constructor. + * + * @param input Input entered by user. + */ public Command clone(String fullCommand) { return new DoneCommand(fullCommand); } + /** + * Marks a Task from the TaskList as done. + * + * @param tasks TaskList to delete Task from. + * @param ui Ui for printing responses to the console. + * @param storage Storage that stores the modified TaskList. + */ public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException { int itemId = Parser.parseDone(this.fullCommand); try { @@ -31,6 +54,11 @@ public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException + tasks.get(itemId).toString()); } + /** + * Returns boolean to initiate exit of program. + * + * @return false so program does not exit. + */ public boolean isExit() { return false; } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 99c269e7ff..ed7e4c6078 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,6 +1,14 @@ package duke; +/** + * Application class for Duke. + */ public class Duke { + /** + * Main method for Duke. + * + * @param args Arguments entered when main method is executed. + */ public static void main(String[] args) { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java index 3c1763dfd2..f00c6a238d 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/DukeException.java @@ -1,6 +1,14 @@ package duke; +/** + * Exception class for Duke. + */ public class DukeException extends Exception { + /** + * Constructor method for DukeException + * + * @param errorMessage Error message to be displayed for the error + */ public DukeException(String errorMessage) { super(errorMessage); } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 3024b01900..e6cbe38de5 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -2,11 +2,25 @@ import java.util.Date; +/** + * Task containing information about an event. + */ public class Event extends Task { + /** + * Constructor for Event object. + * + * @param description Description of event. + * @param date Date of event. + */ public Event(String description, Date date) { super("E", description, date); } + /** + * Returns String containing information about the event. + * + * @return String containing status, description and date of deadline. + */ public String toString() { return String.format("[%s][%s] %s (at: %s)", this.type, this.getStatusIcon(), diff --git a/src/main/java/ExitCommand.java b/src/main/java/ExitCommand.java index e8e846b1a8..63afd3cc40 100644 --- a/src/main/java/ExitCommand.java +++ b/src/main/java/ExitCommand.java @@ -4,23 +4,51 @@ import duke.Storage; import duke.TaskList; +/** + * Command containing method for exiting program. + */ public class ExitCommand extends Command { + /** + * Constructor for ExitCommand without parameters. + */ public ExitCommand() { this(""); } + /** + * Constructor for ExitCommand with String parameter. + * + * @param fullCommand Input entered by user. + */ public ExitCommand(String fullCommand) { this.fullCommand = fullCommand; } + /** + * Returns an ExitCommand as initialized by the constructor. + * + * @param input Input entered by user. + */ public Command clone(String fullCommand) { return new ExitCommand(fullCommand); } + /** + * Exits program. + * + * @param tasks TaskList of program. + * @param ui Ui for printing responses to the console. + * @param storage Storage of program. + */ public void execute(TaskList tasks, Ui ui, Storage storage) { ui.printResponse("Bye. Hope to see you again soon!"); } + /** + * Returns boolean to initiate exit of program. + * + * @return false so program does not exit. + */ public boolean isExit() { return true; } diff --git a/src/main/java/ListCommand.java b/src/main/java/ListCommand.java index 7ae6cc0158..9bbf2ef981 100644 --- a/src/main/java/ListCommand.java +++ b/src/main/java/ListCommand.java @@ -4,24 +4,52 @@ import duke.Storage; import duke.TaskList; +/** + * Command containing method for listing Tasks in TaskList. + */ public class ListCommand extends Command { + /** + * Constructor for ListCommand without parameters. + */ public ListCommand() { this(""); } + /** + * Constructor for ListCommand with String parameter. + * + * @param fullCommand Input entered by user. + */ public ListCommand(String fullCommand) { this.fullCommand = fullCommand; } + /** + * Returns a ListCommand as initialized by the constructor. + * + * @param input Input entered by user. + */ public Command clone(String fullCommand) { return new ListCommand(fullCommand); } + /** + * List Tasks in TaskList. + * + * @param tasks TaskList of program. + * @param ui Ui for printing responses to the console. + * @param storage Storage of program. + */ public void execute(TaskList tasks, Ui ui, Storage storage) { ui.printResponse("Here are the tasks in your list:\n" + tasks.toString()); } + /** + * Returns boolean to initiate exit of program. + * + * @return false so program does not exit. + */ public boolean isExit() { return false; } diff --git a/src/main/java/Main.java b/src/main/java/Main.java index d106b1ffd7..710c60329a 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -13,11 +13,20 @@ import java.io.ObjectOutputStream; import java.util.ArrayList; +/** + * Main class of Duke. + * Contains run() method. + */ public class Main { private Storage storage; private TaskList tasks; private Ui ui; + /** + * Constructor of Main class. + * + * @param filePath Path to text file where save data is stored. + */ public Main(String filePath) { ui = new Ui(); storage = new Storage(filePath); @@ -29,6 +38,9 @@ public Main(String filePath) { } } + /** + * Run method of Duke. + */ public void run() { this.ui.showWelcome(); diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 03bfda73b0..bf86873c8f 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -7,6 +7,9 @@ import java.text.SimpleDateFormat; import java.util.Date; +/** + * Parses input entered by user. + */ public class Parser { protected static HashMap keywordToCommand = createMap(); protected static SimpleDateFormat dateFormatter = new SimpleDateFormat("dd/MM/yyyy HHmm"); @@ -23,6 +26,14 @@ static HashMap createMap() { return keywordToCommand; } + /** + * Returns the command as specified by the input. + * If input cannot be parsed, throws DukeException. + * + * @param input Input entered by user. + * @return Command object specified by input. + * @throws DukeException If input cannot be parsed. + */ public static Command parse(String input) throws DukeException { if(keywordToCommand.containsKey(input)) { return keywordToCommand.get(input); @@ -38,6 +49,14 @@ public static Command parse(String input) throws DukeException { } } + /** + * Returns the itemId for the task to be marked done. + * If input cannot be parsed, throws DukeException. + * + * @param input Input entered by user. + * @return itemId for object to be marked done. + * @throws DukeException If input has incorrect format. + */ public static int parseDone(String input) throws DukeException { String[] words = input.split(" "); int itemId; @@ -52,6 +71,14 @@ public static int parseDone(String input) throws DukeException { return itemId; } + /** + * Returns the itemId for the task to be deleted. + * If input cannot be parsed, throws DukeException. + * + * @param input Input entered by user. + * @return itemId for object to be marked done. + * @throws DukeException If input has incorrect format. + */ public static int parseDelete(String input) throws DukeException { String[] words = input.split(" "); int itemId; @@ -66,6 +93,14 @@ public static int parseDelete(String input) throws DukeException { return itemId; } + /** + * Returns the Task to be added to the TaskList. + * If input cannot be parsed, throws DukeException. + * + * @param input Input entered by user. + * @return Task to be added. + * @throws DukeException If input has incorrect format. + */ public static Task parseTask(String input) throws DukeException { String[] words = input.split(" "); String type = words[0]; diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index cf13dad8c7..0712378b37 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -7,13 +7,27 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +/** + * Storage class of Duke. + * Handles saving of TaskList data. + */ public class Storage { protected String filePath; + /** + * Constructor of Storage + * + * @param filePath Specifies where save data is to be stored and loaded from. + */ public Storage(String filePath) { this.filePath = filePath; } + /** + * Saves TaskList data to file specified in filePath. + * + * @param list TaskList which data is to be saved. + */ public void save(TaskList list) { try { FileOutputStream fout = new FileOutputStream(this.filePath); @@ -26,6 +40,11 @@ public void save(TaskList list) { } } + /** + * Returns TaskList constructed from loaded data from filePath. + * + * @return TaskList constructed from loaded data. + */ public TaskList load() throws DukeException { TaskList list = new TaskList(); try { diff --git a/src/main/java/Task.java b/src/main/java/Task.java index db3db10f1e..6bee1e5b8f 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -3,31 +3,52 @@ import java.io.Serializable; import java.util.Date; +/** + * Task class for storing information about a task. + */ public class Task implements Serializable { - protected String type; protected String description; protected Date date; protected boolean isDone; - public Task(String type, String description, Date date) { - this.type = type; + /** + * Constructor for Task object. + * + * @param description Description of task. + * @param date Date of task. + */ + public Task(String description, Date date) { this.description = description; this.date = date; this.isDone = false; } + /** + * Returns String containing status of task. + */ public String getStatusIcon() { return (isDone ? "\u2713" : "\u2718"); //return tick or X symbols } + /** + * Sets status of task as done. + */ public void markAsDone() { this.isDone = true; } + /** + * Sets status of task as undone. + */ public void markAsUnDone() { this.isDone = false; } + /** + * Returns String containing information about the task. + * + * @return String containing status, description and date of task. + */ public String toString() { return String.format("[%s][%s] %s %s", this.type, this.getStatusIcon(), diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 759f31f17a..2110e551e5 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -4,23 +4,54 @@ import java.io.Serializable; import java.util.ArrayList; +/** + * TaskList class contains Tasks to be done. + */ public class TaskList extends ArrayList implements Serializable { + /** + * Adds Task to TaskList. + * + * @param Task to be added to TaskList. + * @return Boolean if Task is successfully added. + */ public boolean addTask(Task task) { return this.add(task); } + /** + * Returns Task of the specified id. + * + * @param itemId Id of the Task. + * @return Task of the specified itemId. + */ public Task get(int itemId) { return super.get(itemId - 1); } + /** + * Returns Task that has been removed from TaskList. + * + * @param itemId Id of the Task to be removed. + * @return Task which has been removed from TaskList. + */ public Task remove(int itemId) { return super.remove(itemId - 1); } + /** + * Marks the Task of the specified id as done. + * + * @param itemId Id of the Task to be marked as done. + */ public void markAsDone(int itemId) { super.get(itemId - 1).markAsDone(); } + /** + * Returns String of Tasks contained in TaskList. + * + * @return String of Tasks contained in TaskList. + */ public String toString() { StringBuffer listBuffer = new StringBuffer(); int len = this.size(); diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index b3c27f592c..581b5c3d76 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -2,11 +2,24 @@ import java.util.Date; +/** + * Task containing information about a todo. + */ public class Todo extends Task { + /** + * Constructor for Todo object. + * + * @param description Description of todo. + */ public Todo(String description) { super("T", description, new Date()); } + /** + * Returns String containing information about the todo. + * + * @return String containing status, description and date of todo. + */ public String toString() { return String.format("[%s][%s] %s", this.type, this.getStatusIcon(), diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index acb5cd58f2..3f5bee5ad6 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -2,16 +2,19 @@ import java.util.Scanner; +/** + * Ui class that handles output of Duke to the console. + */ public class Ui { - public String format(String command) { + String format(String output) { return " ____________________________________________________________\n" - + indent(command) + + indent(output) + " ____________________________________________________________\n"; } - public String indent(String command) { + String indent(String output) { StringBuffer stringBuffer = new StringBuffer(); - Scanner scanner = new Scanner(command); + Scanner scanner = new Scanner(output); while(scanner.hasNext()) { String temp = scanner.nextLine(); stringBuffer.append(" " + temp + "\n"); @@ -20,10 +23,18 @@ public String indent(String command) { return stringBuffer.toString(); } - public void printResponse(String command) { - System.out.println(format(command)); + /** + * Prints output of Duke. + */ + public void printResponse(String output) { + System.out.println(format(output)); } + /** + * Reads input of user from the console. + * + * @return String containing input of user. + */ public String readCommand() { // Unable to close scanner - will trigger NullException error on scanner.nextLine() Scanner scanner = new Scanner(System.in); @@ -31,15 +42,24 @@ public String readCommand() { return fullCommand; } + /** + * Shows welcome message of Duke. + */ public void showWelcome() { this.printResponse("Hello! I'm Duke\n" + "What can I do for you?"); } + /** + * Shows error message of Duke. + */ public void showError(String message) { this.printResponse(message); } + /** + * Shows error if save data is not loaded. + */ public void showLoadingError() { this.printResponse("☹ OOPS!!! No tasks saved."); } From 4f4b86835a66e14192ac2e71ef40338bcd7f5332 Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Wed, 4 Sep 2019 01:01:03 +0800 Subject: [PATCH 18/28] Completed A-CodingStandard --- src/main/java/AddCommand.java | 2 +- src/main/java/Command.java | 2 ++ src/main/java/DeleteCommand.java | 4 ++-- src/main/java/DoneCommand.java | 2 +- src/main/java/Main.java | 2 +- src/main/java/Parser.java | 27 ++++++++++++++------------- src/main/java/Storage.java | 4 ++-- src/main/java/TaskList.java | 2 +- src/main/java/Ui.java | 2 +- 9 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/main/java/AddCommand.java b/src/main/java/AddCommand.java index 662cd671e8..34d596b1cc 100644 --- a/src/main/java/AddCommand.java +++ b/src/main/java/AddCommand.java @@ -25,7 +25,7 @@ public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException tasks.add(task); ui.printResponse("Got it. I've added this task:\n " + task.toString() + "\n" - + "Now you have " + tasks.size() +" tasks in the list."); + + "Now you have " + tasks.size() + " tasks in the list."); } public boolean isExit() { diff --git a/src/main/java/Command.java b/src/main/java/Command.java index 2ba1035872..bb5cf58931 100644 --- a/src/main/java/Command.java +++ b/src/main/java/Command.java @@ -9,6 +9,8 @@ public abstract class Command { protected String fullCommand; public abstract Command clone(String fullCommand); + public abstract void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException; + public abstract boolean isExit(); } \ No newline at end of file diff --git a/src/main/java/DeleteCommand.java b/src/main/java/DeleteCommand.java index 514c955a2a..0a99bf5743 100644 --- a/src/main/java/DeleteCommand.java +++ b/src/main/java/DeleteCommand.java @@ -26,8 +26,8 @@ public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException Task item = tasks.remove(itemId); ui.printResponse("Noted. I've removed this task: \n " + item.toString() + "\n" - + "Now you have " + tasks.size() +" tasks in the list."); - } catch(IndexOutOfBoundsException e) { + + "Now you have " + tasks.size() + " tasks in the list."); + } catch (IndexOutOfBoundsException e) { throw new DukeException("☹ OOPS!!! There is no item " + itemId + "."); } } diff --git a/src/main/java/DoneCommand.java b/src/main/java/DoneCommand.java index 0393626eae..6319d0d69e 100644 --- a/src/main/java/DoneCommand.java +++ b/src/main/java/DoneCommand.java @@ -24,7 +24,7 @@ public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException int itemId = Parser.parseDone(this.fullCommand); try { tasks.markAsDone(itemId); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { throw new DukeException("☹ OOPS!!! There is no item " + itemId + "."); } ui.printResponse("Nice! I've marked this task as done: \n " diff --git a/src/main/java/Main.java b/src/main/java/Main.java index d106b1ffd7..01d3e55877 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -33,7 +33,7 @@ public void run() { this.ui.showWelcome(); boolean isExit = false; - while(!isExit) { + while (!isExit) { try { String fullCommand = ui.readCommand(); Command c = Parser.parse(fullCommand); diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 03bfda73b0..40a8d5d487 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -24,12 +24,12 @@ static HashMap createMap() { } public static Command parse(String input) throws DukeException { - if(keywordToCommand.containsKey(input)) { + if (keywordToCommand.containsKey(input)) { return keywordToCommand.get(input); } else { String keyword = input.split(" ")[0]; Command command; - if(keywordToCommand.containsKey(keyword)) { + if (keywordToCommand.containsKey(keyword)) { command = keywordToCommand.get(keyword).clone(input); } else { throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); @@ -42,11 +42,11 @@ public static int parseDone(String input) throws DukeException { String[] words = input.split(" "); int itemId; try { - assert(words.length == 2); + assert (words.length == 2); String command = words[0]; - assert(command.equals("done")); + assert (command.equals("done")); itemId = Integer.parseInt(words[1]); - } catch(AssertionError e) { + } catch (AssertionError e) { throw new DukeException("☹ OOPS!!! Incorrect format for done command."); } return itemId; @@ -56,11 +56,11 @@ public static int parseDelete(String input) throws DukeException { String[] words = input.split(" "); int itemId; try { - assert(words.length == 2); + assert (words.length == 2); String command = words[0]; - assert(command.equals("delete")); + assert (command.equals("delete")); itemId = Integer.parseInt(words[1]); - } catch(AssertionError e) { + } catch (AssertionError e) { throw new DukeException("☹ OOPS!!! Incorrect format for delete command."); } return itemId; @@ -71,9 +71,9 @@ public static Task parseTask(String input) throws DukeException { String type = words[0]; String info = input.substring((type + " ").length()); - switch(type) { + switch (type) { case "todo": - if(info.equals("")) { + if (info.equals("")) { throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); } return new Todo(info); @@ -83,7 +83,7 @@ public static Task parseTask(String input) throws DukeException { Date date; try { date = dateFormatter.parse(args[1].trim()); - } catch(Exception e) { + } catch (Exception e) { throw new DukeException("☹ OOPS!!! Incorrect date format."); } return new Deadline(description, date); @@ -92,11 +92,12 @@ public static Task parseTask(String input) throws DukeException { description = args[0].trim(); try { date = dateFormatter.parse(args[1].trim()); - } catch(Exception e) { + } catch (Exception e) { throw new DukeException("☹ OOPS!!! Incorrect date format."); } return new Event(description, date); + default: + throw new DukeException("Invalid task input."); } - throw new DukeException("Invalid task input."); } } \ No newline at end of file diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index cf13dad8c7..acb91a8fd2 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -21,7 +21,7 @@ public void save(TaskList list) { out.writeObject(list); out.flush(); out.close(); - } catch(Exception e) { + } catch (Exception e) { System.out.println(e); } } @@ -32,7 +32,7 @@ public TaskList load() throws DukeException { ObjectInputStream in = new ObjectInputStream(new FileInputStream(this.filePath)); list = (TaskList) in.readObject(); in.close(); - } catch(Exception e) { + } catch (Exception e) { throw new DukeException("Save data not found."); } return list; diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 759f31f17a..bd55362768 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -24,7 +24,7 @@ public void markAsDone(int itemId) { public String toString() { StringBuffer listBuffer = new StringBuffer(); int len = this.size(); - for(int i = 1; i <= len; i++) { + for (int i = 1; i <= len; i++) { listBuffer.append(i + "." + this.get(i).toString() + "\n"); diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index acb5cd58f2..d7588205e5 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -12,7 +12,7 @@ public String format(String command) { public String indent(String command) { StringBuffer stringBuffer = new StringBuffer(); Scanner scanner = new Scanner(command); - while(scanner.hasNext()) { + while (scanner.hasNext()) { String temp = scanner.nextLine(); stringBuffer.append(" " + temp + "\n"); } From 9a03f039e024a3c4dbf20df07c48a0f1aaec0655 Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Wed, 4 Sep 2019 01:20:27 +0800 Subject: [PATCH 19/28] Completed Level-9 --- src/main/java/FindCommand.java | 38 +++++++++++++++++++ src/main/java/Parser.java | 6 +++ src/main/java/duke/Parser.class | Bin 4198 -> 4326 bytes src/main/java/duke/command/FindCommand.class | Bin 0 -> 1721 bytes 4 files changed, 44 insertions(+) create mode 100644 src/main/java/FindCommand.java create mode 100644 src/main/java/duke/command/FindCommand.class diff --git a/src/main/java/FindCommand.java b/src/main/java/FindCommand.java new file mode 100644 index 0000000000..a6586f1fdc --- /dev/null +++ b/src/main/java/FindCommand.java @@ -0,0 +1,38 @@ +package duke.command; + +import duke.DukeException; +import duke.Parser; +import duke.Ui; +import duke.Storage; +import duke.TaskList; +import duke.task.Task; + +public class FindCommand extends Command { + public FindCommand() { + this(""); + } + + public FindCommand(String fullCommand) { + this.fullCommand = fullCommand; + } + + public Command clone(String fullCommand) { + return new FindCommand(fullCommand); + } + + public void execute(TaskList tasks, Ui ui, Storage storage) throws DukeException { + TaskList tempList = new TaskList(); + String phrase = Parser.parseFind(this.fullCommand); + for(Task task : tasks) { + if (task.toString().contains(phrase)) { + tempList.add(task); + } + } + ui.printResponse("Here are the matching tasks in your list:\n " + + tempList.toString() + "\n"); + } + + public boolean isExit() { + return false; + } +} \ No newline at end of file diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 03bfda73b0..2be4bf08f6 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -20,6 +20,7 @@ static HashMap createMap() { keywordToCommand.put("todo", new AddCommand()); keywordToCommand.put("deadline", new AddCommand()); keywordToCommand.put("event", new AddCommand()); + keywordToCommand.put("find", new FindCommand()); return keywordToCommand; } @@ -99,4 +100,9 @@ public static Task parseTask(String input) throws DukeException { } throw new DukeException("Invalid task input."); } + + public static String parseFind(String input) { + String phrase = input.split("find")[1]; + return phrase; + } } \ No newline at end of file diff --git a/src/main/java/duke/Parser.class b/src/main/java/duke/Parser.class index cb414771ddda17d5e1dbfe5864cbfde7b5d7f937..fe6656a552c6e361af464dce85678bf0a9c380bb 100644 GIT binary patch delta 1984 zcmbVNS#VTE6g_X=o9Q<_k0cHxWXQfSKo$Z?2oN9yf`FO?1;RMEKp=wxvIwGx=!mL*(lhTw{sl~_iyM4F5=k~ch7Yi>I z#n1nK>I{JCxFE3rF@bdw9>i?iByh8Y7csqGZ)1bNMhU+*-6F6_!qMVpfh`j0THGpd zt3*(X+iYyNaht#niLr?J(SX}^nmhEeQ{YY;yCfpGOU99l-2!*pxJRN8aqW7qz#fTG zeR2f%N!*VIY&>Y=p&$!=Oe^>5<#D|{VPl_-Ck6IPOhMenQ(F79PNO8|;TeHvZ9FIN zyu=K=V53u@OJbH5Ule#LTjFILkaRyN@QRIBbx>U3wcdcC4C9bG=&3PYSKoS?GTt!Y z-`c)ydu-wQ%^e29>K9L@sz;d;_RG-|K6U^$z*k}^j35ZBp5A6nYWErHI5*Q!fiR|GMmywmr(KeiAFDo+X zx9~VZWeJSyL|RJ9`4G81Wx>1z^3CdI>dIYfW=hglx)-!`gWW2O28)s?K3k#B^|X0cFjml<4l{EQr2>&b_yxVMrBb6RWQ|d*{1d53EzpuG zhsBh1;j;2G-h&AAqm-z}pDj15TV4H_%3vUYaMuWvRoxfIggMy9yrXGu=_RlRkt1;3Zy3jb$Pi;a{89r$ zpmY$@7y*Zqdi^EiN&6?Bk#HvcE1a3EZZ_gML{Y%Gt;1YO^NFXCc;*pL)1~0?;|AQA zx*kszFGrGZ6~ouVt7s{!I7RA_qhw7*Yel`^^3-`lRsxmkyHRCD;ZB6jI&U`$LsoDM z;dLU*()$eVGr3oVX(jQ=t|7&*Dh;w9Q=*kgOzo)*R+E?YzL3wPP*X3Cqc-HTw4A`S zdb=Cx^?vuRr>Ej(L_;EECoz+u_5U+8J{&u1ICgfAn{kfLNa&|=0bjG91BNgpzbOu_ zL>4);h)rLN0OvZy4)5nYcXFZ+aWal_eotT-qgOCK$_x>FL!x|7cKk$+{LID1wodko1Ezfi3Xx8z>8AvBg$(bNOHIkp3$J)^kcW@D*E= zdf%vNbzdK#B-oI^+%5>K8_w;_^P<7|Ni_AM_89%yWmS|hx>`RUUU-~F eg9+BUh7O$LSF)PV@FhNH>mTM`Kc|oI_vjzu7jQxV delta 1854 zcmbW1S#VQT7{`A%H_5rVy-hLFN(!YLAPp@`fPyK7Dhdj;3bsN3*~Ep#1vkKj2#Omn z=y7XRkVUJAS|}t)S=^m*m|=X@@yWqQ$2T6T^*c8e(Q(`+le2uwIsgCt{@*!Md8Q)s z)h|a+0F(H_gG-2IX1~(mM#W7o5#zd9af^#*ma7!2U5dgh9(35` zkckPphmG+OGi)`(qYjTbJg#`crH%~_Pa5ksbIemNQ+ZnPjKi~v?Jg5}&f$55cA0FJ zFDPDgd5M=@iGD>D((ce+b^7tsQ#4J<^`VY`w*vWbfn+ zeazlbB3N1^c{99_IbR^e2dX~ zRj5iY47Cl~@9>_-`+VTh#Q~3lbbB1)fc`SnR(P1K#|&nA%q6F5!t(^f5xprqHTt2) zQF=UDxZ0vr@3cz0zYnjo>|-3)3!F+l)~?YToo~Y@%-NslMUfioGrcu(*!o;IxN}xF zNR`2s>InrbE|*<^D`YRX!GJ*qw%C;Tgtm-xWLGA$C37f|!#W@fi)I_E46N4b4%0vew)g@bL{58Za1_Arv!Ieia!;ipo+{ z3-jSzEAArf;$DU+T6>8o(Po<%4TmzpcpdZmF=ho}P(00fI0B}kg9}ET2<@bxhst!0 zs*|JaWQ%VfSQjhEQr&T$E0{dOu*S{|(H0-;aD#Qoez`}{NRxodW0vnEw36GYMhiWDP@`9L$4;-%V5QVpDC4u);`G%$Sf8tMP)Cp^#?j>GXIxP^so8+ zMrXv|(wQvi8idXiGUdXgUiz(3m^3lXA7_ggO)35}pM@;SmnSerisOndYx~P1rD#sn z9_3=lGBQg|OKmC`s1JqW!7K?~5lvK9w==@74|P%z55@)xy>?21W5gs7u%77~NGD8zZ_*h2vp6nPqHB9b{ZQ95m}J$&}McQ7YosdO|*LVmhwk zPL6s>o%AnLGyS=f`*Sbp@=r{e6NUP5PH|e4an@3nD|22$3n`JWIYU1BObVo(98 zr90cDEA~jI?w8&>B;9vh#BoZra$0o$wJ7}?()=Kw^hXwRmL(#gf{Rl*9Z zij{t$HdELq4@EeyHGdS*waODwROFS$oIa{>{_GT0ipdCbd@lux#b+t_$H3)&WS`Io zo`0Uu`@Kyau0QuuwfGN-NGaBkWl9Gs*h$dtrs4>V-IVk&H65Flqp6#5<{gvorFRXu lFlp2mBH%SylE1`vEahXFU1`vhe2P3ZJS2NZ_M7Fua$GS<42 z{1f^M7-o2Y8Ja*l!|=>Ie};#`w~~|EO@;^Up51fV@0|1P>aVAd{{V0m-=uNT!XPeL zID^6vrCAe26LS_)C|J0R*R?c1j471#@P>&uE!enX;T+!5y0`UkCBty`$@ZGq^0+fusNEM2M9CBWcB!t~uD@N;4ug&t z_|z9q)7KiE9a(aM-Cf}~O4WGgp{CrEPDjygwh-H_iEyXphN==T*WIpAS3z5B%jl?) zx)RRLifBcUOk6YZfdOk_&yg+V27YLQd8FKMVb4`jLU*aI2c5Pf7hRpi_@e7Kx-jN- zItEyw31sy!Y2zb&Y#`eQy2r!7NTfQ#YT^?c*HN``0}D15ao)zKSTZmgnJK1J(zZ61 z@tKX!QM0jvRl>L)1S(W*(OQwJ88pJN6mF(*%f=U|nz(JFj;w)+J|JD#^nSh%1~SoB zN4Z{US;@9w(YP78-(UxhD`a5!+m7cQhsvDnDNQ23TcRCGMj2{pL07@R#Z!CyJRJ5n z?H;2zTbPXx=|iVE&=ldS++(AXel$%SSwNdl}|k zKfg~lnA9s}koFhg%d5`?zo7E0Vev1UsFU0eji^WxMK$FqAyw``&!JF=9?F@y2;F zoQWMPCmY?f)91Lh-;$@8-|MkIDq7E0H$+uQs0)rxPVR07PT9=hcAiY9j?<{zsv9H Ee<~E6w*UYD literal 0 HcmV?d00001 From c2945e532f6ef3a21a2295cbd25779d1cb5ce389 Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Wed, 4 Sep 2019 17:51:36 +0800 Subject: [PATCH 20/28] Completed A-Gradle --- src/test/java/duke/ParserTest.java | 4 +--- src/test/java/duke/TaskListTest.java | 8 ++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/test/java/duke/ParserTest.java b/src/test/java/duke/ParserTest.java index d9e56789b7..95c64ade7b 100644 --- a/src/test/java/duke/ParserTest.java +++ b/src/test/java/duke/ParserTest.java @@ -7,9 +7,7 @@ public class ParserTest { @Test - void parserTest() { + void parserErrorTest() { assertThrows(DukeException.class, () -> Parser.parse("asdfgh")); } - - } \ No newline at end of file diff --git a/src/test/java/duke/TaskListTest.java b/src/test/java/duke/TaskListTest.java index a8ec49e0b9..e11e7d82ae 100644 --- a/src/test/java/duke/TaskListTest.java +++ b/src/test/java/duke/TaskListTest.java @@ -14,4 +14,12 @@ void addTaskTest() { assertEquals(1, taskList.size()); taskList.remove(1); } + + @Test + void deleteTaskTest() { + TaskList taskList = new TaskList(); + taskList.add(new Todo("description")); + taskList.remove(1); + assertEquals(0, taskList.size()); + } } \ No newline at end of file From 7b593ef3bad01a1d92a79c4ff4d02cf33d2f39a6 Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Wed, 4 Sep 2019 17:56:02 +0800 Subject: [PATCH 21/28] Completed A-CheckStyle --- src/main/java/Parser.java | 13 +++++++++++-- src/main/java/duke/Parser.class | Bin 4310 -> 4310 bytes 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index d245c17116..2e00806377 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -1,8 +1,17 @@ package duke; -import duke.command.*; +import duke.command.Command; +import duke.command.AddCommand; +import duke.command.DeleteCommand; +import duke.command.DoneCommand; +import duke.command.ExitCommand; +import duke.command.FindCommand; +import duke.command.ListCommand; +import duke.task.Task; +import duke.task.Todo; +import duke.task.Deadline; +import duke.task.Event; import duke.DukeException; -import duke.task.*; import java.util.HashMap; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/duke/Parser.class b/src/main/java/duke/Parser.class index 2b4d614e194947b9fcfa94e369b4db3ebb40f488..f8239ddc8d0f6a2f869ed9e486db323842e0c954 100644 GIT binary patch delta 280 zcmWO1yGw#$9L4ePGlcp2M(@&_Vz5Q2iB=wcbPRdi8T%LE3o7^01cxDon^5@VD}VrIb3=_x$S5M)*s=A@fvj78asGr@wS3G-vW>Qzze zqBcZrirNyD7L^p0616QVTK;QUQ_C5lS$ymgV2?)*$Z<%KBVIV>ofAGdrNRZDobkmu wH7@z(iaOUcxKSSNmBp>Hxl=9=D#Vk?x0agnczHHU&a~IXpAMZ=o?~&M_yKVNB5xkxN3&LXo>EWg&7K^9PKGCUTA3vQ$5tDK(4P zQpDDOpky-(vzDxEEj_!Zr%zAsTMA0S`^uFi0;G^w};q9}E*>lmufmGfqNnF(=e9L|l)g^6)xTDZ1%(WeSam|HvNr@|gSReCvUi~hhrV#qjZ From de9f79b2f7e2be9fc829e665786a5b9245178a8f Mon Sep 17 00:00:00 2001 From: Kai Zhe Date: Wed, 4 Sep 2019 22:12:48 +0800 Subject: [PATCH 22/28] Completed Level-10 --- src/main/java/DialogBox.java | 73 ++++++++++++++++ src/main/java/Duke.java | 82 +++++++++++++++++- src/main/java/Launcher.java | 12 +++ src/main/java/Main.java | 71 +++++---------- src/main/java/MainWindow.java | 51 +++++++++++ src/main/java/{ => command}/AddCommand.java | 10 +-- src/main/java/{ => command}/Command.java | 8 +- .../java/{ => command}/DeleteCommand.java | 10 +-- src/main/java/{ => command}/DoneCommand.java | 10 +-- src/main/java/{ => command}/ExitCommand.java | 6 +- src/main/java/{ => command}/FindCommand.java | 10 +-- src/main/java/{ => command}/ListCommand.java | 6 +- src/main/java/data/duke.txt | Bin 0 -> 91 bytes src/main/java/duke/DialogBox.class | Bin 0 -> 1957 bytes src/main/java/duke/Duke.class | Bin 1082 -> 2393 bytes src/main/java/duke/DukeException.class | Bin 231 -> 0 bytes src/main/java/duke/DukeLogic.class | Bin 0 -> 2159 bytes src/main/java/duke/Launcher.class | Bin 0 -> 388 bytes src/main/java/duke/Main.class | Bin 1144 -> 1015 bytes src/main/java/duke/MainWindow.class | Bin 0 -> 2139 bytes src/main/java/duke/Parser.class | Bin 4310 -> 0 bytes src/main/java/duke/Ui.class | Bin 1907 -> 0 bytes src/main/java/duke/command/AddCommand.class | Bin 1488 -> 1528 bytes src/main/java/duke/command/Command.class | Bin 437 -> 462 bytes .../java/duke/command/DeleteCommand.class | Bin 1715 -> 1760 bytes src/main/java/duke/command/DoneCommand.class | Bin 1677 -> 1722 bytes src/main/java/duke/command/ExitCommand.class | Bin 695 -> 715 bytes src/main/java/duke/command/FindCommand.class | Bin 1721 -> 1761 bytes src/main/java/duke/command/ListCommand.class | Bin 1215 -> 1240 bytes .../java/duke/exception/DukeException.class | Bin 0 -> 241 bytes src/main/java/duke/{ => task}/TaskList.class | Bin 1592 -> 1597 bytes src/main/java/duke/util/Parser.class | Bin 0 -> 4445 bytes src/main/java/duke/{ => util}/Storage.class | Bin 1223 -> 1253 bytes src/main/java/duke/util/Ui.class | Bin 0 -> 2028 bytes .../java/{ => exception}/DukeException.java | 2 +- src/main/java/resources/DaDuke.png | Bin 0 -> 32657 bytes src/main/java/resources/DaUser.png | Bin 0 -> 37794 bytes src/main/java/{ => task}/Deadline.java | 0 src/main/java/{ => task}/Event.java | 0 src/main/java/{ => task}/Task.java | 0 src/main/java/{ => task}/TaskList.java | 2 +- src/main/java/{ => task}/Todo.java | 0 src/main/java/{ => util}/Parser.java | 59 +++++++------ src/main/java/{ => util}/Storage.java | 6 +- src/main/java/{ => util}/Ui.java | 9 +- src/main/java/view/DialogBox.fxml | 16 ++++ src/main/java/view/MainWindow.fxml | 19 ++++ 47 files changed, 348 insertions(+), 114 deletions(-) create mode 100644 src/main/java/DialogBox.java create mode 100644 src/main/java/Launcher.java create mode 100644 src/main/java/MainWindow.java rename src/main/java/{ => command}/AddCommand.java (91%) rename src/main/java/{ => command}/Command.java (89%) rename src/main/java/{ => command}/DeleteCommand.java (92%) rename src/main/java/{ => command}/DoneCommand.java (92%) rename src/main/java/{ => command}/ExitCommand.java (94%) rename src/main/java/{ => command}/FindCommand.java (92%) rename src/main/java/{ => command}/ListCommand.java (94%) create mode 100644 src/main/java/data/duke.txt create mode 100644 src/main/java/duke/DialogBox.class delete mode 100644 src/main/java/duke/DukeException.class create mode 100644 src/main/java/duke/DukeLogic.class create mode 100644 src/main/java/duke/Launcher.class create mode 100644 src/main/java/duke/MainWindow.class delete mode 100644 src/main/java/duke/Parser.class delete mode 100644 src/main/java/duke/Ui.class create mode 100644 src/main/java/duke/exception/DukeException.class rename src/main/java/duke/{ => task}/TaskList.class (91%) create mode 100644 src/main/java/duke/util/Parser.class rename src/main/java/duke/{ => util}/Storage.class (58%) create mode 100644 src/main/java/duke/util/Ui.class rename src/main/java/{ => exception}/DukeException.java (92%) create mode 100644 src/main/java/resources/DaDuke.png create mode 100644 src/main/java/resources/DaUser.png rename src/main/java/{ => task}/Deadline.java (100%) rename src/main/java/{ => task}/Event.java (100%) rename src/main/java/{ => task}/Task.java (100%) rename src/main/java/{ => task}/TaskList.java (98%) rename src/main/java/{ => task}/Todo.java (100%) rename src/main/java/{ => util}/Parser.java (77%) rename src/main/java/{ => util}/Storage.java (94%) rename src/main/java/{ => util}/Ui.java (91%) create mode 100644 src/main/java/view/DialogBox.fxml create mode 100644 src/main/java/view/MainWindow.fxml diff --git a/src/main/java/DialogBox.java b/src/main/java/DialogBox.java new file mode 100644 index 0000000000..327cc58ab8 --- /dev/null +++ b/src/main/java/DialogBox.java @@ -0,0 +1,73 @@ +package duke; + +import java.io.IOException; +import java.util.Collections; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; + +/** + * An example of a custom control using FXML. + * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label + * containing text from the speaker. + */ +public class DialogBox extends HBox { + @FXML + private Label dialog; + @FXML + private ImageView displayPicture; + + private DialogBox(String text, Image img) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml")); + fxmlLoader.setController(this); + fxmlLoader.setRoot(this); + fxmlLoader.load(); + } catch (IOException e) { + e.printStackTrace(); + } + + dialog.setText(text); + displayPicture.setImage(img); + } + + /** + * Flips the dialog box such that the ImageView is on the left and text on the right. + */ + private void flip() { + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + Collections.reverse(tmp); + getChildren().setAll(tmp); + setAlignment(Pos.TOP_LEFT); + } + + /** + * Creates User dialog box. + * + * @param text Text of user to be displayed. + * @param img Image of user to be displayed. + */ + public static DialogBox getUserDialog(String text, Image img) { + return new DialogBox(text, img); + } + + /** + * Creates Duke dialog box. + * + * @param text Text of Duke to be displayed. + * @param img Image of Duke to be displayed. + */ + public static DialogBox getDukeDialog(String text, Image img) { + var db = new DialogBox(text, img); + db.flip(); + return db; + } +} \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index ed7e4c6078..9a55bbca74 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,23 +1,101 @@ package duke; +import duke.exception.DukeException; +import duke.util.Parser; +import duke.util.Ui; +import duke.util.Storage; +import duke.task.TaskList; +import duke.command.Command; + /** * Application class for Duke. */ public class Duke { + private Storage storage; + private TaskList tasks; + private Ui ui; + + /** + * Constructor of Duke class without parameters. + */ + public Duke() { + this("data/duke.txt"); + } + + /** + * Constructor of Duke class. + * + * @param filePath Path to text file where save data is stored. + */ + public Duke(String filePath) { + this.ui = new Ui(); + this.storage = new Storage(filePath); + try { + this.tasks = this.storage.load(); + } catch (DukeException e) { + this.ui.showLoadingError(); + this.tasks = new TaskList(); + } + } + /** * Main method for Duke. * * @param args Arguments entered when main method is executed. */ public static void main(String[] args) { + Duke duke = new Duke("data/duke.txt"); + duke.run(); + } + + /** + * Returns String as response to user input. + * + * @param input Input entered by user. + */ + public String getResponse(String input) { + return this.step(input); + } + + /** + * Run method of Duke. + */ + public void run() { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); + this.ui.showWelcome(); + + boolean isExit = false; + while (!isExit) { + try { + String fullCommand = ui.readCommand(); + Command c = Parser.parse(fullCommand); + c.execute(tasks, ui, storage); + storage.save(tasks); + isExit = c.isExit(); + } catch (DukeException e) { + ui.showError(e.getMessage()); + } + } + } - Main main = new Main("../../../data/duke.txt"); - main.run(); + /** + * Step-wise execution of Duke. + * + * @param input User input. + */ + public String step(String input) { + try { + Command c = Parser.parse(input); + c.execute(tasks, ui, storage); + this.storage.save(tasks); + } catch (DukeException e) { + this.ui.showError(e.getMessage()); + } + return this.ui.getOutput(); } } diff --git a/src/main/java/Launcher.java b/src/main/java/Launcher.java new file mode 100644 index 0000000000..5483e63637 --- /dev/null +++ b/src/main/java/Launcher.java @@ -0,0 +1,12 @@ +package duke; + +import javafx.application.Application; + +/** + * A launcher class to workaround classpath issues. + */ +public class Launcher { + public static void main(String[] args) { + Application.launch(Main.class, args); + } +} \ No newline at end of file diff --git a/src/main/java/Main.java b/src/main/java/Main.java index d99167a517..8ed3a0e35d 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -1,59 +1,32 @@ package duke; -import duke.DukeException; -import duke.Parser; -import duke.Ui; -import duke.Storage; -import duke.TaskList; -import duke.command.Command; -import java.util.Scanner; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; +import java.io.IOException; + +import duke.MainWindow; +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.layout.AnchorPane; +import javafx.stage.Stage; /** - * Main class of Duke. - * Contains run() method. + * A GUI for Duke using FXML. */ -public class Main { - private Storage storage; - private TaskList tasks; - private Ui ui; - - /** - * Constructor of Main class. - * - * @param filePath Path to text file where save data is stored. - */ - public Main(String filePath) { - ui = new Ui(); - storage = new Storage(filePath); - try { - tasks = storage.load(); - } catch (DukeException e) { - ui.showLoadingError(); - tasks = new TaskList(); - } - } +public class Main extends Application { - /** - * Run method of Duke. - */ - public void run() { - this.ui.showWelcome(); + private Duke duke = new Duke(); - boolean isExit = false; - while (!isExit) { - try { - String fullCommand = ui.readCommand(); - Command c = Parser.parse(fullCommand); - c.execute(tasks, ui, storage); - isExit = c.isExit(); - } catch (DukeException e) { - ui.showError(e.getMessage()); - } + @Override + public void start(Stage stage) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml")); + AnchorPane ap = fxmlLoader.load(); + Scene scene = new Scene(ap); + stage.setScene(scene); + fxmlLoader.getController().setDuke(duke); + stage.show(); + } catch (IOException e) { + e.printStackTrace(); } } } \ No newline at end of file diff --git a/src/main/java/MainWindow.java b/src/main/java/MainWindow.java new file mode 100644 index 0000000000..94f610adc5 --- /dev/null +++ b/src/main/java/MainWindow.java @@ -0,0 +1,51 @@ +package duke; + +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.image.Image; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.VBox; +/** + * Controller for MainWindow. Provides the layout for the other controls. + */ +public class MainWindow extends AnchorPane { + @FXML + private ScrollPane scrollPane; + @FXML + private VBox dialogContainer; + @FXML + private TextField userInput; + @FXML + private Button sendButton; + + private Duke duke; + + private Image userImage = new Image(this.getClass().getResourceAsStream("/resources/DaUser.png")); + private Image dukeImage = new Image(this.getClass().getResourceAsStream("/resources/DaDuke.png")); + + @FXML + public void initialize() { + scrollPane.vvalueProperty().bind(dialogContainer.heightProperty()); + } + + public void setDuke(Duke d) { + duke = d; + } + + /** + * Creates two dialog boxes, one echoing user input and the other containing Duke's reply and then appends them to + * the dialog container. Clears the user input after processing. + */ + @FXML + private void handleUserInput() { + String input = userInput.getText(); + String response = duke.getResponse(input); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(input, userImage), + DialogBox.getDukeDialog(response, dukeImage) + ); + userInput.clear(); + } +} \ No newline at end of file diff --git a/src/main/java/AddCommand.java b/src/main/java/command/AddCommand.java similarity index 91% rename from src/main/java/AddCommand.java rename to src/main/java/command/AddCommand.java index 007a56f8f1..91533794a3 100644 --- a/src/main/java/AddCommand.java +++ b/src/main/java/command/AddCommand.java @@ -1,10 +1,10 @@ package duke.command; -import duke.DukeException; -import duke.Parser; -import duke.Ui; -import duke.Storage; -import duke.TaskList; +import duke.exception.DukeException; +import duke.util.Parser; +import duke.util.Ui; +import duke.util.Storage; +import duke.task.TaskList; import duke.task.Task; /** diff --git a/src/main/java/Command.java b/src/main/java/command/Command.java similarity index 89% rename from src/main/java/Command.java rename to src/main/java/command/Command.java index 9a631e0401..8d5aa357c4 100644 --- a/src/main/java/Command.java +++ b/src/main/java/command/Command.java @@ -1,9 +1,9 @@ package duke.command; -import duke.TaskList; -import duke.Ui; -import duke.Storage; -import duke.DukeException; +import duke.task.TaskList; +import duke.util.Ui; +import duke.util.Storage; +import duke.exception.DukeException; /** * Abstract Command class that contains execute() for diff --git a/src/main/java/DeleteCommand.java b/src/main/java/command/DeleteCommand.java similarity index 92% rename from src/main/java/DeleteCommand.java rename to src/main/java/command/DeleteCommand.java index f092f56dbd..8b64cd95e5 100644 --- a/src/main/java/DeleteCommand.java +++ b/src/main/java/command/DeleteCommand.java @@ -1,10 +1,10 @@ package duke.command; -import duke.DukeException; -import duke.Parser; -import duke.Ui; -import duke.Storage; -import duke.TaskList; +import duke.exception.DukeException; +import duke.util.Parser; +import duke.util.Ui; +import duke.util.Storage; +import duke.task.TaskList; import duke.task.Task; /** diff --git a/src/main/java/DoneCommand.java b/src/main/java/command/DoneCommand.java similarity index 92% rename from src/main/java/DoneCommand.java rename to src/main/java/command/DoneCommand.java index 722b9090be..3cfef136f1 100644 --- a/src/main/java/DoneCommand.java +++ b/src/main/java/command/DoneCommand.java @@ -1,10 +1,10 @@ package duke.command; -import duke.DukeException; -import duke.Parser; -import duke.Ui; -import duke.Storage; -import duke.TaskList; +import duke.exception.DukeException; +import duke.util.Parser; +import duke.util.Ui; +import duke.util.Storage; +import duke.task.TaskList; import duke.task.Task; /** diff --git a/src/main/java/ExitCommand.java b/src/main/java/command/ExitCommand.java similarity index 94% rename from src/main/java/ExitCommand.java rename to src/main/java/command/ExitCommand.java index 4bda058632..bf8712bafb 100644 --- a/src/main/java/ExitCommand.java +++ b/src/main/java/command/ExitCommand.java @@ -1,8 +1,8 @@ package duke.command; -import duke.Ui; -import duke.Storage; -import duke.TaskList; +import duke.util.Ui; +import duke.util.Storage; +import duke.task.TaskList; /** * Command containing method for exiting program. diff --git a/src/main/java/FindCommand.java b/src/main/java/command/FindCommand.java similarity index 92% rename from src/main/java/FindCommand.java rename to src/main/java/command/FindCommand.java index b60a6f1b19..de85afba73 100644 --- a/src/main/java/FindCommand.java +++ b/src/main/java/command/FindCommand.java @@ -1,10 +1,10 @@ package duke.command; -import duke.DukeException; -import duke.Parser; -import duke.Ui; -import duke.Storage; -import duke.TaskList; +import duke.exception.DukeException; +import duke.util.Parser; +import duke.util.Ui; +import duke.util.Storage; +import duke.task.TaskList; import duke.task.Task; /** diff --git a/src/main/java/ListCommand.java b/src/main/java/command/ListCommand.java similarity index 94% rename from src/main/java/ListCommand.java rename to src/main/java/command/ListCommand.java index 020fd4e81e..a5a500f038 100644 --- a/src/main/java/ListCommand.java +++ b/src/main/java/command/ListCommand.java @@ -1,8 +1,8 @@ package duke.command; -import duke.Ui; -import duke.Storage; -import duke.TaskList; +import duke.util.Ui; +import duke.util.Storage; +import duke.task.TaskList; /** * Command containing method for listing Tasks in TaskList. diff --git a/src/main/java/data/duke.txt b/src/main/java/data/duke.txt new file mode 100644 index 0000000000000000000000000000000000000000..026c0d8e3cdb2221fa23e836110bf4284e572eff GIT binary patch literal 91 zcmZ4UmVvdnh(Rc&G&@zVB(XSKF9b;VWEPh!yBjfW$?|zMObiSaMGV4OiDij;r6rj; odX7a!iIpG~6^)l;R-9~xq?1J1=~mD2%>lOLtGYdGDo$o7M^Cx=c8yd~|G@ z_!?U(+_s4fc1-Llvxj{R{VKX8J!^Gi5HoQb@921D;v0NxVhne5d}rc& zJU8(JY#mt>IplQ+6Nf11cws`~NXM}W2SpPuJXPry1r&#I6CbE^4Yl+XyTPjj)>F!) zp*JMeRN|}XrUs!7m*}Kpm)Ue(RC!C3LuoZkyrpPUwJvf+VC`(Fmb_61UF?L_FN+{q z>vcy7KF}O!BYPxrLD*qBaa*1juz4KThINS5FTlwn&E*PC7u9BFZH5=BjohA0DsL!@D}M!hk@P1x`VO0nb%>EwOkYM89^Cp_ml z4$rBE+1ki*6i(Feq-8mvXm{)Rn?b4l&2tSeN)jO}76^ zI}jH9iZ9Eq`{G3SW$N1B96uzhF>j>Ai>IYcwXXZ4{W%YyKVBJj_w zO^@lLnT^fo>6KK51-rPCnh_Mt45Q0}TNEy37;03d1vj;eabCj1y!a#haSp*+^R0u= z(QudJcxA7hNDdcwCy4kF?fe0W_&KyUh#d5_^|e=V?HnEJv+*i)WumiHbng9x=sFi& z@n2z1SJBO9&rB89UoliWgH7`9B!YJtYz|$tBitQBKM4#m;V4s1;60)y@IFy-+64~y z1H`xs9wYKMKep)@)G?{^tER(HWO)hH$v)v*gxEXe)cYDY($lZer`FTIp+ADX_%FCw z#lR~`x3gNRWZ|7*<>s~;Bu^NNoYG_dE25iF>N_ka79AX=-3?z@maUP4car7V=k17 z8>Y8vY}l0ajAkAgJBDr>&L;QtEN3$<434b?Mt(bMltMijpAn;ISdN6=(R+&Cfr_^< zE}BsZ>LF*hEfr@mBH{RSBz9@bS1VOYXIsABHs%~D{wj((lcb1!EqJ{QoP zp-vs)^ePkzbro-8RK+`(l;CSQ{%N(pR|BP@X*q43ANz_{3AJ(>#dZI>rVBM84z;3I z)23;a)0K+A*0uFqZX(B}^&CgJiX!8_iX0wD=(y&(fggBADQgB>ZozL)z-YmSiaaJ| z6jYdkuZP0jO>D^^QID`K!&Xs*qryc=#TW2Y_}Eer2<TM|Vv-?-p5U zt=yw9>lTZK!!WuT#$njCLqU(j#D|A-$?$xWK{S`dKtifvv4{HHK%nY1bRNy_MsoUQ z?wa{>K(vdajaaNd;YVgKZ;J4o`^F9t`Whk#g@onL?OLRn_X5wf!ZVvSeLuW@l7f?3 zdXijNEC;1>AY)gQQANV=At{!#f-gF$(o3#z! zH<^_mkMdN*h${95IkHWEI5JGX&i@ffo#EG~#W8BMQMsMcCj>i5Z^rl}#lr1IkR<3J!B3%`5uBv&Bca9+*M~95%XON5Pf)81 zu@^Lr$>@-A4w4MDlji54*L>8&@PYQ{=vWKm%8XZW{4lt-Fa(`JUf{DjNwW)KD;OE1 zM{qZUWX7*qFwIJ5dRq~Mous` delta 489 zcmYLF%Ps>^82(P@+A&o|TZ-1T=*5hC*&70`5yN<}%{*5oN zXHD1${gn$^Vi3g6gi`-N=Xjp_`8(lb(ZGe(kP4aBRLYL38Z?n zs$pLAvCKD=G|Tf#7Gcgu5J!~wV(ozF YqYq0|U=aKQRb^1}=66ZgvJ9Mg}&U%)HDJJ4Oak4WF#UvPAuy#JqI<;F6-u zymV{LFh&Lz=lqmZMh1SL%)C^;(%hufqL9R-9H0nSaDHh~a;jS4(#gQPIp diff --git a/src/main/java/duke/DukeLogic.class b/src/main/java/duke/DukeLogic.class new file mode 100644 index 0000000000000000000000000000000000000000..2f7b350da5e7a87b4241e0d0663c9fb3b222b5b8 GIT binary patch literal 2159 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 F{{RtQAp8IT literal 0 HcmV?d00001 diff --git a/src/main/java/duke/Parser.class b/src/main/java/duke/Parser.class deleted file mode 100644 index f8239ddc8d0f6a2f869ed9e486db323842e0c954..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4310 zcmbVQTX+;_8Ga{wn8{>F!a@Q83In8&goLGONihKmB}5`gpeAh$ZMBo#AsMne6J}=v z!CGohw$h_Vz}Bi&V-G5Ynowe)o~qV9kB_%{=Z%-%a)ILe&ulikWJTLN&(8ec|9{8# z`~L46`0(GCE(5p|AF1esDdVt;GMEZRWQ?kaz!bEl;E0Sd73Jb6B_pju6H8l$qoPVI z$7LK<5fe*SK}LZmBdcN=%yR6+giv!#JdVqlRB%GYAik(#6&{xHB?XVD&~Z|5J}TqO zD(Z#dK|H47aXg{mNd-^E=;v3(<|*-bRy>|l@VtT-WW1YAkCuRIVLiLzAdCYN>1I`{N zoi^;Gge5&kj0q#2^{iBUpOG2uHO4z6l=oXBw&7)6Q^Jmg9NUAflwps=`#smPM>=|v z*)cPo2-L=N>N|E)*P^81nO%;XHayRCC9DdBJ@dF1@3+$9DYG-rK=vi|MkZsrp5@q? zPAg*!r%bvj9g+~;ZrPT%Q$nbr@jeORJx-GDRrOf5*_TZZo9=*Mrt=Bcq((*}p{Aj6 zq5HIQSE>Dv6;@>2a5J>l)UXhY#?ojIi+;~YjL|dSRT-~IQ1>2BnB#u9blq3l>DW|U zQ%Z5Sj2}v<2-wV&>4|uKYQV^hNvJO+6nNv2AuhN&Wc+AOs>>2Zu%V=sUl@fsmY{4; zq;g46`<<+tFuN=PdBs5ihPzpaXy`?sgvAT$iisPZB=hp3QrUal@^a;(;m4R_VpCSe zyOFJjd-2ZtZnl$JKBSugiE_!+G$6Z7#BBCuq$~c=}=g?uwVNY3hmKl5du< z<$nwKfES2V-|aYF#&eDFUeg4B$Ps zn|W*skY875v^$T4=wvxKXduX$Z=f?*CIa=#tn;|RN~xN6U~f=6OSN?Cr+!bvF zoth!vzp!HwE??H41EL=@2zn=BTVZPmly($|=XP>U)^8TMEyk5_Y|pUl%zkt7hITe5 z#-a<2m^4$=f#yyZ+Tk_KjHfILY%KIEH-j2W1{O)A{(C>=9EqAovqma2*RlKlu?Q#Tl8VX`udOXp@&aqlhN+KaQs$#!cAU;-fXx$O|+vueIp_M|v+ zCDig}S+1GP_XrLvFUtc4b4bQ-#TESnN6fsSWluPq`avuKAYDenbKFT89}z~s1Dg1xXHN>o)&#U3M- z>bE?TgYi!Ua6x>fe3P*H=6qPoFR)I2-G%s3$&tWT_GwaO*hiZE2dG{y+B5eQo^fXK zd4SX{e6#Z*(li6c>focTnG{XMwiCL5l%^(pekokMXEZW7SAF^YDqvXEuw0QsM=X9Bj<9T^IYD)Ca7Gmq<^bW z%OL8p8m(A^UHk;@BNz{09gbi0(7W4EgWKuV zRy3du?fiD`lSz{Dsgq+QoN$1)cO#pRNrHx|(#2Pe&tdk($UGl*y^3M?f8aTlpJriEZ}Tg6fP5lxDGI zsAUGXook7;vZ~vobuGFlSEf+aUhdb*oq^o8p*p!vnZc(h+WzrG zJ947i&-n^>2!-_YJ$!^eGa*+cSyK59F3llcVIae#d8ohyqdA5bF^Mxcf!FXbKU^Qd zJ2*+{$0+|KH9U^L;0gQtZ8nEvTnPE3K?Ixii-c6vFH*!#5xR`?M4PH(pAwE zt0kV{)}BrCElvEx9(b8o>J_%N;e3bg^BWZ}Uu@?z?m7!OJcV%R0@h!|t_!G}#qOcl z-80y80e6W09Y9*?3)P~U|9Mc0{yF>|z)c7PgGd>; zfOMRJX&o5@VWf0?Xdr?aHC$7}^*A(4tG$oa@`jq-?8GOyrNFZWvbe35pQ_zEQQTGG zdr{oiF{dM^A#&UCoZyazbIH_W4dI+D*&4d@j%P2|%3F4IO>DW0M7CwMECLPV$@~kk zCo-<^o@WX{)$yKZQ)fd&I9|#2i0CQ=qPV*xDlMw63PHgm+pkE^C-p!(Mrw&wZBfd} za#?sK4gJZsSz`W<{C>lBi?U3rPPKYit;(u~9yQNPQKG_D$SBBKwP?>f%8|bAOe-fQ zhH%luWegKDCuQIVRZ&^8gB@A&yCZlI#X}SGYWu=z=X15~ZJW7z8ymI2aWjRY@I1S! zSQ92b!-9!Lj7IUfi7${hv80kMV^qhAiB)`Q;(ZM3cx0lW0BcxRP}(0~uw7Rsti`Kk z>p^YTHa2!dV3FNgv`W(A`>^(9?XC$62@RM2eEFNTva(u8BofxLv;yJp`j#*D?9w#7 zmPn9Ucj)lQ!phbQyBHYQz*ic6viN)U4nISCcLofW#jc%`UQq-aPO!t79|$k->0n3r z%k~d!CpPL64N;E^)ur50i7m}w%ZW%z>8j`b_5=3=_UO5M(VMS zP1SqfXc#+sagMhq`8u0Yo7I{Z#Xwf~bv$Dg@>1^BDjLj1)rmP*_`b~&zC2!(7Duzq z7x;y_wm;ScX3rGrc;p0dZNFk4-)u_CK0U_J?6MPAM2jLPT({r^c2>uC8m^r2*G`*; z%m05430`o6yfc9)uSR~_9N*(=m`{z*j`RVvSDf&h;TUNIqnzr0e|FP2O~G$AiQ~ij-@wE|nwH5H&*WKo7@W{^NAf$1MFwV*pe1H$#UX@Pvub-{{p5 z))Bcx4ZI0jN|IEfESRrxUb*P5qvy!9Qm=H!$f98cqb<}mqLjP1()}8}2Z-kh?p&HY z?LSFuiVD+2j=in%D0x+l^>n{eyeLK|Ko%pOn()(GSf;;!S*TiC+e+KD8n_ qwV)(3KX3AOMq@4kuoy`F)(GSf;;!QkI&MyO2pIVWe OT2PXipEuctu@V48LL7(y delta 51 wcmX@dyp?&vLU~OMpOn()(GSf;;!XVUonHp5KD8n_ rwV)(3KX39IMtwaYOfwi6c))^CLl_wZ;oQkqOuAeGaPHwMR`pPpOn(-NifMqMn6@PfBTas(wjgakhR4knqVYF0qD)m6l}Y=!a$^@g{ya#4iI@pIVWe rT2PXipEr3sV}hO#rWuS3JYYenA&d-yaPDL?CS5K8ICpaflPU`U<;ya> delta 98 zcmdnR+sixQqP(VtPfBTas(wgfakfupafvmA8=47WO#FX{RS2YD@&(2Od0rHyj125x YerP5m0}ohD9Fs09H;A=)Dw8S;0NhC-d;kCd diff --git a/src/main/java/duke/command/ExitCommand.class b/src/main/java/duke/command/ExitCommand.class index c974318209d3c25c148193a99f47032666c02e62..667e8cc4ba2a6075d99fdbf65367c1cec3f46ce8 100644 GIT binary patch delta 72 zcmdnadYW~@YCQ`LpOn()(GSf;;!Qktj*ADZ9wfJU IE~6A90Nm3W^8f$< delta 52 xcmX@jx}9~xYI#i!pOn()(GSf;;!XVD&m{y`KY23a p3VsXe}MTX697b6ExZ5# delta 84 zcmaFJyOVdq19?pipOn(<{=9fbe@ diff --git a/src/main/java/duke/command/ListCommand.class b/src/main/java/duke/command/ListCommand.class index cee7c16ab21fab94e34943bccfb0834268460a25..da52629dc3c015f928ea7f06df47993c1f1f032b 100644 GIT binary patch delta 87 zcmdnbd4qGpCOr!cpOn()(GSf;;!V7GiAxBse)0;& QSzJ6|E=cKSccuy^0I!%JsQ>@~ delta 62 zcmcb?xu0{wCV5Q_pOn(b^1}=66ZgvJ9Mg}&U%)HDJJ4Oak4WF#UvPAuy#JqI<;F6-u zymV{LFh&Lz=lqmZMh1SL%)C^;(%hufqL9R-9H0nSaDHh~a;jS?HxnywN@;fLW>F>$763K?1pEL1 diff --git a/src/main/java/duke/util/Parser.class b/src/main/java/duke/util/Parser.class new file mode 100644 index 0000000000000000000000000000000000000000..07e10e17a103d2887475180f1d829269f11fd47c GIT binary patch literal 4445 zcmbVQTX+;_8Ga{wn8{>F!a@Rp022t1goLG$rZnM95{cx1CM^ln>STA4EZLn&cV{7K zYo*$jT5LHxR*jab6f^;1p`NPNs*ksN=Y_rWmJ1Z$e`d4UB@rK*=h>P6`{z5p z-{Jq^ga2H;2H-yYSw$O$WDKh)z>tCw88H(Ef>9Z96@}tcLWZS66H8mhn2Hjy zd_+c4MMx}D3LFJ#8OKyC!%!i1;kZyUE*=vy9#!y|ihew~g-d`;}WEYy5m#a_H3 z<5dOUka0%EHk?&(PR2J?w20-mWPDr3cT~KF@2V7dUB(*<-V|adWPDFT>8Lqz+)hUO z?0t43VOUWKOFEAl$Bb~=iN(YFjnqh&G1elXus1er8BRKBO4u=}}suak^f z!!4cB^r#t*cxuBL^({N8Yf;p2%yv7OFdWBBN~rXN9dq0X_r?-qakDkcK=vioMk-|{ zotSN9B<0_LvoOc1rNo)IKP|zt4`+y^_wDWp<|%gJ!Z%Fw^-+(xgU4 zBB89NcE0FF|b^kCTQ$8kJDJkdWt%Lx!;6YLPKHE7cwoMX+H(DYr0k zb1XsG9*Jj?p!VA7WW;Qb3CN2M3NVtJg@}f3^hj7dudbN5!3i=i&nuO-@tBh-7Y#qe zkC@naEalwJ*2%qW(fXqw~NI~ z*fjNs*Y2AoZ2A8JF7!DfrF(7LNjXVltjlyp>}aYah@UH%(lCud4VQ66!&S^^_yw*= zfP|)88+{|D9yL>uWX$ay-5$~nU8GZw7?x!_`k<+si7{t_&K0}hdiC!n+!r34(C{v< zY4{WlXm|kEXR&d|l3UF=@UP9a+>wPt47Lm=v=W-L(weCn0sVU{`>?^nDVh7;=9SWt z4(pf^k41IinjW*p(hl{ko6Av$6*b3u(oWCNUOR0?Q#me`y4u{a?e(6FUuyUjey!m% z=#{X-)w1A_6|O|XU0vY`{^|SoClWjv=8X0X9%Zicw!9h7*?eUFtRuXxtm}%HFlYNKeZP=6!NpiGjaU_z<5ArbK4>g-jcam*%#+wEuoy97)zSb>`dV?=cM_8 z!5o(HzG&$WcsR`o#;jvD?+acm9w6;T#IcjSOMOT*I&FJ2>F9uq-p_nlY*GOst?sN&tNjaNe-Z=^g-IQsUJDnJKm&MTmFxfti%Q}~UiEuRNTt>T-L5`nsDNbhhV z;nREu-OXiW=47B6!8!%MyZh)23I?X(J5U$$&mh2Ma0>FFx{xx1LQ<+n70o~+waBB2 zXHY__)T0*9AVg}3M=i~x%JQi487w2`a+mW$*1tNaTvyV+RVc@5UX<6Mk$30a1fm;j z@etPGD0j!PJ_AG_Z|x7@!AvZt2$YW++ApG_ZVD^TqS#xld=Hfu>O!lgu-ezy$-PbP z*D`M~@bzH>CScZ}v? zI%hDNK}Hi{G*Lz~%xFwTGsI{{K3+5r<8xka3S!I*3sBmY$qn<+Rabu%b)rjHG4K!tw_4d;m*|3q8)&@|G{cXi$robe0(o0>s z+%M=-(q%3k3^WDG0&h_!qm~{475v@H-&jLvv&-gHXIP*#gDnFM)41nCL#UBe-5jh4 z`ndQ+vwV?ugMP7|!oAJPBubhK-CDWNliM~>Ay+8VxSyiUcPHAC5#4^lRk%YaZ059J z%eZR}n0N6Z{=($kkYq{ay8`E>dhFx{_@D0kBdJQfrL|JMOM4AAh~{r!f{GX z;4~h?Sv-z6@dTw$@H+Y=wLeAuCu!kn{1wmO?|2p;;W_*Zr*H$$vszEn>I;&F7o~E% zB(25EwDO9y8LzswLeotY$@u&Y z6x{`5A^f=-g`S;x?PRc`y|KNKX%~qvstc7fGycZTO>@Ih{Qm;*I-Bzi4#-G$)_1!j zk8K>hAp0lb_g%ue%h+=X6*Jg75ZX75)=StbP67|`VpnJxN(p>9;TCfsfC6nd fPii)nU^DRtzE!&RJNyy9C)2Z}#X0j8{+|0UC4y!m literal 0 HcmV?d00001 diff --git a/src/main/java/duke/Storage.class b/src/main/java/duke/util/Storage.class similarity index 58% rename from src/main/java/duke/Storage.class rename to src/main/java/duke/util/Storage.class index 60ddbe3a2ca988dd5dc3168f2aed30ab520d358b..78d564f96386317f9663b544a937c171a6e79a7f 100644 GIT binary patch delta 91 zcmX@k`IK|QH6C#dpOn(a08<*5-Jo GHYNa(niL)Y diff --git a/src/main/java/duke/util/Ui.class b/src/main/java/duke/util/Ui.class new file mode 100644 index 0000000000000000000000000000000000000000..c4b4ba472a43c849d105c4ae53081d2871a5b2fe GIT binary patch literal 2028 zcmbtV+g2M@82*MrCK-kT;ZQ2JPAE{$Y0(~RY7eBPpy6NxMOw9Pk_}8rW@lw4C~JA= zOVlUu)^;f@=~_O3kKv6^;o;kvNWieXX|nRq-v9ag50l^iI{X#D4QyKI!=#0Cn2M7z zZQ^|k&6qUtfrSXJX>whY8*vzz*0K-v^_D)RwB79($wx8V!CedYa9^Khv`RXP2U_7_ z6tgBCnV2&W*{E!8%CdoY=7rc5$%62IJRAKUmui+lfD z%$Zu5JF9|9;1-hEobWtZ)?No~WUydk5yMd|*;vM>HXiF>Sq$5F4~~uVc*n$wja57` zv1a2lZMBZ4+Wr|UKPL+Xm2l=S7o7){9cis?i@;$BXWq#xhYfP}ROPOXOBgiJ|NF~d zoTa7ZY$B0x7L^kSf5&%xu`Baa2JAc?B&$iTy2M%sv$XL-<^l_!;|l}dIs80-i;rcz zy$75tiXE9&UQPsSZm`Xh9|$k-*|%-sFUoH?AROPP2BID>dUh$&fgQu*Ac|5+>iL*B zZO|GX_#tQtyz%^RC&(?!ACMm z?Nmx^{k)#ZbV2yOWC>p$FG|fvIPh~^s)FNKP2s>C(k*N7jWE5op{g^9Xd7%GWY zTtNpB7#KO~%_Zil+hC5xyZ6yk&(ErYxT*gdsW5s3Z-9IaFQOqe=-*=#?o)s4v;e)Q l7(8NtIU*RR%O*@f@M+P(bL8+9Yn|l%EG1XSyIQ3;{{iyh%A)`P literal 0 HcmV?d00001 diff --git a/src/main/java/DukeException.java b/src/main/java/exception/DukeException.java similarity index 92% rename from src/main/java/DukeException.java rename to src/main/java/exception/DukeException.java index 347503193f..daa62a2058 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/exception/DukeException.java @@ -1,4 +1,4 @@ -package duke; +package duke.exception; /** * Exception class for Duke. diff --git a/src/main/java/resources/DaDuke.png b/src/main/java/resources/DaDuke.png new file mode 100644 index 0000000000000000000000000000000000000000..d893658717e29b50b4ceedada235d9f75835a118 GIT binary patch literal 32657 zcmV)5K*_&}P)Zf>Tg`t%N;{PE9Y2%-o7`CdniQG#9szpJX+ zcrVK`zK7pG^!n{1T{qo3os(XNkTqW0IXIfGihv^wpO4cHg6YjrzS7VYZJZVWev% z!fK9RcD(ntf zCxMCmC7oRZecuOe6J~p&f5@?I;U2zE;O2T?Vy_8UZ1S4i=b>l%q0jeYAI+i(>K zsIun-!&|SPodfa+5u7Z5yhtd`XRjxuF+Ww~1H4xg)(?GXYLo{q2VPiixh(3*`0iyFHj`V{p-_+Q4jWKC=o6ohr zW)q;Nb7IxtY}qD4RyBpAMv`rR!YytU)sgEIa8F)wX(O<=RwjYY+sLdy0`5o0>=a zd(GePvuhIc}2|`2Y7OgN%4u~XV>q*3e$65qJ;}bK0Li-Wh%~iQn_FhV_*O6|& z$E%S!>BN;~l+|jbw5B2<783HDuPYE-T1Z)&EZTFhZGIj)nseO*|7}7`Vz4%vMl&l& z!c*D(>n3|ulhD`D1FzG)Tik79GgrpJ#HE0O)y{gM#c%L1=xtu`A<9oj(;}Q6cpHb= zIjOSNTO3vD|G|N_tH+^nj?I`D4+@;j;9`s4!*lY>X2_|khHWO LGkWs%c&z?S( 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 z z$~Fy&@3nBTb(>mup6iT8r4^7oYZjeuy=Tb`MlEJ0J28V!`yW$N#jo-DmsvUcBi?3F z$b9q#Ounu+bsux2uhlM{ipYA9GZ_#LI-I+AHtFHRHQMOI)SdDdo{UbJ#SR0q0q!-! z#&_2?2%Gb=2BIs~#Gz%J?Pl6U32aVUF z{#uX6F6=PCk7CDD8)^)@jQ#x#h6JH3LMWZ(2&le6=1C+fIkcbI| zRxKr>R8zy#=+((ysvaQKF4{V;eQWxDb)MEtylHgCzPxgVW%3+SlbGdZ3N77KHz}uq zmNhTq_$5)<~E@ z1>XT#cbGejI~z|f+0?O6f%-6L9GEUp`JfTPGc|U}W(I57Y~69?4>)%=MoK$OiYaLFSJ(GMf)h=7DYoL*s2C~)Q+VcuE{#nV*4wPBFRIQP`{cl>2 zFOl`<$paDW#rEV|U1b&E1hgBi%^eQge-lTYS%)RCxwNah3+ znHvMaYhk)QDm=@Q&0v)k>i<~NnZhCIrlp%|CW}-syuE+@{4}bpj5Z*(X1?~v(m>NW zbA6VDW>u(Czv((Nd7WV4&`#)rH?YXyq;J#yBXCnWY6a&xpQB2#qK%CPFUH}|hfLDH zG1%nF0zP#v4W9GpG}H@8Vp?VtBW(hIs~4ihZokbNk5Z6|n_{It2m~O#UReCaW$?KK zaYs}%4-uzm1sQa-9->fqwuix2`={T2N59^GOpkVkF)HGdtJKWJ?ieeh$s)Fu3K4>j zs0=hJjCK2U_^9t+hvUv!M5&bw-agAJYlX8^h~UJ}bBQa&!sP{fqLjyz&6G~>Qq3Dd z(mHZjaoj1IcxOJ7_i8rfu{`-5hmDV1W^87tBdM4w`KeG}in|IMU}jZmq$|X3vRL zY1fjgzN$o%R6NlXk!8UtAZR}pDBTdQ5}+&YlHM5fXckQ1(a8z@+wZ=o)4Qkis|UNZ zw$_)3k93T$jZNdrVG)JExY@B-YywRS=*T#GUS?OL7r((ah9Z_E8pR?q$_%jeT3S=c zBn|j&gaEY=49$zF;%HB0CQF3DDrU1cwCd8(lgdP3Yk5 z0dES>WGQ(8Q(c=}5B|fH7LA~df`0_R3c`d_gL4k}f~zd4(v6Z3A4Py=@I_i3;rGN$ zWemW~^R|o}Nm~A=^D%WhXpim$A8txNynM+MNdNNLGx@%ANz&#@>6mGHg<%wK&5|}K zsW4cuhD$^5G?l}5XD-D0E1fVuhAg*KD~a2r^CxIZO75#@o`C`APD2& z%%fSN*O$?@76FOZ?1E-&G3JH)%c8@8DttGX!|4PZP%}0?{r(!)F^z+u|JTWTI{J_A z=<$R5^vQ6@l^2L|neI^(E`9)B>2kL ztf632nc`EK{vcaeWRYZ~Qei9VUXv(PQJ9hqv{VsMt+{F$OZ=(T+mAi$`71JWQ~Ks( zkMi$+^JQ=@=k)Wt1A6`PElqe(W0x*YU-9`hN@2-EU)Cr@e%sr(sJF3Bb3h9ibz2JZ z4fZ^=zZY4PrXxp(n1dX&A-qPb0;);1C(RIK2(D-Bxo3zOxO+XL;<&G zv(RF=LhF-!Fw+eolnwsb+Iol04!EVxCKvR(@4u(FKfb01ySp^p90XHbY2&Dqjv&ql z%A!>|;#Mq=7^RrFjny5}qUK}eqX|?kSftv^!b5JBEi{tMMW~#bCl*3Ag$!5uoSPiYj=X+ZEJHjbyQq%Xf_e-OUC#JQpNuc){lRh2a0{A_ z=U_|>n_p5Vm?)I+HbVd~+}Y+z$Z-&^(~~pSPD0QY7GQSC`-9~5Xfh3gjJmHTJMI!W zHhB?2NnL7zAK-|JhiQg|3O?P@`B`}FgwF2XrF+A>JX0CtPh?nuP&)dBk5Lv+tKi76 zQmZ5gz0a&{*z-8L+968CN&!tTw~UG9b#*B_;YF^E3}TjZE&r*ae^i?#J66qH=4&C4 zs*IW&b}5ZyK9>1$S^d7(MSiJ(rN7&Au5-#i_9&{^{M(l=FM`=axeKZqLuB}{)R z8f>l6qepv;TlIRK;M>S7Wf|cYOdL@4qr)IjS3%Rw==Au6+uu30(v$_boWktj)Jw*+ zkjj}eJRu|0fTlxZAOOH3VP+sIBW6M1=0RW;AQIe3TfiDzY1!bNwklRBR|Zdkw2+>M z&w{trLP9)zA8?qm@I=<&+9mc%iiW?P8a1!N615mperGjQkcR2%?4vxWRADJtLk5$K zQf=mVSK*gdoan@h`J-h)N=+dt9HRANsZemGtJT~FVwY`Wktp*s?@0X?F;@P)gO_*fB4-`eQZ=0&_9r2oaIzf^n`(Fp@Kcc8g~%XF<3&sUI{XSo;8~VjtEw zdK^JcrdKS?1Wu?KqSH3#BJukSshw~h?GUkIAktNc7AtO$C|IaoAN)-7Z~@#NY>^L- z3-Bz+cdktr8PzPz@0L=NK3ULW zTG7SmG-#lo!X~ea`o$HAND#nZv&mFLjSvB1Vkj?K-qFRC4Z!q-t=nDpLdIjv-V=l$ z4lbaI*%i!PB@tiv!QghDj!AzcA1d|LCI^mQMPEz4W&Tbq-P^-MuBq>#wTvsBvl!k(0JyLvlSHtXGnv&Rvy`O_+E8n+-nI#3Otpyj zqoam%?YhzV6&w*3RHt2*HJxcYJEF<+H69le&#sOD`Bt?UKiAsh4Ey?pBh`9o+UWmA z;N(Ipzxtbpv=&U<`=eue`^M4u;*vEKoLfYEZ65w}tQ(OB?a&H8MG$~q&~P1E12H>r zFH|`MlZX@#mx&M<`7mQ<&Wqi^7!WLSCC)Ui<5nrHTbE!M4nlb9PMB2&1Rsd(W>;4% zyj5_{#~~PKwY$6*SHawJF(D7AtZ3n<+zJI|Ka}pagZ~E%4eyJtor7SmcY@aH1b;1a zQtjaM|C}!Z$zhts%aR2WP}Ff$ssmcIaYNZ%cvDg-3; zM9XAstD7r%MiGx#Pk)q%eI!XDzVC_WdHOql9`sU{Z8{gA+-T3amwmW^_eI`X9O<$A=SopZpLEJ=ffIco@nZshRF{z${o&yw328!>6 z{2g=Xr_z!E2n6r*+KSnn$zpSknr?(3ma!_%`QzM>v4 z`MBX2Ai-<_WI0TJy;Q`c2LM4Nxm;Fyy}pcxW9j$W5{?6@R;yB}lw}Ob6ov*A=`?OW z?cqBkNku&gheH_-2NK|%L5dO)LlaQi#nNu?Nx$EfLb0qMEacJvQ(A^N-`xcrz^WS zMjnzZo5@KA(lC<(=mGEmXr$y16EkgLVu0oA<(vQbcj5$;N_gK&F$1odJD1tX*RSB3 zsfsZvkci1d&V9&{z2mswGXDGL<4#AnpGnOE;;`R8?#F%+I}!a*f2jZ<$E;Ar#Jpyx zsv^`g?vVYtr7{mR#0X^)rT=+VsQqG%LmlzNBfx0g;SsW zC*Jqo?Z2No?1LXSux7zDOTcBHL7+mD{EF}4-m;Jsi;X(Sx5(!1uBxhI$B#=Kjil4w zg(M5WfkL@{{hF-ZT$4s)P8I>MUT;W3DYw)EUN_?TFCj=(zg zq1KP;*dU zxg0>5g_`ogk+PC5S3%%MvbWpBnTPtGs-#>-QX_y9lFNrAi@>`$x_JQFlYwN@KHlpq z@KShxuiXTQJiHE??q>k_EM5b*(;G<)AXM5Ki&gJS7fdkun-*k3pz)`Yf8VNp&rvaB zd749-ar>C&4%L&(Z(o<4on5HJqKt;2 zZ0~GKy#_;spo-5Jep)S+r3cW5kcLqd z8nqZY67Q*M=YN40*u~@-E7FpCj)D3?j2WQs#k%kuC!0~3AA!!eB{7$hq3ELd>=ph`*jGFgDM(~`k2I=T5Rc5N-aZ59XdcIh}B0m0>|3f-B!s`E!SWXMlu9}?|{f>K;9Do zaukj9xFPryL6&&rO}>J205wT|l+Wc27-(5Sy{7TqAnz$5FF=JRr5MIVMk?jHazGEj z^l>a+6Mbp}5VRpAFVEw{(kuY*Y4Ei;fdLUwq8rtyPS=T5`SD1s{RUjJ?|gTAj6;Dn zJy2pr;Z(ottM}>0y5&2Gv5$2h?BEu-7f<~RMB}lbgAOWOO zCY@Cvbvj)cb;dddL15JXIE1wd^*tI7WDnrW=P5NSxYn#0d-asrsDe6ReWeK>mk;qU zu64KHy9yL3_V`EXSi1v5)|i2mvi13_h(h4tS+pk=1KgAqo1jytp8H;8RTy z=J9x}k|+ylk;~*&0u_spP*9=il&_N=LpsG{syKiKk}be@LP(iB&QrkTRq_BtH^lF_ z7I3#zDv#e2fMXBp)Kf<(`BemPX-Fp-sWX(CS`C4I8|Q>-1z7!fBpDBqanP3`BrDZi zo<>BPo_}AZ6a8c~BzjQabmkTcIhB5cVHek!=soxzjtiCCh3ag^d*FO^so+VAmXQN> z6pJ^tpg-i;-|hSy^!wd>?=FFLkd>I+Kd`KShcb$mQbtYmMAZ&o1lSTtE}wi0>a`C}RskPN z=R(P5QtB^*q68=biNFBOi$K`vCUX!#QlUJUWlH_qrz!zZO)a!*jg_e!=w-8cw z3^iN;sgK4`aaKCfS}Xw2UIB1}SW}SJ>L$!I0Pt~rsxI;Qo#qbirwx@@1h5L=^O34z zT8%tj?9YtPwc+unV6av8uV9Nv05xC?;C)t5i~KRZWi1q z4avnt6M_d0{j^c@%ER#!T#7&&0YCxHSA#SPAdTAKb-e+OHNZju`6qW=IeJX?+Fg}) z;t%!napYO|gs0$gUWq9&`Dh;ZtqKqO()4w2#^k)OYqbtR4oGZbeq66KoiVThCWGE= za+VAv5iP~-jdj`E-4TX*O9hhj1@&FgddlH5yv7uOlcxHFYU#C_kT{S6089c&RiQfo zR6hrhP_odsl_#+VAo&_ecNlT9Vg(k#p-+68_d5ot`FUES3M_Ci3>aPyt+fgHgN0DQ zX9fT<4Fjr1f{#A3(IAvIfX~<@LqG)d03hiCl&M@+3Z=XrcVm5BKTisf%~CIiYE*PO zeaYmD02LR>K+@3JFkp2~eCG_e9(+FR`V{B6_-Q^Sv_>YL_rv0WAM}hL6qLMYRj5nM zhKn@sVJeBD2Y$-*$jZ`Lp656 zU9yF&f+3$vW5QFK@fHix3I)v{+72f&pJLzB>`kJP|B#sy)CZP@&5=K-7^fh_l zS9Clwc-)c8Z@(q!EL{#cCABfs#IQHe)f$7BcwO)t`i^kKTD>NQp<{RUK+ynsLo zG(5xKQ?MlY4E(@^Trg3Yls^e2X#m-}DGZ-6lSPRYY5dMt%PdJ{Cifjf0uprUlY-t23ikW)IdQt-Wlv04WCP44y_nrFrknE=kevRg*S2)}^;D z%i6}4oH>0~YK?hF(O4Hiq+{tRS54HTAE-ibZcXK4lbE;pMY*7c$y@^E;XrXeXXkfT zf;`d+Y!>832#>q#hQZ_dS3l z#@)~;!F85O73FblNGhuQ`T3$`0W>;mTYGzQ<;pv961=WfpVP&`6r#j4nX8En2gxK$ z!hmjeT5e4yyt5QKNMha2Av^o}hX&R?iAgcJNwIH6G{K6CnI7!Z*F>Mqwo>^ZRg%rk zby-`zp}ri3MY8FvCgU-;st+)An?0$5ALTJYi!jq0_zcN4ou!$q360R(PK;1$1+)YM zT7($|4*f=yQn4ky1fOpgh)Psie9B*-paW-ane-L?Y+@4nq9oFA6V>UMi-U>E8Bc-0 zV=%NtQs0L)OHXd?5p0Nx)4eG*r!eFRu-3JxmJdB%2+T3>ZMnZ_(pq?A_W2Teaa242>^RD*RBSHH6IA3 z#2N1PI{8ZM#WtZOvQ9~y4-?{_n-Jq;JKqnl_{`fl4k|!LZt=^icZNs ztfie+8{{;UG6s;6foa4yZd_M#pQUFV6F65a$;qWfS*nAdq6+T#4mP0+Tx@qjnQkP)l-!oUE;_$u79msS_t;$e=8f@aV0kr3Lj+$@+4B1yZVP zR7@_FQW8t2C#983`Zs>4luD?;lJ3NMs+q?g_-+-tA_1=K#DXc&bGrA9N?|5wY^^V6 ze1s+o!!wx}^gji9pHPT?%1R8A^x~{XCJb^M=z}c>raCC#Yr`?X2=I83?CotSAus1@ z68C92CXy}`B?I+31R!^}Hf4KlLl55B-IM~Y|0SNjwR6|<^ot~x?GZlt2&x{6o+S5$^g``?& zEXk?45>y|^tYF1c3Mi;jN}!D|&a5s{b6?+|C8(BL5qQ3nLSn!rMzWaFvcTp$C5FKB zx|uDil*NI|H$J%7a%F~mbS0a7de1t24T4SCRh+oWB2T#$=}k44m!P3aRXVV2H+QzB z*X~HER+DiL#tS644>g~~-=%6zA}$;(p!xYFCHg)3`oOz3R#)-e9gN8%QYaQRHmclE zOy$zl^iY=s>bdXSavzuq21z3Ors(%gOni9BGuXs&R9Xr@pBmZ88Q36f?sH06Jueky08<ZFUP4`t1=z% z2{L|{=`oPnjXI2rOjnxiJxxZ8$3y8dZ3mL7jPV%jeZ^Y9kuWw2@H3k=L-2#U@os1o zT)Fz5JoL~bwqV1o;7Mtp=O}{c{q3LQgXa8pA)UMV-Um3={RWnA_s~j~Fjnh_DI#60 z%2GZpC4h?6T+9mXf#B-kwl?L&LS2q8)umoYOArqf5NTL z9sI2uU@RH8zO2dPDRus_Tq@zW9@(McHjHhfpsg< z<13*O-NB%*l1jX^v_RTh7&yk%SoARNcV)R4$V12Hq{N^u<|>2lQ9`K!L_mo@aa_9U zmt; z1hw>wl8aK-GmGdz zd~fw@9qdBz{i*B0Jq~h3eBgWcjhyM}Zv88n6{D{7-4ICTqw~Z}RoTLT@clAYA8)$b z*_DM#MjkqM9Q-N*NvFSyH_o_UMh8)|4SY+cRgL+oh6p5I%i)=h5=z2gF>QJ98+A!o zKn5lY&+x9qfyU;c;~42&#+dDq@xCXfpvEvU&&*6>YaJ6WwyrK?EhZM^8fdq`_01I; zBOwv{B-=7YB1K58n1!<b^q^o_i*O8{mYwuUBsyhuGTb6 zXg|qI*kg^qr*(pzZeKdhU8!aRaH^_Qpdzyv=wd2SK9PXP^QqFx_Z^usp$svq%G1wS zYfnAgp*6it(w?uXF);q7cskI=TV<^}g%6IFN+~~M>W!*K->5x}7X;?qzVaVmExdSA zfNGy!Yz1m!-cJ&nbzq2fkQkLnu+afbsYh#f=#6EZgA_|Qqys59#K-b(=@WI0NV8sdzn{gjx%q+Ovhb=K-V^Ly+u!5ZN-dk&qC(6_I;z+>a?DFiM(QY3cLm2slCcy@ zPNU;L;+T?3tlwPK0DGlelndw2%5HN{wxI=bxuWt=I$=G} zYWk1JAampFoX)pO!H6 zg{&0u{Tu+LzM+IXiB{a$=yZ^GWiU#ZDZLVPri#l2PaJ=;6UuBZT`VS^HgSH^^!H;s z;G$|t@0}csE1aMaYnmr%YYmD@u1Nrw9{1RAK3bBolR`-{Q-~Uybf9EvJm`U9V^GjS zPVripwGj^0=wPwyIASS(2E4Nm4wlmMGFP6eFPF<{D)R`7lzgn!Zb@-4kbI$}mSz~T zbwFFwnsq*$5hAwK?tpo{8+XJ0d7dTr```b7Ds+F|b5`h#1;R%h8cB}tscFqnW@B4jKcl-Fr-3{(SV(TpA!&oDU z{#1(&E4($-n-B^ZtfZ*9?0&8|G0{KpG#6%$n;4&z?*hp)?m%Z= zJFl!~;@`%C6x-#+eu9~u1PuXdz-KdC2?%T9sIW38H{{)Op()RjS!*d-WU^#S4GsN9 zWGZSX0qHPR&K_H<%DN^zF~G8tWvtQ;Rx(p>ShB`S?tBFxiZ!b?3u}<)Hl<@D9fMk} z4h@h7&)UFYGuo#jU(D#(xQN33MlXkX(D!5DFf1G-=~QCP_Q#qM?fY>x7!#EeOJh+i zP{7SbFn`~F|GEZ>Ibbx;>-7cM+1ixF8Y~-Td}3S~s&TB^rQEvt)H!9anV}x-41<-5 za~MyM7>8(Jh%yuUI8m{!PmCwh*hmw-Z@MA~5V|Hj6DUToeV#RQ4(P zkCRCpRGhRUAYwz>brKo18I0|9sQxpDvMvBEK&2Z(4GfcpGa5lHlV1`zFlq)2#(Nz} z6^EL(!*kKWOch9eRR@9JT;G)I?_ZUAV;-b_DC2mf={0Nz!0tJo8a}h*>3u*d9R{pB zNwb5n@{ze4X34tDN-sx>l@EWXl+8a@+%N9q1rWB~&8&C6-Q> zRYfNA)SFm3o&}?^3S*`w4YaE7Mn_|*n0Z?>EyU`8UKV&@uilmlhT^i+8ZgDPnIuZ0xZ4JLqvcRe0F<{Mj$wyFX+4G(04kSXEQ~ zU?d2aE~ERrY35GRVi{{X2!MpaPa-}?8o_t0NIW+P=HdgT;-;-pd#HX(dL^z^fiRbr>%JQuG(yVfS3M{dpS69c(iZzp$ zsH9;wX{ZY&wBQumipdxntmskatxJp6Su$LURnmID%zE|x3AkzeH1~F;2dl6Q-ZeKj zr%8pKc3VotqAV^f!bs{Xxu?I2Kx05Zu>3Qzn&7VHa|Ra&Nvu2JB{loS`}MRtwUAhe zVvea-pjIJ^O!F9kbX<_`-W~*1Uu*WL*8CJEF=rf(aXeDu9cv55NUKkn!eS=T@*~X% zHK2|4*F;RPc{)jxm8Nb1<3*z1X>zskG^16$3RFpfZ`Gs?y;wbLjyqjMVnaO6An-hE zUh+G>@lUz9WJ+urv6voT+SJY_8&1Z^Eg&uq`mC588i|5rfbn5=gK4cA%ca*}mxZMz z^;c;p9sr*uaCKPKZ(n{#E$s?`x7%#1 z#`9Wswl}q~mtUtRo~;17kYtr|Rl&##@hJ8*NivS&so^7bQCh=h>JqvYARm^0xz|5- zRhZb8J;sQi&B zTmgYh&*Q>6mTS4fQcWRtd}}g+BBtq?XH}bTB$<7(S*@y7n_^=M6s&(gnPzBCibOpF zKF^<>09%eFrf4S8kdpJO8SZ5|GRM=`?fpzZCI+CR;aI_=mMgpMumcXpVrAv16krvy z7JxCujg6bC5w>@?HP3D3$PpQEYy+dJ-Pk)Y{WMgezyBZ~_L10soP3$e85<DY z$V264=J@1HED56o<9U{sm$kd0E9ls3HckB@_$qsXEz}yCjkq{G zsoQ~PzyE9YX@*6U0S@sO-S5-&72w6h#{0}FXI9`02VLoQ_SBnBX~m9ssZ3y{LSnN) z<(A_)@44m^F_F!;lPFeoMUi!knu_2!Fs1OypJFFLr;b~498W_vCP;0bp*HxSs`kMB zeAWZS_hU?CG-uLHGb*Y)#^ZPL_6MxDp;z^2v0lmy} zuw-)a)*X>(?2vh0o=iRKMp9aLLhN{-b*EVS(VK7=zU$A7tMic=bsVUV4d5Ar3h@0P zQclDKL!UK^RuWQ`(sxDRQr*R{0LkB2n4$Iyi(6UIgX6LP!^+BWX?Oc_?fO+YcJeGZ zS6O?b4o5>xadxWL6Q`Qp%pFGFKlt9=@Gt*83o!9N(xu)x?(j8I@`Ihi@dbI&N7Ap_>}SHnn-0 z!_RIsp-m;$HcFB4;A>4GzRNh_PcyQpqhKT8^}qwf9wGMW@Z6 zV_ulLNN`WI{LGFTBW)$lg~M`u0*xe}eZ+YE@4fdPKFcmPHQ89Zsr3OP0FG9;TB$QU z&?HCBEE3l>@T0-OopkKoJ$<|4IpitNR`){mlG9v$|B4dG76>LAeuQf6#9BnkFb3~2 zqalZkmNAioxYd(Ro6roMj&x+QOq~rt{4klMqWD&|@L05-s46EdlI%5^rDZcrZ4#ds zyQgQKjvJXyC6>?|m8SHX3n4Z@3|x|+Ot6JGbhkQ!g2nc<2WA*eq zZe{2Le+GJL?(M^lHf$@vZqEdq_F%=6*|uF%n)Ur99#T! z`yIXcaB@=Gj0y_hUYpoLQCE?}vjn!+sDgWvKhMFL zIku)nPeIE6LJa}M+8c~HX9EDp^j|H2uvcUR(2+awyv^pG)(>dOKUZEIT zJL*DEm8Id1P*)ZSDVvQo_gdNjW6WZU$gFa$$+N^)J;pTSX;sBWovN=ZZ6=R=#CITy zO&EtophhCalhBSg;enBj5*U)7xR8ynE?DczuqK^z6?jvJ>tqicn>Lf&;$(@ngN@2M zKd^3+sY}5C-nkvjo31N3P zZ3Gt8o5>!CVi(q#I!48kY!@f=Z4gMgmgQk$jR4&uwJ1Yd*<)3wTD6wgn?+z$uomklhQt#bV^yJvj5Tj9lE(a^48}v{t64~> zg0}r0>vi+V9V}YD$HmQ#fYfxGn;UZS%vt}j=4+GH(+k(Ps*Ja(DH`0V>gc#2vz^T6c)4ua6r(ahDD4O{!bvc>qsdeRLyO(*(@c z_O>QL?zLJfskyTmRj0OHW$wHm={3+|%xYWjv~oM{UbeNhEk{qBQf|wg%S`xm8aKQZ zII{ry;Nu_{!|dOa4AT4cyc_i(R&JV(E}VQ8qE>4)?Fq#PRbs|ADfLxp09VHg-*qAHR_4_dzOTj^z86M89@VB691oX>j(OtITlOM|@rr0;_9 zJHEQagbmC773aU9Jvg&eG!@tguOqvfu{B;m;<(*fp+zBZ%*!^H?| zFRj_OL$##G09d77S3jHfWG&>iNga6?-4-PHeT+9v1@o{BuQcu09ExQGY!~0N*lA6S1uz7W|e*;x=9EK=6rES zS60({nVh6@1^k_5zAS_ur7(VH!(RJj5l9lyqnH-_bN}cpMwjPN_7GA_Z&~ z9JJn;lcPtEYli6#3sKm^0pQUcIq*AkwD{SK4Op8T24DFWfmSG#v^^z1Zzj$8`+Ti@ zvNaJnEuYU}VAI-~ zCl}?TYJG{X1$5rfx5O><^?ND$zdtm;V_H4<6QqG`a1p{82>k_6Tr z5y)g)w=hxZsai7?7|!RJ?^5kjDvSqx)4hh15}7{k>OZqmS1gaxMrn*2$HuCo%2pq| zwladXM&nfX#DU7vl{jQ?LgQVRsk4{X^Efh&<7gCWe=N4}rnN{SUc^23hkcb$w6Lk- zsPec`RI}Mszg4kRR?bDqsj1;upo4x-T_7Cm9@MHcSe&Gv$;Gvz;=>D@LmRK%>tiCZ z#Cmlno@tXtLZ=_wQ19+GwGB2cpTILsZA-d~R$6^F?DNxyev7CwGM-j8_i+$5C=1w} zma7;mZiLBZTkR5nkjti3wPeB9G=E);T8dm8Q42n8dASZ>WO~bcCi{R6O$K{exIo~t z*#-@d{%Bxw_i+t0^Yb9XW9^fgsHGO9VsU|SQ}1Z{%&X&(E(2CCC#FIsNMqr!sybl~ zRj7Ty=#$f+G##tH88b>LTEV&Gzl2@{$YNeu968n($ zn{64ChxmR?eLXB3$i&7mNh!m@)%~3rH)OU$7>bKA(!)=c7|`zn1A)B{cK7zA*B?j+ z78LzP>0C~4h(NBDtJ0{~bUPLD6+X2v#4aFuzf0`I$F9!+27wcex+Wy$naw$=l6`Cb zvt@TGG3<&4it;rYF}y}@SWWi>=1HnwR)?YEUxi8Xv~*Sq0E1IzO5Lx5$8w{Nm0 zIZ5?u11r9$9Z@thG>Nsia%p}}B~~_AFHo0C_I&Jpq9La90rz(_9E-2P_VBusb z&cSWM9=9JcUGF%cAqG61?rGJqb79bA*Bo-KVh|$*7zOC^xFa3>!FZs%wX(vPAnT9% z>Nm=jD%$X$)8FllWEd>}EIct=&lK3An8q(vq$)!e$l zc~;eYCT;i>d%bIJeKfXxQ%zUr$QILbkHbv9qEejuF}9lC!~^cxoGN~w`&8HJb?HLN z4z-WGm_R?RTPzxak$l!~H&m4cz+9PX!54pR3BzD&%0=ZU>;PDVN=t!JXuvvPCPAoW4BF?#P8RdR=*plkhf;gyxcAN*%jkE(ZH?pkH&DpBul&QMW)nv$gI+fMZcv_82SIOhp zg?w2z-((ZD9Il&2%sf<634ra5yZDL8&YQ6%9C|}YP4-_+k99)D%z_|d`#}0|)S=?_(1JD33X+jQ*STjytzXi{mL@4f7Vom4Y zwHo-KXa26NLU$lj@f%N*=n`A>>5$9cG&RJATx>+jx6F{Dn*00l<{O2SG%_W89?~IQ zlD!UiSDaF7u|!`@Hr8+jP3Z02O-Zs4;q{{ILBBS4n$l$l*_2CfUDf_n8WhK( zE)>(?R24Z^W?P}E%+;!r$)(gKLatZ<*Q?Z^-b;DqPT^pv;g^k@H)Ugc2f%E~8*jZQ zKYrzH+3mp~C|4v^YRDJA{7Z5KymIy3OVYo2S$_4)pOH^Icv{;QwE+fQtlXv!222Lv z9S(ZB04j|I=>hx$NcJN~jz|-WkiNSbu5kwvn_hM;ufu{YRtmZgBPA8p=ElYbp6hb9 zzJReR+Z-=-#)-4DTvWjM^}GWx;53v8IJn;jiG1sOFUr6EcmG*__|_G*YF~Qw6?u+T%-gGyk9u0i3MmOluXjku;O4rRhvN7~L|@Q((!ABRH85_`?+E9XXbJpOVU0 z0r8|mv3uWu%AUf;&ImH@H<&9G)l47sJ6KT#sJ2+H+*s3%0*0E|*isc2X}wdTRajb~ z>@=G?@vpu1n*9BbUzPv&yD!UYSFg*Hr;o^&zVt~sxwx#E5DbYl8Wrt-&~5K(#rD>$#-6mZvcSDj~$T)q4T`b{Si;;TmLMXa0xak<-e<}U1N(eW+h<1MG$SLiy}>3P z2BT~IeUd0irt@u7pxq7Q5T&`Vcf&!zn&na=v%7^&C6;eudcH~6C;v!5bhozGW$oGx zdGG!A<)s&2lsDga1E%wy)NzyLEc=&Ju0ex#w&S^djG0Y>w? zZSb)6j%?u=o8V$Bs^A{cMX1UOq~I9pH9NN_8E!uZQ5JT_m^dGn*A%z&%-AU6V9;QRGLm4xaVa8*d7`2(GSg$l5lJMc%+| z=&-PkE-%W-V~cY7*pfVQ@q!#bKEi$HEhjYlJTpGn9ycZ2Ys>lLEAs3oo{&HJ>+j1a zo_Jc;x3}bbKU%{=Gwm#M<(h6q{LZyidFTCA$>O!8g+-aG*W{rG&&vY<*!eT3v6wKn z;FdY=v&b=LnlkP?4;4+o4cKlI=cihvx}=+f{z9gOXL5P92tymrnIsp=^rs^>vqHmt z*7d;9hH}1VHPWG|5$`Yl@~`g7L#oxgzAyW&M0ZlI1}=t;o9puWYp=`e5czLix+K@H z-%!u+^2$+p^pQv9!ubm_4}!UO^9Cf=Hq7ckP8?m5W5<@kW9l*w@n25mG%<}9PY1g3 z`s(}OEn5)xk*drAuB8ce^ZgfJlNT@D(DO2+SOdRW0 zy>?A1GM4}O*S{ja`IXPe4nVWJ*O41d5McK8#DUgsuE~uXtE#sAASX95Dc865&V{+OIP zc}nuQFS>!**xBc%=tW2{)LAgm6InQHv0j2p=}6f zvuzWX@ezw_^W^5-&A;K*rsLu5ZO7#9J?{s(9SA7hX4YdTnQQXRzx^Be;rG8U*C3(T zXOy3Qh5>ErUy`BSnuUsK~Dr`w$XprfA5 zSMpNM`*P#vDh7Qd$11)&eDSRE$g9^^LGXtF79F`64a^4_?s(<_ECbmBsQ>1h&&g}A zzb%hE`ha}ylb@2)3(K0HA3{ZTaj`zGpCBlK|LyE-ON$O=wvGynHM`T?GZJW~W8cj2D9c98CuSp2D8TrmOAzx=EJPyWN#zpm-A3}>*U>2uFM zBftGyzYSh;MqLUFeR8ju&E0LNm{ly%u2gcq?7`B5bqzJw!{EIxS3ppATOHZh6Y1bP z_2s&pJ$DWqa>&B-1 z+kf->vOHIl6U%dQ`qUYT7bAJ``5()r_pZs+tMALzEAPtZ0r$QM5OtUPkzf~gLVP5R4_`z8X+eRfywjWimes?VnT7+{z#(qhZpeAA`Z zR5)47FrMVDO;fw4k}J6_X}4#&`ylkJn_)`mZIgQZ&%T#@odIRm5S~48Tz>T*{38J3 zJj6a$3j@Sf$HxPVL?0%4Zy*DR`aOvD)vN2^VtB#=is%%~vfn26hmPeuR_Ooq&;C1@ z|8p4Ng1r29e=Vz*UXlg;oy`~I#ih%#*}frt5cMp;{`hiHKK0NAsezBYd;O;T@Xaf- z<$<4IKuOH~bf6w~i8E3y&r3QPOa16^@U*zIWGmMxnaham1<3%y+{?F z)4=rHLPL(PEX$`aoDvV$w-}7&%GIiDZmrAJ8|(5H-~6^b^Y}w@^2n03cG}Wd=0@V6 z3jn?!wdD(+c~rjqg{LtN1FY<#JoV^BdF;`L<@4`cm2dp@cjWJW^b_6p5LSq2qiFCN zZj+b6^~I2cZ{i$Rw*O2%vvwWlc?=S%0%@4hx!76XG#RjwNonSuh|Jh!P?{DedDck1 z{w6gkuxUlwLfn%Hao3DAO;~ioB)$b;w}0G6NJpdafvt|==G`>8MKo84@{?R(538}o z6j_+Vox#AB_NmnuG6<%b04aP1;vQ0KquGMW!{B2AD+OP>0^i*1%3Dy2|M`#pKpuJc zN%`#Oz9gUe;^*X>Ti4|JyYI@8l@s##`SbGf{WyAaNU%Ub_GXi$veO@}9i$#_O;^-;^3aU!AY(W|%%V zVoFlF)$hfVN2Cu4N!JATeeUD=ELA0G->P8HHT*KKgK*@?ASEmt%+wg?XJgCG0|1AIw-?bm)yI{|Y$ zTju>Ryu+k3ExSyaz;hQ?WPfa8Tn&J#T7)z#f#eS%wID&>f9n-UsFLjNT$C(0%*Cgl zkTO=~-py^@V6wntfk*xFv!9ipd*YL7QI5caP99&9fBFx9Mc#ksiv02Sek?b)Atn2s zl*&b2wd99+SeET!Pm@^Yp;}u|Im2#8N|2gC?8*71Bd``>Hk1G=fF)Bd=>&0cFweaV z9#n$iusC0pGshR@)RDTp{pP#!{`$6@1hFnK@4r8i5uQthjFccTH#fFS1Yj^$C+2X# z!jtQghuZwolMhP;i2a)%ydoRjz9bA&1-dteQUT_Iaop%}coouk7hG_CyCt7|@<}Y> zsw86?0oxj8^1;7Y&hKX`_zv!wdt-A&k7EUDxcESPj>S?hjaNNCc(Yr?S%;O+>l zdq$N^b+7SlnH=+D$Bydj+q*lOthWr4{FPVM<(uF9Cb+@2{N``}rYt};(AsHrTN2t8 zGsfy+8Va|$%|P@o%+=)xNPggrgssq?I9Jyg+r{%I<-t>@q=88q;&>%kp(jqBkQOYy zOMBbO-%eI4^2rClJ6L$o9ZI%b&{W=HHZA|n&wWO|{p#y-4a9z{I|iB0V1;9dalGzc zOA2-aOU5NxP0Zaei3W=T09rt$zW@Lr07*naRN@g<{xFmbBreHx0O^{AG%2L96c{vz zY6|?EHjOJ6)6#E20;VH%f8+tcH^BWUxpr{AW>NxxI&!=Ys&I2tqV}GKtGLhx{V_ns zy$r{if5lmyD_7;&#~zlK-g-xN0XiS5j%msjPz|Oa!Q4@Gp2PingRZ>z-S5Z{-1XB> zJRx(?9>c)oeKi2c7F{3QkB7U?vS^m7&@+Ma&@<`Xer)3<-UrcQBiol=dRexcJMw$~mrUb~b;uzm!l`=yyXU?9KppcVy zU%xD!y`F5~JTzQRt}H3=x1n}T>&OIBE0!K46Jwi0ddf#8!_mDOuE^upM?o%;zk8gudvc+$WBgFlep_>Et~;71%n$w3lvlO}FxxdMQ!99xv- zMgjaMs|_q7dY!-}n39`@y6yE^u-^6z=fH{_LgWu*EIU~JWOxssJpyUM(sN3`qNbLp zPX?1$E0*P}pZTnO`^9%a(BGEbPdq4%BXhb5Csl$L%VITVlCneqSOCf47%QA% znn9c4ni$u@B*Q&S6!)nvNVb>*9q={ht5mN^2Ar)w9BGbJ1+T3)2lD(&SHT~Puxw9) zF4QC&rcHo2^i0MBCU*=l53ndk+#`Dcsnj28Mr{@H zBd}Dz`lV;(^N&9zr*W@w$c@hXkc?YWgoHZ_PPjeZg@v2LqAqHsx)&I~lxYYzO-OM? zF`gyyu8hri>!I(1e;R2F^3pDvd%)o5!Hs$o`)A9?y@C)+$zyJHH^3I(- zD=)nKg7#D>f$%>6!yf^UV_5-sVwm3{eovyZa;{^T+O!*SX%=p3*8VhmL)7R(-2#tkp(VZW*GR~8dxH6 zmC)>872$gfj3+S^R-*#0SCT7No|C!860FG;HDb8;4U2lyY3{n}>CR`&6wS8wv~G}6 znGJ5WRGsRdJsJRpr6Y@wq$4Q|@&GW#1?u`3D8RE%KP5l=vtN+$_Lf|J`Bg~7o3gff z9kgKwi#IRjg#}5ioR#n-uCunRAt+{L1UBPDT;pF`)UiKaIL%s4ZtrQZAO29PaH@Na zKZ7Kg70E33`W!5_um3+^m$i*GdG?uSWbS+4(i|tcOBnB?M9Yp=B!j``p!A@|jvbws zbLUP-wNeBTPt-}+<@R#m9O(=#nMey4)B+_?pkkR*#r>qWHg;rveOE3XU6Mw%rd2Ds zN=;HYS7;ll@fLen{dMq`-}$94$v8!TSHkCuB;Rd7~%dmiW52|d`Z>fiTarwOb)ertgS~qUU7ry#M zISmWaXPl6njXQtg{wVPa#gyiQHM(V~fE(_?fFQwVs`}RX^?j*+ z^{cYDvMfJ&?I)7qs)wkrSC7bittu5*cBOm@pRdcq51x@S%y1^gg)qNkkl94DKYgfz zg4ySW>dG@cN((vTQ=w04YvYErdLk>}VAWi~#==Cs&ao>iW7UrjjsueW#A6rbbI&{} zfBDKKdE@*US!~qhJXCN2A8Bh|6SD>K5(QbPE|U^tdb69#nNT~tMB3cMbh8nY#;lp3 z%pS$W71^Q*Y8)!-+t0lsfBcQVki}9;KKtYaNUe(Q(hWQ@I4*wer~*niDE1sRa_$C~20Vimhm+*s%II5xbstut z0!q9|r+7+8CeJnI8uIxseqR3Q-~FMwA^!2#eibVN<}S?J1-w_pDm^k+g>{sZ<@tsz zEjFMgGulZnYJ(hO<#ThU*lxF*v%hPb4VF=9UU;BoOdGHcUw`>UFfma-lP9L7qUMeC*1p-#`YW2{S`;+N7VVY`52g>ED#M-@75t{pcn6^FRL!Ez|$+|H(g)Pd#-} z8~+z8B}l%kx>o3KN&x`cDJK}IAFl+7Qp|P%x-?WEPMCo)lm!5@43a}CcAAnZ=K!kX z7|XIWn;Y`>JD25!SD%yed_j&ZtjI!TUW&PrWW9_g1SGwxgdpxd7Ok`g8q)G|fpXQv zcHt4RJy)IIDwzrr_w$Y#&W3>QvzWpr-dn_L79*tAQ=fQR{_4N}xxD@M+w!&F`3+gd zq%+x%`9v>#_q#IMxC(Ke2cUAABTiGdT&T(zD`?p3X=XrRop&^geRmFWmN9eX@jgEP z7vKJ_T)NhgQvm4-EJtq3#v%v$*7$wxG_37_?@$%|{*CW9VsPQ?{B-<$7yO zs@vSueV!>be+BCAbI*Q4o_P3-s{TT;rYS6mHd>2pzv95;#*YnOqYuu@=ahdkFdai; zjbMljnSltf^uXSW;F0xGRd#Xi9axwBxbN-ViciFJ=g;RhbpU{E#13kt`PoH}tv9(&>m zdH#hLX_cmRZSq>fWIW!>#>o1)4bcd{yJo_Gc%wg|p4&UMWOmMPPjhV2vC zI+50qkQ0E|vf$$HfAqZkr$2vAOYNV2{9#!D_h2HM%k$QHXAMV$Smm+l>X*tAs<0Y8 z`MJ-3MOcgRZ~pK<%D;O4d8sbW%VMnoGGCHhKodTrk$$awiA`%EmZf(!FUkaW2fe;2 zXaM)g0}KTK;25miXC8i7P8?s6lgF23WqDq`_&bp1X*yS7m~i_g)=-kG`B_sBplyhl z9LT(WRvJm9Wo@+FVt|N#zhR%vJ<^hggj~Wx>H)l4>)UED)GG~Ho|{+Wpi!U4u>$D_ zL-o)buRX>$hj9kbnph|S!G`%7=`Lrs)1j3%rqBIU8@Z&u!-Umr{MdmpbvItr!ym3v z!?YkwEJ|s;eCaD+mVfcj|5y1x{^h@v-}!Iwo;0vbWclpa1k@a^cKLsg=uS z`!(jGi)~3Hwnd5VMQEF~4NVgf*o^XzAWfEGF#N%v{1>@#b3=j~Fy|{(Nip4c2=xQ7 zaM!IgR8awHyGispc-_34@ROM!MN%DCV?+Xz}<7Id<|G zv;fAAenD8vK`@q_KQe*iY}s&BdeYV16WewMf#He%6gY>4a3(qN2S}`0&pdyKd5uH$)i0|r1@zV_9hkqgHcRfIDay#%wHsVW(& z5#4xGOixidV(E1rn`W{g7?`Y3D`h_W$OAI(|DwF|;}^8lYUSurIeO-_EUX-rJS?YT zy&)O4z2@fT{)b?~KOY%I@8U44ElXU@vv=~JvylyGMU z3#hODFGe*q5i_099clwe?+kd?D2^t|&+Vh_Xq6`Q&8A#Uy5r0=4iP7kJe&FAO;VOW zw7X$?Xt61(F2pm{zg>v_-~7$rl1=cAKmD^mm!G`+g5*FjpfF{Tqh5 z14BwHY*({PH15&0@DT9|= zTg2`U%{X7ovU)b*k8JlB*7rrG@kgi|Y=*LYY#FazlxtV6X&%{?%a>*A<|d?NP8ODq znAS=3wQ|2`wxXn}CHD(W8*kVBU3agyyFjpFhk&H?%NNTU5RW_q67K&zWXsEm3Smga zv|ps*z_cIw>%zcn`%8Dmkj1xg2yV*VWk=HQj5HUH1ZiRUsMPCAki_(f^V~vxV3NUYGMvcecaV@uN#l%t+BiYAzi&<1STa#(4WZ z+kBrxpUZGDI4qmSl^Q?Q@gD1j2u$sa$FS&Zvs}+MkV|RrRl`YGgyGpXjgigVOq^qu z_hb8-QizmspQ0_G#@e1>*c-^=oF^sro!}nOfqh;>s==`W z*Hk}G(~oD<_dHAJXI`29bbQMCQk@!|Lg6-PGqX<6TgcfVAe>a?xNhf+=nwkZgB*)Y zj?_zX?({KCW+JsbEE;fwMx`cY@RuA{=@6^5KhSsIiVPe$`~vN@^hIwiw!}n9BHCTo}9kS~4t zE0Ui-q2C{IGl4Lg?ASpS#Y!ah%?gsV=~AfqaVb+!JL!3UkW0ZxrCS7vg@Nx)RibAX zfy2pdIo2$&rhgy)&|z|Ij9{*F7tjWz7I#n>cJ^e@!sM0MV52NvuOsbtOFE-SI-A>) z0=T#f7`X>s1?+xIKT)naCnruElQSh#bQH_{-4I8jbceFi zCZ(GUn1yGyC@~wNNByouUDJnM3y|#QOq_|xW*C^&FVi@jeQH}wD@n|z8pcXvsEFz< z3$>qTHyHr-`qfowuDv5U-0(wBJS(+@MX2kP=5!5h!#Y=l%5Ib)Rt971UN*1%Gtka) zF0ecW%|Q}tRzn@sAIqEhJ9XGzn0A{yi`MCiygjf?Qob>7K`y~<@};6y|9U;{T91hx z2eN*Bo2Dbw+E_{P0)0oAv|5?nlyjyBX$cbu^SB5?&W5cV)UAyT>9$RACL4)xE43jV zeZI*Jt5ypxxURjgsEX**8fuf+Lp!pff+%1&e@Ke&0n)#Npg^;9h@iXMc^{q zP~mMU!@5c{Xv@8Sz+1SvfFHY#$Yu{9I&Guz(DX?l+0U99M}42J7`tg@Xl0yw^JBwv z*rI&gXRC4&pg=#z*O}!(i9Iwxy5$J(_GIeuhKsY8&e z;xpia1uSSb6am<|6$-N$+E9nwPdknAX2mrf(z?k3(_!qc9n;j~DX{jZ(%f3XV-~C9 z`&MEd4wNZs@8ywLu^4L#Yz{YCZ7j(98|zS6iSA2S!0QcwWBKSYRb^Ffg_dO*S5DKH zC2b}tNPB8w_So-7>c%G|<=ZlN2qT@o`g zy{s8@u0(bxWP@2sqbQmX`N_6-mM?Mi$#G%}G(HF(?S~bc9-^`KTyPU*=R(6rX2ml# zr#@c+op?|ldh`KVfB!x3tv0~dgVtx-V@7K)6DA6bjTO#{oDsg4#(4LFoJJXRGX~o! z+GWN#wS3F0?&H)4_#!No{^v-jz3XL-8SQ zZlRo$<+(B>RbBJ2SsI=JZy=dYQta0mYx#Wu;u}FNu^~u@Erz-s@kpY%!4aL7QDh~L z$!OsDGfcqKN%6E*HaFXhxGiwZ@AT|G&8EjzY-UvYSk)Y0a&5*lQ?Q`umf%iW8K~fF zsVdDIt8%k@MS^}P^&^WCKpip7MKnO3(tcYWIi8qskG8hts4;!pwq!C5IwI3QEH+so z+H#ykU3agD)Dg@3B0#;wr45^8JStCGmh3LWO6Pn&tsJ&kS&%vmn453BApL#^W6ux} z-piDQ#hXk+P9WLID0kUjsZap0X`PxZ-q>X`cn(3c+Gz@x!xYx!vq>`f&;jm-WQros z5wjUf;6M<%Bp&PbOFXU4Vz=I$W+z%6Av`I zu(1CVyUs9Ufg2Dt0jyyQr((t@rPh$`A_wYEB5(q~gh3kX;4|aJV`>hK0PwkhW$&Y& zRuFYz^{wx=w0L!GZAYS3Qx>ZwIljCgiwg}YLnRLZtbDmB)ofAbVTF<}t-W*Ar1awQ z@&J1lDx3q5j#A>vJ=x=m7U@`r#rSu$HKpyxrCiH5z|wY=aWW}|XGW;WD)nq}scC7c zt>9_G(^Zk=v^4>XQ;JZDbg@u+9eLn_HN%muGnscLeH;hw{27(`-~D;Y@@0DL<4p=OzGls86jWH++Bx1^@FJA0T;?9wH!=t7{pF|fj`zJV!GK71|&^i5+q2< z@(hDYyJ-;ygN^ao!-~ZKT?|&U-I1$n>#~D^WWR?p_}kKaT|Bm#gm^#U8A~vg?z4}e zq}eEgttX)#TFo6ur%n0Zb3c&3|Mp9=)e&jrMIOFzR2J(CQp;zwkaTBvPqS5*Po6TJ z@K|ubu+#j4oPLTmhGW@=6&tWsHq?E24pbb{lSK+lX;DQLMH-HA`!8$bGwmkmdQ#bP zs(8i{oOv>-(HnavMMtcU%rmu}Y`j}!BU^IE9J6X8H5|sw48ejRZ;dx@O3adbsOgZ7 zR(x5j$2sP>C;G_Pvo+E>3Qwh(YO!19ca{L%!Du@m`{7_!)y*qbG^p%ePm8f zLMr9*74%#PXozUb@RaOPN@8)RVWl&@CzqIh_6!v&xKtJ-`$WerF4NnB>i~&$ zE3VvQ>Tb9dkq19)Nw$|vsyv+8$=A8DPz~VPY~Ix5JbJ^)CxS2q^FG!_8lkY}BL%{Cxj)-)F0h3EOE@oIJQk%^6X9(x4Ine1ghC4Y#)?Z;><|zU`}=T;f?y72t31? zbe9&-pp;$adc8a*Jg>!+so3~voC&VZytJo{UzwCwWX1x>ew%ymFjRr#m5NzdmXLVl zX>>pWfZ*ry=9OI;jh>eW&+W(p0Kx`u>{D7Q=9H5RhM}B4dlAoba^~CxsAn8oS8A-m zV^#(GW?NHja_eVUi5zH&J0(sUlb&L`a9EuUT+Jz3(q`%V72tH(hR8O`p!)vRZGyfrD%GLc0kG=%j5;(&n5;3>N!IRNlW0DBWcJ|!N6@Wi zg)I;V(q@U5&sbtsyRoFQd2Jokft2ckUko6(F@plfDp#s< z{`^@v4PcR&lSgUDg>f}HOw~JXQdzW@uxE`3b)y@rjP8U!`5%5?IC@+j{nXR);&ac* zjkOy(x!C~Ml*&#PncJq$ZWA!sDMNRjbsK(@%a2VbWsP4#N+;H0GUFajcA_W0VsEUf zSJikSvq{tCthR!TwssYiW95~BRwixUSd|@c(x42(hJH6@eGEh6tkqujmipL@r`&?r z|Jd(pa`QQfG2W7@ei(V5`cK96K$_hg@$iTF{A9y=vttr|+TFXv6f}@@6C~V}F{|7* zF^PG0_j+1K6w~ZAz)5BCXd9LxsYf?Sk=@u5 z6X*|RapiDFZ{O|{|xxS%5FU1ud_)s%f6T2t6aYDNO>ROy3$+W?XU08gN&RJcc zlt2NQA1kg$lQGhiYn5KHc69DS3uIXm#tI)$gfXOV0tvqU{+ispzOLP8f?P>m51|;{ z=T8bJj9KQ{9nS15I=tTksQokVP3HN7MXf5aW>ZdY#pgl5IviB)a|ZZ{Nei|sli>}~ zt|$?BODMaLFlpTxEG6kdPh-Vt4S)D*S!L3uQ!qCw8fhR`v|5ENj|iyP?-QjOIx-Ex zJf;h1&^w)sw5=_3x#sFsId%SwJbeBEId1BPh{|+ac7Mz_#E$d?Hi%OM@ z-D1UV5MWJ{w5BX48iHXx;>j}?Wefx2%~xNRR;MLJs#q!M<_EkN0w56EJe#g1I!-OpA2JJnLj2S zjQL&|Yr4(Kl#!B&JVJm44Dry1d0}H z=z*3k*nmh4NpLvq>F(*ZmaN?KE{<~|zMD6*YnvhLBx|~=GAoyRVSv6uRc!??z2Ou%EnpktN zmOgg}h8oSNPk?dvR<9{t&8t9-27z#YupAnYLIJ7?R^_UX_| z#kTO$Ty{=F$4O6Q$-e=G`R;p<#IYbc-ao$J{~*7l9{a ziY^ujy~SuUm0mlN`@8#Cltm9!<|%t-QMzPqHeJj(?20ROfe9J((lC;aX%(&7GGa?j z4xCb}q0!)i?jwkbKs{KiH?(JPBzD19$Djlzc$o8u;b-uvQH>w(-lah~@PvRT8^xs) zh)WM4tQHNM0=CxMKa_X1FgU>uY>LNbmdknN7X%h@0x1Itc1L2KlX)V&xoKe8$&D)t z4UQi!0x(?g?uQzJJD?^*vZ%2j{h0=@#}|eMEDQ3N&(GdS|J&cO0o=0Qwh>wT(9pXJ zlR4|`%Fd%z%28;+_@D6n7ME>UwTC&56%49wePzv{qD!CPYQvJMs~?^R;vn!ur~*su zxzVd@*w^q=t_TLMR;UnTx_$1z!2~eZk*rAa1IB~KGITe=8couiU>}5FArjkbv}8{c z{tgW5=t#Qiu^^a_?O-hB^>qimt~61ZWwt*s_tmwz1k~9>1(IoQNHJoUd7N-{77k0; z@?T!LoCZpyd$3QDvx2?LjQp|K0;j#ESY?;H*DMVSwM7IdVzS(&vMm%_qHp(MF+sjE zv6BdmPz`&N(^CrGCVPFdNoV7UHQu#yd^(y+|D&%-s$P3UMW2Xc9HncF)=;%zXpn#o$z;=U2MS(MfD;<*M0Nnn{OMTunbEFA{h*K*;t+X)-F_}}pI1w(AhE%HzRapsaYUVCs02qGIR_;MnhQNms(17N_F54KSO-ueM$u3}i)+qO zKLsfe_z#kD3>Tn%g2Xko4X@n$!^%sDr2)bK?ucqNi%dk3u!=8`G&lh{SxVY+YiB5( z;khKh#aLq|Mo&g4%^glDR`kl@`S#Bt#V*57wVeAl1FY#< zgF!Y7i9bc_3TFND&9~sOLRx}r70ucNIEoqz$^K|GAe5;W!O0xYMj8fE=3*FMpD!T8 zJ?1RkYQ7>P0l)8cS{&Vir;-)+rIZv60cn1MO<{|IJ9D6C3N9FOuoXj-{th#T`n z)1lxM4JDT*=(IzK^Ji?Mym|G4B)*^sXv3ejJ;9cYBO#CIwNB1PGM+5-K44;CEzHep z6}H)Z)R@VzH{?E@3+&{P)`))f4#{ z)RDjYO)2+|D8(6hrOD?i#0PnAX;@JW%erNLT^Uvsnw(L{vD`a3+Dj7)-9)egc7&AZd@8JG@R`%b?R`GQYn&q#gvI3wQ|5`KbZKn$M{j%S?@QtoaE-F;H(X zE@IaDWbovF zMc#_XS6G%;9fg;+z*~U7$fCol?ZvatnV|O6(;zwRU>mz&Ln`(wgF~f81MPAR85h$t zE^=y?ZJCeI@>y`*+?|61c}Kr`=v&96frdMz&9SOq?{yconwK3p4WAj5G0z1fCd^ zN>sjv6lU&wsYR@HgDD&-B$SxYZ0CE>pI3$PwQ^2?7lb#m(vCm4XwS}0N1Qw&0kxfI}Vrzamhd{@5x@rUy8?p?WibV!krLp||0;cZZF^>Uv~ zX7mzGtr!RWooZDbyai<%eUJeI8Ph5Hm=kjA-@JSwuU^0Anw4j-PUUC6`n7t1zmvNU z?`iJxk-Yo$uSu?zX{WFSNl3HMuY;rqC$3ZL2{uZDApxSI0LY6ap%D)FuWX-9<|}yt z#c;nOH$_A?!5v#03CqXNMrShDBz#9N%BQbh%0vzBml*hnMi>K^LOtvt>B@tHN3zoz zP|uWus)a2^=X3hRQYBY(?TK{DDlH9IqX%wuQB-yRF3qv(9?R~xQSbF4rV#&cpTOI5 zu@1-O%9DqQXDn=dO1{;CobAfycBer-0qp1#P**fu_L?nubPt}W zLxI=d``|-)R}b)`yN9ydZE<%YHngH6+0y)_-ELATud7vB6x;MN5GQMA7=e!KawD58 z>8hdb6uVZ6V^OB&VrQdsmhPZMKY#v=sQSs-8~NG)`aAviwS4gLM^rE_r+w+{?&-&D z6W|4d6#S>732ivfBsDOg-E{FOeSO1#X5Dwtn^C5pdMqiku2@9p;G zbTpAUF5tF#_?BKg2Ybiz;LdyMF}vKkhsjSF8RJPtnKG1 zs|Wg!VhCwo>fbm57Q!a;Ec*Ze648>t7+A@iXHGGTH|M8vem;@A$M?7yEN&DO2|GM~ zM^Efnk^+;vk?d)H2CS&j>~p^jHd=wqw^*DB#sP{#tGHE1i$og};|6#cbEorQFtA=2 zFOY(GPY&!1nq7{WG2ih64k#q&l(G`*NzOf#q=~rkkqU+&{b{#}6NJ6GpOHau}5oB(b|6NA_=n9BrOQk;~e9 zw}Kmj$EtvbV69&TZU`PLvKA)sA^mw@E18uZ^vQh1Dc-pzm#5=7B?||7VjxO8pD(4; z?CHU3X%fDtS7L|S@u=qTcy#km7Z*~3He5EjusdZ1iu|lAQ#GuKdYkcVp{4kcq`*dL zB|QuW04c<3$x`r{Kel>&>W80~eZhj>Wr}$}jB#mXYV|wvPrmp2^6vZZX^!|zpioa4 z>rzx1k4=6L$iCKh7AKk?!QK zE3Q@SEKvJook-e zB8|AE$uW3Z@FegScr$yeA>YsPe8iKTp%1242H-!1soE~F_1p@FQc|;F`{nB&IAF)*x?XAVqLi1!+ zlCiKrA5cI0c%IAY`Am(f%>|;JR$mSVx%4&EPa9gLqFtk}Gt{L0&O7(jOJh84NrNgp zwSn=MNpKU1tlKs>oyRCBXUWDoLAQla>Rpb!JMdN44hWUqI{E&xw?NJp?~+99jbSYO z_}+ba{N$H%(A2lAC-TJ^!lC9$*x=BGxSHi=YzO(=-AYds@*--dsb{#riNJp7HgK?& zdME5j9&vyb!e`hr3PVEU75w{cFbt(~#Ad6(gZ`zsUM&Z`;zTKoSqmktMIFn(ks_ z*83mG&;Q$B$`}K!da$q*^8EC^#P{wRvw>9;bVN}#HM#2$6%KL?3;|$s#2oTQAP$i9 zmdbd1Vf&Bu>*Mcyo6rMJM5?bn*1sQW1&3*$GtKERdJY|R(2-j(0@U(%kBk$B26db= zcd>Bpq8yQh6=MJxyZ|i9dYUPl#9$%7*ppU4&@*4=#NN zw~-h5{&OoN;#)Wh>k@IkH7Iv z`J017d3}B&&0bgDyco&LlXH3X=A3-1T`20Mw(l5t5*8UvwR*(C=6oKw^3c)(`#`-C zcF_#A+C)e}S0ALfgM%X))wx!2dRn+#09zuOSznF#L|UNTKuH-ryQZ-=G3|nzEuBhC zN(fsUykTpN;EZHC@e>E)9R9UMmX;skb5gG~%YB1<#tQ)~2Xu4To>|N}j62rPXQ6OT zm;pR8^h~jQ04V!dy&Aax-FC_;Z5Vdqs3|Jpc2hmJzW=@BW4ZhAT{ZBuDzb1Z%9=xn zjry{d2-!N9rL4zF{qF1Xs6bRKx9$r+-$KUds~gsO{Txmf!o^Ha`o5OxAInew`Y&xw zh+ef{ygHNPy;mBNx}5G6ON045peT1Ppk#N!$Fe<9U~Ij~$rfnK!{FMTo*Wz=v3jKL zKSa_r@$dGDb+B3+uja&rhIp)2ngCG28bDIrW&0+`H~Q#)5e9HgV@%B{>G-OW^=UK13g5qV&iz-Rh`hQ&!@YTfi)W^Z0Hy2a=<;tJQtHNo?O)`J?^;OLI*?e55EZid?fUrVoYsMj1E9x|k% z%|pEeF#(P;x7-RjA`S_(QUPA_=(zR)1yFL!C1E(!VaToDhpnez7%;TrPt*&})c}#W zqxYDTR@7hx2SOt*EYM+Q8Xnv2o^-TYrn)ky6_oIm zJ|OGXDBm3G3S3aR41EvSTKMs+cr5?&vIFx&@=mv#j!5k(Zmu zjWWF|cQx_+r+@H$`9DAXpBfe>6wvtW*(-TxcTcOGzI4@gmWlP$(CupKmAbdv(XRpJ zuuHMF2$nQ0PEMsePy@jz{pX*`$M1av{X|)O`fEAX+~b~x*O?k%cmIfoY;`)-5ZspZ zxXT$vBrouaxf_C`Hbyd#F#c|`i`1kSJF&p%IB5;T$rkiZAnYNmQN%X0N$#a4@dcJF z>4${T!dqpeTRY(|ip&FR=)*)3F1+bz!shy*HITc*eO9?E3ZQ6(IOs6^tdr$K{i9ooT6Z3d4F$5 zAE#k&no;^2AqgH1gQ;B&V|%@U>=A%$YtGd&A$~QOW6kS2gB>|}^@{7_(BJD0x>7dO za6msULt^WrWU-;uoMxdIhb=N7B`9;XVGLFPCv$-`eA?+`Lc@a5%$5rp31~gY%fNs| zj>swz%6!We|K;>jmRXpb!$9Yx2jQ~}^`ZbN5lJIb349)$2LQ}@)R5zQ@5l~T@RbEy zW`HH~FnuF8zygc@wA(>oAlu{o4@)op#h)eM#pyC>tXV=h

&mbPTKwZnBGeQ>EXZ-VFr#BAIBJ`G{8Ga$r~#15}`KQ9Q)a>$`DR)L}4 z;qw$!Jw{R+TaSvcL*_G)fx%%^7h}5?c@R;ve2vLA`hog9$c?Zb21j_c1RW-`TugJT zm3leoPwedusTrTch@c^wn$qEp79C^o+w?*?esG^D1J|aY@$DXnU4>{p`4a#|!xlpx z^|t*~#^~oeoX_oZeqBpvEedi)WQ%IcctQ){OI3w&SzQ8EOm}lb={+6KpLgF#yFuU**O7|Spi_mei%)wA6l0_#Ly}i1KOlb5ki7^#e*sr z+FiNH0Wpj^_Z@Va!0kdc48sFk77twIa}4#Xr%VknMcYU{9jL`9Bs$n}s5vFP6(I&l zF`y&S!skgTXSvji9{J+_oqN?Vvn|}Vh*wlCx~&{5^7+UBoYq5OI9I{j`QMiw`Zv%0 z&0+Eu;KS6J@k&-1*E_@(@o+9UF3J8xtd6?To zp>>c4qp`3{$N}%KbPX?$b+{)h13M{VUWL9RLg#8>tB9#)I5+$Xg@iSjeeDQL4*6AX z5C~{A47)z72=KPo?#i&M6)NotFWB>gVS&9-_-oqxbV-0BsK>mW zyi4f*RZgR3E^cUXxi+jY1#x+fb-7)9iMhhBezUyMM$N0vI<~SxqjWTvcOJecKm6B! zDvzK1hTQn`$xNQVIhWmGU$5Ghw4yG@q&Q*@m151GKK2|En+d+9JQ| zapCI~g{>2`YBuL$4TnFFfAqcY$;A{iaZQ=#P<)wi8Ri1hy~sb%H^VY+C^2`Ml<2`! zvyGmYltr2VHxlEh2R%=g`5YZ9h(*CDf`&phSyy^~l;=*ijM(d|77(C+m|A6wejRw| zIk2LgGFZ;uQ!h0fXz{Vr=W=v} z!A`p&-FA}&N+LF@k2ecx%{Jr)$cmLpd}Q;uZ(GjoZ_(D*`uDeIx?H=NBHXrt&ued` zQCS&|%F^9y#EKv^H*s|`mNz4rp!coyHA zMXAxUL>QPD5_f1kv^9h-rZak+H{%iWpB?E*Jhw4*?3G3?gxAHER}3*|O-B8LM$sS| z4+B8u#m|ma!&;SLN+)UBm>O^@ejess8TnRhA*lhQWdqg01t~Tej~zT-?s+AET$XY~&^xGXyYB#()0i#Xwl=&3&MX?pOf!r*!$>@`bkiNY;I8eXUQm3|{M-NFk zZan@zpjy_D_h`dZw&(>R--_z(LHi*p*O1X>M<$lH?dui`1itbuc&YHcy&mzMC{$Li z`c<$r&*a08za@Y4{U6AW{?ngpQk+rR=;g_UUcGt}u#2z`7KkfU-r*2EHs%YWW$M>ERw}mY<0dL3;|Kx}A%fJ77`RtQ_kbI{j zug*uBU&K6Nhw3qg1HcH#O&j)JqKLUpMk(!t*b&fkv`g^Ln|w?`VqHd|H`8-ja)X2q zr^W^ZM;?|5ZgO)yx&AwmHSQJ6X}vLh zodg5}Lr?JTy*u*wSD$e7i`CNk1@;_q;boNWurfj=gf34dDi9tD94W`4- z*r0)9#U6-)iSwzzmcT}}q^lloIG~4R5#m}8l@QAYUKQCzY>sQRDsC(FzbkYiJbRC=;h{4A-EfJHxIC^rD0;=jQ6=F=Kuf` zIY~r8R6!U7;v+kK77pdAsFLmgpRCWGhYvp$WzgdPlA*9-J^1&x4~18}h$4Pac073nIJ|ItA7=Jbpj?c99`p%8>MB=%)yODkgwF-U%AT8X0MhY%aJr*aEVTtZ1B zF|S8vo@=zvmi9itNC5l+Ix#q3c@Y0EtQTn8C06{KrW!8Rxgb1e4DI%m7)Qg3JQy8- zU>L3)7wc0}M*vd$7wOersP04``v9uXGYg00uv=&h&1JTL#Pqws*MgUYQK6uS z!%&HS-ZlhmeG3?XPl%n+Q^8At)Ca?gA_AycVJk^GnlH{qYGvJhX%CNR=w<2>X+YWw zpIP=$NK$f*LgR`MwPDp8LScZ3qIForzlHpcIaYW;Jz2Z8$GQw|sO}R_FujgJ^EWd5 zXncN3_5g<%a-;V~s|CgTv1N5MDP;Eeg$##dHLgB+TCwMBMGC2*Sf0IlB`4=+a{ulF z>cppL;WRBTLiptg2bKkSqdB04Y1PvMmc)fiygICjymW&CQvo0-yb;NKYRD1y{iS@L zFg!H3Io_q-k|Xw>La;9h!%3`GqE4Et%pd^=$O}#uT3s-F%j1l#Y9hD^ja@SX>FnLn zH`+EC&LlFyM_)Cw+0%`J7<#ZZk@EJ2CH{O>&b|dbTz~qn;A7!-6;yxYtqj^q7MuA- z;=tvK{9xOQ6QVJ3WnRsvXQ!n0Hav_Kxw$`9L=beva!2MjOAadR>|~^v#6-nYu2#XM z&PWsV6v}$bjD~;_EW8ga-d-&G((YjGt>H`O7ZdezZ5jjsQg|0k~;oJK_1 zMm^c6@TB^DD;5RRC#CmkG3h36KC%>oLb+5mv~(be0w>CL?4U469MdCq)v~a;BxDlX zBBiY4yd`ottV51CI-i?CmCg#Sq2jUQTHz#DtByk1ev5Otp3V7+aKrx(k5&C`T~Ob{ zAipOkDc8jPg07ZJ$1_h@mxXx+Fagq%2Of`wK_H0+v!S715FFXt-IL?;SYDsNyG?i^ z7T}O;0>9fI@C268lmiQ$ZkyN97XdI8gvb4GTIaP$u3^{FncC0ama7b$1fJM2m0s(0N zrpf*JAxRLVi7IHq&wI#W%TPcSeqQ939?PGjsv*Cu$GVdB9z-)eY5!70znWncp(z;$ z@qCf6SlhOG3VHA)DxQ2rAz5IRXdhF_4t+VF$AdyPt2TH7&BHFnW3HZsRztfzrGgCl za_vS(Ch<}$$C>2QNMtx<1>fLEU_>7@_`@rJo9iA$Fv z8WcvevSL9ar-#GFdT#t$@g#=|kU14fc7UR8JhN;rE6weSbVd9OhJis>@UK8l#M%~w zy?&={x#iqM*GA)+4EBy?cyvJUlN}7dP{Ubak`7T_Dcq2RaD+vOaxLfmJKT8bxnW<1 zfre<5MpsyF6s+3I)u?tgTzRWXTiNI_tqoHMH56Vcl1hS#jjfc0V?H+D$Gv@}S-q(n z+Xy_sN?gTU=pETXMCqU9Q<+RA9&%Im@BoI6F_o;IX`&$wOaWAe3{jxF77lwjWDUH&>2{gN zst}7%w)Zrgv!VA5Va{Ag@9>^a&fyV+(QeO&VHP9Yihn<6~V2%`JMNA7` znqrfY@jU|$hn}OR%aUZiA0oC8k>#$Ni~&`NtGoz}X;RLCLHTT95<^2FQ4iBK$!RcL zW0M%CvauRWreSmkOVT^3deJH0Gmb;0)aTna`u&a!cXu4($k-?Bq)o1fF>d^lUK5v9 zu9e`?gZCH?lG4UW!~tgt2>Ve7*KFNes~J%gl6bj1~2BT#QEDbqi9P+yD^It|B z7_MSwy&rU?QE$J8`eO}NverR`s#y*Y$C39)OG^gWkamxzhwk+B6*s_>I^tI(duX5+ z^OCnsq*hH@uMt;soW)jl#}>lqzDrvjl0>0gwtS7_@ua?#yw4PA3s#hA5<3)NkVNXe zLnhvF=i>Z7i|b<9YPyo)7r7-26!Mf@5UNE5n$mpgw3wDFdKRn~p)Nv}`%r0v5>0IJsMkqS6MoCIG7Sj|E|^ZI zOS&eD78M*N*quD^C>tJVJx;uL^*6_&L&NA9~-ukJIYX7N%&=u$J z%JX`~ef8Jl>A%EKaZBso>8d9xielr5!td*V+4==NY4nf=EG8vk&2lB234a>ss#Z()tcJK#El&-gsi!?D?DOF9dA=ZgFat}X(d3XQz*KmzMq`H_2Xtlh zI{`t!6QV(m=iG^KvcI>>Aqh_N=4+Sp$z4{cfTgmY;(Xu zoG@8jkt2mXhfSW+`lQTL{rl@#D$!f#xPA+NkAL$#-?+aXQqv8Kzs4nQ8{Jz*$iCpZ z0)a6!S_#W(J0Z>~*AI&|yI>1IbT)1`G;x0-&z^ox(6FV(FmI*Y;>Em&$!N@h0X#3M z!k7xSb(IW5RdR}foCrNUOW0#yOM+0D&@##@EX1`j^Z@$MFtJ2Hy%9nbDAIe~fk`nU znMYnHwkRFgma$D6q!+iF)+QVO3 z7{V<*tKK)8o@>bLOIy9wg7SQcguON))L(t`Z0HK7an<+Nh0Xf!>S1!b5J0HL>a9MnWtc%F}mKU>IM+Lzf2xs z+pxm<58h`Z$GXA*>#tE6R^2t$@4V~@!(+m~>&MvQON2RwD=oYK%a4B|fBlo6$fv*g z4XMXtHL8qUrHlrN-(gU*t)=@n-+d@|hdoXkV}f?r8BzV*_!co-#Vf%mi&(;EnBPkb1!p4e#wadk8;q|kEv({sFbKici+aX!W5#N&gNbTL zUU!Y7-sPNM!-@&yeIO-bfqG=yQHi-NS3VePIMzTfoWuPC%Nrs1tN+q-RY{S1q@>`) z_Np0^?6}__a(zq8VOvkAqbtFoOHcG|$GGa=r|y}qd+z%0H$ve}c~C+6BbmtsQBe(3R$%B(pczyvG>hdg7axhK1WzJ|UAvA331cBM;t3-dq?l;FP;*tDMDg6R2N zKU14I*AQGXa@B3Di>Nt%&YkQB=|_adw#eDV8yV^Iy?b~^TJ0vA?@=(Q8w_jvJcj6U zQ)_P94uS^@Ioh^ST^0suSoJrt?K-bd@@k6}4TjVM-I33qd@ld_M}JNl@Zr(Ey}8o* zXY<9(5MV+=24jGjhuj6;r_1%Z2{}lpy!M8>G8&JGv~x7euN-&`gc5XB*!5pz9Ivuf z^tQdrfbfXe5;r|Kn}H%{G^p4;m|<5)uGxpgXV1%ulYg$Sk2J2MhO|4_k%QeG>2&+- zJ9fK0YwdW!f@z~w7cccb8OK&~w8&wmI7tm|&UEc=U`*(aIVAD0CJZengaA4{k?KMA0o| zJejhu#!54yC9v_Fji>aMU^k>ihCrT>#8tVzilh? znWYv|mTPzcN%zZ_U&tq){Dbc^&ghk}Dvs65-cSw?hw}Wz8JAoZxh)-P>y_9=p3#W8 zMFCz7Z3$FNK%jRp3e`+WW1&i3=9rVdC6jl|DmOi+vL8zQ(k}qMJsK_zh+#*nz0TBb zC}Zm#>f@ll0Faj8tnYyaxC!kouvwwa_4@QwcKThpd$h+e2SHw&3W_L9!oAV1XBw(9 z&|y#jU@4V&VTAm#5!vS1m;!=Vh1c(E1b8+&WBqG+q=}7$Md3I3t!{6Gcpxg)46hBFNCciprK>-R_kl5=3pw`^qY*1}395 z>@<9_q)8H$+|69|48`$&yq(TWx#{$|t&VGDXs zR>nx!H4lQ$RVY#lR(}*(r`|k^4GHs%am6YPAqw7f0of*ug%!4>69Om94e5mo&#xl6 zHp$vDp3A-uKVJtk-R3zid%ZLm%hmsedBV-4J%FL&R~X9Vr%#@+(u4QfQ2#4UZ>!Vk zt8pF6{I}0!InU&y_urM{g9EMLX3k2`uZFd93O4TjH6kIQ4?tm)N_kqfWme{+*@+M_ zkBx7R5S!#$5Ja{ZEQ26NZP!IwcfA-$X;cVr$w=)4RfxC{XZKd&Jrc`F^-23_k0`hNkopJFdxujUK@0000< KMNUMnLSTa5`eeEQ literal 0 HcmV?d00001 diff --git a/src/main/java/Deadline.java b/src/main/java/task/Deadline.java similarity index 100% rename from src/main/java/Deadline.java rename to src/main/java/task/Deadline.java diff --git a/src/main/java/Event.java b/src/main/java/task/Event.java similarity index 100% rename from src/main/java/Event.java rename to src/main/java/task/Event.java diff --git a/src/main/java/Task.java b/src/main/java/task/Task.java similarity index 100% rename from src/main/java/Task.java rename to src/main/java/task/Task.java diff --git a/src/main/java/TaskList.java b/src/main/java/task/TaskList.java similarity index 98% rename from src/main/java/TaskList.java rename to src/main/java/task/TaskList.java index 63d565ec89..b5a2b86af3 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/task/TaskList.java @@ -1,4 +1,4 @@ -package duke; +package duke.task; import duke.task.Task; import java.io.Serializable; diff --git a/src/main/java/Todo.java b/src/main/java/task/Todo.java similarity index 100% rename from src/main/java/Todo.java rename to src/main/java/task/Todo.java diff --git a/src/main/java/Parser.java b/src/main/java/util/Parser.java similarity index 77% rename from src/main/java/Parser.java rename to src/main/java/util/Parser.java index 2e00806377..f78b9aa0c6 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/util/Parser.java @@ -1,4 +1,4 @@ -package duke; +package duke.util; import duke.command.Command; import duke.command.AddCommand; @@ -11,8 +11,9 @@ import duke.task.Todo; import duke.task.Deadline; import duke.task.Event; -import duke.DukeException; +import duke.exception.DukeException; import java.util.HashMap; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; @@ -116,32 +117,36 @@ public static Task parseTask(String input) throws DukeException { String type = words[0]; String info = input.substring((type + " ").length()); - switch (type) { - case "todo": - if (info.equals("")) { - throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); - } - return new Todo(info); - case "deadline": - String[] args = info.split("/by"); - String description = args[0].trim(); - Date date; - try { - date = dateFormatter.parse(args[1].trim()); - } catch (Exception e) { - throw new DukeException("☹ OOPS!!! Incorrect date format."); - } - return new Deadline(description, date); - case "event": - args = info.split("/at"); - description = args[0].trim(); - try { - date = dateFormatter.parse(args[1].trim()); - } catch (Exception e) { - throw new DukeException("☹ OOPS!!! Incorrect date format."); + try { + switch (type) { + case "todo": + if (info.equals("")) { + throw new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); + } + return new Todo(info); + case "deadline": + String[] args = info.split("/by"); + String description = args[0].trim(); + Date date; + try { + date = dateFormatter.parse(args[1].trim()); + } catch (ParseException e) { + throw new DukeException("☹ OOPS!!! Incorrect date format."); + } + return new Deadline(description, date); + case "event": + args = info.split("/at"); + description = args[0].trim(); + try { + date = dateFormatter.parse(args[1].trim()); + } catch (ParseException e) { + throw new DukeException("☹ OOPS!!! Incorrect date format."); + } + return new Event(description, date); + default: + throw new DukeException("Invalid task input."); } - return new Event(description, date); - default: + } catch (IndexOutOfBoundsException e) { throw new DukeException("Invalid task input."); } } diff --git a/src/main/java/Storage.java b/src/main/java/util/Storage.java similarity index 94% rename from src/main/java/Storage.java rename to src/main/java/util/Storage.java index bb42cafd25..b99057110f 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/util/Storage.java @@ -1,7 +1,7 @@ -package duke; +package duke.util; -import duke.TaskList; -import duke.DukeException; +import duke.task.TaskList; +import duke.exception.DukeException; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.ObjectInputStream; diff --git a/src/main/java/Ui.java b/src/main/java/util/Ui.java similarity index 91% rename from src/main/java/Ui.java rename to src/main/java/util/Ui.java index 770390eef6..c22ca0bea3 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/util/Ui.java @@ -1,4 +1,4 @@ -package duke; +package duke.util; import java.util.Scanner; @@ -6,6 +6,8 @@ * Ui class that handles output of Duke to the console. */ public class Ui { + public String buffer; + String format(String output) { return " ____________________________________________________________\n" + indent(output) @@ -27,9 +29,14 @@ String indent(String output) { * Prints output of Duke. */ public void printResponse(String output) { + this.buffer = format(output); System.out.println(format(output)); } + public String getOutput() { + return this.buffer; + } + /** * Reads input of user from the console. * diff --git a/src/main/java/view/DialogBox.fxml b/src/main/java/view/DialogBox.fxml new file mode 100644 index 0000000000..e2b59b6e48 --- /dev/null +++ b/src/main/java/view/DialogBox.fxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/view/MainWindow.fxml b/src/main/java/view/MainWindow.fxml new file mode 100644 index 0000000000..3add5bc787 --- /dev/null +++ b/src/main/java/view/MainWindow.fxml @@ -0,0 +1,19 @@ + + + + + + + + + + + +