From d8398594b7bc43da5eb865321c5a50cec4b3923d Mon Sep 17 00:00:00 2001 From: damithc Date: Mon, 25 May 2020 00:58:18 +0800 Subject: [PATCH 01/32] Add Gradle support --- build.gradle | 46 ++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 +++++++++++++++++++++++ gradlew.bat | 103 +++++++++++++ text-ui-test/runtest.sh | 0 6 files changed, 337 insertions(+) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat mode change 100644 => 100755 text-ui-test/runtest.sh diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..20c0521c --- /dev/null +++ b/build.gradle @@ -0,0 +1,46 @@ +plugins { + id 'java' + id 'application' + id 'checkstyle' + id 'com.github.johnrengelman.shadow' version '5.1.0' +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' +} + +test { + useJUnitPlatform() + + testLogging { + events "passed", "skipped", "failed" + + showExceptions true + exceptionFormat "full" + showCauses true + showStackTraces true + showStandardStreams = false + } +} + +application { + mainClassName = "seedu.duke.Duke" +} + +shadowJar { + archiveBaseName = "duke" + archiveClassifier = null +} + +checkstyle { + toolVersion = '8.29' +} + +run{ + standardInput = System.in +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 zcma&OV~}Oh(k5J8>Mq;vvTfV8ZQE5{wr$(iDciPf+tV}m-if*I+;_h3N1nY;M6TF7 zBc7A_WUgl&IY|&uNFbnJzkq;%`2QLZ5b*!{1OkHidzBVe;-?mu5upVElKVGD>pC88 zzP}E3wRHBgaO?2nzdZ5pL;m-xf&RU>buj(E-s=DK zf%>P9se`_emGS@673tqyT^;o8?2H}$uO&&u^TlmHfPgSSfPiTK^AZ7DTPH`Szw4#- z&21E&^c|dx9f;^@46XDX9itS+ZRYuqx#wG*>5Bs&gxwSQbj8grds#xkl;ikls1%(2 zR-`Tn(#9}E_aQ!zu~_iyc0gXp2I`O?erY?=JK{M`Ew(*RP3vy^0=b2E0^PSZgm(P6 z+U<&w#)I=>0z=IC4 zh4Q;eq94OGttUh7AGWu7m){;^Qk*5F6eTn+Ky$x>9Ntl~n0KDzFmB0lBI6?o!({iX zQt=|-9TPjAmCP!eA{r|^71cIvI(1#UCSzPw(L2>8OG0O_RQeJ{{MG)tLQ*aSX{AMS zP-;|nj+9{J&c9UV5Ww|#OE*Ah6?9WaR?B04N|#`m0G-IqwdN~Z{8)!$@UsK>l9H81 z?z`Z@`dWZEvuABvItgYLk-FA(u-$4mfW@2(Eh(9fe`5?WUda#wQa54 z3dXE&-*@lsrR~U#4NqkGM7Yu4#pfGqAmxmGr&Ep?&MwQ9?Z*twtODbi;vK|nQ~d_N z;T5Gtj_HZKu&oTfqQ~i`K!L||U1U=EfW@FzKSx!_`brOs#}9d(!Cu>cN51(FstP_2dJh>IHldL~vIwjZChS-*KcKk5Gz zyoiecAu;ImgF&DPrY6!68)9CM-S8*T5$damK&KdK4S6yg#i9%YBH>Yuw0f280eAv3 za@9e0+I>F}6&QZE5*T8$5__$L>39+GL+Q(}j71dS!_w%B5BdDS56%xX1~(pKYRjT; zbVy6V@Go&vbd_OzK^&!o{)$xIfnHbMJZMOo``vQfBpg7dzc^+&gfh7_=oxk5n(SO3 zr$pV6O0%ZXyK~yn++5#x`M^HzFb3N>Vb-4J%(TAy#3qjo2RzzD*|8Y} z7fEdoY5x9b3idE~-!45v?HQ$IQWc(c>@OZ>p*o&Om#YU904cMNGuEfV=7=&sEBWEO z0*!=GVSv0>d^i9z7Sg{z#So+GM2TEu7$KXJ6>)Bor8P5J(xrxgx+fTLn1?Jlotz*U z(ekS*a2*ml5ft&R;h3Gc2ndTElB!bdMa>UptgIl{pA+&b+z_Y&aS7SWUlwJf-+PRv z$#v|!SP92+41^ppe}~aariwztUtwKA8BBLa5=?j3@~qHfjxkvID8CD`t5*+4s|u4T zLJ9iEfhO4YuAl$)?VsWcln|?(P=CA|!u}ab3c3fL8ej9fW;K|@3-c@y4I;^8?K!i0 zS(5Cm#i85BGZov}qp+<-5!Fh+KZev3(sA2D_4Z~ZLmB5B$_Yw2aY{kA$zuzggbD{T zE>#yd3ilpjM4F^dmfW#p#*;@RgBg{!_3b6cW?^iYcP!mjj!}pkNi{2da-ZCD2TKKz zH^x^+YgBb=dtg@_(Cy33D|#IZ&8t?w8$E8P0fmX#GIzq~w51uYmFs{aY76e0_~z2M z(o%PNTIipeOIq(H5O>OJ*v8KZE>U@kw5(LkumNrY>Rv7BlW7{_R9v@N63rK)*tu|S zKzq|aNs@81YUVZ5vm>+pc42CDPwQa>oxrsXkRdowWP!w?=M(fn3y6frEV*;WwfUV$s31D!S_;_~E@MEZ>|~wmIr05#z2J+& zBme6rnxfCp&kP@sP)NwG>!#WqzG>KN7VC~Gdg493So%%-P%Rk!<|~-U|L3VASMj9K zk(Pfm1oj~>$A>MFFdAC8M&X0i9-cV7Q($(R5C&nR5RH$T&7M=pCDl`MpAHPOha!4r zQnYz$7B1iLK$>_Ai%kZQaj-9)nH$)tESWUSDGs2|7plF4cq1Oj-U|+l4Ga}>k!efC z*ecEudbliG+%wI8J#qI!s@t%0y9R$MBUFB)4d47VmI`FjtzNd_xit&l1T@drx z&4>Aj<2{1gUW8&EihwT1mZeliwrCN{R|4@w4@@Btov?x5ZVzrs&gF0n4jGSE33ddUnBg_nO4Zw)yB$J-{@a8 z);m%fvX2fvXxogriNb}}A8HxA)1P-oK+Da4C3pofK3>U_6%DsXFpPX}3F8O`uIpLn zdKjq(QxJTJ4xh->(=lxWO#^XAa~<7UxQl8~8=izS!TcPmAiBP5Et7y?qEbFd9Q=%IJ;%Kn$lto-~3`}&`x=AVS+Uo7N*hbUxhqVH_w^sn!74z{Ka#*U6s z=8jIrHpUMBC@@9Jn~GS<$lse*EKuX%3Swl5&3~GiK_$vn8Vjqe{mjhBlH}m4I8qK+ ztU50COh7)d-gXpq-|}T;biGa^e=VjxjjFuoGIA8`2jJ}wNBRcsx24?7lJ7W4ksNPv zA7|gcXT@~7KTID#0|EX#OAXvgaBJ8Jg!7X#kc1^Tvl;I(=~(jtn-(5bhB=~J^w5bw z8^Hifeupm;nwsSDkT{?x?E(DgLC~Nh8HKQGv`~2jMYrz9PwS^8qs3@nz4ZBCP5}%i z=w}jr2*$X-f(zDhu%D8(hWCpix>TQpi{e`-{p^y?x4?9%)^wWc?L}UMcfp~lL|;g) zmtkcXGi9#?cFOQQi_!Z8b;4R%4y{$SN~fkFedDJ&3eBfHg|DRSx09!tjoDHgD510Z z_aJLHdS&7;Dl;X|WBVyl_+d+2_MK07^X1JEi_)v$Z*ny-()VrD6VWx|Un{)gO0*FQ zX{8Ss3JMrV15zXyfCTsVO@hs49m&mN(QMdL3&x@uQqOyh2gnGJYocz0G=?BX7qxA{ zXe0bn4ij^;wfZfnRlIYkWS^usYI@goI9PccI>}Ih*B!%zv6P$DoXsS%?G)|HHevkG z>`b#vtP=Lx$Ee(t??%_+jh(nuc0Q&mCU{E3U z1NqNK!XOE#H2Pybjg0_tYz^bzX`^RR{F2ML^+<8Q{a;t(#&af8@c6K2y2m zP|parK=qf`I`#YxwL=NTP>tMiLR(d|<#gEu=L-c!r&(+CpSMB5ChYW1pUmTVdCWw|!Ao?j&-*~50S`=) z9#Knf7GPA19g%Y7wip@`nj$aJcV|SakXZ*Q2k$_SZlNMx!eY8exF;navr&R)?NO9k z#V&~KLZ0c9m|Mf4Gic}+<=w9YPlY@|Pw*z?70dwOtb<9-(0GOg>{sZaMkZc9DVk0r zKt%g5B1-8xj$Z)>tWK-Gl4{%XF55_Ra3}pSY<@Y&9mw`1jW8|&Zm{BmHt^g=FlE{` z9Lu7fI2v3_0u~apyA;wa|S4NaaG>eHEw&3lNFVd_R9E=Y? zgpVQxc9{drFt2pP#ZiN~(PL%9daP4pWd*5ABZYK{a@e&Vb`TYiLt$1S>KceK36Ehz z;;MI%V;I`#VoSVAgK3I%-c>ViA>nt=5EZ zjr$Jv~$_vg<$q<@CpZ1gdqP_3v^)uaqZ`?RS_>f(pWx3(H;gWpjR?W8L++YPW;)Vw3)~tozdySrB3A2;O<%1F8?Il4G|rO0mEZYHDz!?ke!$^bEiWRC1B%j~ws0+hHS;B8l5Wh)e+Ms7f4M4CbL%Q_*i~cP}5-B(UkE&f7*pW6OtYk5okQCEoN4v|7;(+~~nyViqo5 z(bMGQi$)KN6EmfVHv4pf2zZMJbcAKyYy>jY@>LB5eId|2Vsp{>NMlsee-tmh({;@b z@g;wiv8@a1qrDf-@7$(MR^M^*dKYBewhIDFX%;*8s zR#u?E;DJO;VnTY6IfbO=dQ61V0DisUAs4~t|9`9ZE(jG}ax#-xikDhsO_4^RaK ziZ?9AJQP_{9WuzVk^s_U+3V8gOvVl5(#1>}a|RL>};+uJB%nQM-J>M4~yK)cioytFXtnmOaJZSiE+3g}C`Im~6H z*+-vjI>ng5w>>Y!L(+DwX2gs0!&-BFEaDie4i5ln*NGP$te7$F9iUlJl4`XpkAsPm z0l?GQ17uN^=g~u1*$)S`30xL%!`LW*flwT*#svAtY(kHXFfvA`dj*pDfr0pBZ`!La zWmX$Z@qyv|{nNsRS|+CzN-Pvb>47HEDeUGFhpp5C_NL0Vp~{Wc{bsm_5J!#tuqW@? z)Be zb&Gj&(l*bHQDq7w-b`F9MHEH*{Dh~0`Gn8t`pz}!R+q~4u$T@cVaUu`E^%0f-q*hM z1To6V31UGJN7a-QW5;nhk#C26vmHyjTVZkdV zqYMI9jQY)3oZt=V0L7JZQ=^c2k){Y_lHp&V_LIi*iX^Ih3vZ_K<@Di(hY<&g^f?c$wwF-wX1VLj>ZC4{0#e`XhbL_$a9uXS zKph*4LupSV2TQBCJ4AfOXD8fs2;bAGz-qU4=Qj$^1ZJX z2TtaVdq>OjaWGvv9)agwV)QW9eTZ-xv`us2!yXSARnD5DwX_Vg*@g4w!-zT|5<}-7 zsnllGRQz>k!LwdU`|i&!Bw^W7CTUU3x`Zg8>XgHj=bo!cd<#pI8*pa*1N`gg~I0ace!wzZoJ)oGScm~D_Sc;#wFed zUo;-*0LaWVCC2yqr6IbeW3`hvXyMfAH94qP2|cN``Z%dSuz8HcQ!WT0k38!X34<6l zHtMV%4fH5<6z-lYcK;CTvzzT6-^xSP>~a*8LfbByHyp$|X*#I6HCAi){gCu1nvN%& zvlSbNFJRCc&8>f`$2Qa`fb@w!C11v1KCn)P9<}ei0}g*cl~9A9h=7(}FO!=cVllq3 z7nD)E%gt;&AYdo{Ljb2~Fm5jy{I><%i*GUlU8crR4k(zwQf#nima@xb%O71M#t-4< z(yjX(m^mp_Y;5()naqt2-VibylPS)Oof9uBp$3Gj`>7@gjKwnwRCc>rx%$esn);gI z5B9;~uz57n7Rpm8K^o=_sFPyU?>liHM&8&#O%f)}C5F7gvj#n#TLp@!M~Q?iW~lS}(gy%d&G3p?iBP z(PZQUv07@7!o3~1_l|m5m;Xr)^QK_JaVAY3v1UREC*6>v;AT$BO`nA~KZa1x3kV2F z%iwG7SaaAcT8kalCa^Hg&|eINWmBQA_d8$}B+-Q_@6j_{>a- zwT3CMWG!A}Ef$EvQsjK>o)lJ;q!~#F%wo`k-_mT=+yo%6+`iGe9(XeUl;*-4(`G;M zc@+ep^Xv&<3e7l4wt48iwaLIC1RhSsYrf6>7zXfVD zNNJ1#zM;CjKgfqCabzacX7#oEN{koCnq1-stV+-CMQ=ZX7Fpd*n9`+AEg9=p&q7mTAKXvcbo?$AVvOOp{F>#a;S?joYZl_f}BECS%u&0x!95DR;|QkR9i}`FEAsPb=)I z8nb=4iwjiLRgAF}8WTwAb^eA>QjL4Srqb#n zTwx^-*Z38Uzh@bX$_1tq>m{o8PBX*t3Lqaf$EBqiOU*2NFp{LJX#3}p9{|v{^Hg4f zlhllKI>F+>*%mu6i9V7TT*Wx-zdK z(p8faUOwGOm5mBC%UGA1jO0@IKkG;i&+6Ur8XR2ZuRb$*a}R^-H6eKxcYodlXsF`& z{NkO+;_Yh-Ni@vV9iyzM43Yibn;oC7hPAzC24zs&+RYdY&r`3&&fg2hs62ysV^G`N zHMfBEFo8E3S$0C_m({bL8QCe$B@M{n1dLsaJYIU;(!n*V?0I1OvBB=iYh&`?u8 z&~n-$nbVIhO3mMhCQRlq%XRr1;Hvl=9E_F0sc9!VLnM>@mY~=Cx3K5}wxHKEZF9pC zIdyu1qucM!gEiomw7bW0-RwbX7?o=FE#K0l4`U2KhC8*kMWaEWJyVNZVu_tY2e&4F zb54Lh=Oz>(3?V$!ArXFXh8Cb3i;%KQGCrW$W#;kvx$YA2gofNeu?@nt>Yq8?2uJQp zUTo14hS%&dHF3Uhm~Z1>W)yb%&HoM!3z?%a%dmKT#>}}kKy2B=V3{Nu=bae%V%wU$ zb4%^m?&qn==QeHo`nAs3H}wtiK~!!&i|iBLfazh6!y9F)ToKNyE0B385!zq{p)5vB zvu`R#ULIS|2{3w52c*c$4}Pe>9Fw&U^>Bb_LUWn!xPx3X-uQsv(b1XFvFzn#voq0* z5~o`V_G805QXdgAOwOjoqmZ?uzwBVYSNP0Ie8FL`P0VK1J4CzV@t&%0duHB{;yIL$FZ9 zz#s#%ZG6ya&AwE;0_~^$1K

Hnj76Oym1QVh(3qRgs)GmgnEt-KxP|nCFY3uezZn zmtR0CZ$Z_-+f07?lu_tr~IC{&U6+QOth>ZgYk4V2FI$B2V3`M`Jk zsr>>lupymPeK129PfpDt9?GA2;I>03Ktz8NxwvTroqu8oaRB&bXT}G=^2UyOW}(4H z;9sG^YwV8K7pC&&viM^X_pfeFoN!cIhrE>OPQ5E<4KKDyPhRV^BGb_^Y6GO6#w}c= zu`0fC-@F4qXQtnB^nPmfI7Uw0bLhY^09TCO+H2(nvg8jdPjMAi4oSX%GP3oeo0`ks z%DoV|waU-Q7_libJCwnnOL9~LoapKqFPpZx?5FygX zsA~*ZR7X=@i{smf?fgxbcY6Y`JvD50P=R;Xv^sANPRp-Hc8n~Wb*gLIaoZJ2Q^CFe z_=G}y&{_NXT|Ob??}$cF7)$oPQMaeN_va1f%>C>V2E01uDU=h~<_fQKjtnl_aho2i zmI|R9jrNdhtl+q*X@}>l08Izz&UJygYkbsqu?4OOclV{GI5h98vfszu2QPiF?{Tvh19u_-C^+NjdAq!tq&Rd`ejXw#` z@U15c$Nmylco)Yj4kctX{L+lz$&CqTT5~}Q>0r-Xe!m5+?du6R&XY|YD5r5C-k*`s zOq-NOg%}RJr5ZWV4)?EO%XzZg&e8qVFQ?40r=8BI-~L%9T7@_{1X@<7RjboXqMzsV z8FiSINMjV*vC^FCv_;`jdJ-{U1<_xjZg4g?ek z4FtsapW_vFGqiGcGHP%?8US~Dfqi8^ZqtHx!}0%dqZFg%nQB)8`mE$~;1)Fb76nFk z@rK#&>2@@)4vO&gb{9&~R8-_{8qz6Rmw`4zeckD(L9xq}{r(fUO0Zh-R(d#x{<0j| z?6xZ2sp3mWnC}40B~g2QinHs1CZqZH&`+x2yBLT8hF7oWNIs_#YK2cyHO6AoGRG|RM>Hyn(ddpXFPAOGh~^0zcat`%&WoEQf9)!@l*3Tt@m>Lb z6$+$c!zsy_=%L9!_;jfd`?VXDd*^Vn%G>n~V9Vr6+_D@#E+dWB#&zAE+6xJeDMr1j zV+Tp~ht!M%^6f?)LBf8U1O4G#CutR07SB>8C&_&;g3TdIR#~e~qRtwd>&)|-ztJJ#4y0|UMjhJZlS8gA zAA260zUh+!$+xMfWKs|Lr23bcy#)JNnY|?WOka&wTS7_u%*N7PrMl1Lp9gxJY%CF? zz4IA@VVxX{knZPlNF+$9)>YIj#+(|$aflt=Wnforgn6`^3T+vaMmbshBjDi&tR(a7 zky~xCa77poRXPPam)@_UCwPdha^X~Aum=c0I@yTyD&Z!3pkA7LKr%Y6g%;~0<`{2& zS7W$AY$Kd}3Tg9CJgx=_gKR59zTMROsos?PU6&ocyCwCs8Qx1R%2#!&5c%~B+APu( z<1EXfahbm{XtOBK%@2a3&!cJ6R^g|2iLIN1)C2|l=;uj%tgSHoq2ojec6_4@6b<8BYG1h-Pm_V6dkRB!{T?jwVIIj&;~b7#%5Ew=0Fx zc(p7D1TT&e=hVt4spli}{J6tJ^}WL>sb`k}&gz+6It`Yz6dZdI53%$TR6!kSK2CfT*Q$`P30 z;$+G$D*C$U(^kkeY!OWn$j@IUu0_a{bZQ=TCbHD1EtmZ0-IBR<_3=tT%cz$>EE!V}pvfn7EMWs^971+XK}~kxSc_ATJJD$?)1Gz^Jq!>Hz#KkdCJ~jb-Y*Xv01_}}=T_V-A1<3O!V9Ezf z%Lnjihb3>=ZV}jSeqNu5AAdVbe|`;|p<%W#-<$s1oDYrB;C({psqV>ENkhadsC{cfEx=teVSB`?FOs+}d#pssxP z(ihudAVu3%%!*vOIWY11fn1M0&W|(|<2lEShz|#%W|wV2qM%#+P9NOy1x8jytHpfU zh;_L^uiL<<$L@~NpRXSrkJgdC>9R=>FmVu3^#C?3H>P{ue=mcv7lBmnfA?mB|L)EF zHv%Nl|D}0Tb~JVnv$ZysvbD8zw)>|5NpW3foe!QHipV9>Zy`|<5?O+rsBr*nZ4OE} zUytv%Rw7>^moSMsSU?@&a9+OdVgzWZnD>QXcUd{dd7vad+=0Hy)4|0A`}rpCx6cu!Ee5AM=iJ?|6=pG^>q(ExotyZP3(2PGhgg6-FkkQHS?nHX(yU0NG;4foCV|&)7 z1YK!bnv%#5n<25|CZ>4r1nK=D39qMzLAja*^#CN(aBbMx${?Iur3t=g2EMK|KwOF?I@W~0y`al&TGqJ zwf#~(?!>@#|JbDjQV9ct%+51l%q|lcY&f{FV&ACRVW*%VY6G5DzTpC!e%=T30mvav zRk$JOTntNoxRv>PDlJG1X=uep&???K00ep|l_#7=YZPuRHYoM46Z$O=ZZuGy_njgC z>P@gd+zKH5SjpWQ!h_r*!ol1s{9DS@sD4}xgFxaw>|av!xrKzg?rGnhZ#uZeU~iod z3-i*Hl@7cge0);y{DCVU(Ni1zg{yE&CxYT7)@zJ%ZZABj-Fh}0au^)*aw`vpmym;( z5|JZ!EACYenKNXH%=Md{my$sI3!8^FgtqkMcUR%w_)EBdP5DZ64aCIR%K99tId6SU ziT8Ef)K%7{XuIpPi}N+&FCm$elE>oKY;3c$x+*mXy?~wt6~?ss$HGqCm=YL2xzVTQ zr>*2_F;7j{5}NUPQ(aY0+h~rOKN|IA28L7^4XjX!L0C^vFB+3R5*1+s@k7;4d#U=5 zXTy8JN^_BCx1a4O3HMa9rf@?Fz>>dq}uvkY7!c?oksgs~xrpCo1{}^PD?w}Ug z3MbfBtRi z$ze~eRSLW^6bDJJeAt^5El{T*i1*v9wX{T7`a2wAVA z%j>3m*g^lc*~GOHFNy?h7>f7mPU*)3J>yPosaGkok}2#?wX5d$9moM~{NTzLznVhX zKa}bFQt#De`atoWzj4Lb@ZCud_T9rA@6VcmvW(+X?oIaH-FDbEg#0Slwf|7f!zUO( z7EUzpBOODL&w~(tNt0z|<9}Filev&4y;SQPp+?kIvJgnpc!^eYmsWz1)^n`LmP&Ui z-Oi1J2&O|$I<^V@g2Z91l3OArSbCkYAD0Tuw-O(INJJ>t%`DfIj}6%zmO+=-L{b!P zLRKvZHBT=^`60YuZon~D$;8UDlb-5l8J=1erf$H(r~ryWFN)+yY@a;=CjeUGNmexR zN)@)xaHmyp$SJcl>9)buKst5_+XomJu34&QMyS zQR(N@C$@%EmfWB8dFN(@Z%xmRma@>QU}!{3=E`wrRCQ~W=Dwb}*CW8KxAJ;v@TAs3 zW}Pq5JPc)(C8Rths1LR}Bgcf6dPOX<#X08^QHkznM-S>6YF(siF;pf~!@)O{KR4q1_c`T9gxSEf`_;a-=bg6=8W zQ&t`BK^gsK-E0Jp{^gW&8F9k?L4<#}Y0icYT2r+Dvg!bnY;lNNCj_3=N=yd9cM9kY zLFg|R0X;NRMY%zD*DbAmFV`(V@IANtz4^_32CH*)XCc$A>P-v49$k@!o$8%Ug>3-- z$#Fpo9J>eUMKg>Cn+T0H!n0Hf#avZX4pp54cv}YcutP+CmKC~a745-zhZp`KNms;J zS3S49WEyS8gCRAY|B~6yDh*cehY52jOSA#MZmk2dzu`_XpBXx9jDf!H3~!`n zaGe=)1VkfIz?*$T3t>-Pwhrw447idZxrsi;ks;(NF>uVl12}zI(N~2Gxi)8yDv-TLgbZ;L&{ax&TBv;m@z6RcbakF^el{!&)<___n#_|XR%jedxzfXG!a2Eyi)4g zYAWkYK{bQzhm|=>4+*SLTG2<#7g-{oB48b05=?PeW;Jo3ebWlo5y5|cl?p8)~PVZqiT^A~w-V*st8kV%%Et1(}x(mE0br-#hyPspVehofF`{gjFXla1lrqXJqQKE9M)8Xe0ZO&s$}Q zBTPjH>N!UU%bRFqaX(O9KMoG$Zy|xt-kCDjz(E*VDaI={%q? zURR{qi>G^wNteX|?&ZfhK-93KZlPXmGMsPd1o?*f_ej~TkoQ#no}~&#{O=>RadgtR zvig@~IZMsm3)vOr`>TGKD&fbRoB*0xhK7|R?Jh-NzkmR}H6lJiAZTIM1#AXE1LOGx zm7j;4b(Lu6d6GwtnsCvImB8%KJD+8z?W{_bDEB$ulcKP*v;c z*Ymsd)aP+t$dAfC-XnbwDx3HXKrB{91~O}OBx)fsb{s-qXkY<@QK7p-q-aaX&F?GS z2};`CqoNJ$<0DuM2!NCbtIpJ9*1a8?PH#bnF#xf~AYOIc4dx1Bw@K=)9bRX;ehYs; z$_=Ro(1!iIM=kZDlHFB>Ef46#rUwLM%)(#oAG(gYp>0tc##V{#aBl!q``!iIe1GBn z+6^G^5)(nr z8h#bm1ZzI450T?!EL)>RWX8VwT1X`2f;dW!{b~S>#$Pa~D6#Hp!;85XzluH%v5325 z730-aW?rY1!EAt;j7d23qfbMEyRZqxP};uID8xmG@mGw~3#2T^B~~14K5?&dP&H@r zL|aXJsEcAAXEXfu2d-!otZTV=if~^EQD*!NkUFQaheV&b-?-zH6JfjKO)aYN=Do*5 zYZ-@m#)5U0c&sUqu_%-Editr5#%Ne&bs)DxOj2_}`f;I_ReEY9U&Cf3rb>A3LK(ZD zid0_-3RfsS*t&g!zw}C_9u(_ze-vc1L59CdBl(IS^yrvsksfvjXfm>(lcol%L3))Q z@ZT;aumO3Q#8R!-)U697NBM@11jQ>lWBPs#?M4_(w=V_73rsiZh8awEm>q1phn1Ks ze@D|zskeome3uilE8-dgG(EojlI(@Yhfm}Xh_AgueHV`SL##I@?VR+bEHH=sh21A_ zhs&pIN7YTLcmJiyf4lZ;`?pN0`8@QbzDpmT`$m0CTrTMiCq%dE&Cd_{-h`I~f8Kps zAuZt4z)}@T>w$9V@iLi=mh({yiCl}}d>JN)z;*G<6&mgl(CYhJHCAPl=PYK2D>*F zy;YK=xS@1JW7i=C)T04(2P#|fowalY=`Y`G8?eRMAKt|ddG9UF^0M5 zW=ZGZ5qb-z@}iS`4RKXvuPIfzUHT)rv<8a|b?bgB3n=ziCiX4m2~CdVBKHWxw2+Hz zLvqoAij9(0moKoo2$`dqS0?5-(?^RXfcsQB6hU2SAgq8wyeasuyFGcK+@An?8ZzVw zW8wwbZB@i=<<4fA7JKPkki6y>>qO3_bW>-uQ*>9g+g7M0U^`RV)YTrGu2Q=2K>fiI zY0dFs>+}xuOZE^efLK2K6&X@>+y10Oqejnnq^NjfXt9JpK4K_E=cl29 z(t2P;kl4AK_Jg9v{1(z)ESpyo_(Z`74D&J1A#J?l5&J^Ad1sm5;Po@s9v7wOs(=_T zkutjt`BaxT09G{-r>yzyKLlM(k`GZl5m+Tgvq=IN|VjtJ*Zu66@#Rw;qdfZqi15A@fr^vz?071F5!T`s>Lx5!TszI%UK|7dDU;rUCwrRcLh!TZZ9$UMfo z@Qzjw>tKS3&-pyWS^p4mMtx`AvwxVc?g?#8aj@jQ#YKDG0aCx{pU+36?ctAiz=f$k z05S(b&VPQgA(Sm`oP&M^eiHvBe&PcTb+j$!!Yx(j3iI5zcQLOn(QqfX5OElbSsQBUw7);5C92onieJyx`p{V!iwXk)+1v zA6vStRZo0hc>m5yz-pkby#9`iG5+qJ{x>6I@qeAK zSBFylj8{FU*0YbFd2FZ6zdt^2p?V;3F~kap`UQgf@}c33+6xP)hK)fmDo@mm=`47* z9S6rnwCSL&aqgZs959!lhEZZp`*>V8ifNmL;cqajMuaJ~t`;jLPB?X~Ylk_Z#Q;%} zV+sAJ=4505-DdnIR=@D_a`Gy#RxtSX+i-zInO@LVDOd*p>M-|X(qRrZ3S(>(=Oj>} z89d75&n?m^j>;SOXM=)vNoum|3YmzxjYx%^AU*V|5v@SjBYtESp^yz?eQ#>5pnCj} zJ_WCw23wGd2AA-iBve8Hq8`%B3K4@9q@a}sf$49IA^IPsX@QK)36mrzqOv?R_n9K@ zw3=^_m#j{gNR0;&+F~wlS(i8IQN8mIvIO)mkx|e)u*y+xDie}%mkZ*m)BQM^$R@-g z1FrP0{8A?EcxtxxxX&J;393ljwwG?2A2?y-1M0-tw$?5ssoEsbPi?sd2!s~TrwPLF zYo-5XYV7AU-c|Vb-v;>pVi^CwX(Rpt<9{Ic?@<9SrNu>F(gwij%?dC9^!Xo90o1-| z&_aPKo%+xyw64e&v<}F^-7sO0Cz-VOF@7**i@v&(Oy4Q8PbV+4&rKwmYyokM z48OZ|^%*mC_Q)RJ31D#b4o4Jzr{~BX4D#swW<31;qCil2qlim;e=9ymJAEXfv-|h3 z)>uqQ5~S+8IgiWW28Fqbq+@ukCLy+k7eGa1i5#G_tAUquw$FjFvQt6~kWa69KXvAj z-knF`5yWMEJvCbTX!K{L)VeNF?(+s?eNjtE5ivg^-#937-l()2nKr#cHShB&Pl^l8 zVYws26D^7nXPlm<_DYU{iDS>6Bq0@QsN%6n>XHVvP<^rDWscC!c+LFrK#)T@$%_0{ zob%f&oaq>1_Z8Ata@Y2K6n?GYg|l8SgUr(}hi4D!@KL~hjRv<}ZZ`tCD^ev=H&^0pP%6q2e+t=Ua`ag8xqWvNnIvCU|6ZA^L5v{DD)!mcQ@n6{=; z#Z)PrAz>*+h-|IV!&J*f@{xb!L7h3{?FEs*ifw5z2U9$&OkYseI68yb=V4xv*VK3- zVxGhtmedujX32y-kC{5ej-Wy#JvB~4oxTb{|1H825_B(A0#?CjUTc=PrGh6jAgK9h zoLAe`+NBdStZE@Y8UH^Rd*|R-|7Ke}wr$(CZQHhO+upHlCp)%n+fH_}S8%^%xqhu%20_1p=x#Dl9ia`c3iM+9Vh5?gyY8M9c$tJ5>}V_sidHN zoMl%rSgSK!7+Y8tQkYq|;Vh`4by2uMsUfnxkk2{S@a>V#d}fv}Yud*>paVi_~T zU!GoYwWbnG%92!Cte(zhZX-i9#KJ;b{$(aZs|{MerP#6||UUx$=y)4XOb zihyKn`_QhJ#~@_peJ*8yD4>I7wQyKkZG%#FTKZfb(@G+9x7-3@hG}+ZC&$7DwbaB$ zC)jLj7yituY&WpOWlG7Z4Tuxzdwo6k!3lgwhh7BYMyB? zO9Q5nvn77~g~c623b`Pe5efNzYD#2Sfmg>aMB5s?4NC|-0pIXy%%`J;+E{(irb!Szc8M8A@!}0zqJLoG4SJ5$~1*yRo0^Z`uObA+= zV?1sYNvzvWbP%AsMzoIo3Cwx~y%i8rHF(BgLS>tH5Ab|1wp$X_3o2_VB(pFxgQ5QQ zk@)Vy95$b%HVf4@ppX(wrv^Jwfrsu+9N_OUm}nD7Ch_7STj66EYsZR#`9k|Tf^@p& ziHwnO$p{TB#R(Q{Os>Un~0!r$JO zLZ&F%SP|%$TuG)mFeOhKr1?S!aa0jTV$2XIeZb_fgO&n{8HTe9s`L&(tKoy?OaS^$ zLHNrgYgq920EI~M>LyU7gK70$7*`nFKD^d>MoEAhsBU0%@*RW@%T(J z?+wVbz=mcN%4#7qlCpl_^Ay7VB%?+uW1WSNnQOj^tALyqTpV zkEN2C;qO_W)MYl^Ow5I;t3;z#iG82F(qe}#QeE;AjA=wM==dB(Gu+ez*5|RVxO4}l zt`o?*B;);-0`vR(#+Q^L4WH_9wklh-S-L-_zd%Q0LZ%|H5=>Z)-x#Z+m%p&6$2ScV zEBneIGo)r0oT)xjze*Q~AIqhB%lOM5Id}^eKwS!?b_;B&TouZsemyL&y`)#FX}ZKp zp)ZnB*^)1P@2bCoe+Z|#KhTBNrT)UN@WIuudw})fwHl)re1|b~E1F=xpH?7L77p>5 zei$aD@KO0<+zo1<&7OuZatNsPq24Whu%0jD_ z$ZZy6MzayYgTJulNEy8D$F%JDYgx|d6{6kpDg#s170<15bM#4tzvrDU$6bvu-hH@6 zgcjq&3aR3k(23$FaUA|iuoy*bO{2F6W0<+ZdsYvXjc?d@ZT8kM!GD}r@qr;TF@0Hb z2Dz-A!HZ$-qJ?F%w6_`t`8xk$f$MNBfjqwvJiVdD+pf7NVFGh?O=qp2vh%UcYvc{rFldib~rkIlo`seU%pO_6hmBWGMcUhsBSWiQYYPMX<-Cjp49@7U==iS57bG zw3T9Nbm`)m9<<4e$U74`t~zRo0JSfi}=GdQXGLLPyW zlT^I}y=t$j{Vx!wN^z8X4l0|@RNrC#)G>bK)7IT7Qop>YdS^NnI3gfP>vtp)pXkr2WSVcAAv8uN>@ z`6)kICvNYU$DA8pnkl4sQopDC6<_M8zGJ^@ANXJL(yd#n1XFj9pH;rld*gwY8om_I zdB55w@FUQ_2k}d%HtQsmUx_7Mzftky&o2X2yDQrgGcehmrDDDtUJj5``AX$gzEbMc zUj2Qzp)Lo>y-O*@HJ|g9$GR2-jgjKfB68J6OlIg;4F2@2?FlW zqj|lO7A2Ts-Kd!SO|r9XLbPt_B~pBpF40xcr0h=a&$bg(cwjp>v%d~Uk-7GUWom?1 z92p+C0~)Og*-N~daT#gQdG{&dPRZso(#{jGeDb1G`N)^nFSB`{2-UQ&!fkPyK`m03 z_Di94`{-(%3nE4}7;4MZ)Pmawf#{}lyTSs5f(r;r1Dp4<;27K=F}Oga^VsUs3*NIn zOsYstpqpRF&rq^9>m50LRORj>=;{CV2&#C$-{M5{oY9biBSoQyXvugVcwyT-19S;pf!`GSNqb4**TI%Y z*zyV)XN3Fdp3RNNr9FU+cV*tt?4L8>D@kJp^rkf_rJ~DPYL}oJngd1^l!4ITQN`0RTT^iq4xMg|S6;d}lznE$Ip^8pW-CHu zP*^!U>Lcd3*shqa)pswq;y<|ISM1g1RG#`|MSPNAsw*XH1IAD(e(Kgqp6aDHgv>fI z!P67$z{#()Pdo3;4dUoy*Xor(O?+YTRPe=g*FfRj*9q9!8p%1l>g3e^rQ_nm{(@4t z?^nMDC2J8@my5q0QyCljCSp_@)No+6bZ*y)lSdrkLFcR6YOHu*vZ-q(C);5$MmM_z z1WT>Gc8g%`Rt~6*!}JhWi0=Rc_z5c8GR9YXW+cdoK~Ea(@wyXf|89HagNuFAO-V7k zUb|9zaCCWH3^Fz(m7$8K$|0ZOP!SNpgP!ql<)!z8w$Z$?9gq2f<~koe3|zD=imLfD z>IV5?SkRZ;7JlOG%z%Tlze$GXr0A}ResyF63ZGZVDLv2k4HWtoqoCaq+Z&GaVKuLA z>@zhNjYYc=sexH?;DTe4&2vnQE}C@UFo&|qcLddvH0FwswdRUc(p*X&IT^Zu>xLpG zn(@C%3ig(l2ZPm#Fc){+0b+%O7nt4zbOt+3@GQVm|1t70=-U(>yo3VY2`FnXFHUyi zwiqf(akt0kEE5_Pa-a*VCS}Pi6?`~P%bvX6UT~r-tUAY%I4XF3^nC+tf3alyL{M`w zv?aVQ#usdwpZmkrfv19O39}tQPQM+oY**a{X?@3Qe>r$+G!>r#?Id&U&m^HU(f= zjVpSi9M||1FyNQA&PO`*94&(qTTMQv3-z`bpCXs-3bX}#Ovqec<>omYhB*VrwxqjY zF3#OXFsj`h#G?F}UAilxTQ|78-edHc-Uc-LHaH*Y(K%R#dVw>_gz}kRD4s#+U&Pq= zps)kMf_t9`GHR7CO4zI8WVj0%qiSqy50N{e_5o#GrvNhMpJf5_sCPrEa%a@ltFnss ziaWh26vEW4fQp}qa4oP(l4xIMpA)~VHD9!lP%;Tm`(HD$jYMM-5Ag>S(gC35J35$%?^gk(r|`4Ewi-W z;f&;B*fO=kC@N=r<-#nGW|yXE;`zb0Y3TJOAkw1a$SQgoTawHZTck+V%T=spmP`^BHihc(jc+S1ObX%6AYQ6LVVc+BfM*P{2s0T2z zVIs*5{ql%#CKAzv0?@S+%||z;`dpfj0Y(VtA51n$j%sG5I%A|h98VU}PkVZFrk1*G zaw75v3(N50lanvr&ND4=7Db;HS4fpi)2vTME7aD2-8N5+kcOXmYCrLE?*5&dWhvB` zbD5)ADuIwwpS*Ms;1qyns(8&tZ*)0*&_lNa`_(phwqkL}h#WdX_ zyKg%+7vP>*&Fus9E4SqIN*Ms`QLB(YOnJ|md%U|X`r#tVN$#q6nEH1|blQ?9e(3|3 z`i#;GUl~v?I6&I6%YvkvmR?*l%&z)Pv8irzVQsWrZSr%aoYuPJa#EjK|4NmiuswK= zlKP2v&;yXv3>LQ$P){aYWrb)5GICwbj;ygw>*amKP;Z{xb^cF}O@IeQ^hB-OjEK{l z>#PNyLuVkeDroL9SK2*ChHmJJSkv@YRn7)E49fy!3tqhq`HtHs_(DK|2Lyv(%9L&f zSy+H}Uk{nE2^5h7zN7;{tP3)$1GK9Xcv^L48Sodg0}ZST@}x607yJo2O*XCfs7*wT@d?G^Q6QQRb!kVn?}iZLUVoyh8M4A^ElaHD*Nn2= zkfCS=(Bg9-Mck6K{ z%ZM59Rs4(j1tSG1B#wS=$kQfXSvw6V>A(IC@>F;5RrCos`N{>Oyg|o*qR2EJ>5Gpe ze~a4CB{mmDXC7C>uS@VL&t%X#&4k<`nDx;Zjmo%?A4fV3KOhBr;VuO!cvM8s2;pG5 zcAs!j?nshFQhNA`G3HMS z?8bfRyy1LwSYktu+I7Hurb-AIU9r|rl5nMd!S&!()6xYNJ1EqJd9BkjgDH@F*! zzjtj4ezywvlkV7X@dG^oOB}T76eK=y!YZB#53LhYsZuP&HdmVL>6kH8&xwa zxv8;t-AE>D5K<{`-({E0O4%fGiLVI8#GfZ0aXR6SfYiPUJKnujMoTI5El<1ZO9w|u zS3lJFx<7XUoUD(@)$pDcs3taMb*(v2yj#G)=Mz-1M1q@Tf4o{s9}Uj9Yo?8refJwV zJ;b+7kf0M}fluzHHHS!Ph8MGJxJNks7C$58^EmlaJcp`5nx+O7?J)4}1!Y>-GHf9o zk}oTyPa>+YC$)(Qm8|MhEWbj?XEq}R=0NFH@F3ymW>&KS!e&k5*05>V@O*~my_Th; zlP05~S5@q+XG>0EuSH!~gZe_@5Dbj}oNIiPJpEOip+3l!gyze@%qOkmjmx=?FWJLF zj?b}f8Vet*yYd16KmM43rVfZo?rz3u|L6Foi*GQe4+{REUv9*}d?%a{%=8|i;I!aT z7Wxm}QJC`?cEt9+$@kSkB!@`TKZz1|yrA1^*7geq zD5Kx-zf|pvWA+8s$egLrb=kY385v2WCGL{y4I15NCz5NMnyXP_^@rsP#LN$%`2+AL zJaUyV<5;B^7f+pLzTN50Z~6KC0WI<|#bMfv+JiP3RTN^2!a7*oi+@v3w*sm5#|7zz zosF*{&;fHBXn2@uguQ1IDsh(oJzH#i4%pk;Qh^T zfQLyOW;E*NqU!Fki*f-T4j(?C$lY2CT{e!uW}8E(evb3!S%>v^NtNy@BTYAD;DkVo zn9ehVGaO7s?PQBP{p%b#orGi6Y&~<;D%XLWdUi}`Nu-(U$wBBTt*|N4##sm2JSuWc)TRoYg57cM*VDGj~ka<=&JF zo8=4>Z8F`wA?AUHtoi$_hHoK!3v?l*P0$g^yipOWlcex4?N2?Ewb1U=lu}0`QICA4 zef61j-^1p}hkA*0_(esa!p%dX6%-1e-eMfQsIp6wRgtE=6=hDe`&jel{y=6x5;78s z?5^{J|t!#x1aS8<3C`v%E%u{*wZwSXr$0Owl5_ zmXh>D>C_SjOCL^CyGZpBpM5`eymt{*rf~9`%F&&o7*S!H%3X)7~QFgn^J>6 zD+yV}u{HN-x9*_$R;a+k?4k*1f)rE~K|QvcC3dlr>!nftB?gE-cfcPMj&9mRl>|Lg zQyCe|&SuZopU0>IfRmcV3^_mhueN5oQ=J+H4%UsSIum4r4!`^DJqZr?1j3BU)Ttzg z6LwM)W&UEMIe*H2T6|{rQ;x9qGbp7ca#-!Egm4|ECNTMN);`>2Q&%|BpOdIJ4l|fp zk!qEhl;n(Y7~R1YNt7FnY10bQZXRna2X`E_D1f*}v1bW^lJorDD0_p2Rkr32n}hY! zCDB(t$)4YOd)97R60gfg3|wrlsVs#4=poh4JS7Ykg$H)vE#B|YFrxU-$Ae^~62e;! zK9mwxK?dV4(|0_sv(zY&mzkf{x@!T8@}Z6Bf)#sfGy#XyRS1{$Bl(6&+db=>uy-@y z$Eq~9fYX$06>PSKAs#|7RqJ3GFb;@(^e`jpo-14%^{|%}&|6h{CD(w@8(bu-m=dVl zoWmYtxTjwKlI!^nwJ}^+ql`&fE#pcj*3I|_Z>#y##e@AvnlSN4po#4N#}WT)V5oNP zkG+h_Yb=fB$)i`e2Fd28kS$;$*_sI;o0Xoj#uVAtsB6CjX&|;Bk}HzQ*hJ!HDQ&qZ z^qf{}c`l^h5sg-i(pEg#_9aW(yTi?#WH=48?2Hfl_X+(SfW)_c48bG5Bf+MDNp>Y#Mpil%{IzCXD&azAq4&1U10=$#ETJzev$)C*S;Pr9papU3OabRQk_toRZ!Ge(4-=Ki8Db?eSBq~ZT#ufL6SKaXZ+9rA~ zQwyTQTI7*NXOhn?^$QOU>Y6PyCFP|pg;wi8VZ5Z$)7+(I_9cy--(;T#c9SO;Hk~|_ z0tEQ)?geu8C(E$>e1wy%f@o;Ar2e#3HZP$I#+9ar9bDa(RUOA+y!oB;NEBQ`VMb@_ zLFj{syU4mN%9GF;zCwNbx@^)jkv$|vFtbtbi7_odG)9s=q(-PtOnIVcwy(FxnEZm&O^y`vwRfhB z7Urcums9SQS6(swAgl?S|WDGUTFQu51yG$8069U zviuZ=@J&7tQ8DZG<(a->RzV+sUrmH$WG+QvZmUJhT*IoR3#3{ugW%XG0s?_ycS6V6 zS)019<_Rl@DN~8K4#w3g_lvRm4mK3&jmI$mwROr0>D`mX+228Dw4r;mvx7df zy~$zP8NjVX?xkGFaV>|BLuXMQ+BN+MMrIB4S6X)p&5l$;6=S8oI9qi&1iQbs?TroDMfCmIeJ}pbVVtVqHhS(zutEy6#UjTk29-+3@W0`KfehW`@np zhhu#)O&g%r)hTj4b$CY41NYp_)7!bYyG;v(rts z^}YDJt2W88H^H;e$LSm3dh=~yi@)mzJtEfW8=4avbeOE&;Oc>-6OHO+MW`XBZ4rO6 zS;nAi**w3Yso4&Ty+8f$uvT?Z)eaLe$KW1I~9YM2zeTIT}C%_G6FPH-s5Wi3r`=I&juGTfl zZ;4qFZV|6V0c&>t!Y>mvGx#1WWL0N5evV=u28K9**dv`}U3tJ$W?>3InXiwyc)SA% zcnH}(zb0@&wmE>J07n#DOs7~lw>5qUY0(JDQszC~KAAM}Bmd-2tGIzUpO@|yGBrJyXGJk3d+7 zJBN0$?Se(rEb0-z2m%CBd;~_4aH04%9UnSc4KP!FDAM5F_EFujJZ!KDR-fn181GX` z8A?8BUYV}D9bCE0eV~M>9SPag%iVCLWOYQJDzC4~B~Ct0{H7x|kOmVcTQ;esvyHJC zi$H0R73Z8+Z!9^3|2tNut#&MVKbm`8?65s)UM8rg6uE(|e^DYqvoc15-f;u8c=>3;Viz*T# zN%!T+Hex0>>_gUKs%+lgY9jo6CnxL6qnQ>C*RseLWRpipqI;AQE7;LUwL`zM%b`Vu z%Sa-+?a#+=)HaD|k2%_(b;pHRF96(c;QyPl6XHL8IqGQKC$M8R=US-c8;hUe?LKo&l!{V)8d&55sUXEu z5uITcO~`ipddh+Nr{7ibp^Wd{bU)^3##<5`lkuqfckxEU*9{pgNpTB2=ku1c-|3dK z|LIQF=ld@I7swq^4|G1VA}BK85&>2p#*P95W`I1FF(8G9vfNJ6MoN$+C^M89u!X=< zJSS%l?Qj>$J%9?0#0&S6#*h*(-9Z$}q*G#hP?cX7cAvM0eiVFhJJ~$`iZM!N5NhDb zi<1u_m#?jzpIaOe7h|Kiap#mHA`L|)ATnPJ7du{^ybuNx@1jA+V1l8ux#{LJ#teM(6=%gZcMq24J$2p z`wcC!qRssmwUv4H6Psw{(YdDNOv$!sq&O1SvIS}fCKZa+`T=Ayt@uZjQqEC{@Uj+| z!;i3W+p~=@fqEEhW@gT^JtCR<`m`i|Htg<TSJ&v`p;55ed zt@a|)70mq;#RP@=%76*iz>fAr7FKd|X8*@?9sWOFf$gbH$XFG zcUNu#=_+ovUd>FW*twO`+NSo*bcea=nbQ_gu^C7iR*dZtYbMkXL5mB@4a3@0wnwH! z(fZKLy+yfQRd%}-!aPC z4GB%OvPHXl(^H(BwVr6u6s=I;`SHQ1um7GPCdP-BjO%OQUH!_UKbEGvHCY}{OL`8FU$GZ;Y$SlS$-0VjK%lCP?U0shcadt4x7lN4%V}wBrLEbiEcK-OHl+pcBNSqN#mftpRj2A4Q z+av@-<#t_Dj_FN^O2~wq(ij1O*+=RVl+6gNV^~CI1UED- zn^zN@UOq8?q58b^4RA>lV}x;jA2OE=SqMYV9P#RsUlI+pp!y*jpwHgp-w3i$V)%?L z>irn1pnRc|P@r|Z0pCeMZ*k$}$`1GVGCT&QtJ`V%Mq!TXoge?8Fjn$bz}NqDn*2ZQ z$p3@F_^(}IVS76>OLNzs`O5!pF=LZ$<&gyuM$HQzHx8ww^FVxnP%Yv2i=m*1ASF~~ zP=!H}b`xl`k0pL5byku2QOS~!_1po!6vQyQL#LQ#rIRr?G5^W?yuNvw-PP{}%m35i$i+I?DJ%RGRcqekT#X~CxOjkV1UQrd&m_bbJ+gsSGbPwKS{F& zU-`QNw!*yq#Co#{)2JvP-6>lY$J$2u+e=r0&kEc#j#jh@4Tp;l*s<28wU%r= zezVPG^r*a?&Fn_(M|A7^xTPD998E-)-A4agNwT?=>FbrHz8w~w?hWBeHVYM()|buJ zvGv4j<%!U_Rh^ZKi~2(h1vk-?o9;`*Zc}m5#o@a1ncp)}rO2SDD9y!nT$_Eb%h`>% zDmssJ8Dl=gDn<-7Ug$~nTaRzd?CJh;?}nCco$7Pz<#J8;YL40#VFbAG|4nA$co;l^byBOT2Ki@gAO!{xU7-TY|rujdYTaWV(Rr{Jwu?(_TA zDR1|~ExJBfJ?MAReMF47u!oEw>JHVREmROknZUs2>yaboEyVs$Pg1f6vs06gCQp$b z?##4PWI#BxjCAVl>46V_dm4?uw=Y@h#}ER4|ACU{lddiweg`vq>gmB25`XuhNai1- zjt{?&%;TRFE+2Y_Gn;p^&&|bU44M=`9!Mc%NbHv|2E4!2+dUL z>6be$Kh|Duz}+)(R7WXsh!m`+#t^Its($x`pqDaN-^E z?*a=0Ck^rZBLQV~jY-SBliN&7%-y3s@FB;X)z(t&D=~@U0vT%xfcu`Lix=W#WVE{{ z2=C~L$>`~@JCIg8RAyk= zYG`(@w4H95n0@Fqv16~nlDU!+QZw&#w@K)hv!V>zA!ZOL$1Iykd&Su3rEln@(gxO| zxWc++T-rQEIL+j7i`TeatMfp4z7Ir31(TE4+_Ds@M|-+cwQg(z>s=S}gsSz{X*Wm+ ziKJWgOd`5^o|5a#i%?Gvw~8e?Rpi7C>nQ5dvPHVTO$PI^mnJ*7?gd3RD{|c_a>WrXT#Es3d}(k z$wpmA#$Q^zFclx{-GUL_M$i0&mRQMd4J#xq-5es)yD{kYCP1s!An(~K5JDRkv6DUSKgo^s@lVM5|V4mWjNZp zsuw^##l%rbRDKglQyj?YT!nk$lNUzh%kH705HWhiMuv(5a<~yoRDM&oCqm+1#S~|8 zA$g2Xr=}p_FX%Eaq{tUO9i*Q1i!>$+1JYZCL}flWRvF0y1=#D#y-JQTwx6uP-(bC} z_uP7)c;Xd`C6k#JVW?#Id7-|`uW+hN0>OM=C2Ta^4?G zr;EvxJ{%l|8D-heRYRM%f*LBC)krHZJ@%&CL0)FADWh14&7KV<9km6gE=o9(7keg~^rIQtthK^_8%Jk&aZLY_bc6SbY>IcwDK9{sV*t1GfKwf8aCo8t za)yALEi^-WXb!k6n>W-62Z^n8hO|eRYr&uZiW5d_URi??nl*aGu?ioQ+9RF9u8kwD z6UZ6HVd(G%l9>y7E)uyn?gAJMKeki0@tG*jdcE-}K?8(D-&n=Ld1i=A1AI<1z>u5p=B z<1}|q3@2jNxW-}Q4z~s|j&^Qc;nXIdS3K8caP_07#ig} z#KAD&ue2jXc&K#Q`Hy#x+LeT4HHUCzi1e?*3w{tK+5Tij(#2l2%p#YGI-b~{5{aS8 z!jABC*n6y~W|h;P!kn(a4$Ri2G118!?0WHDNn((QDJP^I{{wPf<^efQWW?zS>VS?X zfIUgCS{7oV$|7z2hJBt+pp1CPx4L{B_yC3oWdE)d)20WG6m5qknl}8@;kjPJE@!xP zV(Nkv^-Vz>DuwBXmKT(z>57*D<$u=Blt)IS-RK0j89omD{5Ya*ULWkoO)qeM_*)jF zIn87l{kXPp=}4ufM1h7t(lAL?-kEq>_DE-in8-!@+>E1+gCV9Fq)5V3SY?**;AKq0 zIpQ(1u*3MVh#tHRu5E5=B{W-QOI34plm`#uH(mk*;9&Re%?|v-=fvb;?qvVL@gc|l z8^L?2_0ZrVFS-stRY(E>UiQeG_sMrw5UiO znGFLOP-GO{JtBM@!)Q37k3G_p&JhdwPwtJS6@R4_($Ut^b!8HP{52-tkue8MG=Zwr z7u6WaFranJq4oNadY)>_6d~?pKVxg$2Uz`zZPnZVHOh-;M|H7qbV0OF8}z;ZPoI+| z(`e}bn6u*kJpRLC>OZ}gX#eHCMEk#d8y$XzSU;QZ|An$pQ%uZC$=Ki!h@&m8$5(xCtGaY3X1FsU?l5w^Fr{Q-?+EbUBxx+b?D z80o*@qg0juG;aZhj=tO=YHjfo=1+-NqLME~Kw7Y1A*?}M7#cOyT(vd$1tVPKKd@U! z&oV!RzZcK6gPWj`*8FIAy2I&x``h_sXPe*O{|ih(Y+V3|o68MWq~2Iy^iQ8RqK76f zC$1+hXqd^jsz`U{+EFo^VQNrLZt#R`qE*>2-Ip&(@6FmtAngx@+YnG}b5B9Y)^wg#oc z24KlT2s!H_4ZR^1_nDX#UH4(UTgl603&Q3g{G4!?6Sl9Om=Sy|8CjWO>d@e9?Q%s- z-OS3*W_H7*LW|Ne{b+^#LqQ}UKDmiZDma@no2!ydO^jcm>+z379K%=Ifs{20mT|xh zP$e7P=?N(tW4PMHJOQ`a8?n}>^&@<`1Rgo`aRevPp^1n7ibeS6sc8^GPe>c&{Kc+R z^2_F~K=HVI45Pf|<3)^;I{?H}vU7-QK3L1nHpcn3!1_)<$V;e0d_b8^d1T==rVpky zZTn~UvKrjdr11k}UO@o>aR2wn{jX5`KQQM1J1A?^wAFvi&A#NA#`_qKksu`sQ0tdM ziif17TO<{wDq_Q;OM}+1xMji^5X=syK=$QdZnS#dwe$;JYC7JozV8KpwfV}?As|^! zFlln0UitprIpuzLd$`<{_XoUV>rrHgc{cUQH-Px#(_Ul%=#ENrfJe@MRP_$E@FLMa zI`(J)Imw$o427@Oc^3(U&vz}<3Lfmy7diVpJJJ@gA>e;q-&gj zcGcBC_luF%_;**EB?o--G?AkaruJ%-b*8aX$4E+-?V@RWMnjHJ;hx27Vd7l0nUUY( z6OQb&8g8cvN3LZ%^xvIav*X|Epqm@yrTZk9U{GSZXAUJt8Lh(%7?Eaf&AzmXOVvU| zmz<@l1oMe#^POR38KT6q3@c`{%eYNu4ccurv`q?b5DzLxENjSfYOJHAI$MbSNgB*D zJsP>i*BgrFlIn?x&DH9x~UbPBtMFj{_vJ#CaAF>1$oE&k`EF&L@HCa@mN>Q7~!RU>7 zW%fv84aCKSgBacmuvg}r@)YKqO$U{D5|!`vG-Gp%An}raz2gESWm0Exhux4C)zE}} z_@kn z3t}bvm?L+@@az@<*jG>(Xopq&c*;^mttlJ!mv;5k6o%Ac<_`o`4G3qzzo(GO{!&F8 zW+~bF?S;7gO1dQ@>gwZ?iIHjE#^@;Ix!Z`R6{RYLlGB&v4A)ha(2hc`RGV-8`LcvSf+Y@lhT%(Z7$tWEF;cZs2{B|9k#&C}sPyr; zd-g~${TqY7E$9X+h4_(yMxQ%q;tm(h(lKzK)2FQ%k#b2}aMy+a=LHYgk?1|1VQ=&e z9)olOA5H}UD{%nu+!3^HsrBoX^D9Iy0pw!xNGXB6bPSpKDAaun{!fT~Z~`xp&Ii~k zdac?&*lkM+k_&+4oc6=KJ6RwIkB|st@DiQ!4`sI;@40>%zAG^!oG2@ z@eBM$2PJ@F&_3_}oc8A*7mp-0bWng^he9UYX#Ph*JL+<>y+moP^xvQF!MD_)h@b}c2GVX8Ez`x!kjAIV>y9h;2EgwMhDc~tn<2~`lf9j8-Q~yL zM=!Ahm|3JL3?@Tt(OuDDfljlbbN@nIgn#k+7VC+Ko;@iKi>~ovA)(M6rz5KP(yiH| z#iwJqOB7VmFZ#6qI~93C`&qTxT(*Q@om-Xb%ntm_?E;|58Ipd1F!r>^vEjy}*M^E(WslbfLE z<+71#sY~m$gZvoRX@=^FY}X?5qoU|Vg8(o`Om5RM6I(baU^6HmB<+n9rBl@N$CmP41^s?s1ey}wu3r3 z4~1dkyi%kA#*pLQy0phlXa-u(oK2Dwzhuex$YZv=*t*Tg5=n~H=}fJA!p2L78y3D2 zimkqC1gTU(0q||k9QM#><$b-Ilw#Ut2>JF=T^qN34^qcBEd={! zB)rxUbM2IwvMo?S;Id^aglw}-t9et}@TP;!QlFoqqcs(-HfNt9VqGFJ4*Ko*Kk#*B zGpJ>tA9(=t|4#M!kBaf%{$Kfj3-uf|ZFgiU`Bo>%k_OuAp~vnE^_Tg8*% z*?)4JdzyMTzvNDy{r$c``zBw=Vr)6c4}CBIv#mw()3h7`?V-;LF?J&N5a>kjpy;9n zQyXvuu`n?+W84QV=(i`JEJY=}Ak+u4>!Lyt2P!$nBl}T=^|pG*z@)_l!)OKB{tIV&&E@hj=OIhSBHgPV~X=R3NrTMh?VzDm?1yW^IJ&zzAn2{8rE~MRX5EE)a(-T&oE)1J4pGXBYi+nexX-?5! z{EZ4Ju=Y8MQ87=uNc2t^7@X)?85KeSoc`?BmCD;Uv_cwQaLyc}vvnJKHV zuK)H_d)xhGKB!_pRXv{$XgfZ_(8G%N3o$ZI#_ zixQj~so0*m^iuA!bT>&8R@>b%#B~zbIlwt4Ba0v&>B(`*Z;~?6!>-aQ zal+Qt4^dCcjZZMd4b4Khg~(GP#8$3BeB8j!-6l?*##)H?J$PeUy)cA_I26#0aggao zaM5PweS_Sb@{OZ@Uw*(!DNV)KTQU+BTRi?AUAv0Vowth`7mr9)ZVC+TI?@; zWGL&zydnsuE3+D7#U~P%PrxpD3nTc9#mm621iX*?ZMS_Q#n9SzOJ~Hg@`rX{d?qJ; zt}`76!H)MX#=VKifJZP$3<8@}0-llthFpq3FV;(UP$-k63MkHHq~J&}d?C<+c~*Zk z<#G&>AD7EoiAVO38TO2TOBKN>6N|JS*{+`}V-)T0j(bAzGlEUWEvWLrMOIItYexh) z?he>SJk*#bywgDF6+*&%>n%0`-3tOY72+n&Q1NJ`A-bX*2tJV(@;%b6&RxMcUd7+# z@UzOmc9DolSHc-D$5(GouinaE%&uOVMyD&CTdKaEB{Qap4_wU7_=23CULKQ;jmZuV;+Y$(`#Gh0@}s7-!qk-^&#IG>7B{yft?UoA)H5 z|B0u3Tu0TF{AB0jpT|E&RsYB$3WiQU^5p*|f)^Si_#^j+Ao^|5(gNjn+!0|NtXDt* z5fwxpajl@e0FrdEuj2s#Pg>gUvJdko9RBwEe_4@?aEM?SiA2nvm^tsLML{-AvBWM7 z_bm7%tu*MaJkUWd#?GWVrqaQ0>B%Azkxj+Yidvc$XdG1{@$U~uF|1oovneldx`h;9 zB1>H;;n1_5(h`2ECl?bu-sSY@d!QTa`3DrNj_F@vUIdW5{R7$|K{fN11_l7={h7@D z4}I;wCCq>QR6(;JbVbb4$=OBO)#zVu|0iK~SnW~{SrOq&j*_>YRzU&bHUhPPwiy($ zK0qin8U;#F@@}_P_flw`bW_v^G;ct?Pb65%=%egDBgS#YF3?E36$9xzdvYqjAZoK#hcjctJu~MF^S*$q3`o2;!L|jPnM1x*Q~qF%BH(5UDFYglsJwO zEdEuB7NihnTXK6$)F~``nmSQNFP7x7hE{WuOjTAhEjGw#XxvL@S;aZYuyu9)!yZ~X zo35D6Cwb8`shRXCCR;xlR`n`cs4aie!SSM`0)x3ykwM*k zK~w^4x2u#=jEEi`3Q9AU!wE)Zpn#)0!*~)(T^SEjIJveav(d1$RaSMC0|}<)?}nSG zRC2xEBN_YAsuKyl_3yDt%W^F`J-TyeGrcfboC_0Ta=KcW_?~RLb>xbqIVI6`%iWz; zM8Kq9QzwO8w!TntqcB;gNuV$gd+N|(4?6A9GEzYs z5f4(*N5}&ObeYA~I28r;?pKUj4N6}iloE=ok%1|X()Ahdwir?xf6QJfY7owe>pPj)Me*}c^%W-pP6`dnX1&6 z`b#*_P0PeM+1FR)t)Rnr22f!@UFBW!TxgjV)u0%_C~gIbb_D3aPhZ~Wmex0)Lj`VoZKjoW)dUoKY6*| z0|V)|XyjiKgZ}s5(SN?te*muif87vD_(wYOiOjOKNI4L*aK||2$~;s25HS#iY6r=)WW8a^dkd0Y|pPc1-9jmy&wqoCbL84`C94At6$lm_o!8m*did^?o$m?ozIp{RmZ*M%YMX_i$KYkz_Q)QK?Fdm)REqf*f=@>C-SnW{Lb;yYfk&2nAC~b}&B@@^fY7g;n(FVh_hy zW}ifIO9T7nSBHBQP5%-&GF8@A-!%wJAjDn{gAg=lV6IJv!|-QEXT+O>3yoZNCSD3V zG$B?5Xl20xQT?c%cCh?mParFHBsMGB=_5hl#!$W@JHM-vKkiwYqr8kZJ06n%w|-bS zE?p&12hR2B+YB$0GQd;40fJd6#37-qd1}xc1mNCeC%PDxb zlK=X|WE*qn2fROb4{oXtJZSyjOFleI3i8RBZ?2u?EEL1W-~L%7<`H6Vp0;cz5vv`7jlTXf-7XGwp}3|Xl6tNaII3GC z9y1w*@jFLl2iFA!<5AQ~e@S|uK4WL9<$R^??V^aM?Bgy=#|wl$D2P$o;06>{f)P+X z91};NrzVV+)b}k2#rYLF0X0-A+eRul=opDju)g0+vd79B%i!Y}*&a^L$_|C&jQN^j z9q#4<(4)3qNst^+ZYpyVF2hP;DN|OMxM9w(+)%kFQRcYVI zO-frej9x6a%-D%Xuwedcw9#3VSVkOjNF!BYRoY1KD3wFJ%?ML*3QwcarMK)@v`o%s z$w=NLrO>og`nRJpZZ(%~*hNJU#Y~k;_Ci3~gc=4UQO!Ydje^?=W^DgCKyO;Zz4LgQ zKtm($MdY;UZ((U_g5*pMY+dYGyyT1ERkaj`U#S-2yyJ47wMonCpV+2rI8zPNHDfo& zc59dFz*2#^A-R?P6Np}jhDLi4&vP%$NW#8J>=CLj1mlf$XzmQezH*F1jNOiPgXl2j zzD07AKLT*h$CA*OsOba2etPLU%|p?=XhplXo?vOu@q0{QBo++)@6U?YKv_)GFK(^Y zm&uFBbrQyzJm;c49O00PIt;|{&ei%VSS%Y3m3#~L#(3%Gso^a4#9AaB$w@vnAvdr6 z%!2#)YS0HFt%o)q6~BelT;?%oUjX%9qQCn#-~+TM(a^s%Y>&aBkL(UY{+?a9@&Q+a;t%c_6u^6_r@>MEAN9ir5q=Yo|R8z4lKYd1sv^LyTozFn$KqaJ>? zoH&+`AX>E03Gv=71+NZK2>!-NasKeCfMp;@5rZ z*m<}q2!$AgKUwWRXTVHs!E>`FcMT|fzJo30W551|6RoE#Q0WPD$fdA>IRD-C=ae&$=Fuzc6q1CNF>b3z_c<9!;))OViz@ zP58XOt`WOQS)r@tD0IiEIo4Umc(5f%J1p{y4F(1&3AzeAP%V)e#}>2%8W9~x^l}S4 zUOc9^;@m{eUDGL={35TN0+kQbN$X~)P>~L?3FD>s;=PIq9f{Xsl)b7D@8JW{!WVi=s?aqGVKrSJB zO-V&R>_|3@u=MEV1AF%!V*;mZS=ZK9u5OVbETOE$9JhOs!YRxgwRS9XMQ0TArkAi< zu1EC{6!O{djvwxWk_cF`2JgB zE{oo?Cyjy5@Et}<6+>vsYWY3T7S-EcO?8lrm&3!318GR}f~VZMy+(GQ#X9yLEXnnX z7)UaEJSIHQtj5?O(ZJQ{0W{^JrD=EqH_h`gxh^HS!~)?S)s<7ox3eeb7lS!XiKNiWDj5!S1ZVr8m*Vm(LX=PFO>N%y7l+73j-eS1>v0g}5&G zp?qu*PR0C>)@9!mP#acrxNj`*gh}21yrvqyhpQQK)U6|hk1wt3`@h^0-$GQCE z^f#SJiU zb@27$QZ^SVuNSI7qoRcwiH6H(ax|Xx!@g__4i%NN5wu0;mM`CSTZjJw96htSu%C7? z#pPQ9o4xEOJ#DT#KRu9mzu!GH0jb{vhP$nkD}v`n1`tnnNls#^_AN-c~PD;MVeGMBhLT0Ce2O2nwYOlg39xtI24v>pzQ zanl2Vr$77%weA<>>iVZQ&*K9_hfmv=tXiu#PVzNA;M@2}l&vaQsh84GX_+hrIfZC= z0Se*ilv-%zoXRHyvAQW9nOI2C$%DlFH1%zP-4r8bEfHjB3;8{WH`gOYt zg+fX)HIleuMKewYtjg+cSVRUIxAD9xCn+MT zs`DA7)Wx;B`ycL8Q&dR8+8mfhK;a^Rw9 zh9tC~qa>%5T{^8THrj^VEl5Do4j4h@nkrBG6+k8CDD~KB=57m@BL-)vXGkKIuVO9v z7t_L5rpY^0y=uu5iNw0v&Ca-zWk>v;fLJ=+SaV&V#C-o^}8 zp&Xp$v?~ccnfR=&5Df)32^d6QJLg*iuF#s|0M4zJF@Hza1p`q|f}~K)q;HC*I1_9t zQ&1jr9-kdUi8)DGxiwdqU|rPxYWDQPWY&SI&Rxkhxobp~C=Y*`d?HD4JW?WjU7dBPeuIE`ABLq95b#lfKS52IB^6KoHmm60$R}TESplQt59#mboJj+Na!P)V{ic@$yQ-&Z za^JU0T+n0Lf2VdusoNr0?g~1DMsY)zdY-63yH!Ii#aWe|;0TO>L7#YlaDrH}xvYXn zh-NYa>O>f_NTTBG=|k0qWH+X?d5@+INsQ}WcI_3z1Z4-%Gj#_{P$0A~cAye`?j0cW z8)hd(V}7rattLUSMvgZ4g96P7n` z^{55A&&29;-P992{yhkGWa3v_Z6iB4a&~NmL)IpC&dsSwe$9jS(4RVJGt=Y!b-O~1 zSCl@wlaba_cA*yt(QvulMcLUuK z>(ys_!{vqKy{%%~d#4ibQ5$yKn6|4Ky0_ngH>x-}h3pHzRt;iqs}KzajS!i!Pqs8c zCP%xI*d=F=6za_0g`{ZO^mAwRk0iwkzKB7D)SaLR0h|ovGF2w9C9g8;f#EtDN*vBP9yl;n=;B2a7#E8(%Bw()z(M$_pu zQ+9uFnlJ!5&$kk^S_+kJ>r9y8MFPpSf9;o8v;ZxsMA!p>eaAIwt5xNiQ|2_ydGkbi zkggG;Xp&I7C8R{>ten^j@MsN#V5JPs1Ezc!74->Nh0a}U){OK@j=OIoY}C7IYYd8-V9 zQ6s?v=Y7(?Y$7=P#Wwub-*0DLqli?I%kT-D^jqK?c2~HEx<2(poRWAUoC}!~6$1=I z*M(IfPmdID8i+5l@=1(+`?i`G_ew=1Y!gF?tFbdgtW2etKLOFoNozkH(i!Qa7(h^| zF`9!VeqQQwM+yO6J`;oWUWq@9l6hP~FiG8-{Pj*T`XI3~s@FfjW2Tl(llpa901$&y`F}K1uZuHEo;=mr+_8d(o z2Be#yWHEN@euC$=VUSB+3A}khJdF$)0r#<5(f3n`kx>ZT8ifaKyX*OhffeHH1?6OM z*-19$j5tMNYQoB)>cGpz@11>J%q4KW`GLNj?uB>LcNg$0G@}XN#Tqf2F5@jv<`|~p zqB^l!%v!g{R_+0GX5z0>3Q~O``%T$NFc==dsPsTj-;{b$XUS0TGoJs2BUA*H;4S?w z|Nigt|F@9hf7QLSo}JPEK#CPgYgTjrdCSChx0yJeRdbXipF(OwV)ZvghYba)5NZxS zm=L8k_7Lb?f8`=vpv(@m%gzsCs9^E$D5Jn+sf}1lep*zz&5V?~qi_@B?-$Vd1ti(rCi*I0}c}slKv@H_+g?#yarVzpYZN zIk21Bz9Z#WOF`JG&TC&C%a*3*`)GJx9I!U8+!#J4}@5rm8*jK%Xg2VLjP-a;H zFydWO;nxOZ&|{yOW;ta$ZU^6*4vFP)idD6M*M0+9buB#hK4z%YTGBdSva?Pvxim2` zF-?QVGuRQ2-1eYzd1Y%}w^`t1S7|{{8=Es#ApC0<;pc$|NJ)IU%WVK+4gnTWA7-t1 z0K{DCESXb}!y_tzrycr^%%|G4T4)`$BC8+qm|n1lS?CO=`V`1T#ykY#5g5$dc$lGt zqGHyw-*Av%C;33nEiU(rU?w^3F46!dEz#cHd3IF<(XCq)>JG?Bi)4v26MQr1A-g5RqhFoPy%^TD3sa|D^9aS>>_2-X2i#? ztVp@ZkyMB;Uo#9s!R!@G#CCaFVaxx*8YYu$kGFk4g3|9t!1nKqOaDBAe;w!(6#w)0 z?{&F2BgctT1=Z;TvjOGL_!}Vlt=kaLA7#W`mv1h%hUg983!wA*K@_r6_cd6o z6LHiCE6qwlt2H&|Ica~%b9C?Z@$dreBNR_!NKcfL)%8kGr7!IVq|^&6PKYK%EhcKu z6+uR*%EOw=rF6Q42Mx|a> z$2XrM*NV2x9ci6|X^eh1UAbJ9Ky!#*Q5w7)#o#%}d!#-^k8To=n8{UU*LmFsS-wRj zi6-p76V6g?If3S&Bj~GW&QI_WtyPY0@u3hjKtqf9`8S!wn{@P&Tc8uu8cf)YmrX7+ zrC+O3V{9}JG6ihA&^2Q7@)Kq)j(Y_oTzsoBUYQDG!}`Ame`bbcr>J-6E%gaBPEDCU zflX#1-)Ih^HJV*lew*N_SdG-4!b2}G8%U&9_V0~Qt?ZS z@H3L&5ybV8X}A@KQADl93H`}0qkNm!jGHkCJUM%r8`mP1nV?Oo%^l;yDnU6IJtbuY z`X2Sf8|r00mB_f)Q0;S{FqS1Yq?otd-BVbw`#@SDd5}n5X4lqdDi1*vtVv8-Zi10q zexCj0eyngrp`UxjEOrdzUt`?%jRlj7zSU-V-%R?y+_w7P7f1ge%t1ozmN+&)%3xQW zT3u@)))(_a<6`lTJd`DIYw>(pkb=PMKvCNEG~zza+LVNqkY^}QoGMVdS0K;gS*A3f z;6Ua!^sSV-try(M^pB6D9dsX}c>$Da#NHucp9vr(fg4pbBR*uPhYq+N>q1X4RSOCl znIQj4=A+y+8{?LQ$3L@(!Yy~~Cu4Sx72*%@dW>eP%Br7=uaynV6Mqa-49A9) z|L&5r=4K5SClwc`!2J|>(#n$4y1>lmR~2Om8q6HkcpK>d(Fk!T^NO?hM4Fc+(5J{` z&K|vrBz;;zWlNO%=a~JkMxMiZa%wYz#G901lw#+2SUaMMHrebb&|1L8tKoGJK*QhJ zU9|WkDy^-4F6U&VYSc3ScHDk@kV^0801#I|-pSK%az5=DwI}gMm)@s2O+-ESTk?QY z;y9gyucaXO(Cc+cd{B>2)euMHFT71$a6DssWU>>oLw4E-7>FC-YgZH1QAbRwmdahD zO4KAeuA^0q&yWS|zLTx%(P4VOqZv-^BO`0OFAXdBNt9>LAXmPALi3b|gt{b?e-$z0 z4n7H$eg6y_zs(c>*4FT!kN*$H`43~1p!g;IZ8-mYbUPTejaLW#BZnAPFES?ApM{TQ zE*TC%O8)apqcX|PrNjIZE-z{q`I(LwIE0kf=PLjExEX>)oIu><<@lt>-Ng9i$Lrk( znGXl|i4dP;Mt^-IbEp7K0e#*c7By@gCo@VQIW$93ujLL`)lMbA9R?C_5u~7^KopaAMj#6&>n-SOWlup_@{4 zcJ?w_!9JKPM=&Bd#IQ37F*x39y!azm$;~IRlkm>bHdABcNwW-TdDKD$pkD{j6A8d* z{vP~|<}bj_Oz#83K$ieRtsA4a@4a5cRjJ}A01{PgxXn3;fx)5ElMEPwDX_mW9)9oB z*;scve~v#HHqUj3KdC$tdV3&0)Whkp-=hKKz{SzD7g0@N!wyv;ZAime7AjB7&)!)5 zp_iVblaf)%agwJqOG2e7WTCM1&khq`{b>fN4n8hOJbvO?Y;60>LIwagLXWC@@0RSR zo%lPo1cUU=g$ahJ8D=;`v~ORUSl(1-&a@yTAC5Y8E892@{P@MM=GXUGpBSXSbSs!N z;L~0D_s7{+^F6c!WW+^yz5~o7eWtsOE}8{hKaFlHgnyBeUJ8Zz2$k7Lrh?NuMU|No zVvsq@57)8zin;&ckR1;*Z%(xH2lBw z`x%N;|H1En8au588bPDxP^$kfpO!bIzz>K=5Jiq9Rg(NGde0g!rKagLa+&yC)jg7y zq}~2IH)N*FJC31qrIH-2;%3^F?=bDD^U2Y;%ftN(v71oY;od+vh!!2z^}GHR$43rg z0In@ki}TglIsMU^O1(SiLK#oiuyw zB>-@z?&uW`ILoPupw0_cs?C|2YoX&87~us+ny%eo{A!3M<-7O7mHUBCgA~{yR!Dc^ zb= z8}s4Ly!GdxEQj7HHr<}iu@%Lu+-bV>EZ6MnB~{v7U59;q<9$h}&0WT;SKRpf2IId ztAjig0@{@!ab z{yVt$e@uJ{3R~8*vfrL03KVF2pS5`oR75rm?1c`@a8e{G$zfx^mA*~d>1x`8#dRm) zFESmEnSSsupfB>h7MipTeE!t>BayDVjH~pu&(FI%bRUpZ*H615?2(_6vNmYwbc^KX4HqSi!&mY9$w zpf%C6vy@O30&3N5#0s_!jDk|6qjb-7wE3YT3DA7q3D`Q&Y*y>XbgE7=g#rPx1hnf8 zTWd{IC!Iysq*vZup5VGrO)UM<3)6raR`rOwk(!ikf3XPp!n|gz0hS*P=VDXAyMW(s zL??-`&IusEuOMrz>m(A1W5Q~>9xJwCExAcMkOBD` zD5BJSadd{0u}%z4r!9qA`FW4;Ka_Qk>FcHxiucGw4L9qhtoge|ag8jbr`7LHSbVQz z6|xUo*^LV1SLxS>?D`m=g{8IC&1YF$e}VRGD#ZOc_15QW%J@FbEj8tE-nGxo4?X02 z@|q#k*G4xMW>q84Xc09pRj@>Hz8t^fMm3n&G;Al6KU*;=W`7Q{$^|=bnZiJ7?(s)@ zB`vW>#zJ{}!8=*|?p(~fcXSanO^j8+q7V!q16*ic!HLRdz0TzNI6}m+=OKd2b8KX< zAcDTj*%~vQlcO+%@H01gjv-1zZaOXVoM*t-+KXTR#NoTf-#{dQAm?GqK6q8Ta zu3xW?t=NE$EfYa#=0HofLn5~c#m-U#Ct_r6~X-pg6k*F zYIP7De52BBwcAnK?O(j?YEs1;q60!-!hTuKzw3T;XcA_w5HvU;tO~}byLA^cggu8i z-IP@pxFjTy&ie28m}j66dm@g78xK7aG{QSR^bAcY+W*xWu;G~I08sf(GK4>K-cbfJ z-%v9DGR77He<291M~=fg>>9&NFQlboP)pC6fT;{>_!lM`A&&HWIMd)Y6e@IL;nvRdBE*Tn({&3{-XJ9helJa{G51Ck}-_Y=5C|fEo z)7fZlsHxN&SY&ZLTdYuBBZnwIh0#VTzmyK>U0|r&SXb&GP0m)1dGV8z(^x6s5yQ-z zEyniK${#U@Y7p@Yxx}E+jA?1@{=|e6UM;iyai=0=aItVvqieogZUq@sio2#9NLW~L z{w@^H!HEGU;>;T0lu{Ad20Hr6u;?-9YHKvkjEc)}wsb4Y-ArRK8`24uBT8N)8m%Ee zYJX21)|e{peL26}VUUKYQ3L@NSe8rEbN#AIo$tjJm-$B|IJU?mu(h$Sq`XNY0@NhY z0?WeMtPwP)sUdk}dWA4qBUV^x>P|is-kPgVe)*WV>dKDL>gOq1 zUYw(nU|N#dw>97A_(c3?VA_zDfF{^A1eE#8Bucd^ON(sv-{tc@&i)Y)3V~o7U~+AA zOwnXB5`WN^z$z<9^@(?LY%7?y5X_C(j1ip-Ug^f7Tt6suI3&a=&~#EJegG4r2^tKz zJoEXCVOc1QdOSNHp2d;t&smxL%CfK@mSl)Ky}`!6kCsi#7s5&G2Q!sM9S6o)&mdx% zz|2M~pav2;Th=DTN5yB@6HFAO!pl-y+tEJsh}(? z!tIyg01O*w@mWxsFhHMi7%Gqz!v(Osc5WxK+^1PGfsozw)FE}VIxk9GexmAohPNAF*SAjxG3Al#(xQoYXdI}TR zoCHAFS6+LDqsP8L1SZH{RxJjFK_=vy4nNH^?M!OsQWe^qC~$c1r&y`H9n5;D z2F$t-Htc%2@K(>opJHE{NytI2<_J<6Kz*p$wtKUTEH}zITx?H0L%!5%i@!rLphSBrkFs>jscP6?HVQovX8!~b~ZY|0h%&souT7e5nD@OxuSgC zVW*eo0B|1POwg7;6fJSUC`g+`1%XQvwpRc*&|AtV*h!#5nQM(@m!K)-Qop!Rt3F`a z9HUO zF3w{uI_==EpjFQWV4boF^A?wc@@@U+KrKPjn6sK{OLu-~1UloSqt-aHYo*^@kQy2+ zH(9*-mFz?YV4cL7EW)9hsdmG{5jaYXLvm*&3PZ4y?8z`$9z6`q9fgsJm@*W$-QSzu zut}57hroSbTd=&RJpuy#?K?A6!-;_MowpK8eb~5T-^eye%3O-T^ktSMbd%PT0j-B?#yAKr37u%gB z*2)WJMw6Y)6BvY$JjD`(06ci7u;u$hv}gN5oS&Q^*y$J6L)0#BD<>XL|;pZgtZaxp3~$0zxA(;6Qr_AP$?8l@S)C^Hoaz#rQFK^lA}3&)Gr}Fsca? zK>9BkVcl;c*E2P9UMppEIB&38dL9R?Xg9N{Nl~4*w!qsZJElz}Xc9gz#}cwnP4u{+ z6VNTEx*>u67?3bn{sWk*P`1_$YfsB+)Ax0+jt|)0p&VS?N0k8IAp2KH_#eY3I#{Hw zB$vObUDtXyZX)*wVh*@BefnUej#jv@%uiA=>ngX0kQXaz>8(WM)fX~v__@I}7|!Il z@J%r#I!JqqFwGd4JPhmDmL>1Bh}nn_BE;hgKUesNOf9zQhiuhn%4B}O8jnxEwJiQFDaiiuXw2sb?*8a}Lr;_#7+IPfIjhVDhazSpbQZECL+4)p8lO;)!y>Rt=0X*;O# zX{s(p-*d{#{Y3gVhL;A{4a(Z5sIfpk;WMCqdFA&Mb7mp;YMXhBF@p`}$ShAug+bo`;<9fm!~F z-;1yCj$GQ^mzucrfuatilXrYLr)`izjn_m(f~);txN?D7d?Kg4wDuPXilVyeVwjzf z=4Kewf=u}X_H*viVfPWZW?Sqa3G#h3|;b!Q7>BRc7-Wox0}&>}Lqo=0v;T_i~% zqB&h;14|~nK{W0N=$obGP@O%(c8SraYS^qiu%Q`B zBHdA!`Vk7#Bz*@_3eE#bizLzjBV;F0vfSA~+7@8+F{$7Y?fwI~Pp_X`2ORgqW6g@2 z{cQV!niSsMEVr1IaeRAj8~|*4yW~X5$6o`crw4uTHhgPs^qAk?9UPu;xy5wh2^jZ; z)@27Q=QKa?8w7_C0|u`@k=%b9Ce$D7x42CdLsckF2<$wLuV2kpik8PXex2^Co$n2o z)l#H*;#>?yrPw0x6LI@x(X$nezCBa0Obi%|I5ZV|4bJSPtNHjDkS|3S?fiv(i_(n* zFbve0g!B0!MMmakRsgg_if8nwImb=kk%|s+08xGQ)J?vpkdaya3UD|RJK+LQ72|g> zc4LnwInx!2pN-5Yvp7rvRF#B=(ZO8gyVB^0Dh#ZdHA2BjjppfV<=2Nm#w_t{%6O$W z`-?7N?LwL0DWgK0Y7L#ChSHfa{=DOpJpl8L@V70cd%ei)n%SQO;Z+Xw#li#%LUfbs z&hP%UzN(qM3cw#bWQS6_B@>1^ea-AqNA12xoiQeb_Zdtf>yHljqeIHqlyC^gzH)h1 zstXTFEb0r=l9;><<$a}YWlscH7VW_xeKVZ#*#v#HiuUOs7PPj8ml4#!BiGEK)kDpO zX=2mU0ZuIDDnhfV7v_Rs)0R#ff6I6_|MrzV(R$3Nt#S7D?GQy6?a^WRvA@r2~?7f~s99*9;fuqJ(843U`hRl2O|sk>J@WMsR2O zwyZt$@J)DnSUNkF@B3MPNz|<@`72{M*S5d<1Vkg+G=q~u{8OP84Yh6VCE5pNC*#m> z*jzHy5Tc82sBVw+6W7DoR5@LXZ|+>;)Q%czg%8pyMyeE2-)R^oHg~SrO~#I8MxNc> z6pWT&F&H1mX7#2@mBY>#rRoFKszT z(gvV#j3x|7sF|Dt0*CgsJTdH1R!>inYZWp*2RDbjjQCP98L_ds!$x&{t85NRYk4ii ztJ3HyC8h2A2&`kq^Cfci>N*r&btHg_|v6=s|v=(-MQ zK4kjqoI^~y`j9poC2r{Izdlehm8!AcMP^+SwDUce1Zon(%YvxK)x|rXsJRlO?-K91 zMsmHgI&PmqT_W}C0mdA_6L!EEjgJzidRvTN;vQRJ-uBl#{dEeN?24PRwx)7c5kF^ut=M0)e@zr?z_vpYf=%;;@UYF9>9-->Qf2FW*# z5*#VFB$$-k(zphh4sAElMiLbp`$+SKm*{l6qX;Q8GZ7b|J>OhC!yg$}8dt$dx3E8b z$FlaM*K@6mSsYCoe#*QjLEB3|_Vs4GbZI#!>Ya}dzh%uMn}sw0gFQQ{+V+e|_`q)M3nK27)nAqQ-viJoPHUKdr9HN`v0 z+tZo0ORLuv_d)x}gO|~s(H!12RM(aMfqLG>KSH#kGxC{sUUj>FUC(6;ds1cOjeDYu zOrd>q@bNFq5?0s&@5nbF3-rw{{V&YYf3o_9|K-X4k861UwZ&C2bH+A7^%7nizU>b? zC2@*VlrqprJiv$rx{+^+Op9i3RM;IHq@a;34=Gn%B+rXMZi=UsHC@TEFk4{*fs96p z)wNUY?AhVkdLGQmPESuh@-!iqSZrnxIT~Mon)J+i+B~9VdL8QE`^4=2@lNaKluUVx z_^i7~5E4dN4&gVMi%;7ast@WIY21Q`+^iTC*Gx@IMVYB`BLFHzPh{Fpc6LKZTk@>P zquo2E*Pgq(0MX>h>4)YaJYbIK&V?-W}JfL@&R0I2)TOA!Teg zNa4DBO&)`Nn0$Inb|d8ea|)qqOLYVbQIBRC4T4E<5#Nzc2 z57|Bq7mYsW8y?uLA$XMj%OeK+1|DAKcLYB98-vDP<3*+SKYcPcOkm&}H|!{9l*9%L zbiYJYJ^)Cql-&wPwABGD>Ai7SUXe15m zIr^wNEU$9)D6@atm z(w(1~GuLpHi?JGgIBj`Ovy;j4M`XjrCNs?JsGh1zKsZ{8 z@%G?i>LaU7#uSQLpypocm*onI)$8zFgVWc7_8PVuuw>u`j-<@R$Of}T`glJ!@v*N^ zc(T~+N+M!ZczPSXN&?Ww(<@B=+*jZ+KmcpB8* zDY_1bZ3fwTw|urH{LLWB;DCGzz$jD|VX#Af@HC%BktA8F7VJSy&!5iTt};#U^e0_q zh6j7KCTInKqriZ1`BiF3iq2LWk;gyt0ORIFc4Mi3Bx`7WEuFq{u^C49-SYVjnv!_40m1>7x*+<8~Xkq?056 z!RBfE@osP%SxzOw>cLAQ$bioAOC0V!OzIXIc};)8HjfPtc~8tnah$PtoAz`4k)7$FDUc2O@D)g_uAo&nXMymK$##V?gYUPt^l zj{6NFDL(l-Rh(xkAHP%bBa=($r%3Y~jB!eQ1Smuq2iuQ|>n%Y=p(26SE5gFu11*Q< zaPN5G^d;Iovf`VY&Gh58z~%JpGzaeUz6QoBL^J%+U4|30w7Q&g9i}}@l61eKEfCgo zST6qMxF_Eaj7;0OC)TSU{4_m}%FOa6B{AxS$QIcmmG~IVjjf;7Uk!HBtHfm{%LsLb zu8~5VQFyOZk&!VY(wxL__haJ;>Bj?g&n`+i&=X{unJmv&0whCitWfGlOr6+Tc-lMZ z(ZRXqC-=O+GAvTXKViA9vdwu{aifhk$tYh~-9BScg!Yr*M2zw&9`pHMxHGh`dUH-1;~^6lF@ep;X9PjQ!rqmXNWJ?#P-qb%*TB%xe&3 zX*5V>xuW7)$3!Yc$y>cwBqd8+p+u>WS7p7~O80ipG{(a*#=NJ`^Ld6k-`|;Y&htFy zIi2(Sm)4eD=o+CGo~M3%qF|O9P0+ahmc%EklI?NgX05W3+OdS`_Rd#wg-}hd1&txU5wXy zy`x)05?WVZvELw`XWetIAg6$|(^4ntaE;=f$Wcpwbxm7?bLDnPs-1!bRoMcy!EeOh zpIv8ewDzcIU}mv1NxV!&(Wf7~_kqGAk=2=j&O5FA)z2!APCcDQPnIaiqMkVT4fUyX z))R|WvOJyzcU6d=z0q8JDt42*`js4g+_t{YP7lVguX+vhEejJ3TAIo*Z6jizHm#S- zZT_}-STQAa-0Gn8+RmR7V}{Ns1@jJ{^Sb!9&RSXXP;^ep)r6;&PW++~XYXC9a=zSF z?sp(JQo&MROb~b1Y*Xw4!P)>PHT>Z<)*U=Ax_75^OUw97pNudbxS1XPtNrIg zQ5YB77E@i7$2Ia}(^JcCi@OX`9a|m}PY%-th2m~y+)eCl>fTVjCP^lDOBLyhg1DZ+ z)~G{&OkDc$!;t~`gq(wz@qW3lh9B^ic$>-h#nV!H8d#l+>C(M%g}u2g=I#&W|L!VD zqHYoQkBW;`r|fW02u{7X!X;}T7X4iAaWzkeOh}7&o!F1qt4#$1|BDF;(2VlgEqJ$F zy8Ba-y(%fs`MzpvyXlQLEhS^ed$7Va2hO%?$-D>^*f$b)2Hx;}Ao$UqFt7l26<7eP z!{!C7PVrq>=794Zqmc z%LKkzIBZq@%Ja8EkH}?>c5ILG(EAMS*JHu?#9_7TsELw)8LZzN>f2Y6YN{AJC?34> zh42sPa1%2JpCeS9&E1URm+Pb}B>A1M`R{+O+2~}c(@^1Rf&J9p(4QqHl;E^4w5;I5 zM{?(A^eg*6DY_kI*-9!?If^HaNBfuh*u==X1_a?8$EQ3z!&;v2iJ``O7mZh%G)(O8 ze<4wX?N94(Ozf9`j+=TZpCbH>KVjWyLUe*SCiYO=rFZ4}S~Tq|ln75Jz7$AcKl$=hub=-0RM1s(0WMmE`(OPtAj>7_2I5&76hu2KPIA0y;9{+8yKa;9-m??hIE5t`5DrZ8DzRsQ+{p1jk-VFL9U z2NK_oIeqvyze>1K%b|V?-t;Wv`nY~?-t;tMC4ozyk8CR(hoZTno3!*8ZTc15`?MFf zDI892&g&3lshOEv4E@w-*_%)8C_<&HhV`0D5lN$WT4Q^UWHNSAE+RZe(o z%bqR^hp1IsDr47e^AajFtlppT)2F6yPcrWO9{Kw{o=P6y^HOW$Wqd_)_fwzn`ikZl zOGVc0+S(*=xZ_KbL0Nr`Sx$$CWEbw$52udl1f=X6CZEcFMA*nl>`0gn4&tc5^`!!)tGw<}^Q>P7E}$ zialDUofH*XcB3r9@tA@lnS}dA(@nK_xuw0b;FPUnNGD0;MIySCw=cSzB#=3>F37V-nni3UNB)-;;Gkk;3l9fh6FIjSZU zk=Eo2a`6i7@i*4>ym5`R?i-uZFv6+iX*Gi^I}ZU1OrLAX8aGiT@`*YnjeF>}$U}ORP`+EY5`eqVC_&4yG z;Tp>+2QbZ?lt1GB+D}q14W3dWP8lWnN zf(nlT6+XW&(zme{FbyDpP^NakA<~TK=Y}H^eS%2rt0v8Lr)B}@B!cTvC=9FM;7q4@ zf*;vb4HG>RFpY5?vFCp27VEnVIGx~-na6biU4{+UoYe=}^R#_My6wT$5d&r*=kpAA zu;=-c0|~yqi(N8&*H;aNfhyey+HHQ7J_qae*_CgG2V8j=Tq936S0DC8r3BXBql3Gz z0pLo_`|4Q+oY3rPBNaLmL{QM};9dke>ujP^j@z-N;fNlKb|edn>)YaafDaJ>GWKP$ z5}l&#$QFhN!CMT;WH&z-5E)kvM|36lV!^#3z{@2FF>HsgUO4PMqO#U$X%+U>K!xJ@ zBFs|+woG_9HZQs_Tw*vnCPGhlXG@>y|6pJT$I67!aP&b0o$AF2JwFy9OoapQAk>k7 z**+$_5L;5fKof<;NBX%_;vP@eyD=Z0(QW)5AF7 zp|=tk3p?5)*e~Inuydz-U?%Kuj4%zToS5I|lolPT!B)ZuRVkVa>f*-2aPeV3R79xh zB)3A$>X~szg#}>uNkpLPG#3IKyeMHM*pUuV5=-Jji7S6PSQ9oCLo{oXxzOZfF$PP) zrYwlmSQ-~n94uO3CD{K0QTmj@g%Yzn7_xQ4fTduU0Yqvln`e_`CdXH5iQ5qRr1 zBC;}%YZ2!4I>*=sR)O~jBPx6sxmIEBnq)s-fHz_y0z8-gPl2Us4BiBXNR5CIF!YR@ zb9B305SilU*@4|+ x6JBtc8JSt5M0pkooaq!^FqtuD_KdXXTo>Mw54>`rP&>h&58!3a6l6r9{sG7g--!SK literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..b7c8c5db --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..2fe81a7d --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..62bd9b9c --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh old mode 100644 new mode 100755 From 9d7a480f7dcf27cca682cad630b99fc3eb8baa4f Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 28 Aug 2021 19:53:48 +0800 Subject: [PATCH 02/32] Implemented Level-1 --- src/main/java/Duke.java | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334..5a5c5d48 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,6 @@ +import java.util.Arrays; +import java.util.Scanner; + public class Duke { public static void main(String[] args) { String logo = " ____ _ \n" @@ -6,5 +9,27 @@ public static void main(String[] args) { + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); + boolean end = false; + String command; + Scanner in = new Scanner(System.in); + System.out.println(" ____________________________________________________________"); + System.out.println(" Hello! I'm Duke"); + System.out.println(" What can I do for you?"); + System.out.println(" ____________________________________________________________"); + command = in.nextLine(); + while(!end){ + if(command.equals("bye")){ + end = true; + } + else{ + System.out.println(" ____________________________________________________________"); + System.out.println(" "+command); + System.out.println(" ____________________________________________________________"); + command = in.nextLine(); + } + } + System.out.println(" ____________________________________________________________"); + System.out.println(" Bye. Hope to see you again soon!"); + System.out.println(" ____________________________________________________________"); } } From 940bbca5ebd7eb1a325b0041707b3995bab75586 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 28 Aug 2021 20:34:10 +0800 Subject: [PATCH 03/32] Implemented Level-2 --- src/main/java/Duke.java | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5a5c5d48..4c52d35f 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -2,6 +2,36 @@ import java.util.Scanner; public class Duke { + private static String[] commandList = new String[100]; + private static int commandCount = 0; + + public static void addCommand(String command){ + commandList[commandCount] = command; + commandCount++; + } + public static void reply(String command){ + System.out.println(" ____________________________________________________________"); + System.out.println(" added: "+command); + System.out.println(" ____________________________________________________________"); + + } + + public static void printAll(){ + if(commandCount==0){ + System.out.println(" ____________________________________________________________"); + System.out.println(" Nothing in list yet..."); + System.out.println(" ____________________________________________________________"); + return; + } + int numbering = 1; + System.out.println(" ____________________________________________________________"); + for(int i=0;i Date: Thu, 2 Sep 2021 02:05:23 +0800 Subject: [PATCH 04/32] Implemented Level-3 --- src/main/java/Duke.java | 19 +++++++++++++++---- src/main/java/Task.java | 22 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 src/main/java/Task.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 4c52d35f..ed1a2668 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -2,14 +2,23 @@ import java.util.Scanner; public class Duke { - private static String[] commandList = new String[100]; + private static Task[] taskList = new Task[100]; private static int commandCount = 0; public static void addCommand(String command){ - commandList[commandCount] = command; + taskList[commandCount] = new Task(command); commandCount++; } public static void reply(String command){ + if(command.contains("done")){ + String[] doneCmd = command.split(" "); + taskList[Integer.parseInt(doneCmd[1])-1].setDone(); + System.out.println(" ____________________________________________________________"); + System.out.println(" Nice! I've marked this task as done:"); + System.out.println(" "+"[X] "+taskList[Integer.parseInt(doneCmd[1])-1].getTaskInfo()); + System.out.println(" ____________________________________________________________"); + return; + } System.out.println(" ____________________________________________________________"); System.out.println(" added: "+command); System.out.println(" ____________________________________________________________"); @@ -26,7 +35,7 @@ public static void printAll(){ int numbering = 1; System.out.println(" ____________________________________________________________"); for(int i=0;i Date: Thu, 2 Sep 2021 02:10:07 +0800 Subject: [PATCH 05/32] Implemented Level-3 --- src/main/java/Duke.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index ed1a2668..e9ebf78c 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -3,11 +3,11 @@ public class Duke { private static Task[] taskList = new Task[100]; - private static int commandCount = 0; + private static int taskCount = 0; public static void addCommand(String command){ - taskList[commandCount] = new Task(command); - commandCount++; + taskList[taskCount] = new Task(command); + taskCount++; } public static void reply(String command){ if(command.contains("done")){ @@ -26,7 +26,7 @@ public static void reply(String command){ } public static void printAll(){ - if(commandCount==0){ + if(taskCount==0){ System.out.println(" ____________________________________________________________"); System.out.println(" Nothing in list yet..."); System.out.println(" ____________________________________________________________"); @@ -34,7 +34,7 @@ public static void printAll(){ } int numbering = 1; System.out.println(" ____________________________________________________________"); - for(int i=0;i Date: Thu, 2 Sep 2021 02:27:48 +0800 Subject: [PATCH 06/32] Implemented A-TextUiTesting --- text-ui-test/EXPECTED.TXT | 13 +++++++++++++ text-ui-test/input.txt | 3 +++ text-ui-test/runtest.bat | 2 +- text-ui-test/runtest.sh | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 657e74f6..22766333 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -5,3 +5,16 @@ Hello from | |_| | |_| | < __/ |____/ \__,_|_|\_\___| + ____________________________________________________________ + Hello! I'm Duke + What can I do for you? + ____________________________________________________________ + ____________________________________________________________ + added: read book + ____________________________________________________________ + ____________________________________________________________ + added: return book + ____________________________________________________________ + ____________________________________________________________ + added: buy bread + ____________________________________________________________ \ No newline at end of file diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index e69de29b..385d118e 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -0,0 +1,3 @@ +read book +return book +buy bread \ No newline at end of file diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 08737446..97c1d915 100644 --- a/text-ui-test/runtest.bat +++ b/text-ui-test/runtest.bat @@ -7,7 +7,7 @@ REM delete output from previous run if exist ACTUAL.TXT del ACTUAL.TXT REM compile the code into the bin folder -javac -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\*.java +javac -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\Duke.java IF ERRORLEVEL 1 ( echo ********** BUILD FAILURE ********** exit /b 1 diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh index c9ec8700..8433cd0b 100644 --- a/text-ui-test/runtest.sh +++ b/text-ui-test/runtest.sh @@ -13,7 +13,7 @@ then fi # compile the code into the bin folder, terminates if error occurred -if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/*.java +if ! javac -cp ../src/main/java -Xlint:none -d ../bin ../src/main/java/Duke.java then echo "********** BUILD FAILURE **********" exit 1 From 3112af4041c5fa22c96d10c98c963f7f8545c6e4 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 11 Sep 2021 03:24:29 +0800 Subject: [PATCH 07/32] Implemented Level-4 --- src/main/java/Deadline.java | 14 ++++++ src/main/java/Duke.java | 91 +++++++++++++++++++++++----------- src/main/java/Events.java | 13 +++++ src/main/java/PrintHelper.java | 40 +++++++++++++++ src/main/java/Task.java | 5 ++ src/main/java/ToDos.java | 13 +++++ text-ui-test/EXPECTED.TXT | 26 ++++++++-- text-ui-test/input.txt | 10 +++- 8 files changed, 178 insertions(+), 34 deletions(-) create mode 100644 src/main/java/Deadline.java create mode 100644 src/main/java/Events.java create mode 100644 src/main/java/PrintHelper.java create mode 100644 src/main/java/ToDos.java diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java new file mode 100644 index 00000000..2de70b75 --- /dev/null +++ b/src/main/java/Deadline.java @@ -0,0 +1,14 @@ +public class Deadline extends Task { + + protected String by; + + public Deadline(String description, String by) { + super(description); + this.by = by; + } + + @Override + public String toString() { + return "[D]" + super.toString() + " (by: " + by + ")"; + } +} \ No newline at end of file diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index e9ebf78c..9dee212f 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -4,41 +4,76 @@ public class Duke { private static Task[] taskList = new Task[100]; private static int taskCount = 0; + private static PrintHelper printer = new PrintHelper(); public static void addCommand(String command){ - taskList[taskCount] = new Task(command); + String[] toWords = command.split(" ", 2); + String keyword = toWords[0]; + String cmd = toWords[1]; + //System.out.println("keyword: "+keyWord[0]); + switch(keyword){ + case "todo": + taskList[taskCount] = new ToDos(cmd, cmd); + break; + case "deadline": + String[] dl = cmd.split("/by", 2); + //System.out.println("cmd: "+dl[0]); + //System.out.println("by: "+dl[1]); + taskList[taskCount] = new Deadline(dl[0],dl[1]); + break; + case "events": + String[] dt = cmd.split("/at", 2); + //System.out.println("cmd: "+dt[0]); + //System.out.println("at: "+dt[1]); + taskList[taskCount] = new Events(dt[0], dt[1]); + break; + default: + taskList[taskCount] = new Task(command); + break; + } + /*if(keyword.equals("")){ + taskList[taskCount] = new ToDos(cmd, cmd); + } + else if(keyword.equals("deadline")){ + String[] dl = cmd.split("/by", 2); + //System.out.println("cmd: "+dl[0]); + //System.out.println("by: "+dl[1]); + taskList[taskCount] = new Deadline(dl[0],dl[1]); + } + else if(keyword .equals("event")){ + String[] dt = cmd.split("/at", 2); + //System.out.println("cmd: "+dt[0]); + //System.out.println("at: "+dt[1]); + taskList[taskCount] = new Events(dt[0], dt[1]); + } + else{ + //System.out.println("Keyword not found"); + taskList[taskCount] = new Task(command); + }*/ taskCount++; } + public static void reply(String command){ if(command.contains("done")){ String[] doneCmd = command.split(" "); taskList[Integer.parseInt(doneCmd[1])-1].setDone(); - System.out.println(" ____________________________________________________________"); - System.out.println(" Nice! I've marked this task as done:"); - System.out.println(" "+"[X] "+taskList[Integer.parseInt(doneCmd[1])-1].getTaskInfo()); - System.out.println(" ____________________________________________________________"); + printer.taskDoneFeedback(); + System.out.println(" "+ taskList[Integer.parseInt(doneCmd[1])-1].toString()); + printer.separator(); return; } - System.out.println(" ____________________________________________________________"); - System.out.println(" added: "+command); - System.out.println(" ____________________________________________________________"); - + printer.taskAddFeedback(); + System.out.println(" "+ taskList[taskCount-1].toString()); + System.out.println(" Now you have "+ taskCount + " tasks in the list."); + printer.separator(); } public static void printAll(){ if(taskCount==0){ - System.out.println(" ____________________________________________________________"); - System.out.println(" Nothing in list yet..."); - System.out.println(" ____________________________________________________________"); + printer.emptyList(); return; } - int numbering = 1; - System.out.println(" ____________________________________________________________"); - for(int i=0;i Date: Sat, 2 Oct 2021 03:39:21 +0800 Subject: [PATCH 08/32] Implemented Level-5 --- src/main/java/Duke.java | 161 ++++++++++++------- src/main/java/EmptyDescriptionException.java | 7 + src/main/java/EmptyTaskListException.java | 7 + src/main/java/PrintHelper.java | 30 +++- src/main/java/TaskNotFoundException.java | 7 + src/main/java/TimeManagementException.java | 7 + src/main/java/UnknownSyntaxException.java | 7 + text-ui-test/input.txt | 18 ++- 8 files changed, 179 insertions(+), 65 deletions(-) create mode 100644 src/main/java/EmptyDescriptionException.java create mode 100644 src/main/java/EmptyTaskListException.java create mode 100644 src/main/java/TaskNotFoundException.java create mode 100644 src/main/java/TimeManagementException.java create mode 100644 src/main/java/UnknownSyntaxException.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 9dee212f..022cc9e4 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -5,73 +5,76 @@ public class Duke { private static Task[] taskList = new Task[100]; private static int taskCount = 0; private static PrintHelper printer = new PrintHelper(); - - public static void addCommand(String command){ - String[] toWords = command.split(" ", 2); - String keyword = toWords[0]; - String cmd = toWords[1]; - //System.out.println("keyword: "+keyWord[0]); - switch(keyword){ - case "todo": - taskList[taskCount] = new ToDos(cmd, cmd); - break; - case "deadline": - String[] dl = cmd.split("/by", 2); - //System.out.println("cmd: "+dl[0]); - //System.out.println("by: "+dl[1]); - taskList[taskCount] = new Deadline(dl[0],dl[1]); - break; - case "events": - String[] dt = cmd.split("/at", 2); - //System.out.println("cmd: "+dt[0]); - //System.out.println("at: "+dt[1]); - taskList[taskCount] = new Events(dt[0], dt[1]); - break; - default: - taskList[taskCount] = new Task(command); - break; + public static void addCommand(String command) throws UnknownSyntaxException, EmptyDescriptionException, TimeManagementException{ + String keyword; + String detail; + try { + String[] toWords = command.split(" ", 2); + keyword = toWords[0]; + detail = toWords[1]; } - /*if(keyword.equals("")){ - taskList[taskCount] = new ToDos(cmd, cmd); + catch(ArrayIndexOutOfBoundsException aio) { + if(command.contains("todo") || command.contains("deadline") || command.contains("event")){ + throw new EmptyDescriptionException(); + } + else { + throw new UnknownSyntaxException(); + } } - else if(keyword.equals("deadline")){ - String[] dl = cmd.split("/by", 2); - //System.out.println("cmd: "+dl[0]); - //System.out.println("by: "+dl[1]); - taskList[taskCount] = new Deadline(dl[0],dl[1]); + try{ + switch (keyword) { + case "todo": + taskList[taskCount] = new ToDos(detail, detail); + break; + case "deadline": + String[] dl = detail.split("/by", 2); + taskList[taskCount] = new Deadline(dl[0], dl[1]); + break; + case "event": + String[] dt = detail.split("/at", 2); + taskList[taskCount] = new Events(dt[0], dt[1]); + break; + default: + throw new UnknownSyntaxException(); + } } - else if(keyword .equals("event")){ - String[] dt = cmd.split("/at", 2); - //System.out.println("cmd: "+dt[0]); - //System.out.println("at: "+dt[1]); - taskList[taskCount] = new Events(dt[0], dt[1]); + catch(IndexOutOfBoundsException e){ + if(command.contains("deadline") || command.contains("event")){ + throw new TimeManagementException(); + } + throw new UnknownSyntaxException(); } - else{ - //System.out.println("Keyword not found"); - taskList[taskCount] = new Task(command); - }*/ taskCount++; } - public static void reply(String command){ + public static void reply(String command) throws EmptyTaskListException, UnknownSyntaxException,TaskNotFoundException{ if(command.contains("done")){ - String[] doneCmd = command.split(" "); - taskList[Integer.parseInt(doneCmd[1])-1].setDone(); - printer.taskDoneFeedback(); - System.out.println(" "+ taskList[Integer.parseInt(doneCmd[1])-1].toString()); - printer.separator(); - return; + try { + String[] doneCmd = command.split(" "); + taskList[Integer.parseInt(doneCmd[1]) - 1].setDone(); + printer.taskDoneFeedback(); + System.out.println(" " + taskList[Integer.parseInt(doneCmd[1]) - 1].toString()); + printer.separator(); + return; + } + catch(NumberFormatException nf){ + throw new TaskNotFoundException(); + } } printer.taskAddFeedback(); - System.out.println(" "+ taskList[taskCount-1].toString()); - System.out.println(" Now you have "+ taskCount + " tasks in the list."); - printer.separator(); + try { + System.out.println(" " + taskList[taskCount - 1].toString()); + System.out.println(" Now you have " + taskCount + " tasks in the list."); + printer.separator(); + } + catch(ArrayIndexOutOfBoundsException a){ + throw new EmptyTaskListException(); + } } - public static void printAll(){ + public static void printAll() throws EmptyTaskListException{ if(taskCount==0){ - printer.emptyList(); - return; + throw new EmptyTaskListException(); } printer.taskFullListFeedback(taskCount,taskList); } @@ -94,19 +97,61 @@ public static void main(String[] args) { end = true; } else if(command.equals("list")){ - printAll(); + try { + printAll(); + } + catch(EmptyTaskListException etl){ + printer.emptyTaskList(); + } command = in.nextLine(); } else if(command.contains("done")){ - reply(command); + try { + reply(command); + } + catch(EmptyTaskListException etl){ + printer.emptyTaskList(); + } + catch(UnknownSyntaxException us){ + printer.unknownSyntax(command); + } + catch(TaskNotFoundException tnf){ + printer.taskNotFound(command.split(" ", 2)[1]); + } command = in.nextLine(); } else{ - addCommand(command); - reply(command); + boolean success = true; + try { + addCommand(command); + } + catch(UnknownSyntaxException us){ + success = false; + printer.unknownSyntax(command); + } + catch(EmptyDescriptionException ed){ + success = false; + printer.emptyDescription(command); + } + catch(TimeManagementException tm){ + success = false; + printer.noTimeConcept(); + } + if(success) { + try { + reply(command); + } catch (EmptyTaskListException etl) { + printer.emptyTaskList(); + } + catch(UnknownSyntaxException | TaskNotFoundException exception){ + printer.unknownSyntax(command); + } + } command = in.nextLine(); } } + + printer.exitFeedback(); } } diff --git a/src/main/java/EmptyDescriptionException.java b/src/main/java/EmptyDescriptionException.java new file mode 100644 index 00000000..ee6644e6 --- /dev/null +++ b/src/main/java/EmptyDescriptionException.java @@ -0,0 +1,7 @@ +public class EmptyDescriptionException extends Exception{ + /*Prints the following + printer.separator(); + System.out.printf(" ☹ OOPS!!! The description of a %s cannot be empty.\n", taskType); + printer.separator(); + */ +} diff --git a/src/main/java/EmptyTaskListException.java b/src/main/java/EmptyTaskListException.java new file mode 100644 index 00000000..2f5ab024 --- /dev/null +++ b/src/main/java/EmptyTaskListException.java @@ -0,0 +1,7 @@ +public class EmptyTaskListException extends Exception{ + /*Prints the following + printer.separator(); + System.out.println(" ☹ OOPS!!! I'm sorry, the list is empty ^_^"); + printer.separator(); + */ +} diff --git a/src/main/java/PrintHelper.java b/src/main/java/PrintHelper.java index 3805242e..d38fbeaa 100644 --- a/src/main/java/PrintHelper.java +++ b/src/main/java/PrintHelper.java @@ -21,11 +21,6 @@ public void taskFullListFeedback(int taskCount, Task[] taskList){ } separator(); } - public void emptyList(){ - separator(); - System.out.println(" Nothing in list yet..."); - separator(); - } public void welcomeFeedback(){ separator(); System.out.println(" Hello! I'm Duke"); @@ -37,4 +32,29 @@ public void exitFeedback(){ System.out.println(" Bye. Hope to see you again soon!"); separator(); } + public void emptyDescription(String taskType){ + separator(); + System.out.printf(" ☹ OOPS!!! The description of a %s cannot be empty.\n", taskType); + separator(); + } + public void emptyTaskList(){ + separator(); + System.out.println(" ☹ OOPS!!! The list is empty ^_^"); + separator(); + } + public void unknownSyntax(String message){ + separator(); + System.out.printf(" ☹ OOPS!!! I'm sorry, but I don't know what [%s] means :-(\n", message); + separator(); + } + public void taskNotFound(String message){ + separator(); + System.out.printf(" ☹ OOPS!!! Please key in by Task ID instead of [%s]\n", message); + separator(); + } + public void noTimeConcept(){ + separator(); + System.out.println(" ☹ HEY!!! Please give a due date for deadlines and events. Let's have some sense of time >_<|||"); + separator(); + } } diff --git a/src/main/java/TaskNotFoundException.java b/src/main/java/TaskNotFoundException.java new file mode 100644 index 00000000..6886361d --- /dev/null +++ b/src/main/java/TaskNotFoundException.java @@ -0,0 +1,7 @@ +public class TaskNotFoundException extends Exception{ + /*Prints the following + printer.separator(); + System.out.println(" ☹ OOPS!!! I'm sorry, please key in by Task ID instead of [%s]", message); + printer.separator(); + */ +} diff --git a/src/main/java/TimeManagementException.java b/src/main/java/TimeManagementException.java new file mode 100644 index 00000000..a91f610c --- /dev/null +++ b/src/main/java/TimeManagementException.java @@ -0,0 +1,7 @@ +public class TimeManagementException extends Exception{ + /*Prints the following + printer.separator(); + System.out.println(" ☹ HEY!!! Please give a due date for deadlines and events. Let's have some sense of time"); + printer.separator(); + */ +} diff --git a/src/main/java/UnknownSyntaxException.java b/src/main/java/UnknownSyntaxException.java new file mode 100644 index 00000000..59e78f05 --- /dev/null +++ b/src/main/java/UnknownSyntaxException.java @@ -0,0 +1,7 @@ +public class UnknownSyntaxException extends Exception{ + /*Prints the following + printer.separator(); + System.out.println(" ☹ OOPS!!! I'm sorry, but I don't know what that means :-("); + printer.separator(); + */ +} diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 4a50f439..366a3e0a 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,9 +1,23 @@ +blah +to do +list read book +to do read book +deadline return book deadline return book /by June 6th -project meeting /at Aug 6th 2-4PM +event project meeting /at +event project meeting /at Aug 6th 2-4PM to do join sports club to do borrow book list deadline return book /by Sunday event project meeting /at Mon 2-4pm -deadline do homework /by no idea :-p \ No newline at end of file +deadline do homework /by no idea :-p +list +done 1 +done 2 +list +done project meeting +done 3 +done 5 +done 6 From 069d47e2f0f3503f90cd5998b8b1323fa4b538c4 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sun, 3 Oct 2021 03:00:14 +0800 Subject: [PATCH 09/32] - Some code cleanup - made task list into class - use arraylist instead of array for tasklist --- src/main/java/Duke.java | 49 +++++++++++++++------------------- src/main/java/PrintHelper.java | 20 ++++---------- src/main/java/TaskList.java | 46 +++++++++++++++++++++++++++++++ text-ui-test/input.txt | 2 +- 4 files changed, 74 insertions(+), 43 deletions(-) create mode 100644 src/main/java/TaskList.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 022cc9e4..f89a78e0 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -2,12 +2,13 @@ import java.util.Scanner; public class Duke { - private static Task[] taskList = new Task[100]; - private static int taskCount = 0; + private static TaskList taskList = new TaskList(); private static PrintHelper printer = new PrintHelper(); + public static void addCommand(String command) throws UnknownSyntaxException, EmptyDescriptionException, TimeManagementException{ String keyword; String detail; + Task temp_task; try { String[] toWords = command.split(" ", 2); keyword = toWords[0]; @@ -24,15 +25,15 @@ public static void addCommand(String command) throws UnknownSyntaxException, Emp try{ switch (keyword) { case "todo": - taskList[taskCount] = new ToDos(detail, detail); + temp_task = new ToDos(detail, detail); break; case "deadline": String[] dl = detail.split("/by", 2); - taskList[taskCount] = new Deadline(dl[0], dl[1]); + temp_task = new Deadline(dl[0], dl[1]); break; case "event": String[] dt = detail.split("/at", 2); - taskList[taskCount] = new Events(dt[0], dt[1]); + temp_task = new Events(dt[0], dt[1]); break; default: throw new UnknownSyntaxException(); @@ -44,16 +45,17 @@ public static void addCommand(String command) throws UnknownSyntaxException, Emp } throw new UnknownSyntaxException(); } - taskCount++; + taskList.addTask(temp_task); } public static void reply(String command) throws EmptyTaskListException, UnknownSyntaxException,TaskNotFoundException{ if(command.contains("done")){ try { String[] doneCmd = command.split(" "); - taskList[Integer.parseInt(doneCmd[1]) - 1].setDone(); + taskList.getTask(Integer.parseInt(doneCmd[1]) - 1).setDone(); + //taskList[Integer.parseInt(doneCmd[1]) - 1].setDone(); printer.taskDoneFeedback(); - System.out.println(" " + taskList[Integer.parseInt(doneCmd[1]) - 1].toString()); + System.out.println(" " + taskList.getTask(Integer.parseInt(doneCmd[1]) - 1).toString()); printer.separator(); return; } @@ -63,8 +65,8 @@ public static void reply(String command) throws EmptyTaskListException, UnknownS } printer.taskAddFeedback(); try { - System.out.println(" " + taskList[taskCount - 1].toString()); - System.out.println(" Now you have " + taskCount + " tasks in the list."); + System.out.println(" " + taskList.getLastTask().toString()); + System.out.println(" Now you have " + taskList.getListSize() + " tasks in the list."); printer.separator(); } catch(ArrayIndexOutOfBoundsException a){ @@ -72,13 +74,6 @@ public static void reply(String command) throws EmptyTaskListException, UnknownS } } - public static void printAll() throws EmptyTaskListException{ - if(taskCount==0){ - throw new EmptyTaskListException(); - } - printer.taskFullListFeedback(taskCount,taskList); - } - public static void main(String[] args) { String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" @@ -98,10 +93,10 @@ public static void main(String[] args) { } else if(command.equals("list")){ try { - printAll(); + taskList.printTaskList(); } catch(EmptyTaskListException etl){ - printer.emptyTaskList(); + printer.exception_feedback_emptyTaskList(); } command = in.nextLine(); } @@ -110,13 +105,13 @@ else if(command.contains("done")){ reply(command); } catch(EmptyTaskListException etl){ - printer.emptyTaskList(); + printer.exception_feedback_emptyTaskList(); } catch(UnknownSyntaxException us){ - printer.unknownSyntax(command); + printer.exception_feedback_unknownSyntax(command); } catch(TaskNotFoundException tnf){ - printer.taskNotFound(command.split(" ", 2)[1]); + printer.exception_feedback_taskNotFound(command.split(" ", 2)[1]); } command = in.nextLine(); } @@ -127,24 +122,24 @@ else if(command.contains("done")){ } catch(UnknownSyntaxException us){ success = false; - printer.unknownSyntax(command); + printer.exception_feedback_unknownSyntax(command); } catch(EmptyDescriptionException ed){ success = false; - printer.emptyDescription(command); + printer.exception_feedback_emptyDescription(command); } catch(TimeManagementException tm){ success = false; - printer.noTimeConcept(); + printer.exception_feedback_noTimeConcept(); } if(success) { try { reply(command); } catch (EmptyTaskListException etl) { - printer.emptyTaskList(); + printer.exception_feedback_emptyTaskList(); } catch(UnknownSyntaxException | TaskNotFoundException exception){ - printer.unknownSyntax(command); + printer.exception_feedback_unknownSyntax(command); } } command = in.nextLine(); diff --git a/src/main/java/PrintHelper.java b/src/main/java/PrintHelper.java index d38fbeaa..f8f3d808 100644 --- a/src/main/java/PrintHelper.java +++ b/src/main/java/PrintHelper.java @@ -11,16 +11,6 @@ public void taskAddFeedback(){ separator(); System.out.println(" Got it. I've added this task:"); } - public void taskFullListFeedback(int taskCount, Task[] taskList){ - int numbering = 1; - separator(); - System.out.println(" Here are the tasks in your list:"); - for(int i=0;i_<|||"); separator(); diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java new file mode 100644 index 00000000..20e41340 --- /dev/null +++ b/src/main/java/TaskList.java @@ -0,0 +1,46 @@ +import java.util.ArrayList; + +public class TaskList { + protected int listSize; + ArrayList taskList; + private static PrintHelper printer = new PrintHelper(); + + public TaskList() { + taskList = new ArrayList<>(); + } + + public void deleteTask(int taskID){ + this.taskList.remove(taskID-1); + listSize--; + } + + public void addTask(Task task){ + this.taskList.add(task); + listSize++; + } + + public Task getTask(int ID){ + return taskList.get(ID); + } + + public Task getLastTask(){ + return taskList.get(listSize-1); + } + + public int getListSize(){ + return listSize; + } + public void printTaskList() throws EmptyTaskListException{ + printer.separator(); + if(listSize == 0){ + throw new EmptyTaskListException(); + } + int numbering = 1; + System.out.println(" Here are the tasks in your list:"); + for(Task t : taskList){ + System.out.println(" "+numbering+"."+t.toString()); + numbering++; + } + printer.separator(); + } +} diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 366a3e0a..e4518ba2 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -5,7 +5,7 @@ read book to do read book deadline return book deadline return book /by June 6th -event project meeting /at +event project meeting event project meeting /at Aug 6th 2-4PM to do join sports club to do borrow book From cdf479b020f11abfba08afcca37afb2e44ad248e Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sun, 3 Oct 2021 09:13:50 +0800 Subject: [PATCH 10/32] Implemented Level 6 --- src/main/java/Duke.java | 23 +++++++- .../EmptyDescriptionException.java | 2 + .../EmptyTaskListException.java | 2 + .../TaskNotFoundException.java | 4 +- .../TimeManagementException.java | 2 + .../UnknownSyntaxException.java | 2 + src/main/java/TaskList.java | 46 --------------- src/main/java/{ => Tasks}/Deadline.java | 2 + src/main/java/{ => Tasks}/Events.java | 2 + src/main/java/{ => Tasks}/PrintHelper.java | 4 +- src/main/java/{ => Tasks}/Task.java | 2 + src/main/java/Tasks/TaskList.java | 59 +++++++++++++++++++ src/main/java/{ => Tasks}/ToDos.java | 2 + text-ui-test/input.txt | 1 + 14 files changed, 102 insertions(+), 51 deletions(-) rename src/main/java/{ => Exception_Handling}/EmptyDescriptionException.java (89%) rename src/main/java/{ => Exception_Handling}/EmptyTaskListException.java (88%) rename src/main/java/{ => Exception_Handling}/TaskNotFoundException.java (72%) rename src/main/java/{ => Exception_Handling}/TimeManagementException.java (90%) rename src/main/java/{ => Exception_Handling}/UnknownSyntaxException.java (89%) delete mode 100644 src/main/java/TaskList.java rename src/main/java/{ => Tasks}/Deadline.java (94%) rename src/main/java/{ => Tasks}/Events.java (94%) rename src/main/java/{ => Tasks}/PrintHelper.java (96%) rename src/main/java/{ => Tasks}/Task.java (97%) create mode 100644 src/main/java/Tasks/TaskList.java rename src/main/java/{ => Tasks}/ToDos.java (94%) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index f89a78e0..908189e0 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,11 +1,13 @@ -import java.util.Arrays; +import Exception_Handling.*; +import Tasks.*; + import java.util.Scanner; public class Duke { private static TaskList taskList = new TaskList(); private static PrintHelper printer = new PrintHelper(); - public static void addCommand(String command) throws UnknownSyntaxException, EmptyDescriptionException, TimeManagementException{ + public static void addCommand(String command) throws UnknownSyntaxException, EmptyDescriptionException, TimeManagementException { String keyword; String detail; Task temp_task; @@ -48,7 +50,7 @@ public static void addCommand(String command) throws UnknownSyntaxException, Emp taskList.addTask(temp_task); } - public static void reply(String command) throws EmptyTaskListException, UnknownSyntaxException,TaskNotFoundException{ + public static void reply(String command) throws EmptyTaskListException, UnknownSyntaxException, TaskNotFoundException { if(command.contains("done")){ try { String[] doneCmd = command.split(" "); @@ -115,6 +117,21 @@ else if(command.contains("done")){ } command = in.nextLine(); } + else if(command.contains("delete")){ + try{ + taskList.deleteTask(Integer.parseInt(command.split(" ", 2)[1])); + } + catch(TaskNotFoundException tnf){ + printer.exception_feedback_taskNotFound(command.split(" ", 2)[1]); + } + catch(NumberFormatException e){ + printer.exception_feedback_unknownSyntax(command); + } + catch(EmptyTaskListException etl){ + printer.exception_feedback_emptyTaskList(); + } + command = in.nextLine(); + } else{ boolean success = true; try { diff --git a/src/main/java/EmptyDescriptionException.java b/src/main/java/Exception_Handling/EmptyDescriptionException.java similarity index 89% rename from src/main/java/EmptyDescriptionException.java rename to src/main/java/Exception_Handling/EmptyDescriptionException.java index ee6644e6..bc1b1e27 100644 --- a/src/main/java/EmptyDescriptionException.java +++ b/src/main/java/Exception_Handling/EmptyDescriptionException.java @@ -1,3 +1,5 @@ +package Exception_Handling; + public class EmptyDescriptionException extends Exception{ /*Prints the following printer.separator(); diff --git a/src/main/java/EmptyTaskListException.java b/src/main/java/Exception_Handling/EmptyTaskListException.java similarity index 88% rename from src/main/java/EmptyTaskListException.java rename to src/main/java/Exception_Handling/EmptyTaskListException.java index 2f5ab024..90d053b3 100644 --- a/src/main/java/EmptyTaskListException.java +++ b/src/main/java/Exception_Handling/EmptyTaskListException.java @@ -1,3 +1,5 @@ +package Exception_Handling; + public class EmptyTaskListException extends Exception{ /*Prints the following printer.separator(); diff --git a/src/main/java/TaskNotFoundException.java b/src/main/java/Exception_Handling/TaskNotFoundException.java similarity index 72% rename from src/main/java/TaskNotFoundException.java rename to src/main/java/Exception_Handling/TaskNotFoundException.java index 6886361d..f4440b8e 100644 --- a/src/main/java/TaskNotFoundException.java +++ b/src/main/java/Exception_Handling/TaskNotFoundException.java @@ -1,7 +1,9 @@ +package Exception_Handling; + public class TaskNotFoundException extends Exception{ /*Prints the following printer.separator(); - System.out.println(" ☹ OOPS!!! I'm sorry, please key in by Task ID instead of [%s]", message); + System.out.println(" ☹ OOPS!!! I'm sorry, please key in by Tasks.Task ID instead of [%s]", message); printer.separator(); */ } diff --git a/src/main/java/TimeManagementException.java b/src/main/java/Exception_Handling/TimeManagementException.java similarity index 90% rename from src/main/java/TimeManagementException.java rename to src/main/java/Exception_Handling/TimeManagementException.java index a91f610c..77da327c 100644 --- a/src/main/java/TimeManagementException.java +++ b/src/main/java/Exception_Handling/TimeManagementException.java @@ -1,3 +1,5 @@ +package Exception_Handling; + public class TimeManagementException extends Exception{ /*Prints the following printer.separator(); diff --git a/src/main/java/UnknownSyntaxException.java b/src/main/java/Exception_Handling/UnknownSyntaxException.java similarity index 89% rename from src/main/java/UnknownSyntaxException.java rename to src/main/java/Exception_Handling/UnknownSyntaxException.java index 59e78f05..188c8c0e 100644 --- a/src/main/java/UnknownSyntaxException.java +++ b/src/main/java/Exception_Handling/UnknownSyntaxException.java @@ -1,3 +1,5 @@ +package Exception_Handling; + public class UnknownSyntaxException extends Exception{ /*Prints the following printer.separator(); diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java deleted file mode 100644 index 20e41340..00000000 --- a/src/main/java/TaskList.java +++ /dev/null @@ -1,46 +0,0 @@ -import java.util.ArrayList; - -public class TaskList { - protected int listSize; - ArrayList taskList; - private static PrintHelper printer = new PrintHelper(); - - public TaskList() { - taskList = new ArrayList<>(); - } - - public void deleteTask(int taskID){ - this.taskList.remove(taskID-1); - listSize--; - } - - public void addTask(Task task){ - this.taskList.add(task); - listSize++; - } - - public Task getTask(int ID){ - return taskList.get(ID); - } - - public Task getLastTask(){ - return taskList.get(listSize-1); - } - - public int getListSize(){ - return listSize; - } - public void printTaskList() throws EmptyTaskListException{ - printer.separator(); - if(listSize == 0){ - throw new EmptyTaskListException(); - } - int numbering = 1; - System.out.println(" Here are the tasks in your list:"); - for(Task t : taskList){ - System.out.println(" "+numbering+"."+t.toString()); - numbering++; - } - printer.separator(); - } -} diff --git a/src/main/java/Deadline.java b/src/main/java/Tasks/Deadline.java similarity index 94% rename from src/main/java/Deadline.java rename to src/main/java/Tasks/Deadline.java index 2de70b75..0ceaa03a 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Tasks/Deadline.java @@ -1,3 +1,5 @@ +package Tasks; + public class Deadline extends Task { protected String by; diff --git a/src/main/java/Events.java b/src/main/java/Tasks/Events.java similarity index 94% rename from src/main/java/Events.java rename to src/main/java/Tasks/Events.java index 3c4edff7..5a887a08 100644 --- a/src/main/java/Events.java +++ b/src/main/java/Tasks/Events.java @@ -1,3 +1,5 @@ +package Tasks; + public class Events extends Task { protected String at; diff --git a/src/main/java/PrintHelper.java b/src/main/java/Tasks/PrintHelper.java similarity index 96% rename from src/main/java/PrintHelper.java rename to src/main/java/Tasks/PrintHelper.java index f8f3d808..b0a0be73 100644 --- a/src/main/java/PrintHelper.java +++ b/src/main/java/Tasks/PrintHelper.java @@ -1,3 +1,5 @@ +package Tasks; + public class PrintHelper { public void separator(){ System.out.println(" ____________________________________________________________"); @@ -39,7 +41,7 @@ public void exception_feedback_unknownSyntax(String message){ } public void exception_feedback_taskNotFound(String message){ separator(); - System.out.printf(" ☹ OOPS!!! Please key in by Task ID instead of [%s]\n", message); + System.out.printf(" ☹ OOPS!!! Please key in by Tasks.Task ID instead of [%s]\n", message); separator(); } public void exception_feedback_noTimeConcept(){ diff --git a/src/main/java/Task.java b/src/main/java/Tasks/Task.java similarity index 97% rename from src/main/java/Task.java rename to src/main/java/Tasks/Task.java index 9db7c687..5b4aeeba 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Tasks/Task.java @@ -1,3 +1,5 @@ +package Tasks; + public class Task { protected String description; protected boolean isDone; diff --git a/src/main/java/Tasks/TaskList.java b/src/main/java/Tasks/TaskList.java new file mode 100644 index 00000000..e16635b9 --- /dev/null +++ b/src/main/java/Tasks/TaskList.java @@ -0,0 +1,59 @@ +package Tasks; +import Exception_Handling.*; +import java.util.ArrayList; + +public class TaskList { + protected int listSize; + private ArrayList taskList; + private static PrintHelper printer = new PrintHelper(); + + public TaskList() { + taskList = new ArrayList<>(); + } + + public void deleteTask(int taskID) throws TaskNotFoundException, EmptyTaskListException{ + int taskPosition = taskID -1; + if(taskPosition > this.listSize || taskPosition < 0){ + throw new TaskNotFoundException(); + } + System.out.println(" Noted. I've removed this task: " ); + System.out.println(" " + taskList.get(taskPosition).toString()); + this.taskList.remove(taskPosition); + this.listSize--; + if(this.listSize == 0){ + throw new EmptyTaskListException(); + } + System.out.println(" Now you have " + this.listSize + " tasks in the list."); + printer.separator(); + } + + public void addTask(Task task){ + this.taskList.add(task); + this.listSize++; + } + + public Task getTask(int ID){ + return taskList.get(ID); + } + + public Task getLastTask(){ + return taskList.get(listSize-1); + } + + public int getListSize(){ + return this.listSize; + } + public void printTaskList() throws EmptyTaskListException { + printer.separator(); + if(this.listSize == 0){ + throw new EmptyTaskListException(); + } + int numbering = 1; + System.out.println(" Here are the tasks in your list:"); + for(Task t : taskList){ + System.out.println(" "+numbering+"."+t.toString()); + numbering++; + } + printer.separator(); + } +} diff --git a/src/main/java/ToDos.java b/src/main/java/Tasks/ToDos.java similarity index 94% rename from src/main/java/ToDos.java rename to src/main/java/Tasks/ToDos.java index 42e9fc41..0191be53 100644 --- a/src/main/java/ToDos.java +++ b/src/main/java/Tasks/ToDos.java @@ -1,3 +1,5 @@ +package Tasks; + public class ToDos extends Task { protected String action; diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index e4518ba2..2ad0e44b 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,5 +1,6 @@ blah to do +to do list read book to do read book From f3812376368283ddf8f77a775648337b23577f50 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sun, 3 Oct 2021 09:15:14 +0800 Subject: [PATCH 11/32] 1. Source code tidying up 2. Java classes into folders. 3. Enum in progress --- src/main/java/Tasks/Task_Enum.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/main/java/Tasks/Task_Enum.java diff --git a/src/main/java/Tasks/Task_Enum.java b/src/main/java/Tasks/Task_Enum.java new file mode 100644 index 00000000..6adffdea --- /dev/null +++ b/src/main/java/Tasks/Task_Enum.java @@ -0,0 +1,11 @@ +package Tasks; + +public enum Task_Enum { + TODO, //0 + DEADLINE, //1 + EVENT, //2 + LIST, //3 + DONE, //4 + DELETE, //5 + BYE //6 +} From 1872bfda0259645bbd690a68b83219d80ac87c33 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 16 Oct 2021 21:02:18 +0800 Subject: [PATCH 12/32] Save function, More OOP, Packages in Progress. --- README.md | 4 +- src/main/java/{ => Duke}/Duke.java | 63 +++++++++++-------- .../java/Exception_Handler/DukeException.java | 4 ++ .../EmptyDescriptionException.java | 2 +- .../EmptyTaskListException.java | 2 +- .../Exception_Handler/SavingException.java | 10 +++ .../TaskNotFoundException.java | 2 +- .../TimeManagementException.java | 2 +- .../UnknownSyntaxException.java | 2 +- src/main/java/Parser/CMD.java | 11 ++++ src/main/java/Parser/CMD_Add.java | 8 +++ src/main/java/Parser/CMD_Bye.java | 4 ++ src/main/java/Parser/CMD_Delete.java | 4 ++ src/main/java/Parser/CMD_Done.java | 4 ++ src/main/java/Parser/CMD_Enum.java | 9 +++ src/main/java/Parser/CMD_List.java | 4 ++ src/main/java/Parser/CMD_Save.java | 4 ++ src/main/java/Storage/Storage.java | 56 +++++++++++++++++ .../java/{Tasks => TaskList}/Deadline.java | 2 +- src/main/java/{Tasks => TaskList}/Events.java | 2 +- src/main/java/{Tasks => TaskList}/Task.java | 2 +- .../java/{Tasks => TaskList}/TaskList.java | 10 ++- src/main/java/TaskList/Task_Enum.java | 7 +++ src/main/java/{Tasks => TaskList}/ToDos.java | 2 +- src/main/java/Tasks/Task_Enum.java | 11 ---- .../ReturnMessages.java} | 21 ++++++- src/main/java/UI/UI.java | 18 ++++++ text-ui-test/EXPECTED.TXT | 2 +- text-ui-test/runtest.bat | 4 +- 29 files changed, 218 insertions(+), 58 deletions(-) rename src/main/java/{ => Duke}/Duke.java (73%) create mode 100644 src/main/java/Exception_Handler/DukeException.java rename src/main/java/{Exception_Handling => Exception_Handler}/EmptyDescriptionException.java (90%) rename src/main/java/{Exception_Handling => Exception_Handler}/EmptyTaskListException.java (89%) create mode 100644 src/main/java/Exception_Handler/SavingException.java rename src/main/java/{Exception_Handling => Exception_Handler}/TaskNotFoundException.java (90%) rename src/main/java/{Exception_Handling => Exception_Handler}/TimeManagementException.java (90%) rename src/main/java/{Exception_Handling => Exception_Handler}/UnknownSyntaxException.java (89%) create mode 100644 src/main/java/Parser/CMD.java create mode 100644 src/main/java/Parser/CMD_Add.java create mode 100644 src/main/java/Parser/CMD_Bye.java create mode 100644 src/main/java/Parser/CMD_Delete.java create mode 100644 src/main/java/Parser/CMD_Done.java create mode 100644 src/main/java/Parser/CMD_Enum.java create mode 100644 src/main/java/Parser/CMD_List.java create mode 100644 src/main/java/Parser/CMD_Save.java create mode 100644 src/main/java/Storage/Storage.java rename src/main/java/{Tasks => TaskList}/Deadline.java (94%) rename src/main/java/{Tasks => TaskList}/Events.java (94%) rename src/main/java/{Tasks => TaskList}/Task.java (96%) rename src/main/java/{Tasks => TaskList}/TaskList.java (90%) create mode 100644 src/main/java/TaskList/Task_Enum.java rename src/main/java/{Tasks => TaskList}/ToDos.java (93%) delete mode 100644 src/main/java/Tasks/Task_Enum.java rename src/main/java/{Tasks/PrintHelper.java => UI/ReturnMessages.java} (71%) create mode 100644 src/main/java/UI/UI.java diff --git a/README.md b/README.md index 8715d4d9..63d0ad6b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Duke project template +# Duke.Duke project template This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it. @@ -13,7 +13,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version. 1. If there are any further prompts, accept the defaults. 1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).
In the same dialog, set the **Project language level** field to the `SDK default` option. -3. After that, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output: +3. After that, locate the `src/main/java/Duke.Duke.java` file, right-click it, and choose `Run Duke.Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output: ``` Hello from ____ _ diff --git a/src/main/java/Duke.java b/src/main/java/Duke/Duke.java similarity index 73% rename from src/main/java/Duke.java rename to src/main/java/Duke/Duke.java index 908189e0..d3a2edfa 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -1,12 +1,17 @@ -import Exception_Handling.*; -import Tasks.*; +package Duke; +import Exception_Handler.*; +import TaskList.*; +import UI.*; +import Storage.*; import java.util.Scanner; - +import java.io.*; public class Duke { + private Storage storage; + private TaskList tasks; + private UI ui; private static TaskList taskList = new TaskList(); - private static PrintHelper printer = new PrintHelper(); - + private static ReturnMessages returnMessage = new ReturnMessages(); public static void addCommand(String command) throws UnknownSyntaxException, EmptyDescriptionException, TimeManagementException { String keyword; String detail; @@ -56,37 +61,43 @@ public static void reply(String command) throws EmptyTaskListException, UnknownS String[] doneCmd = command.split(" "); taskList.getTask(Integer.parseInt(doneCmd[1]) - 1).setDone(); //taskList[Integer.parseInt(doneCmd[1]) - 1].setDone(); - printer.taskDoneFeedback(); + returnMessage.taskDoneFeedback(); System.out.println(" " + taskList.getTask(Integer.parseInt(doneCmd[1]) - 1).toString()); - printer.separator(); + returnMessage.separator(); return; } catch(NumberFormatException nf){ throw new TaskNotFoundException(); } } - printer.taskAddFeedback(); + returnMessage.taskAddFeedback(); try { System.out.println(" " + taskList.getLastTask().toString()); System.out.println(" Now you have " + taskList.getListSize() + " tasks in the list."); - printer.separator(); + returnMessage.separator(); } catch(ArrayIndexOutOfBoundsException a){ throw new EmptyTaskListException(); } } + public Duke(String fileName) throws DukeException, FileNotFoundException, IOException { + ui = new UI(); + storage = new Storage(fileName); + tasks = new TaskList(); + storage.load(tasks); + } public static void main(String[] args) { - String logo = " ____ _ \n" + /*String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); + System.out.println("Hello from\n" + logo);*/ boolean end = false; String command; Scanner in = new Scanner(System.in); - printer.welcomeFeedback(); + returnMessage.welcomeFeedback(); command = in.nextLine(); while(!end){ @@ -98,7 +109,7 @@ else if(command.equals("list")){ taskList.printTaskList(); } catch(EmptyTaskListException etl){ - printer.exception_feedback_emptyTaskList(); + returnMessage.exception_feedback_emptyTaskList(); } command = in.nextLine(); } @@ -107,13 +118,13 @@ else if(command.contains("done")){ reply(command); } catch(EmptyTaskListException etl){ - printer.exception_feedback_emptyTaskList(); + returnMessage.exception_feedback_emptyTaskList(); } catch(UnknownSyntaxException us){ - printer.exception_feedback_unknownSyntax(command); + returnMessage.exception_feedback_unknownSyntax(command); } catch(TaskNotFoundException tnf){ - printer.exception_feedback_taskNotFound(command.split(" ", 2)[1]); + returnMessage.exception_feedback_taskNotFound(command.split(" ", 2)[1]); } command = in.nextLine(); } @@ -122,13 +133,13 @@ else if(command.contains("delete")){ taskList.deleteTask(Integer.parseInt(command.split(" ", 2)[1])); } catch(TaskNotFoundException tnf){ - printer.exception_feedback_taskNotFound(command.split(" ", 2)[1]); + returnMessage.exception_feedback_taskNotFound(command.split(" ", 2)[1]); } catch(NumberFormatException e){ - printer.exception_feedback_unknownSyntax(command); + returnMessage.exception_feedback_unknownSyntax(command); } catch(EmptyTaskListException etl){ - printer.exception_feedback_emptyTaskList(); + returnMessage.exception_feedback_emptyTaskList(); } command = in.nextLine(); } @@ -139,31 +150,29 @@ else if(command.contains("delete")){ } catch(UnknownSyntaxException us){ success = false; - printer.exception_feedback_unknownSyntax(command); + returnMessage.exception_feedback_unknownSyntax(command); } catch(EmptyDescriptionException ed){ success = false; - printer.exception_feedback_emptyDescription(command); + returnMessage.exception_feedback_emptyDescription(command); } catch(TimeManagementException tm){ success = false; - printer.exception_feedback_noTimeConcept(); + returnMessage.exception_feedback_noTimeConcept(); } if(success) { try { reply(command); } catch (EmptyTaskListException etl) { - printer.exception_feedback_emptyTaskList(); + returnMessage.exception_feedback_emptyTaskList(); } catch(UnknownSyntaxException | TaskNotFoundException exception){ - printer.exception_feedback_unknownSyntax(command); + returnMessage.exception_feedback_unknownSyntax(command); } } command = in.nextLine(); } } - - - printer.exitFeedback(); + returnMessage.exitFeedback(); } } diff --git a/src/main/java/Exception_Handler/DukeException.java b/src/main/java/Exception_Handler/DukeException.java new file mode 100644 index 00000000..e2356d84 --- /dev/null +++ b/src/main/java/Exception_Handler/DukeException.java @@ -0,0 +1,4 @@ +package Exception_Handler; + +public class DukeException extends Exception{ +} diff --git a/src/main/java/Exception_Handling/EmptyDescriptionException.java b/src/main/java/Exception_Handler/EmptyDescriptionException.java similarity index 90% rename from src/main/java/Exception_Handling/EmptyDescriptionException.java rename to src/main/java/Exception_Handler/EmptyDescriptionException.java index bc1b1e27..e2a792ad 100644 --- a/src/main/java/Exception_Handling/EmptyDescriptionException.java +++ b/src/main/java/Exception_Handler/EmptyDescriptionException.java @@ -1,4 +1,4 @@ -package Exception_Handling; +package Exception_Handler; public class EmptyDescriptionException extends Exception{ /*Prints the following diff --git a/src/main/java/Exception_Handling/EmptyTaskListException.java b/src/main/java/Exception_Handler/EmptyTaskListException.java similarity index 89% rename from src/main/java/Exception_Handling/EmptyTaskListException.java rename to src/main/java/Exception_Handler/EmptyTaskListException.java index 90d053b3..a81c687b 100644 --- a/src/main/java/Exception_Handling/EmptyTaskListException.java +++ b/src/main/java/Exception_Handler/EmptyTaskListException.java @@ -1,4 +1,4 @@ -package Exception_Handling; +package Exception_Handler; public class EmptyTaskListException extends Exception{ /*Prints the following diff --git a/src/main/java/Exception_Handler/SavingException.java b/src/main/java/Exception_Handler/SavingException.java new file mode 100644 index 00000000..9c88d02f --- /dev/null +++ b/src/main/java/Exception_Handler/SavingException.java @@ -0,0 +1,10 @@ +package Exception_Handler; + +public class SavingException extends Exception{ + /*Prints the following + separator(); + System.out.println(" ☹ OOPS!!! Exception caught while saving >_<|||"); + separator(); + */ + +} diff --git a/src/main/java/Exception_Handling/TaskNotFoundException.java b/src/main/java/Exception_Handler/TaskNotFoundException.java similarity index 90% rename from src/main/java/Exception_Handling/TaskNotFoundException.java rename to src/main/java/Exception_Handler/TaskNotFoundException.java index f4440b8e..95f08a6f 100644 --- a/src/main/java/Exception_Handling/TaskNotFoundException.java +++ b/src/main/java/Exception_Handler/TaskNotFoundException.java @@ -1,4 +1,4 @@ -package Exception_Handling; +package Exception_Handler; public class TaskNotFoundException extends Exception{ /*Prints the following diff --git a/src/main/java/Exception_Handling/TimeManagementException.java b/src/main/java/Exception_Handler/TimeManagementException.java similarity index 90% rename from src/main/java/Exception_Handling/TimeManagementException.java rename to src/main/java/Exception_Handler/TimeManagementException.java index 77da327c..007d7b30 100644 --- a/src/main/java/Exception_Handling/TimeManagementException.java +++ b/src/main/java/Exception_Handler/TimeManagementException.java @@ -1,4 +1,4 @@ -package Exception_Handling; +package Exception_Handler; public class TimeManagementException extends Exception{ /*Prints the following diff --git a/src/main/java/Exception_Handling/UnknownSyntaxException.java b/src/main/java/Exception_Handler/UnknownSyntaxException.java similarity index 89% rename from src/main/java/Exception_Handling/UnknownSyntaxException.java rename to src/main/java/Exception_Handler/UnknownSyntaxException.java index 188c8c0e..ed2e563a 100644 --- a/src/main/java/Exception_Handling/UnknownSyntaxException.java +++ b/src/main/java/Exception_Handler/UnknownSyntaxException.java @@ -1,4 +1,4 @@ -package Exception_Handling; +package Exception_Handler; public class UnknownSyntaxException extends Exception{ /*Prints the following diff --git a/src/main/java/Parser/CMD.java b/src/main/java/Parser/CMD.java new file mode 100644 index 00000000..9f18fcef --- /dev/null +++ b/src/main/java/Parser/CMD.java @@ -0,0 +1,11 @@ +package Parser; + +public class CMD { + public CMD(String command){ + + } + + public CMD() { + + } +} diff --git a/src/main/java/Parser/CMD_Add.java b/src/main/java/Parser/CMD_Add.java new file mode 100644 index 00000000..8c42fc74 --- /dev/null +++ b/src/main/java/Parser/CMD_Add.java @@ -0,0 +1,8 @@ +package Parser; + +public class CMD_Add extends CMD{ + public CMD_Add(){ + super(); + + } +} diff --git a/src/main/java/Parser/CMD_Bye.java b/src/main/java/Parser/CMD_Bye.java new file mode 100644 index 00000000..779013ea --- /dev/null +++ b/src/main/java/Parser/CMD_Bye.java @@ -0,0 +1,4 @@ +package Parser; + +public class CMD_Bye extends CMD{ +} diff --git a/src/main/java/Parser/CMD_Delete.java b/src/main/java/Parser/CMD_Delete.java new file mode 100644 index 00000000..23777833 --- /dev/null +++ b/src/main/java/Parser/CMD_Delete.java @@ -0,0 +1,4 @@ +package Parser; + +public class CMD_Delete extends CMD{ +} diff --git a/src/main/java/Parser/CMD_Done.java b/src/main/java/Parser/CMD_Done.java new file mode 100644 index 00000000..047ad173 --- /dev/null +++ b/src/main/java/Parser/CMD_Done.java @@ -0,0 +1,4 @@ +package Parser; + +public class CMD_Done extends CMD{ +} diff --git a/src/main/java/Parser/CMD_Enum.java b/src/main/java/Parser/CMD_Enum.java new file mode 100644 index 00000000..44af64d7 --- /dev/null +++ b/src/main/java/Parser/CMD_Enum.java @@ -0,0 +1,9 @@ +package Parser; + +public enum CMD_Enum { + LIST, //0 + DONE, //1 + DELETE, //2 + BYE, //3 + SAVE //4 +} diff --git a/src/main/java/Parser/CMD_List.java b/src/main/java/Parser/CMD_List.java new file mode 100644 index 00000000..dce610da --- /dev/null +++ b/src/main/java/Parser/CMD_List.java @@ -0,0 +1,4 @@ +package Parser; + +public class CMD_List extends CMD{ +} diff --git a/src/main/java/Parser/CMD_Save.java b/src/main/java/Parser/CMD_Save.java new file mode 100644 index 00000000..7058fbfa --- /dev/null +++ b/src/main/java/Parser/CMD_Save.java @@ -0,0 +1,4 @@ +package Parser; + +public class CMD_Save extends CMD{ +} diff --git a/src/main/java/Storage/Storage.java b/src/main/java/Storage/Storage.java new file mode 100644 index 00000000..2ec26ec7 --- /dev/null +++ b/src/main/java/Storage/Storage.java @@ -0,0 +1,56 @@ +package Storage; + +import Exception_Handler.*; +import TaskList.TaskList; +import TaskList.Task; + +import java.io.*; +import java.util.ArrayList; +import java.util.Scanner; + +public class Storage { + protected boolean isExist; + protected String fileName; + protected File file = new File(System.getProperty("user.dir") + "/src/main/java/Storage/"+fileName); // create a File for the given file path + Scanner scanner; + public Storage(String fileName){ + this.fileName = fileName; + } + + public void load(TaskList task_from_file) throws IOException{ + try (BufferedReader br = new BufferedReader(new FileReader(file))) { + String line; + while ((line = br.readLine()) != null) { + // process the line + System.out.println("Loading"); + } + } + catch(IOException e){ + + } + } + public void createFile() throws IOException{ + try { + file.createNewFile(); + } + catch(IOException ioe) { + this.isExist = true; + System.out.println("FIle exists"); + } + System.out.println("File created: " + file.getName()); + } + + public void save(ArrayList list) throws IOException{ + + FileWriter myWriter = new FileWriter(file.getAbsoluteFile()); + list.forEach((task) -> { + try { + myWriter.write(task.toString()); + } catch (IOException e) { + // + } + }); + myWriter.close(); + System.out.println("Successfully wrote to the file."); + } +} diff --git a/src/main/java/Tasks/Deadline.java b/src/main/java/TaskList/Deadline.java similarity index 94% rename from src/main/java/Tasks/Deadline.java rename to src/main/java/TaskList/Deadline.java index 0ceaa03a..4d9946d1 100644 --- a/src/main/java/Tasks/Deadline.java +++ b/src/main/java/TaskList/Deadline.java @@ -1,4 +1,4 @@ -package Tasks; +package TaskList; public class Deadline extends Task { diff --git a/src/main/java/Tasks/Events.java b/src/main/java/TaskList/Events.java similarity index 94% rename from src/main/java/Tasks/Events.java rename to src/main/java/TaskList/Events.java index 5a887a08..831eacae 100644 --- a/src/main/java/Tasks/Events.java +++ b/src/main/java/TaskList/Events.java @@ -1,4 +1,4 @@ -package Tasks; +package TaskList; public class Events extends Task { protected String at; diff --git a/src/main/java/Tasks/Task.java b/src/main/java/TaskList/Task.java similarity index 96% rename from src/main/java/Tasks/Task.java rename to src/main/java/TaskList/Task.java index 5b4aeeba..baea4e63 100644 --- a/src/main/java/Tasks/Task.java +++ b/src/main/java/TaskList/Task.java @@ -1,4 +1,4 @@ -package Tasks; +package TaskList; public class Task { protected String description; diff --git a/src/main/java/Tasks/TaskList.java b/src/main/java/TaskList/TaskList.java similarity index 90% rename from src/main/java/Tasks/TaskList.java rename to src/main/java/TaskList/TaskList.java index e16635b9..589370c6 100644 --- a/src/main/java/Tasks/TaskList.java +++ b/src/main/java/TaskList/TaskList.java @@ -1,11 +1,13 @@ -package Tasks; -import Exception_Handling.*; +package TaskList; +import Exception_Handler.*; +import UI.ReturnMessages; + import java.util.ArrayList; public class TaskList { protected int listSize; private ArrayList taskList; - private static PrintHelper printer = new PrintHelper(); + private static ReturnMessages printer = new ReturnMessages(); public TaskList() { taskList = new ArrayList<>(); @@ -43,6 +45,8 @@ public Task getLastTask(){ public int getListSize(){ return this.listSize; } + + public void save(){} public void printTaskList() throws EmptyTaskListException { printer.separator(); if(this.listSize == 0){ diff --git a/src/main/java/TaskList/Task_Enum.java b/src/main/java/TaskList/Task_Enum.java new file mode 100644 index 00000000..84172601 --- /dev/null +++ b/src/main/java/TaskList/Task_Enum.java @@ -0,0 +1,7 @@ +package TaskList; + +public enum Task_Enum { + TODO, //0 + DEADLINE, //1 + EVENT, //2 +} diff --git a/src/main/java/Tasks/ToDos.java b/src/main/java/TaskList/ToDos.java similarity index 93% rename from src/main/java/Tasks/ToDos.java rename to src/main/java/TaskList/ToDos.java index 0191be53..59699786 100644 --- a/src/main/java/Tasks/ToDos.java +++ b/src/main/java/TaskList/ToDos.java @@ -1,4 +1,4 @@ -package Tasks; +package TaskList; public class ToDos extends Task { protected String action; diff --git a/src/main/java/Tasks/Task_Enum.java b/src/main/java/Tasks/Task_Enum.java deleted file mode 100644 index 6adffdea..00000000 --- a/src/main/java/Tasks/Task_Enum.java +++ /dev/null @@ -1,11 +0,0 @@ -package Tasks; - -public enum Task_Enum { - TODO, //0 - DEADLINE, //1 - EVENT, //2 - LIST, //3 - DONE, //4 - DELETE, //5 - BYE //6 -} diff --git a/src/main/java/Tasks/PrintHelper.java b/src/main/java/UI/ReturnMessages.java similarity index 71% rename from src/main/java/Tasks/PrintHelper.java rename to src/main/java/UI/ReturnMessages.java index b0a0be73..87dffeac 100644 --- a/src/main/java/Tasks/PrintHelper.java +++ b/src/main/java/UI/ReturnMessages.java @@ -1,6 +1,6 @@ -package Tasks; +package UI; -public class PrintHelper { +public class ReturnMessages { public void separator(){ System.out.println(" ____________________________________________________________"); } @@ -15,7 +15,7 @@ public void taskAddFeedback(){ } public void welcomeFeedback(){ separator(); - System.out.println(" Hello! I'm Duke"); + System.out.println(" Hello! I'm Duke.Duke"); System.out.println(" What can I do for you?"); separator(); } @@ -49,4 +49,19 @@ public void exception_feedback_noTimeConcept(){ System.out.println(" ☹ HEY!!! Please give a due date for deadlines and events. Let's have some sense of time >_<|||"); separator(); } + public void exception_feedback_cantSave(){ + separator(); + System.out.println(" ☹ OOPS!!! Exception caught while saving >_<|||"); + separator(); + } + public void exception_feedback_loadingError(){ + separator(); + String logo = " ____ _ \n" + + "| _ \\ _ _| | _____ \n" + + "| | | | | | | |/ / _ \\\n" + + "| |_| | |_| | < __/\n" + + "|____/ \\__,_|_|\\_\\___|\n"; + System.out.println(" ☹ OOPS!!! Something went wrong while loading"); + separator(); + } } diff --git a/src/main/java/UI/UI.java b/src/main/java/UI/UI.java new file mode 100644 index 00000000..4faf2ee9 --- /dev/null +++ b/src/main/java/UI/UI.java @@ -0,0 +1,18 @@ +package UI; +public class UI{ + + private static ReturnMessages returnMessage = new ReturnMessages(); + + public void show(){ + String logo = " ____ _ \n" + + "| _ \\ _ _| | _____ \n" + + "| | | | | | | |/ / _ \\\n" + + "| |_| | |_| | < __/\n" + + "|____/ \\__,_|_|\\_\\___|\n"; + System.out.println("Hello from\n" + logo); + } + + public void showLoadingError(){ + returnMessage.exception_feedback_loadingError(); + } +} diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 7ce03d21..d4cfae16 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -6,7 +6,7 @@ Hello from |____/ \__,_|_|\_\___| ____________________________________________________________ - Hello! I'm Duke + Hello! I'm Duke.Duke What can I do for you? ____________________________________________________________ ____________________________________________________________ diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 97c1d915..9ebaa2cc 100644 --- a/text-ui-test/runtest.bat +++ b/text-ui-test/runtest.bat @@ -7,7 +7,7 @@ REM delete output from previous run if exist ACTUAL.TXT del ACTUAL.TXT REM compile the code into the bin folder -javac -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\Duke.java +javac -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\Duke.Duke.java IF ERRORLEVEL 1 ( echo ********** BUILD FAILURE ********** exit /b 1 @@ -15,7 +15,7 @@ IF ERRORLEVEL 1 ( REM no error here, errorlevel == 0 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT -java -classpath ..\bin Duke < input.txt > ACTUAL.TXT +java -classpath ..\bin Duke.Duke < input.txt > ACTUAL.TXT REM compare the output to the expected output FC ACTUAL.TXT EXPECTED.TXT From f256f68f7124534346c84c4b55f87b0d99fcaa9e Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Mon, 18 Oct 2021 01:41:43 +0800 Subject: [PATCH 13/32] 1. Made ENUM into use 2. Level-7 Save function implementation 3.More-OOP Achieved 4. Packages Segregation --- src/main/java/Duke/Duke.java | 204 ++++-------------- src/main/java/Duke/DukeTest.java | 15 ++ .../java/Duke/exception/DukeException.java | 10 + .../exception}/EmptyDescriptionException.java | 7 +- .../exception}/EmptyTaskListException.java | 7 +- .../exception}/SavingException.java | 7 +- .../exception}/TaskNotFoundException.java | 8 +- .../exception}/TimeManagementException.java | 7 +- .../exception}/UnknownSyntaxException.java | 7 +- src/main/java/Duke/parser/CMD.java | 74 +++++++ src/main/java/Duke/parser/CMD_Add.java | 7 + src/main/java/Duke/parser/CMD_Bye.java | 17 ++ src/main/java/Duke/parser/CMD_Deadline.java | 37 ++++ src/main/java/Duke/parser/CMD_Delete.java | 19 ++ src/main/java/Duke/parser/CMD_Done.java | 18 ++ src/main/java/Duke/parser/CMD_Enum.java | 27 +++ src/main/java/Duke/parser/CMD_Error.java | 9 + src/main/java/Duke/parser/CMD_Event.java | 35 +++ src/main/java/Duke/parser/CMD_List.java | 18 ++ src/main/java/Duke/parser/CMD_Save.java | 7 + src/main/java/Duke/parser/CMD_TODO.java | 33 +++ src/main/java/Duke/parser/Command.java | 29 +++ src/main/java/Duke/parser/Parser.java | 28 +++ src/main/java/Duke/storage/Storage.java | 104 +++++++++ src/main/java/Duke/storage/duke.txt | 2 + .../{TaskList => Duke/task}/Deadline.java | 7 +- .../java/{TaskList => Duke/task}/Events.java | 7 +- .../java/{TaskList => Duke/task}/Task.java | 12 +- .../{TaskList => Duke/task}/TaskList.java | 25 ++- .../{TaskList => Duke/task}/Task_Enum.java | 2 +- .../java/{TaskList => Duke/task}/ToDos.java | 7 +- .../java/{UI => Duke/ui}/ReturnMessages.java | 2 +- src/main/java/Duke/ui/UI.java | 65 ++++++ .../java/Exception_Handler/DukeException.java | 4 - src/main/java/Parser/CMD.java | 11 - src/main/java/Parser/CMD_Add.java | 8 - src/main/java/Parser/CMD_Bye.java | 4 - src/main/java/Parser/CMD_Delete.java | 4 - src/main/java/Parser/CMD_Done.java | 4 - src/main/java/Parser/CMD_Enum.java | 9 - src/main/java/Parser/CMD_List.java | 4 - src/main/java/Parser/CMD_Save.java | 4 - src/main/java/Storage/Storage.java | 56 ----- src/main/java/UI/UI.java | 18 -- 44 files changed, 673 insertions(+), 316 deletions(-) create mode 100644 src/main/java/Duke/DukeTest.java create mode 100644 src/main/java/Duke/exception/DukeException.java rename src/main/java/{Exception_Handler => Duke/exception}/EmptyDescriptionException.java (53%) rename src/main/java/{Exception_Handler => Duke/exception}/EmptyTaskListException.java (51%) rename src/main/java/{Exception_Handler => Duke/exception}/SavingException.java (52%) rename src/main/java/{Exception_Handler => Duke/exception}/TaskNotFoundException.java (56%) rename src/main/java/{Exception_Handler => Duke/exception}/TimeManagementException.java (62%) rename src/main/java/{Exception_Handler => Duke/exception}/UnknownSyntaxException.java (53%) create mode 100644 src/main/java/Duke/parser/CMD.java create mode 100644 src/main/java/Duke/parser/CMD_Add.java create mode 100644 src/main/java/Duke/parser/CMD_Bye.java create mode 100644 src/main/java/Duke/parser/CMD_Deadline.java create mode 100644 src/main/java/Duke/parser/CMD_Delete.java create mode 100644 src/main/java/Duke/parser/CMD_Done.java create mode 100644 src/main/java/Duke/parser/CMD_Enum.java create mode 100644 src/main/java/Duke/parser/CMD_Error.java create mode 100644 src/main/java/Duke/parser/CMD_Event.java create mode 100644 src/main/java/Duke/parser/CMD_List.java create mode 100644 src/main/java/Duke/parser/CMD_Save.java create mode 100644 src/main/java/Duke/parser/CMD_TODO.java create mode 100644 src/main/java/Duke/parser/Command.java create mode 100644 src/main/java/Duke/parser/Parser.java create mode 100644 src/main/java/Duke/storage/Storage.java create mode 100644 src/main/java/Duke/storage/duke.txt rename src/main/java/{TaskList => Duke/task}/Deadline.java (69%) rename src/main/java/{TaskList => Duke/task}/Events.java (69%) rename src/main/java/{TaskList => Duke/task}/Task.java (62%) rename src/main/java/{TaskList => Duke/task}/TaskList.java (73%) rename src/main/java/{TaskList => Duke/task}/Task_Enum.java (82%) rename src/main/java/{TaskList => Duke/task}/ToDos.java (70%) rename src/main/java/{UI => Duke/ui}/ReturnMessages.java (99%) create mode 100644 src/main/java/Duke/ui/UI.java delete mode 100644 src/main/java/Exception_Handler/DukeException.java delete mode 100644 src/main/java/Parser/CMD.java delete mode 100644 src/main/java/Parser/CMD_Add.java delete mode 100644 src/main/java/Parser/CMD_Bye.java delete mode 100644 src/main/java/Parser/CMD_Delete.java delete mode 100644 src/main/java/Parser/CMD_Done.java delete mode 100644 src/main/java/Parser/CMD_Enum.java delete mode 100644 src/main/java/Parser/CMD_List.java delete mode 100644 src/main/java/Parser/CMD_Save.java delete mode 100644 src/main/java/Storage/Storage.java delete mode 100644 src/main/java/UI/UI.java diff --git a/src/main/java/Duke/Duke.java b/src/main/java/Duke/Duke.java index d3a2edfa..9ae9a914 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -1,178 +1,52 @@ package Duke; -import Exception_Handler.*; -import TaskList.*; -import UI.*; -import Storage.*; -import java.util.Scanner; -import java.io.*; +import Duke.exception.DukeException; +import Duke.parser.Command; +import Duke.parser.Parser; +import Duke.storage.Storage; +import Duke.task.*; +import Duke.ui.UI; + +import java.io.IOException; + + public class Duke { - private Storage storage; - private TaskList tasks; + private static Storage storage; private UI ui; - private static TaskList taskList = new TaskList(); - private static ReturnMessages returnMessage = new ReturnMessages(); - public static void addCommand(String command) throws UnknownSyntaxException, EmptyDescriptionException, TimeManagementException { - String keyword; - String detail; - Task temp_task; - try { - String[] toWords = command.split(" ", 2); - keyword = toWords[0]; - detail = toWords[1]; - } - catch(ArrayIndexOutOfBoundsException aio) { - if(command.contains("todo") || command.contains("deadline") || command.contains("event")){ - throw new EmptyDescriptionException(); - } - else { - throw new UnknownSyntaxException(); - } - } - try{ - switch (keyword) { - case "todo": - temp_task = new ToDos(detail, detail); - break; - case "deadline": - String[] dl = detail.split("/by", 2); - temp_task = new Deadline(dl[0], dl[1]); - break; - case "event": - String[] dt = detail.split("/at", 2); - temp_task = new Events(dt[0], dt[1]); - break; - default: - throw new UnknownSyntaxException(); - } - } - catch(IndexOutOfBoundsException e){ - if(command.contains("deadline") || command.contains("event")){ - throw new TimeManagementException(); - } - throw new UnknownSyntaxException(); - } - taskList.addTask(temp_task); - } + private TaskList taskList; - public static void reply(String command) throws EmptyTaskListException, UnknownSyntaxException, TaskNotFoundException { - if(command.contains("done")){ - try { - String[] doneCmd = command.split(" "); - taskList.getTask(Integer.parseInt(doneCmd[1]) - 1).setDone(); - //taskList[Integer.parseInt(doneCmd[1]) - 1].setDone(); - returnMessage.taskDoneFeedback(); - System.out.println(" " + taskList.getTask(Integer.parseInt(doneCmd[1]) - 1).toString()); - returnMessage.separator(); - return; - } - catch(NumberFormatException nf){ - throw new TaskNotFoundException(); - } - } - returnMessage.taskAddFeedback(); + public Duke(String filePath) { + ui = new UI(); + storage = new Storage(filePath); try { - System.out.println(" " + taskList.getLastTask().toString()); - System.out.println(" Now you have " + taskList.getListSize() + " tasks in the list."); - returnMessage.separator(); - } - catch(ArrayIndexOutOfBoundsException a){ - throw new EmptyTaskListException(); + taskList = new TaskList(storage.load()); + } catch (DukeException e) { + ui.showLoadingError(); + taskList = new TaskList(); } } - public Duke(String fileName) throws DukeException, FileNotFoundException, IOException { - ui = new UI(); - storage = new Storage(fileName); - tasks = new TaskList(); - storage.load(tasks); + public void run() throws IOException { + ui.showWelcome(); + boolean isExit = false; + + while (!isExit) { + try { + String fullCommand = ui.readCommand(); + ui.showLine(); // show the divider line ("_______") + Command c = Parser.parse(fullCommand); + c.execute(taskList, ui, storage); + isExit = c.isExit(); + } catch (DukeException e) { + ui.showError(e); + } finally { + ui.showLine(); + } + } + ui.showExit(); } - public static void main(String[] args) { - /*String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo);*/ - boolean end = false; - String command; - Scanner in = new Scanner(System.in); - returnMessage.welcomeFeedback(); - command = in.nextLine(); - while(!end){ - if(command.equals("bye")){ - end = true; - } - else if(command.equals("list")){ - try { - taskList.printTaskList(); - } - catch(EmptyTaskListException etl){ - returnMessage.exception_feedback_emptyTaskList(); - } - command = in.nextLine(); - } - else if(command.contains("done")){ - try { - reply(command); - } - catch(EmptyTaskListException etl){ - returnMessage.exception_feedback_emptyTaskList(); - } - catch(UnknownSyntaxException us){ - returnMessage.exception_feedback_unknownSyntax(command); - } - catch(TaskNotFoundException tnf){ - returnMessage.exception_feedback_taskNotFound(command.split(" ", 2)[1]); - } - command = in.nextLine(); - } - else if(command.contains("delete")){ - try{ - taskList.deleteTask(Integer.parseInt(command.split(" ", 2)[1])); - } - catch(TaskNotFoundException tnf){ - returnMessage.exception_feedback_taskNotFound(command.split(" ", 2)[1]); - } - catch(NumberFormatException e){ - returnMessage.exception_feedback_unknownSyntax(command); - } - catch(EmptyTaskListException etl){ - returnMessage.exception_feedback_emptyTaskList(); - } - command = in.nextLine(); - } - else{ - boolean success = true; - try { - addCommand(command); - } - catch(UnknownSyntaxException us){ - success = false; - returnMessage.exception_feedback_unknownSyntax(command); - } - catch(EmptyDescriptionException ed){ - success = false; - returnMessage.exception_feedback_emptyDescription(command); - } - catch(TimeManagementException tm){ - success = false; - returnMessage.exception_feedback_noTimeConcept(); - } - if(success) { - try { - reply(command); - } catch (EmptyTaskListException etl) { - returnMessage.exception_feedback_emptyTaskList(); - } - catch(UnknownSyntaxException | TaskNotFoundException exception){ - returnMessage.exception_feedback_unknownSyntax(command); - } - } - command = in.nextLine(); - } - } - returnMessage.exitFeedback(); + public static void main(String[] args) throws DukeException, IOException { + new Duke("duke.txt").run(); } } diff --git a/src/main/java/Duke/DukeTest.java b/src/main/java/Duke/DukeTest.java new file mode 100644 index 00000000..e8821bad --- /dev/null +++ b/src/main/java/Duke/DukeTest.java @@ -0,0 +1,15 @@ +package Duke; + +import java.io.File; +import java.io.IOException; + + +public class DukeTest { + public static void main(String[] args) throws IOException { + System.out.println(System.getProperty("user.dir")); + String fileName = "duke.txt"; + File file = new File(System.getProperty("user.dir") + "/src/main/java/Duke.Storage/"+fileName); + System.out.println(file.exists()); + } + +} diff --git a/src/main/java/Duke/exception/DukeException.java b/src/main/java/Duke/exception/DukeException.java new file mode 100644 index 00000000..9c035019 --- /dev/null +++ b/src/main/java/Duke/exception/DukeException.java @@ -0,0 +1,10 @@ +package Duke.exception; + +public class DukeException extends RuntimeException{ + + public DukeException(String message) { + super(message); + } + + public DukeException() {} +} diff --git a/src/main/java/Exception_Handler/EmptyDescriptionException.java b/src/main/java/Duke/exception/EmptyDescriptionException.java similarity index 53% rename from src/main/java/Exception_Handler/EmptyDescriptionException.java rename to src/main/java/Duke/exception/EmptyDescriptionException.java index e2a792ad..9b86376e 100644 --- a/src/main/java/Exception_Handler/EmptyDescriptionException.java +++ b/src/main/java/Duke/exception/EmptyDescriptionException.java @@ -1,6 +1,9 @@ -package Exception_Handler; +package Duke.exception; -public class EmptyDescriptionException extends Exception{ +public class EmptyDescriptionException extends DukeException{ + public EmptyDescriptionException(String message) { + super(message); + } /*Prints the following printer.separator(); System.out.printf(" ☹ OOPS!!! The description of a %s cannot be empty.\n", taskType); diff --git a/src/main/java/Exception_Handler/EmptyTaskListException.java b/src/main/java/Duke/exception/EmptyTaskListException.java similarity index 51% rename from src/main/java/Exception_Handler/EmptyTaskListException.java rename to src/main/java/Duke/exception/EmptyTaskListException.java index a81c687b..40afc589 100644 --- a/src/main/java/Exception_Handler/EmptyTaskListException.java +++ b/src/main/java/Duke/exception/EmptyTaskListException.java @@ -1,6 +1,9 @@ -package Exception_Handler; +package Duke.exception; -public class EmptyTaskListException extends Exception{ +public class EmptyTaskListException extends DukeException{ + public EmptyTaskListException(String message) { + super(message); + } /*Prints the following printer.separator(); System.out.println(" ☹ OOPS!!! I'm sorry, the list is empty ^_^"); diff --git a/src/main/java/Exception_Handler/SavingException.java b/src/main/java/Duke/exception/SavingException.java similarity index 52% rename from src/main/java/Exception_Handler/SavingException.java rename to src/main/java/Duke/exception/SavingException.java index 9c88d02f..71b42e60 100644 --- a/src/main/java/Exception_Handler/SavingException.java +++ b/src/main/java/Duke/exception/SavingException.java @@ -1,6 +1,9 @@ -package Exception_Handler; +package Duke.exception; -public class SavingException extends Exception{ +public class SavingException extends DukeException{ + public SavingException(String message) { + super(message); + } /*Prints the following separator(); System.out.println(" ☹ OOPS!!! Exception caught while saving >_<|||"); diff --git a/src/main/java/Exception_Handler/TaskNotFoundException.java b/src/main/java/Duke/exception/TaskNotFoundException.java similarity index 56% rename from src/main/java/Exception_Handler/TaskNotFoundException.java rename to src/main/java/Duke/exception/TaskNotFoundException.java index 95f08a6f..73676b75 100644 --- a/src/main/java/Exception_Handler/TaskNotFoundException.java +++ b/src/main/java/Duke/exception/TaskNotFoundException.java @@ -1,9 +1,13 @@ -package Exception_Handler; +package Duke.exception; -public class TaskNotFoundException extends Exception{ +public class TaskNotFoundException extends DukeException{ + public TaskNotFoundException(String message) { + super(message); + } /*Prints the following printer.separator(); System.out.println(" ☹ OOPS!!! I'm sorry, please key in by Tasks.Task ID instead of [%s]", message); printer.separator(); */ } + diff --git a/src/main/java/Exception_Handler/TimeManagementException.java b/src/main/java/Duke/exception/TimeManagementException.java similarity index 62% rename from src/main/java/Exception_Handler/TimeManagementException.java rename to src/main/java/Duke/exception/TimeManagementException.java index 007d7b30..e213f900 100644 --- a/src/main/java/Exception_Handler/TimeManagementException.java +++ b/src/main/java/Duke/exception/TimeManagementException.java @@ -1,6 +1,9 @@ -package Exception_Handler; +package Duke.exception; + +public class TimeManagementException extends DukeException{ + public TimeManagementException() { + } -public class TimeManagementException extends Exception{ /*Prints the following printer.separator(); System.out.println(" ☹ HEY!!! Please give a due date for deadlines and events. Let's have some sense of time"); diff --git a/src/main/java/Exception_Handler/UnknownSyntaxException.java b/src/main/java/Duke/exception/UnknownSyntaxException.java similarity index 53% rename from src/main/java/Exception_Handler/UnknownSyntaxException.java rename to src/main/java/Duke/exception/UnknownSyntaxException.java index ed2e563a..001f5c68 100644 --- a/src/main/java/Exception_Handler/UnknownSyntaxException.java +++ b/src/main/java/Duke/exception/UnknownSyntaxException.java @@ -1,6 +1,9 @@ -package Exception_Handler; +package Duke.exception; -public class UnknownSyntaxException extends Exception{ +public class UnknownSyntaxException extends DukeException{ + public UnknownSyntaxException(String message) { + super(message); + } /*Prints the following printer.separator(); System.out.println(" ☹ OOPS!!! I'm sorry, but I don't know what that means :-("); diff --git a/src/main/java/Duke/parser/CMD.java b/src/main/java/Duke/parser/CMD.java new file mode 100644 index 00000000..6e0603ec --- /dev/null +++ b/src/main/java/Duke/parser/CMD.java @@ -0,0 +1,74 @@ +package Duke.parser; + +import Duke.exception.EmptyDescriptionException; +import Duke.exception.EmptyTaskListException; +import Duke.exception.TaskNotFoundException; +import Duke.exception.UnknownSyntaxException; +import Duke.storage.Storage; +import Duke.task.*; +import Duke.ui.ReturnMessages; +import Duke.ui.UI; + +public class CMD { + + protected String fullCommand; + + protected String keyword; + + protected String detail; + + private static ReturnMessages returnMessage = new ReturnMessages(); + + public CMD(String command) { + this.fullCommand = command; + if(command.contains(CMD_Enum.TODO.getName()) || command.contains(CMD_Enum.DEADLINE.getName()) || command.contains(CMD_Enum.EVENT.getName())){ + try { + String[] toWords = command.split(" ", 2); + this.keyword = toWords[0]; + this.detail = toWords[1]; + } + catch(ArrayIndexOutOfBoundsException aio) { + if(command.contains(CMD_Enum.TODO.getName()) || command.contains(CMD_Enum.DEADLINE.getName()) || command.contains(CMD_Enum.EVENT.getName())){ + throw new EmptyDescriptionException(keyword); + } + else { + throw new UnknownSyntaxException(command); + } + } + } + } + + public CMD() { + + } + + public boolean execute(TaskList taskList, UI ui, Storage storage){ + return false; + } + + public void reply(TaskList taskList) throws EmptyTaskListException, UnknownSyntaxException, TaskNotFoundException { + if(fullCommand.contains("done")){ + try { + String[] doneCmd = fullCommand.split(" "); + taskList.getTask(Integer.parseInt(doneCmd[1]) - 1).setDone(); + //taskList[Integer.parseInt(doneCmd[1]) - 1].setDone(); + returnMessage.taskDoneFeedback(); + System.out.println(" " + taskList.getTask(Integer.parseInt(doneCmd[1]) - 1).toString()); + returnMessage.separator(); + return; + } + catch(NumberFormatException nf){ + throw new TaskNotFoundException("task not found"); + } + } + returnMessage.taskAddFeedback(); + try { + System.out.println(" " + taskList.getLastTask().toString()); + System.out.println(" Now you have " + taskList.getListSize() + " tasks in the list."); + returnMessage.separator(); + } + catch(ArrayIndexOutOfBoundsException a){ + throw new EmptyTaskListException("empty task"); + } + } +} diff --git a/src/main/java/Duke/parser/CMD_Add.java b/src/main/java/Duke/parser/CMD_Add.java new file mode 100644 index 00000000..81facb56 --- /dev/null +++ b/src/main/java/Duke/parser/CMD_Add.java @@ -0,0 +1,7 @@ +package Duke.parser; + +public class CMD_Add extends CMD { + public CMD_Add(String command) { + super(command); + } +} diff --git a/src/main/java/Duke/parser/CMD_Bye.java b/src/main/java/Duke/parser/CMD_Bye.java new file mode 100644 index 00000000..684d7320 --- /dev/null +++ b/src/main/java/Duke/parser/CMD_Bye.java @@ -0,0 +1,17 @@ +package Duke.parser; + +import Duke.storage.Storage; +import Duke.task.TaskList; +import Duke.ui.UI; + +public class CMD_Bye extends CMD { + public CMD_Bye(String command){ + super(command); + } + + @Override + public boolean execute(TaskList taskList, UI ui, Storage storage) { + storage.save(taskList); + return true; + } +} diff --git a/src/main/java/Duke/parser/CMD_Deadline.java b/src/main/java/Duke/parser/CMD_Deadline.java new file mode 100644 index 00000000..79377b37 --- /dev/null +++ b/src/main/java/Duke/parser/CMD_Deadline.java @@ -0,0 +1,37 @@ +package Duke.parser; + +import Duke.exception.TimeManagementException; +import Duke.exception.UnknownSyntaxException; +import Duke.storage.Storage; +import Duke.task.Deadline; +import Duke.task.Task; +import Duke.task.TaskList; +import Duke.ui.UI; + + +public class CMD_Deadline extends CMD{ + + public CMD_Deadline(String command){ + super(command); + } + + @Override + public boolean execute(TaskList taskList, UI ui, Storage storage) { + boolean success = true; + try { + if (!CMD_Enum.DEADLINE.getName().equals(super.keyword)) throw new UnknownSyntaxException(super.keyword); + String[] dl = super.detail.split("/by", 2); + Task task = new Deadline(dl[0], dl[1]); + taskList.addTask(task); + } catch (IndexOutOfBoundsException e) { + success = false; + throw new TimeManagementException(); + } + + if (success) { + reply(taskList); + } + + return false; + } +} diff --git a/src/main/java/Duke/parser/CMD_Delete.java b/src/main/java/Duke/parser/CMD_Delete.java new file mode 100644 index 00000000..0bb39b41 --- /dev/null +++ b/src/main/java/Duke/parser/CMD_Delete.java @@ -0,0 +1,19 @@ +package Duke.parser; + +import Duke.exception.EmptyDescriptionException; +import Duke.exception.UnknownSyntaxException; +import Duke.storage.Storage; +import Duke.task.TaskList; +import Duke.ui.UI; + +public class CMD_Delete extends CMD{ + public CMD_Delete(String command) { + super(command); + } + + @Override + public boolean execute(TaskList taskList, UI ui, Storage storage) { + taskList.deleteTask(Integer.parseInt(super.fullCommand.split(" ", 2)[1])); + return false; + } +} diff --git a/src/main/java/Duke/parser/CMD_Done.java b/src/main/java/Duke/parser/CMD_Done.java new file mode 100644 index 00000000..48627740 --- /dev/null +++ b/src/main/java/Duke/parser/CMD_Done.java @@ -0,0 +1,18 @@ +package Duke.parser; + +import Duke.storage.Storage; +import Duke.task.TaskList; +import Duke.ui.UI; + +public class CMD_Done extends CMD{ + + public CMD_Done(String command) { + super(command); + } + + @Override + public boolean execute(TaskList taskList, UI ui, Storage storage) { + reply(taskList); + return false; + } +} \ No newline at end of file diff --git a/src/main/java/Duke/parser/CMD_Enum.java b/src/main/java/Duke/parser/CMD_Enum.java new file mode 100644 index 00000000..eee17e56 --- /dev/null +++ b/src/main/java/Duke/parser/CMD_Enum.java @@ -0,0 +1,27 @@ +package Duke.parser; + +public enum CMD_Enum { + LIST("list"), + DONE("done"), + DELETE("delete"), + BYE("bye"), + SAVE("save"), + TODO("todo"), + EVENT("event"), + DEADLINE("deadline") + ; + + CMD_Enum(String name) { + this.name = name; + } + + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/main/java/Duke/parser/CMD_Error.java b/src/main/java/Duke/parser/CMD_Error.java new file mode 100644 index 00000000..289ccaa2 --- /dev/null +++ b/src/main/java/Duke/parser/CMD_Error.java @@ -0,0 +1,9 @@ +package Duke.parser; + +import Duke.exception.UnknownSyntaxException; + +public class CMD_Error extends CMD{ + public CMD_Error(String command) { + throw new UnknownSyntaxException(command); + } +} diff --git a/src/main/java/Duke/parser/CMD_Event.java b/src/main/java/Duke/parser/CMD_Event.java new file mode 100644 index 00000000..ad5b499d --- /dev/null +++ b/src/main/java/Duke/parser/CMD_Event.java @@ -0,0 +1,35 @@ +package Duke.parser; + +import Duke.exception.TimeManagementException; +import Duke.exception.UnknownSyntaxException; +import Duke.storage.Storage; +import Duke.task.Events; +import Duke.task.Task; +import Duke.task.TaskList; +import Duke.ui.UI; + +public class CMD_Event extends CMD{ + public CMD_Event(String command) { + super(command); + } + + @Override + public boolean execute(TaskList taskList, UI ui, Storage storage) { + boolean success = true; + try { + if (!CMD_Enum.EVENT.getName().equals(super.keyword)) throw new UnknownSyntaxException(super.keyword); + String[] dt = detail.split("/at", 2); + Task task = new Events(dt[0], dt[1]); + taskList.addTask(task); + } catch (IndexOutOfBoundsException e) { + success = false; + throw new TimeManagementException(); + } + + if (success) { + reply(taskList); + } + + return false; + } +} \ No newline at end of file diff --git a/src/main/java/Duke/parser/CMD_List.java b/src/main/java/Duke/parser/CMD_List.java new file mode 100644 index 00000000..dc1d7ada --- /dev/null +++ b/src/main/java/Duke/parser/CMD_List.java @@ -0,0 +1,18 @@ +package Duke.parser; + +import Duke.exception.EmptyTaskListException; +import Duke.storage.Storage; +import Duke.task.TaskList; +import Duke.ui.UI; + +public class CMD_List extends CMD { + public CMD_List(String command) { + super(command); + } + + @Override + public boolean execute(TaskList taskList, UI ui, Storage storage) { + taskList.printTaskList(); + return false; + } +} \ No newline at end of file diff --git a/src/main/java/Duke/parser/CMD_Save.java b/src/main/java/Duke/parser/CMD_Save.java new file mode 100644 index 00000000..297b6c35 --- /dev/null +++ b/src/main/java/Duke/parser/CMD_Save.java @@ -0,0 +1,7 @@ +package Duke.parser; + +public class CMD_Save extends CMD{ + public CMD_Save(String command){ + super(command); + } +} diff --git a/src/main/java/Duke/parser/CMD_TODO.java b/src/main/java/Duke/parser/CMD_TODO.java new file mode 100644 index 00000000..2473b4bd --- /dev/null +++ b/src/main/java/Duke/parser/CMD_TODO.java @@ -0,0 +1,33 @@ +package Duke.parser; + +import Duke.exception.UnknownSyntaxException; +import Duke.storage.Storage; +import Duke.task.Task; +import Duke.task.TaskList; +import Duke.task.ToDos; +import Duke.ui.UI; + +public class CMD_TODO extends CMD { + public CMD_TODO(String command) { + super(command); + } + + @Override + public boolean execute(TaskList taskList, UI ui, Storage storage) { + boolean success = true; + try { + if (!CMD_Enum.TODO.getName().equals(super.keyword)) throw new UnknownSyntaxException(super.keyword); + Task task = new ToDos(super.detail, super.detail); + taskList.addTask(task); + } catch (IndexOutOfBoundsException e) { + success = false; + throw new UnknownSyntaxException(super.keyword); + } + + if (success) { + reply(taskList); + } + + return false; + } +} diff --git a/src/main/java/Duke/parser/Command.java b/src/main/java/Duke/parser/Command.java new file mode 100644 index 00000000..e8e5018e --- /dev/null +++ b/src/main/java/Duke/parser/Command.java @@ -0,0 +1,29 @@ +package Duke.parser; + +import Duke.storage.Storage; +import Duke.task.TaskList; +import Duke.ui.UI; + +public class Command { + + private CMD cmd; + + private boolean isExit; + + public void execute(TaskList taskList, UI ui, Storage storage) { + this.isExit = cmd.execute(taskList, ui, storage); + } + + public boolean isExit() { + + return this.isExit; + } + + public CMD getCmd() { + return cmd; + } + + public void setCmd(CMD cmd) { + this.cmd = cmd; + } +} \ No newline at end of file diff --git a/src/main/java/Duke/parser/Parser.java b/src/main/java/Duke/parser/Parser.java new file mode 100644 index 00000000..2e1ee2a6 --- /dev/null +++ b/src/main/java/Duke/parser/Parser.java @@ -0,0 +1,28 @@ +package Duke.parser; +public class Parser { + + public static Command parse(String fullCommand) { + Command command = new Command(); + if (fullCommand.contains(CMD_Enum.DONE.getName())) { + command.setCmd(new CMD_Done(fullCommand)); + } else if (fullCommand.contains(CMD_Enum.LIST.getName())) { + command.setCmd(new CMD_List(fullCommand)); + } else if (fullCommand.contains(CMD_Enum.DELETE.getName())) { + command.setCmd(new CMD_Delete(fullCommand)); + } else if (fullCommand.contains(CMD_Enum.BYE.getName())) { + command.setCmd(new CMD_Bye(fullCommand)); + } else if (fullCommand.contains(CMD_Enum.SAVE.getName())) { + command.setCmd(new CMD_Save(fullCommand)); + } else if (fullCommand.contains(CMD_Enum.TODO.getName())) { + command.setCmd(new CMD_TODO(fullCommand)); + } else if (fullCommand.contains(CMD_Enum.EVENT.getName())) { + command.setCmd(new CMD_Event(fullCommand)); + } else if (fullCommand.contains(CMD_Enum.DEADLINE.getName())) { + command.setCmd(new CMD_Deadline(fullCommand)); + } else { + command.setCmd(new CMD_Error(fullCommand)); + } + + return command; + } +} diff --git a/src/main/java/Duke/storage/Storage.java b/src/main/java/Duke/storage/Storage.java new file mode 100644 index 00000000..605f3e3c --- /dev/null +++ b/src/main/java/Duke/storage/Storage.java @@ -0,0 +1,104 @@ +package Duke.storage; + +import Duke.exception.*; +import Duke.task.*; +import Duke.ui.*; + +import java.io.*; +import java.util.Scanner; + +public class Storage { + protected boolean isExist; + protected String fileName; + protected File file; + private static ReturnMessages returnMessage = new ReturnMessages(); + Scanner scanner; + + public Storage(String fileName) { + this.fileName = fileName; + this.file = new File(System.getProperty("user.dir") + "/src/main/java/Duke.Storage/"+fileName); // create a File for the given file path + } + + public TaskList load() throws DukeException { + TaskList taskList = new TaskList(); + if (file.exists()) { + try (BufferedReader br = new BufferedReader(new FileReader(file))) { + String line; + while ((line = br.readLine()) != null) { + // process the line + System.out.println("Loading..."); + taskList.addTask(decodeStr2Task(line)); + } + } catch (IOException e) { + // 文件解析失败 + throw new DukeException("file parse fail"); + } + } else { + try { + createFile(); + } catch (IOException e) { + // 文件创建失败 + throw new DukeException("create file fail"); + } + } + return taskList; + } + + public void createFile() throws IOException { + try { + file.createNewFile(); + } catch (IOException ioe) { + this.isExist = true; + System.out.println("File exists"); + } + System.out.println("File created: " + file.getName()); + } + + public void save(TaskList taskList) { + + FileWriter myWriter; + try { + myWriter = new FileWriter(file.getAbsoluteFile(), true); + FileWriter finalMyWriter = myWriter; + taskList.getTaskList().forEach((task) -> { + try { + finalMyWriter.write(task.encodeTask() + "\n"); + } catch (IOException e) { + // + throw new DukeException(e.getMessage()); + } + }); + myWriter.close(); + } catch (IOException e) { + e.printStackTrace(); + throw new DukeException(e.getMessage()); + } + + + System.out.println("Successfully wrote to the file."); + } + + public Task decodeStr2Task(String str) { + String[] line = str.split(" \\| "); + Task task = null; + switch (line[0]) { + case "T": + task = new ToDos(line[2], line[2]); + + break; + case "D": + // String[] dl = detail.split("/by", 2); + task = new Deadline(line[2], line[3]); + break; + case "E": + task = new Events(line[2], line[3]); + break; + } + if (Task.DONE.equals(line[1])) { + if (task != null) { + task.setDone(); + } + } + return task; + } +} diff --git a/src/main/java/Duke/storage/duke.txt b/src/main/java/Duke/storage/duke.txt new file mode 100644 index 00000000..9961335f --- /dev/null +++ b/src/main/java/Duke/storage/duke.txt @@ -0,0 +1,2 @@ +T | 0 | sleep +D | 0 | sleep | 3pm diff --git a/src/main/java/TaskList/Deadline.java b/src/main/java/Duke/task/Deadline.java similarity index 69% rename from src/main/java/TaskList/Deadline.java rename to src/main/java/Duke/task/Deadline.java index 4d9946d1..3800160a 100644 --- a/src/main/java/TaskList/Deadline.java +++ b/src/main/java/Duke/task/Deadline.java @@ -1,4 +1,4 @@ -package TaskList; +package Duke.task; public class Deadline extends Task { @@ -13,4 +13,9 @@ public Deadline(String description, String by) { public String toString() { return "[D]" + super.toString() + " (by: " + by + ")"; } + + @Override + public String encodeTask() { + return "D" + super.encodeTask() + "|" + by; + } } \ No newline at end of file diff --git a/src/main/java/TaskList/Events.java b/src/main/java/Duke/task/Events.java similarity index 69% rename from src/main/java/TaskList/Events.java rename to src/main/java/Duke/task/Events.java index 831eacae..517cd6ac 100644 --- a/src/main/java/TaskList/Events.java +++ b/src/main/java/Duke/task/Events.java @@ -1,4 +1,4 @@ -package TaskList; +package Duke.task; public class Events extends Task { protected String at; @@ -12,4 +12,9 @@ public Events(String description, String at) { public String toString() { return "[E]" + super.toString() + " (at: " + at + ")"; } + + @Override + public String encodeTask() { + return "E" + super.encodeTask() + "|" + at ; + } } diff --git a/src/main/java/TaskList/Task.java b/src/main/java/Duke/task/Task.java similarity index 62% rename from src/main/java/TaskList/Task.java rename to src/main/java/Duke/task/Task.java index baea4e63..9065326f 100644 --- a/src/main/java/TaskList/Task.java +++ b/src/main/java/Duke/task/Task.java @@ -1,9 +1,11 @@ -package TaskList; +package Duke.task; public class Task { protected String description; protected boolean isDone; + public static final String DONE = "1"; + public static final String UNDONE = "0"; public Task(String description) { this.description = description; @@ -14,6 +16,10 @@ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } + public String getStatusCode() { + return (isDone ? DONE : UNDONE); // mark done task with 1 + } + public String getTaskInfo(){ return description; } @@ -26,4 +32,8 @@ public String toString() { return "["+getStatusIcon()+"] " + description; } + public String encodeTask() { + return " | " + getStatusCode() + " | " + description; + } + } \ No newline at end of file diff --git a/src/main/java/TaskList/TaskList.java b/src/main/java/Duke/task/TaskList.java similarity index 73% rename from src/main/java/TaskList/TaskList.java rename to src/main/java/Duke/task/TaskList.java index 589370c6..ea19725a 100644 --- a/src/main/java/TaskList/TaskList.java +++ b/src/main/java/Duke/task/TaskList.java @@ -1,6 +1,8 @@ -package TaskList; -import Exception_Handler.*; -import UI.ReturnMessages; +package Duke.task; + +import Duke.exception.EmptyTaskListException; +import Duke.exception.TaskNotFoundException; +import Duke.ui.ReturnMessages; import java.util.ArrayList; @@ -13,17 +15,22 @@ public TaskList() { taskList = new ArrayList<>(); } - public void deleteTask(int taskID) throws TaskNotFoundException, EmptyTaskListException{ + public TaskList(TaskList load) { + this.listSize = load.listSize; + this.taskList = load.taskList; + } + + public void deleteTask(int taskID) throws TaskNotFoundException, EmptyTaskListException { int taskPosition = taskID -1; if(taskPosition > this.listSize || taskPosition < 0){ - throw new TaskNotFoundException(); + throw new TaskNotFoundException("task not found"); } System.out.println(" Noted. I've removed this task: " ); System.out.println(" " + taskList.get(taskPosition).toString()); this.taskList.remove(taskPosition); this.listSize--; if(this.listSize == 0){ - throw new EmptyTaskListException(); + throw new EmptyTaskListException("empty task"); } System.out.println(" Now you have " + this.listSize + " tasks in the list."); printer.separator(); @@ -50,7 +57,7 @@ public void save(){} public void printTaskList() throws EmptyTaskListException { printer.separator(); if(this.listSize == 0){ - throw new EmptyTaskListException(); + throw new EmptyTaskListException("empty task"); } int numbering = 1; System.out.println(" Here are the tasks in your list:"); @@ -60,4 +67,8 @@ public void printTaskList() throws EmptyTaskListException { } printer.separator(); } + + public ArrayList getTaskList() { + return taskList; + } } diff --git a/src/main/java/TaskList/Task_Enum.java b/src/main/java/Duke/task/Task_Enum.java similarity index 82% rename from src/main/java/TaskList/Task_Enum.java rename to src/main/java/Duke/task/Task_Enum.java index 84172601..5f434a55 100644 --- a/src/main/java/TaskList/Task_Enum.java +++ b/src/main/java/Duke/task/Task_Enum.java @@ -1,4 +1,4 @@ -package TaskList; +package Duke.task; public enum Task_Enum { TODO, //0 diff --git a/src/main/java/TaskList/ToDos.java b/src/main/java/Duke/task/ToDos.java similarity index 70% rename from src/main/java/TaskList/ToDos.java rename to src/main/java/Duke/task/ToDos.java index 59699786..6d4c1ff4 100644 --- a/src/main/java/TaskList/ToDos.java +++ b/src/main/java/Duke/task/ToDos.java @@ -1,4 +1,4 @@ -package TaskList; +package Duke.task; public class ToDos extends Task { protected String action; @@ -12,4 +12,9 @@ public ToDos(String description, String action) { public String toString() { return "[T]" + super.toString(); } + + @Override + public String encodeTask() { + return "T" + super.encodeTask() ; + } } diff --git a/src/main/java/UI/ReturnMessages.java b/src/main/java/Duke/ui/ReturnMessages.java similarity index 99% rename from src/main/java/UI/ReturnMessages.java rename to src/main/java/Duke/ui/ReturnMessages.java index 87dffeac..5d4f074a 100644 --- a/src/main/java/UI/ReturnMessages.java +++ b/src/main/java/Duke/ui/ReturnMessages.java @@ -1,4 +1,4 @@ -package UI; +package Duke.ui; public class ReturnMessages { public void separator(){ diff --git a/src/main/java/Duke/ui/UI.java b/src/main/java/Duke/ui/UI.java new file mode 100644 index 00000000..b605697d --- /dev/null +++ b/src/main/java/Duke/ui/UI.java @@ -0,0 +1,65 @@ +package Duke.ui; + + +import Duke.exception.*; + +import java.util.Scanner; + +public class UI{ + + private static ReturnMessages returnMessage = new ReturnMessages(); + + private Scanner in; + + public void showWelcome(){ + String logo = " ____ _ \n" + + "| _ \\ _ _| | _____ \n" + + "| | | | | | | |/ / _ \\\n" + + "| |_| | |_| | < __/\n" + + "|____/ \\__,_|_|\\_\\___|\n"; + System.out.println("Hello from\n" + logo); + returnMessage.welcomeFeedback(); + } + + public void showLoadingError(){ + returnMessage.exception_feedback_loadingError(); + } + + public String readCommand() { + boolean end = false; + String command; + in = new Scanner(System.in); + command = in.nextLine(); + return command; + } + + public void showLine() { + returnMessage.separator(); + } + + public void showError(String message) { + System.out.println(message); + } + + public void showError(DukeException e) { + if (e instanceof EmptyDescriptionException) { + returnMessage.exception_feedback_emptyDescription(e.getMessage()); + } else if (e instanceof EmptyTaskListException) { + returnMessage.exception_feedback_emptyTaskList(); + } else if (e instanceof SavingException) { + returnMessage.exception_feedback_cantSave(); + } else if (e instanceof TaskNotFoundException) { + returnMessage.exception_feedback_taskNotFound(e.getMessage()); + } else if (e instanceof TimeManagementException) { + returnMessage.exception_feedback_noTimeConcept(); + } else if (e instanceof UnknownSyntaxException){ + returnMessage.exception_feedback_unknownSyntax(e.getMessage()); + } else { + System.out.println("system error"); + } + } + + public void showExit() { + returnMessage.exitFeedback(); + } +} diff --git a/src/main/java/Exception_Handler/DukeException.java b/src/main/java/Exception_Handler/DukeException.java deleted file mode 100644 index e2356d84..00000000 --- a/src/main/java/Exception_Handler/DukeException.java +++ /dev/null @@ -1,4 +0,0 @@ -package Exception_Handler; - -public class DukeException extends Exception{ -} diff --git a/src/main/java/Parser/CMD.java b/src/main/java/Parser/CMD.java deleted file mode 100644 index 9f18fcef..00000000 --- a/src/main/java/Parser/CMD.java +++ /dev/null @@ -1,11 +0,0 @@ -package Parser; - -public class CMD { - public CMD(String command){ - - } - - public CMD() { - - } -} diff --git a/src/main/java/Parser/CMD_Add.java b/src/main/java/Parser/CMD_Add.java deleted file mode 100644 index 8c42fc74..00000000 --- a/src/main/java/Parser/CMD_Add.java +++ /dev/null @@ -1,8 +0,0 @@ -package Parser; - -public class CMD_Add extends CMD{ - public CMD_Add(){ - super(); - - } -} diff --git a/src/main/java/Parser/CMD_Bye.java b/src/main/java/Parser/CMD_Bye.java deleted file mode 100644 index 779013ea..00000000 --- a/src/main/java/Parser/CMD_Bye.java +++ /dev/null @@ -1,4 +0,0 @@ -package Parser; - -public class CMD_Bye extends CMD{ -} diff --git a/src/main/java/Parser/CMD_Delete.java b/src/main/java/Parser/CMD_Delete.java deleted file mode 100644 index 23777833..00000000 --- a/src/main/java/Parser/CMD_Delete.java +++ /dev/null @@ -1,4 +0,0 @@ -package Parser; - -public class CMD_Delete extends CMD{ -} diff --git a/src/main/java/Parser/CMD_Done.java b/src/main/java/Parser/CMD_Done.java deleted file mode 100644 index 047ad173..00000000 --- a/src/main/java/Parser/CMD_Done.java +++ /dev/null @@ -1,4 +0,0 @@ -package Parser; - -public class CMD_Done extends CMD{ -} diff --git a/src/main/java/Parser/CMD_Enum.java b/src/main/java/Parser/CMD_Enum.java deleted file mode 100644 index 44af64d7..00000000 --- a/src/main/java/Parser/CMD_Enum.java +++ /dev/null @@ -1,9 +0,0 @@ -package Parser; - -public enum CMD_Enum { - LIST, //0 - DONE, //1 - DELETE, //2 - BYE, //3 - SAVE //4 -} diff --git a/src/main/java/Parser/CMD_List.java b/src/main/java/Parser/CMD_List.java deleted file mode 100644 index dce610da..00000000 --- a/src/main/java/Parser/CMD_List.java +++ /dev/null @@ -1,4 +0,0 @@ -package Parser; - -public class CMD_List extends CMD{ -} diff --git a/src/main/java/Parser/CMD_Save.java b/src/main/java/Parser/CMD_Save.java deleted file mode 100644 index 7058fbfa..00000000 --- a/src/main/java/Parser/CMD_Save.java +++ /dev/null @@ -1,4 +0,0 @@ -package Parser; - -public class CMD_Save extends CMD{ -} diff --git a/src/main/java/Storage/Storage.java b/src/main/java/Storage/Storage.java deleted file mode 100644 index 2ec26ec7..00000000 --- a/src/main/java/Storage/Storage.java +++ /dev/null @@ -1,56 +0,0 @@ -package Storage; - -import Exception_Handler.*; -import TaskList.TaskList; -import TaskList.Task; - -import java.io.*; -import java.util.ArrayList; -import java.util.Scanner; - -public class Storage { - protected boolean isExist; - protected String fileName; - protected File file = new File(System.getProperty("user.dir") + "/src/main/java/Storage/"+fileName); // create a File for the given file path - Scanner scanner; - public Storage(String fileName){ - this.fileName = fileName; - } - - public void load(TaskList task_from_file) throws IOException{ - try (BufferedReader br = new BufferedReader(new FileReader(file))) { - String line; - while ((line = br.readLine()) != null) { - // process the line - System.out.println("Loading"); - } - } - catch(IOException e){ - - } - } - public void createFile() throws IOException{ - try { - file.createNewFile(); - } - catch(IOException ioe) { - this.isExist = true; - System.out.println("FIle exists"); - } - System.out.println("File created: " + file.getName()); - } - - public void save(ArrayList list) throws IOException{ - - FileWriter myWriter = new FileWriter(file.getAbsoluteFile()); - list.forEach((task) -> { - try { - myWriter.write(task.toString()); - } catch (IOException e) { - // - } - }); - myWriter.close(); - System.out.println("Successfully wrote to the file."); - } -} diff --git a/src/main/java/UI/UI.java b/src/main/java/UI/UI.java deleted file mode 100644 index 4faf2ee9..00000000 --- a/src/main/java/UI/UI.java +++ /dev/null @@ -1,18 +0,0 @@ -package UI; -public class UI{ - - private static ReturnMessages returnMessage = new ReturnMessages(); - - public void show(){ - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); - } - - public void showLoadingError(){ - returnMessage.exception_feedback_loadingError(); - } -} From 5ad63631170f4ba3301155584a5a2123f4a66ba9 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Tue, 19 Oct 2021 03:03:06 +0800 Subject: [PATCH 14/32] 1. code cleanup 2. added some JavaDoc --- .../java/Duke/exception/DukeException.java | 8 ++++- .../exception/EmptyDescriptionException.java | 18 +++++++--- .../exception/EmptyTaskListException.java | 17 ++++++--- .../java/Duke/exception/SavingException.java | 16 ++++++--- .../Duke/exception/TaskNotFoundException.java | 16 ++++++--- .../exception/TimeManagementException.java | 16 +++++---- .../exception/UnknownSyntaxException.java | 16 ++++++--- src/main/java/Duke/parser/CMD.java | 20 +++++++++++ src/main/java/Duke/parser/CMD_Add.java | 4 +++ src/main/java/Duke/parser/CMD_Bye.java | 12 +++++++ src/main/java/Duke/parser/CMD_Deadline.java | 14 +++++++- src/main/java/Duke/parser/CMD_Delete.java | 14 ++++++-- src/main/java/Duke/parser/CMD_Done.java | 13 ++++++- src/main/java/Duke/parser/CMD_Enum.java | 5 ++- src/main/java/Duke/parser/CMD_Error.java | 4 +++ src/main/java/Duke/parser/CMD_Event.java | 4 +++ src/main/java/Duke/parser/CMD_List.java | 5 ++- src/main/java/Duke/parser/CMD_Save.java | 4 +++ src/main/java/Duke/parser/CMD_TODO.java | 4 +++ src/main/java/Duke/parser/Parser.java | 5 +++ src/main/java/Duke/storage/Storage.java | 36 +++++++++++++++++-- src/main/java/Duke/ui/ReturnMessages.java | 14 ++++---- 22 files changed, 218 insertions(+), 47 deletions(-) diff --git a/src/main/java/Duke/exception/DukeException.java b/src/main/java/Duke/exception/DukeException.java index 9c035019..3c2794db 100644 --- a/src/main/java/Duke/exception/DukeException.java +++ b/src/main/java/Duke/exception/DukeException.java @@ -1,10 +1,16 @@ package Duke.exception; public class DukeException extends RuntimeException{ - + /** + * A base class for self-defined exceptions + * + * @param message the pre-defined message + * + */ public DukeException(String message) { super(message); } + public DukeException() {} } diff --git a/src/main/java/Duke/exception/EmptyDescriptionException.java b/src/main/java/Duke/exception/EmptyDescriptionException.java index 9b86376e..602cc003 100644 --- a/src/main/java/Duke/exception/EmptyDescriptionException.java +++ b/src/main/java/Duke/exception/EmptyDescriptionException.java @@ -1,12 +1,20 @@ package Duke.exception; public class EmptyDescriptionException extends DukeException{ + + /** + * Thrown when user did not give a description for the task + * + * Prints the following + * printer.separator(); + * System.out.printf(" ☹ OOPS!!! The description of a %s cannot be empty.\n", taskType); + * printer.separator(); + * + * @param message the pre-defined message + * + */ public EmptyDescriptionException(String message) { super(message); } - /*Prints the following - printer.separator(); - System.out.printf(" ☹ OOPS!!! The description of a %s cannot be empty.\n", taskType); - printer.separator(); - */ + } diff --git a/src/main/java/Duke/exception/EmptyTaskListException.java b/src/main/java/Duke/exception/EmptyTaskListException.java index 40afc589..7abd1fb8 100644 --- a/src/main/java/Duke/exception/EmptyTaskListException.java +++ b/src/main/java/Duke/exception/EmptyTaskListException.java @@ -1,12 +1,21 @@ package Duke.exception; + public class EmptyTaskListException extends DukeException{ + + /** + * Thrown when the task list is empty + * + * Prints the following + * printer.separator(); + * System.out.println(" ☹ OOPS!!! I'm sorry, the list is empty ^_^"); + * printer.separator(); + * + * @param message Printing message overload + */ public EmptyTaskListException(String message) { super(message); } - /*Prints the following - printer.separator(); - System.out.println(" ☹ OOPS!!! I'm sorry, the list is empty ^_^"); - printer.separator(); + /* */ } diff --git a/src/main/java/Duke/exception/SavingException.java b/src/main/java/Duke/exception/SavingException.java index 71b42e60..439b0ef5 100644 --- a/src/main/java/Duke/exception/SavingException.java +++ b/src/main/java/Duke/exception/SavingException.java @@ -1,13 +1,19 @@ package Duke.exception; public class SavingException extends DukeException{ + /** + * Thrown when there is problem saving the current task list + * + * Prints the following + * separator(); + * System.out.println(" OOPS!!! Exception caught while saving >_<|||"); + * separator(); + * + * @param message the pre-defined message + * + */ public SavingException(String message) { super(message); } - /*Prints the following - separator(); - System.out.println(" ☹ OOPS!!! Exception caught while saving >_<|||"); - separator(); - */ } diff --git a/src/main/java/Duke/exception/TaskNotFoundException.java b/src/main/java/Duke/exception/TaskNotFoundException.java index 73676b75..d0b3fdf5 100644 --- a/src/main/java/Duke/exception/TaskNotFoundException.java +++ b/src/main/java/Duke/exception/TaskNotFoundException.java @@ -1,13 +1,19 @@ package Duke.exception; public class TaskNotFoundException extends DukeException{ + /** + * Thrown when failed to identify task, either given wrong information or task does not exist. + * + * Prints the following + * printer.separator(); + * System.out.println(" ☹ OOPS!!! I'm sorry, please key in by Tasks.Task ID instead of [%s]", message); + * printer.separator(); + * + * @param message the pre-defined message + * + */ public TaskNotFoundException(String message) { super(message); } - /*Prints the following - printer.separator(); - System.out.println(" ☹ OOPS!!! I'm sorry, please key in by Tasks.Task ID instead of [%s]", message); - printer.separator(); - */ } diff --git a/src/main/java/Duke/exception/TimeManagementException.java b/src/main/java/Duke/exception/TimeManagementException.java index e213f900..4e7bbb3f 100644 --- a/src/main/java/Duke/exception/TimeManagementException.java +++ b/src/main/java/Duke/exception/TimeManagementException.java @@ -1,12 +1,16 @@ package Duke.exception; public class TimeManagementException extends DukeException{ + /** + * Thrown when date-time not given for deadline/event task. + * + * Prints the following + * printer.separator(); + * System.out.println(" ☹ HEY!!! Please give a due date for deadlines and events. Let's have some sense of time"); + * printer.separator(); + * + * + */ public TimeManagementException() { } - - /*Prints the following - printer.separator(); - System.out.println(" ☹ HEY!!! Please give a due date for deadlines and events. Let's have some sense of time"); - printer.separator(); - */ } diff --git a/src/main/java/Duke/exception/UnknownSyntaxException.java b/src/main/java/Duke/exception/UnknownSyntaxException.java index 001f5c68..7847a712 100644 --- a/src/main/java/Duke/exception/UnknownSyntaxException.java +++ b/src/main/java/Duke/exception/UnknownSyntaxException.java @@ -1,12 +1,18 @@ package Duke.exception; public class UnknownSyntaxException extends DukeException{ + /** + * Thrown when user input does not categorize under any of the pre-defined message. + * + * Prints the following + * printer.separator(); + * System.out.println(" ☹ OOPS!!! I'm sorry, but I don't know what that means :-("); + * printer.separator(); + * + * @param message the pre-defined message + * + */ public UnknownSyntaxException(String message) { super(message); } - /*Prints the following - printer.separator(); - System.out.println(" ☹ OOPS!!! I'm sorry, but I don't know what that means :-("); - printer.separator(); - */ } diff --git a/src/main/java/Duke/parser/CMD.java b/src/main/java/Duke/parser/CMD.java index 6e0603ec..ae35abc7 100644 --- a/src/main/java/Duke/parser/CMD.java +++ b/src/main/java/Duke/parser/CMD.java @@ -19,6 +19,12 @@ public class CMD { private static ReturnMessages returnMessage = new ReturnMessages(); + /** + * Constructor command + * + * @param command the command input + * + */ public CMD(String command) { this.fullCommand = command; if(command.contains(CMD_Enum.TODO.getName()) || command.contains(CMD_Enum.DEADLINE.getName()) || command.contains(CMD_Enum.EVENT.getName())){ @@ -42,10 +48,24 @@ public CMD() { } + /** + * Base class for different execution + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storage storage object + * + */ public boolean execute(TaskList taskList, UI ui, Storage storage){ return false; } + /** + * Replies a done/add command + * + * @param taskList gets the full task list + * + */ public void reply(TaskList taskList) throws EmptyTaskListException, UnknownSyntaxException, TaskNotFoundException { if(fullCommand.contains("done")){ try { diff --git a/src/main/java/Duke/parser/CMD_Add.java b/src/main/java/Duke/parser/CMD_Add.java index 81facb56..d078ca6d 100644 --- a/src/main/java/Duke/parser/CMD_Add.java +++ b/src/main/java/Duke/parser/CMD_Add.java @@ -1,6 +1,10 @@ package Duke.parser; public class CMD_Add extends CMD { + /** + * Add Command Constructor + * + */ public CMD_Add(String command) { super(command); } diff --git a/src/main/java/Duke/parser/CMD_Bye.java b/src/main/java/Duke/parser/CMD_Bye.java index 684d7320..3c2a1228 100644 --- a/src/main/java/Duke/parser/CMD_Bye.java +++ b/src/main/java/Duke/parser/CMD_Bye.java @@ -5,10 +5,22 @@ import Duke.ui.UI; public class CMD_Bye extends CMD { + /** + * Bye Command Constructor + * + */ public CMD_Bye(String command){ super(command); } + /** + * Function Overloading for execution of bye command + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storage storage object + * + */ @Override public boolean execute(TaskList taskList, UI ui, Storage storage) { storage.save(taskList); diff --git a/src/main/java/Duke/parser/CMD_Deadline.java b/src/main/java/Duke/parser/CMD_Deadline.java index 79377b37..50df0b2f 100644 --- a/src/main/java/Duke/parser/CMD_Deadline.java +++ b/src/main/java/Duke/parser/CMD_Deadline.java @@ -10,11 +10,23 @@ public class CMD_Deadline extends CMD{ - + /** + * Deadline Command Constructor + * + */ public CMD_Deadline(String command){ super(command); } + + /** + * Function Overloading for execution of deadline command + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storage storage object + * + */ @Override public boolean execute(TaskList taskList, UI ui, Storage storage) { boolean success = true; diff --git a/src/main/java/Duke/parser/CMD_Delete.java b/src/main/java/Duke/parser/CMD_Delete.java index 0bb39b41..ee8977c1 100644 --- a/src/main/java/Duke/parser/CMD_Delete.java +++ b/src/main/java/Duke/parser/CMD_Delete.java @@ -1,16 +1,26 @@ package Duke.parser; -import Duke.exception.EmptyDescriptionException; -import Duke.exception.UnknownSyntaxException; import Duke.storage.Storage; import Duke.task.TaskList; import Duke.ui.UI; public class CMD_Delete extends CMD{ + /** + * Delete Command Constructor + * + */ public CMD_Delete(String command) { super(command); } + /** + * Function Overloading for execution of delete command + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storage storage object + * + */ @Override public boolean execute(TaskList taskList, UI ui, Storage storage) { taskList.deleteTask(Integer.parseInt(super.fullCommand.split(" ", 2)[1])); diff --git a/src/main/java/Duke/parser/CMD_Done.java b/src/main/java/Duke/parser/CMD_Done.java index 48627740..19b5bbaa 100644 --- a/src/main/java/Duke/parser/CMD_Done.java +++ b/src/main/java/Duke/parser/CMD_Done.java @@ -5,11 +5,22 @@ import Duke.ui.UI; public class CMD_Done extends CMD{ - + /** + * Done Command Constructor + * + */ public CMD_Done(String command) { super(command); } + /** + * Function Overloading for execution of Done command + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storage storage object + * + */ @Override public boolean execute(TaskList taskList, UI ui, Storage storage) { reply(taskList); diff --git a/src/main/java/Duke/parser/CMD_Enum.java b/src/main/java/Duke/parser/CMD_Enum.java index eee17e56..fca4d3fc 100644 --- a/src/main/java/Duke/parser/CMD_Enum.java +++ b/src/main/java/Duke/parser/CMD_Enum.java @@ -10,7 +10,10 @@ public enum CMD_Enum { EVENT("event"), DEADLINE("deadline") ; - + /** + * Eunm class for Command Constructor + * + */ CMD_Enum(String name) { this.name = name; } diff --git a/src/main/java/Duke/parser/CMD_Error.java b/src/main/java/Duke/parser/CMD_Error.java index 289ccaa2..161e84f7 100644 --- a/src/main/java/Duke/parser/CMD_Error.java +++ b/src/main/java/Duke/parser/CMD_Error.java @@ -3,6 +3,10 @@ import Duke.exception.UnknownSyntaxException; public class CMD_Error extends CMD{ + /** + * Error Command Constructor + * + */ public CMD_Error(String command) { throw new UnknownSyntaxException(command); } diff --git a/src/main/java/Duke/parser/CMD_Event.java b/src/main/java/Duke/parser/CMD_Event.java index ad5b499d..bc21f94d 100644 --- a/src/main/java/Duke/parser/CMD_Event.java +++ b/src/main/java/Duke/parser/CMD_Event.java @@ -9,6 +9,10 @@ import Duke.ui.UI; public class CMD_Event extends CMD{ + /** + * Event Command Constructor + * + */ public CMD_Event(String command) { super(command); } diff --git a/src/main/java/Duke/parser/CMD_List.java b/src/main/java/Duke/parser/CMD_List.java index dc1d7ada..dae3519c 100644 --- a/src/main/java/Duke/parser/CMD_List.java +++ b/src/main/java/Duke/parser/CMD_List.java @@ -1,11 +1,14 @@ package Duke.parser; -import Duke.exception.EmptyTaskListException; import Duke.storage.Storage; import Duke.task.TaskList; import Duke.ui.UI; public class CMD_List extends CMD { + /** + * List Command Constructor + * + */ public CMD_List(String command) { super(command); } diff --git a/src/main/java/Duke/parser/CMD_Save.java b/src/main/java/Duke/parser/CMD_Save.java index 297b6c35..8a9368f0 100644 --- a/src/main/java/Duke/parser/CMD_Save.java +++ b/src/main/java/Duke/parser/CMD_Save.java @@ -1,6 +1,10 @@ package Duke.parser; public class CMD_Save extends CMD{ + /** + * Save Command Constructor + * + */ public CMD_Save(String command){ super(command); } diff --git a/src/main/java/Duke/parser/CMD_TODO.java b/src/main/java/Duke/parser/CMD_TODO.java index 2473b4bd..ef7bf063 100644 --- a/src/main/java/Duke/parser/CMD_TODO.java +++ b/src/main/java/Duke/parser/CMD_TODO.java @@ -8,6 +8,10 @@ import Duke.ui.UI; public class CMD_TODO extends CMD { + /** + * TO DO Command Constructor + * + */ public CMD_TODO(String command) { super(command); } diff --git a/src/main/java/Duke/parser/Parser.java b/src/main/java/Duke/parser/Parser.java index 2e1ee2a6..916a0946 100644 --- a/src/main/java/Duke/parser/Parser.java +++ b/src/main/java/Duke/parser/Parser.java @@ -1,6 +1,11 @@ package Duke.parser; public class Parser { + /** + * Determines which known command is been input + * + * @param fullCommand takes in the full command, check via ENUM + */ public static Command parse(String fullCommand) { Command command = new Command(); if (fullCommand.contains(CMD_Enum.DONE.getName())) { diff --git a/src/main/java/Duke/storage/Storage.java b/src/main/java/Duke/storage/Storage.java index 605f3e3c..0182dc5e 100644 --- a/src/main/java/Duke/storage/Storage.java +++ b/src/main/java/Duke/storage/Storage.java @@ -14,11 +14,23 @@ public class Storage { private static ReturnMessages returnMessage = new ReturnMessages(); Scanner scanner; + /** + * Constructor for Storage + * + * @param fileName the file saving the information of task list + * + */ public Storage(String fileName) { this.fileName = fileName; this.file = new File(System.getProperty("user.dir") + "/src/main/java/Duke.Storage/"+fileName); // create a File for the given file path } + /** + * Loads the information pre-stored in the file or saved on last exit. + * + * @exception DukeException Throws a general Duke Exception with Message Self-defined + * + */ public TaskList load() throws DukeException { TaskList taskList = new TaskList(); if (file.exists()) { @@ -30,23 +42,29 @@ public TaskList load() throws DukeException { taskList.addTask(decodeStr2Task(line)); } } catch (IOException e) { - // 文件解析失败 + //fail to parse throw new DukeException("file parse fail"); } } else { try { createFile(); } catch (IOException e) { - // 文件创建失败 + //fail to create file throw new DukeException("create file fail"); } } return taskList; } + /** + * Creates File if first time initializing + * + * @exception IOException throws a IO Exception if file exists + * + */ public void createFile() throws IOException { try { - file.createNewFile(); + boolean create = file.createNewFile(); } catch (IOException ioe) { this.isExist = true; System.out.println("File exists"); @@ -54,6 +72,12 @@ public void createFile() throws IOException { System.out.println("File created: " + file.getName()); } + /** + * Save function for current runtime task list + * + * @param taskList save the task list of current run time + * + */ public void save(TaskList taskList) { FileWriter myWriter; @@ -78,6 +102,12 @@ public void save(TaskList taskList) { System.out.println("Successfully wrote to the file."); } + /** + * Decodes The Saved String back to its task format + * + * @param str the string of each line of information stored in the text file + * + */ public Task decodeStr2Task(String str) { String[] line = str.split(" \\| "); Task task = null; diff --git a/src/main/java/Duke/ui/ReturnMessages.java b/src/main/java/Duke/ui/ReturnMessages.java index 5d4f074a..48ebdede 100644 --- a/src/main/java/Duke/ui/ReturnMessages.java +++ b/src/main/java/Duke/ui/ReturnMessages.java @@ -26,32 +26,32 @@ public void exitFeedback(){ } public void exception_feedback_emptyDescription(String taskType){ separator(); - System.out.printf(" ☹ OOPS!!! The description of a %s cannot be empty.\n", taskType); + System.out.printf(" OOPS!!! The description of a %s cannot be empty.\n", taskType); separator(); } public void exception_feedback_emptyTaskList(){ separator(); - System.out.println(" ☹ OOPS!!! The list is empty ^_^"); + System.out.println(" OOPS!!! The list is empty ^_^"); separator(); } public void exception_feedback_unknownSyntax(String message){ separator(); - System.out.printf(" ☹ OOPS!!! I'm sorry, but I don't know what [%s] means :-(\n", message); + System.out.printf(" OOPS!!! I'm sorry, but I don't know what [%s] means :-(\n", message); separator(); } public void exception_feedback_taskNotFound(String message){ separator(); - System.out.printf(" ☹ OOPS!!! Please key in by Tasks.Task ID instead of [%s]\n", message); + System.out.printf(" OOPS!!! Please key in by Tasks.Task ID instead of [%s]\n", message); separator(); } public void exception_feedback_noTimeConcept(){ separator(); - System.out.println(" ☹ HEY!!! Please give a due date for deadlines and events. Let's have some sense of time >_<|||"); + System.out.println(" HEY!!! Please give a due date for deadlines and events. Let's have some sense of time >_<|||"); separator(); } public void exception_feedback_cantSave(){ separator(); - System.out.println(" ☹ OOPS!!! Exception caught while saving >_<|||"); + System.out.println(" OOPS!!! Exception caught while saving >_<|||"); separator(); } public void exception_feedback_loadingError(){ @@ -61,7 +61,7 @@ public void exception_feedback_loadingError(){ + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println(" ☹ OOPS!!! Something went wrong while loading"); + System.out.println(" OOPS!!! Something went wrong while loading"); separator(); } } From 9f1c4df453a6a3f90e644c75102c7026fe1b4693 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Thu, 21 Oct 2021 00:48:48 +0800 Subject: [PATCH 15/32] 1. code cleanup 2. more javadoc --- src/main/java/Duke/Duke.java | 13 ++++--- src/main/java/Duke/task/Deadline.java | 13 +++++++ src/main/java/Duke/task/Events.java | 16 +++++++- src/main/java/Duke/task/Task.java | 28 ++++++++++++++ src/main/java/Duke/task/TaskList.java | 41 ++++++++++++++++++++ src/main/java/Duke/task/Task_Enum.java | 6 +++ src/main/java/Duke/task/ToDos.java | 11 ++++++ src/main/java/Duke/ui/ReturnMessages.java | 46 +++++++++++++++++++++++ 8 files changed, 167 insertions(+), 7 deletions(-) diff --git a/src/main/java/Duke/Duke.java b/src/main/java/Duke/Duke.java index 9ae9a914..188ecb88 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -4,17 +4,20 @@ import Duke.parser.Command; import Duke.parser.Parser; import Duke.storage.Storage; -import Duke.task.*; +import Duke.task.TaskList; import Duke.ui.UI; -import java.io.IOException; - public class Duke { private static Storage storage; private UI ui; private TaskList taskList; + /** + * Beginning function taking in filepath + * + * @param filePath - filepath to storage + */ public Duke(String filePath) { ui = new UI(); storage = new Storage(filePath); @@ -26,7 +29,7 @@ public Duke(String filePath) { } } - public void run() throws IOException { + public void run() throws DukeException { ui.showWelcome(); boolean isExit = false; @@ -46,7 +49,7 @@ public void run() throws IOException { ui.showExit(); } - public static void main(String[] args) throws DukeException, IOException { + public static void main(String[] args) throws DukeException { new Duke("duke.txt").run(); } } diff --git a/src/main/java/Duke/task/Deadline.java b/src/main/java/Duke/task/Deadline.java index 3800160a..33640eba 100644 --- a/src/main/java/Duke/task/Deadline.java +++ b/src/main/java/Duke/task/Deadline.java @@ -4,16 +4,29 @@ public class Deadline extends Task { protected String by; + /** + * Deadline task constructor + * + * @param description - the task for the deadline + * @param by - the deadline's datetime + */ public Deadline(String description, String by) { super(description); this.by = by; } + /** + * Prints task by its own style + */ @Override public String toString() { return "[D]" + super.toString() + " (by: " + by + ")"; } + /** + * Encode function for storage within text file + * + */ @Override public String encodeTask() { return "D" + super.encodeTask() + "|" + by; diff --git a/src/main/java/Duke/task/Events.java b/src/main/java/Duke/task/Events.java index 517cd6ac..dd62858f 100644 --- a/src/main/java/Duke/task/Events.java +++ b/src/main/java/Duke/task/Events.java @@ -3,16 +3,28 @@ public class Events extends Task { protected String at; + /** + * Event task constructor + * @param description - Description of Event + * @param at - Date/Time event is held + */ public Events(String description, String at) { super(description); this.at = at; } - + /** + * Prints task by its own style + * + * + */ @Override public String toString() { return "[E]" + super.toString() + " (at: " + at + ")"; } - + /** + * Encode function for storage within text file + * + */ @Override public String encodeTask() { return "E" + super.encodeTask() + "|" + at ; diff --git a/src/main/java/Duke/task/Task.java b/src/main/java/Duke/task/Task.java index 9065326f..573923ac 100644 --- a/src/main/java/Duke/task/Task.java +++ b/src/main/java/Duke/task/Task.java @@ -7,31 +7,59 @@ public class Task { public static final String DONE = "1"; public static final String UNDONE = "0"; + /** + * Task base constructor + * @param description - the description string. + */ public Task(String description) { this.description = description; this.isDone = false; } + /** + * Task's Current status indicator + * + * @return - done or not done + */ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } + /** + * Similar to get status icon Status Code for code usage + * @return - done or not done + */ public String getStatusCode() { return (isDone ? DONE : UNDONE); // mark done task with 1 } + /** + * Gets the full description of each task + * @return - returns task description + */ public String getTaskInfo(){ return description; } + /** + * Sets the task to Done + */ public void setDone(){ isDone = true; } + /** + * Base Function to print task + * @return tasks [] TASK + */ public String toString() { return "["+getStatusIcon()+"] " + description; } + /** + * Encodes task for storage. + * @return | X | TASK + */ public String encodeTask() { return " | " + getStatusCode() + " | " + description; } diff --git a/src/main/java/Duke/task/TaskList.java b/src/main/java/Duke/task/TaskList.java index ea19725a..336e85e4 100644 --- a/src/main/java/Duke/task/TaskList.java +++ b/src/main/java/Duke/task/TaskList.java @@ -11,15 +11,29 @@ public class TaskList { private ArrayList taskList; private static ReturnMessages printer = new ReturnMessages(); + + /** + * Task list Constructor + */ public TaskList() { taskList = new ArrayList<>(); } + /** + * Task list constructor with tasks within + * @param load - the task list that already contained task. + */ public TaskList(TaskList load) { this.listSize = load.listSize; this.taskList = load.taskList; } + /** + * Deletes a specific task uniquely identified via taskID + * @param taskID - the unique identifier for each task + * @throws TaskNotFoundException - when a task is not found + * @throws EmptyTaskListException - when the task list is empty + */ public void deleteTask(int taskID) throws TaskNotFoundException, EmptyTaskListException { int taskPosition = taskID -1; if(taskPosition > this.listSize || taskPosition < 0){ @@ -36,24 +50,47 @@ public void deleteTask(int taskID) throws TaskNotFoundException, EmptyTaskListEx printer.separator(); } + /** + * Adds a task to task list + * @param task - the full task information + */ public void addTask(Task task){ this.taskList.add(task); this.listSize++; } + /** + * Gets a task via its task ID + * @param ID - the unique identifier for a task + * @return - returns the task + */ public Task getTask(int ID){ return taskList.get(ID); } + /** + * Gets the last task added + * @return - return the task + */ public Task getLastTask(){ return taskList.get(listSize-1); } + /** + * Gets the list size. + * @return - list size in integer + */ public int getListSize(){ return this.listSize; } + public void save(){} + + /** + * Prints the tasks within the task list + * @throws EmptyTaskListException - thrown if task list is empty + */ public void printTaskList() throws EmptyTaskListException { printer.separator(); if(this.listSize == 0){ @@ -68,6 +105,10 @@ public void printTaskList() throws EmptyTaskListException { printer.separator(); } + /** + * Getter for getting the task list + * @return - returns entire task list + */ public ArrayList getTaskList() { return taskList; } diff --git a/src/main/java/Duke/task/Task_Enum.java b/src/main/java/Duke/task/Task_Enum.java index 5f434a55..da8223bc 100644 --- a/src/main/java/Duke/task/Task_Enum.java +++ b/src/main/java/Duke/task/Task_Enum.java @@ -1,5 +1,11 @@ package Duke.task; +/** + * Enumerate for Task + * 1. TO DO + * 2. DEADLINE + * 3. EVENT + */ public enum Task_Enum { TODO, //0 DEADLINE, //1 diff --git a/src/main/java/Duke/task/ToDos.java b/src/main/java/Duke/task/ToDos.java index 6d4c1ff4..ecf62986 100644 --- a/src/main/java/Duke/task/ToDos.java +++ b/src/main/java/Duke/task/ToDos.java @@ -3,16 +3,27 @@ public class ToDos extends Task { protected String action; + /** + * To Do task constructor + * @param description - Description of To Do task + */ public ToDos(String description, String action) { super(description); this.action = action; } + /** + * Prints task by its own style + */ @Override public String toString() { return "[T]" + super.toString(); } + /** + * Encode function for storage within text file + * + */ @Override public String encodeTask() { return "T" + super.encodeTask() ; diff --git a/src/main/java/Duke/ui/ReturnMessages.java b/src/main/java/Duke/ui/ReturnMessages.java index 48ebdede..39febba0 100644 --- a/src/main/java/Duke/ui/ReturnMessages.java +++ b/src/main/java/Duke/ui/ReturnMessages.java @@ -5,55 +5,101 @@ public void separator(){ System.out.println(" ____________________________________________________________"); } + /** + * Feedback when marking a task done + */ public void taskDoneFeedback(){ separator(); System.out.println(" Nice! I've marked this task as done:"); } + + /** + * Feedback when adding a task + */ public void taskAddFeedback(){ separator(); System.out.println(" Got it. I've added this task:"); } + + /** + * Feedback on program startup + */ public void welcomeFeedback(){ separator(); System.out.println(" Hello! I'm Duke.Duke"); System.out.println(" What can I do for you?"); separator(); } + + /** + * Feedback on program exit + */ public void exitFeedback(){ separator(); System.out.println(" Bye. Hope to see you again soon!"); separator(); } + + /** + * Feedback message on emptyDescription Exception thrown + * @param taskType The type of task (To Do, Event, Deadline) + */ public void exception_feedback_emptyDescription(String taskType){ separator(); System.out.printf(" OOPS!!! The description of a %s cannot be empty.\n", taskType); separator(); } + + /** + * Feedback message on emptyTaskList Exception thrown + */ public void exception_feedback_emptyTaskList(){ separator(); System.out.println(" OOPS!!! The list is empty ^_^"); separator(); } + + /** + * Feedback message on unknownSyntax Exception thrown + * @param message - user input + */ public void exception_feedback_unknownSyntax(String message){ separator(); System.out.printf(" OOPS!!! I'm sorry, but I don't know what [%s] means :-(\n", message); separator(); } + + /** + * Feedback message on taskNotfound Exception thrown + * @param message - the task description + */ public void exception_feedback_taskNotFound(String message){ separator(); System.out.printf(" OOPS!!! Please key in by Tasks.Task ID instead of [%s]\n", message); separator(); } + + /** + * Feedback message on noTimeConcept Exception thrown + */ public void exception_feedback_noTimeConcept(){ separator(); System.out.println(" HEY!!! Please give a due date for deadlines and events. Let's have some sense of time >_<|||"); separator(); } + + /** + * Feedback message on Saving Exception thrown + */ public void exception_feedback_cantSave(){ separator(); System.out.println(" OOPS!!! Exception caught while saving >_<|||"); separator(); } + + /** + * Feedback message on Loading Exception thrown + */ public void exception_feedback_loadingError(){ separator(); String logo = " ____ _ \n" From 9461d779946f5ad97c56084c899830b7b4c68255 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 23 Oct 2021 15:54:49 +0800 Subject: [PATCH 16/32] Implemented Level 8 Date and Time --- src/main/java/Duke/Duke.java | 2 +- src/main/java/Duke/DukeTest.java | 10 ++- .../Duke/exception/TimeParseException.java | 8 +++ src/main/java/Duke/parser/CMD.java | 35 +++++++--- src/main/java/Duke/parser/CMD_Deadline.java | 60 +++++++++++++++- src/main/java/Duke/parser/CMD_Event.java | 61 +++++++++++++++- .../java/Duke/parser/CMD_Event_Enum_DAY.java | 24 +++++++ .../java/Duke/parser/CMD_Event_Enum_MTH.java | 31 +++++++++ src/main/java/Duke/parser/CMD_Save.java | 18 +++++ src/main/java/Duke/parser/Parser.java | 5 +- src/main/java/Duke/storage/Storage.java | 45 ++++++------ src/main/java/Duke/storage/duke.txt | 2 - src/main/java/Duke/task/Deadline.java | 10 +-- src/main/java/Duke/task/Events.java | 21 ++++-- src/main/java/Duke/ui/ReturnMessages.java | 69 ++++++++++++++++++- src/main/java/Duke/ui/UI.java | 13 +++- text-ui-test/input.txt | 9 ++- 17 files changed, 362 insertions(+), 61 deletions(-) create mode 100644 src/main/java/Duke/exception/TimeParseException.java create mode 100644 src/main/java/Duke/parser/CMD_Event_Enum_DAY.java create mode 100644 src/main/java/Duke/parser/CMD_Event_Enum_MTH.java diff --git a/src/main/java/Duke/Duke.java b/src/main/java/Duke/Duke.java index 188ecb88..ae892c8c 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -20,6 +20,7 @@ public class Duke { */ public Duke(String filePath) { ui = new UI(); + ui.showWelcome(); storage = new Storage(filePath); try { taskList = new TaskList(storage.load()); @@ -30,7 +31,6 @@ public Duke(String filePath) { } public void run() throws DukeException { - ui.showWelcome(); boolean isExit = false; while (!isExit) { diff --git a/src/main/java/Duke/DukeTest.java b/src/main/java/Duke/DukeTest.java index e8821bad..1e785403 100644 --- a/src/main/java/Duke/DukeTest.java +++ b/src/main/java/Duke/DukeTest.java @@ -1,15 +1,19 @@ package Duke; -import java.io.File; -import java.io.IOException; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; public class DukeTest { - public static void main(String[] args) throws IOException { + /*public static void main(String[] args) throws IOException { System.out.println(System.getProperty("user.dir")); String fileName = "duke.txt"; File file = new File(System.getProperty("user.dir") + "/src/main/java/Duke.Storage/"+fileName); System.out.println(file.exists()); } + */ + public static void main(String[] args) { + System.out.println(LocalDate.parse("20210909", DateTimeFormatter.BASIC_ISO_DATE)); + } } diff --git a/src/main/java/Duke/exception/TimeParseException.java b/src/main/java/Duke/exception/TimeParseException.java new file mode 100644 index 00000000..d846841a --- /dev/null +++ b/src/main/java/Duke/exception/TimeParseException.java @@ -0,0 +1,8 @@ +package Duke.exception; + + +public class TimeParseException extends DukeException{ + public TimeParseException(String message) { + super(message); + } +} diff --git a/src/main/java/Duke/parser/CMD.java b/src/main/java/Duke/parser/CMD.java index ae35abc7..08126cf4 100644 --- a/src/main/java/Duke/parser/CMD.java +++ b/src/main/java/Duke/parser/CMD.java @@ -9,21 +9,33 @@ import Duke.ui.ReturnMessages; import Duke.ui.UI; +/** + * base cmd class + * CMD is the base class of all command objects. It contains some public attributes and methods. + * Each class that inherits CMD only needs to perform its own duties. + */ public class CMD { + /** + * command user input + */ protected String fullCommand; + /** + * command to be executed + */ protected String keyword; + /** + * command parameters + */ protected String detail; private static ReturnMessages returnMessage = new ReturnMessages(); /** - * Constructor command - * - * @param command the command input - * + * This construction method tells the command to parse into keyword and detail(If needed) + * @param command {@code fullCommand} user input */ public CMD(String command) { this.fullCommand = command; @@ -49,12 +61,11 @@ public CMD() { } /** - * Base class for different execution - * - * @param taskList the full task list for saving purpose - * @param ui UI object - * @param storage storage object - * + * execute cmd + * @param taskList user generate + * @param ui show interactive information + * @param storage info where to storage + * @return if true, the program stops, otherwise it starts */ public boolean execute(TaskList taskList, UI ui, Storage storage){ return false; @@ -64,7 +75,9 @@ public boolean execute(TaskList taskList, UI ui, Storage storage){ * Replies a done/add command * * @param taskList gets the full task list - * + * @throws EmptyTaskListException - thrown if task list is empty + * @throws UnknownSyntaxException - thrown if syntax is unknown + * @throws TaskNotFoundException - thrown if task is not found */ public void reply(TaskList taskList) throws EmptyTaskListException, UnknownSyntaxException, TaskNotFoundException { if(fullCommand.contains("done")){ diff --git a/src/main/java/Duke/parser/CMD_Deadline.java b/src/main/java/Duke/parser/CMD_Deadline.java index 50df0b2f..e7c732a5 100644 --- a/src/main/java/Duke/parser/CMD_Deadline.java +++ b/src/main/java/Duke/parser/CMD_Deadline.java @@ -1,6 +1,7 @@ package Duke.parser; import Duke.exception.TimeManagementException; +import Duke.exception.TimeParseException; import Duke.exception.UnknownSyntaxException; import Duke.storage.Storage; import Duke.task.Deadline; @@ -8,8 +9,12 @@ import Duke.task.TaskList; import Duke.ui.UI; +import java.time.DateTimeException; +import java.time.LocalDateTime; -public class CMD_Deadline extends CMD{ + +public class +CMD_Deadline extends CMD{ /** * Deadline Command Constructor * @@ -33,11 +38,18 @@ public boolean execute(TaskList taskList, UI ui, Storage storage) { try { if (!CMD_Enum.DEADLINE.getName().equals(super.keyword)) throw new UnknownSyntaxException(super.keyword); String[] dl = super.detail.split("/by", 2); - Task task = new Deadline(dl[0], dl[1]); + //region time parse + String[] s = dl[1].split(" ", 2); + LocalDateTime dateT = timeParse(s[1]); + //endregion + Task task = new Deadline(dl[0], dateT); taskList.addTask(task); } catch (IndexOutOfBoundsException e) { success = false; throw new TimeManagementException(); + } catch (TimeParseException e) { + success = false; + throw new TimeParseException(e.getMessage()); } if (success) { @@ -46,4 +58,48 @@ public boolean execute(TaskList taskList, UI ui, Storage storage) { return false; } + + /** + * Help parse the time to yyyy,mm,dd ssss + * @param str - the string of datetime + * @return - datetime in its correct format + */ + private LocalDateTime timeParse(String str) throws TimeParseException{ + if (!str.contains("/")) throw new TimeParseException("DateTime Format DD/MM/YYYY"); + // gen yyyy,mm,dd ssss + String[] date = str.split("/", 3); + if (date.length < 3) throw new TimeParseException("DateTime Format DD/MM/YYYY"); + + // gen time + System.out.println("date2: "+date[2]); + String[] time = date[2].split(" ", 2); + int year = Integer.parseInt(date[0]); + int month = Integer.parseInt(date[1]); + int dayOfMth = Integer.parseInt(time[0]); + int hour = get24HrFormat(time[1]); + + LocalDateTime localDate; + try { + //LocalDateTime.of(,,); + localDate = LocalDateTime.of(year,month,dayOfMth,hour,0,0,0); + System.out.println(localDate); + } catch (DateTimeException e) { + throw new TimeParseException(e.getMessage()); + } + + return localDate; + } + + + private int get24HrFormat(String t){ + int timeVal; + if(t.contains("AM")){ + timeVal = Integer.parseInt(t.replace("AM", "").stripTrailing()); + } + else{ + timeVal = Integer.parseInt(t.replace("PM", "").stripTrailing()); + timeVal +=12; + } + return timeVal; + } } diff --git a/src/main/java/Duke/parser/CMD_Event.java b/src/main/java/Duke/parser/CMD_Event.java index bc21f94d..28f0f688 100644 --- a/src/main/java/Duke/parser/CMD_Event.java +++ b/src/main/java/Duke/parser/CMD_Event.java @@ -1,6 +1,7 @@ package Duke.parser; import Duke.exception.TimeManagementException; +import Duke.exception.TimeParseException; import Duke.exception.UnknownSyntaxException; import Duke.storage.Storage; import Duke.task.Events; @@ -8,6 +9,10 @@ import Duke.task.TaskList; import Duke.ui.UI; +import java.time.DateTimeException; +import java.time.LocalDate; +import java.time.LocalTime; + public class CMD_Event extends CMD{ /** * Event Command Constructor @@ -17,13 +22,21 @@ public CMD_Event(String command) { super(command); } + @Override public boolean execute(TaskList taskList, UI ui, Storage storage) { boolean success = true; try { if (!CMD_Enum.EVENT.getName().equals(super.keyword)) throw new UnknownSyntaxException(super.keyword); String[] dt = detail.split("/at", 2); - Task task = new Events(dt[0], dt[1]); + String desc = dt[0]; + String dateTime = dt[1].substring(1); + LocalDate date = dateParse(dateTime); + String[] dayTimeInfo = dateTime.split(" ", 2); + String timeRange = dayTimeInfo[1]; + String from = timeRange.split("-", 2)[0]; + String to = timeRange.split("-", 2)[1]; + Task task = new Events(dt[0], date, timeParse(get24HrFormat(from)),timeParse(get24HrFormat(to))); taskList.addTask(task); } catch (IndexOutOfBoundsException e) { success = false; @@ -36,4 +49,50 @@ public boolean execute(TaskList taskList, UI ui, Storage storage) { return false; } + + /** + * Help parse the time to yyyy,mm,dd ssss + * @param str - the string of datetime + * @return - datetime in its correct format + */ + private LocalDate dateParse(String str) throws TimeParseException{ + if (!str.contains("/")) throw new TimeParseException("DateTime Format DD/MM/YYYY"); + // gen yyyy,mm,dd ssss + String[] date = str.split("/", 3); + if (date.length < 3) throw new TimeParseException("DateTime Format DD/MM/YYYY"); + + // gen time + System.out.println("date2: "+date[2]); + String[] time = date[2].split(" ", 2); + int year = Integer.parseInt(date[0]); + int month = Integer.parseInt(date[1]); + int dayOfMth = Integer.parseInt(time[0]); + + LocalDate localDate; + try { + localDate = LocalDate.of(year,month,dayOfMth); + System.out.println(localDate); + } catch (DateTimeException e) { + throw new TimeParseException(e.getMessage()); + } + + return localDate; + } + + + private int get24HrFormat(String t){ + int timeVal; + if(t.contains("AM")){ + timeVal = Integer.parseInt(t.replace("AM", "").stripTrailing()); + } + else{ + timeVal = Integer.parseInt(t.replace("PM", "").stripTrailing()); + timeVal +=12; + } + return timeVal; + } + + private LocalTime timeParse(int t){ + return LocalTime.of(t,0,0); + } } \ No newline at end of file diff --git a/src/main/java/Duke/parser/CMD_Event_Enum_DAY.java b/src/main/java/Duke/parser/CMD_Event_Enum_DAY.java new file mode 100644 index 00000000..8a50e87c --- /dev/null +++ b/src/main/java/Duke/parser/CMD_Event_Enum_DAY.java @@ -0,0 +1,24 @@ +package Duke.parser; + +public enum CMD_Event_Enum_DAY { + MON("Mon"), + TUE("Tue"), + WED("Wed"), + THUR("Thur"), + FRI("Fri") + ; + + CMD_Event_Enum_DAY(String day) { + this.day = day; + } + + private String day; + + public String getDay() { + return day; + } + + public void setDay(String day) { + this.day = day; + } +} diff --git a/src/main/java/Duke/parser/CMD_Event_Enum_MTH.java b/src/main/java/Duke/parser/CMD_Event_Enum_MTH.java new file mode 100644 index 00000000..1c2d2bc4 --- /dev/null +++ b/src/main/java/Duke/parser/CMD_Event_Enum_MTH.java @@ -0,0 +1,31 @@ +package Duke.parser; + +public enum CMD_Event_Enum_MTH { + JAN("Jan"), + FEB("Feb"), + MAR("Mar"), + APR("Apr"), + MAY("May"), + JUN("Jun"), + JUL("Jul"), + AUG("Aug"), + SEP("Sep"), + OCT("Oct"), + NOV("Nov"), + DEC("Dec") + ; + + CMD_Event_Enum_MTH(String month) { + this.month = month; + } + + private String month; + + public String getMth() { + return month; + } + + public void setMth(String month) { + this.month = month; + } +} diff --git a/src/main/java/Duke/parser/CMD_Save.java b/src/main/java/Duke/parser/CMD_Save.java index 8a9368f0..5edb4003 100644 --- a/src/main/java/Duke/parser/CMD_Save.java +++ b/src/main/java/Duke/parser/CMD_Save.java @@ -1,5 +1,9 @@ package Duke.parser; +import Duke.storage.Storage; +import Duke.task.TaskList; +import Duke.ui.UI; + public class CMD_Save extends CMD{ /** * Save Command Constructor @@ -8,4 +12,18 @@ public class CMD_Save extends CMD{ public CMD_Save(String command){ super(command); } + + /** + * Function Overloading for execution of bye command + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storage storage object + * + */ + @Override + public boolean execute(TaskList taskList, UI ui, Storage storage) { + storage.save(taskList); + return false; + } } diff --git a/src/main/java/Duke/parser/Parser.java b/src/main/java/Duke/parser/Parser.java index 916a0946..9116673e 100644 --- a/src/main/java/Duke/parser/Parser.java +++ b/src/main/java/Duke/parser/Parser.java @@ -2,9 +2,8 @@ public class Parser { /** - * Determines which known command is been input - * - * @param fullCommand takes in the full command, check via ENUM + * This is a factory that generates different CMD objects according to the input parameters + * @see CMD */ public static Command parse(String fullCommand) { Command command = new Command(); diff --git a/src/main/java/Duke/storage/Storage.java b/src/main/java/Duke/storage/Storage.java index 0182dc5e..7cfb0c1c 100644 --- a/src/main/java/Duke/storage/Storage.java +++ b/src/main/java/Duke/storage/Storage.java @@ -1,10 +1,13 @@ package Duke.storage; -import Duke.exception.*; +import Duke.exception.DukeException; import Duke.task.*; -import Duke.ui.*; +import Duke.ui.ReturnMessages; import java.io.*; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; import java.util.Scanner; public class Storage { @@ -22,23 +25,21 @@ public class Storage { */ public Storage(String fileName) { this.fileName = fileName; - this.file = new File(System.getProperty("user.dir") + "/src/main/java/Duke.Storage/"+fileName); // create a File for the given file path + this.file = new File(System.getProperty("user.dir") + "/src/main/java/Duke/storage/"+fileName); // create a File for the given file path } /** - * Loads the information pre-stored in the file or saved on last exit. - * - * @exception DukeException Throws a general Duke Exception with Message Self-defined - * + * load info from hard disk + * @return task list from hard disk */ public TaskList load() throws DukeException { TaskList taskList = new TaskList(); if (file.exists()) { + returnMessage.loadingFileFeedback(); try (BufferedReader br = new BufferedReader(new FileReader(file))) { String line; while ((line = br.readLine()) != null) { // process the line - System.out.println("Loading..."); taskList.addTask(decodeStr2Task(line)); } } catch (IOException e) { @@ -53,11 +54,12 @@ public TaskList load() throws DukeException { throw new DukeException("create file fail"); } } + returnMessage.loadSuccessFeedback(); return taskList; } /** - * Creates File if first time initializing + * Creates File if not exist * * @exception IOException throws a IO Exception if file exists * @@ -69,20 +71,20 @@ public void createFile() throws IOException { this.isExist = true; System.out.println("File exists"); } - System.out.println("File created: " + file.getName()); + returnMessage.createSuccessFeedback(file.getName()); } /** - * Save function for current runtime task list + * save task list to hard disk * - * @param taskList save the task list of current run time + * @param taskList - data to save * */ public void save(TaskList taskList) { FileWriter myWriter; try { - myWriter = new FileWriter(file.getAbsoluteFile(), true); + myWriter = new FileWriter(file.getAbsoluteFile(), false); FileWriter finalMyWriter = myWriter; taskList.getTaskList().forEach((task) -> { try { @@ -99,14 +101,13 @@ public void save(TaskList taskList) { } - System.out.println("Successfully wrote to the file."); + returnMessage.saveSuccessFeedback(); } /** - * Decodes The Saved String back to its task format - * - * @param str the string of each line of information stored in the text file - * + * decode the str to its individual task format + * @param str the full string per line + * @return created task object */ public Task decodeStr2Task(String str) { String[] line = str.split(" \\| "); @@ -117,11 +118,13 @@ public Task decodeStr2Task(String str) { break; case "D": - // String[] dl = detail.split("/by", 2); - task = new Deadline(line[2], line[3]); + String[] date = str.split("-", 3); + LocalDate d = LocalDate.parse(line[3]); + LocalTime t = LocalTime.parse(line[4]); + task = new Deadline(line[2], LocalDateTime.of(d,t)); break; case "E": - task = new Events(line[2], line[3]); + task = new Events(line[2], LocalDate.parse(line[3]), LocalTime.parse(line[4]), LocalTime.parse(line[5])); break; } if (Task.DONE.equals(line[1])) { diff --git a/src/main/java/Duke/storage/duke.txt b/src/main/java/Duke/storage/duke.txt index 9961335f..e69de29b 100644 --- a/src/main/java/Duke/storage/duke.txt +++ b/src/main/java/Duke/storage/duke.txt @@ -1,2 +0,0 @@ -T | 0 | sleep -D | 0 | sleep | 3pm diff --git a/src/main/java/Duke/task/Deadline.java b/src/main/java/Duke/task/Deadline.java index 33640eba..540bb225 100644 --- a/src/main/java/Duke/task/Deadline.java +++ b/src/main/java/Duke/task/Deadline.java @@ -1,8 +1,10 @@ package Duke.task; +import java.time.LocalDateTime; + public class Deadline extends Task { - protected String by; + protected LocalDateTime by; /** * Deadline task constructor @@ -10,7 +12,7 @@ public class Deadline extends Task { * @param description - the task for the deadline * @param by - the deadline's datetime */ - public Deadline(String description, String by) { + public Deadline(String description, LocalDateTime by) { super(description); this.by = by; } @@ -20,7 +22,7 @@ public Deadline(String description, String by) { */ @Override public String toString() { - return "[D]" + super.toString() + " (by: " + by + ")"; + return "[D]" + super.toString() + " (by: " + by.toLocalDate().toString() + "["+ by.toLocalDate().getDayOfWeek() +"] "+ by.toLocalTime().toString()+")"; } /** @@ -29,6 +31,6 @@ public String toString() { */ @Override public String encodeTask() { - return "D" + super.encodeTask() + "|" + by; + return "D" + super.encodeTask() + " | " + by.toLocalDate().toString() + " | " + by.toLocalTime().toString(); } } \ No newline at end of file diff --git a/src/main/java/Duke/task/Events.java b/src/main/java/Duke/task/Events.java index dd62858f..1e3e19df 100644 --- a/src/main/java/Duke/task/Events.java +++ b/src/main/java/Duke/task/Events.java @@ -1,16 +1,25 @@ package Duke.task; +import java.time.LocalDate; +import java.time.LocalTime; + public class Events extends Task { - protected String at; + protected LocalDate date; + protected LocalTime start; + protected LocalTime end; /** * Event task constructor * @param description - Description of Event - * @param at - Date/Time event is held + * @param start - Date/Time event is held + * @param end - Date/Time event ends + * @param date - the date event is held */ - public Events(String description, String at) { + public Events(String description, LocalDate date, LocalTime start, LocalTime end) { super(description); - this.at = at; + this.date = date; + this.start = start; + this.end = end; } /** * Prints task by its own style @@ -19,7 +28,7 @@ public Events(String description, String at) { */ @Override public String toString() { - return "[E]" + super.toString() + " (at: " + at + ")"; + return "[E]" + super.toString() + " (on:" + date.toString() + "[" + date.getDayOfWeek().toString() + "] from:" + start.toString() +" to:" + end.toString() +")"; } /** * Encode function for storage within text file @@ -27,6 +36,6 @@ public String toString() { */ @Override public String encodeTask() { - return "E" + super.encodeTask() + "|" + at ; + return "E" + super.encodeTask() + " | " + date.toString() + " | " + start.toString() + " | " + end.toString(); } } diff --git a/src/main/java/Duke/ui/ReturnMessages.java b/src/main/java/Duke/ui/ReturnMessages.java index 39febba0..0d678804 100644 --- a/src/main/java/Duke/ui/ReturnMessages.java +++ b/src/main/java/Duke/ui/ReturnMessages.java @@ -1,5 +1,8 @@ package Duke.ui; +/** + * handle msg output + */ public class ReturnMessages { public void separator(){ System.out.println(" ____________________________________________________________"); @@ -26,8 +29,17 @@ public void taskAddFeedback(){ */ public void welcomeFeedback(){ separator(); - System.out.println(" Hello! I'm Duke.Duke"); - System.out.println(" What can I do for you?"); + System.out.println(" Hello! I'm Duke"); + System.out.println(" Here are my functionality...."); + System.out.println(" Check Existing Tasks: list"); + System.out.println(" Mark a Task done： done {taskID}"); + System.out.println(" Delete a Task: delete {taskID}"); + System.out.println(" Add a Todo Task: todo read book"); + System.out.println(" Save Current State: save"); + System.out.println(" Add a Event Task: event xxxx /at {date by YYYY/MM/DD} {startTime}-{endTime}PM"); + System.out.println(" Add a Deadline Task: deadline xxxx /by {date by YYYY/MM/DD}"); + System.out.println(" Add a Deadline Task: deadline XXXX /by {date by YYYY/MM/DD} {Time}PM"); + System.out.println(" End the program: bye"); separator(); } @@ -40,6 +52,42 @@ public void exitFeedback(){ separator(); } + /** + * Feedback when loading file. + */ + public void loadingFileFeedback(){ + separator(); + System.out.println(" Loading File..."); + separator(); + } + + /** + * Feedback on file load success. + */ + public void loadSuccessFeedback(){ + separator(); + System.out.println(" File Loaded Successfully, use command 'list' to view..."); + separator(); + } + + /** + * Feedback on file save + */ + public void saveSuccessFeedback(){ + separator(); + System.out.println(" Successfully wrote to the file."); + separator(); + } + + /** + * Feedback on file create + */ + public void createSuccessFeedback(String name){ + separator(); + System.out.println("File created: " + name); + separator(); + } + /** * Feedback message on emptyDescription Exception thrown * @param taskType The type of task (To Do, Event, Deadline) @@ -84,7 +132,16 @@ public void exception_feedback_taskNotFound(String message){ */ public void exception_feedback_noTimeConcept(){ separator(); - System.out.println(" HEY!!! Please give a due date for deadlines and events. Let's have some sense of time >_<|||"); + System.out.println(" HEY!!! Please give a due date for deadlines and events or the syntax could be wrong"); + separator(); + } + + /** + * Feedback message on Time Parse Exception thrown + */ + public void exception_feedback_timeParse(String message){ + separator(); + System.out.printf(" There seems to have problem with your time format [%s]\n", message); separator(); } @@ -110,4 +167,10 @@ public void exception_feedback_loadingError(){ System.out.println(" OOPS!!! Something went wrong while loading"); separator(); } + + public void exception_feedback_unknownError(){ + separator(); + System.out.println("Sorry, An unknown error occurred"); + separator(); + } } diff --git a/src/main/java/Duke/ui/UI.java b/src/main/java/Duke/ui/UI.java index b605697d..531f58a0 100644 --- a/src/main/java/Duke/ui/UI.java +++ b/src/main/java/Duke/ui/UI.java @@ -25,6 +25,10 @@ public void showLoadingError(){ returnMessage.exception_feedback_loadingError(); } + /** + * read cmd user input + * @return - command read from user Input + */ public String readCommand() { boolean end = false; String command; @@ -41,6 +45,11 @@ public void showError(String message) { System.out.println(message); } + /** + * all the error msg will output by this + * All exceptions inherit DukeException + * @param e the exception object + */ public void showError(DukeException e) { if (e instanceof EmptyDescriptionException) { returnMessage.exception_feedback_emptyDescription(e.getMessage()); @@ -54,8 +63,10 @@ public void showError(DukeException e) { returnMessage.exception_feedback_noTimeConcept(); } else if (e instanceof UnknownSyntaxException){ returnMessage.exception_feedback_unknownSyntax(e.getMessage()); + } else if (e instanceof TimeParseException){ + returnMessage.exception_feedback_timeParse(e.getMessage()); } else { - System.out.println("system error"); + returnMessage.exception_feedback_unknownError(); } } diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 2ad0e44b..132207f9 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,13 +1,16 @@ blah to do -to do +event +deadline list read book to do read book deadline return book -deadline return book /by June 6th +deadline return book /by 2021-10-24 10PM (wrong) +deadline return book /by 2021/10/24 10PM (correct) event project meeting -event project meeting /at Aug 6th 2-4PM +event project meeting /at 2021-10-24 2-4PM (wrong) +event project meeting /at 2021/10/24 2PM-4PM (correct) to do join sports club to do borrow book list From 6a2ede3f7dc86198edc5674f681b6d349b64124c Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 23 Oct 2021 16:11:53 +0800 Subject: [PATCH 17/32] Implemented JavaDoc for all functions --- .../Duke/exception/TimeParseException.java | 11 ++++++++++ src/main/java/Duke/parser/CMD_Deadline.java | 6 +++++- ..._Event_Enum_DAY.java => CMD_Enum_DAY.java} | 4 ++-- ..._Event_Enum_MTH.java => CMD_Enum_MTH.java} | 4 ++-- src/main/java/Duke/parser/CMD_Event.java | 18 ++++++++++++++++ src/main/java/Duke/parser/CMD_List.java | 8 +++++++ src/main/java/Duke/parser/CMD_TODO.java | 8 +++++++ src/main/java/Duke/parser/Parser.java | 1 + src/main/java/Duke/storage/duke.txt | 7 +++++++ text-ui-test/input.txt | 21 +++++++------------ 10 files changed, 70 insertions(+), 18 deletions(-) rename src/main/java/Duke/parser/{CMD_Event_Enum_DAY.java => CMD_Enum_DAY.java} (80%) rename src/main/java/Duke/parser/{CMD_Event_Enum_MTH.java => CMD_Enum_MTH.java} (85%) diff --git a/src/main/java/Duke/exception/TimeParseException.java b/src/main/java/Duke/exception/TimeParseException.java index d846841a..7514a988 100644 --- a/src/main/java/Duke/exception/TimeParseException.java +++ b/src/main/java/Duke/exception/TimeParseException.java @@ -2,6 +2,17 @@ public class TimeParseException extends DukeException{ + /** + * Thrown when error occured while parsing time + * + * Prints the following + * separator(); + * System.out.printf(" There seems to have problem with your time format [%s]\n", message); + * separator(); + * + * @param message the pre-defined message + * + */ public TimeParseException(String message) { super(message); } diff --git a/src/main/java/Duke/parser/CMD_Deadline.java b/src/main/java/Duke/parser/CMD_Deadline.java index e7c732a5..a64722f5 100644 --- a/src/main/java/Duke/parser/CMD_Deadline.java +++ b/src/main/java/Duke/parser/CMD_Deadline.java @@ -90,7 +90,11 @@ private LocalDateTime timeParse(String str) throws TimeParseException{ return localDate; } - + /** + * Transforms time to 24hour format + * @param t string such as [1AM] [10PM] + * @return integer time such as 1, 22 + */ private int get24HrFormat(String t){ int timeVal; if(t.contains("AM")){ diff --git a/src/main/java/Duke/parser/CMD_Event_Enum_DAY.java b/src/main/java/Duke/parser/CMD_Enum_DAY.java similarity index 80% rename from src/main/java/Duke/parser/CMD_Event_Enum_DAY.java rename to src/main/java/Duke/parser/CMD_Enum_DAY.java index 8a50e87c..5ff1b307 100644 --- a/src/main/java/Duke/parser/CMD_Event_Enum_DAY.java +++ b/src/main/java/Duke/parser/CMD_Enum_DAY.java @@ -1,6 +1,6 @@ package Duke.parser; -public enum CMD_Event_Enum_DAY { +public enum CMD_Enum_DAY { MON("Mon"), TUE("Tue"), WED("Wed"), @@ -8,7 +8,7 @@ public enum CMD_Event_Enum_DAY { FRI("Fri") ; - CMD_Event_Enum_DAY(String day) { + CMD_Enum_DAY(String day) { this.day = day; } diff --git a/src/main/java/Duke/parser/CMD_Event_Enum_MTH.java b/src/main/java/Duke/parser/CMD_Enum_MTH.java similarity index 85% rename from src/main/java/Duke/parser/CMD_Event_Enum_MTH.java rename to src/main/java/Duke/parser/CMD_Enum_MTH.java index 1c2d2bc4..26a5abba 100644 --- a/src/main/java/Duke/parser/CMD_Event_Enum_MTH.java +++ b/src/main/java/Duke/parser/CMD_Enum_MTH.java @@ -1,6 +1,6 @@ package Duke.parser; -public enum CMD_Event_Enum_MTH { +public enum CMD_Enum_MTH { JAN("Jan"), FEB("Feb"), MAR("Mar"), @@ -15,7 +15,7 @@ public enum CMD_Event_Enum_MTH { DEC("Dec") ; - CMD_Event_Enum_MTH(String month) { + CMD_Enum_MTH(String month) { this.month = month; } diff --git a/src/main/java/Duke/parser/CMD_Event.java b/src/main/java/Duke/parser/CMD_Event.java index 28f0f688..0c40ad5a 100644 --- a/src/main/java/Duke/parser/CMD_Event.java +++ b/src/main/java/Duke/parser/CMD_Event.java @@ -23,6 +23,14 @@ public CMD_Event(String command) { } + /** + * Function Overloading for execution of event command + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storage storage object + * + */ @Override public boolean execute(TaskList taskList, UI ui, Storage storage) { boolean success = true; @@ -80,6 +88,11 @@ private LocalDate dateParse(String str) throws TimeParseException{ } + /** + * Transforms time to 24hour format + * @param t string such as [1AM] [10PM] + * @return integer time such as 1, 22 + */ private int get24HrFormat(String t){ int timeVal; if(t.contains("AM")){ @@ -92,6 +105,11 @@ private int get24HrFormat(String t){ return timeVal; } + /** + * converts time in integer to LocalTime + * @param t the integer time [1] [22] + * @return time in LocalTime [01:00:00] [22:00:00] + */ private LocalTime timeParse(int t){ return LocalTime.of(t,0,0); } diff --git a/src/main/java/Duke/parser/CMD_List.java b/src/main/java/Duke/parser/CMD_List.java index dae3519c..5660883a 100644 --- a/src/main/java/Duke/parser/CMD_List.java +++ b/src/main/java/Duke/parser/CMD_List.java @@ -13,6 +13,14 @@ public CMD_List(String command) { super(command); } + /** + * Function Overloading for execution of list command + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storage storage object + * + */ @Override public boolean execute(TaskList taskList, UI ui, Storage storage) { taskList.printTaskList(); diff --git a/src/main/java/Duke/parser/CMD_TODO.java b/src/main/java/Duke/parser/CMD_TODO.java index ef7bf063..54d97d0f 100644 --- a/src/main/java/Duke/parser/CMD_TODO.java +++ b/src/main/java/Duke/parser/CMD_TODO.java @@ -16,6 +16,14 @@ public CMD_TODO(String command) { super(command); } + /** + * Function Overloading for execution of TO DO command + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storage storage object + * + */ @Override public boolean execute(TaskList taskList, UI ui, Storage storage) { boolean success = true; diff --git a/src/main/java/Duke/parser/Parser.java b/src/main/java/Duke/parser/Parser.java index 9116673e..09b1a11b 100644 --- a/src/main/java/Duke/parser/Parser.java +++ b/src/main/java/Duke/parser/Parser.java @@ -1,4 +1,5 @@ package Duke.parser; + public class Parser { /** diff --git a/src/main/java/Duke/storage/duke.txt b/src/main/java/Duke/storage/duke.txt index e69de29b..6d845d4a 100644 --- a/src/main/java/Duke/storage/duke.txt +++ b/src/main/java/Duke/storage/duke.txt @@ -0,0 +1,7 @@ +T | 0 | read book +D | 0 | return book | 2021-10-24 | 22:00 +D | 0 | return book | 2021-10-24 | 22:00 +E | 0 | project meeting | 2021-10-24 | 14:00 | 16:00 +D | 0 | return book | 2021-11-05 | 22:00 +E | 0 | project meeting | 2022-07-30 | 14:00 | 16:00 +E | 0 | new year | 2022-02-02 | 00:00 | 12:00 diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 132207f9..d05dcd6b 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,22 +1,17 @@ -blah -to do -event -deadline -list -read book to do read book deadline return book -deadline return book /by 2021-10-24 10PM (wrong) -deadline return book /by 2021/10/24 10PM (correct) +deadline return book /by 2021-10-24 10PM +deadline return book /by 2021/10/24 10PM event project meeting -event project meeting /at 2021-10-24 2-4PM (wrong) -event project meeting /at 2021/10/24 2PM-4PM (correct) +event project meeting /at 2021-10-24 2-4PM +event project meeting /at 2021/10/24 2PM-4PM to do join sports club to do borrow book list -deadline return book /by Sunday -event project meeting /at Mon 2-4pm -deadline do homework /by no idea :-p +deadline return book /by 2021/11/5 10PM +event project meeting /at 2022/7/30 2PM-4PM +event new year /at 2022/2/2 0AM-12AM +save list done 1 done 2 From 033a203432182f95f005dc475950bd949138fd40 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 23 Oct 2021 16:35:13 +0800 Subject: [PATCH 18/32] Added Gradle Support[minimal] --- .../java/Duke/exception/EmptyDescriptionException.java | 2 +- src/main/java/Duke/ui/ReturnMessages.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/Duke/exception/EmptyDescriptionException.java b/src/main/java/Duke/exception/EmptyDescriptionException.java index 602cc003..b07a81d6 100644 --- a/src/main/java/Duke/exception/EmptyDescriptionException.java +++ b/src/main/java/Duke/exception/EmptyDescriptionException.java @@ -7,7 +7,7 @@ public class EmptyDescriptionException extends DukeException{ * * Prints the following * printer.separator(); - * System.out.printf(" ☹ OOPS!!! The description of a %s cannot be empty.\n", taskType); + * System.out.printf(" OOPS!!! The description of a %s cannot be empty.\n", taskType); * printer.separator(); * * @param message the pre-defined message diff --git a/src/main/java/Duke/ui/ReturnMessages.java b/src/main/java/Duke/ui/ReturnMessages.java index 0d678804..b53755cf 100644 --- a/src/main/java/Duke/ui/ReturnMessages.java +++ b/src/main/java/Duke/ui/ReturnMessages.java @@ -32,13 +32,12 @@ public void welcomeFeedback(){ System.out.println(" Hello! I'm Duke"); System.out.println(" Here are my functionality...."); System.out.println(" Check Existing Tasks: list"); - System.out.println(" Mark a Task done： done {taskID}"); + System.out.println(" Mark a Task done: done {taskID}"); System.out.println(" Delete a Task: delete {taskID}"); System.out.println(" Add a Todo Task: todo read book"); System.out.println(" Save Current State: save"); - System.out.println(" Add a Event Task: event xxxx /at {date by YYYY/MM/DD} {startTime}-{endTime}PM"); - System.out.println(" Add a Deadline Task: deadline xxxx /by {date by YYYY/MM/DD}"); - System.out.println(" Add a Deadline Task: deadline XXXX /by {date by YYYY/MM/DD} {Time}PM"); + System.out.println(" Add a Event Task: event xxxx /at {date by YYYY/MM/DD} {startTime}AM/PM-{endTime}AM/PM"); + System.out.println(" Add a Deadline Task: deadline XXXX /by {date by YYYY/MM/DD} {Time}AM/PM"); System.out.println(" End the program: bye"); separator(); } From 7ce30b62587da31230d462e6805cdea6f1a9e594 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 23 Oct 2021 18:11:52 +0800 Subject: [PATCH 19/32] Added Gradle Support[Recommended] - run tests with gradlew test Added JUnit Testing --- build.gradle | 2 +- src/main/java/Duke/storage/Storage.java | 8 ++++ src/main/java/Duke/storage/duke.txt | 4 ++ src/main/java/Duke/task/Deadline.java | 2 +- .../java/Duke/StorageTests/StorageTest.java | 40 +++++++++++++++++++ .../java/Duke/TaskTests/DeadlineTest.java | 19 +++++++++ src/test/java/Duke/TaskTests/EventTest.java | 18 +++++++++ .../java/Duke/TaskTests/TaskListTest.java | 31 ++++++++++++++ src/test/java/Duke/TaskTests/ToDosTest.java | 15 +++++++ 9 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 src/test/java/Duke/StorageTests/StorageTest.java create mode 100644 src/test/java/Duke/TaskTests/DeadlineTest.java create mode 100644 src/test/java/Duke/TaskTests/EventTest.java create mode 100644 src/test/java/Duke/TaskTests/TaskListTest.java create mode 100644 src/test/java/Duke/TaskTests/ToDosTest.java diff --git a/build.gradle b/build.gradle index 20c0521c..73b1f710 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ test { } application { - mainClassName = "seedu.duke.Duke" + mainClassName = "Duke.Duke" } shadowJar { diff --git a/src/main/java/Duke/storage/Storage.java b/src/main/java/Duke/storage/Storage.java index 7cfb0c1c..6badb4f8 100644 --- a/src/main/java/Duke/storage/Storage.java +++ b/src/main/java/Duke/storage/Storage.java @@ -17,6 +17,13 @@ public class Storage { private static ReturnMessages returnMessage = new ReturnMessages(); Scanner scanner; + /** + * Check current file existence status + * @return true or false + */ + public boolean existence(){ + return isExist; + } /** * Constructor for Storage * @@ -71,6 +78,7 @@ public void createFile() throws IOException { this.isExist = true; System.out.println("File exists"); } + this.isExist = true; returnMessage.createSuccessFeedback(file.getName()); } diff --git a/src/main/java/Duke/storage/duke.txt b/src/main/java/Duke/storage/duke.txt index 6d845d4a..4b791ce0 100644 --- a/src/main/java/Duke/storage/duke.txt +++ b/src/main/java/Duke/storage/duke.txt @@ -5,3 +5,7 @@ E | 0 | project meeting | 2021-10-24 | 14:00 | 16:00 D | 0 | return book | 2021-11-05 | 22:00 E | 0 | project meeting | 2022-07-30 | 14:00 | 16:00 E | 0 | new year | 2022-02-02 | 00:00 | 12:00 +D | 0 | return book | 2020-10-29 | 03:00 +D | 0 | return book | 2021-12-25 | 16:00 +T | 0 | eat +E | 0 | Finish Homework | 2021-12-25 | 16:00 | 18:00 diff --git a/src/main/java/Duke/task/Deadline.java b/src/main/java/Duke/task/Deadline.java index 540bb225..f51bcac5 100644 --- a/src/main/java/Duke/task/Deadline.java +++ b/src/main/java/Duke/task/Deadline.java @@ -22,7 +22,7 @@ public Deadline(String description, LocalDateTime by) { */ @Override public String toString() { - return "[D]" + super.toString() + " (by: " + by.toLocalDate().toString() + "["+ by.toLocalDate().getDayOfWeek() +"] "+ by.toLocalTime().toString()+")"; + return "[D]" + super.toString() + "(by: " + by.toLocalDate().toString() + "["+ by.toLocalDate().getDayOfWeek() +"] "+ by.toLocalTime().toString()+")"; } /** diff --git a/src/test/java/Duke/StorageTests/StorageTest.java b/src/test/java/Duke/StorageTests/StorageTest.java new file mode 100644 index 00000000..3a053872 --- /dev/null +++ b/src/test/java/Duke/StorageTests/StorageTest.java @@ -0,0 +1,40 @@ +package Duke.StorageTests; + +import Duke.storage.Storage; +import Duke.task.Deadline; +import Duke.task.Events; +import Duke.task.TaskList; +import Duke.task.ToDos; +import org.junit.jupiter.api.Test; + +import java.io.File; +import java.io.IOException; +import java.time.LocalDateTime; + +import static org.junit.jupiter.api.Assertions.*; + +public class StorageTest { + @Test + public void storage() throws IOException { + LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); + ToDos toDos = new ToDos("eat", "eat"); + Deadline deadline = new Deadline("return book", sample); + Events event = new Events("Finish Homework",sample.toLocalDate(),sample.toLocalTime(),sample.toLocalTime().plusHours(2)); + TaskList tasks = new TaskList(); + tasks.addTask(toDos); + tasks.addTask(deadline); + tasks.addTask(event); + + Storage store = new Storage("Testing.txt"); + assertFalse(store.existence()); + store.createFile(); + store.save(tasks); + assertTrue(store.existence()); + + Storage store2 = new Storage("Testing.txt"); + assertEquals(tasks.getLastTask().toString(), store2.load().getLastTask().toString()); + + File cleanUP = new File(System.getProperty("user.dir") + "/src/main/java/Duke/storage/Testing.txt"); // create a File for the given file path + cleanUP.delete(); + } +} diff --git a/src/test/java/Duke/TaskTests/DeadlineTest.java b/src/test/java/Duke/TaskTests/DeadlineTest.java new file mode 100644 index 00000000..7d498829 --- /dev/null +++ b/src/test/java/Duke/TaskTests/DeadlineTest.java @@ -0,0 +1,19 @@ +package Duke.TaskTests; + + +import Duke.task.Deadline; +import org.junit.jupiter.api.Test; + +import java.time.LocalDateTime; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class DeadlineTest { + @Test + public void deadline(){ + LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); + Deadline deadline = new Deadline("return book", sample); + assertEquals("[D][ ] return book(by: 2021-12-25[SATURDAY] 16:00)", deadline.toString()); + assertEquals("D | 0 | return book | 2021-12-25 | 16:00", deadline.encodeTask()); + } +} diff --git a/src/test/java/Duke/TaskTests/EventTest.java b/src/test/java/Duke/TaskTests/EventTest.java new file mode 100644 index 00000000..43df9308 --- /dev/null +++ b/src/test/java/Duke/TaskTests/EventTest.java @@ -0,0 +1,18 @@ +package Duke.TaskTests; + +import Duke.task.Events; +import org.junit.jupiter.api.Test; + +import java.time.LocalDateTime; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class EventTest { + @Test + public void event(){ + LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); + Events event = new Events("Finish Homework",sample.toLocalDate(),sample.toLocalTime(),sample.toLocalTime().plusHours(2)); + assertEquals("[E][ ] Finish Homework (on:2021-12-25[SATURDAY] from:16:00 to:18:00)", event.toString()); + assertEquals("E | 0 | Finish Homework | 2021-12-25 | 16:00 | 18:00", event.encodeTask()); + } +} diff --git a/src/test/java/Duke/TaskTests/TaskListTest.java b/src/test/java/Duke/TaskTests/TaskListTest.java new file mode 100644 index 00000000..7f05bc26 --- /dev/null +++ b/src/test/java/Duke/TaskTests/TaskListTest.java @@ -0,0 +1,31 @@ +package Duke.TaskTests; + +import Duke.task.Deadline; +import Duke.task.Events; +import Duke.task.TaskList; +import Duke.task.ToDos; +import org.junit.jupiter.api.Test; + +import java.time.LocalDateTime; + +import static org.junit.jupiter.api.Assertions.assertEquals; + + +public class TaskListTest { + @Test + public void TaskList(){ + LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); + ToDos toDos = new ToDos("eat", "eat"); + Deadline deadline = new Deadline("return book", sample); + Events event = new Events("Finish Homework",sample.toLocalDate(),sample.toLocalTime(),sample.toLocalTime().plusHours(2)); + TaskList tasks = new TaskList(); + tasks.addTask(toDos); + tasks.addTask(deadline); + tasks.addTask(event); + + + assertEquals(3, tasks.getListSize()); + assertEquals(event,tasks.getLastTask()); + assertEquals(toDos, tasks.getTask(0)); + } +} diff --git a/src/test/java/Duke/TaskTests/ToDosTest.java b/src/test/java/Duke/TaskTests/ToDosTest.java new file mode 100644 index 00000000..3d00085a --- /dev/null +++ b/src/test/java/Duke/TaskTests/ToDosTest.java @@ -0,0 +1,15 @@ +package Duke.TaskTests; + +import Duke.task.ToDos; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class ToDosTest { + @Test + public void todo(){ + ToDos toDos = new ToDos("eat", "eat"); + assertEquals("[T][ ] eat", toDos.toString()); + assertEquals("T | 0 | eat", toDos.encodeTask()); + } +} From 2a5ae14b0790f9dac9d98ecb017bea3967bab132 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 23 Oct 2021 18:16:04 +0800 Subject: [PATCH 20/32] Added tags for Gradle Support[Recommended] Added tags for JUnit Testing --- src/test/java/Duke/TaskTests/DeadlineTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/Duke/TaskTests/DeadlineTest.java b/src/test/java/Duke/TaskTests/DeadlineTest.java index 7d498829..9cd5dd98 100644 --- a/src/test/java/Duke/TaskTests/DeadlineTest.java +++ b/src/test/java/Duke/TaskTests/DeadlineTest.java @@ -15,5 +15,7 @@ public void deadline(){ Deadline deadline = new Deadline("return book", sample); assertEquals("[D][ ] return book(by: 2021-12-25[SATURDAY] 16:00)", deadline.toString()); assertEquals("D | 0 | return book | 2021-12-25 | 16:00", deadline.encodeTask()); + + } } From 10b717c71e85f8e6b210d0f21a1b54028bf016e2 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Wed, 27 Oct 2021 06:48:29 +0800 Subject: [PATCH 21/32] Added fixed duration tasks feature --- src/main/java/Duke/Duke.java | 2 + src/main/java/Duke/DukeTest.java | 19 ---- src/main/java/Duke/parser/CMD.java | 1 - src/main/java/Duke/parser/CMD_Enum_DAY.java | 24 ----- src/main/java/Duke/parser/CMD_Enum_MTH.java | 31 ------ src/main/java/Duke/parser/CMD_TODO.java | 23 ++++- src/main/java/Duke/parser/Command.java | 2 + src/main/java/Duke/storage/Storage.java | 3 +- .../java/Duke/storage/Storage_Unschedule.java | 97 +++++++++++++++++++ src/main/java/Duke/storage/duke.txt | 7 +- .../java/Duke/storage/task_time_records.txt | 4 + src/main/java/Duke/task/Task_Enum.java | 6 +- src/main/java/Duke/task/ToDos.java | 28 +++++- src/main/java/Duke/task/UnscheduledTask.java | 20 ++++ .../java/Duke/task/UnscheduledTaskList.java | 57 +++++++++++ src/main/java/Duke/ui/ReturnMessages.java | 2 +- .../java/Duke/StorageTests/StorageTest.java | 2 +- .../java/Duke/TaskTests/TaskListTest.java | 2 +- src/test/java/Duke/TaskTests/ToDosTest.java | 2 +- 19 files changed, 238 insertions(+), 94 deletions(-) delete mode 100644 src/main/java/Duke/DukeTest.java delete mode 100644 src/main/java/Duke/parser/CMD_Enum_DAY.java delete mode 100644 src/main/java/Duke/parser/CMD_Enum_MTH.java create mode 100644 src/main/java/Duke/storage/Storage_Unschedule.java create mode 100644 src/main/java/Duke/storage/task_time_records.txt create mode 100644 src/main/java/Duke/task/UnscheduledTask.java create mode 100644 src/main/java/Duke/task/UnscheduledTaskList.java diff --git a/src/main/java/Duke/Duke.java b/src/main/java/Duke/Duke.java index ae892c8c..ef3bb649 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/Duke/Duke.java @@ -4,7 +4,9 @@ import Duke.parser.Command; import Duke.parser.Parser; import Duke.storage.Storage; +import Duke.storage.Storage_Unschedule; import Duke.task.TaskList; +import Duke.task.UnscheduledTaskList; import Duke.ui.UI; diff --git a/src/main/java/Duke/DukeTest.java b/src/main/java/Duke/DukeTest.java deleted file mode 100644 index 1e785403..00000000 --- a/src/main/java/Duke/DukeTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package Duke; - -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; - - -public class DukeTest { - /*public static void main(String[] args) throws IOException { - System.out.println(System.getProperty("user.dir")); - String fileName = "duke.txt"; - File file = new File(System.getProperty("user.dir") + "/src/main/java/Duke.Storage/"+fileName); - System.out.println(file.exists()); - } - */ - public static void main(String[] args) { - System.out.println(LocalDate.parse("20210909", DateTimeFormatter.BASIC_ISO_DATE)); - } - -} diff --git a/src/main/java/Duke/parser/CMD.java b/src/main/java/Duke/parser/CMD.java index 08126cf4..2af344e2 100644 --- a/src/main/java/Duke/parser/CMD.java +++ b/src/main/java/Duke/parser/CMD.java @@ -70,7 +70,6 @@ public CMD() { public boolean execute(TaskList taskList, UI ui, Storage storage){ return false; } - /** * Replies a done/add command * diff --git a/src/main/java/Duke/parser/CMD_Enum_DAY.java b/src/main/java/Duke/parser/CMD_Enum_DAY.java deleted file mode 100644 index 5ff1b307..00000000 --- a/src/main/java/Duke/parser/CMD_Enum_DAY.java +++ /dev/null @@ -1,24 +0,0 @@ -package Duke.parser; - -public enum CMD_Enum_DAY { - MON("Mon"), - TUE("Tue"), - WED("Wed"), - THUR("Thur"), - FRI("Fri") - ; - - CMD_Enum_DAY(String day) { - this.day = day; - } - - private String day; - - public String getDay() { - return day; - } - - public void setDay(String day) { - this.day = day; - } -} diff --git a/src/main/java/Duke/parser/CMD_Enum_MTH.java b/src/main/java/Duke/parser/CMD_Enum_MTH.java deleted file mode 100644 index 26a5abba..00000000 --- a/src/main/java/Duke/parser/CMD_Enum_MTH.java +++ /dev/null @@ -1,31 +0,0 @@ -package Duke.parser; - -public enum CMD_Enum_MTH { - JAN("Jan"), - FEB("Feb"), - MAR("Mar"), - APR("Apr"), - MAY("May"), - JUN("Jun"), - JUL("Jul"), - AUG("Aug"), - SEP("Sep"), - OCT("Oct"), - NOV("Nov"), - DEC("Dec") - ; - - CMD_Enum_MTH(String month) { - this.month = month; - } - - private String month; - - public String getMth() { - return month; - } - - public void setMth(String month) { - this.month = month; - } -} diff --git a/src/main/java/Duke/parser/CMD_TODO.java b/src/main/java/Duke/parser/CMD_TODO.java index 54d97d0f..efe17601 100644 --- a/src/main/java/Duke/parser/CMD_TODO.java +++ b/src/main/java/Duke/parser/CMD_TODO.java @@ -2,12 +2,13 @@ import Duke.exception.UnknownSyntaxException; import Duke.storage.Storage; -import Duke.task.Task; -import Duke.task.TaskList; -import Duke.task.ToDos; +import Duke.storage.Storage_Unschedule; +import Duke.task.*; import Duke.ui.UI; public class CMD_TODO extends CMD { + private static Storage_Unschedule unscheduledRecordLoad; + private static UnscheduledTaskList unscheduledRecord; /** * TO DO Command Constructor * @@ -26,11 +27,23 @@ public CMD_TODO(String command) { */ @Override public boolean execute(TaskList taskList, UI ui, Storage storage) { - boolean success = true; + boolean success; try { if (!CMD_Enum.TODO.getName().equals(super.keyword)) throw new UnknownSyntaxException(super.keyword); - Task task = new ToDos(super.detail, super.detail); + unscheduledRecordLoad = new Storage_Unschedule(); + unscheduledRecord = new UnscheduledTaskList(unscheduledRecordLoad.load()); + System.out.println("detail: "+super.detail); + int duration = unscheduledRecord.findRecord(super.detail); + Task task; + System.out.println("Duration: "+duration); + if (duration > 0) { + task = new ToDos(super.detail, duration); + } + else{ + task = new ToDos(super.detail); + } taskList.addTask(task); + success = true; } catch (IndexOutOfBoundsException e) { success = false; throw new UnknownSyntaxException(super.keyword); diff --git a/src/main/java/Duke/parser/Command.java b/src/main/java/Duke/parser/Command.java index e8e5018e..610c39d5 100644 --- a/src/main/java/Duke/parser/Command.java +++ b/src/main/java/Duke/parser/Command.java @@ -2,6 +2,7 @@ import Duke.storage.Storage; import Duke.task.TaskList; +import Duke.task.UnscheduledTaskList; import Duke.ui.UI; public class Command { @@ -14,6 +15,7 @@ public void execute(TaskList taskList, UI ui, Storage storage) { this.isExit = cmd.execute(taskList, ui, storage); } + public boolean isExit() { return this.isExit; diff --git a/src/main/java/Duke/storage/Storage.java b/src/main/java/Duke/storage/Storage.java index 6badb4f8..6b235b97 100644 --- a/src/main/java/Duke/storage/Storage.java +++ b/src/main/java/Duke/storage/Storage.java @@ -24,6 +24,7 @@ public class Storage { public boolean existence(){ return isExist; } + /** * Constructor for Storage * @@ -122,7 +123,7 @@ public Task decodeStr2Task(String str) { Task task = null; switch (line[0]) { case "T": - task = new ToDos(line[2], line[2]); + task = new ToDos(line[2]); break; case "D": diff --git a/src/main/java/Duke/storage/Storage_Unschedule.java b/src/main/java/Duke/storage/Storage_Unschedule.java new file mode 100644 index 00000000..7b92ba3b --- /dev/null +++ b/src/main/java/Duke/storage/Storage_Unschedule.java @@ -0,0 +1,97 @@ +package Duke.storage; + +import Duke.exception.DukeException; +import Duke.task.*; +import Duke.ui.ReturnMessages; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.Scanner; + +public class Storage_Unschedule { + + protected boolean isExist; + protected String fileName; + protected File file; + private static ReturnMessages returnMessage = new ReturnMessages(); + Scanner scanner; + + + /** + * Constructor for Storage_Unscheduled + * + */ + public Storage_Unschedule() { + //this.fileName = fileName; + this.file = new File(System.getProperty("user.dir") + "/src/main/java/Duke/storage/task_time_records.txt"); // create a File for the given file path + this.fileName = file.getName(); + } + + /** + * load info from hard disk + * @return task list from hard disk + */ + public UnscheduledTaskList load() throws DukeException { + UnscheduledTaskList unscheduledRecords = new UnscheduledTaskList(); + if (file.exists()) { + returnMessage.loadingFileFeedback(); + try (BufferedReader br = new BufferedReader(new FileReader(file))) { + String line; + while ((line = br.readLine()) != null) { + // process the line + unscheduledRecords.addTask(decodeStr2Unscheduled(line)); + } + } catch (IOException e) { + //fail to parse + throw new DukeException("file parse fail"); + } + } else { + try { + createFile(); + } catch (IOException e) { + //fail to create file + throw new DukeException("create file fail"); + } + } + returnMessage.loadSuccessFeedback(); + return unscheduledRecords; + } + + + /** + * Creates File if not exist + * + * @exception IOException throws a IO Exception if file exists + * + */ + public void createFile() throws IOException { + try { + boolean create = file.createNewFile(); + } catch (IOException ioe) { + this.isExist = true; + System.out.println("File exists"); + } + this.isExist = true; + returnMessage.createSuccessFeedback(file.getName()); + } + + + /** + * decode the str to unscheduled task records with description and duration + * @param str the full string per line + * @return created task object + */ + public UnscheduledTask decodeStr2Unscheduled(String str) { + String[] line = str.split(" \\| "); + UnscheduledTask unscheduledRecord; + System.out.println("line[0]: "+line[0].stripTrailing()); + System.out.println("line[1]: "+line[1].stripLeading()); + unscheduledRecord = new UnscheduledTask(line[0], Integer.parseInt(line[1])); + return unscheduledRecord; + } +} diff --git a/src/main/java/Duke/storage/duke.txt b/src/main/java/Duke/storage/duke.txt index 4b791ce0..fffd1d55 100644 --- a/src/main/java/Duke/storage/duke.txt +++ b/src/main/java/Duke/storage/duke.txt @@ -1,4 +1,4 @@ -T | 0 | read book +T | 0 | read book | 0 D | 0 | return book | 2021-10-24 | 22:00 D | 0 | return book | 2021-10-24 | 22:00 E | 0 | project meeting | 2021-10-24 | 14:00 | 16:00 @@ -7,5 +7,8 @@ E | 0 | project meeting | 2022-07-30 | 14:00 | 16:00 E | 0 | new year | 2022-02-02 | 00:00 | 12:00 D | 0 | return book | 2020-10-29 | 03:00 D | 0 | return book | 2021-12-25 | 16:00 -T | 0 | eat +T | 0 | eat | 0 E | 0 | Finish Homework | 2021-12-25 | 16:00 | 18:00 +E | 0 | new year | 2022-02-02 | 00:00 | 12:00 +T | 0 | read book | 1 +T | 0 | study book | 0 diff --git a/src/main/java/Duke/storage/task_time_records.txt b/src/main/java/Duke/storage/task_time_records.txt new file mode 100644 index 00000000..71285f2f --- /dev/null +++ b/src/main/java/Duke/storage/task_time_records.txt @@ -0,0 +1,4 @@ +read sales report | 2 +read book | 1 +do homework | 4 +submit claims | 1 diff --git a/src/main/java/Duke/task/Task_Enum.java b/src/main/java/Duke/task/Task_Enum.java index da8223bc..1051b98c 100644 --- a/src/main/java/Duke/task/Task_Enum.java +++ b/src/main/java/Duke/task/Task_Enum.java @@ -7,7 +7,7 @@ * 3. EVENT */ public enum Task_Enum { - TODO, //0 - DEADLINE, //1 - EVENT, //2 + TODO, + DEADLINE, + EVENT, } diff --git a/src/main/java/Duke/task/ToDos.java b/src/main/java/Duke/task/ToDos.java index ecf62986..b645874a 100644 --- a/src/main/java/Duke/task/ToDos.java +++ b/src/main/java/Duke/task/ToDos.java @@ -1,15 +1,32 @@ package Duke.task; public class ToDos extends Task { - protected String action; + protected int duration; + + /** + * To Do task constructor + * @param description - Description of To Do task + */ + public ToDos(String description) { + this(description,0); + + } /** * To Do task constructor * @param description - Description of To Do task + * @param duration - unscheduled fixed duration */ - public ToDos(String description, String action) { + public ToDos(String description, int duration) { super(description); - this.action = action; + this.duration = duration; + } + public int getDuration(){ + return this.duration; + } + + public void setDuration(int duration){ + this.duration = duration; } /** @@ -17,6 +34,9 @@ public ToDos(String description, String action) { */ @Override public String toString() { + if(this.duration>0){ + return "[T]" + super.toString()+ " (requires: " + duration + " Hour)"; + } return "[T]" + super.toString(); } @@ -26,6 +46,6 @@ public String toString() { */ @Override public String encodeTask() { - return "T" + super.encodeTask() ; + return "T" + super.encodeTask() + " | " + duration; } } diff --git a/src/main/java/Duke/task/UnscheduledTask.java b/src/main/java/Duke/task/UnscheduledTask.java new file mode 100644 index 00000000..460b0033 --- /dev/null +++ b/src/main/java/Duke/task/UnscheduledTask.java @@ -0,0 +1,20 @@ +package Duke.task; + +public class UnscheduledTask { + protected String description; + protected int duration; + + public UnscheduledTask(String desc, int duration){ + this.description = desc; + this.duration = duration; + } + + public String getDesc(){ + return this.description; + } + + public int getDuration(){ + return this.duration; + } + +} diff --git a/src/main/java/Duke/task/UnscheduledTaskList.java b/src/main/java/Duke/task/UnscheduledTaskList.java new file mode 100644 index 00000000..3a6da465 --- /dev/null +++ b/src/main/java/Duke/task/UnscheduledTaskList.java @@ -0,0 +1,57 @@ +package Duke.task; + +import java.util.ArrayList; + +public class UnscheduledTaskList { + + protected int listSize; + private ArrayList unscheduleTaskList; + + + /** + * Constructor for Unscheduled Task Duration List + * + */ + public UnscheduledTaskList() { + unscheduleTaskList = new ArrayList<>(); + } + + /** + * Task list constructor with tasks within + * @param load - the task list that already contained task. + */ + public UnscheduledTaskList(UnscheduledTaskList load) { + this.listSize = load.listSize; + this.unscheduleTaskList = load.unscheduleTaskList; + } + + /** + * Gets the list size. + * @return - list size in integer + */ + public int getListSize(){ + return this.listSize; + } + + + /** + * Adds a unscheduled record to unscheduled list + * @param task - the full task information + */ + public void addTask(UnscheduledTask task){ + this.unscheduleTaskList.add(task); + this.listSize++; + } + + public int findRecord(String description){ + for(UnscheduledTask ut : unscheduleTaskList){ + System.out.println("input Desc: "+description); + System.out.println("saved Desc: "+ut.getDesc()); + if(description.equals(ut.getDesc())){ + System.out.println("matched"); + return ut.getDuration(); + } + } + return 0; + } +} diff --git a/src/main/java/Duke/ui/ReturnMessages.java b/src/main/java/Duke/ui/ReturnMessages.java index b53755cf..53c1f55d 100644 --- a/src/main/java/Duke/ui/ReturnMessages.java +++ b/src/main/java/Duke/ui/ReturnMessages.java @@ -34,7 +34,7 @@ public void welcomeFeedback(){ System.out.println(" Check Existing Tasks: list"); System.out.println(" Mark a Task done: done {taskID}"); System.out.println(" Delete a Task: delete {taskID}"); - System.out.println(" Add a Todo Task: todo read book"); + System.out.println(" Add a Todo Task: todo {action}"); System.out.println(" Save Current State: save"); System.out.println(" Add a Event Task: event xxxx /at {date by YYYY/MM/DD} {startTime}AM/PM-{endTime}AM/PM"); System.out.println(" Add a Deadline Task: deadline XXXX /by {date by YYYY/MM/DD} {Time}AM/PM"); diff --git a/src/test/java/Duke/StorageTests/StorageTest.java b/src/test/java/Duke/StorageTests/StorageTest.java index 3a053872..649f0366 100644 --- a/src/test/java/Duke/StorageTests/StorageTest.java +++ b/src/test/java/Duke/StorageTests/StorageTest.java @@ -17,7 +17,7 @@ public class StorageTest { @Test public void storage() throws IOException { LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); - ToDos toDos = new ToDos("eat", "eat"); + ToDos toDos = new ToDos("eat"); Deadline deadline = new Deadline("return book", sample); Events event = new Events("Finish Homework",sample.toLocalDate(),sample.toLocalTime(),sample.toLocalTime().plusHours(2)); TaskList tasks = new TaskList(); diff --git a/src/test/java/Duke/TaskTests/TaskListTest.java b/src/test/java/Duke/TaskTests/TaskListTest.java index 7f05bc26..39f7049a 100644 --- a/src/test/java/Duke/TaskTests/TaskListTest.java +++ b/src/test/java/Duke/TaskTests/TaskListTest.java @@ -15,7 +15,7 @@ public class TaskListTest { @Test public void TaskList(){ LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); - ToDos toDos = new ToDos("eat", "eat"); + ToDos toDos = new ToDos("eat"); Deadline deadline = new Deadline("return book", sample); Events event = new Events("Finish Homework",sample.toLocalDate(),sample.toLocalTime(),sample.toLocalTime().plusHours(2)); TaskList tasks = new TaskList(); diff --git a/src/test/java/Duke/TaskTests/ToDosTest.java b/src/test/java/Duke/TaskTests/ToDosTest.java index 3d00085a..21865ff1 100644 --- a/src/test/java/Duke/TaskTests/ToDosTest.java +++ b/src/test/java/Duke/TaskTests/ToDosTest.java @@ -8,7 +8,7 @@ public class ToDosTest { @Test public void todo(){ - ToDos toDos = new ToDos("eat", "eat"); + ToDos toDos = new ToDos("eat"); assertEquals("[T][ ] eat", toDos.toString()); assertEquals("T | 0 | eat", toDos.encodeTask()); } From 4eed24c1441a4f3675bcd204c4499922d4f51df6 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Wed, 27 Oct 2021 07:53:53 +0800 Subject: [PATCH 22/32] Added Level-9 Find --- src/main/java/Duke/parser/CMD.java | 2 +- src/main/java/Duke/parser/CMD_Enum.java | 3 +- src/main/java/Duke/parser/CMD_Event.java | 2 +- src/main/java/Duke/parser/CMD_Find.java | 41 +++++++++++++++++++ src/main/java/Duke/parser/Parser.java | 2 + .../java/Duke/storage/Storage_Unschedule.java | 4 +- src/main/java/Duke/storage/duke.txt | 2 +- src/main/java/Duke/task/TaskList.java | 22 ++++++++++ 8 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 src/main/java/Duke/parser/CMD_Find.java diff --git a/src/main/java/Duke/parser/CMD.java b/src/main/java/Duke/parser/CMD.java index 2af344e2..91f05e36 100644 --- a/src/main/java/Duke/parser/CMD.java +++ b/src/main/java/Duke/parser/CMD.java @@ -39,7 +39,7 @@ public class CMD { */ public CMD(String command) { this.fullCommand = command; - if(command.contains(CMD_Enum.TODO.getName()) || command.contains(CMD_Enum.DEADLINE.getName()) || command.contains(CMD_Enum.EVENT.getName())){ + if(command.contains(CMD_Enum.TODO.getName()) || command.contains(CMD_Enum.DEADLINE.getName()) || command.contains(CMD_Enum.EVENT.getName()) || command.contains(CMD_Enum.FIND.getName())){ try { String[] toWords = command.split(" ", 2); this.keyword = toWords[0]; diff --git a/src/main/java/Duke/parser/CMD_Enum.java b/src/main/java/Duke/parser/CMD_Enum.java index fca4d3fc..9128b672 100644 --- a/src/main/java/Duke/parser/CMD_Enum.java +++ b/src/main/java/Duke/parser/CMD_Enum.java @@ -8,7 +8,8 @@ public enum CMD_Enum { SAVE("save"), TODO("todo"), EVENT("event"), - DEADLINE("deadline") + DEADLINE("deadline"), + FIND("find") ; /** * Eunm class for Command Constructor diff --git a/src/main/java/Duke/parser/CMD_Event.java b/src/main/java/Duke/parser/CMD_Event.java index 0c40ad5a..a6937d82 100644 --- a/src/main/java/Duke/parser/CMD_Event.java +++ b/src/main/java/Duke/parser/CMD_Event.java @@ -36,7 +36,7 @@ public boolean execute(TaskList taskList, UI ui, Storage storage) { boolean success = true; try { if (!CMD_Enum.EVENT.getName().equals(super.keyword)) throw new UnknownSyntaxException(super.keyword); - String[] dt = detail.split("/at", 2); + String[] dt = super.detail.split("/at", 2); String desc = dt[0]; String dateTime = dt[1].substring(1); LocalDate date = dateParse(dateTime); diff --git a/src/main/java/Duke/parser/CMD_Find.java b/src/main/java/Duke/parser/CMD_Find.java new file mode 100644 index 00000000..b7206548 --- /dev/null +++ b/src/main/java/Duke/parser/CMD_Find.java @@ -0,0 +1,41 @@ +package Duke.parser; + +import Duke.exception.TimeManagementException; +import Duke.exception.UnknownSyntaxException; +import Duke.storage.Storage; +import Duke.task.Events; +import Duke.task.Task; +import Duke.task.TaskList; +import Duke.ui.UI; + +import java.time.LocalDate; + +public class CMD_Find extends CMD{ + /** + * Find Command Constructor + * + */ + public CMD_Find(String command) { + super(command); + } + + /** + * Function Overloading for execution of Done command + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storage storage object + * + */ + @Override + public boolean execute(TaskList taskList, UI ui, Storage storage) { + try{ + System.out.println("detail: " +super.detail); + taskList.printFoundTaskList(super.detail); + } + catch(Exception e){ + System.out.println(e.getMessage()); + } + return false; + } +} diff --git a/src/main/java/Duke/parser/Parser.java b/src/main/java/Duke/parser/Parser.java index 09b1a11b..c9e659c2 100644 --- a/src/main/java/Duke/parser/Parser.java +++ b/src/main/java/Duke/parser/Parser.java @@ -24,6 +24,8 @@ public static Command parse(String fullCommand) { command.setCmd(new CMD_Event(fullCommand)); } else if (fullCommand.contains(CMD_Enum.DEADLINE.getName())) { command.setCmd(new CMD_Deadline(fullCommand)); + } else if(fullCommand.contains(CMD_Enum.FIND.getName())) { + command.setCmd(new CMD_Find(fullCommand)); } else { command.setCmd(new CMD_Error(fullCommand)); } diff --git a/src/main/java/Duke/storage/Storage_Unschedule.java b/src/main/java/Duke/storage/Storage_Unschedule.java index 7b92ba3b..8dc3317e 100644 --- a/src/main/java/Duke/storage/Storage_Unschedule.java +++ b/src/main/java/Duke/storage/Storage_Unschedule.java @@ -39,7 +39,7 @@ public Storage_Unschedule() { public UnscheduledTaskList load() throws DukeException { UnscheduledTaskList unscheduledRecords = new UnscheduledTaskList(); if (file.exists()) { - returnMessage.loadingFileFeedback(); + //returnMessage.loadingFileFeedback(); try (BufferedReader br = new BufferedReader(new FileReader(file))) { String line; while ((line = br.readLine()) != null) { @@ -58,7 +58,7 @@ public UnscheduledTaskList load() throws DukeException { throw new DukeException("create file fail"); } } - returnMessage.loadSuccessFeedback(); + //returnMessage.loadSuccessFeedback(); return unscheduledRecords; } diff --git a/src/main/java/Duke/storage/duke.txt b/src/main/java/Duke/storage/duke.txt index fffd1d55..b76a2431 100644 --- a/src/main/java/Duke/storage/duke.txt +++ b/src/main/java/Duke/storage/duke.txt @@ -10,5 +10,5 @@ D | 0 | return book | 2021-12-25 | 16:00 T | 0 | eat | 0 E | 0 | Finish Homework | 2021-12-25 | 16:00 | 18:00 E | 0 | new year | 2022-02-02 | 00:00 | 12:00 -T | 0 | read book | 1 +T | 0 | read book | 0 T | 0 | study book | 0 diff --git a/src/main/java/Duke/task/TaskList.java b/src/main/java/Duke/task/TaskList.java index 336e85e4..a6f66c44 100644 --- a/src/main/java/Duke/task/TaskList.java +++ b/src/main/java/Duke/task/TaskList.java @@ -112,4 +112,26 @@ public void printTaskList() throws EmptyTaskListException { public ArrayList getTaskList() { return taskList; } + + + /** + * Finds tasks containing specific keyword + * @param keyword - the keyword to find + * @throws EmptyTaskListException - thrown if task list is empty + */ + public void printFoundTaskList(String keyword) throws EmptyTaskListException { + printer.separator(); + if(this.listSize == 0){ + throw new EmptyTaskListException("empty task"); + } + int numbering = 1; + System.out.println(" Here are the matching tasks in your list:"); + for(Task t : getTaskList()){ + if(t.getTaskInfo().contains(keyword)){ + System.out.println(" "+numbering+"."+t.toString()); + } + numbering++; + } + printer.separator(); + } } From b1817aaa3120d56e2776dbd36bdbf12c156ee018 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Fri, 29 Oct 2021 01:23:40 +0800 Subject: [PATCH 23/32] Coding Standard Improvement --- README.md | 4 +- .../exception/EmptyDescriptionException.java | 20 --- .../exception/EmptyTaskListException.java | 21 --- .../java/Duke/exception/SavingException.java | 19 --- .../Duke/exception/TaskNotFoundException.java | 19 --- .../exception/TimeManagementException.java | 16 --- .../Duke/exception/TimeParseException.java | 19 --- .../exception/UnknownSyntaxException.java | 18 --- src/main/java/Duke/parser/CMD.java | 106 --------------- src/main/java/Duke/parser/CMD_Add.java | 11 -- src/main/java/Duke/parser/CMD_Bye.java | 29 ---- src/main/java/Duke/parser/CMD_Deadline.java | 109 --------------- src/main/java/Duke/parser/CMD_Delete.java | 29 ---- src/main/java/Duke/parser/CMD_Done.java | 29 ---- src/main/java/Duke/parser/CMD_Error.java | 13 -- src/main/java/Duke/parser/CMD_Event.java | 116 ---------------- src/main/java/Duke/parser/CMD_Find.java | 41 ------ src/main/java/Duke/parser/CMD_List.java | 29 ---- src/main/java/Duke/parser/CMD_Save.java | 29 ---- src/main/java/Duke/parser/CMD_TODO.java | 58 -------- src/main/java/Duke/parser/Command.java | 31 ----- src/main/java/Duke/parser/Parser.java | 35 ----- src/main/java/Duke/task/Task_Enum.java | 13 -- .../java/Duke/task/UnscheduledTaskList.java | 57 -------- src/main/java/{Duke => duke}/Duke.java | 26 ++-- .../exception/DukeException.java | 7 +- .../exception/EmptyDescriptionException.java | 14 ++ .../exception/EmptyTaskListException.java | 16 +++ .../java/duke/exception/SavingException.java | 14 ++ .../duke/exception/TaskNotFoundException.java | 13 ++ .../exception/TimeManagementException.java | 8 ++ .../duke/exception/TimeParseException.java | 13 ++ .../exception/UnknownSyntaxException.java | 12 ++ src/main/java/duke/parser/Command.java | 49 +++++++ src/main/java/duke/parser/CommandAdd.java | 13 ++ src/main/java/duke/parser/CommandBase.java | 104 +++++++++++++++ src/main/java/duke/parser/CommandBye.java | 30 +++++ .../java/duke/parser/CommandDeadline.java | 117 ++++++++++++++++ src/main/java/duke/parser/CommandDelete.java | 31 +++++ src/main/java/duke/parser/CommandDone.java | 30 +++++ .../parser/CommandEnums.java} | 10 +- src/main/java/duke/parser/CommandError.java | 17 +++ src/main/java/duke/parser/CommandEvent.java | 125 ++++++++++++++++++ src/main/java/duke/parser/CommandFind.java | 33 +++++ src/main/java/duke/parser/CommandList.java | 29 ++++ src/main/java/duke/parser/CommandParser.java | 35 +++++ src/main/java/duke/parser/CommandSave.java | 29 ++++ src/main/java/duke/parser/CommandTodo.java | 59 +++++++++ .../StorageFixedDurationReference.java} | 53 ++++---- .../storage/StorageTaskList.java} | 81 ++++++------ src/main/java/{Duke => duke}/storage/duke.txt | 4 +- .../storage/fixedDurationTask.txt} | 0 .../java/{Duke => duke}/task/Deadline.java | 17 +-- src/main/java/{Duke => duke}/task/Events.java | 24 ++-- .../task/FixedDurationTask.java} | 12 +- .../java/duke/task/FixedDurationTaskList.java | 60 +++++++++ src/main/java/{Duke => duke}/task/Task.java | 31 +++-- .../java/{Duke => duke}/task/TaskList.java | 82 ++++++------ src/main/java/duke/task/Task_Enum.java | 8 ++ src/main/java/{Duke => duke}/task/ToDos.java | 23 ++-- .../{Duke => duke}/ui/ReturnMessages.java | 122 ++++++++++------- src/main/java/{Duke => duke}/ui/UI.java | 31 +++-- .../StorageTests/StorageTaskListTest.java} | 20 +-- .../TaskTests/DeadlineTest.java | 4 +- .../{Duke => duke}/TaskTests/EventTest.java | 4 +- .../TaskTests/TaskListTest.java | 10 +- .../{Duke => duke}/TaskTests/ToDosTest.java | 4 +- text-ui-test/EXPECTED.TXT | 2 +- text-ui-test/runtest.bat | 4 +- 69 files changed, 1153 insertions(+), 1148 deletions(-) delete mode 100644 src/main/java/Duke/exception/EmptyDescriptionException.java delete mode 100644 src/main/java/Duke/exception/EmptyTaskListException.java delete mode 100644 src/main/java/Duke/exception/SavingException.java delete mode 100644 src/main/java/Duke/exception/TaskNotFoundException.java delete mode 100644 src/main/java/Duke/exception/TimeManagementException.java delete mode 100644 src/main/java/Duke/exception/TimeParseException.java delete mode 100644 src/main/java/Duke/exception/UnknownSyntaxException.java delete mode 100644 src/main/java/Duke/parser/CMD.java delete mode 100644 src/main/java/Duke/parser/CMD_Add.java delete mode 100644 src/main/java/Duke/parser/CMD_Bye.java delete mode 100644 src/main/java/Duke/parser/CMD_Deadline.java delete mode 100644 src/main/java/Duke/parser/CMD_Delete.java delete mode 100644 src/main/java/Duke/parser/CMD_Done.java delete mode 100644 src/main/java/Duke/parser/CMD_Error.java delete mode 100644 src/main/java/Duke/parser/CMD_Event.java delete mode 100644 src/main/java/Duke/parser/CMD_Find.java delete mode 100644 src/main/java/Duke/parser/CMD_List.java delete mode 100644 src/main/java/Duke/parser/CMD_Save.java delete mode 100644 src/main/java/Duke/parser/CMD_TODO.java delete mode 100644 src/main/java/Duke/parser/Command.java delete mode 100644 src/main/java/Duke/parser/Parser.java delete mode 100644 src/main/java/Duke/task/Task_Enum.java delete mode 100644 src/main/java/Duke/task/UnscheduledTaskList.java rename src/main/java/{Duke => duke}/Duke.java (66%) rename src/main/java/{Duke => duke}/exception/DukeException.java (59%) create mode 100644 src/main/java/duke/exception/EmptyDescriptionException.java create mode 100644 src/main/java/duke/exception/EmptyTaskListException.java create mode 100644 src/main/java/duke/exception/SavingException.java create mode 100644 src/main/java/duke/exception/TaskNotFoundException.java create mode 100644 src/main/java/duke/exception/TimeManagementException.java create mode 100644 src/main/java/duke/exception/TimeParseException.java create mode 100644 src/main/java/duke/exception/UnknownSyntaxException.java create mode 100644 src/main/java/duke/parser/Command.java create mode 100644 src/main/java/duke/parser/CommandAdd.java create mode 100644 src/main/java/duke/parser/CommandBase.java create mode 100644 src/main/java/duke/parser/CommandBye.java create mode 100644 src/main/java/duke/parser/CommandDeadline.java create mode 100644 src/main/java/duke/parser/CommandDelete.java create mode 100644 src/main/java/duke/parser/CommandDone.java rename src/main/java/{Duke/parser/CMD_Enum.java => duke/parser/CommandEnums.java} (70%) create mode 100644 src/main/java/duke/parser/CommandError.java create mode 100644 src/main/java/duke/parser/CommandEvent.java create mode 100644 src/main/java/duke/parser/CommandFind.java create mode 100644 src/main/java/duke/parser/CommandList.java create mode 100644 src/main/java/duke/parser/CommandParser.java create mode 100644 src/main/java/duke/parser/CommandSave.java create mode 100644 src/main/java/duke/parser/CommandTodo.java rename src/main/java/{Duke/storage/Storage_Unschedule.java => duke/storage/StorageFixedDurationReference.java} (59%) rename src/main/java/{Duke/storage/Storage.java => duke/storage/StorageTaskList.java} (63%) rename src/main/java/{Duke => duke}/storage/duke.txt (91%) rename src/main/java/{Duke/storage/task_time_records.txt => duke/storage/fixedDurationTask.txt} (100%) rename src/main/java/{Duke => duke}/task/Deadline.java (69%) rename src/main/java/{Duke => duke}/task/Events.java (69%) rename src/main/java/{Duke/task/UnscheduledTask.java => duke/task/FixedDurationTask.java} (52%) create mode 100644 src/main/java/duke/task/FixedDurationTaskList.java rename src/main/java/{Duke => duke}/task/Task.java (69%) rename src/main/java/{Duke => duke}/task/TaskList.java (58%) create mode 100644 src/main/java/duke/task/Task_Enum.java rename src/main/java/{Duke => duke}/task/ToDos.java (68%) rename src/main/java/{Duke => duke}/ui/ReturnMessages.java (63%) rename src/main/java/{Duke => duke}/ui/UI.java (75%) rename src/test/java/{Duke/StorageTests/StorageTest.java => duke/StorageTests/StorageTaskListTest.java} (73%) rename src/test/java/{Duke => duke}/TaskTests/DeadlineTest.java (91%) rename src/test/java/{Duke => duke}/TaskTests/EventTest.java (92%) rename src/test/java/{Duke => duke}/TaskTests/TaskListTest.java (86%) rename src/test/java/{Duke => duke}/TaskTests/ToDosTest.java (86%) diff --git a/README.md b/README.md index 63d0ad6b..a8111be7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Duke.Duke project template +# duke.duke project template This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it. @@ -13,7 +13,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version. 1. If there are any further prompts, accept the defaults. 1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).
In the same dialog, set the **Project language level** field to the `SDK default` option. -3. After that, locate the `src/main/java/Duke.Duke.java` file, right-click it, and choose `Run Duke.Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output: +3. After that, locate the `src/main/java/duke.duke.java` file, right-click it, and choose `Run duke.duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output: ``` Hello from ____ _ diff --git a/src/main/java/Duke/exception/EmptyDescriptionException.java b/src/main/java/Duke/exception/EmptyDescriptionException.java deleted file mode 100644 index b07a81d6..00000000 --- a/src/main/java/Duke/exception/EmptyDescriptionException.java +++ /dev/null @@ -1,20 +0,0 @@ -package Duke.exception; - -public class EmptyDescriptionException extends DukeException{ - - /** - * Thrown when user did not give a description for the task - * - * Prints the following - * printer.separator(); - * System.out.printf(" OOPS!!! The description of a %s cannot be empty.\n", taskType); - * printer.separator(); - * - * @param message the pre-defined message - * - */ - public EmptyDescriptionException(String message) { - super(message); - } - -} diff --git a/src/main/java/Duke/exception/EmptyTaskListException.java b/src/main/java/Duke/exception/EmptyTaskListException.java deleted file mode 100644 index 7abd1fb8..00000000 --- a/src/main/java/Duke/exception/EmptyTaskListException.java +++ /dev/null @@ -1,21 +0,0 @@ -package Duke.exception; - - -public class EmptyTaskListException extends DukeException{ - - /** - * Thrown when the task list is empty - * - * Prints the following - * printer.separator(); - * System.out.println(" ☹ OOPS!!! I'm sorry, the list is empty ^_^"); - * printer.separator(); - * - * @param message Printing message overload - */ - public EmptyTaskListException(String message) { - super(message); - } - /* - */ -} diff --git a/src/main/java/Duke/exception/SavingException.java b/src/main/java/Duke/exception/SavingException.java deleted file mode 100644 index 439b0ef5..00000000 --- a/src/main/java/Duke/exception/SavingException.java +++ /dev/null @@ -1,19 +0,0 @@ -package Duke.exception; - -public class SavingException extends DukeException{ - /** - * Thrown when there is problem saving the current task list - * - * Prints the following - * separator(); - * System.out.println(" OOPS!!! Exception caught while saving >_<|||"); - * separator(); - * - * @param message the pre-defined message - * - */ - public SavingException(String message) { - super(message); - } - -} diff --git a/src/main/java/Duke/exception/TaskNotFoundException.java b/src/main/java/Duke/exception/TaskNotFoundException.java deleted file mode 100644 index d0b3fdf5..00000000 --- a/src/main/java/Duke/exception/TaskNotFoundException.java +++ /dev/null @@ -1,19 +0,0 @@ -package Duke.exception; - -public class TaskNotFoundException extends DukeException{ - /** - * Thrown when failed to identify task, either given wrong information or task does not exist. - * - * Prints the following - * printer.separator(); - * System.out.println(" ☹ OOPS!!! I'm sorry, please key in by Tasks.Task ID instead of [%s]", message); - * printer.separator(); - * - * @param message the pre-defined message - * - */ - public TaskNotFoundException(String message) { - super(message); - } -} - diff --git a/src/main/java/Duke/exception/TimeManagementException.java b/src/main/java/Duke/exception/TimeManagementException.java deleted file mode 100644 index 4e7bbb3f..00000000 --- a/src/main/java/Duke/exception/TimeManagementException.java +++ /dev/null @@ -1,16 +0,0 @@ -package Duke.exception; - -public class TimeManagementException extends DukeException{ - /** - * Thrown when date-time not given for deadline/event task. - * - * Prints the following - * printer.separator(); - * System.out.println(" ☹ HEY!!! Please give a due date for deadlines and events. Let's have some sense of time"); - * printer.separator(); - * - * - */ - public TimeManagementException() { - } -} diff --git a/src/main/java/Duke/exception/TimeParseException.java b/src/main/java/Duke/exception/TimeParseException.java deleted file mode 100644 index 7514a988..00000000 --- a/src/main/java/Duke/exception/TimeParseException.java +++ /dev/null @@ -1,19 +0,0 @@ -package Duke.exception; - - -public class TimeParseException extends DukeException{ - /** - * Thrown when error occured while parsing time - * - * Prints the following - * separator(); - * System.out.printf(" There seems to have problem with your time format [%s]\n", message); - * separator(); - * - * @param message the pre-defined message - * - */ - public TimeParseException(String message) { - super(message); - } -} diff --git a/src/main/java/Duke/exception/UnknownSyntaxException.java b/src/main/java/Duke/exception/UnknownSyntaxException.java deleted file mode 100644 index 7847a712..00000000 --- a/src/main/java/Duke/exception/UnknownSyntaxException.java +++ /dev/null @@ -1,18 +0,0 @@ -package Duke.exception; - -public class UnknownSyntaxException extends DukeException{ - /** - * Thrown when user input does not categorize under any of the pre-defined message. - * - * Prints the following - * printer.separator(); - * System.out.println(" ☹ OOPS!!! I'm sorry, but I don't know what that means :-("); - * printer.separator(); - * - * @param message the pre-defined message - * - */ - public UnknownSyntaxException(String message) { - super(message); - } -} diff --git a/src/main/java/Duke/parser/CMD.java b/src/main/java/Duke/parser/CMD.java deleted file mode 100644 index 91f05e36..00000000 --- a/src/main/java/Duke/parser/CMD.java +++ /dev/null @@ -1,106 +0,0 @@ -package Duke.parser; - -import Duke.exception.EmptyDescriptionException; -import Duke.exception.EmptyTaskListException; -import Duke.exception.TaskNotFoundException; -import Duke.exception.UnknownSyntaxException; -import Duke.storage.Storage; -import Duke.task.*; -import Duke.ui.ReturnMessages; -import Duke.ui.UI; - -/** - * base cmd class - * CMD is the base class of all command objects. It contains some public attributes and methods. - * Each class that inherits CMD only needs to perform its own duties. - */ -public class CMD { - - /** - * command user input - */ - protected String fullCommand; - - /** - * command to be executed - */ - protected String keyword; - - /** - * command parameters - */ - protected String detail; - - private static ReturnMessages returnMessage = new ReturnMessages(); - - /** - * This construction method tells the command to parse into keyword and detail(If needed) - * @param command {@code fullCommand} user input - */ - public CMD(String command) { - this.fullCommand = command; - if(command.contains(CMD_Enum.TODO.getName()) || command.contains(CMD_Enum.DEADLINE.getName()) || command.contains(CMD_Enum.EVENT.getName()) || command.contains(CMD_Enum.FIND.getName())){ - try { - String[] toWords = command.split(" ", 2); - this.keyword = toWords[0]; - this.detail = toWords[1]; - } - catch(ArrayIndexOutOfBoundsException aio) { - if(command.contains(CMD_Enum.TODO.getName()) || command.contains(CMD_Enum.DEADLINE.getName()) || command.contains(CMD_Enum.EVENT.getName())){ - throw new EmptyDescriptionException(keyword); - } - else { - throw new UnknownSyntaxException(command); - } - } - } - } - - public CMD() { - - } - - /** - * execute cmd - * @param taskList user generate - * @param ui show interactive information - * @param storage info where to storage - * @return if true, the program stops, otherwise it starts - */ - public boolean execute(TaskList taskList, UI ui, Storage storage){ - return false; - } - /** - * Replies a done/add command - * - * @param taskList gets the full task list - * @throws EmptyTaskListException - thrown if task list is empty - * @throws UnknownSyntaxException - thrown if syntax is unknown - * @throws TaskNotFoundException - thrown if task is not found - */ - public void reply(TaskList taskList) throws EmptyTaskListException, UnknownSyntaxException, TaskNotFoundException { - if(fullCommand.contains("done")){ - try { - String[] doneCmd = fullCommand.split(" "); - taskList.getTask(Integer.parseInt(doneCmd[1]) - 1).setDone(); - //taskList[Integer.parseInt(doneCmd[1]) - 1].setDone(); - returnMessage.taskDoneFeedback(); - System.out.println(" " + taskList.getTask(Integer.parseInt(doneCmd[1]) - 1).toString()); - returnMessage.separator(); - return; - } - catch(NumberFormatException nf){ - throw new TaskNotFoundException("task not found"); - } - } - returnMessage.taskAddFeedback(); - try { - System.out.println(" " + taskList.getLastTask().toString()); - System.out.println(" Now you have " + taskList.getListSize() + " tasks in the list."); - returnMessage.separator(); - } - catch(ArrayIndexOutOfBoundsException a){ - throw new EmptyTaskListException("empty task"); - } - } -} diff --git a/src/main/java/Duke/parser/CMD_Add.java b/src/main/java/Duke/parser/CMD_Add.java deleted file mode 100644 index d078ca6d..00000000 --- a/src/main/java/Duke/parser/CMD_Add.java +++ /dev/null @@ -1,11 +0,0 @@ -package Duke.parser; - -public class CMD_Add extends CMD { - /** - * Add Command Constructor - * - */ - public CMD_Add(String command) { - super(command); - } -} diff --git a/src/main/java/Duke/parser/CMD_Bye.java b/src/main/java/Duke/parser/CMD_Bye.java deleted file mode 100644 index 3c2a1228..00000000 --- a/src/main/java/Duke/parser/CMD_Bye.java +++ /dev/null @@ -1,29 +0,0 @@ -package Duke.parser; - -import Duke.storage.Storage; -import Duke.task.TaskList; -import Duke.ui.UI; - -public class CMD_Bye extends CMD { - /** - * Bye Command Constructor - * - */ - public CMD_Bye(String command){ - super(command); - } - - /** - * Function Overloading for execution of bye command - * - * @param taskList the full task list for saving purpose - * @param ui UI object - * @param storage storage object - * - */ - @Override - public boolean execute(TaskList taskList, UI ui, Storage storage) { - storage.save(taskList); - return true; - } -} diff --git a/src/main/java/Duke/parser/CMD_Deadline.java b/src/main/java/Duke/parser/CMD_Deadline.java deleted file mode 100644 index a64722f5..00000000 --- a/src/main/java/Duke/parser/CMD_Deadline.java +++ /dev/null @@ -1,109 +0,0 @@ -package Duke.parser; - -import Duke.exception.TimeManagementException; -import Duke.exception.TimeParseException; -import Duke.exception.UnknownSyntaxException; -import Duke.storage.Storage; -import Duke.task.Deadline; -import Duke.task.Task; -import Duke.task.TaskList; -import Duke.ui.UI; - -import java.time.DateTimeException; -import java.time.LocalDateTime; - - -public class -CMD_Deadline extends CMD{ - /** - * Deadline Command Constructor - * - */ - public CMD_Deadline(String command){ - super(command); - } - - - /** - * Function Overloading for execution of deadline command - * - * @param taskList the full task list for saving purpose - * @param ui UI object - * @param storage storage object - * - */ - @Override - public boolean execute(TaskList taskList, UI ui, Storage storage) { - boolean success = true; - try { - if (!CMD_Enum.DEADLINE.getName().equals(super.keyword)) throw new UnknownSyntaxException(super.keyword); - String[] dl = super.detail.split("/by", 2); - //region time parse - String[] s = dl[1].split(" ", 2); - LocalDateTime dateT = timeParse(s[1]); - //endregion - Task task = new Deadline(dl[0], dateT); - taskList.addTask(task); - } catch (IndexOutOfBoundsException e) { - success = false; - throw new TimeManagementException(); - } catch (TimeParseException e) { - success = false; - throw new TimeParseException(e.getMessage()); - } - - if (success) { - reply(taskList); - } - - return false; - } - - /** - * Help parse the time to yyyy,mm,dd ssss - * @param str - the string of datetime - * @return - datetime in its correct format - */ - private LocalDateTime timeParse(String str) throws TimeParseException{ - if (!str.contains("/")) throw new TimeParseException("DateTime Format DD/MM/YYYY"); - // gen yyyy,mm,dd ssss - String[] date = str.split("/", 3); - if (date.length < 3) throw new TimeParseException("DateTime Format DD/MM/YYYY"); - - // gen time - System.out.println("date2: "+date[2]); - String[] time = date[2].split(" ", 2); - int year = Integer.parseInt(date[0]); - int month = Integer.parseInt(date[1]); - int dayOfMth = Integer.parseInt(time[0]); - int hour = get24HrFormat(time[1]); - - LocalDateTime localDate; - try { - //LocalDateTime.of(,,); - localDate = LocalDateTime.of(year,month,dayOfMth,hour,0,0,0); - System.out.println(localDate); - } catch (DateTimeException e) { - throw new TimeParseException(e.getMessage()); - } - - return localDate; - } - - /** - * Transforms time to 24hour format - * @param t string such as [1AM] [10PM] - * @return integer time such as 1, 22 - */ - private int get24HrFormat(String t){ - int timeVal; - if(t.contains("AM")){ - timeVal = Integer.parseInt(t.replace("AM", "").stripTrailing()); - } - else{ - timeVal = Integer.parseInt(t.replace("PM", "").stripTrailing()); - timeVal +=12; - } - return timeVal; - } -} diff --git a/src/main/java/Duke/parser/CMD_Delete.java b/src/main/java/Duke/parser/CMD_Delete.java deleted file mode 100644 index ee8977c1..00000000 --- a/src/main/java/Duke/parser/CMD_Delete.java +++ /dev/null @@ -1,29 +0,0 @@ -package Duke.parser; - -import Duke.storage.Storage; -import Duke.task.TaskList; -import Duke.ui.UI; - -public class CMD_Delete extends CMD{ - /** - * Delete Command Constructor - * - */ - public CMD_Delete(String command) { - super(command); - } - - /** - * Function Overloading for execution of delete command - * - * @param taskList the full task list for saving purpose - * @param ui UI object - * @param storage storage object - * - */ - @Override - public boolean execute(TaskList taskList, UI ui, Storage storage) { - taskList.deleteTask(Integer.parseInt(super.fullCommand.split(" ", 2)[1])); - return false; - } -} diff --git a/src/main/java/Duke/parser/CMD_Done.java b/src/main/java/Duke/parser/CMD_Done.java deleted file mode 100644 index 19b5bbaa..00000000 --- a/src/main/java/Duke/parser/CMD_Done.java +++ /dev/null @@ -1,29 +0,0 @@ -package Duke.parser; - -import Duke.storage.Storage; -import Duke.task.TaskList; -import Duke.ui.UI; - -public class CMD_Done extends CMD{ - /** - * Done Command Constructor - * - */ - public CMD_Done(String command) { - super(command); - } - - /** - * Function Overloading for execution of Done command - * - * @param taskList the full task list for saving purpose - * @param ui UI object - * @param storage storage object - * - */ - @Override - public boolean execute(TaskList taskList, UI ui, Storage storage) { - reply(taskList); - return false; - } -} \ No newline at end of file diff --git a/src/main/java/Duke/parser/CMD_Error.java b/src/main/java/Duke/parser/CMD_Error.java deleted file mode 100644 index 161e84f7..00000000 --- a/src/main/java/Duke/parser/CMD_Error.java +++ /dev/null @@ -1,13 +0,0 @@ -package Duke.parser; - -import Duke.exception.UnknownSyntaxException; - -public class CMD_Error extends CMD{ - /** - * Error Command Constructor - * - */ - public CMD_Error(String command) { - throw new UnknownSyntaxException(command); - } -} diff --git a/src/main/java/Duke/parser/CMD_Event.java b/src/main/java/Duke/parser/CMD_Event.java deleted file mode 100644 index a6937d82..00000000 --- a/src/main/java/Duke/parser/CMD_Event.java +++ /dev/null @@ -1,116 +0,0 @@ -package Duke.parser; - -import Duke.exception.TimeManagementException; -import Duke.exception.TimeParseException; -import Duke.exception.UnknownSyntaxException; -import Duke.storage.Storage; -import Duke.task.Events; -import Duke.task.Task; -import Duke.task.TaskList; -import Duke.ui.UI; - -import java.time.DateTimeException; -import java.time.LocalDate; -import java.time.LocalTime; - -public class CMD_Event extends CMD{ - /** - * Event Command Constructor - * - */ - public CMD_Event(String command) { - super(command); - } - - - /** - * Function Overloading for execution of event command - * - * @param taskList the full task list for saving purpose - * @param ui UI object - * @param storage storage object - * - */ - @Override - public boolean execute(TaskList taskList, UI ui, Storage storage) { - boolean success = true; - try { - if (!CMD_Enum.EVENT.getName().equals(super.keyword)) throw new UnknownSyntaxException(super.keyword); - String[] dt = super.detail.split("/at", 2); - String desc = dt[0]; - String dateTime = dt[1].substring(1); - LocalDate date = dateParse(dateTime); - String[] dayTimeInfo = dateTime.split(" ", 2); - String timeRange = dayTimeInfo[1]; - String from = timeRange.split("-", 2)[0]; - String to = timeRange.split("-", 2)[1]; - Task task = new Events(dt[0], date, timeParse(get24HrFormat(from)),timeParse(get24HrFormat(to))); - taskList.addTask(task); - } catch (IndexOutOfBoundsException e) { - success = false; - throw new TimeManagementException(); - } - - if (success) { - reply(taskList); - } - - return false; - } - - /** - * Help parse the time to yyyy,mm,dd ssss - * @param str - the string of datetime - * @return - datetime in its correct format - */ - private LocalDate dateParse(String str) throws TimeParseException{ - if (!str.contains("/")) throw new TimeParseException("DateTime Format DD/MM/YYYY"); - // gen yyyy,mm,dd ssss - String[] date = str.split("/", 3); - if (date.length < 3) throw new TimeParseException("DateTime Format DD/MM/YYYY"); - - // gen time - System.out.println("date2: "+date[2]); - String[] time = date[2].split(" ", 2); - int year = Integer.parseInt(date[0]); - int month = Integer.parseInt(date[1]); - int dayOfMth = Integer.parseInt(time[0]); - - LocalDate localDate; - try { - localDate = LocalDate.of(year,month,dayOfMth); - System.out.println(localDate); - } catch (DateTimeException e) { - throw new TimeParseException(e.getMessage()); - } - - return localDate; - } - - - /** - * Transforms time to 24hour format - * @param t string such as [1AM] [10PM] - * @return integer time such as 1, 22 - */ - private int get24HrFormat(String t){ - int timeVal; - if(t.contains("AM")){ - timeVal = Integer.parseInt(t.replace("AM", "").stripTrailing()); - } - else{ - timeVal = Integer.parseInt(t.replace("PM", "").stripTrailing()); - timeVal +=12; - } - return timeVal; - } - - /** - * converts time in integer to LocalTime - * @param t the integer time [1] [22] - * @return time in LocalTime [01:00:00] [22:00:00] - */ - private LocalTime timeParse(int t){ - return LocalTime.of(t,0,0); - } -} \ No newline at end of file diff --git a/src/main/java/Duke/parser/CMD_Find.java b/src/main/java/Duke/parser/CMD_Find.java deleted file mode 100644 index b7206548..00000000 --- a/src/main/java/Duke/parser/CMD_Find.java +++ /dev/null @@ -1,41 +0,0 @@ -package Duke.parser; - -import Duke.exception.TimeManagementException; -import Duke.exception.UnknownSyntaxException; -import Duke.storage.Storage; -import Duke.task.Events; -import Duke.task.Task; -import Duke.task.TaskList; -import Duke.ui.UI; - -import java.time.LocalDate; - -public class CMD_Find extends CMD{ - /** - * Find Command Constructor - * - */ - public CMD_Find(String command) { - super(command); - } - - /** - * Function Overloading for execution of Done command - * - * @param taskList the full task list for saving purpose - * @param ui UI object - * @param storage storage object - * - */ - @Override - public boolean execute(TaskList taskList, UI ui, Storage storage) { - try{ - System.out.println("detail: " +super.detail); - taskList.printFoundTaskList(super.detail); - } - catch(Exception e){ - System.out.println(e.getMessage()); - } - return false; - } -} diff --git a/src/main/java/Duke/parser/CMD_List.java b/src/main/java/Duke/parser/CMD_List.java deleted file mode 100644 index 5660883a..00000000 --- a/src/main/java/Duke/parser/CMD_List.java +++ /dev/null @@ -1,29 +0,0 @@ -package Duke.parser; - -import Duke.storage.Storage; -import Duke.task.TaskList; -import Duke.ui.UI; - -public class CMD_List extends CMD { - /** - * List Command Constructor - * - */ - public CMD_List(String command) { - super(command); - } - - /** - * Function Overloading for execution of list command - * - * @param taskList the full task list for saving purpose - * @param ui UI object - * @param storage storage object - * - */ - @Override - public boolean execute(TaskList taskList, UI ui, Storage storage) { - taskList.printTaskList(); - return false; - } -} \ No newline at end of file diff --git a/src/main/java/Duke/parser/CMD_Save.java b/src/main/java/Duke/parser/CMD_Save.java deleted file mode 100644 index 5edb4003..00000000 --- a/src/main/java/Duke/parser/CMD_Save.java +++ /dev/null @@ -1,29 +0,0 @@ -package Duke.parser; - -import Duke.storage.Storage; -import Duke.task.TaskList; -import Duke.ui.UI; - -public class CMD_Save extends CMD{ - /** - * Save Command Constructor - * - */ - public CMD_Save(String command){ - super(command); - } - - /** - * Function Overloading for execution of bye command - * - * @param taskList the full task list for saving purpose - * @param ui UI object - * @param storage storage object - * - */ - @Override - public boolean execute(TaskList taskList, UI ui, Storage storage) { - storage.save(taskList); - return false; - } -} diff --git a/src/main/java/Duke/parser/CMD_TODO.java b/src/main/java/Duke/parser/CMD_TODO.java deleted file mode 100644 index efe17601..00000000 --- a/src/main/java/Duke/parser/CMD_TODO.java +++ /dev/null @@ -1,58 +0,0 @@ -package Duke.parser; - -import Duke.exception.UnknownSyntaxException; -import Duke.storage.Storage; -import Duke.storage.Storage_Unschedule; -import Duke.task.*; -import Duke.ui.UI; - -public class CMD_TODO extends CMD { - private static Storage_Unschedule unscheduledRecordLoad; - private static UnscheduledTaskList unscheduledRecord; - /** - * TO DO Command Constructor - * - */ - public CMD_TODO(String command) { - super(command); - } - - /** - * Function Overloading for execution of TO DO command - * - * @param taskList the full task list for saving purpose - * @param ui UI object - * @param storage storage object - * - */ - @Override - public boolean execute(TaskList taskList, UI ui, Storage storage) { - boolean success; - try { - if (!CMD_Enum.TODO.getName().equals(super.keyword)) throw new UnknownSyntaxException(super.keyword); - unscheduledRecordLoad = new Storage_Unschedule(); - unscheduledRecord = new UnscheduledTaskList(unscheduledRecordLoad.load()); - System.out.println("detail: "+super.detail); - int duration = unscheduledRecord.findRecord(super.detail); - Task task; - System.out.println("Duration: "+duration); - if (duration > 0) { - task = new ToDos(super.detail, duration); - } - else{ - task = new ToDos(super.detail); - } - taskList.addTask(task); - success = true; - } catch (IndexOutOfBoundsException e) { - success = false; - throw new UnknownSyntaxException(super.keyword); - } - - if (success) { - reply(taskList); - } - - return false; - } -} diff --git a/src/main/java/Duke/parser/Command.java b/src/main/java/Duke/parser/Command.java deleted file mode 100644 index 610c39d5..00000000 --- a/src/main/java/Duke/parser/Command.java +++ /dev/null @@ -1,31 +0,0 @@ -package Duke.parser; - -import Duke.storage.Storage; -import Duke.task.TaskList; -import Duke.task.UnscheduledTaskList; -import Duke.ui.UI; - -public class Command { - - private CMD cmd; - - private boolean isExit; - - public void execute(TaskList taskList, UI ui, Storage storage) { - this.isExit = cmd.execute(taskList, ui, storage); - } - - - public boolean isExit() { - - return this.isExit; - } - - public CMD getCmd() { - return cmd; - } - - public void setCmd(CMD cmd) { - this.cmd = cmd; - } -} \ No newline at end of file diff --git a/src/main/java/Duke/parser/Parser.java b/src/main/java/Duke/parser/Parser.java deleted file mode 100644 index c9e659c2..00000000 --- a/src/main/java/Duke/parser/Parser.java +++ /dev/null @@ -1,35 +0,0 @@ -package Duke.parser; - -public class Parser { - - /** - * This is a factory that generates different CMD objects according to the input parameters - * @see CMD - */ - public static Command parse(String fullCommand) { - Command command = new Command(); - if (fullCommand.contains(CMD_Enum.DONE.getName())) { - command.setCmd(new CMD_Done(fullCommand)); - } else if (fullCommand.contains(CMD_Enum.LIST.getName())) { - command.setCmd(new CMD_List(fullCommand)); - } else if (fullCommand.contains(CMD_Enum.DELETE.getName())) { - command.setCmd(new CMD_Delete(fullCommand)); - } else if (fullCommand.contains(CMD_Enum.BYE.getName())) { - command.setCmd(new CMD_Bye(fullCommand)); - } else if (fullCommand.contains(CMD_Enum.SAVE.getName())) { - command.setCmd(new CMD_Save(fullCommand)); - } else if (fullCommand.contains(CMD_Enum.TODO.getName())) { - command.setCmd(new CMD_TODO(fullCommand)); - } else if (fullCommand.contains(CMD_Enum.EVENT.getName())) { - command.setCmd(new CMD_Event(fullCommand)); - } else if (fullCommand.contains(CMD_Enum.DEADLINE.getName())) { - command.setCmd(new CMD_Deadline(fullCommand)); - } else if(fullCommand.contains(CMD_Enum.FIND.getName())) { - command.setCmd(new CMD_Find(fullCommand)); - } else { - command.setCmd(new CMD_Error(fullCommand)); - } - - return command; - } -} diff --git a/src/main/java/Duke/task/Task_Enum.java b/src/main/java/Duke/task/Task_Enum.java deleted file mode 100644 index 1051b98c..00000000 --- a/src/main/java/Duke/task/Task_Enum.java +++ /dev/null @@ -1,13 +0,0 @@ -package Duke.task; - -/** - * Enumerate for Task - * 1. TO DO - * 2. DEADLINE - * 3. EVENT - */ -public enum Task_Enum { - TODO, - DEADLINE, - EVENT, -} diff --git a/src/main/java/Duke/task/UnscheduledTaskList.java b/src/main/java/Duke/task/UnscheduledTaskList.java deleted file mode 100644 index 3a6da465..00000000 --- a/src/main/java/Duke/task/UnscheduledTaskList.java +++ /dev/null @@ -1,57 +0,0 @@ -package Duke.task; - -import java.util.ArrayList; - -public class UnscheduledTaskList { - - protected int listSize; - private ArrayList unscheduleTaskList; - - - /** - * Constructor for Unscheduled Task Duration List - * - */ - public UnscheduledTaskList() { - unscheduleTaskList = new ArrayList<>(); - } - - /** - * Task list constructor with tasks within - * @param load - the task list that already contained task. - */ - public UnscheduledTaskList(UnscheduledTaskList load) { - this.listSize = load.listSize; - this.unscheduleTaskList = load.unscheduleTaskList; - } - - /** - * Gets the list size. - * @return - list size in integer - */ - public int getListSize(){ - return this.listSize; - } - - - /** - * Adds a unscheduled record to unscheduled list - * @param task - the full task information - */ - public void addTask(UnscheduledTask task){ - this.unscheduleTaskList.add(task); - this.listSize++; - } - - public int findRecord(String description){ - for(UnscheduledTask ut : unscheduleTaskList){ - System.out.println("input Desc: "+description); - System.out.println("saved Desc: "+ut.getDesc()); - if(description.equals(ut.getDesc())){ - System.out.println("matched"); - return ut.getDuration(); - } - } - return 0; - } -} diff --git a/src/main/java/Duke/Duke.java b/src/main/java/duke/Duke.java similarity index 66% rename from src/main/java/Duke/Duke.java rename to src/main/java/duke/Duke.java index ef3bb649..da1ad89e 100644 --- a/src/main/java/Duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -1,17 +1,15 @@ -package Duke; +package duke; -import Duke.exception.DukeException; -import Duke.parser.Command; -import Duke.parser.Parser; -import Duke.storage.Storage; -import Duke.storage.Storage_Unschedule; -import Duke.task.TaskList; -import Duke.task.UnscheduledTaskList; -import Duke.ui.UI; +import duke.exception.DukeException; +import duke.parser.Command; +import duke.parser.CommandParser; +import duke.storage.StorageTaskList; +import duke.task.TaskList; +import duke.ui.UI; public class Duke { - private static Storage storage; + private static StorageTaskList storageTaskList; private UI ui; private TaskList taskList; @@ -23,9 +21,9 @@ public class Duke { public Duke(String filePath) { ui = new UI(); ui.showWelcome(); - storage = new Storage(filePath); + storageTaskList = new StorageTaskList(filePath); try { - taskList = new TaskList(storage.load()); + taskList = new TaskList(storageTaskList.load()); } catch (DukeException e) { ui.showLoadingError(); taskList = new TaskList(); @@ -39,8 +37,8 @@ public void run() throws DukeException { try { String fullCommand = ui.readCommand(); ui.showLine(); // show the divider line ("_______") - Command c = Parser.parse(fullCommand); - c.execute(taskList, ui, storage); + Command c = CommandParser.parse(fullCommand); + c.execute(taskList, ui, storageTaskList); isExit = c.isExit(); } catch (DukeException e) { ui.showError(e); diff --git a/src/main/java/Duke/exception/DukeException.java b/src/main/java/duke/exception/DukeException.java similarity index 59% rename from src/main/java/Duke/exception/DukeException.java rename to src/main/java/duke/exception/DukeException.java index 3c2794db..d92e00d0 100644 --- a/src/main/java/Duke/exception/DukeException.java +++ b/src/main/java/duke/exception/DukeException.java @@ -1,11 +1,10 @@ -package Duke.exception; +package duke.exception; public class DukeException extends RuntimeException{ /** - * A base class for self-defined exceptions - * - * @param message the pre-defined message + * Throws base class for self-defined exceptions. * + * @param message the pre-defined message. */ public DukeException(String message) { super(message); diff --git a/src/main/java/duke/exception/EmptyDescriptionException.java b/src/main/java/duke/exception/EmptyDescriptionException.java new file mode 100644 index 00000000..926835c7 --- /dev/null +++ b/src/main/java/duke/exception/EmptyDescriptionException.java @@ -0,0 +1,14 @@ +package duke.exception; + +public class EmptyDescriptionException extends DukeException{ + + /** + * Throws when user did not give a description for the task. + * + * @param message the pre-defined message. + */ + public EmptyDescriptionException(String message) { + super(message); + } + +} diff --git a/src/main/java/duke/exception/EmptyTaskListException.java b/src/main/java/duke/exception/EmptyTaskListException.java new file mode 100644 index 00000000..8b95d89a --- /dev/null +++ b/src/main/java/duke/exception/EmptyTaskListException.java @@ -0,0 +1,16 @@ +package duke.exception; + + +public class EmptyTaskListException extends DukeException{ + + /** + * Throws when the task list is empty. + * + * @param message Printing message overload. + */ + public EmptyTaskListException(String message) { + super(message); + } + /* + */ +} diff --git a/src/main/java/duke/exception/SavingException.java b/src/main/java/duke/exception/SavingException.java new file mode 100644 index 00000000..07da9d8c --- /dev/null +++ b/src/main/java/duke/exception/SavingException.java @@ -0,0 +1,14 @@ +package duke.exception; + +public class SavingException extends DukeException{ + /** + * Throws when there is problem saving the current task list. + * + * @param message the pre-defined message. + * + */ + public SavingException(String message) { + super(message); + } + +} diff --git a/src/main/java/duke/exception/TaskNotFoundException.java b/src/main/java/duke/exception/TaskNotFoundException.java new file mode 100644 index 00000000..15e6181e --- /dev/null +++ b/src/main/java/duke/exception/TaskNotFoundException.java @@ -0,0 +1,13 @@ +package duke.exception; + +public class TaskNotFoundException extends DukeException{ + /** + * Throws when failed to identify task, either given wrong information or task does not exist. + * + * @param message the pre-defined message. + */ + public TaskNotFoundException(String message) { + super(message); + } +} + diff --git a/src/main/java/duke/exception/TimeManagementException.java b/src/main/java/duke/exception/TimeManagementException.java new file mode 100644 index 00000000..9fb69947 --- /dev/null +++ b/src/main/java/duke/exception/TimeManagementException.java @@ -0,0 +1,8 @@ +package duke.exception; + +public class TimeManagementException extends DukeException{ + + /** Throws when date-time not given for deadline/event task. */ + public TimeManagementException() { + } +} diff --git a/src/main/java/duke/exception/TimeParseException.java b/src/main/java/duke/exception/TimeParseException.java new file mode 100644 index 00000000..60e9507d --- /dev/null +++ b/src/main/java/duke/exception/TimeParseException.java @@ -0,0 +1,13 @@ +package duke.exception; + + +public class TimeParseException extends DukeException{ + /** + * Throws when error occurred while parsing time. + * + * @param message the pre-defined message. + */ + public TimeParseException(String message) { + super(message); + } +} diff --git a/src/main/java/duke/exception/UnknownSyntaxException.java b/src/main/java/duke/exception/UnknownSyntaxException.java new file mode 100644 index 00000000..854663cc --- /dev/null +++ b/src/main/java/duke/exception/UnknownSyntaxException.java @@ -0,0 +1,12 @@ +package duke.exception; + +public class UnknownSyntaxException extends DukeException{ + /** + * Throws when user input does not categorize under any of the pre-defined message. + * + * @param message the pre-defined message. + */ + public UnknownSyntaxException(String message) { + super(message); + } +} diff --git a/src/main/java/duke/parser/Command.java b/src/main/java/duke/parser/Command.java new file mode 100644 index 00000000..3862440a --- /dev/null +++ b/src/main/java/duke/parser/Command.java @@ -0,0 +1,49 @@ +package duke.parser; + +import duke.storage.StorageTaskList; +import duke.task.TaskList; +import duke.ui.UI; + +public class Command { + + /** Declares CommandBase Object. */ + private CommandBase commandBase; + + /** Checks if the input is "bye". */ + private boolean shouldExit; + + /** + * Checks if to exit or continue the runtime after each execution. + * + * @param taskList task list object + * @param ui ui object + * @param storageTaskList storage task list object + */ + public void execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) { + this.shouldExit = commandBase.execute(taskList, ui, storageTaskList); + } + + /** + * Checks if isExit true. + * + * @return isExit true or false. + */ + public boolean isExit() { + + return this.shouldExit; + } + + /** + * Returns CommandBase object. + * + * @return CommandBase object. + */ + public CommandBase getCommandBase() { + return commandBase; + } + + /** Sets CommandBase object. */ + public void setCmd(CommandBase commandBase) { + this.commandBase = commandBase; + } +} \ No newline at end of file diff --git a/src/main/java/duke/parser/CommandAdd.java b/src/main/java/duke/parser/CommandAdd.java new file mode 100644 index 00000000..cd77e8ca --- /dev/null +++ b/src/main/java/duke/parser/CommandAdd.java @@ -0,0 +1,13 @@ +package duke.parser; + +public class CommandAdd extends CommandBase { + + /** + * Creates Add Command Constructor. + * + * @param command the full command. + */ + public CommandAdd(String command) { + super(command); + } +} diff --git a/src/main/java/duke/parser/CommandBase.java b/src/main/java/duke/parser/CommandBase.java new file mode 100644 index 00000000..f4f0f76d --- /dev/null +++ b/src/main/java/duke/parser/CommandBase.java @@ -0,0 +1,104 @@ +package duke.parser; + +import duke.exception.EmptyDescriptionException; +import duke.exception.EmptyTaskListException; +import duke.exception.TaskNotFoundException; +import duke.exception.UnknownSyntaxException; +import duke.storage.StorageTaskList; +import duke.task.TaskList; +import duke.ui.ReturnMessages; +import duke.ui.UI; + +/** + * Creates base command class. + * CommandBase is the base class of all command objects. It contains some public attributes and methods. + * Each class that inherits CommandBase only needs to perform its own duty. + */ +public class CommandBase { + + /** Declares command user input. */ + protected String fullCommand; + + /** Declares command to be executed. */ + protected String keyword; + + /** Declares command parameters. */ + protected String detail; + + /** Returns message object. */ + private static ReturnMessages returnMessage = new ReturnMessages(); + + /** + * Tells the command to parse into keyword and detail(If needed). + * + * @param command full command of user input. + * @throws IndexOutOfBoundsException thrown when able to identify keyword but not the rest of the descriptions + * @throws UnknownSyntaxException thrown when syntax is unreadable + * @throws EmptyDescriptionException thrown after detecting description is empty + */ + public CommandBase(String command) throws ArrayIndexOutOfBoundsException, UnknownSyntaxException, EmptyDescriptionException{ + this.fullCommand = command; + this.keyword = ""; + this.detail = ""; + if(command.contains(CommandEnums.TODO.getName()) || command.contains(CommandEnums.DEADLINE.getName()) || command.contains(CommandEnums.EVENT.getName()) || command.contains(CommandEnums.FIND.getName())){ + try { + String[] toWords = command.split(" ", 2); + this.keyword = toWords[0]; + this.detail = toWords[1]; + } catch(ArrayIndexOutOfBoundsException aio) { + if(command.contains(CommandEnums.TODO.getName()) || command.contains(CommandEnums.DEADLINE.getName()) || command.contains(CommandEnums.EVENT.getName())){ + throw new EmptyDescriptionException(keyword); + } else { + throw new UnknownSyntaxException(command); + } + } + } + } + + public CommandBase() { + + } + + /** + * Executes command. + * + * @param taskList user generate. + * @param ui show interactive information. + * @param storageTaskList info where to storage. + * @return if true, the program stops, otherwise it starts. + */ + public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList){ + return false; + } + + /** + * Replies a done/add command. + * + * @param taskList gets the full task list. + * @throws EmptyTaskListException thrown if task list is empty. + * @throws UnknownSyntaxException thrown if syntax is unknown. + * @throws TaskNotFoundException thrown if task is not found. + */ + public void reply(TaskList taskList) throws EmptyTaskListException, UnknownSyntaxException, TaskNotFoundException { + if(fullCommand.contains("done")){ + try { + String[] doneCommand = fullCommand.split(" "); + taskList.getTask(Integer.parseInt(doneCommand[1]) - 1).setDone(); + returnMessage.taskDoneFeedback(); + System.out.println(" " + taskList.getTask(Integer.parseInt(doneCommand[1]) - 1).toString()); + returnMessage.separator(); + return; + } catch(NumberFormatException nf){ + throw new TaskNotFoundException("task not found"); + } + } + returnMessage.taskAddFeedback(); + try { + System.out.println(" " + taskList.getLastTask().toString()); + System.out.println(" Now you have " + taskList.getListSize() + " tasks in the list."); + returnMessage.separator(); + } catch(ArrayIndexOutOfBoundsException a){ + throw new EmptyTaskListException("empty task"); + } + } +} diff --git a/src/main/java/duke/parser/CommandBye.java b/src/main/java/duke/parser/CommandBye.java new file mode 100644 index 00000000..c087ef93 --- /dev/null +++ b/src/main/java/duke/parser/CommandBye.java @@ -0,0 +1,30 @@ +package duke.parser; + +import duke.storage.StorageTaskList; +import duke.task.TaskList; +import duke.ui.UI; + +public class CommandBye extends CommandBase { + /** + * Creates bye command constructor. + * + * @param command Full command. + */ + public CommandBye(String command){ + super(command); + } + + /** + * Executes of bye command. + * + * @param taskList user generate. + * @param ui show interactive information. + * @param storageTaskList info where to storage. + * @return if true, the program stops, otherwise it starts. + */ + @Override + public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) { + storageTaskList.save(taskList); + return true; + } +} diff --git a/src/main/java/duke/parser/CommandDeadline.java b/src/main/java/duke/parser/CommandDeadline.java new file mode 100644 index 00000000..12872787 --- /dev/null +++ b/src/main/java/duke/parser/CommandDeadline.java @@ -0,0 +1,117 @@ +package duke.parser; + +import duke.exception.TimeManagementException; +import duke.exception.TimeParseException; +import duke.exception.UnknownSyntaxException; +import duke.storage.StorageTaskList; +import duke.task.Deadline; +import duke.task.Task; +import duke.task.TaskList; +import duke.ui.UI; + +import java.time.DateTimeException; +import java.time.LocalDateTime; + + +public class +CommandDeadline extends CommandBase { + + /** + * Creates deadline constructor. + * + * @param command full command. + */ + public CommandDeadline(String command){ + super(command); + } + + + /** + * Executes deadline command. + * + * @param taskList user generate. + * @param ui show interactive information. + * @param storageTaskList info where to storage. + * @return if true, the program stops, otherwise it starts. + * @throws TimeManagementException thrown when datetime not specified + * @throws TimeParseException thrown when datetime format is wrong + */ + @Override + public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) throws TimeManagementException, TimeParseException{ + boolean success = false; + try { + if (!CommandEnums.DEADLINE.getName().equals(super.keyword)){ + throw new UnknownSyntaxException(super.keyword); + } + String[] deadlineCommand = super.detail.split("/by", 2); + //region time parse + String[] dateTimes = deadlineCommand[1].split(" ", 2); + LocalDateTime dateT = timeParse(dateTimes[1]); + //endregion + Task task = new Deadline(deadlineCommand[0], dateT); + taskList.addTask(task); + success = true; + } catch (IndexOutOfBoundsException e) { + throw new TimeManagementException(); + } catch (TimeParseException e) { + throw new TimeParseException(e.getMessage()); + } + + if (success) { + reply(taskList); + } + + return false; + } + + /** + * Returns parsed time as format {DD-MM-YYYY}. + * + * @param str - the string of datetime. + * @return - Date in its correct format. + * @throws TimeParseException thrown when date format is wrong + */ + private LocalDateTime timeParse(String str) throws TimeParseException{ + if (!str.contains("/")){ + throw new TimeParseException("DateTime Format DD/MM/YYYY"); + } + // gen yyyy,mm,dd ssss + String[] date = str.split("/", 3); + if (date.length < 3){ + throw new TimeParseException("DateTime Format DD/MM/YYYY"); + } + + // gen time + String[] time = date[2].split(" ", 2); + int year = Integer.parseInt(date[0]); + int month = Integer.parseInt(date[1]); + int dayOfMth = Integer.parseInt(time[0]); + int hour = get24HrFormat(time[1]); + + LocalDateTime localDate; + try { + localDate = LocalDateTime.of(year,month,dayOfMth,hour,0,0,0); + } catch (DateTimeException e) { + throw new TimeParseException(e.getMessage()); + } + + return localDate; + } + + /** + * Transforms time to 24hour format. + * + * @param t string such as [1AM] [10PM]. + * @return integer time such as 1, 22. + */ + private int get24HrFormat(String t){ + int timeVal; + if(t.contains("AM")){ + timeVal = Integer.parseInt(t.replace("AM", "").stripTrailing()); + } else{ + timeVal = Integer.parseInt(t.replace("PM", "").stripTrailing()); + timeVal +=12; + } + return timeVal; + } +} diff --git a/src/main/java/duke/parser/CommandDelete.java b/src/main/java/duke/parser/CommandDelete.java new file mode 100644 index 00000000..98494092 --- /dev/null +++ b/src/main/java/duke/parser/CommandDelete.java @@ -0,0 +1,31 @@ +package duke.parser; + +import duke.storage.StorageTaskList; +import duke.task.TaskList; +import duke.ui.UI; + +public class CommandDelete extends CommandBase { + + /** + * Creates delete command constructor. + * + * @param command full command. + */ + public CommandDelete(String command) { + super(command); + } + + /** + * Executes delete command. + * + * @param taskList user generate. + * @param ui show interactive information. + * @param storageTaskList info where to storage. + * @return if true, the program stops, otherwise it starts. + */ + @Override + public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) { + taskList.deleteTask(Integer.parseInt(super.fullCommand.split(" ", 2)[1])); + return false; + } +} diff --git a/src/main/java/duke/parser/CommandDone.java b/src/main/java/duke/parser/CommandDone.java new file mode 100644 index 00000000..f8076f71 --- /dev/null +++ b/src/main/java/duke/parser/CommandDone.java @@ -0,0 +1,30 @@ +package duke.parser; + +import duke.storage.StorageTaskList; +import duke.task.TaskList; +import duke.ui.UI; + +public class CommandDone extends CommandBase { + /** + * Creates done command constructor. + * + * @param command full command + */ + public CommandDone(String command) { + super(command); + } + + /** + * Executes done command. + * + * @param taskList user generate. + * @param ui show interactive information. + * @param storageTaskList info where to storage. + * @return if true, the program stops, otherwise it starts. + */ + @Override + public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) { + reply(taskList); + return false; + } +} \ No newline at end of file diff --git a/src/main/java/Duke/parser/CMD_Enum.java b/src/main/java/duke/parser/CommandEnums.java similarity index 70% rename from src/main/java/Duke/parser/CMD_Enum.java rename to src/main/java/duke/parser/CommandEnums.java index 9128b672..52012f8f 100644 --- a/src/main/java/Duke/parser/CMD_Enum.java +++ b/src/main/java/duke/parser/CommandEnums.java @@ -1,6 +1,6 @@ -package Duke.parser; +package duke.parser; -public enum CMD_Enum { +public enum CommandEnums { LIST("list"), DONE("done"), DELETE("delete"), @@ -11,11 +11,13 @@ public enum CMD_Enum { DEADLINE("deadline"), FIND("find") ; + /** - * Eunm class for Command Constructor + * Creates Enum constructor * + * @param name the keyword for the command */ - CMD_Enum(String name) { + CommandEnums(String name) { this.name = name; } diff --git a/src/main/java/duke/parser/CommandError.java b/src/main/java/duke/parser/CommandError.java new file mode 100644 index 00000000..5887f947 --- /dev/null +++ b/src/main/java/duke/parser/CommandError.java @@ -0,0 +1,17 @@ +package duke.parser; + +import duke.exception.UnknownSyntaxException; + +public class CommandError extends CommandBase { + + /** + * Creates error command constructor. + * Used when unknown syntax is detected. + * + * @param command full command + * @throws UnknownSyntaxException throws unknown syntax if unable to identify + */ + public CommandError(String command) throws UnknownSyntaxException{ + throw new UnknownSyntaxException(command); + } +} diff --git a/src/main/java/duke/parser/CommandEvent.java b/src/main/java/duke/parser/CommandEvent.java new file mode 100644 index 00000000..e9f1f8f9 --- /dev/null +++ b/src/main/java/duke/parser/CommandEvent.java @@ -0,0 +1,125 @@ +package duke.parser; + +import duke.exception.TimeManagementException; +import duke.exception.TimeParseException; +import duke.exception.UnknownSyntaxException; +import duke.storage.StorageTaskList; +import duke.task.Events; +import duke.task.Task; +import duke.task.TaskList; +import duke.ui.UI; + +import java.time.DateTimeException; +import java.time.LocalDate; +import java.time.LocalTime; + +public class CommandEvent extends CommandBase { + /** + * Creates event Command Constructor + * + */ + public CommandEvent(String command) { + super(command); + } + + + /** + * Executes event command. + * + * @param taskList user generate. + * @param ui show interactive information. + * @param storageTaskList info where to storage. + * @return if true, the program stops, otherwise it starts. + * @throws TimeManagementException time management exception if no datetime is given + */ + @Override + public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) throws TimeManagementException{ + boolean success = false; + try { + if (!CommandEnums.EVENT.getName().equals(super.keyword)){ + throw new UnknownSyntaxException(super.keyword); + } + String[] dt = super.detail.split("/at", 2); + String description = dt[0]; + String dateTime = dt[1].substring(1); + LocalDate date = dateParse(dateTime); + String[] dateTimeInformation = dateTime.split(" ", 2); + String timeRange = dateTimeInformation[1]; + String from = timeRange.split("-", 2)[0]; + String to = timeRange.split("-", 2)[1]; + Task task = new Events(description, date, timeParse(get24HrFormat(from)),timeParse(get24HrFormat(to))); + taskList.addTask(task); + success = true; + } catch (IndexOutOfBoundsException e) { + throw new TimeManagementException(); + } + + if (success) { + reply(taskList); + } + + return false; + } + + /** + * Returns parsed time in format {DD-MM-YYYY}. + * + * @param str - the string of datetime. + * @return - Date in its correct format. + * @throws TimeParseException thrown when time format is wrong + */ + private LocalDate dateParse(String str) throws TimeParseException{ + if (!str.contains("/")){ + throw new TimeParseException("DateTime Format DD/MM/YYYY"); + } + // gen yyyy,mm,dd ssss + String[] date = str.split("/", 3); + if (date.length < 3){ + throw new TimeParseException("DateTime Format DD/MM/YYYY"); + } + + // gen time + String[] time = date[2].split(" ", 2); + int year = Integer.parseInt(date[0]); + int month = Integer.parseInt(date[1]); + int dayOfMth = Integer.parseInt(time[0]); + + LocalDate localDate; + try { + localDate = LocalDate.of(year,month,dayOfMth); + } catch (DateTimeException e) { + throw new TimeParseException(e.getMessage()); + } + + return localDate; + } + + + /** + * Transforms time to 24hour format. + * + * @param t string such as [1AM] [10PM]. + * @return integer time such as 1, 22. + */ + private int get24HrFormat(String t){ + int timeVal; + if(t.contains("AM")){ + timeVal = Integer.parseInt(t.replace("AM", "").stripTrailing()); + } else{ + timeVal = Integer.parseInt(t.replace("PM", "").stripTrailing()); + timeVal +=12; + } + + return timeVal; + } + + /** + * Returns time in LocalTime format. + * + * @param t the integer time [1] [22] + * @return time in LocalTime [01:00:00] [22:00:00] + */ + private LocalTime timeParse(int t){ + return LocalTime.of(t,0,0); + } +} \ No newline at end of file diff --git a/src/main/java/duke/parser/CommandFind.java b/src/main/java/duke/parser/CommandFind.java new file mode 100644 index 00000000..27a93188 --- /dev/null +++ b/src/main/java/duke/parser/CommandFind.java @@ -0,0 +1,33 @@ +package duke.parser; + +import duke.storage.StorageTaskList; +import duke.task.TaskList; +import duke.ui.UI; + +public class CommandFind extends CommandBase { + /** + * Creates find Command Constructor + * + */ + public CommandFind(String command) { + super(command); + } + + /** + * Executes done command + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storageTaskList storage object + * + */ + @Override + public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) { + try{ + taskList.printFoundTaskList(super.detail); + } catch(Exception e){ + System.out.println(e.getMessage()); + } + return false; + } +} diff --git a/src/main/java/duke/parser/CommandList.java b/src/main/java/duke/parser/CommandList.java new file mode 100644 index 00000000..b0e7b452 --- /dev/null +++ b/src/main/java/duke/parser/CommandList.java @@ -0,0 +1,29 @@ +package duke.parser; + +import duke.storage.StorageTaskList; +import duke.task.TaskList; +import duke.ui.UI; + +public class CommandList extends CommandBase { + /** + * Creates list Command Constructor + * + */ + public CommandList(String command) { + super(command); + } + + /** + * Executes list command + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storageTaskList storage object + * + */ + @Override + public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) { + taskList.printTaskList(); + return false; + } +} \ No newline at end of file diff --git a/src/main/java/duke/parser/CommandParser.java b/src/main/java/duke/parser/CommandParser.java new file mode 100644 index 00000000..04a47c5c --- /dev/null +++ b/src/main/java/duke/parser/CommandParser.java @@ -0,0 +1,35 @@ +package duke.parser; + +public class CommandParser { + + /** + * Generates different CMD objects according to the input parameters + * @see CommandBase + */ + public static Command parse(String fullCommand) { + Command command = new Command(); + if (fullCommand.contains(CommandEnums.DONE.getName())) { + command.setCmd(new CommandDone(fullCommand)); + } else if (fullCommand.contains(CommandEnums.LIST.getName())) { + command.setCmd(new CommandList(fullCommand)); + } else if (fullCommand.contains(CommandEnums.DELETE.getName())) { + command.setCmd(new CommandDelete(fullCommand)); + } else if (fullCommand.contains(CommandEnums.BYE.getName())) { + command.setCmd(new CommandBye(fullCommand)); + } else if (fullCommand.contains(CommandEnums.SAVE.getName())) { + command.setCmd(new CommandSave(fullCommand)); + } else if (fullCommand.contains(CommandEnums.TODO.getName())) { + command.setCmd(new CommandTodo(fullCommand)); + } else if (fullCommand.contains(CommandEnums.EVENT.getName())) { + command.setCmd(new CommandEvent(fullCommand)); + } else if (fullCommand.contains(CommandEnums.DEADLINE.getName())) { + command.setCmd(new CommandDeadline(fullCommand)); + } else if(fullCommand.contains(CommandEnums.FIND.getName())) { + command.setCmd(new CommandFind(fullCommand)); + } else { + command.setCmd(new CommandError(fullCommand)); + } + + return command; + } +} diff --git a/src/main/java/duke/parser/CommandSave.java b/src/main/java/duke/parser/CommandSave.java new file mode 100644 index 00000000..cd3e651a --- /dev/null +++ b/src/main/java/duke/parser/CommandSave.java @@ -0,0 +1,29 @@ +package duke.parser; + +import duke.storage.StorageTaskList; +import duke.task.TaskList; +import duke.ui.UI; + +public class CommandSave extends CommandBase { + /** + * Creates save Command Constructor + * + */ + public CommandSave(String command){ + super(command); + } + + /** + * Executes save command + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storageTaskList storage object + * + */ + @Override + public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) { + storageTaskList.save(taskList); + return false; + } +} diff --git a/src/main/java/duke/parser/CommandTodo.java b/src/main/java/duke/parser/CommandTodo.java new file mode 100644 index 00000000..b376dc15 --- /dev/null +++ b/src/main/java/duke/parser/CommandTodo.java @@ -0,0 +1,59 @@ +package duke.parser; + +import duke.exception.UnknownSyntaxException; +import duke.storage.StorageTaskList; +import duke.storage.StorageFixedDurationReference; +import duke.task.Task; +import duke.task.TaskList; +import duke.task.ToDos; +import duke.task.FixedDurationTaskList; +import duke.ui.UI; + +public class CommandTodo extends CommandBase { + private static StorageFixedDurationReference loadFixedDurationRecord; + private static FixedDurationTaskList fixedDurationTaskList; + /** + * Creates TO DO Command + * + */ + public CommandTodo(String command) { + super(command); + } + + /** + * Executes TO DO command + * + * @param taskList the full task list for saving purpose + * @param ui UI object + * @param storageTaskList storage object + * + */ + @Override + public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) { + boolean success = false; + try { + if (!CommandEnums.TODO.getName().equals(super.keyword)){ + throw new UnknownSyntaxException(super.keyword); + } + loadFixedDurationRecord = new StorageFixedDurationReference(); + fixedDurationTaskList = new FixedDurationTaskList(loadFixedDurationRecord.load()); + int duration = fixedDurationTaskList.findRecord(super.detail); + Task task; + if (duration > 0) { + task = new ToDos(super.detail, duration); + } else{ + task = new ToDos(super.detail); + } + taskList.addTask(task); + success = true; + } catch (IndexOutOfBoundsException e) { + throw new UnknownSyntaxException(super.keyword); + } + + if (success) { + reply(taskList); + } + + return false; + } +} diff --git a/src/main/java/Duke/storage/Storage_Unschedule.java b/src/main/java/duke/storage/StorageFixedDurationReference.java similarity index 59% rename from src/main/java/Duke/storage/Storage_Unschedule.java rename to src/main/java/duke/storage/StorageFixedDurationReference.java index 8dc3317e..371adeb5 100644 --- a/src/main/java/Duke/storage/Storage_Unschedule.java +++ b/src/main/java/duke/storage/StorageFixedDurationReference.java @@ -1,19 +1,17 @@ -package Duke.storage; +package duke.storage; -import Duke.exception.DukeException; -import Duke.task.*; -import Duke.ui.ReturnMessages; +import duke.exception.DukeException; +import duke.task.FixedDurationTask; +import duke.task.FixedDurationTaskList; +import duke.ui.ReturnMessages; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; import java.util.Scanner; -public class Storage_Unschedule { +public class StorageFixedDurationReference { protected boolean isExist; protected String fileName; @@ -22,24 +20,21 @@ public class Storage_Unschedule { Scanner scanner; - /** - * Constructor for Storage_Unscheduled - * - */ - public Storage_Unschedule() { + /** Creates Storage_Unscheduled object. */ + public StorageFixedDurationReference() { //this.fileName = fileName; - this.file = new File(System.getProperty("user.dir") + "/src/main/java/Duke/storage/task_time_records.txt"); // create a File for the given file path + this.file = new File(System.getProperty("user.dir") + "/src/main/java/Duke/storage/fixedDurationTask.txt"); // create a File for the given file path this.fileName = file.getName(); } /** - * load info from hard disk - * @return task list from hard disk + * loads info from hard disk. + * + * @return task list from hard disk. */ - public UnscheduledTaskList load() throws DukeException { - UnscheduledTaskList unscheduledRecords = new UnscheduledTaskList(); + public FixedDurationTaskList load() throws DukeException { + FixedDurationTaskList unscheduledRecords = new FixedDurationTaskList(); if (file.exists()) { - //returnMessage.loadingFileFeedback(); try (BufferedReader br = new BufferedReader(new FileReader(file))) { String line; while ((line = br.readLine()) != null) { @@ -58,15 +53,14 @@ public UnscheduledTaskList load() throws DukeException { throw new DukeException("create file fail"); } } - //returnMessage.loadSuccessFeedback(); return unscheduledRecords; } /** - * Creates File if not exist + * Creates File if not exist. * - * @exception IOException throws a IO Exception if file exists + * @exception IOException throws a IO Exception if file exists. * */ public void createFile() throws IOException { @@ -82,16 +76,15 @@ public void createFile() throws IOException { /** - * decode the str to unscheduled task records with description and duration - * @param str the full string per line - * @return created task object + * Decodes the str to unscheduled task records with description and duration. + * + * @param str the full string per line. + * @return created task object. */ - public UnscheduledTask decodeStr2Unscheduled(String str) { + public FixedDurationTask decodeStr2Unscheduled(String str) { String[] line = str.split(" \\| "); - UnscheduledTask unscheduledRecord; - System.out.println("line[0]: "+line[0].stripTrailing()); - System.out.println("line[1]: "+line[1].stripLeading()); - unscheduledRecord = new UnscheduledTask(line[0], Integer.parseInt(line[1])); + FixedDurationTask unscheduledRecord; + unscheduledRecord = new FixedDurationTask(line[0], Integer.parseInt(line[1])); return unscheduledRecord; } } diff --git a/src/main/java/Duke/storage/Storage.java b/src/main/java/duke/storage/StorageTaskList.java similarity index 63% rename from src/main/java/Duke/storage/Storage.java rename to src/main/java/duke/storage/StorageTaskList.java index 6b235b97..7533db65 100644 --- a/src/main/java/Duke/storage/Storage.java +++ b/src/main/java/duke/storage/StorageTaskList.java @@ -1,8 +1,8 @@ -package Duke.storage; +package duke.storage; -import Duke.exception.DukeException; -import Duke.task.*; -import Duke.ui.ReturnMessages; +import duke.exception.DukeException; +import duke.task.*; +import duke.ui.ReturnMessages; import java.io.*; import java.time.LocalDate; @@ -10,35 +10,39 @@ import java.time.LocalTime; import java.util.Scanner; -public class Storage { +public class StorageTaskList { protected boolean isExist; protected String fileName; protected File file; private static ReturnMessages returnMessage = new ReturnMessages(); + private static StorageFixedDurationReference loadFixedDurationRecord; + private static FixedDurationTaskList fixedDurationTaskList; Scanner scanner; /** - * Check current file existence status - * @return true or false + * Checks current file existence status. + * + * @return true or false. */ public boolean existence(){ return isExist; } /** - * Constructor for Storage + * Creates Storage object. * * @param fileName the file saving the information of task list * */ - public Storage(String fileName) { + public StorageTaskList(String fileName) { this.fileName = fileName; this.file = new File(System.getProperty("user.dir") + "/src/main/java/Duke/storage/"+fileName); // create a File for the given file path } /** - * load info from hard disk - * @return task list from hard disk + * Loads info from hard disk. + * + * @return task list from hard disk. */ public TaskList load() throws DukeException { TaskList taskList = new TaskList(); @@ -67,9 +71,9 @@ public TaskList load() throws DukeException { } /** - * Creates File if not exist + * Creates File if not exist. * - * @exception IOException throws a IO Exception if file exists + * @exception IOException throws a IO Exception if file exists. * */ public void createFile() throws IOException { @@ -84,10 +88,9 @@ public void createFile() throws IOException { } /** - * save task list to hard disk - * - * @param taskList - data to save + * Saves task list to hard disk. * + * @param taskList - data to save. */ public void save(TaskList taskList) { @@ -108,35 +111,39 @@ public void save(TaskList taskList) { e.printStackTrace(); throw new DukeException(e.getMessage()); } - - returnMessage.saveSuccessFeedback(); } /** - * decode the str to its individual task format - * @param str the full string per line - * @return created task object + * Decodes the str to its individual task format. + * + * @param str the full string per line. + * @return created task object. */ public Task decodeStr2Task(String str) { - String[] line = str.split(" \\| "); + String[] lines = str.split(" \\| "); Task task = null; - switch (line[0]) { - case "T": - task = new ToDos(line[2]); - - break; - case "D": - String[] date = str.split("-", 3); - LocalDate d = LocalDate.parse(line[3]); - LocalTime t = LocalTime.parse(line[4]); - task = new Deadline(line[2], LocalDateTime.of(d,t)); - break; - case "E": - task = new Events(line[2], LocalDate.parse(line[3]), LocalTime.parse(line[4]), LocalTime.parse(line[5])); - break; + switch (lines[0]) { + case "T": + loadFixedDurationRecord = new StorageFixedDurationReference(); + fixedDurationTaskList = new FixedDurationTaskList(loadFixedDurationRecord.load()); + int duration = fixedDurationTaskList.findRecord(lines[2]); + if (duration > 0) { + task = new ToDos(lines[2], duration); + } else{ + task = new ToDos(lines[2]); + } + break; + case "D": + LocalDate date = LocalDate.parse(lines[3]); + LocalTime time = LocalTime.parse(lines[4]); + task = new Deadline(lines[2], LocalDateTime.of(date,time)); + break; + case "E": + task = new Events(lines[2], LocalDate.parse(lines[3]), LocalTime.parse(lines[4]), LocalTime.parse(lines[5])); + break; } - if (Task.DONE.equals(line[1])) { + if (Task.DONE.equals(lines[1])) { if (task != null) { task.setDone(); } diff --git a/src/main/java/Duke/storage/duke.txt b/src/main/java/duke/storage/duke.txt similarity index 91% rename from src/main/java/Duke/storage/duke.txt rename to src/main/java/duke/storage/duke.txt index b76a2431..95827fbc 100644 --- a/src/main/java/Duke/storage/duke.txt +++ b/src/main/java/duke/storage/duke.txt @@ -1,4 +1,4 @@ -T | 0 | read book | 0 +T | 0 | read book | 1 D | 0 | return book | 2021-10-24 | 22:00 D | 0 | return book | 2021-10-24 | 22:00 E | 0 | project meeting | 2021-10-24 | 14:00 | 16:00 @@ -10,5 +10,5 @@ D | 0 | return book | 2021-12-25 | 16:00 T | 0 | eat | 0 E | 0 | Finish Homework | 2021-12-25 | 16:00 | 18:00 E | 0 | new year | 2022-02-02 | 00:00 | 12:00 -T | 0 | read book | 0 +T | 0 | read book | 1 T | 0 | study book | 0 diff --git a/src/main/java/Duke/storage/task_time_records.txt b/src/main/java/duke/storage/fixedDurationTask.txt similarity index 100% rename from src/main/java/Duke/storage/task_time_records.txt rename to src/main/java/duke/storage/fixedDurationTask.txt diff --git a/src/main/java/Duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java similarity index 69% rename from src/main/java/Duke/task/Deadline.java rename to src/main/java/duke/task/Deadline.java index f51bcac5..c8e657bf 100644 --- a/src/main/java/Duke/task/Deadline.java +++ b/src/main/java/duke/task/Deadline.java @@ -1,4 +1,4 @@ -package Duke.task; +package duke.task; import java.time.LocalDateTime; @@ -7,28 +7,23 @@ public class Deadline extends Task { protected LocalDateTime by; /** - * Deadline task constructor + * Creates Deadline task. * - * @param description - the task for the deadline - * @param by - the deadline's datetime + * @param description - the task for the deadline. + * @param by - the deadline's datetime. */ public Deadline(String description, LocalDateTime by) { super(description); this.by = by; } - /** - * Prints task by its own style - */ + /** Prints task by its own style. */ @Override public String toString() { return "[D]" + super.toString() + "(by: " + by.toLocalDate().toString() + "["+ by.toLocalDate().getDayOfWeek() +"] "+ by.toLocalTime().toString()+")"; } - /** - * Encode function for storage within text file - * - */ + /** Encodes function for storage within text file. */ @Override public String encodeTask() { return "D" + super.encodeTask() + " | " + by.toLocalDate().toString() + " | " + by.toLocalTime().toString(); diff --git a/src/main/java/Duke/task/Events.java b/src/main/java/duke/task/Events.java similarity index 69% rename from src/main/java/Duke/task/Events.java rename to src/main/java/duke/task/Events.java index 1e3e19df..f6847c9c 100644 --- a/src/main/java/Duke/task/Events.java +++ b/src/main/java/duke/task/Events.java @@ -1,4 +1,4 @@ -package Duke.task; +package duke.task; import java.time.LocalDate; import java.time.LocalTime; @@ -9,11 +9,12 @@ public class Events extends Task { protected LocalTime end; /** - * Event task constructor - * @param description - Description of Event - * @param start - Date/Time event is held - * @param end - Date/Time event ends - * @param date - the date event is held + * Creates Event task. + * + * @param description - Description of Event. + * @param start - Date/Time event is held. + * @param end - Date/Time event ends. + * @param date - the date event is held. */ public Events(String description, LocalDate date, LocalTime start, LocalTime end) { super(description); @@ -21,19 +22,12 @@ public Events(String description, LocalDate date, LocalTime start, LocalTime end this.start = start; this.end = end; } - /** - * Prints task by its own style - * - * - */ + /** Prints task by its own style. */ @Override public String toString() { return "[E]" + super.toString() + " (on:" + date.toString() + "[" + date.getDayOfWeek().toString() + "] from:" + start.toString() +" to:" + end.toString() +")"; } - /** - * Encode function for storage within text file - * - */ + /** Encodes function for storage within text file */ @Override public String encodeTask() { return "E" + super.encodeTask() + " | " + date.toString() + " | " + start.toString() + " | " + end.toString(); diff --git a/src/main/java/Duke/task/UnscheduledTask.java b/src/main/java/duke/task/FixedDurationTask.java similarity index 52% rename from src/main/java/Duke/task/UnscheduledTask.java rename to src/main/java/duke/task/FixedDurationTask.java index 460b0033..fdb3fbe6 100644 --- a/src/main/java/Duke/task/UnscheduledTask.java +++ b/src/main/java/duke/task/FixedDurationTask.java @@ -1,10 +1,16 @@ -package Duke.task; +package duke.task; -public class UnscheduledTask { +public class FixedDurationTask { protected String description; protected int duration; - public UnscheduledTask(String desc, int duration){ + /** + * Creates FixedDuration Task. + * + * @param desc its fixed description. + * @param duration its fixed duration. + */ + public FixedDurationTask(String desc, int duration){ this.description = desc; this.duration = duration; } diff --git a/src/main/java/duke/task/FixedDurationTaskList.java b/src/main/java/duke/task/FixedDurationTaskList.java new file mode 100644 index 00000000..a18f8bc1 --- /dev/null +++ b/src/main/java/duke/task/FixedDurationTaskList.java @@ -0,0 +1,60 @@ +package duke.task; + +import java.util.ArrayList; + +public class FixedDurationTaskList { + + protected int listSize; + private ArrayList unscheduleTaskList; + + + /** Creates Fixed Duration Task List */ + public FixedDurationTaskList() { + unscheduleTaskList = new ArrayList<>(); + } + + /** + * Creates Fixed Duration Task List with records within. + * + * @param load - the task list that already contained task. + */ + public FixedDurationTaskList(FixedDurationTaskList load) { + this.listSize = load.listSize; + this.unscheduleTaskList = load.unscheduleTaskList; + } + + /** + * Gets the list size. + * + * @return - list size in integer. + */ + public int getListSize(){ + return this.listSize; + } + + + /** + * Adds an fixed duration task record to list. + * + * @param task - the full task information. + */ + public void addTask(FixedDurationTask task){ + this.unscheduleTaskList.add(task); + this.listSize++; + } + + /** + * Finds if a fixed duration task exists in record. + * + * @param description find by description. + * @return the task ID if exists. + */ + public int findRecord(String description){ + for(FixedDurationTask ut : unscheduleTaskList){ + if(description.equals(ut.getDesc())){ + return ut.getDuration(); + } + } + return 0; + } +} diff --git a/src/main/java/Duke/task/Task.java b/src/main/java/duke/task/Task.java similarity index 69% rename from src/main/java/Duke/task/Task.java rename to src/main/java/duke/task/Task.java index 573923ac..1a9f31f9 100644 --- a/src/main/java/Duke/task/Task.java +++ b/src/main/java/duke/task/Task.java @@ -1,4 +1,4 @@ -package Duke.task; +package duke.task; public class Task { protected String description; @@ -8,7 +8,8 @@ public class Task { public static final String UNDONE = "0"; /** - * Task base constructor + * Creates Task base. + * * @param description - the description string. */ public Task(String description) { @@ -17,40 +18,41 @@ public Task(String description) { } /** - * Task's Current status indicator + * Returns task's current status. * - * @return - done or not done + * @return - done or not done. */ public String getStatusIcon() { return (isDone ? "X" : " "); // mark done task with X } /** - * Similar to get status icon Status Code for code usage - * @return - done or not done + * Returns task's current status for code usage. + * + * @return - 0 or 1. */ public String getStatusCode() { return (isDone ? DONE : UNDONE); // mark done task with 1 } /** - * Gets the full description of each task - * @return - returns task description + * Returns the full description of each task. + * + * @return - returns task description. */ public String getTaskInfo(){ return description; } - /** - * Sets the task to Done - */ + /** Sets the task to Done. */ public void setDone(){ isDone = true; } /** - * Base Function to print task - * @return tasks [] TASK + * Base Function to print task. + * + * @return tasks [] TASK. */ public String toString() { return "["+getStatusIcon()+"] " + description; @@ -58,7 +60,8 @@ public String toString() { /** * Encodes task for storage. - * @return | X | TASK + * + * @return | X | TASK. */ public String encodeTask() { return " | " + getStatusCode() + " | " + description; diff --git a/src/main/java/Duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java similarity index 58% rename from src/main/java/Duke/task/TaskList.java rename to src/main/java/duke/task/TaskList.java index a6f66c44..75ab133d 100644 --- a/src/main/java/Duke/task/TaskList.java +++ b/src/main/java/duke/task/TaskList.java @@ -1,8 +1,8 @@ -package Duke.task; +package duke.task; -import Duke.exception.EmptyTaskListException; -import Duke.exception.TaskNotFoundException; -import Duke.ui.ReturnMessages; +import duke.exception.EmptyTaskListException; +import duke.exception.TaskNotFoundException; +import duke.ui.ReturnMessages; import java.util.ArrayList; @@ -12,15 +12,14 @@ public class TaskList { private static ReturnMessages printer = new ReturnMessages(); - /** - * Task list Constructor - */ + /** Creates task list. */ public TaskList() { taskList = new ArrayList<>(); } /** - * Task list constructor with tasks within + * Creates Task list with tasks within. + * * @param load - the task list that already contained task. */ public TaskList(TaskList load) { @@ -29,10 +28,11 @@ public TaskList(TaskList load) { } /** - * Deletes a specific task uniquely identified via taskID - * @param taskID - the unique identifier for each task - * @throws TaskNotFoundException - when a task is not found - * @throws EmptyTaskListException - when the task list is empty + * Deletes a specific task uniquely identified via taskID. + * + * @param taskID - the unique identifier for each task. + * @throws TaskNotFoundException - when a task is not found. + * @throws EmptyTaskListException - when the task list is empty. */ public void deleteTask(int taskID) throws TaskNotFoundException, EmptyTaskListException { int taskPosition = taskID -1; @@ -51,8 +51,9 @@ public void deleteTask(int taskID) throws TaskNotFoundException, EmptyTaskListEx } /** - * Adds a task to task list - * @param task - the full task information + * Adds a task to task list. + * + * @param task - the full task information. */ public void addTask(Task task){ this.taskList.add(task); @@ -60,17 +61,19 @@ public void addTask(Task task){ } /** - * Gets a task via its task ID - * @param ID - the unique identifier for a task - * @return - returns the task + * Gets a task via its task ID. + * + * @param ID - the unique identifier for a task. + * @return - returns the task. */ public Task getTask(int ID){ return taskList.get(ID); } /** - * Gets the last task added - * @return - return the task + * Gets the last task added. + * + * @return - return the task. */ public Task getLastTask(){ return taskList.get(listSize-1); @@ -78,7 +81,8 @@ public Task getLastTask(){ /** * Gets the list size. - * @return - list size in integer + * + * @return - list size in integer. */ public int getListSize(){ return this.listSize; @@ -88,26 +92,21 @@ public int getListSize(){ public void save(){} /** - * Prints the tasks within the task list - * @throws EmptyTaskListException - thrown if task list is empty + * Prints the tasks within the task list. + * + * @throws EmptyTaskListException - thrown if task list is empty. */ public void printTaskList() throws EmptyTaskListException { - printer.separator(); if(this.listSize == 0){ throw new EmptyTaskListException("empty task"); } - int numbering = 1; - System.out.println(" Here are the tasks in your list:"); - for(Task t : taskList){ - System.out.println(" "+numbering+"."+t.toString()); - numbering++; - } - printer.separator(); + printer.printFullTaskList(taskList); } /** - * Getter for getting the task list - * @return - returns entire task list + * Getter for getting the task list. + * + * @return - returns entire task list. */ public ArrayList getTaskList() { return taskList; @@ -115,23 +114,16 @@ public ArrayList getTaskList() { /** - * Finds tasks containing specific keyword - * @param keyword - the keyword to find - * @throws EmptyTaskListException - thrown if task list is empty + * Finds tasks containing specific keyword. + * + * @param keyword - the keyword to find. + * @throws EmptyTaskListException - thrown if task list is empty. */ public void printFoundTaskList(String keyword) throws EmptyTaskListException { - printer.separator(); + if(this.listSize == 0){ throw new EmptyTaskListException("empty task"); } - int numbering = 1; - System.out.println(" Here are the matching tasks in your list:"); - for(Task t : getTaskList()){ - if(t.getTaskInfo().contains(keyword)){ - System.out.println(" "+numbering+"."+t.toString()); - } - numbering++; - } - printer.separator(); + printer.taskFound(keyword, taskList); } } diff --git a/src/main/java/duke/task/Task_Enum.java b/src/main/java/duke/task/Task_Enum.java new file mode 100644 index 00000000..28e6fd0d --- /dev/null +++ b/src/main/java/duke/task/Task_Enum.java @@ -0,0 +1,8 @@ +package duke.task; + +/** Enumerate for Task */ +public enum Task_Enum { + TODO, + DEADLINE, + EVENT, +} diff --git a/src/main/java/Duke/task/ToDos.java b/src/main/java/duke/task/ToDos.java similarity index 68% rename from src/main/java/Duke/task/ToDos.java rename to src/main/java/duke/task/ToDos.java index b645874a..93e51a32 100644 --- a/src/main/java/Duke/task/ToDos.java +++ b/src/main/java/duke/task/ToDos.java @@ -1,21 +1,23 @@ -package Duke.task; +package duke.task; public class ToDos extends Task { protected int duration; /** - * To Do task constructor - * @param description - Description of To Do task + * Creates To Do task + * + * @param description - Description of To Do task. */ public ToDos(String description) { this(description,0); } /** - * To Do task constructor - * @param description - Description of To Do task - * @param duration - unscheduled fixed duration + * Creates To Do task. + * + * @param description - Description of To Do task. + * @param duration - unscheduled fixed duration. */ public ToDos(String description, int duration) { super(description); @@ -29,9 +31,7 @@ public void setDuration(int duration){ this.duration = duration; } - /** - * Prints task by its own style - */ + /** Prints task by its own style. */ @Override public String toString() { if(this.duration>0){ @@ -40,10 +40,7 @@ public String toString() { return "[T]" + super.toString(); } - /** - * Encode function for storage within text file - * - */ + /** Encodes function for storage within text file. */ @Override public String encodeTask() { return "T" + super.encodeTask() + " | " + duration; diff --git a/src/main/java/Duke/ui/ReturnMessages.java b/src/main/java/duke/ui/ReturnMessages.java similarity index 63% rename from src/main/java/Duke/ui/ReturnMessages.java rename to src/main/java/duke/ui/ReturnMessages.java index 53c1f55d..8fc58ee1 100644 --- a/src/main/java/Duke/ui/ReturnMessages.java +++ b/src/main/java/duke/ui/ReturnMessages.java @@ -1,33 +1,36 @@ -package Duke.ui; +package duke.ui; -/** - * handle msg output - */ +import duke.task.Task; +import duke.task.TaskList; + +import java.util.ArrayList; + +/** Handles message output. */ public class ReturnMessages { public void separator(){ System.out.println(" ____________________________________________________________"); } - /** - * Feedback when marking a task done - */ + /** Feedbacks when marking a task done. */ public void taskDoneFeedback(){ separator(); System.out.println(" Nice! I've marked this task as done:"); } - /** - * Feedback when adding a task - */ + /** Feedbacks when adding a task. */ public void taskAddFeedback(){ separator(); System.out.println(" Got it. I've added this task:"); } - /** - * Feedback on program startup - */ + /** Feedbacks on program startup. */ public void welcomeFeedback(){ + String logo = " ____ _ \n" + + "| _ \\ _ _| | _____ \n" + + "| | | | | | | |/ / _ \\\n" + + "| |_| | |_| | < __/\n" + + "|____/ \\__,_|_|\\_\\___|\n"; + System.out.println("Hello from\n" + logo); separator(); System.out.println(" Hello! I'm Duke"); System.out.println(" Here are my functionality...."); @@ -42,45 +45,35 @@ public void welcomeFeedback(){ separator(); } - /** - * Feedback on program exit - */ + /** Feedbacks on program exit. */ public void exitFeedback(){ separator(); System.out.println(" Bye. Hope to see you again soon!"); separator(); } - /** - * Feedback when loading file. - */ + /** Feedbacks when loading file. */ public void loadingFileFeedback(){ separator(); System.out.println(" Loading File..."); separator(); } - /** - * Feedback on file load success. - */ + /** Feedbacks on file load success. */ public void loadSuccessFeedback(){ separator(); System.out.println(" File Loaded Successfully, use command 'list' to view..."); separator(); } - /** - * Feedback on file save - */ + /** Feedbacks on file save. */ public void saveSuccessFeedback(){ separator(); System.out.println(" Successfully wrote to the file."); separator(); } - /** - * Feedback on file create - */ + /** Feedbacks on file create. */ public void createSuccessFeedback(String name){ separator(); System.out.println("File created: " + name); @@ -88,18 +81,52 @@ public void createSuccessFeedback(String name){ } /** - * Feedback message on emptyDescription Exception thrown - * @param taskType The type of task (To Do, Event, Deadline) + * Returns full task list with numbering. + * + * @param list the full task list. */ - public void exception_feedback_emptyDescription(String taskType){ + public void printFullTaskList(ArrayList list){ separator(); - System.out.printf(" OOPS!!! The description of a %s cannot be empty.\n", taskType); + int numbering = 1; + System.out.println(" Here are the tasks in your list:"); + for(Task t : list){ + System.out.println(" "+numbering+"."+t.toString()); + numbering++; + } separator(); } /** - * Feedback message on emptyTaskList Exception thrown + * Returns task found with keyword with its correct numbering. + * + * @param key keyword. + * @param list full task list. */ + public void taskFound(String key, ArrayList list){ + separator(); + int numbering = 1; + System.out.println(" Here are the matching tasks in your list:"); + for(Task t : list){ + if(t.getTaskInfo().contains(key)){ + System.out.println(" "+numbering+"."+t.toString()); + } + numbering++; + } + separator(); + } + + /** + * Feedbacks message on emptyDescription Exception thrown. + * + * @param taskType The type of task (To Do, Event, Deadline). + */ + public void exception_feedback_emptyDescription(String taskType){ + separator(); + System.out.printf(" OOPS!!! The description of a %s cannot be empty.\n", taskType); + separator(); + } + + /** Feedbacks message on emptyTaskList Exception thrown. */ public void exception_feedback_emptyTaskList(){ separator(); System.out.println(" OOPS!!! The list is empty ^_^"); @@ -107,8 +134,9 @@ public void exception_feedback_emptyTaskList(){ } /** - * Feedback message on unknownSyntax Exception thrown - * @param message - user input + * Feedbacks message on unknownSyntax Exception thrown. + * + * @param message - user input. */ public void exception_feedback_unknownSyntax(String message){ separator(); @@ -117,8 +145,9 @@ public void exception_feedback_unknownSyntax(String message){ } /** - * Feedback message on taskNotfound Exception thrown - * @param message - the task description + * Feedbacks message on task not found Exception thrown. + * + * @param message - the task description. */ public void exception_feedback_taskNotFound(String message){ separator(); @@ -126,36 +155,28 @@ public void exception_feedback_taskNotFound(String message){ separator(); } - /** - * Feedback message on noTimeConcept Exception thrown - */ + /** Feedbacks message on noTimeConcept Exception thrown. */ public void exception_feedback_noTimeConcept(){ separator(); System.out.println(" HEY!!! Please give a due date for deadlines and events or the syntax could be wrong"); separator(); } - /** - * Feedback message on Time Parse Exception thrown - */ + /** Feedbacks message on Time Parse Exception thrown. */ public void exception_feedback_timeParse(String message){ separator(); System.out.printf(" There seems to have problem with your time format [%s]\n", message); separator(); } - /** - * Feedback message on Saving Exception thrown - */ + /** Feedbacks message on Saving Exception thrown. */ public void exception_feedback_cantSave(){ separator(); System.out.println(" OOPS!!! Exception caught while saving >_<|||"); separator(); } - /** - * Feedback message on Loading Exception thrown - */ + /** Feedbacks message on Loading Exception thrown. */ public void exception_feedback_loadingError(){ separator(); String logo = " ____ _ \n" @@ -167,9 +188,10 @@ public void exception_feedback_loadingError(){ separator(); } + /** Feedbacks message on an Unknown Exception thrown. */ public void exception_feedback_unknownError(){ separator(); - System.out.println("Sorry, An unknown error occurred"); + System.out.println(" Sorry, An unknown error occurred"); separator(); } } diff --git a/src/main/java/Duke/ui/UI.java b/src/main/java/duke/ui/UI.java similarity index 75% rename from src/main/java/Duke/ui/UI.java rename to src/main/java/duke/ui/UI.java index 531f58a0..092c4f76 100644 --- a/src/main/java/Duke/ui/UI.java +++ b/src/main/java/duke/ui/UI.java @@ -1,7 +1,16 @@ -package Duke.ui; +package duke.ui; -import Duke.exception.*; + + +import duke.exception.DukeException; +import duke.exception.EmptyDescriptionException; +import duke.exception.EmptyTaskListException; +import duke.exception.SavingException; +import duke.exception.TaskNotFoundException; +import duke.exception.TimeManagementException; +import duke.exception.UnknownSyntaxException; +import duke.exception.TimeParseException; import java.util.Scanner; @@ -12,12 +21,6 @@ public class UI{ private Scanner in; public void showWelcome(){ - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); returnMessage.welcomeFeedback(); } @@ -26,8 +29,9 @@ public void showLoadingError(){ } /** - * read cmd user input - * @return - command read from user Input + * Reads cmd user input. + * + * @return - command read from user Input. */ public String readCommand() { boolean end = false; @@ -46,9 +50,10 @@ public void showError(String message) { } /** - * all the error msg will output by this - * All exceptions inherit DukeException - * @param e the exception object + * Returns the error msg will output by this. + * All exceptions inherit DukeException. + * + * @param e the exception object. */ public void showError(DukeException e) { if (e instanceof EmptyDescriptionException) { diff --git a/src/test/java/Duke/StorageTests/StorageTest.java b/src/test/java/duke/StorageTests/StorageTaskListTest.java similarity index 73% rename from src/test/java/Duke/StorageTests/StorageTest.java rename to src/test/java/duke/StorageTests/StorageTaskListTest.java index 649f0366..15d38837 100644 --- a/src/test/java/Duke/StorageTests/StorageTest.java +++ b/src/test/java/duke/StorageTests/StorageTaskListTest.java @@ -1,10 +1,10 @@ -package Duke.StorageTests; +package duke.StorageTests; -import Duke.storage.Storage; -import Duke.task.Deadline; -import Duke.task.Events; -import Duke.task.TaskList; -import Duke.task.ToDos; +import duke.storage.StorageTaskList; +import duke.task.Deadline; +import duke.task.Events; +import duke.task.TaskList; +import duke.task.ToDos; import org.junit.jupiter.api.Test; import java.io.File; @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.*; -public class StorageTest { +public class StorageTaskListTest { @Test public void storage() throws IOException { LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); @@ -25,16 +25,16 @@ public void storage() throws IOException { tasks.addTask(deadline); tasks.addTask(event); - Storage store = new Storage("Testing.txt"); + StorageTaskList store = new StorageTaskList("Testing.txt"); assertFalse(store.existence()); store.createFile(); store.save(tasks); assertTrue(store.existence()); - Storage store2 = new Storage("Testing.txt"); + StorageTaskList store2 = new StorageTaskList("Testing.txt"); assertEquals(tasks.getLastTask().toString(), store2.load().getLastTask().toString()); File cleanUP = new File(System.getProperty("user.dir") + "/src/main/java/Duke/storage/Testing.txt"); // create a File for the given file path - cleanUP.delete(); + boolean wrapUp = cleanUP.delete(); } } diff --git a/src/test/java/Duke/TaskTests/DeadlineTest.java b/src/test/java/duke/TaskTests/DeadlineTest.java similarity index 91% rename from src/test/java/Duke/TaskTests/DeadlineTest.java rename to src/test/java/duke/TaskTests/DeadlineTest.java index 9cd5dd98..0a8c76bb 100644 --- a/src/test/java/Duke/TaskTests/DeadlineTest.java +++ b/src/test/java/duke/TaskTests/DeadlineTest.java @@ -1,7 +1,7 @@ -package Duke.TaskTests; +package duke.TaskTests; -import Duke.task.Deadline; +import duke.task.Deadline; import org.junit.jupiter.api.Test; import java.time.LocalDateTime; diff --git a/src/test/java/Duke/TaskTests/EventTest.java b/src/test/java/duke/TaskTests/EventTest.java similarity index 92% rename from src/test/java/Duke/TaskTests/EventTest.java rename to src/test/java/duke/TaskTests/EventTest.java index 43df9308..97169a70 100644 --- a/src/test/java/Duke/TaskTests/EventTest.java +++ b/src/test/java/duke/TaskTests/EventTest.java @@ -1,6 +1,6 @@ -package Duke.TaskTests; +package duke.TaskTests; -import Duke.task.Events; +import duke.task.Events; import org.junit.jupiter.api.Test; import java.time.LocalDateTime; diff --git a/src/test/java/Duke/TaskTests/TaskListTest.java b/src/test/java/duke/TaskTests/TaskListTest.java similarity index 86% rename from src/test/java/Duke/TaskTests/TaskListTest.java rename to src/test/java/duke/TaskTests/TaskListTest.java index 39f7049a..404387bd 100644 --- a/src/test/java/Duke/TaskTests/TaskListTest.java +++ b/src/test/java/duke/TaskTests/TaskListTest.java @@ -1,9 +1,9 @@ -package Duke.TaskTests; +package duke.TaskTests; -import Duke.task.Deadline; -import Duke.task.Events; -import Duke.task.TaskList; -import Duke.task.ToDos; +import duke.task.Deadline; +import duke.task.Events; +import duke.task.TaskList; +import duke.task.ToDos; import org.junit.jupiter.api.Test; import java.time.LocalDateTime; diff --git a/src/test/java/Duke/TaskTests/ToDosTest.java b/src/test/java/duke/TaskTests/ToDosTest.java similarity index 86% rename from src/test/java/Duke/TaskTests/ToDosTest.java rename to src/test/java/duke/TaskTests/ToDosTest.java index 21865ff1..53f95283 100644 --- a/src/test/java/Duke/TaskTests/ToDosTest.java +++ b/src/test/java/duke/TaskTests/ToDosTest.java @@ -1,6 +1,6 @@ -package Duke.TaskTests; +package duke.TaskTests; -import Duke.task.ToDos; +import duke.task.ToDos; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index d4cfae16..2ac693cf 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -6,7 +6,7 @@ Hello from |____/ \__,_|_|\_\___| ____________________________________________________________ - Hello! I'm Duke.Duke + Hello! I'm duke.duke What can I do for you? ____________________________________________________________ ____________________________________________________________ diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 9ebaa2cc..bca3a295 100644 --- a/text-ui-test/runtest.bat +++ b/text-ui-test/runtest.bat @@ -7,7 +7,7 @@ REM delete output from previous run if exist ACTUAL.TXT del ACTUAL.TXT REM compile the code into the bin folder -javac -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\Duke.Duke.java +javac -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\duke.duke.java IF ERRORLEVEL 1 ( echo ********** BUILD FAILURE ********** exit /b 1 @@ -15,7 +15,7 @@ IF ERRORLEVEL 1 ( REM no error here, errorlevel == 0 REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT -java -classpath ..\bin Duke.Duke < input.txt > ACTUAL.TXT +java -classpath ..\bin duke.duke < input.txt > ACTUAL.TXT REM compare the output to the expected output FC ACTUAL.TXT EXPECTED.TXT From 2916d0dcce57af644825839bbd17c2dfdadb1a96 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Fri, 29 Oct 2021 01:31:59 +0800 Subject: [PATCH 24/32] Coding Quality Improvement --- src/main/java/duke/parser/CommandDeadline.java | 6 ++++-- src/main/java/duke/parser/CommandEvent.java | 7 +++++-- .../java/duke/storage/StorageFixedDurationReference.java | 4 ++-- src/main/java/duke/storage/StorageTaskList.java | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/duke/parser/CommandDeadline.java b/src/main/java/duke/parser/CommandDeadline.java index 12872787..672dd62d 100644 --- a/src/main/java/duke/parser/CommandDeadline.java +++ b/src/main/java/duke/parser/CommandDeadline.java @@ -16,6 +16,7 @@ public class CommandDeadline extends CommandBase { + static final int dateLength = 3; /** * Creates deadline constructor. * @@ -77,7 +78,7 @@ private LocalDateTime timeParse(String str) throws TimeParseException{ } // gen yyyy,mm,dd ssss String[] date = str.split("/", 3); - if (date.length < 3){ + if (date.length < dateLength){ throw new TimeParseException("DateTime Format DD/MM/YYYY"); } @@ -105,12 +106,13 @@ private LocalDateTime timeParse(String str) throws TimeParseException{ * @return integer time such as 1, 22. */ private int get24HrFormat(String t){ + int timeInterval = 12; int timeVal; if(t.contains("AM")){ timeVal = Integer.parseInt(t.replace("AM", "").stripTrailing()); } else{ timeVal = Integer.parseInt(t.replace("PM", "").stripTrailing()); - timeVal +=12; + timeVal +=timeInterval; } return timeVal; } diff --git a/src/main/java/duke/parser/CommandEvent.java b/src/main/java/duke/parser/CommandEvent.java index e9f1f8f9..a01db3a7 100644 --- a/src/main/java/duke/parser/CommandEvent.java +++ b/src/main/java/duke/parser/CommandEvent.java @@ -14,6 +14,8 @@ import java.time.LocalTime; public class CommandEvent extends CommandBase { + + static final int dateLength = 3; /** * Creates event Command Constructor * @@ -74,7 +76,7 @@ private LocalDate dateParse(String str) throws TimeParseException{ } // gen yyyy,mm,dd ssss String[] date = str.split("/", 3); - if (date.length < 3){ + if (date.length < dateLength){ throw new TimeParseException("DateTime Format DD/MM/YYYY"); } @@ -102,12 +104,13 @@ private LocalDate dateParse(String str) throws TimeParseException{ * @return integer time such as 1, 22. */ private int get24HrFormat(String t){ + int timeinterval = 12; int timeVal; if(t.contains("AM")){ timeVal = Integer.parseInt(t.replace("AM", "").stripTrailing()); } else{ timeVal = Integer.parseInt(t.replace("PM", "").stripTrailing()); - timeVal +=12; + timeVal +=timeinterval; } return timeVal; diff --git a/src/main/java/duke/storage/StorageFixedDurationReference.java b/src/main/java/duke/storage/StorageFixedDurationReference.java index 371adeb5..716c5b85 100644 --- a/src/main/java/duke/storage/StorageFixedDurationReference.java +++ b/src/main/java/duke/storage/StorageFixedDurationReference.java @@ -39,7 +39,7 @@ public FixedDurationTaskList load() throws DukeException { String line; while ((line = br.readLine()) != null) { // process the line - unscheduledRecords.addTask(decodeStr2Unscheduled(line)); + unscheduledRecords.addTask(decodeStrToFixedDurationTask(line)); } } catch (IOException e) { //fail to parse @@ -81,7 +81,7 @@ public void createFile() throws IOException { * @param str the full string per line. * @return created task object. */ - public FixedDurationTask decodeStr2Unscheduled(String str) { + public FixedDurationTask decodeStrToFixedDurationTask(String str) { String[] line = str.split(" \\| "); FixedDurationTask unscheduledRecord; unscheduledRecord = new FixedDurationTask(line[0], Integer.parseInt(line[1])); diff --git a/src/main/java/duke/storage/StorageTaskList.java b/src/main/java/duke/storage/StorageTaskList.java index 7533db65..23b035cb 100644 --- a/src/main/java/duke/storage/StorageTaskList.java +++ b/src/main/java/duke/storage/StorageTaskList.java @@ -52,7 +52,7 @@ public TaskList load() throws DukeException { String line; while ((line = br.readLine()) != null) { // process the line - taskList.addTask(decodeStr2Task(line)); + taskList.addTask(decodeStrToTask(line)); } } catch (IOException e) { //fail to parse @@ -120,7 +120,7 @@ public void save(TaskList taskList) { * @param str the full string per line. * @return created task object. */ - public Task decodeStr2Task(String str) { + public Task decodeStrToTask(String str) { String[] lines = str.split(" \\| "); Task task = null; switch (lines[0]) { From d7e8ec6dea42815a9f6a60e5f7d929efb6b3dc51 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 30 Oct 2021 03:19:46 +0800 Subject: [PATCH 25/32] Additional-ViewSchedule --- build.gradle | 2 +- src/main/java/duke/parser/CommandBase.java | 2 +- .../java/duke/parser/CommandDeadline.java | 4 +- src/main/java/duke/parser/CommandEnums.java | 3 +- src/main/java/duke/parser/CommandEvent.java | 4 +- src/main/java/duke/parser/CommandFind.java | 13 ++-- src/main/java/duke/parser/CommandParser.java | 2 + .../java/duke/parser/CommandViewSchedule.java | 78 +++++++++++++++++++ src/main/java/duke/task/Deadline.java | 14 +++- src/main/java/duke/task/Events.java | 10 ++- src/main/java/duke/task/Task.java | 23 +++++- src/main/java/duke/task/TaskList.java | 24 +++++- src/main/java/duke/task/ToDos.java | 3 +- src/main/java/duke/ui/ReturnMessages.java | 28 ++++++- 14 files changed, 189 insertions(+), 21 deletions(-) create mode 100644 src/main/java/duke/parser/CommandViewSchedule.java diff --git a/build.gradle b/build.gradle index 73b1f710..dda93802 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ test { } application { - mainClassName = "Duke.Duke" + mainClassName = "duke.Duke" } shadowJar { diff --git a/src/main/java/duke/parser/CommandBase.java b/src/main/java/duke/parser/CommandBase.java index f4f0f76d..40655ab9 100644 --- a/src/main/java/duke/parser/CommandBase.java +++ b/src/main/java/duke/parser/CommandBase.java @@ -40,7 +40,7 @@ public CommandBase(String command) throws ArrayIndexOutOfBoundsException, Unknow this.fullCommand = command; this.keyword = ""; this.detail = ""; - if(command.contains(CommandEnums.TODO.getName()) || command.contains(CommandEnums.DEADLINE.getName()) || command.contains(CommandEnums.EVENT.getName()) || command.contains(CommandEnums.FIND.getName())){ + if(command.contains(CommandEnums.TODO.getName()) || command.contains(CommandEnums.DEADLINE.getName()) || command.contains(CommandEnums.EVENT.getName()) || command.contains(CommandEnums.VIEW.getName()) || command.contains(CommandEnums.FIND.getName())){ try { String[] toWords = command.split(" ", 2); this.keyword = toWords[0]; diff --git a/src/main/java/duke/parser/CommandDeadline.java b/src/main/java/duke/parser/CommandDeadline.java index 672dd62d..bd2ea9c3 100644 --- a/src/main/java/duke/parser/CommandDeadline.java +++ b/src/main/java/duke/parser/CommandDeadline.java @@ -74,12 +74,12 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList */ private LocalDateTime timeParse(String str) throws TimeParseException{ if (!str.contains("/")){ - throw new TimeParseException("DateTime Format DD/MM/YYYY"); + throw new TimeParseException("DateTime Format YYYY/MM/DD"); } // gen yyyy,mm,dd ssss String[] date = str.split("/", 3); if (date.length < dateLength){ - throw new TimeParseException("DateTime Format DD/MM/YYYY"); + throw new TimeParseException("DateTime Format YYYY/MM/DD"); } // gen time diff --git a/src/main/java/duke/parser/CommandEnums.java b/src/main/java/duke/parser/CommandEnums.java index 52012f8f..a19facd0 100644 --- a/src/main/java/duke/parser/CommandEnums.java +++ b/src/main/java/duke/parser/CommandEnums.java @@ -9,7 +9,8 @@ public enum CommandEnums { TODO("todo"), EVENT("event"), DEADLINE("deadline"), - FIND("find") + FIND("find"), + VIEW("view") ; /** diff --git a/src/main/java/duke/parser/CommandEvent.java b/src/main/java/duke/parser/CommandEvent.java index a01db3a7..e22a4d7c 100644 --- a/src/main/java/duke/parser/CommandEvent.java +++ b/src/main/java/duke/parser/CommandEvent.java @@ -72,12 +72,12 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList */ private LocalDate dateParse(String str) throws TimeParseException{ if (!str.contains("/")){ - throw new TimeParseException("DateTime Format DD/MM/YYYY"); + throw new TimeParseException("DateTime Format YYYY/MM/DD"); } // gen yyyy,mm,dd ssss String[] date = str.split("/", 3); if (date.length < dateLength){ - throw new TimeParseException("DateTime Format DD/MM/YYYY"); + throw new TimeParseException("DateTime Format YYYY/MM/DD"); } // gen time diff --git a/src/main/java/duke/parser/CommandFind.java b/src/main/java/duke/parser/CommandFind.java index 27a93188..9eaa84fc 100644 --- a/src/main/java/duke/parser/CommandFind.java +++ b/src/main/java/duke/parser/CommandFind.java @@ -6,20 +6,21 @@ public class CommandFind extends CommandBase { /** - * Creates find Command Constructor + * Creates find Command Constructor. * + * @param command the full command. */ public CommandFind(String command) { super(command); } /** - * Executes done command - * - * @param taskList the full task list for saving purpose - * @param ui UI object - * @param storageTaskList storage object + * Executes done command. * + * @param taskList the full task list for saving purpose. + * @param ui UI object. + * @param storageTaskList storage object. + * @return returns false as this command does not end the runtime */ @Override public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) { diff --git a/src/main/java/duke/parser/CommandParser.java b/src/main/java/duke/parser/CommandParser.java index 04a47c5c..7804f0b2 100644 --- a/src/main/java/duke/parser/CommandParser.java +++ b/src/main/java/duke/parser/CommandParser.java @@ -26,6 +26,8 @@ public static Command parse(String fullCommand) { command.setCmd(new CommandDeadline(fullCommand)); } else if(fullCommand.contains(CommandEnums.FIND.getName())) { command.setCmd(new CommandFind(fullCommand)); + } else if(fullCommand.contains(CommandEnums.VIEW.getName())) { + command.setCmd(new CommandViewSchedule(fullCommand)); } else { command.setCmd(new CommandError(fullCommand)); } diff --git a/src/main/java/duke/parser/CommandViewSchedule.java b/src/main/java/duke/parser/CommandViewSchedule.java new file mode 100644 index 00000000..c0528499 --- /dev/null +++ b/src/main/java/duke/parser/CommandViewSchedule.java @@ -0,0 +1,78 @@ +package duke.parser; + +import duke.exception.EmptyTaskListException; +import duke.exception.TimeParseException; +import duke.exception.UnknownSyntaxException; +import duke.storage.StorageTaskList; +import duke.task.TaskList; +import duke.ui.UI; + +import java.time.DateTimeException; +import java.time.LocalDate; + +public class CommandViewSchedule extends CommandBase{ + + static final int dateLength = 3; + + /** + * Creates view schedule command constructor. + * + * @param command the full command. + */ + public CommandViewSchedule(String command){super(command);} + + + /** + * Executes view schedule command + * + * @param taskList the full task list for sorting purpose. + * @param ui show interactive information. + * @param storageTaskList storage object. + * @return returns false as this command does not end the runtime + * @throws EmptyTaskListException when task list is empty no schedule to sort + */ + @Override + public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) throws EmptyTaskListException{ + try{ + if (!CommandEnums.VIEW.getName().equals(super.keyword)){ + throw new UnknownSyntaxException(super.keyword); + } + LocalDate scheduleDate = dateParse(super.detail); + taskList.printAsSchedule(scheduleDate); + } catch(EmptyTaskListException e){ + throw new EmptyTaskListException("Empty"); + } + return false; + } + + /** + * Returns parsed time in format {DD-MM-YYYY}. + * + * @param str - the string of datetime. + * @return - Date in its correct format. + * @throws TimeParseException thrown when time format is wrong + */ + private LocalDate dateParse(String str) throws TimeParseException{ + if (!str.contains("/")){ + throw new TimeParseException("DateTime Format YYYY/MM/DD"); + } + // gen yyyy,mm,dd ssss + String[] date = str.split("/", 3); + if (date.length < dateLength){ + throw new TimeParseException("DateTime Format YYYY/MM/DD"); + } + + int year = Integer.parseInt(date[0]); + int month = Integer.parseInt(date[1]); + int dayOfMth = Integer.parseInt(date[2]); + + LocalDate localDate; + try { + localDate = LocalDate.of(year,month,dayOfMth); + } catch (DateTimeException e) { + throw new TimeParseException(e.getMessage()); + } + + return localDate; + } +} diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java index c8e657bf..83485f46 100644 --- a/src/main/java/duke/task/Deadline.java +++ b/src/main/java/duke/task/Deadline.java @@ -1,10 +1,13 @@ package duke.task; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.LocalTime; public class Deadline extends Task { protected LocalDateTime by; + protected LocalDate date; /** * Creates Deadline task. @@ -13,8 +16,9 @@ public class Deadline extends Task { * @param by - the deadline's datetime. */ public Deadline(String description, LocalDateTime by) { - super(description); + super(description, "deadline", by.toLocalDate(), by.toLocalTime()); this.by = by; + this.date = by.toLocalDate(); } /** Prints task by its own style. */ @@ -28,4 +32,12 @@ public String toString() { public String encodeTask() { return "D" + super.encodeTask() + " | " + by.toLocalDate().toString() + " | " + by.toLocalTime().toString(); } + + public LocalDate getDate(){ + return this.date; + } + + public LocalTime getTime(){ + return this.by.toLocalTime(); + } } \ No newline at end of file diff --git a/src/main/java/duke/task/Events.java b/src/main/java/duke/task/Events.java index f6847c9c..31a52c42 100644 --- a/src/main/java/duke/task/Events.java +++ b/src/main/java/duke/task/Events.java @@ -17,7 +17,7 @@ public class Events extends Task { * @param date - the date event is held. */ public Events(String description, LocalDate date, LocalTime start, LocalTime end) { - super(description); + super(description, "event", date, start); this.date = date; this.start = start; this.end = end; @@ -32,4 +32,12 @@ public String toString() { public String encodeTask() { return "E" + super.encodeTask() + " | " + date.toString() + " | " + start.toString() + " | " + end.toString(); } + + public LocalDate getDate(){ + return this.date; + } + + public LocalTime getTime(){ + return this.start; + } } diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java index 1a9f31f9..b5078730 100644 --- a/src/main/java/duke/task/Task.java +++ b/src/main/java/duke/task/Task.java @@ -1,8 +1,14 @@ package duke.task; +import java.time.LocalDate; +import java.time.LocalTime; + public class Task { protected String description; protected boolean isDone; + protected String taskType; + protected LocalDate date; + protected LocalTime time; public static final String DONE = "1"; public static final String UNDONE = "0"; @@ -12,9 +18,12 @@ public class Task { * * @param description - the description string. */ - public Task(String description) { + public Task(String description, String taskType, LocalDate date, LocalTime time) { this.description = description; this.isDone = false; + this.taskType = taskType; + this.date = date; + this.time = time; } /** @@ -44,6 +53,11 @@ public String getTaskInfo(){ return description; } + public String getTaskType(){ + return taskType; + } + + /** Sets the task to Done. */ public void setDone(){ isDone = true; @@ -67,4 +81,11 @@ public String encodeTask() { return " | " + getStatusCode() + " | " + description; } + public LocalDate getDate(){ + return this.date; + } + + public LocalTime getTime(){ + return this.time; + } } \ No newline at end of file diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java index 75ab133d..da3c630e 100644 --- a/src/main/java/duke/task/TaskList.java +++ b/src/main/java/duke/task/TaskList.java @@ -4,7 +4,9 @@ import duke.exception.TaskNotFoundException; import duke.ui.ReturnMessages; +import java.time.LocalDate; import java.util.ArrayList; +import java.util.Comparator; public class TaskList { protected int listSize; @@ -124,6 +126,26 @@ public void printFoundTaskList(String keyword) throws EmptyTaskListException { if(this.listSize == 0){ throw new EmptyTaskListException("empty task"); } - printer.taskFound(keyword, taskList); + printer.taskFoundFeedback(keyword, taskList); } + + /** + * prints schedule order by date + * + * @param dateToPrint the date that the schedule is needed + * @throws EmptyTaskListException if task list is empty, throws exception on empty task list + */ + public void printAsSchedule(LocalDate dateToPrint) throws EmptyTaskListException{ + if(this.listSize == 0){ + throw new EmptyTaskListException("empty task"); + } + printer.taskSchedulingFeedback(dateToPrint, taskList); + } + + // Comparison done using compareTo function + public static void sort(ArrayList list) + { + list.sort(Comparator.comparing(Task::getTime)); + } + } diff --git a/src/main/java/duke/task/ToDos.java b/src/main/java/duke/task/ToDos.java index 93e51a32..64484a92 100644 --- a/src/main/java/duke/task/ToDos.java +++ b/src/main/java/duke/task/ToDos.java @@ -3,7 +3,6 @@ public class ToDos extends Task { protected int duration; - /** * Creates To Do task * @@ -20,7 +19,7 @@ public ToDos(String description) { * @param duration - unscheduled fixed duration. */ public ToDos(String description, int duration) { - super(description); + super(description, "todo", null, null); this.duration = duration; } public int getDuration(){ diff --git a/src/main/java/duke/ui/ReturnMessages.java b/src/main/java/duke/ui/ReturnMessages.java index 8fc58ee1..51904954 100644 --- a/src/main/java/duke/ui/ReturnMessages.java +++ b/src/main/java/duke/ui/ReturnMessages.java @@ -3,7 +3,11 @@ import duke.task.Task; import duke.task.TaskList; +import java.time.LocalDate; import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; /** Handles message output. */ public class ReturnMessages { @@ -37,8 +41,10 @@ public void welcomeFeedback(){ System.out.println(" Check Existing Tasks: list"); System.out.println(" Mark a Task done: done {taskID}"); System.out.println(" Delete a Task: delete {taskID}"); - System.out.println(" Add a Todo Task: todo {action}"); + System.out.println(" Find a Task: find {keyword}"); + System.out.println(" View Schedule: view {date by YYYY/MM/DD}"); System.out.println(" Save Current State: save"); + System.out.println(" Add a Todo Task: todo {action}"); System.out.println(" Add a Event Task: event xxxx /at {date by YYYY/MM/DD} {startTime}AM/PM-{endTime}AM/PM"); System.out.println(" Add a Deadline Task: deadline XXXX /by {date by YYYY/MM/DD} {Time}AM/PM"); System.out.println(" End the program: bye"); @@ -96,13 +102,31 @@ public void printFullTaskList(ArrayList list){ separator(); } + public void taskSchedulingFeedback(LocalDate datePrint, ArrayList list){ + ArrayList printable = new ArrayList<>(); + for(Task t: list){ + if(t.getTaskType().equals("event") || t.getTaskType().equals("deadline")){ + if(t.getDate().equals(datePrint)){ + printable.add(t); + } + } + } + separator(); + System.out.println(" Here are the tasks in your list scheduled for: " +datePrint.toString()); + for(Task t : printable){ + System.out.println(" "+t.toString()); + } + separator(); + } + + /** * Returns task found with keyword with its correct numbering. * * @param key keyword. * @param list full task list. */ - public void taskFound(String key, ArrayList list){ + public void taskFoundFeedback(String key, ArrayList list){ separator(); int numbering = 1; System.out.println(" Here are the matching tasks in your list:"); From 26c470bd7ff3dc6b840db2bdb82244b4ba1309e1 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 30 Oct 2021 13:27:19 +0800 Subject: [PATCH 26/32] Asserts at important check points. Cleared code style that is causing warning. --- src/main/java/duke/parser/CommandBase.java | 2 ++ src/main/java/duke/parser/CommandDeadline.java | 6 ++++-- src/main/java/duke/parser/CommandEvent.java | 6 ++++-- src/main/java/duke/parser/CommandTodo.java | 6 ++++-- .../java/duke/storage/StorageFixedDurationReference.java | 1 + src/main/java/duke/storage/StorageTaskList.java | 1 + src/main/java/duke/task/TaskList.java | 9 ++++++--- src/main/java/duke/ui/ReturnMessages.java | 4 +++- 8 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/main/java/duke/parser/CommandBase.java b/src/main/java/duke/parser/CommandBase.java index 40655ab9..64686bc4 100644 --- a/src/main/java/duke/parser/CommandBase.java +++ b/src/main/java/duke/parser/CommandBase.java @@ -81,6 +81,7 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList */ public void reply(TaskList taskList) throws EmptyTaskListException, UnknownSyntaxException, TaskNotFoundException { if(fullCommand.contains("done")){ + assert fullCommand.contains("done"):"It should have confirmed a done command by this stage"; try { String[] doneCommand = fullCommand.split(" "); taskList.getTask(Integer.parseInt(doneCommand[1]) - 1).setDone(); @@ -93,6 +94,7 @@ public void reply(TaskList taskList) throws EmptyTaskListException, UnknownSynt } } returnMessage.taskAddFeedback(); + assert taskList.getListSize()>0:"There should at least have 1 task"; try { System.out.println(" " + taskList.getLastTask().toString()); System.out.println(" Now you have " + taskList.getListSize() + " tasks in the list."); diff --git a/src/main/java/duke/parser/CommandDeadline.java b/src/main/java/duke/parser/CommandDeadline.java index bd2ea9c3..5936346a 100644 --- a/src/main/java/duke/parser/CommandDeadline.java +++ b/src/main/java/duke/parser/CommandDeadline.java @@ -50,8 +50,10 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList LocalDateTime dateT = timeParse(dateTimes[1]); //endregion Task task = new Deadline(deadlineCommand[0], dateT); - taskList.addTask(task); - success = true; + if(taskList.addTask(task)){ + success = true; + assert taskList.getListSize()>0:"There should at least have 1 task"; + } } catch (IndexOutOfBoundsException e) { throw new TimeManagementException(); } catch (TimeParseException e) { diff --git a/src/main/java/duke/parser/CommandEvent.java b/src/main/java/duke/parser/CommandEvent.java index e22a4d7c..70740d19 100644 --- a/src/main/java/duke/parser/CommandEvent.java +++ b/src/main/java/duke/parser/CommandEvent.java @@ -50,8 +50,10 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList String from = timeRange.split("-", 2)[0]; String to = timeRange.split("-", 2)[1]; Task task = new Events(description, date, timeParse(get24HrFormat(from)),timeParse(get24HrFormat(to))); - taskList.addTask(task); - success = true; + if(taskList.addTask(task)){ + success = true; + assert taskList.getListSize()>0:"There should at least have 1 task"; + } } catch (IndexOutOfBoundsException e) { throw new TimeManagementException(); } diff --git a/src/main/java/duke/parser/CommandTodo.java b/src/main/java/duke/parser/CommandTodo.java index b376dc15..8a0d8c17 100644 --- a/src/main/java/duke/parser/CommandTodo.java +++ b/src/main/java/duke/parser/CommandTodo.java @@ -44,8 +44,10 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList } else{ task = new ToDos(super.detail); } - taskList.addTask(task); - success = true; + if(taskList.addTask(task)){ + success = true; + assert taskList.getListSize()>0:"There should at least have 1 task"; + } } catch (IndexOutOfBoundsException e) { throw new UnknownSyntaxException(super.keyword); } diff --git a/src/main/java/duke/storage/StorageFixedDurationReference.java b/src/main/java/duke/storage/StorageFixedDurationReference.java index 716c5b85..4f5eb35f 100644 --- a/src/main/java/duke/storage/StorageFixedDurationReference.java +++ b/src/main/java/duke/storage/StorageFixedDurationReference.java @@ -34,6 +34,7 @@ public StorageFixedDurationReference() { */ public FixedDurationTaskList load() throws DukeException { FixedDurationTaskList unscheduledRecords = new FixedDurationTaskList(); + assert !file.exists():"The file should exist by now"; if (file.exists()) { try (BufferedReader br = new BufferedReader(new FileReader(file))) { String line; diff --git a/src/main/java/duke/storage/StorageTaskList.java b/src/main/java/duke/storage/StorageTaskList.java index 23b035cb..c553e71d 100644 --- a/src/main/java/duke/storage/StorageTaskList.java +++ b/src/main/java/duke/storage/StorageTaskList.java @@ -46,6 +46,7 @@ public StorageTaskList(String fileName) { */ public TaskList load() throws DukeException { TaskList taskList = new TaskList(); + assert !file.exists():"The file should exist by now"; if (file.exists()) { returnMessage.loadingFileFeedback(); try (BufferedReader br = new BufferedReader(new FileReader(file))) { diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java index da3c630e..45c966bd 100644 --- a/src/main/java/duke/task/TaskList.java +++ b/src/main/java/duke/task/TaskList.java @@ -57,9 +57,12 @@ public void deleteTask(int taskID) throws TaskNotFoundException, EmptyTaskListEx * * @param task - the full task information. */ - public void addTask(Task task){ - this.taskList.add(task); - this.listSize++; + public boolean addTask(Task task){ + if(this.taskList.add(task)){ + this.listSize++; + return true; + } + return false; } /** diff --git a/src/main/java/duke/ui/ReturnMessages.java b/src/main/java/duke/ui/ReturnMessages.java index 51904954..d2c554c4 100644 --- a/src/main/java/duke/ui/ReturnMessages.java +++ b/src/main/java/duke/ui/ReturnMessages.java @@ -127,12 +127,14 @@ public void taskSchedulingFeedback(LocalDate datePrint, ArrayList list){ * @param list full task list. */ public void taskFoundFeedback(String key, ArrayList list){ + assert !list.isEmpty():"Should be caught by emptyTaskListException"; + separator(); int numbering = 1; System.out.println(" Here are the matching tasks in your list:"); for(Task t : list){ if(t.getTaskInfo().contains(key)){ - System.out.println(" "+numbering+"."+t.toString()); + System.out.println(" "+numbering+"."+t); } numbering++; } From 2b50cf0c38410b0e0677f20b48331b27c86f4db2 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 6 Nov 2021 01:11:27 +0800 Subject: [PATCH 27/32] Touch up --- src/main/java/duke/Duke.java | 4 +-- src/main/java/duke/parser/CommandBase.java | 15 +++++++--- .../java/duke/parser/CommandDeadline.java | 28 ++++++++++-------- src/main/java/duke/parser/CommandEvent.java | 29 ++++++++++--------- src/main/java/duke/parser/CommandParser.java | 2 +- src/main/java/duke/parser/CommandTodo.java | 6 ++-- ...mandViewSchedule.java => CommandView.java} | 4 +-- .../StorageFixedDurationReference.java | 3 +- .../java/duke/storage/StorageTaskList.java | 2 +- src/main/java/duke/storage/duke.txt | 5 ++-- src/main/java/duke/task/Task.java | 6 +++- src/main/java/duke/ui/ReturnMessages.java | 9 +++++- .../duke/exceptiontest/ExceptionTest.java | 20 +++++++++++++ .../StorageTaskListTest.java | 8 +++-- .../{TaskTests => tasktest}/DeadlineTest.java | 2 +- .../{TaskTests => tasktest}/EventTest.java | 2 +- .../{TaskTests => tasktest}/TaskListTest.java | 2 +- .../{TaskTests => tasktest}/ToDosTest.java | 4 +-- 18 files changed, 99 insertions(+), 52 deletions(-) rename src/main/java/duke/parser/{CommandViewSchedule.java => CommandView.java} (95%) create mode 100644 src/test/java/duke/exceptiontest/ExceptionTest.java rename src/test/java/duke/{StorageTests => storagetest}/StorageTaskListTest.java (85%) rename src/test/java/duke/{TaskTests => tasktest}/DeadlineTest.java (95%) rename src/test/java/duke/{TaskTests => tasktest}/EventTest.java (96%) rename src/test/java/duke/{TaskTests => tasktest}/TaskListTest.java (97%) rename src/test/java/duke/{TaskTests => tasktest}/ToDosTest.java (77%) diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index da1ad89e..783fd500 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -14,9 +14,9 @@ public class Duke { private TaskList taskList; /** - * Beginning function taking in filepath + * Initializes entire duke. * - * @param filePath - filepath to storage + * @param filePath - filepath to storage. */ public Duke(String filePath) { ui = new UI(); diff --git a/src/main/java/duke/parser/CommandBase.java b/src/main/java/duke/parser/CommandBase.java index 64686bc4..4fb4959a 100644 --- a/src/main/java/duke/parser/CommandBase.java +++ b/src/main/java/duke/parser/CommandBase.java @@ -84,13 +84,20 @@ public void reply(TaskList taskList) throws EmptyTaskListException, UnknownSynt assert fullCommand.contains("done"):"It should have confirmed a done command by this stage"; try { String[] doneCommand = fullCommand.split(" "); - taskList.getTask(Integer.parseInt(doneCommand[1]) - 1).setDone(); - returnMessage.taskDoneFeedback(); - System.out.println(" " + taskList.getTask(Integer.parseInt(doneCommand[1]) - 1).toString()); + if(Integer.parseInt(doneCommand[1]) - 1 >= taskList.getListSize()){ + throw new TaskNotFoundException("you only have "+taskList.getListSize()+" and you entered "+Integer.parseInt(doneCommand[1])); + } + if(taskList.getTask(Integer.parseInt(doneCommand[1]) - 1).isDone()){ + returnMessage.taskAlreadyDoneFeedback(); + } else{ + taskList.getTask(Integer.parseInt(doneCommand[1]) - 1).setDone(); + returnMessage.taskDoneFeedback(); + System.out.println(" " + taskList.getTask(Integer.parseInt(doneCommand[1]) - 1).toString()); + } returnMessage.separator(); return; } catch(NumberFormatException nf){ - throw new TaskNotFoundException("task not found"); + throw new TaskNotFoundException("task does not exist"); } } returnMessage.taskAddFeedback(); diff --git a/src/main/java/duke/parser/CommandDeadline.java b/src/main/java/duke/parser/CommandDeadline.java index 5936346a..5bc073db 100644 --- a/src/main/java/duke/parser/CommandDeadline.java +++ b/src/main/java/duke/parser/CommandDeadline.java @@ -39,7 +39,7 @@ public CommandDeadline(String command){ */ @Override public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) throws TimeManagementException, TimeParseException{ - boolean success = false; + boolean isSuccess = false; try { if (!CommandEnums.DEADLINE.getName().equals(super.keyword)){ throw new UnknownSyntaxException(super.keyword); @@ -51,7 +51,7 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList //endregion Task task = new Deadline(deadlineCommand[0], dateT); if(taskList.addTask(task)){ - success = true; + isSuccess = true; assert taskList.getListSize()>0:"There should at least have 1 task"; } } catch (IndexOutOfBoundsException e) { @@ -60,7 +60,7 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList throw new TimeParseException(e.getMessage()); } - if (success) { + if (isSuccess) { reply(taskList); } @@ -76,12 +76,12 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList */ private LocalDateTime timeParse(String str) throws TimeParseException{ if (!str.contains("/")){ - throw new TimeParseException("DateTime Format YYYY/MM/DD"); + throw new TimeParseException("Date Format YYYY/MM/DD"); } // gen yyyy,mm,dd ssss String[] date = str.split("/", 3); if (date.length < dateLength){ - throw new TimeParseException("DateTime Format YYYY/MM/DD"); + throw new TimeParseException("Date Format YYYY/MM/DD"); } // gen time @@ -109,13 +109,17 @@ private LocalDateTime timeParse(String str) throws TimeParseException{ */ private int get24HrFormat(String t){ int timeInterval = 12; - int timeVal; - if(t.contains("AM")){ - timeVal = Integer.parseInt(t.replace("AM", "").stripTrailing()); - } else{ - timeVal = Integer.parseInt(t.replace("PM", "").stripTrailing()); - timeVal +=timeInterval; + int timeValue; + if(t.toUpperCase().contains("AM")){ + timeValue = Integer.parseInt(t.replace("AM", "").stripTrailing()); + } else if(t.toUpperCase().contains("PM")){ + timeValue = Integer.parseInt(t.replace("PM", "").stripTrailing()); + timeValue += timeInterval; + }else{ + throw new TimeParseException("Time Format 1AM/1PM"); } - return timeVal; + + return timeValue; } + } diff --git a/src/main/java/duke/parser/CommandEvent.java b/src/main/java/duke/parser/CommandEvent.java index 70740d19..bc795908 100644 --- a/src/main/java/duke/parser/CommandEvent.java +++ b/src/main/java/duke/parser/CommandEvent.java @@ -36,7 +36,7 @@ public CommandEvent(String command) { */ @Override public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) throws TimeManagementException{ - boolean success = false; + boolean isSuccess = false; try { if (!CommandEnums.EVENT.getName().equals(super.keyword)){ throw new UnknownSyntaxException(super.keyword); @@ -47,18 +47,19 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList LocalDate date = dateParse(dateTime); String[] dateTimeInformation = dateTime.split(" ", 2); String timeRange = dateTimeInformation[1]; + System.out.println(timeRange); String from = timeRange.split("-", 2)[0]; String to = timeRange.split("-", 2)[1]; Task task = new Events(description, date, timeParse(get24HrFormat(from)),timeParse(get24HrFormat(to))); if(taskList.addTask(task)){ - success = true; + isSuccess = true; assert taskList.getListSize()>0:"There should at least have 1 task"; } } catch (IndexOutOfBoundsException e) { throw new TimeManagementException(); } - if (success) { + if (isSuccess) { reply(taskList); } @@ -74,12 +75,12 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList */ private LocalDate dateParse(String str) throws TimeParseException{ if (!str.contains("/")){ - throw new TimeParseException("DateTime Format YYYY/MM/DD"); + throw new TimeParseException("Date Format YYYY/MM/DD"); } // gen yyyy,mm,dd ssss String[] date = str.split("/", 3); if (date.length < dateLength){ - throw new TimeParseException("DateTime Format YYYY/MM/DD"); + throw new TimeParseException("Date Format YYYY/MM/DD"); } // gen time @@ -106,16 +107,18 @@ private LocalDate dateParse(String str) throws TimeParseException{ * @return integer time such as 1, 22. */ private int get24HrFormat(String t){ - int timeinterval = 12; - int timeVal; - if(t.contains("AM")){ - timeVal = Integer.parseInt(t.replace("AM", "").stripTrailing()); - } else{ - timeVal = Integer.parseInt(t.replace("PM", "").stripTrailing()); - timeVal +=timeinterval; + int timeInterval = 12; + int timeValue; + if(t.toUpperCase().contains("AM")){ + timeValue = Integer.parseInt(t.replace("AM", "").stripTrailing()); + } else if(t.toUpperCase().contains("PM")){ + timeValue = Integer.parseInt(t.replace("PM", "").stripTrailing()); + timeValue += timeInterval; + }else{ + throw new TimeParseException("Time Format 1AM/1PM"); } - return timeVal; + return timeValue; } /** diff --git a/src/main/java/duke/parser/CommandParser.java b/src/main/java/duke/parser/CommandParser.java index 7804f0b2..ae4bc189 100644 --- a/src/main/java/duke/parser/CommandParser.java +++ b/src/main/java/duke/parser/CommandParser.java @@ -27,7 +27,7 @@ public static Command parse(String fullCommand) { } else if(fullCommand.contains(CommandEnums.FIND.getName())) { command.setCmd(new CommandFind(fullCommand)); } else if(fullCommand.contains(CommandEnums.VIEW.getName())) { - command.setCmd(new CommandViewSchedule(fullCommand)); + command.setCmd(new CommandView(fullCommand)); } else { command.setCmd(new CommandError(fullCommand)); } diff --git a/src/main/java/duke/parser/CommandTodo.java b/src/main/java/duke/parser/CommandTodo.java index 8a0d8c17..2ee1056e 100644 --- a/src/main/java/duke/parser/CommandTodo.java +++ b/src/main/java/duke/parser/CommandTodo.java @@ -30,7 +30,7 @@ public CommandTodo(String command) { */ @Override public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList) { - boolean success = false; + boolean isSuccess = false; try { if (!CommandEnums.TODO.getName().equals(super.keyword)){ throw new UnknownSyntaxException(super.keyword); @@ -45,14 +45,14 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList task = new ToDos(super.detail); } if(taskList.addTask(task)){ - success = true; + isSuccess = true; assert taskList.getListSize()>0:"There should at least have 1 task"; } } catch (IndexOutOfBoundsException e) { throw new UnknownSyntaxException(super.keyword); } - if (success) { + if (isSuccess) { reply(taskList); } diff --git a/src/main/java/duke/parser/CommandViewSchedule.java b/src/main/java/duke/parser/CommandView.java similarity index 95% rename from src/main/java/duke/parser/CommandViewSchedule.java rename to src/main/java/duke/parser/CommandView.java index c0528499..e71ef7d7 100644 --- a/src/main/java/duke/parser/CommandViewSchedule.java +++ b/src/main/java/duke/parser/CommandView.java @@ -10,7 +10,7 @@ import java.time.DateTimeException; import java.time.LocalDate; -public class CommandViewSchedule extends CommandBase{ +public class CommandView extends CommandBase{ static final int dateLength = 3; @@ -19,7 +19,7 @@ public class CommandViewSchedule extends CommandBase{ * * @param command the full command. */ - public CommandViewSchedule(String command){super(command);} + public CommandView(String command){super(command);} /** diff --git a/src/main/java/duke/storage/StorageFixedDurationReference.java b/src/main/java/duke/storage/StorageFixedDurationReference.java index 4f5eb35f..9e563612 100644 --- a/src/main/java/duke/storage/StorageFixedDurationReference.java +++ b/src/main/java/duke/storage/StorageFixedDurationReference.java @@ -22,7 +22,6 @@ public class StorageFixedDurationReference { /** Creates Storage_Unscheduled object. */ public StorageFixedDurationReference() { - //this.fileName = fileName; this.file = new File(System.getProperty("user.dir") + "/src/main/java/Duke/storage/fixedDurationTask.txt"); // create a File for the given file path this.fileName = file.getName(); } @@ -34,7 +33,7 @@ public StorageFixedDurationReference() { */ public FixedDurationTaskList load() throws DukeException { FixedDurationTaskList unscheduledRecords = new FixedDurationTaskList(); - assert !file.exists():"The file should exist by now"; + assert file.exists():"The file should exist by now"; if (file.exists()) { try (BufferedReader br = new BufferedReader(new FileReader(file))) { String line; diff --git a/src/main/java/duke/storage/StorageTaskList.java b/src/main/java/duke/storage/StorageTaskList.java index c553e71d..dc1bc58b 100644 --- a/src/main/java/duke/storage/StorageTaskList.java +++ b/src/main/java/duke/storage/StorageTaskList.java @@ -46,7 +46,7 @@ public StorageTaskList(String fileName) { */ public TaskList load() throws DukeException { TaskList taskList = new TaskList(); - assert !file.exists():"The file should exist by now"; + assert file.exists():"The file should exist by now"; if (file.exists()) { returnMessage.loadingFileFeedback(); try (BufferedReader br = new BufferedReader(new FileReader(file))) { diff --git a/src/main/java/duke/storage/duke.txt b/src/main/java/duke/storage/duke.txt index 95827fbc..8a409a9d 100644 --- a/src/main/java/duke/storage/duke.txt +++ b/src/main/java/duke/storage/duke.txt @@ -10,5 +10,6 @@ D | 0 | return book | 2021-12-25 | 16:00 T | 0 | eat | 0 E | 0 | Finish Homework | 2021-12-25 | 16:00 | 18:00 E | 0 | new year | 2022-02-02 | 00:00 | 12:00 -T | 0 | read book | 1 -T | 0 | study book | 0 +T | 1 | read book | 1 +T | 1 | study book | 0 +E | 0 | meeting | 2021-12-25 | 00:00 | 15:00 diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java index b5078730..295b69f2 100644 --- a/src/main/java/duke/task/Task.java +++ b/src/main/java/duke/task/Task.java @@ -57,6 +57,10 @@ public String getTaskType(){ return taskType; } + /** Gets the task done condition. */ + public boolean isDone(){ + return isDone; + } /** Sets the task to Done. */ public void setDone(){ @@ -64,7 +68,7 @@ public void setDone(){ } /** - * Base Function to print task. + * Prints task on its own syntax. * * @return tasks [] TASK. */ diff --git a/src/main/java/duke/ui/ReturnMessages.java b/src/main/java/duke/ui/ReturnMessages.java index d2c554c4..994cee86 100644 --- a/src/main/java/duke/ui/ReturnMessages.java +++ b/src/main/java/duke/ui/ReturnMessages.java @@ -21,6 +21,13 @@ public void taskDoneFeedback(){ System.out.println(" Nice! I've marked this task as done:"); } + /** Feedbacks when a task is already done. */ + public void taskAlreadyDoneFeedback(){ + separator(); + System.out.println(" This task is already done."); + } + + /** Feedbacks when adding a task. */ public void taskAddFeedback(){ separator(); @@ -177,7 +184,7 @@ public void exception_feedback_unknownSyntax(String message){ */ public void exception_feedback_taskNotFound(String message){ separator(); - System.out.printf(" OOPS!!! Please key in by Tasks.Task ID instead of [%s]\n", message); + System.out.printf(" OOPS!!! Task was not found [%s]\n", message); separator(); } diff --git a/src/test/java/duke/exceptiontest/ExceptionTest.java b/src/test/java/duke/exceptiontest/ExceptionTest.java new file mode 100644 index 00000000..7e2f518f --- /dev/null +++ b/src/test/java/duke/exceptiontest/ExceptionTest.java @@ -0,0 +1,20 @@ +package duke.exceptiontest; + +import duke.task.Deadline; +import org.junit.jupiter.api.Test; + +import java.time.LocalDateTime; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class ExceptionTest { + @Test + public void exception(){ + LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); + Deadline deadline = new Deadline("return book", sample); + assertEquals("[D][ ] return book(by: 2021-12-25[SATURDAY] 16:00)", deadline.toString()); + assertEquals("D | 0 | return book | 2021-12-25 | 16:00", deadline.encodeTask()); + + + } +} diff --git a/src/test/java/duke/StorageTests/StorageTaskListTest.java b/src/test/java/duke/storagetest/StorageTaskListTest.java similarity index 85% rename from src/test/java/duke/StorageTests/StorageTaskListTest.java rename to src/test/java/duke/storagetest/StorageTaskListTest.java index 15d38837..e0ee69b1 100644 --- a/src/test/java/duke/StorageTests/StorageTaskListTest.java +++ b/src/test/java/duke/storagetest/StorageTaskListTest.java @@ -1,4 +1,4 @@ -package duke.StorageTests; +package duke.storagetest; import duke.storage.StorageTaskList; import duke.task.Deadline; @@ -17,14 +17,16 @@ public class StorageTaskListTest { @Test public void storage() throws IOException { LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); + TaskList tasks = new TaskList(); ToDos toDos = new ToDos("eat"); Deadline deadline = new Deadline("return book", sample); Events event = new Events("Finish Homework",sample.toLocalDate(),sample.toLocalTime(),sample.toLocalTime().plusHours(2)); - TaskList tasks = new TaskList(); tasks.addTask(toDos); + assert tasks.getListSize()==1:"There should exist 1 task"; tasks.addTask(deadline); + assert tasks.getListSize()==2:"There should exist 2 task"; tasks.addTask(event); - + assert tasks.getListSize()==3:"There should exist 3 task"; StorageTaskList store = new StorageTaskList("Testing.txt"); assertFalse(store.existence()); store.createFile(); diff --git a/src/test/java/duke/TaskTests/DeadlineTest.java b/src/test/java/duke/tasktest/DeadlineTest.java similarity index 95% rename from src/test/java/duke/TaskTests/DeadlineTest.java rename to src/test/java/duke/tasktest/DeadlineTest.java index 0a8c76bb..27921ad9 100644 --- a/src/test/java/duke/TaskTests/DeadlineTest.java +++ b/src/test/java/duke/tasktest/DeadlineTest.java @@ -1,4 +1,4 @@ -package duke.TaskTests; +package duke.tasktest; import duke.task.Deadline; diff --git a/src/test/java/duke/TaskTests/EventTest.java b/src/test/java/duke/tasktest/EventTest.java similarity index 96% rename from src/test/java/duke/TaskTests/EventTest.java rename to src/test/java/duke/tasktest/EventTest.java index 97169a70..10339cf4 100644 --- a/src/test/java/duke/TaskTests/EventTest.java +++ b/src/test/java/duke/tasktest/EventTest.java @@ -1,4 +1,4 @@ -package duke.TaskTests; +package duke.tasktest; import duke.task.Events; import org.junit.jupiter.api.Test; diff --git a/src/test/java/duke/TaskTests/TaskListTest.java b/src/test/java/duke/tasktest/TaskListTest.java similarity index 97% rename from src/test/java/duke/TaskTests/TaskListTest.java rename to src/test/java/duke/tasktest/TaskListTest.java index 404387bd..063f91d8 100644 --- a/src/test/java/duke/TaskTests/TaskListTest.java +++ b/src/test/java/duke/tasktest/TaskListTest.java @@ -1,4 +1,4 @@ -package duke.TaskTests; +package duke.tasktest; import duke.task.Deadline; import duke.task.Events; diff --git a/src/test/java/duke/TaskTests/ToDosTest.java b/src/test/java/duke/tasktest/ToDosTest.java similarity index 77% rename from src/test/java/duke/TaskTests/ToDosTest.java rename to src/test/java/duke/tasktest/ToDosTest.java index 53f95283..85ff83e2 100644 --- a/src/test/java/duke/TaskTests/ToDosTest.java +++ b/src/test/java/duke/tasktest/ToDosTest.java @@ -1,4 +1,4 @@ -package duke.TaskTests; +package duke.tasktest; import duke.task.ToDos; import org.junit.jupiter.api.Test; @@ -10,6 +10,6 @@ public class ToDosTest { public void todo(){ ToDos toDos = new ToDos("eat"); assertEquals("[T][ ] eat", toDos.toString()); - assertEquals("T | 0 | eat", toDos.encodeTask()); + assertEquals("T | 0 | eat | 0", toDos.encodeTask()); } } From e7f4bf256a5e2c01c52f8196b1fbcce34aa1f913 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 6 Nov 2021 01:47:29 +0800 Subject: [PATCH 28/32] Fixed certain bugs after creating JAR file --- .../duke/storage/StorageFixedDurationReference.java | 2 +- src/main/java/duke/storage/StorageTaskList.java | 2 +- src/main/java/duke/task/TaskList.java | 9 ++++++++- src/main/java/duke/ui/ReturnMessages.java | 12 ++---------- text-ui-test/input.txt | 5 ++++- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/main/java/duke/storage/StorageFixedDurationReference.java b/src/main/java/duke/storage/StorageFixedDurationReference.java index 9e563612..0fa07a4a 100644 --- a/src/main/java/duke/storage/StorageFixedDurationReference.java +++ b/src/main/java/duke/storage/StorageFixedDurationReference.java @@ -22,7 +22,7 @@ public class StorageFixedDurationReference { /** Creates Storage_Unscheduled object. */ public StorageFixedDurationReference() { - this.file = new File(System.getProperty("user.dir") + "/src/main/java/Duke/storage/fixedDurationTask.txt"); // create a File for the given file path + this.file = new File(System.getProperty("user.dir") + "/fixedDurationTask.txt"); // create a File for the given file path this.fileName = file.getName(); } diff --git a/src/main/java/duke/storage/StorageTaskList.java b/src/main/java/duke/storage/StorageTaskList.java index dc1bc58b..a0825cd3 100644 --- a/src/main/java/duke/storage/StorageTaskList.java +++ b/src/main/java/duke/storage/StorageTaskList.java @@ -36,7 +36,7 @@ public boolean existence(){ */ public StorageTaskList(String fileName) { this.fileName = fileName; - this.file = new File(System.getProperty("user.dir") + "/src/main/java/Duke/storage/"+fileName); // create a File for the given file path + this.file = new File(System.getProperty("user.dir") + "/"+fileName); // create a File for the given file path } /** diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java index 45c966bd..ce273aff 100644 --- a/src/main/java/duke/task/TaskList.java +++ b/src/main/java/duke/task/TaskList.java @@ -142,7 +142,14 @@ public void printAsSchedule(LocalDate dateToPrint) throws EmptyTaskListException if(this.listSize == 0){ throw new EmptyTaskListException("empty task"); } - printer.taskSchedulingFeedback(dateToPrint, taskList); + ArrayList tempTaskList = new ArrayList<>(); + for(Task t : taskList){ + if(!t.getTaskType().equals("todo")){ + tempTaskList.add(t); + } + } + sort(tempTaskList); + printer.taskSchedulingFeedback(dateToPrint, tempTaskList); } // Comparison done using compareTo function diff --git a/src/main/java/duke/ui/ReturnMessages.java b/src/main/java/duke/ui/ReturnMessages.java index 994cee86..3423b0d9 100644 --- a/src/main/java/duke/ui/ReturnMessages.java +++ b/src/main/java/duke/ui/ReturnMessages.java @@ -110,17 +110,9 @@ public void printFullTaskList(ArrayList list){ } public void taskSchedulingFeedback(LocalDate datePrint, ArrayList list){ - ArrayList printable = new ArrayList<>(); - for(Task t: list){ - if(t.getTaskType().equals("event") || t.getTaskType().equals("deadline")){ - if(t.getDate().equals(datePrint)){ - printable.add(t); - } - } - } separator(); - System.out.println(" Here are the tasks in your list scheduled for: " +datePrint.toString()); - for(Task t : printable){ + System.out.println(" Here are the tasks in your list scheduled for: " +datePrint.toString() + ", "+datePrint.getDayOfWeek()); + for(Task t : list){ System.out.println(" "+t.toString()); } separator(); diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index d05dcd6b..18b02372 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -8,8 +8,11 @@ event project meeting /at 2021/10/24 2PM-4PM to do join sports club to do borrow book list +deadline borrow book /by 2021/11/5 11AM +deadline read book /by 2021/11/5 3PM deadline return book /by 2021/11/5 10PM -event project meeting /at 2022/7/30 2PM-4PM +event project meeting /at 2021/11/5 2PM-4PM +event family dinner /at 2021/11/5 6PM-9PM event new year /at 2022/2/2 0AM-12AM save list From 6bad20e42fd9a6a749542334452f45aadbc65b44 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Mon, 8 Nov 2021 00:01:05 +0800 Subject: [PATCH 29/32] Extracted date/time parse function into a new package --- duke.txt | 10 ++ fixedDurationTask.txt | 4 + .../java/duke/parser/CommandDeadline.java | 62 +--------- src/main/java/duke/parser/CommandEvent.java | 71 +---------- .../duke/parser/timeHelper/DateTimeParse.java | 112 ++++++++++++++++++ src/main/java/duke/task/TaskList.java | 4 +- src/main/java/duke/ui/ReturnMessages.java | 25 ++-- 7 files changed, 152 insertions(+), 136 deletions(-) create mode 100644 duke.txt create mode 100644 fixedDurationTask.txt create mode 100644 src/main/java/duke/parser/timeHelper/DateTimeParse.java diff --git a/duke.txt b/duke.txt new file mode 100644 index 00000000..d7eb218d --- /dev/null +++ b/duke.txt @@ -0,0 +1,10 @@ +T | 0 | eat | 0 +T | 0 | read sales report | 2 +T | 0 | read sales report | 2 +T | 0 | eat | 0 +T | 0 | sleep | 0 +D | 0 | return book | 2021-11-05 | 22:00 +D | 0 | read book | 2021-11-05 | 15:00 +D | 0 | borrow book | 2021-11-05 | 11:00 +E | 0 | project meeting | 2021-11-05 | 14:00 | 16:00 +E | 0 | family dinner | 2021-11-05 | 18:00 | 21:00 diff --git a/fixedDurationTask.txt b/fixedDurationTask.txt new file mode 100644 index 00000000..e786b73e --- /dev/null +++ b/fixedDurationTask.txt @@ -0,0 +1,4 @@ +read sales report | 2 +read book | 1 +do homework | 4 +submit claims | 1 \ No newline at end of file diff --git a/src/main/java/duke/parser/CommandDeadline.java b/src/main/java/duke/parser/CommandDeadline.java index 5bc073db..cb666d0d 100644 --- a/src/main/java/duke/parser/CommandDeadline.java +++ b/src/main/java/duke/parser/CommandDeadline.java @@ -3,20 +3,21 @@ import duke.exception.TimeManagementException; import duke.exception.TimeParseException; import duke.exception.UnknownSyntaxException; +import duke.parser.timeHelper.DateTimeParse; import duke.storage.StorageTaskList; import duke.task.Deadline; import duke.task.Task; import duke.task.TaskList; import duke.ui.UI; -import java.time.DateTimeException; import java.time.LocalDateTime; public class CommandDeadline extends CommandBase { - static final int dateLength = 3; + DateTimeParse timeHelp = new DateTimeParse(); + /** * Creates deadline constructor. * @@ -47,7 +48,7 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList String[] deadlineCommand = super.detail.split("/by", 2); //region time parse String[] dateTimes = deadlineCommand[1].split(" ", 2); - LocalDateTime dateT = timeParse(dateTimes[1]); + LocalDateTime dateT = timeHelp.dateAndTimeParse(dateTimes[1]); //endregion Task task = new Deadline(deadlineCommand[0], dateT); if(taskList.addTask(task)){ @@ -67,59 +68,4 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList return false; } - /** - * Returns parsed time as format {DD-MM-YYYY}. - * - * @param str - the string of datetime. - * @return - Date in its correct format. - * @throws TimeParseException thrown when date format is wrong - */ - private LocalDateTime timeParse(String str) throws TimeParseException{ - if (!str.contains("/")){ - throw new TimeParseException("Date Format YYYY/MM/DD"); - } - // gen yyyy,mm,dd ssss - String[] date = str.split("/", 3); - if (date.length < dateLength){ - throw new TimeParseException("Date Format YYYY/MM/DD"); - } - - // gen time - String[] time = date[2].split(" ", 2); - int year = Integer.parseInt(date[0]); - int month = Integer.parseInt(date[1]); - int dayOfMth = Integer.parseInt(time[0]); - int hour = get24HrFormat(time[1]); - - LocalDateTime localDate; - try { - localDate = LocalDateTime.of(year,month,dayOfMth,hour,0,0,0); - } catch (DateTimeException e) { - throw new TimeParseException(e.getMessage()); - } - - return localDate; - } - - /** - * Transforms time to 24hour format. - * - * @param t string such as [1AM] [10PM]. - * @return integer time such as 1, 22. - */ - private int get24HrFormat(String t){ - int timeInterval = 12; - int timeValue; - if(t.toUpperCase().contains("AM")){ - timeValue = Integer.parseInt(t.replace("AM", "").stripTrailing()); - } else if(t.toUpperCase().contains("PM")){ - timeValue = Integer.parseInt(t.replace("PM", "").stripTrailing()); - timeValue += timeInterval; - }else{ - throw new TimeParseException("Time Format 1AM/1PM"); - } - - return timeValue; - } - } diff --git a/src/main/java/duke/parser/CommandEvent.java b/src/main/java/duke/parser/CommandEvent.java index bc795908..6976f5ed 100644 --- a/src/main/java/duke/parser/CommandEvent.java +++ b/src/main/java/duke/parser/CommandEvent.java @@ -3,19 +3,19 @@ import duke.exception.TimeManagementException; import duke.exception.TimeParseException; import duke.exception.UnknownSyntaxException; +import duke.parser.timeHelper.DateTimeParse; import duke.storage.StorageTaskList; import duke.task.Events; import duke.task.Task; import duke.task.TaskList; import duke.ui.UI; -import java.time.DateTimeException; import java.time.LocalDate; -import java.time.LocalTime; public class CommandEvent extends CommandBase { - static final int dateLength = 3; + DateTimeParse timeHelp = new DateTimeParse(); + /** * Creates event Command Constructor * @@ -44,13 +44,12 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList String[] dt = super.detail.split("/at", 2); String description = dt[0]; String dateTime = dt[1].substring(1); - LocalDate date = dateParse(dateTime); + LocalDate date = timeHelp.dateParse(dateTime); String[] dateTimeInformation = dateTime.split(" ", 2); String timeRange = dateTimeInformation[1]; - System.out.println(timeRange); String from = timeRange.split("-", 2)[0]; String to = timeRange.split("-", 2)[1]; - Task task = new Events(description, date, timeParse(get24HrFormat(from)),timeParse(get24HrFormat(to))); + Task task = new Events(description, date, timeHelp.timeParse(timeHelp.get24HrFormat(from)),timeHelp.timeParse(timeHelp.get24HrFormat(to))); if(taskList.addTask(task)){ isSuccess = true; assert taskList.getListSize()>0:"There should at least have 1 task"; @@ -66,68 +65,8 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList return false; } - /** - * Returns parsed time in format {DD-MM-YYYY}. - * - * @param str - the string of datetime. - * @return - Date in its correct format. - * @throws TimeParseException thrown when time format is wrong - */ - private LocalDate dateParse(String str) throws TimeParseException{ - if (!str.contains("/")){ - throw new TimeParseException("Date Format YYYY/MM/DD"); - } - // gen yyyy,mm,dd ssss - String[] date = str.split("/", 3); - if (date.length < dateLength){ - throw new TimeParseException("Date Format YYYY/MM/DD"); - } - // gen time - String[] time = date[2].split(" ", 2); - int year = Integer.parseInt(date[0]); - int month = Integer.parseInt(date[1]); - int dayOfMth = Integer.parseInt(time[0]); - LocalDate localDate; - try { - localDate = LocalDate.of(year,month,dayOfMth); - } catch (DateTimeException e) { - throw new TimeParseException(e.getMessage()); - } - return localDate; - } - - /** - * Transforms time to 24hour format. - * - * @param t string such as [1AM] [10PM]. - * @return integer time such as 1, 22. - */ - private int get24HrFormat(String t){ - int timeInterval = 12; - int timeValue; - if(t.toUpperCase().contains("AM")){ - timeValue = Integer.parseInt(t.replace("AM", "").stripTrailing()); - } else if(t.toUpperCase().contains("PM")){ - timeValue = Integer.parseInt(t.replace("PM", "").stripTrailing()); - timeValue += timeInterval; - }else{ - throw new TimeParseException("Time Format 1AM/1PM"); - } - - return timeValue; - } - - /** - * Returns time in LocalTime format. - * - * @param t the integer time [1] [22] - * @return time in LocalTime [01:00:00] [22:00:00] - */ - private LocalTime timeParse(int t){ - return LocalTime.of(t,0,0); - } } \ No newline at end of file diff --git a/src/main/java/duke/parser/timeHelper/DateTimeParse.java b/src/main/java/duke/parser/timeHelper/DateTimeParse.java new file mode 100644 index 00000000..35dae3d2 --- /dev/null +++ b/src/main/java/duke/parser/timeHelper/DateTimeParse.java @@ -0,0 +1,112 @@ +package duke.parser.timeHelper; + +import duke.exception.TimeParseException; + +import java.time.DateTimeException; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; + +public class DateTimeParse { + + static final int dateLength = 3; + + /** + * Returns parsed time in format {DD-MM-YYYY}. + * + * @param str - the string of datetime. + * @return - Date in its correct format. + * @throws TimeParseException thrown when time format is wrong + */ + public LocalDate dateParse(String str) throws TimeParseException{ + if (!str.contains("/")){ + throw new TimeParseException("Date Format YYYY/MM/DD"); + } + // gen yyyy,mm,dd ssss + String[] date = str.split("/", 3); + if (date.length < dateLength){ + throw new TimeParseException("Date Format YYYY/MM/DD"); + } + + // gen time + String[] time = date[2].split(" ", 2); + int year = Integer.parseInt(date[0]); + int month = Integer.parseInt(date[1]); + int dayOfMth = Integer.parseInt(time[0]); + + LocalDate localDate; + try { + localDate = LocalDate.of(year,month,dayOfMth); + } catch (DateTimeException e) { + throw new TimeParseException(e.getMessage()); + } + + return localDate; + } + + + /** + * Returns parsed time as format {DD-MM-YYYY}. + * + * @param str - the string of datetime. + * @return - Date in its correct format. + * @throws TimeParseException thrown when date format is wrong + */ + public LocalDateTime dateAndTimeParse(String str) throws TimeParseException{ + if (!str.contains("/")){ + throw new TimeParseException("Date Format YYYY/MM/DD"); + } + // gen yyyy,mm,dd ssss + String[] date = str.split("/", 3); + if (date.length < dateLength){ + throw new TimeParseException("Date Format YYYY/MM/DD"); + } + + // gen time + String[] time = date[2].split(" ", 2); + int year = Integer.parseInt(date[0]); + int month = Integer.parseInt(date[1]); + int dayOfMth = Integer.parseInt(time[0]); + int hour = get24HrFormat(time[1]); + + LocalDateTime localDateTime; + try { + localDateTime = LocalDateTime.of(year,month,dayOfMth,hour,0,0,0); + } catch (DateTimeException e) { + throw new TimeParseException(e.getMessage()); + } + + return localDateTime; + } + + /** + * Transforms time to 24hour format. + * + * @param t string such as [1AM] [10PM]. + * @return integer time such as 1, 22. + */ + public int get24HrFormat(String t){ + int timeInterval = 12; + int timeValue; + if(t.toUpperCase().contains("AM")){ + timeValue = Integer.parseInt(t.replace("AM", "").stripTrailing()); + } else if(t.toUpperCase().contains("PM")){ + timeValue = Integer.parseInt(t.replace("PM", "").stripTrailing()); + timeValue += timeInterval; + }else{ + throw new TimeParseException("Time Format 1AM/1PM"); + } + + return timeValue; + } + + /** + * Returns time in LocalTime format. + * + * @param t the integer time [1] [22] + * @return time in LocalTime [01:00:00] [22:00:00] + */ + public LocalTime timeParse(int t){ + return LocalTime.of(t,0,0); + } +} diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java index ce273aff..8b4506c5 100644 --- a/src/main/java/duke/task/TaskList.java +++ b/src/main/java/duke/task/TaskList.java @@ -140,11 +140,11 @@ public void printFoundTaskList(String keyword) throws EmptyTaskListException { */ public void printAsSchedule(LocalDate dateToPrint) throws EmptyTaskListException{ if(this.listSize == 0){ - throw new EmptyTaskListException("empty task"); + throw new EmptyTaskListException("There's nothing in task list yet."); } ArrayList tempTaskList = new ArrayList<>(); for(Task t : taskList){ - if(!t.getTaskType().equals("todo")){ + if(!t.getTaskType().equals("todo") && t.getDate().equals(dateToPrint)){ tempTaskList.add(t); } } diff --git a/src/main/java/duke/ui/ReturnMessages.java b/src/main/java/duke/ui/ReturnMessages.java index 3423b0d9..32d76266 100644 --- a/src/main/java/duke/ui/ReturnMessages.java +++ b/src/main/java/duke/ui/ReturnMessages.java @@ -1,13 +1,11 @@ package duke.ui; +import duke.exception.TaskNotFoundException; import duke.task.Task; -import duke.task.TaskList; import java.time.LocalDate; import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; + /** Handles message output. */ public class ReturnMessages { @@ -127,17 +125,24 @@ public void taskSchedulingFeedback(LocalDate datePrint, ArrayList list){ */ public void taskFoundFeedback(String key, ArrayList list){ assert !list.isEmpty():"Should be caught by emptyTaskListException"; - - separator(); - int numbering = 1; - System.out.println(" Here are the matching tasks in your list:"); + ArrayList tempList = new ArrayList<>(); for(Task t : list){ if(t.getTaskInfo().contains(key)){ + tempList.add(t); + } + } + if(tempList.isEmpty()){ + throw new TaskNotFoundException("No task found with keyword ["+key+"]."); + }else{ + separator(); + int numbering = 1; + System.out.println(" Here are the matching tasks in your list:"); + for(Task t : tempList){ System.out.println(" "+numbering+"."+t); + numbering++; } - numbering++; + separator(); } - separator(); } /** From d079af077b160997235300204fa16a061624ada7 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Fri, 12 Nov 2021 01:56:35 +0800 Subject: [PATCH 30/32] - More Junit Test Cases - Coding Standard Revised --- .../java/duke/parser/CommandDeadline.java | 2 +- src/main/java/duke/parser/CommandEvent.java | 2 +- src/main/java/duke/parser/CommandView.java | 38 ++--------- .../StorageFixedDurationReference.java | 2 - .../java/duke/storage/StorageTaskList.java | 16 +++-- .../java/duke/task/FixedDurationTask.java | 4 +- .../task/{Task_Enum.java => TaskEnums.java} | 2 +- src/main/java/duke/task/TaskList.java | 9 +-- src/main/java/duke/ui/UI.java | 3 - .../duke/exceptiontest/ExceptionTest.java | 20 ------ .../java/duke/parsertest/CommandByeTest.java | 44 +++++++++++++ .../duke/parsertest/CommandDeadlineTest.java | 52 +++++++++++++++ .../duke/parsertest/CommandDeleteTest.java | 58 ++++++++++++++++ .../java/duke/parsertest/CommandDoneTest.java | 53 +++++++++++++++ .../duke/parsertest/CommandEventTest.java | 53 +++++++++++++++ .../java/duke/parsertest/CommandTodoTest.java | 51 ++++++++++++++ .../duke/parsertest/DateTimeParseTest.java | 66 +++++++++++++++++++ .../duke/storagetest/StorageTaskListTest.java | 48 +++++++++++--- src/test/java/duke/tasktest/DeadlineTest.java | 19 ++++-- .../{EventTest.java => EventsTest.java} | 19 ++++-- src/test/java/duke/tasktest/TaskListTest.java | 62 +++++++++++++---- src/test/java/duke/tasktest/ToDosTest.java | 34 +++++++++- 22 files changed, 548 insertions(+), 109 deletions(-) rename src/main/java/duke/task/{Task_Enum.java => TaskEnums.java} (77%) delete mode 100644 src/test/java/duke/exceptiontest/ExceptionTest.java create mode 100644 src/test/java/duke/parsertest/CommandByeTest.java create mode 100644 src/test/java/duke/parsertest/CommandDeadlineTest.java create mode 100644 src/test/java/duke/parsertest/CommandDeleteTest.java create mode 100644 src/test/java/duke/parsertest/CommandDoneTest.java create mode 100644 src/test/java/duke/parsertest/CommandEventTest.java create mode 100644 src/test/java/duke/parsertest/CommandTodoTest.java create mode 100644 src/test/java/duke/parsertest/DateTimeParseTest.java rename src/test/java/duke/tasktest/{EventTest.java => EventsTest.java} (55%) diff --git a/src/main/java/duke/parser/CommandDeadline.java b/src/main/java/duke/parser/CommandDeadline.java index cb666d0d..5683fe7a 100644 --- a/src/main/java/duke/parser/CommandDeadline.java +++ b/src/main/java/duke/parser/CommandDeadline.java @@ -16,7 +16,7 @@ public class CommandDeadline extends CommandBase { - DateTimeParse timeHelp = new DateTimeParse(); + private DateTimeParse timeHelp = new DateTimeParse(); /** * Creates deadline constructor. diff --git a/src/main/java/duke/parser/CommandEvent.java b/src/main/java/duke/parser/CommandEvent.java index 6976f5ed..a2caac8a 100644 --- a/src/main/java/duke/parser/CommandEvent.java +++ b/src/main/java/duke/parser/CommandEvent.java @@ -14,7 +14,7 @@ public class CommandEvent extends CommandBase { - DateTimeParse timeHelp = new DateTimeParse(); + private DateTimeParse timeHelp = new DateTimeParse(); /** * Creates event Command Constructor diff --git a/src/main/java/duke/parser/CommandView.java b/src/main/java/duke/parser/CommandView.java index e71ef7d7..19ea3d7a 100644 --- a/src/main/java/duke/parser/CommandView.java +++ b/src/main/java/duke/parser/CommandView.java @@ -1,18 +1,18 @@ package duke.parser; import duke.exception.EmptyTaskListException; -import duke.exception.TimeParseException; import duke.exception.UnknownSyntaxException; +import duke.parser.timeHelper.DateTimeParse; import duke.storage.StorageTaskList; import duke.task.TaskList; import duke.ui.UI; -import java.time.DateTimeException; + import java.time.LocalDate; public class CommandView extends CommandBase{ - static final int dateLength = 3; + private DateTimeParse timeHelp = new DateTimeParse(); /** * Creates view schedule command constructor. @@ -37,7 +37,7 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList if (!CommandEnums.VIEW.getName().equals(super.keyword)){ throw new UnknownSyntaxException(super.keyword); } - LocalDate scheduleDate = dateParse(super.detail); + LocalDate scheduleDate = timeHelp.dateParse(super.detail); taskList.printAsSchedule(scheduleDate); } catch(EmptyTaskListException e){ throw new EmptyTaskListException("Empty"); @@ -45,34 +45,4 @@ public boolean execute(TaskList taskList, UI ui, StorageTaskList storageTaskList return false; } - /** - * Returns parsed time in format {DD-MM-YYYY}. - * - * @param str - the string of datetime. - * @return - Date in its correct format. - * @throws TimeParseException thrown when time format is wrong - */ - private LocalDate dateParse(String str) throws TimeParseException{ - if (!str.contains("/")){ - throw new TimeParseException("DateTime Format YYYY/MM/DD"); - } - // gen yyyy,mm,dd ssss - String[] date = str.split("/", 3); - if (date.length < dateLength){ - throw new TimeParseException("DateTime Format YYYY/MM/DD"); - } - - int year = Integer.parseInt(date[0]); - int month = Integer.parseInt(date[1]); - int dayOfMth = Integer.parseInt(date[2]); - - LocalDate localDate; - try { - localDate = LocalDate.of(year,month,dayOfMth); - } catch (DateTimeException e) { - throw new TimeParseException(e.getMessage()); - } - - return localDate; - } } diff --git a/src/main/java/duke/storage/StorageFixedDurationReference.java b/src/main/java/duke/storage/StorageFixedDurationReference.java index 0fa07a4a..c8069bd3 100644 --- a/src/main/java/duke/storage/StorageFixedDurationReference.java +++ b/src/main/java/duke/storage/StorageFixedDurationReference.java @@ -9,7 +9,6 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.util.Scanner; public class StorageFixedDurationReference { @@ -17,7 +16,6 @@ public class StorageFixedDurationReference { protected String fileName; protected File file; private static ReturnMessages returnMessage = new ReturnMessages(); - Scanner scanner; /** Creates Storage_Unscheduled object. */ diff --git a/src/main/java/duke/storage/StorageTaskList.java b/src/main/java/duke/storage/StorageTaskList.java index a0825cd3..76615b7d 100644 --- a/src/main/java/duke/storage/StorageTaskList.java +++ b/src/main/java/duke/storage/StorageTaskList.java @@ -1,14 +1,23 @@ package duke.storage; import duke.exception.DukeException; -import duke.task.*; +import duke.task.FixedDurationTaskList; +import duke.task.TaskList; +import duke.task.Task; +import duke.task.ToDos; +import duke.task.Events; +import duke.task.Deadline; import duke.ui.ReturnMessages; -import java.io.*; +import java.io.File; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; + import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import java.util.Scanner; public class StorageTaskList { protected boolean isExist; @@ -17,7 +26,6 @@ public class StorageTaskList { private static ReturnMessages returnMessage = new ReturnMessages(); private static StorageFixedDurationReference loadFixedDurationRecord; private static FixedDurationTaskList fixedDurationTaskList; - Scanner scanner; /** * Checks current file existence status. diff --git a/src/main/java/duke/task/FixedDurationTask.java b/src/main/java/duke/task/FixedDurationTask.java index fdb3fbe6..7ced5f7e 100644 --- a/src/main/java/duke/task/FixedDurationTask.java +++ b/src/main/java/duke/task/FixedDurationTask.java @@ -1,8 +1,8 @@ package duke.task; public class FixedDurationTask { - protected String description; - protected int duration; + private String description; + private int duration; /** * Creates FixedDuration Task. diff --git a/src/main/java/duke/task/Task_Enum.java b/src/main/java/duke/task/TaskEnums.java similarity index 77% rename from src/main/java/duke/task/Task_Enum.java rename to src/main/java/duke/task/TaskEnums.java index 28e6fd0d..d4ab162f 100644 --- a/src/main/java/duke/task/Task_Enum.java +++ b/src/main/java/duke/task/TaskEnums.java @@ -1,7 +1,7 @@ package duke.task; /** Enumerate for Task */ -public enum Task_Enum { +public enum TaskEnums { TODO, DEADLINE, EVENT, diff --git a/src/main/java/duke/task/TaskList.java b/src/main/java/duke/task/TaskList.java index 8b4506c5..bc2a12ae 100644 --- a/src/main/java/duke/task/TaskList.java +++ b/src/main/java/duke/task/TaskList.java @@ -15,9 +15,7 @@ public class TaskList { /** Creates task list. */ - public TaskList() { - taskList = new ArrayList<>(); - } + public TaskList() {taskList = new ArrayList<>();} /** * Creates Task list with tasks within. @@ -94,7 +92,6 @@ public int getListSize(){ } - public void save(){} /** * Prints the tasks within the task list. @@ -148,12 +145,12 @@ public void printAsSchedule(LocalDate dateToPrint) throws EmptyTaskListException tempTaskList.add(t); } } - sort(tempTaskList); + sortByTime(tempTaskList); printer.taskSchedulingFeedback(dateToPrint, tempTaskList); } // Comparison done using compareTo function - public static void sort(ArrayList list) + protected static void sortByTime(ArrayList list) { list.sort(Comparator.comparing(Task::getTime)); } diff --git a/src/main/java/duke/ui/UI.java b/src/main/java/duke/ui/UI.java index 092c4f76..ad6a60c1 100644 --- a/src/main/java/duke/ui/UI.java +++ b/src/main/java/duke/ui/UI.java @@ -45,9 +45,6 @@ public void showLine() { returnMessage.separator(); } - public void showError(String message) { - System.out.println(message); - } /** * Returns the error msg will output by this. diff --git a/src/test/java/duke/exceptiontest/ExceptionTest.java b/src/test/java/duke/exceptiontest/ExceptionTest.java deleted file mode 100644 index 7e2f518f..00000000 --- a/src/test/java/duke/exceptiontest/ExceptionTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package duke.exceptiontest; - -import duke.task.Deadline; -import org.junit.jupiter.api.Test; - -import java.time.LocalDateTime; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class ExceptionTest { - @Test - public void exception(){ - LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); - Deadline deadline = new Deadline("return book", sample); - assertEquals("[D][ ] return book(by: 2021-12-25[SATURDAY] 16:00)", deadline.toString()); - assertEquals("D | 0 | return book | 2021-12-25 | 16:00", deadline.encodeTask()); - - - } -} diff --git a/src/test/java/duke/parsertest/CommandByeTest.java b/src/test/java/duke/parsertest/CommandByeTest.java new file mode 100644 index 00000000..074c6dfa --- /dev/null +++ b/src/test/java/duke/parsertest/CommandByeTest.java @@ -0,0 +1,44 @@ +package duke.parsertest; + +import duke.parser.Command; +import duke.parser.CommandParser; +import duke.storage.StorageTaskList; +import duke.task.TaskList; +import duke.ui.UI; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.AfterAll; +import java.io.File; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) +public class CommandByeTest { + private static Command c; + private static StorageTaskList storageTaskList; + private static UI ui; + private static TaskList taskList; + private static String sampleCmd = "bye"; + + @BeforeAll + static void init(){ + ui = new UI(); + storageTaskList = new StorageTaskList("/byeTest.txt"); + taskList = new TaskList(); + } + + @Test + void byeCommand_byeTask_successAndTrue(){ + c = CommandParser.parse(sampleCmd); + c.execute(taskList, ui, storageTaskList); + assertTrue(c.isExit()); + } + + @AfterAll + static void wrapUp(){ + File cleanUP = new File(System.getProperty("user.dir") + "/byeTest.txt"); // create a File for the given file path + assertTrue(cleanUP.delete()); + } +} diff --git a/src/test/java/duke/parsertest/CommandDeadlineTest.java b/src/test/java/duke/parsertest/CommandDeadlineTest.java new file mode 100644 index 00000000..22fb6538 --- /dev/null +++ b/src/test/java/duke/parsertest/CommandDeadlineTest.java @@ -0,0 +1,52 @@ +package duke.parsertest; + +import duke.parser.Command; +import duke.parser.CommandParser; +import duke.storage.StorageTaskList; +import duke.task.Deadline; +import duke.task.TaskList; +import duke.ui.UI; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.AfterAll; + +import java.io.File; +import java.time.LocalDateTime; + +import static org.junit.jupiter.api.Assertions.*; + +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) +public class CommandDeadlineTest { + + private static Command c; + private static StorageTaskList storageTaskList; + private static UI ui; + private static TaskList taskList; + private static String sampleCmd = "deadline submit abc/by 2021/12/25 11PM"; + Deadline deadline = new Deadline("submit abc", LocalDateTime.of(2021,12,25,23,0,0)); + + @BeforeAll + static void init(){ + ui = new UI(); + storageTaskList = new StorageTaskList("/deadlineTest.txt"); + taskList = new TaskList(); + } + + @Test + void deadlineCommand_deadlineTask_successAndFalse(){ + c = CommandParser.parse(sampleCmd); + c.execute(taskList, ui, storageTaskList); + assertEquals(deadline.toString(), taskList.getLastTask().toString()); + assertFalse(c.isExit()); + } + + @AfterAll + static void wrapUp(){ + File cleanUP = new File(System.getProperty("user.dir") + "/deadlineTest.txt"); + if(cleanUP.exists()){ + assertTrue(cleanUP.delete()); + } + } +} diff --git a/src/test/java/duke/parsertest/CommandDeleteTest.java b/src/test/java/duke/parsertest/CommandDeleteTest.java new file mode 100644 index 00000000..ac32e665 --- /dev/null +++ b/src/test/java/duke/parsertest/CommandDeleteTest.java @@ -0,0 +1,58 @@ +package duke.parsertest; + +import duke.exception.EmptyTaskListException; +import duke.exception.TimeParseException; +import duke.parser.Command; +import duke.parser.CommandParser; +import duke.storage.StorageTaskList; +import duke.task.Deadline; +import duke.task.TaskList; +import duke.task.ToDos; +import duke.ui.UI; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.AfterAll; + +import java.io.File; + +import static org.junit.jupiter.api.Assertions.*; + +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) +public class CommandDeleteTest { + + private static Command c; + private static StorageTaskList storageTaskList; + private static UI ui; + private static TaskList taskList; + private static String sampleCmd = "delete 1"; + @BeforeAll + static void init(){ + ui = new UI(); + storageTaskList = new StorageTaskList("/deleteTest.txt"); + taskList = new TaskList(); + ToDos sampleData = new ToDos("sleep"); + taskList.addTask(sampleData); + } + + @Test + void deleteCommand_deleteTask_successAndFalse(){ + c = CommandParser.parse(sampleCmd); + EmptyTaskListException exception = assertThrows(EmptyTaskListException.class, () -> { + c.execute(taskList, ui, storageTaskList); + assertEquals(0, taskList.getListSize()); + }); + String errorMsg = exception.getMessage(); + assertEquals("empty task", errorMsg); + assertFalse(c.isExit()); + } + + @AfterAll + static void wrapUp(){ + File cleanUP = new File(System.getProperty("user.dir") + "/deleteTest.txt"); + if(cleanUP.exists()){ + assertTrue(cleanUP.delete()); + } + } +} diff --git a/src/test/java/duke/parsertest/CommandDoneTest.java b/src/test/java/duke/parsertest/CommandDoneTest.java new file mode 100644 index 00000000..15ed3f0a --- /dev/null +++ b/src/test/java/duke/parsertest/CommandDoneTest.java @@ -0,0 +1,53 @@ +package duke.parsertest; + +import duke.exception.EmptyTaskListException; +import duke.parser.Command; +import duke.parser.CommandParser; +import duke.storage.StorageTaskList; +import duke.task.TaskList; +import duke.task.ToDos; +import duke.ui.UI; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.AfterAll; + +import java.io.File; + +import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) +public class CommandDoneTest { + + private static Command c; + private static StorageTaskList storageTaskList; + private static UI ui; + private static TaskList taskList; + private static String sampleCmd = "done 1"; + @BeforeAll + static void init(){ + ui = new UI(); + storageTaskList = new StorageTaskList("/doneTest.txt"); + taskList = new TaskList(); + ToDos sampleData = new ToDos("sleep"); + taskList.addTask(sampleData); + } + + @Test + void doneCommand_doneTask_successAndFalse(){ + c = CommandParser.parse(sampleCmd); + c.execute(taskList, ui, storageTaskList); + assertTrue(taskList.getTask(0).isDone()); + assertFalse(c.isExit()); + } + + @AfterAll + static void wrapUp(){ + File cleanUP = new File(System.getProperty("user.dir") + "/doneTest.txt"); + if(cleanUP.exists()){ + assertTrue(cleanUP.delete()); + } + } +} diff --git a/src/test/java/duke/parsertest/CommandEventTest.java b/src/test/java/duke/parsertest/CommandEventTest.java new file mode 100644 index 00000000..1e37f219 --- /dev/null +++ b/src/test/java/duke/parsertest/CommandEventTest.java @@ -0,0 +1,53 @@ +package duke.parsertest; + +import duke.parser.Command; +import duke.parser.CommandParser; +import duke.storage.StorageTaskList; +import duke.task.Events; +import duke.task.TaskList; +import duke.ui.UI; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.AfterAll; + +import java.io.File; +import java.time.LocalDate; +import java.time.LocalTime; + +import static org.junit.jupiter.api.Assertions.*; + +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) +public class CommandEventTest { + + private static Command c; + private static StorageTaskList storageTaskList; + private static UI ui; + private static TaskList taskList; + private static String sampleCmd = "event project meeting/at 2021/12/25 11AM-2PM"; + Events event = new Events("project meeting", LocalDate.of(2021,12,25), LocalTime.of(11,0), LocalTime.of(14,0)); + + @BeforeAll + static void init(){ + ui = new UI(); + storageTaskList = new StorageTaskList("/eventTest.txt"); + taskList = new TaskList(); + } + + @Test + void eventCommand_eventTask_successAndFalse(){ + c = CommandParser.parse(sampleCmd); + c.execute(taskList, ui, storageTaskList); + assertEquals(event.toString(), taskList.getLastTask().toString()); + assertFalse(c.isExit()); + } + + @AfterAll + static void wrapUp(){ + File cleanUP = new File(System.getProperty("user.dir") + "/eventTest.txt"); + if(cleanUP.exists()){ + assertTrue(cleanUP.delete()); + } + } +} diff --git a/src/test/java/duke/parsertest/CommandTodoTest.java b/src/test/java/duke/parsertest/CommandTodoTest.java new file mode 100644 index 00000000..01439cfe --- /dev/null +++ b/src/test/java/duke/parsertest/CommandTodoTest.java @@ -0,0 +1,51 @@ +package duke.parsertest; + +import duke.parser.Command; +import duke.parser.CommandParser; +import duke.storage.StorageTaskList; +import duke.task.TaskList; +import duke.task.ToDos; +import duke.ui.UI; + +import java.io.File; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.AfterAll; + +import static org.junit.jupiter.api.Assertions.*; + +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) +public class CommandTodoTest { + + private static Command c; + private static StorageTaskList storageTaskList; + private static UI ui; + private static TaskList taskList; + private static String sampleCmd = "todo eat"; + ToDos todo = new ToDos("eat", 0); //since its testing command with the fixed duration database. assume it does not exist. + + @BeforeAll + static void init(){ + ui = new UI(); + storageTaskList = new StorageTaskList("/todoTest.txt"); + taskList = new TaskList(); + } + + @Test + void todoCommand_todoTask_successAndFalse(){ + c = CommandParser.parse(sampleCmd); + c.execute(taskList, ui, storageTaskList); + assertEquals(todo.toString(), taskList.getLastTask().toString()); + assertFalse(c.isExit()); + } + + @AfterAll + static void wrapUp(){ + File cleanUP = new File(System.getProperty("user.dir") + "/todoTest.txt"); + if(cleanUP.exists()){ + assertTrue(cleanUP.delete()); + } + } +} diff --git a/src/test/java/duke/parsertest/DateTimeParseTest.java b/src/test/java/duke/parsertest/DateTimeParseTest.java new file mode 100644 index 00000000..d408f010 --- /dev/null +++ b/src/test/java/duke/parsertest/DateTimeParseTest.java @@ -0,0 +1,66 @@ +package duke.parsertest; + +import duke.exception.TimeParseException; +import duke.parser.timeHelper.DateTimeParse; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import java.time.LocalDate; +import java.time.LocalTime; + +import static org.junit.jupiter.api.Assertions.*; + +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) +public class DateTimeParseTest { + private static final String wrongDate = "20211225"; + private static final String wrongDT = "20211225 10PM"; + private static final String rDwT = "2021/12/25 10"; + private static final String correctDate = "2021/12/25"; + private static DateTimeParse timeObject; + + @BeforeAll + static void init(){ + timeObject = new DateTimeParse(); + } + + @Test + void dateParse_correctFormattedDate_success(){ + LocalDate sample = LocalDate.of(2021,12,25); + assertEquals(sample, timeObject.dateParse(correctDate)); + } + + @Test + void timeParse_integerTimeToConvert_success(){ + LocalTime sample = LocalTime.of(10,0,0); + assertEquals(sample, timeObject.timeParse(10)); + } + + + @Test + void dateParse_wrongFormattedDate_exceptionThrown() { + TimeParseException exception = assertThrows(TimeParseException.class, () -> { + timeObject.dateParse(wrongDate); + }); + String errorMsg = exception.getMessage(); + assertEquals("Date Format YYYY/MM/DD", errorMsg); + } + + @Test + void dateTimeParse_wrongFormattedDateTime_exceptionThrown() { + TimeParseException exception = assertThrows(TimeParseException.class, () -> { + timeObject.dateAndTimeParse(wrongDT); + }); + String errorMsg = exception.getMessage(); + assertEquals("Date Format YYYY/MM/DD", errorMsg); + } + + @Test + void dateTimeParse_wrongFormattedTime_exceptionThrown() { + TimeParseException exception1 = assertThrows(TimeParseException.class, () -> { + timeObject.dateAndTimeParse(rDwT); + }); + String errorMsg1 = exception1.getMessage(); + assertEquals("Time Format 1AM/1PM", errorMsg1); + } +} diff --git a/src/test/java/duke/storagetest/StorageTaskListTest.java b/src/test/java/duke/storagetest/StorageTaskListTest.java index e0ee69b1..02e706e9 100644 --- a/src/test/java/duke/storagetest/StorageTaskListTest.java +++ b/src/test/java/duke/storagetest/StorageTaskListTest.java @@ -5,38 +5,66 @@ import duke.task.Events; import duke.task.TaskList; import duke.task.ToDos; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Order; import java.io.File; import java.io.IOException; import java.time.LocalDateTime; import static org.junit.jupiter.api.Assertions.*; +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class StorageTaskListTest { - @Test - public void storage() throws IOException { + private static TaskList tasks; + private static ToDos toDos; + private static Deadline deadline; + private static Events event; + private static StorageTaskList store; + + @BeforeAll + static void init(){ LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); - TaskList tasks = new TaskList(); - ToDos toDos = new ToDos("eat"); - Deadline deadline = new Deadline("return book", sample); - Events event = new Events("Finish Homework",sample.toLocalDate(),sample.toLocalTime(),sample.toLocalTime().plusHours(2)); + tasks = new TaskList(); + toDos = new ToDos("eat"); + deadline = new Deadline("return book", sample); + event = new Events("Finish Homework",sample.toLocalDate(),sample.toLocalTime(),sample.toLocalTime().plusHours(2)); tasks.addTask(toDos); assert tasks.getListSize()==1:"There should exist 1 task"; tasks.addTask(deadline); assert tasks.getListSize()==2:"There should exist 2 task"; tasks.addTask(event); assert tasks.getListSize()==3:"There should exist 3 task"; - StorageTaskList store = new StorageTaskList("Testing.txt"); + store = new StorageTaskList("Testing.txt"); + } + + @Test + @Order(1) + public void fileNotCreated_checkExistenceFunction_false(){ assertFalse(store.existence()); + } + + @Test + @Order(2) + public void fileCreated_checkExistenceFunction_true() throws IOException { store.createFile(); store.save(tasks); assertTrue(store.existence()); + } + @Test + @Order(3) + public void checkFileLoadStatus_anotherSameFile_true(){ StorageTaskList store2 = new StorageTaskList("Testing.txt"); assertEquals(tasks.getLastTask().toString(), store2.load().getLastTask().toString()); + } - File cleanUP = new File(System.getProperty("user.dir") + "/src/main/java/Duke/storage/Testing.txt"); // create a File for the given file path - boolean wrapUp = cleanUP.delete(); + @AfterAll + static void wrapUp(){ + File cleanUP = new File(System.getProperty("user.dir") + "/Testing.txt"); // create a File for the given file path + assertTrue(cleanUP.delete()); } } diff --git a/src/test/java/duke/tasktest/DeadlineTest.java b/src/test/java/duke/tasktest/DeadlineTest.java index 27921ad9..9687c39b 100644 --- a/src/test/java/duke/tasktest/DeadlineTest.java +++ b/src/test/java/duke/tasktest/DeadlineTest.java @@ -2,6 +2,7 @@ import duke.task.Deadline; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import java.time.LocalDateTime; @@ -9,13 +10,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class DeadlineTest { - @Test - public void deadline(){ + private static Deadline deadline; + + @BeforeAll + static void init(){ LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); - Deadline deadline = new Deadline("return book", sample); + deadline = new Deadline("return book", sample); + } + @Test + void printDeadlineSyntax_deadlineTaskSample_success(){ assertEquals("[D][ ] return book(by: 2021-12-25[SATURDAY] 16:00)", deadline.toString()); - assertEquals("D | 0 | return book | 2021-12-25 | 16:00", deadline.encodeTask()); - + } + @Test + void deadlineEncodeTest_deadlineTask_success(){ + assertEquals("D | 0 | return book | 2021-12-25 | 16:00", deadline.encodeTask()); } + } diff --git a/src/test/java/duke/tasktest/EventTest.java b/src/test/java/duke/tasktest/EventsTest.java similarity index 55% rename from src/test/java/duke/tasktest/EventTest.java rename to src/test/java/duke/tasktest/EventsTest.java index 10339cf4..b04328b1 100644 --- a/src/test/java/duke/tasktest/EventTest.java +++ b/src/test/java/duke/tasktest/EventsTest.java @@ -1,18 +1,29 @@ package duke.tasktest; import duke.task.Events; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import java.time.LocalDateTime; import static org.junit.jupiter.api.Assertions.assertEquals; -public class EventTest { - @Test - public void event(){ +public class EventsTest { + + private static Events event; + + @BeforeAll + static void init(){ LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); - Events event = new Events("Finish Homework",sample.toLocalDate(),sample.toLocalTime(),sample.toLocalTime().plusHours(2)); + event = new Events("Finish Homework",sample.toLocalDate(),sample.toLocalTime(),sample.toLocalTime().plusHours(2)); + } + @Test + void printEventSyntax_eventTaskSample_success(){ assertEquals("[E][ ] Finish Homework (on:2021-12-25[SATURDAY] from:16:00 to:18:00)", event.toString()); + } + + @Test + void eventEncodeTest_eventTask_success(){ assertEquals("E | 0 | Finish Homework | 2021-12-25 | 16:00 | 18:00", event.encodeTask()); } } diff --git a/src/test/java/duke/tasktest/TaskListTest.java b/src/test/java/duke/tasktest/TaskListTest.java index 063f91d8..3090e366 100644 --- a/src/test/java/duke/tasktest/TaskListTest.java +++ b/src/test/java/duke/tasktest/TaskListTest.java @@ -1,31 +1,65 @@ package duke.tasktest; -import duke.task.Deadline; -import duke.task.Events; -import duke.task.TaskList; -import duke.task.ToDos; +import duke.task.*; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Order; import java.time.LocalDateTime; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TaskListTest { + private static TaskList tasks; + private static ToDos toDo; + private static Events event; + private static Deadline deadline; + private static LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); + @BeforeAll + static void init(){ + tasks = new TaskList(); + } + @Test - public void TaskList(){ - LocalDateTime sample = LocalDateTime.of(2021,12,25,16,0,0); - ToDos toDos = new ToDos("eat"); - Deadline deadline = new Deadline("return book", sample); - Events event = new Events("Finish Homework",sample.toLocalDate(),sample.toLocalTime(),sample.toLocalTime().plusHours(2)); - TaskList tasks = new TaskList(); - tasks.addTask(toDos); - tasks.addTask(deadline); - tasks.addTask(event); + @Order(1) + void addTodo(){ + toDo = new ToDos("eat"); + assertTrue(tasks.addTask(toDo)); + } + @Test + @Order(2) + void addDeadline_deadlineTask_success(){ + deadline = new Deadline("return book", sample); + assertTrue(tasks.addTask(deadline)); + } + @Test + @Order(3) + void addEvent_eventTask_success(){ + event = new Events("Finish Homework",sample.toLocalDate(),sample.toLocalTime(),sample.toLocalTime().plusHours(2)); + assertTrue(tasks.addTask(event)); + } + @Test + @Order(4) + void checkSize_taskListSize_success(){ assertEquals(3, tasks.getListSize()); + } + + @Test + @Order(5) + void getLastTask_retrieveLastTask_success(){ assertEquals(event,tasks.getLastTask()); - assertEquals(toDos, tasks.getTask(0)); + } + + @Test + @Order(6) + void getTaskByID_retrieveTaskID_success(){ + assertEquals(toDo, tasks.getTask(0)); } } diff --git a/src/test/java/duke/tasktest/ToDosTest.java b/src/test/java/duke/tasktest/ToDosTest.java index 85ff83e2..97533a42 100644 --- a/src/test/java/duke/tasktest/ToDosTest.java +++ b/src/test/java/duke/tasktest/ToDosTest.java @@ -1,15 +1,45 @@ package duke.tasktest; import duke.task.ToDos; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Order; import static org.junit.jupiter.api.Assertions.assertEquals; +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ToDosTest { + + private static ToDos toDos; + + @BeforeAll + static void init(){ + toDos = new ToDos("eat"); + } @Test - public void todo(){ - ToDos toDos = new ToDos("eat"); + @Order(1) + void printToDoSyntax_todoTaskSampleWithoutDuration_success(){ assertEquals("[T][ ] eat", toDos.toString()); + } + + @Test + @Order(3) + void printToDoSyntax_todoTaskSampleWithDuration_success(){ + toDos.setDuration(1); + assertEquals("[T][ ] eat (requires: 1 Hour)", toDos.toString()); + } + + @Test + @Order(2) + void todoEncodeTest_toDoWithNoDuration_success(){ assertEquals("T | 0 | eat | 0", toDos.encodeTask()); } + + @Test + @Order(4) + void todoEncodeTest_toDoWithDuration_success(){ + assertEquals("T | 0 | eat | 1", toDos.encodeTask()); + } } From c1aba75f581034450d64f6adab879ba485cbd7ae Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Sat, 13 Nov 2021 13:38:25 +0800 Subject: [PATCH 31/32] Submission --- duke.txt | 6 +++++- src/main/java/duke/storage/StorageTaskList.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/duke.txt b/duke.txt index d7eb218d..39424621 100644 --- a/duke.txt +++ b/duke.txt @@ -4,7 +4,11 @@ T | 0 | read sales report | 2 T | 0 | eat | 0 T | 0 | sleep | 0 D | 0 | return book | 2021-11-05 | 22:00 -D | 0 | read book | 2021-11-05 | 15:00 +D | 1 | read book | 2021-11-05 | 15:00 D | 0 | borrow book | 2021-11-05 | 11:00 E | 0 | project meeting | 2021-11-05 | 14:00 | 16:00 E | 0 | family dinner | 2021-11-05 | 18:00 | 21:00 +T | 0 | submit claim | 0 +T | 0 | read sales report | 2 +D | 0 | return book | 2021-11-05 | 22:00 +E | 0 | family dinner | 2021-11-05 | 18:00 | 21:00 diff --git a/src/main/java/duke/storage/StorageTaskList.java b/src/main/java/duke/storage/StorageTaskList.java index 76615b7d..c16aacd8 100644 --- a/src/main/java/duke/storage/StorageTaskList.java +++ b/src/main/java/duke/storage/StorageTaskList.java @@ -102,7 +102,7 @@ public void createFile() throws IOException { * @param taskList - data to save. */ public void save(TaskList taskList) { - + assert this.isExist:true; FileWriter myWriter; try { myWriter = new FileWriter(file.getAbsoluteFile(), false); From 3df9872b08ccefd1301645b94573895efdce0100 Mon Sep 17 00:00:00 2001 From: Lin Gang Date: Mon, 21 Feb 2022 00:31:11 +0800 Subject: [PATCH 32/32] Test --- src/main/java/duke/exception/DukeException.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/duke/exception/DukeException.java b/src/main/java/duke/exception/DukeException.java index d92e00d0..7104bc7d 100644 --- a/src/main/java/duke/exception/DukeException.java +++ b/src/main/java/duke/exception/DukeException.java @@ -11,5 +11,6 @@ public DukeException(String message) { } - public DukeException() {} + public DukeException() {//testing + } }