From 65f72a8d7407cfc1d4ded97e87a8cbbbe6d16d8b Mon Sep 17 00:00:00 2001 From: Jeffry Lum <22460123+j-lum@users.noreply.github.com> Date: Tue, 6 Aug 2019 15:24:53 +0800 Subject: [PATCH 01/37] Add support for Gradle workflow --- build.gradle | 16 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 55190 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 172 +++++++++++++++++++++++ gradlew.bat | 84 +++++++++++ settings.gradle | 1 + 6 files changed, 278 insertions(+) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..e5b8ce7e49 --- /dev/null +++ b/build.gradle @@ -0,0 +1,16 @@ +plugins { + id 'java' + id 'application' +} + +group 'seedu.duke' +version '0.1.0' + +repositories { + mavenCentral() +} + +application { + // Change this to your main class. + mainClassName = "seedu.duke.Duke" +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..87b738cbd051603d91cc39de6cb000dd98fe6b02 GIT binary patch literal 55190 zcmafaW0WS*vSoFbZQHhO+s0S6%`V%vZQJa!ZQHKus_B{g-pt%P_q|ywBQt-*Stldc z$+IJ3?^KWm27v+sf`9-50uuadKtMnL*BJ;1^6ynvR7H?hQcjE>7)art9Bu0Pcm@7C z@c%WG|JzYkP)<@zR9S^iR_sA`azaL$mTnGKnwDyMa;8yL_0^>Ba^)phg0L5rOPTbm7g*YIRLg-2^{qe^`rb!2KqS zk~5wEJtTdD?)3+}=eby3x6%i)sb+m??NHC^u=tcG8p$TzB<;FL(WrZGV&cDQb?O0GMe6PBV=V z?tTO*5_HTW$xea!nkc~Cnx#cL_rrUGWPRa6l+A{aiMY=<0@8y5OC#UcGeE#I>nWh}`#M#kIn-$A;q@u-p71b#hcSItS!IPw?>8 zvzb|?@Ahb22L(O4#2Sre&l9H(@TGT>#Py)D&eW-LNb!=S;I`ZQ{w;MaHW z#to!~TVLgho_Pm%zq@o{K3Xq?I|MVuVSl^QHnT~sHlrVxgsqD-+YD?Nz9@HA<;x2AQjxP)r6Femg+LJ-*)k%EZ}TTRw->5xOY z9#zKJqjZgC47@AFdk1$W+KhTQJKn7e>A&?@-YOy!v_(}GyV@9G#I?bsuto4JEp;5|N{orxi_?vTI4UF0HYcA( zKyGZ4<7Fk?&LZMQb6k10N%E*$gr#T&HsY4SPQ?yerqRz5c?5P$@6dlD6UQwZJ*Je9 z7n-@7!(OVdU-mg@5$D+R%gt82Lt%&n6Yr4=|q>XT%&^z_D*f*ug8N6w$`woqeS-+#RAOfSY&Rz z?1qYa5xi(7eTCrzCFJfCxc%j{J}6#)3^*VRKF;w+`|1n;Xaojr2DI{!<3CaP`#tXs z*`pBQ5k@JLKuCmovFDqh_`Q;+^@t_;SDm29 zCNSdWXbV?9;D4VcoV`FZ9Ggrr$i<&#Dx3W=8>bSQIU_%vf)#(M2Kd3=rN@^d=QAtC zI-iQ;;GMk|&A++W5#hK28W(YqN%?!yuW8(|Cf`@FOW5QbX|`97fxmV;uXvPCqxBD zJ9iI37iV)5TW1R+fV16y;6}2tt~|0J3U4E=wQh@sx{c_eu)t=4Yoz|%Vp<#)Qlh1V z0@C2ZtlT>5gdB6W)_bhXtcZS)`9A!uIOa`K04$5>3&8An+i9BD&GvZZ=7#^r=BN=k za+=Go;qr(M)B~KYAz|<^O3LJON}$Q6Yuqn8qu~+UkUKK~&iM%pB!BO49L+?AL7N7o z(OpM(C-EY753=G=WwJHE`h*lNLMNP^c^bBk@5MyP5{v7x>GNWH>QSgTe5 z!*GPkQ(lcbEs~)4ovCu!Zt&$${9$u(<4@9%@{U<-ksAqB?6F`bQ;o-mvjr)Jn7F&j$@`il1Mf+-HdBs<-`1FahTxmPMMI)@OtI&^mtijW6zGZ67O$UOv1Jj z;a3gmw~t|LjPkW3!EZ=)lLUhFzvO;Yvj9g`8hm%6u`;cuek_b-c$wS_0M4-N<@3l|88 z@V{Sd|M;4+H6guqMm4|v=C6B7mlpP(+It%0E;W`dxMOf9!jYwWj3*MRk`KpS_jx4c z=hrKBkFK;gq@;wUV2eqE3R$M+iUc+UD0iEl#-rECK+XmH9hLKrC={j@uF=f3UiceB zU5l$FF7#RKjx+6!JHMG5-!@zI-eG=a-!Bs^AFKqN_M26%cIIcSs61R$yuq@5a3c3& z4%zLs!g}+C5%`ja?F`?5-og0lv-;(^e<`r~p$x%&*89_Aye1N)9LNVk?9BwY$Y$$F^!JQAjBJvywXAesj7lTZ)rXuxv(FFNZVknJha99lN=^h`J2> zl5=~(tKwvHHvh|9-41@OV`c;Ws--PE%{7d2sLNbDp;A6_Ka6epzOSFdqb zBa0m3j~bT*q1lslHsHqaHIP%DF&-XMpCRL(v;MV#*>mB^&)a=HfLI7efblG z(@hzN`|n+oH9;qBklb=d^S0joHCsArnR1-h{*dIUThik>ot^!6YCNjg;J_i3h6Rl0ji)* zo(tQ~>xB!rUJ(nZjCA^%X;)H{@>uhR5|xBDA=d21p@iJ!cH?+%U|VSh2S4@gv`^)^ zNKD6YlVo$%b4W^}Rw>P1YJ|fTb$_(7C;hH+ z1XAMPb6*p^h8)e5nNPKfeAO}Ik+ZN_`NrADeeJOq4Ak;sD~ zTe77no{Ztdox56Xi4UE6S7wRVxJzWxKj;B%v7|FZ3cV9MdfFp7lWCi+W{}UqekdpH zdO#eoOuB3Fu!DU`ErfeoZWJbWtRXUeBzi zBTF-AI7yMC^ntG+8%mn(I6Dw}3xK8v#Ly{3w3_E?J4(Q5JBq~I>u3!CNp~Ekk&YH` z#383VO4O42NNtcGkr*K<+wYZ>@|sP?`AQcs5oqX@-EIqgK@Pmp5~p6O6qy4ml~N{D z{=jQ7k(9!CM3N3Vt|u@%ssTw~r~Z(}QvlROAkQQ?r8OQ3F0D$aGLh zny+uGnH5muJ<67Z=8uilKvGuANrg@s3Vu_lU2ajb?rIhuOd^E@l!Kl0hYIxOP1B~Q zggUmXbh$bKL~YQ#!4fos9UUVG#}HN$lIkM<1OkU@r>$7DYYe37cXYwfK@vrHwm;pg zbh(hEU|8{*d$q7LUm+x&`S@VbW*&p-sWrplWnRM|I{P;I;%U`WmYUCeJhYc|>5?&& zj}@n}w~Oo=l}iwvi7K6)osqa;M8>fRe}>^;bLBrgA;r^ZGgY@IC^ioRmnE&H4)UV5 zO{7egQ7sBAdoqGsso5q4R(4$4Tjm&&C|7Huz&5B0wXoJzZzNc5Bt)=SOI|H}+fbit z-PiF5(NHSy>4HPMrNc@SuEMDuKYMQ--G+qeUPqO_9mOsg%1EHpqoX^yNd~~kbo`cH zlV0iAkBFTn;rVb>EK^V6?T~t~3vm;csx+lUh_%ROFPy0(omy7+_wYjN!VRDtwDu^h4n|xpAMsLepm% zggvs;v8+isCW`>BckRz1MQ=l>K6k^DdT`~sDXTWQ<~+JtY;I~I>8XsAq3yXgxe>`O zZdF*{9@Z|YtS$QrVaB!8&`&^W->_O&-JXn1n&~}o3Z7FL1QE5R*W2W@=u|w~7%EeC1aRfGtJWxImfY-D3t!!nBkWM> zafu>^Lz-ONgT6ExjV4WhN!v~u{lt2-QBN&UxwnvdH|I%LS|J-D;o>@@sA62@&yew0 z)58~JSZP!(lX;da!3`d)D1+;K9!lyNlkF|n(UduR-%g>#{`pvrD^ClddhJyfL7C-(x+J+9&7EsC~^O`&}V%)Ut8^O_7YAXPDpzv8ir4 zl`d)(;imc6r16k_d^)PJZ+QPxxVJS5e^4wX9D=V2zH&wW0-p&OJe=}rX`*->XT=;_qI&)=WHkYnZx6bLoUh_)n-A}SF_ z9z7agNTM5W6}}ui=&Qs@pO5$zHsOWIbd_&%j^Ok5PJ3yUWQw*i4*iKO)_er2CDUME ztt+{Egod~W-fn^aLe)aBz)MOc_?i-stTj}~iFk7u^-gGSbU;Iem06SDP=AEw9SzuF zeZ|hKCG3MV(z_PJg0(JbqTRf4T{NUt%kz&}4S`)0I%}ZrG!jgW2GwP=WTtkWS?DOs znI9LY!dK+1_H0h+i-_~URb^M;4&AMrEO_UlDV8o?E>^3x%ZJyh$JuDMrtYL8|G3If zPf2_Qb_W+V?$#O; zydKFv*%O;Y@o_T_UAYuaqx1isMKZ^32JtgeceA$0Z@Ck0;lHbS%N5)zzAW9iz; z8tTKeK7&qw!8XVz-+pz>z-BeIzr*#r0nB^cntjQ9@Y-N0=e&ZK72vlzX>f3RT@i7@ z=z`m7jNk!9%^xD0ug%ptZnM>F;Qu$rlwo}vRGBIymPL)L|x}nan3uFUw(&N z24gdkcb7!Q56{0<+zu zEtc5WzG2xf%1<@vo$ZsuOK{v9gx^0`gw>@h>ZMLy*h+6ueoie{D#}}` zK2@6Xxq(uZaLFC%M!2}FX}ab%GQ8A0QJ?&!vaI8Gv=vMhd);6kGguDmtuOElru()) zuRk&Z{?Vp!G~F<1#s&6io1`poBqpRHyM^p;7!+L??_DzJ8s9mYFMQ0^%_3ft7g{PD zZd}8E4EV}D!>F?bzcX=2hHR_P`Xy6?FOK)mCj)Ym4s2hh z0OlOdQa@I;^-3bhB6mpw*X5=0kJv8?#XP~9){G-+0ST@1Roz1qi8PhIXp1D$XNqVG zMl>WxwT+K`SdO1RCt4FWTNy3!i?N>*-lbnn#OxFJrswgD7HjuKpWh*o@QvgF&j+CT z{55~ZsUeR1aB}lv#s_7~+9dCix!5(KR#c?K?e2B%P$fvrsZxy@GP#R#jwL{y#Ld$} z7sF>QT6m|}?V;msb?Nlohj7a5W_D$y+4O6eI;Zt$jVGymlzLKscqer9#+p2$0It&u zWY!dCeM6^B^Z;ddEmhi?8`scl=Lhi7W%2|pT6X6^%-=q90DS(hQ-%c+E*ywPvmoF(KqDoW4!*gmQIklm zk#!GLqv|cs(JRF3G?=AYY19{w@~`G3pa z@xR9S-Hquh*&5Yas*VI};(%9%PADn`kzm zeWMJVW=>>wap*9|R7n#!&&J>gq04>DTCMtj{P^d12|2wXTEKvSf?$AvnE!peqV7i4 zE>0G%CSn%WCW1yre?yi9*aFP{GvZ|R4JT}M%x_%Hztz2qw?&28l&qW<6?c6ym{f$d z5YCF+k#yEbjCN|AGi~-NcCG8MCF1!MXBFL{#7q z)HO+WW173?kuI}^Xat;Q^gb4Hi0RGyB}%|~j8>`6X4CPo+|okMbKy9PHkr58V4bX6<&ERU)QlF8%%huUz&f+dwTN|tk+C&&o@Q1RtG`}6&6;ncQuAcfHoxd5AgD7`s zXynq41Y`zRSiOY@*;&1%1z>oNcWTV|)sjLg1X8ijg1Y zbIGL0X*Sd}EXSQ2BXCKbJmlckY(@EWn~Ut2lYeuw1wg?hhj@K?XB@V_ZP`fyL~Yd3n3SyHU-RwMBr6t-QWE5TinN9VD4XVPU; zonIIR!&pGqrLQK)=#kj40Im%V@ij0&Dh0*s!lnTw+D`Dt-xmk-jmpJv$1-E-vfYL4 zqKr#}Gm}~GPE+&$PI@4ag@=M}NYi7Y&HW82Q`@Y=W&PE31D110@yy(1vddLt`P%N^ z>Yz195A%tnt~tvsSR2{m!~7HUc@x<&`lGX1nYeQUE(%sphTi>JsVqSw8xql*Ys@9B z>RIOH*rFi*C`ohwXjyeRBDt8p)-u{O+KWP;$4gg||%*u{$~yEj+Al zE(hAQRQ1k7MkCq9s4^N3ep*$h^L%2Vq?f?{+cicpS8lo)$Cb69b98au+m2J_e7nYwID0@`M9XIo1H~|eZFc8Hl!qly612ADCVpU zY8^*RTMX(CgehD{9v|^9vZ6Rab`VeZ2m*gOR)Mw~73QEBiktViBhR!_&3l$|be|d6 zupC`{g89Y|V3uxl2!6CM(RNpdtynaiJ~*DqSTq9Mh`ohZnb%^3G{k;6%n18$4nAqR zjPOrP#-^Y9;iw{J@XH9=g5J+yEVh|e=4UeY<^65`%gWtdQ=-aqSgtywM(1nKXh`R4 zzPP&7r)kv_uC7X9n=h=!Zrf<>X=B5f<9~Q>h#jYRD#CT7D~@6@RGNyO-#0iq0uHV1 zPJr2O4d_xLmg2^TmG7|dpfJ?GGa`0|YE+`2Rata9!?$j#e9KfGYuLL(*^z z!SxFA`$qm)q-YKh)WRJZ@S+-sD_1E$V?;(?^+F3tVcK6 z2fE=8hV*2mgiAbefU^uvcM?&+Y&E}vG=Iz!%jBF7iv){lyC`)*yyS~D8k+Mx|N3bm zI~L~Z$=W9&`x)JnO;8c>3LSDw!fzN#X3qi|0`sXY4?cz{*#xz!kvZ9bO=K3XbN z5KrgN=&(JbXH{Wsu9EdmQ-W`i!JWEmfI;yVTT^a-8Ch#D8xf2dtyi?7p z%#)W3n*a#ndFpd{qN|+9Jz++AJQO#-Y7Z6%*%oyEP5zs}d&kKIr`FVEY z;S}@d?UU=tCdw~EJ{b}=9x}S2iv!!8<$?d7VKDA8h{oeD#S-$DV)-vPdGY@x08n)@ zag?yLF_E#evvRTj4^CcrLvBL=fft&@HOhZ6Ng4`8ijt&h2y}fOTC~7GfJi4vpomA5 zOcOM)o_I9BKz}I`q)fu+Qnfy*W`|mY%LO>eF^a z;$)?T4F-(X#Q-m}!-k8L_rNPf`Mr<9IWu)f&dvt=EL+ESYmCvErd@8B9hd)afc(ZL94S z?rp#h&{7Ah5IJftK4VjATklo7@hm?8BX*~oBiz)jyc9FuRw!-V;Uo>p!CWpLaIQyt zAs5WN)1CCeux-qiGdmbIk8LR`gM+Qg=&Ve}w?zA6+sTL)abU=-cvU`3E?p5$Hpkxw znu0N659qR=IKnde*AEz_7z2pdi_Bh-sb3b=PdGO1Pdf_q2;+*Cx9YN7p_>rl``knY zRn%aVkcv1(W;`Mtp_DNOIECtgq%ufk-mu_<+Fu3Q17Tq4Rr(oeq)Yqk_CHA7LR@7@ zIZIDxxhS&=F2IQfusQ+Nsr%*zFK7S4g!U0y@3H^Yln|i;0a5+?RPG;ZSp6Tul>ezM z`40+516&719qT)mW|ArDSENle5hE2e8qY+zfeZoy12u&xoMgcP)4=&P-1Ib*-bAy` zlT?>w&B|ei-rCXO;sxo7*G;!)_p#%PAM-?m$JP(R%x1Hfas@KeaG%LO?R=lmkXc_MKZW}3f%KZ*rAN?HYvbu2L$ zRt_uv7~-IejlD1x;_AhwGXjB94Q=%+PbxuYzta*jw?S&%|qb=(JfJ?&6P=R7X zV%HP_!@-zO*zS}46g=J}#AMJ}rtWBr21e6hOn&tEmaM%hALH7nlm2@LP4rZ>2 zebe5aH@k!e?ij4Zwak#30|}>;`bquDQK*xmR=zc6vj0yuyC6+U=LusGnO3ZKFRpen z#pwzh!<+WBVp-!$MAc<0i~I%fW=8IO6K}bJ<-Scq>e+)951R~HKB?Mx2H}pxPHE@} zvqpq5j81_jtb_WneAvp<5kgdPKm|u2BdQx9%EzcCN&U{l+kbkhmV<1}yCTDv%&K^> zg;KCjwh*R1f_`6`si$h6`jyIKT7rTv5#k~x$mUyIw)_>Vr)D4fwIs@}{FSX|5GB1l z4vv;@oS@>Bu7~{KgUa_8eg#Lk6IDT2IY$41$*06{>>V;Bwa(-@N;ex4;D`(QK*b}{ z{#4$Hmt)FLqERgKz=3zXiV<{YX6V)lvYBr3V>N6ajeI~~hGR5Oe>W9r@sg)Na(a4- zxm%|1OKPN6^%JaD^^O~HbLSu=f`1px>RawOxLr+1b2^28U*2#h*W^=lSpSY4(@*^l z{!@9RSLG8Me&RJYLi|?$c!B0fP=4xAM4rerxX{xy{&i6=AqXueQAIBqO+pmuxy8Ib z4X^}r!NN3-upC6B#lt7&x0J;)nb9O~xjJMemm$_fHuP{DgtlU3xiW0UesTzS30L+U zQzDI3p&3dpONhd5I8-fGk^}@unluzu%nJ$9pzoO~Kk!>dLxw@M)M9?pNH1CQhvA`z zV;uacUtnBTdvT`M$1cm9`JrT3BMW!MNVBy%?@ZX%;(%(vqQAz<7I!hlDe|J3cn9=} zF7B;V4xE{Ss76s$W~%*$JviK?w8^vqCp#_G^jN0j>~Xq#Zru26e#l3H^{GCLEXI#n z?n~F-Lv#hU(bZS`EI9(xGV*jT=8R?CaK)t8oHc9XJ;UPY0Hz$XWt#QyLBaaz5+}xM zXk(!L_*PTt7gwWH*HLWC$h3Ho!SQ-(I||nn_iEC{WT3S{3V{8IN6tZ1C+DiFM{xlI zeMMk{o5;I6UvaC)@WKp9D+o?2Vd@4)Ue-nYci()hCCsKR`VD;hr9=vA!cgGL%3k^b(jADGyPi2TKr(JNh8mzlIR>n(F_hgiV(3@Ds(tjbNM7GoZ;T|3 zWzs8S`5PrA!9){jBJuX4y`f<4;>9*&NY=2Sq2Bp`M2(fox7ZhIDe!BaQUb@P(ub9D zlP8!p(AN&CwW!V&>H?yPFMJ)d5x#HKfwx;nS{Rr@oHqpktOg)%F+%1#tsPtq7zI$r zBo-Kflhq-=7_eW9B2OQv=@?|y0CKN77)N;z@tcg;heyW{wlpJ1t`Ap!O0`Xz{YHqO zI1${8Hag^r!kA<2_~bYtM=<1YzQ#GGP+q?3T7zYbIjN6Ee^V^b&9en$8FI*NIFg9G zPG$OXjT0Ku?%L7fat8Mqbl1`azf1ltmKTa(HH$Dqlav|rU{zP;Tbnk-XkGFQ6d+gi z-PXh?_kEJl+K98&OrmzgPIijB4!Pozbxd0H1;Usy!;V>Yn6&pu*zW8aYx`SC!$*ti zSn+G9p=~w6V(fZZHc>m|PPfjK6IN4(o=IFu?pC?+`UZAUTw!e`052{P=8vqT^(VeG z=psASIhCv28Y(;7;TuYAe>}BPk5Qg=8$?wZj9lj>h2kwEfF_CpK=+O6Rq9pLn4W)# zeXCKCpi~jsfqw7Taa0;!B5_C;B}e56W1s8@p*)SPzA;Fd$Slsn^=!_&!mRHV*Lmt| zBGIDPuR>CgS4%cQ4wKdEyO&Z>2aHmja;Pz+n|7(#l%^2ZLCix%>@_mbnyPEbyrHaz z>j^4SIv;ZXF-Ftzz>*t4wyq)ng8%0d;(Z_ExZ-cxwei=8{(br-`JYO(f23Wae_MqE z3@{Mlf^%M5G1SIN&en1*| zH~ANY1h3&WNsBy$G9{T=`kcxI#-X|>zLX2r*^-FUF+m0{k)n#GTG_mhG&fJfLj~K& zU~~6othMlvMm9<*SUD2?RD+R17|Z4mgR$L*R3;nBbo&Vm@39&3xIg;^aSxHS>}gwR zmzs?h8oPnNVgET&dx5^7APYx6Vv6eou07Zveyd+^V6_LzI$>ic+pxD_8s~ zC<}ucul>UH<@$KM zT4oI=62M%7qQO{}re-jTFqo9Z;rJKD5!X5$iwUsh*+kcHVhID08MB5cQD4TBWB(rI zuWc%CA}}v|iH=9gQ?D$1#Gu!y3o~p7416n54&Hif`U-cV?VrUMJyEqo_NC4#{puzU zzXEE@UppeeRlS9W*^N$zS`SBBi<@tT+<%3l@KhOy^%MWB9(A#*J~DQ;+MK*$rxo6f zcx3$3mcx{tly!q(p2DQrxcih|)0do_ZY77pyHGE#Q(0k*t!HUmmMcYFq%l$-o6%lS zDb49W-E?rQ#Hl``C3YTEdGZjFi3R<>t)+NAda(r~f1cT5jY}s7-2^&Kvo&2DLTPYP zhVVo-HLwo*vl83mtQ9)PR#VBg)FN}+*8c-p8j`LnNUU*Olm1O1Qqe62D#$CF#?HrM zy(zkX|1oF}Z=T#3XMLWDrm(|m+{1&BMxHY7X@hM_+cV$5-t!8HT(dJi6m9{ja53Yw z3f^`yb6Q;(e|#JQIz~B*=!-GbQ4nNL-NL z@^NWF_#w-Cox@h62;r^;Y`NX8cs?l^LU;5IWE~yvU8TqIHij!X8ydbLlT0gwmzS9} z@5BccG?vO;rvCs$mse1*ANi-cYE6Iauz$Fbn3#|ToAt5v7IlYnt6RMQEYLldva{~s zvr>1L##zmeoYgvIXJ#>bbuCVuEv2ZvZ8I~PQUN3wjP0UC)!U+wn|&`V*8?)` zMSCuvnuGec>QL+i1nCPGDAm@XSMIo?A9~C?g2&G8aNKjWd2pDX{qZ?04+2 zeyLw}iEd4vkCAWwa$ zbrHlEf3hfN7^1g~aW^XwldSmx1v~1z(s=1az4-wl} z`mM+G95*N*&1EP#u3}*KwNrPIgw8Kpp((rdEOO;bT1;6ea~>>sK+?!;{hpJ3rR<6UJb`O8P4@{XGgV%63_fs%cG8L zk9Fszbdo4tS$g0IWP1>t@0)E%-&9yj%Q!fiL2vcuL;90fPm}M==<>}Q)&sp@STFCY z^p!RzmN+uXGdtPJj1Y-khNyCb6Y$Vs>eZyW zPaOV=HY_T@FwAlleZCFYl@5X<<7%5DoO(7S%Lbl55?{2vIr_;SXBCbPZ(up;pC6Wx={AZL?shYOuFxLx1*>62;2rP}g`UT5+BHg(ju z&7n5QSvSyXbioB9CJTB#x;pexicV|9oaOpiJ9VK6EvKhl4^Vsa(p6cIi$*Zr0UxQ z;$MPOZnNae2Duuce~7|2MCfhNg*hZ9{+8H3?ts9C8#xGaM&sN;2lriYkn9W>&Gry! z3b(Xx1x*FhQkD-~V+s~KBfr4M_#0{`=Yrh90yj}Ph~)Nx;1Y^8<418tu!$1<3?T*~ z7Dl0P3Uok-7w0MPFQexNG1P5;y~E8zEvE49>$(f|XWtkW2Mj`udPn)pb%} zrA%wRFp*xvDgC767w!9`0vx1=q!)w!G+9(-w&p*a@WXg{?T&%;qaVcHo>7ca%KX$B z^7|KBPo<2;kM{2mRnF8vKm`9qGV%|I{y!pKm8B(q^2V;;x2r!1VJ^Zz8bWa)!-7a8 zSRf@dqEPlsj!7}oNvFFAA)75})vTJUwQ03hD$I*j6_5xbtd_JkE2`IJD_fQ;a$EkO z{fQ{~e%PKgPJsD&PyEvDmg+Qf&p*-qu!#;1k2r_(H72{^(Z)htgh@F?VIgK#_&eS- z$~(qInec>)XIkv@+{o6^DJLpAb>!d}l1DK^(l%#OdD9tKK6#|_R?-%0V!`<9Hj z3w3chDwG*SFte@>Iqwq`J4M&{aHXzyigT620+Vf$X?3RFfeTcvx_e+(&Q*z)t>c0e zpZH$1Z3X%{^_vylHVOWT6tno=l&$3 z9^eQ@TwU#%WMQaFvaYp_we%_2-9=o{+ck zF{cKJCOjpW&qKQquyp2BXCAP920dcrZ}T1@piukx_NY;%2W>@Wca%=Ch~x5Oj58Hv z;D-_ALOZBF(Mqbcqjd}P3iDbek#Dwzu`WRs`;hRIr*n0PV7vT+%Io(t}8KZ zpp?uc2eW!v28ipep0XNDPZt7H2HJ6oey|J3z!ng#1H~x_k%35P+Cp%mqXJ~cV0xdd z^4m5^K_dQ^Sg?$P`))ccV=O>C{Ds(C2WxX$LMC5vy=*44pP&)X5DOPYfqE${)hDg< z3hcG%U%HZ39=`#Ko4Uctg&@PQLf>?0^D|4J(_1*TFMOMB!Vv1_mnOq$BzXQdOGqgy zOp#LBZ!c>bPjY1NTXksZmbAl0A^Y&(%a3W-k>bE&>K?px5Cm%AT2E<&)Y?O*?d80d zgI5l~&Mve;iXm88Q+Fw7{+`PtN4G7~mJWR^z7XmYQ>uoiV!{tL)hp|= zS(M)813PM`d<501>{NqaPo6BZ^T{KBaqEVH(2^Vjeq zgeMeMpd*1tE@@);hGjuoVzF>Cj;5dNNwh40CnU+0DSKb~GEMb_# zT8Z&gz%SkHq6!;_6dQFYE`+b`v4NT7&@P>cA1Z1xmXy<2htaDhm@XXMp!g($ zw(7iFoH2}WR`UjqjaqOQ$ecNt@c|K1H1kyBArTTjLp%-M`4nzOhkfE#}dOpcd;b#suq8cPJ&bf5`6Tq>ND(l zib{VrPZ>{KuaIg}Y$W>A+nrvMg+l4)-@2jpAQ5h(Tii%Ni^-UPVg{<1KGU2EIUNGaXcEkOedJOusFT9X3%Pz$R+-+W+LlRaY-a$5r?4V zbPzgQl22IPG+N*iBRDH%l{Zh$fv9$RN1sU@Hp3m=M}{rX%y#;4(x1KR2yCO7Pzo>rw(67E{^{yUR`91nX^&MxY@FwmJJbyPAoWZ9Z zcBS$r)&ogYBn{DOtD~tIVJUiq|1foX^*F~O4hlLp-g;Y2wKLLM=?(r3GDqsPmUo*? zwKMEi*%f)C_@?(&&hk>;m07F$X7&i?DEK|jdRK=CaaNu-)pX>n3}@%byPKVkpLzBq z{+Py&!`MZ^4@-;iY`I4#6G@aWMv{^2VTH7|WF^u?3vsB|jU3LgdX$}=v7#EHRN(im zI(3q-eU$s~r=S#EWqa_2!G?b~ z<&brq1vvUTJH380=gcNntZw%7UT8tLAr-W49;9y^=>TDaTC|cKA<(gah#2M|l~j)w zY8goo28gj$n&zcNgqX1Qn6=<8?R0`FVO)g4&QtJAbW3G#D)uNeac-7cH5W#6i!%BH z=}9}-f+FrtEkkrQ?nkoMQ1o-9_b+&=&C2^h!&mWFga#MCrm85hW;)1pDt;-uvQG^D zntSB?XA*0%TIhtWDS!KcI}kp3LT>!(Nlc(lQN?k^bS8Q^GGMfo}^|%7s;#r+pybl@?KA++|FJ zr%se9(B|g*ERQU96az%@4gYrxRRxaM2*b}jNsG|0dQi;Rw{0WM0E>rko!{QYAJJKY z)|sX0N$!8d9E|kND~v|f>3YE|uiAnqbkMn)hu$if4kUkzKqoNoh8v|S>VY1EKmgO} zR$0UU2o)4i4yc1inx3}brso+sio{)gfbLaEgLahj8(_Z#4R-v) zglqwI%`dsY+589a8$Mu7#7_%kN*ekHupQ#48DIN^uhDxblDg3R1yXMr^NmkR z7J_NWCY~fhg}h!_aXJ#?wsZF$q`JH>JWQ9`jbZzOBpS`}-A$Vgkq7+|=lPx9H7QZG z8i8guMN+yc4*H*ANr$Q-3I{FQ-^;8ezWS2b8rERp9TMOLBxiG9J*g5=?h)mIm3#CGi4JSq1ohFrcrxx@`**K5%T}qbaCGldV!t zVeM)!U3vbf5FOy;(h08JnhSGxm)8Kqxr9PsMeWi=b8b|m_&^@#A3lL;bVKTBx+0v8 zLZeWAxJ~N27lsOT2b|qyp$(CqzqgW@tyy?CgwOe~^i;ZH zlL``i4r!>i#EGBNxV_P@KpYFQLz4Bdq{#zA&sc)*@7Mxsh9u%e6Ke`?5Yz1jkTdND zR8!u_yw_$weBOU}24(&^Bm|(dSJ(v(cBct}87a^X(v>nVLIr%%D8r|&)mi+iBc;B;x;rKq zd8*X`r?SZsTNCPQqoFOrUz8nZO?225Z#z(B!4mEp#ZJBzwd7jW1!`sg*?hPMJ$o`T zR?KrN6OZA1H{9pA;p0cSSu;@6->8aJm1rrO-yDJ7)lxuk#npUk7WNER1Wwnpy%u zF=t6iHzWU(L&=vVSSc^&D_eYP3TM?HN!Tgq$SYC;pSIPWW;zeNm7Pgub#yZ@7WPw#f#Kl)W4%B>)+8%gpfoH1qZ;kZ*RqfXYeGXJ_ zk>2otbp+1By`x^1V!>6k5v8NAK@T;89$`hE0{Pc@Q$KhG0jOoKk--Qx!vS~lAiypV zCIJ&6B@24`!TxhJ4_QS*S5;;Pk#!f(qIR7*(c3dN*POKtQe)QvR{O2@QsM%ujEAWEm) z+PM=G9hSR>gQ`Bv2(k}RAv2+$7qq(mU`fQ+&}*i%-RtSUAha>70?G!>?w%F(b4k!$ zvm;E!)2`I?etmSUFW7WflJ@8Nx`m_vE2HF#)_BiD#FaNT|IY@!uUbd4v$wTglIbIX zblRy5=wp)VQzsn0_;KdM%g<8@>#;E?vypTf=F?3f@SSdZ;XpX~J@l1;p#}_veWHp>@Iq_T z@^7|h;EivPYv1&u0~l9(a~>dV9Uw10QqB6Dzu1G~-l{*7IktljpK<_L8m0|7VV_!S zRiE{u97(%R-<8oYJ{molUd>vlGaE-C|^<`hppdDz<7OS13$#J zZ+)(*rZIDSt^Q$}CRk0?pqT5PN5TT`Ya{q(BUg#&nAsg6apPMhLTno!SRq1e60fl6GvpnwDD4N> z9B=RrufY8+g3_`@PRg+(+gs2(bd;5#{uTZk96CWz#{=&h9+!{_m60xJxC%r&gd_N! z>h5UzVX%_7@CUeAA1XFg_AF%(uS&^1WD*VPS^jcC!M2v@RHZML;e(H-=(4(3O&bX- zI6>usJOS+?W&^S&DL{l|>51ZvCXUKlH2XKJPXnHjs*oMkNM#ZDLx!oaM5(%^)5XaP zk6&+P16sA>vyFe9v`Cp5qnbE#r#ltR5E+O3!WnKn`56Grs2;sqr3r# zp@Zp<^q`5iq8OqOlJ`pIuyK@3zPz&iJ0Jcc`hDQ1bqos2;}O|$i#}e@ua*x5VCSx zJAp}+?Hz++tm9dh3Fvm_bO6mQo38al#>^O0g)Lh^&l82+&x)*<n7^Sw-AJo9tEzZDwyJ7L^i7|BGqHu+ea6(&7jKpBq>~V z8CJxurD)WZ{5D0?s|KMi=e7A^JVNM6sdwg@1Eg_+Bw=9j&=+KO1PG|y(mP1@5~x>d z=@c{EWU_jTSjiJl)d(>`qEJ;@iOBm}alq8;OK;p(1AdH$)I9qHNmxxUArdzBW0t+Qeyl)m3?D09770g z)hzXEOy>2_{?o%2B%k%z4d23!pZcoxyW1Ik{|m7Q1>fm4`wsRrl)~h z_=Z*zYL+EG@DV1{6@5@(Ndu!Q$l_6Qlfoz@79q)Kmsf~J7t1)tl#`MD<;1&CAA zH8;i+oBm89dTTDl{aH`cmTPTt@^K-%*sV+t4X9q0Z{A~vEEa!&rRRr=0Rbz4NFCJr zLg2u=0QK@w9XGE=6(-JgeP}G#WG|R&tfHRA3a9*zh5wNTBAD;@YYGx%#E4{C#Wlfo z%-JuW9=FA_T6mR2-Vugk1uGZvJbFvVVWT@QOWz$;?u6+CbyQsbK$>O1APk|xgnh_8 zc)s@Mw7#0^wP6qTtyNq2G#s?5j~REyoU6^lT7dpX{T-rhZWHD%dik*=EA7bIJgOVf_Ga!yC8V^tkTOEHe+JK@Fh|$kfNxO^= z#lpV^(ZQ-3!^_BhV>aXY~GC9{8%1lOJ}6vzXDvPhC>JrtXwFBC+!3a*Z-%#9}i z#<5&0LLIa{q!rEIFSFc9)>{-_2^qbOg5;_A9 ztQ))C6#hxSA{f9R3Eh^`_f${pBJNe~pIQ`tZVR^wyp}=gLK}e5_vG@w+-mp#Fu>e| z*?qBp5CQ5zu+Fi}xAs)YY1;bKG!htqR~)DB$ILN6GaChoiy%Bq@i+1ZnANC0U&D z_4k$=YP47ng+0NhuEt}6C;9-JDd8i5S>`Ml==9wHDQFOsAlmtrVwurYDw_)Ihfk35 zJDBbe!*LUpg%4n>BExWz>KIQ9vexUu^d!7rc_kg#Bf= z7TLz|l*y*3d2vi@c|pX*@ybf!+Xk|2*z$@F4K#MT8Dt4zM_EcFmNp31#7qT6(@GG? zdd;sSY9HHuDb=w&|K%sm`bYX#%UHKY%R`3aLMO?{T#EI@FNNFNO>p@?W*i0z(g2dt z{=9Ofh80Oxv&)i35AQN>TPMjR^UID-T7H5A?GI{MD_VeXZ%;uo41dVm=uT&ne2h0i zv*xI%9vPtdEK@~1&V%p1sFc2AA`9?H)gPnRdlO~URx!fiSV)j?Tf5=5F>hnO=$d$x zzaIfr*wiIc!U1K*$JO@)gP4%xp!<*DvJSv7p}(uTLUb=MSb@7_yO+IsCj^`PsxEl& zIxsi}s3L?t+p+3FXYqujGhGwTx^WXgJ1}a@Yq5mwP0PvGEr*qu7@R$9j>@-q1rz5T zriz;B^(ex?=3Th6h;7U`8u2sDlfS{0YyydK=*>-(NOm9>S_{U|eg(J~C7O zIe{|LK=Y`hXiF_%jOM8Haw3UtaE{hWdzo3BbD6ud7br4cODBtN(~Hl+odP0SSWPw;I&^m)yLw+nd#}3#z}?UIcX3=SssI}`QwY=% zAEXTODk|MqTx}2DVG<|~(CxgLyi*A{m>M@1h^wiC)4Hy>1K7@|Z&_VPJsaQoS8=ex zDL&+AZdQa>ylxhT_Q$q=60D5&%pi6+qlY3$3c(~rsITX?>b;({FhU!7HOOhSP7>bmTkC8KM%!LRGI^~y3Ug+gh!QM=+NZXznM)?L3G=4=IMvFgX3BAlyJ z`~jjA;2z+65D$j5xbv9=IWQ^&-K3Yh`vC(1Qz2h2`o$>Cej@XRGff!it$n{@WEJ^N z41qk%Wm=}mA*iwCqU_6}Id!SQd13aFER3unXaJJXIsSnxvG2(hSCP{i&QH$tL&TPx zDYJsuk+%laN&OvKb-FHK$R4dy%M7hSB*yj#-nJy?S9tVoxAuDei{s}@+pNT!vLOIC z8g`-QQW8FKp3cPsX%{)0B+x+OhZ1=L7F-jizt|{+f1Ga7%+!BXqjCjH&x|3%?UbN# zh?$I1^YokvG$qFz5ySK+Ja5=mkR&p{F}ev**rWdKMko+Gj^?Or=UH?SCg#0F(&a_y zXOh}dPv0D9l0RVedq1~jCNV=8?vZfU-Xi|nkeE->;ohG3U7z+^0+HV17~-_Mv#mV` zzvwUJJ15v5wwKPv-)i@dsEo@#WEO9zie7mdRAbgL2kjbW4&lk$vxkbq=w5mGKZK6@ zjXWctDkCRx58NJD_Q7e}HX`SiV)TZMJ}~zY6P1(LWo`;yDynY_5_L?N-P`>ALfmyl z8C$a~FDkcwtzK9m$tof>(`Vu3#6r#+v8RGy#1D2)F;vnsiL&P-c^PO)^B-4VeJteLlT@25sPa z%W~q5>YMjj!mhN})p$47VA^v$Jo6_s{!y?}`+h+VM_SN`!11`|;C;B};B&Z<@%FOG z_YQVN+zFF|q5zKab&e4GH|B;sBbKimHt;K@tCH+S{7Ry~88`si7}S)1E{21nldiu5 z_4>;XTJa~Yd$m4A9{Qbd)KUAm7XNbZ4xHbg3a8-+1uf*$1PegabbmCzgC~1WB2F(W zYj5XhVos!X!QHuZXCatkRsdEsSCc+D2?*S7a+(v%toqyxhjz|`zdrUvsxQS{J>?c& zvx*rHw^8b|v^7wq8KWVofj&VUitbm*a&RU_ln#ZFA^3AKEf<#T%8I!Lg3XEsdH(A5 zlgh&M_XEoal)i#0tcq8c%Gs6`xu;vvP2u)D9p!&XNt z!TdF_H~;`g@fNXkO-*t<9~;iEv?)Nee%hVe!aW`N%$cFJ(Dy9+Xk*odyFj72T!(b%Vo5zvCGZ%3tkt$@Wcx8BWEkefI1-~C_3y*LjlQ5%WEz9WD8i^ z2MV$BHD$gdPJV4IaV)G9CIFwiV=ca0cfXdTdK7oRf@lgyPx;_7*RRFk=?@EOb9Gcz zg~VZrzo*Snp&EE{$CWr)JZW)Gr;{B2ka6B!&?aknM-FENcl%45#y?oq9QY z3^1Y5yn&^D67Da4lI}ljDcphaEZw2;tlYuzq?uB4b9Mt6!KTW&ptxd^vF;NbX=00T z@nE1lIBGgjqs?ES#P{ZfRb6f!At51vk%<0X%d_~NL5b8UyfQMPDtfU@>ijA0NP3UU zh{lCf`Wu7cX!go`kUG`1K=7NN@SRGjUKuo<^;@GS!%iDXbJs`o6e`v3O8-+7vRkFm z)nEa$sD#-v)*Jb>&Me+YIW3PsR1)h=-Su)))>-`aRcFJG-8icomO4J@60 zw10l}BYxi{eL+Uu0xJYk-Vc~BcR49Qyyq!7)PR27D`cqGrik=?k1Of>gY7q@&d&Ds zt7&WixP`9~jjHO`Cog~RA4Q%uMg+$z^Gt&vn+d3&>Ux{_c zm|bc;k|GKbhZLr-%p_f%dq$eiZ;n^NxoS-Nu*^Nx5vm46)*)=-Bf<;X#?`YC4tLK; z?;u?shFbXeks+dJ?^o$l#tg*1NA?(1iFff@I&j^<74S!o;SWR^Xi);DM%8XiWpLi0 zQE2dL9^a36|L5qC5+&Pf0%>l&qQ&)OU4vjd)%I6{|H+pw<0(a``9w(gKD&+o$8hOC zNAiShtc}e~ob2`gyVZx59y<6Fpl*$J41VJ-H*e-yECWaDMmPQi-N8XI3 z%iI@ljc+d}_okL1CGWffeaejlxWFVDWu%e=>H)XeZ|4{HlbgC-Uvof4ISYQzZ0Um> z#Ov{k1c*VoN^f(gfiueuag)`TbjL$XVq$)aCUBL_M`5>0>6Ska^*Knk__pw{0I>jA zzh}Kzg{@PNi)fcAk7jMAdi-_RO%x#LQszDMS@_>iFoB+zJ0Q#CQJzFGa8;pHFdi`^ zxnTC`G$7Rctm3G8t8!SY`GwFi4gF|+dAk7rh^rA{NXzc%39+xSYM~($L(pJ(8Zjs* zYdN_R^%~LiGHm9|ElV4kVZGA*T$o@YY4qpJOxGHlUi*S*A(MrgQ{&xoZQo+#PuYRs zv3a$*qoe9gBqbN|y|eaH=w^LE{>kpL!;$wRahY(hhzRY;d33W)m*dfem@)>pR54Qy z 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..6d57edc706 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000000..d1e92fe5db --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'duke' From 0112efe4f745ecd1985e5362f85e8ddc5facb02c Mon Sep 17 00:00:00 2001 From: Jeffry Lum <22460123+j-lum@users.noreply.github.com> Date: Mon, 12 Aug 2019 18:09:24 +0800 Subject: [PATCH 02/37] Add sample checkstyle configuration Add toolVersion block in to Gradle code sample to prevent errors. --- config/checkstyle/checkstyle.xml | 257 +++++++++++++++++++++++++++++++ tutorials/gradleTutorial.md | 7 +- 2 files changed, 263 insertions(+), 1 deletion(-) create mode 100644 config/checkstyle/checkstyle.xml diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 0000000000..b1a57ba6c0 --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tutorials/gradleTutorial.md b/tutorials/gradleTutorial.md index d16b72179a..fd6b043bf7 100644 --- a/tutorials/gradleTutorial.md +++ b/tutorials/gradleTutorial.md @@ -74,11 +74,16 @@ plugins { id 'application' id 'checkstyle' } + +checkstyle { + toolVersion = '8.23' +} + // ... ``` Checkstyle expects configuration files for checkstyle to be in `./config/checkstyle/` by convention. -For example, you can copy [these files from se-edu/addressbook-level3](https://github.com/se-edu/addressbook-level3/blob/master/config/checkstyle/) to your project. +A sample checkstyle rule configuration is provided in the branch. The plugin adds a few _tasks_ to your project. Run `gradlew checkstyleMain checkstyleTest` to verify that you have set up Checkstyle properly (the command will check your main code and test code against the style rules). From cfd6da79bab287c74d4b7f5666e61e686674fb29 Mon Sep 17 00:00:00 2001 From: Jeffry Lum <22460123+j-lum@users.noreply.github.com> Date: Sun, 18 Aug 2019 23:25:53 +0800 Subject: [PATCH 03/37] Change file mode on `gradle` to be executable --- gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From a3ca5a4e3fe35013f5690cacd168b19f7370a013 Mon Sep 17 00:00:00 2001 From: Jeffry Lum <22460123+j-lum@users.noreply.github.com> Date: Wed, 21 Aug 2019 00:32:40 +0800 Subject: [PATCH 04/37] Add configuration for console applications Gradle defaults to an empty stdin which results in runtime exceptions when attempting to read from `System.in`. Let's add some sensible defaults for students who may still need to work with the standard input stream. --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index e5b8ce7e49..ce97c7ba2e 100644 --- a/build.gradle +++ b/build.gradle @@ -14,3 +14,7 @@ application { // Change this to your main class. mainClassName = "seedu.duke.Duke" } + +run { + standardInput = System.in +} \ No newline at end of file From 69d98fe5a08c06a214567d6aa5160bfdaff5acc6 Mon Sep 17 00:00:00 2001 From: Shirley Wang Date: Wed, 28 Aug 2019 06:27:41 +0800 Subject: [PATCH 05/37] Level-1 --- src/main/src/Duke.java | 43 ++++++++++++++++++++++++++ src/main/src/text-ui-test/ACTUAL.TXT | 19 ++++++++++++ src/main/src/text-ui-test/EXPECTED.txt | 19 ++++++++++++ src/main/src/text-ui-test/input.txt | 3 ++ src/main/src/text-ui-test/runtest.sh | 34 ++++++++++++++++++++ 5 files changed, 118 insertions(+) create mode 100644 src/main/src/Duke.java create mode 100644 src/main/src/text-ui-test/ACTUAL.TXT create mode 100644 src/main/src/text-ui-test/EXPECTED.txt create mode 100644 src/main/src/text-ui-test/input.txt create mode 100644 src/main/src/text-ui-test/runtest.sh diff --git a/src/main/src/Duke.java b/src/main/src/Duke.java new file mode 100644 index 0000000000..96b52943b9 --- /dev/null +++ b/src/main/src/Duke.java @@ -0,0 +1,43 @@ +import java.util.Scanner; + +public class Duke { + public static void main(String[] args) { + + String cmd; + Scanner scan = new Scanner(System.in); + + /* + String logo = " ____ _ \n" + + "| _ \\ _ _| | _____ \n" + + "| | | | | | | |/ / _ \\\n" + + "| |_| | |_| | < __/\n" + + "|____/ \\__,_|_|\\_\\___|\n"; + System.out.println("Hello from\n" + logo); + */ + + String line = "____________________________________________________________"; + String tab = " "; + + printDuke(line); + printDuke("Hello! I'm Duke"); + printDuke("What can I do for you?"); + printDuke(line); + + while(true) { + cmd = scan.next(); + if (cmd.equals("bye")) { + printDuke(line); + printDuke("Bye. Hope to see you again soon!"); + printDuke(line); + break; + } + printDuke(line); + printDuke(cmd); + printDuke(line); + } + } + + public static void printDuke(String toPrint) { + System.out.println(" " + toPrint); + } +} \ No newline at end of file diff --git a/src/main/src/text-ui-test/ACTUAL.TXT b/src/main/src/text-ui-test/ACTUAL.TXT new file mode 100644 index 0000000000..9cfe2e1376 --- /dev/null +++ b/src/main/src/text-ui-test/ACTUAL.TXT @@ -0,0 +1,19 @@ + ___________________________________________________________ + Hello! I'm Duke + What can I do for you? + ____________________________________________________________ + +list + ____________________________________________________________ + list + ____________________________________________________________ + +blah + ____________________________________________________________ + blah + ____________________________________________________________ + +bye + ____________________________________________________________ + Bye. Hope to see you again soon! + ____________________________________________________________ \ No newline at end of file diff --git a/src/main/src/text-ui-test/EXPECTED.txt b/src/main/src/text-ui-test/EXPECTED.txt new file mode 100644 index 0000000000..9cfe2e1376 --- /dev/null +++ b/src/main/src/text-ui-test/EXPECTED.txt @@ -0,0 +1,19 @@ + ___________________________________________________________ + Hello! I'm Duke + What can I do for you? + ____________________________________________________________ + +list + ____________________________________________________________ + list + ____________________________________________________________ + +blah + ____________________________________________________________ + blah + ____________________________________________________________ + +bye + ____________________________________________________________ + Bye. Hope to see you again soon! + ____________________________________________________________ \ No newline at end of file diff --git a/src/main/src/text-ui-test/input.txt b/src/main/src/text-ui-test/input.txt new file mode 100644 index 0000000000..53883c7fad --- /dev/null +++ b/src/main/src/text-ui-test/input.txt @@ -0,0 +1,3 @@ +list +blah +bye \ No newline at end of file diff --git a/src/main/src/text-ui-test/runtest.sh b/src/main/src/text-ui-test/runtest.sh new file mode 100644 index 0000000000..ecc690dbe0 --- /dev/null +++ b/src/main/src/text-ui-test/runtest.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +# create bin directory if it doesn't exist +if [ ! -d "../bin" ] +then + mkdir ../bin +fi + +# delete output from previous run +if [ -e "./ACTUAL.TXT" ] +then + rm ACTUAL.TXT +fi + +# compile the code into the bin folder, terminates if error occurred +if ! javac -cp ../src -Xlint:none -d ~/Desktop/Desktop/School/school/cs2103t/github/duke/bin ~/Desktop/Desktop/School/school/cs2103t/github/duke/src/main/java/*.java +then + echo "********** BUILD FAILURE **********" + exit 1 +fi + +# run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT +java -classpath ~/Desktop/Desktop/School/school/cs2103t/github/duke/bin Duke < input.txt > ACTUAL.TXT + +# compare the output to the expected output +diff ACTUAL.TXT EXPECTED.TXT +if [ $? -eq 0 ] +then + echo "Test result: PASSED" + exit 0 +else + echo "Test result: FAILED" + exit 1 +fi \ No newline at end of file From 2cde05a078c86ce6a9706c22aa979f83ba6b32a4 Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 28 Aug 2019 06:52:07 +0800 Subject: [PATCH 06/37] added Level-1, ACTUAL.TXT, EXPECTED.txt, input.txt, runtest.sh --- src/main/java/Duke.java | 35 ++++++++++++++- .../{src => java}/text-ui-test/ACTUAL.TXT | 0 .../{src => java}/text-ui-test/EXPECTED.txt | 0 src/main/{src => java}/text-ui-test/input.txt | 0 .../{src => java}/text-ui-test/runtest.sh | 0 src/main/src/Duke.java | 43 ------------------- 6 files changed, 34 insertions(+), 44 deletions(-) rename src/main/{src => java}/text-ui-test/ACTUAL.TXT (100%) rename src/main/{src => java}/text-ui-test/EXPECTED.txt (100%) rename src/main/{src => java}/text-ui-test/input.txt (100%) rename src/main/{src => java}/text-ui-test/runtest.sh (100%) delete mode 100644 src/main/src/Duke.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..96b52943b9 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,10 +1,43 @@ +import java.util.Scanner; + public class Duke { public static void main(String[] args) { + + String cmd; + Scanner scan = new Scanner(System.in); + + /* String logo = " ____ _ \n" + "| _ \\ _ _| | _____ \n" + "| | | | | | | |/ / _ \\\n" + "| |_| | |_| | < __/\n" + "|____/ \\__,_|_|\\_\\___|\n"; System.out.println("Hello from\n" + logo); + */ + + String line = "____________________________________________________________"; + String tab = " "; + + printDuke(line); + printDuke("Hello! I'm Duke"); + printDuke("What can I do for you?"); + printDuke(line); + + while(true) { + cmd = scan.next(); + if (cmd.equals("bye")) { + printDuke(line); + printDuke("Bye. Hope to see you again soon!"); + printDuke(line); + break; + } + printDuke(line); + printDuke(cmd); + printDuke(line); + } } -} + + public static void printDuke(String toPrint) { + System.out.println(" " + toPrint); + } +} \ No newline at end of file diff --git a/src/main/src/text-ui-test/ACTUAL.TXT b/src/main/java/text-ui-test/ACTUAL.TXT similarity index 100% rename from src/main/src/text-ui-test/ACTUAL.TXT rename to src/main/java/text-ui-test/ACTUAL.TXT diff --git a/src/main/src/text-ui-test/EXPECTED.txt b/src/main/java/text-ui-test/EXPECTED.txt similarity index 100% rename from src/main/src/text-ui-test/EXPECTED.txt rename to src/main/java/text-ui-test/EXPECTED.txt diff --git a/src/main/src/text-ui-test/input.txt b/src/main/java/text-ui-test/input.txt similarity index 100% rename from src/main/src/text-ui-test/input.txt rename to src/main/java/text-ui-test/input.txt diff --git a/src/main/src/text-ui-test/runtest.sh b/src/main/java/text-ui-test/runtest.sh similarity index 100% rename from src/main/src/text-ui-test/runtest.sh rename to src/main/java/text-ui-test/runtest.sh diff --git a/src/main/src/Duke.java b/src/main/src/Duke.java deleted file mode 100644 index 96b52943b9..0000000000 --- a/src/main/src/Duke.java +++ /dev/null @@ -1,43 +0,0 @@ -import java.util.Scanner; - -public class Duke { - public static void main(String[] args) { - - String cmd; - Scanner scan = new Scanner(System.in); - - /* - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); - */ - - String line = "____________________________________________________________"; - String tab = " "; - - printDuke(line); - printDuke("Hello! I'm Duke"); - printDuke("What can I do for you?"); - printDuke(line); - - while(true) { - cmd = scan.next(); - if (cmd.equals("bye")) { - printDuke(line); - printDuke("Bye. Hope to see you again soon!"); - printDuke(line); - break; - } - printDuke(line); - printDuke(cmd); - printDuke(line); - } - } - - public static void printDuke(String toPrint) { - System.out.println(" " + toPrint); - } -} \ No newline at end of file From 6522dbc219cd392de831a77060abb0fdd4186d3e Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 28 Aug 2019 07:00:53 +0800 Subject: [PATCH 07/37] Change in location of test-ui-text folder --- {src/main/java/text-ui-test => text-ui-test}/ACTUAL.TXT | 0 {src/main/java/text-ui-test => text-ui-test}/EXPECTED.txt | 0 {src/main/java/text-ui-test => text-ui-test}/input.txt | 0 {src/main/java/text-ui-test => text-ui-test}/runtest.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {src/main/java/text-ui-test => text-ui-test}/ACTUAL.TXT (100%) rename {src/main/java/text-ui-test => text-ui-test}/EXPECTED.txt (100%) rename {src/main/java/text-ui-test => text-ui-test}/input.txt (100%) rename {src/main/java/text-ui-test => text-ui-test}/runtest.sh (100%) diff --git a/src/main/java/text-ui-test/ACTUAL.TXT b/text-ui-test/ACTUAL.TXT similarity index 100% rename from src/main/java/text-ui-test/ACTUAL.TXT rename to text-ui-test/ACTUAL.TXT diff --git a/src/main/java/text-ui-test/EXPECTED.txt b/text-ui-test/EXPECTED.txt similarity index 100% rename from src/main/java/text-ui-test/EXPECTED.txt rename to text-ui-test/EXPECTED.txt diff --git a/src/main/java/text-ui-test/input.txt b/text-ui-test/input.txt similarity index 100% rename from src/main/java/text-ui-test/input.txt rename to text-ui-test/input.txt diff --git a/src/main/java/text-ui-test/runtest.sh b/text-ui-test/runtest.sh similarity index 100% rename from src/main/java/text-ui-test/runtest.sh rename to text-ui-test/runtest.sh From e42b83c0e21c04e2abd18792ffe15f620ecf6720 Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 28 Aug 2019 07:21:48 +0800 Subject: [PATCH 08/37] added level 2 --- src/main/java/Duke.java | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 96b52943b9..95d25f5067 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,10 +1,14 @@ import java.util.Scanner; +import java.util.ArrayList; public class Duke { public static void main(String[] args) { + final String LINE = "____________________________________________________________"; + final String TAB = " "; String cmd; Scanner scan = new Scanner(System.in); + ArrayList list = new ArrayList(); /* String logo = " ____ _ \n" @@ -15,29 +19,39 @@ public static void main(String[] args) { System.out.println("Hello from\n" + logo); */ - String line = "____________________________________________________________"; - String tab = " "; - - printDuke(line); + printDuke(LINE); printDuke("Hello! I'm Duke"); printDuke("What can I do for you?"); - printDuke(line); + printDuke(LINE); while(true) { - cmd = scan.next(); + cmd = scan.nextLine(); if (cmd.equals("bye")) { - printDuke(line); + printDuke(LINE); printDuke("Bye. Hope to see you again soon!"); - printDuke(line); + printDuke(LINE); break; } - printDuke(line); - printDuke(cmd); - printDuke(line); + if (cmd.equals("list")) { + printDuke(LINE); + printDuke(list); + printDuke(LINE); + } else { + list.add(cmd); + printDuke(LINE); + System.out.println(TAB + "added: " + cmd); + printDuke(LINE); + } } } public static void printDuke(String toPrint) { System.out.println(" " + toPrint); } + + public static void printDuke(ArrayList toPrint) { + for (int i = 1; i <= toPrint.size(); i++) { + System.out.println(" " + i + ". " + toPrint.get(i - 1)); + } + } } \ No newline at end of file From 88723afbe406c661a18a98280d768a2922d730f9 Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 4 Sep 2019 12:55:08 +0800 Subject: [PATCH 09/37] added level 3, added Task.java to represent Task --- src/main/java/Duke.java | 58 +++++++++++++++++++++++++++-------------- src/main/java/Task.java | 22 ++++++++++++++++ 2 files changed, 60 insertions(+), 20 deletions(-) create mode 100644 src/main/java/Task.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 95d25f5067..fd4383a7a9 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -8,7 +8,7 @@ public static void main(String[] args) { final String TAB = " "; String cmd; Scanner scan = new Scanner(System.in); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList(); /* String logo = " ____ _ \n" @@ -24,20 +24,44 @@ public static void main(String[] args) { printDuke("What can I do for you?"); printDuke(LINE); - while(true) { + Boolean isNotBye = true; + while(isNotBye) { cmd = scan.nextLine(); - if (cmd.equals("bye")) { - printDuke(LINE); - printDuke("Bye. Hope to see you again soon!"); - printDuke(LINE); - break; - } - if (cmd.equals("list")) { - printDuke(LINE); - printDuke(list); - printDuke(LINE); - } else { - list.add(cmd); + String arr[] = cmd.split(" ", 2); + String firstWord = arr[0]; + + switch (firstWord) { + case "bye": + printDuke(LINE); + printDuke("Bye. Hope to see you again soon!"); + printDuke(LINE); + isNotBye = false; + break; + case "list": + printDuke(LINE); + System.out.println(" Here are the tasks in your list:"); + if (list.isEmpty()) { + break; + } + for (int i = 0; i < list.size(); i++) { + System.out.println(" " + (i + 1) + ". [" + list.get(i).getStatusIcon() + "]" + list.get(i).getDesc()); + } + + printDuke(LINE); + break; + case "done": + printDuke(LINE); + int taskNum = Integer.valueOf(arr[1]); + list.get(taskNum - 1).isDone(true); + printDuke("Nice! I've marked this task as done"); + System.out.println(" " + taskNum + ". [" + list.get(taskNum - 1).getStatusIcon() + "]" + + list.get(taskNum - 1).getDesc()); + //printDuke(); + printDuke(LINE); + break; + default: + Task t = new Task(cmd); + list.add(t); printDuke(LINE); System.out.println(TAB + "added: " + cmd); printDuke(LINE); @@ -48,10 +72,4 @@ public static void main(String[] args) { public static void printDuke(String toPrint) { System.out.println(" " + toPrint); } - - public static void printDuke(ArrayList toPrint) { - for (int i = 1; i <= toPrint.size(); i++) { - System.out.println(" " + i + ". " + toPrint.get(i - 1)); - } - } } \ No newline at end of file diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 0000000000..0c06ad52dc --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,22 @@ +public class Task { + protected String description; + protected boolean isDone; + + public Task(String description) { + this.description = description; + this.isDone = false; + } + + public String getStatusIcon() { + return (isDone ? "\u2713" : "\u2718"); //return tick or X symbols + } + + public void isDone(boolean boo) { + this.isDone = boo; + } + + public String getDesc() { + return this.description; + } + //... +} \ No newline at end of file From c708f136b4c223bda97c55efba56d2c2fdf59eb5 Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Fri, 6 Sep 2019 04:58:27 +0800 Subject: [PATCH 10/37] added level 4 and 5, with error handling and separate class files to support multiple task types --- src/main/java/Deadline.java | 15 +++++++ src/main/java/Duke.java | 90 ++++++++++++++++++++++++++++++++++--- src/main/java/Event.java | 15 +++++++ src/main/java/Task.java | 29 ++++++++++-- src/main/java/Todo.java | 14 ++++++ 5 files changed, 153 insertions(+), 10 deletions(-) create mode 100644 src/main/java/Deadline.java create mode 100644 src/main/java/Event.java create mode 100644 src/main/java/Todo.java diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java new file mode 100644 index 0000000000..b3ba1a4e75 --- /dev/null +++ b/src/main/java/Deadline.java @@ -0,0 +1,15 @@ +public class Deadline extends Task { + + protected String by; + + public Deadline(String description, String by) { + super(description); + this.by = by; + this.type = "deadline"; + } + + @Override + public String toString() { + return " [D]" + super.toString() + "(by: " + by + ")"; + } +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index fd4383a7a9..71c9fe6ed9 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -6,6 +6,7 @@ public static void main(String[] args) { final String LINE = "____________________________________________________________"; final String TAB = " "; + final String GOT_IT = "Got it. I've added this task:"; String cmd; Scanner scan = new Scanner(System.in); ArrayList list = new ArrayList(); @@ -27,8 +28,8 @@ public static void main(String[] args) { Boolean isNotBye = true; while(isNotBye) { cmd = scan.nextLine(); - String arr[] = cmd.split(" ", 2); - String firstWord = arr[0]; + String cmdArr[] = cmd.split(" ", 2); + String firstWord = cmdArr[0]; switch (firstWord) { case "bye": @@ -37,6 +38,7 @@ public static void main(String[] args) { printDuke(LINE); isNotBye = false; break; + case "list": printDuke(LINE); System.out.println(" Here are the tasks in your list:"); @@ -44,14 +46,17 @@ public static void main(String[] args) { break; } for (int i = 0; i < list.size(); i++) { - System.out.println(" " + (i + 1) + ". [" + list.get(i).getStatusIcon() + "]" + list.get(i).getDesc()); + Task task = list.get(i); + printDuke((i + 1) + ". [" + task.getType() + "][" + + task.getStatusIcon() + "]" + task.getDesc()); } printDuke(LINE); break; + case "done": printDuke(LINE); - int taskNum = Integer.valueOf(arr[1]); + int taskNum = Integer.valueOf(cmdArr[1]); list.get(taskNum - 1).isDone(true); printDuke("Nice! I've marked this task as done"); System.out.println(" " + taskNum + ". [" + list.get(taskNum - 1).getStatusIcon() + "]" @@ -59,11 +64,82 @@ public static void main(String[] args) { //printDuke(); printDuke(LINE); break; + + case "todo": + try { + String task = cmdArr[1]; + Todo todo = new Todo(task); + list.add(todo); + + //output + printDuke(LINE); + printDuke(GOT_IT); + printDuke(todo.toString()); + printDuke("Now you have " + list.size() + " tasks in the list"); + printDuke(LINE); + } catch (ArrayIndexOutOfBoundsException exception) { + printDuke(LINE); + printDuke("☹ OOPS!!! The description of a todo cannot be empty."); + printDuke(LINE); + } + break; + + case "deadline": + try { + String taskAndDate = cmdArr[1]; + String dl[] = taskAndDate.split("/", 2); + try { + String by = dl[1].substring(3); + Deadline deadline = new Deadline(dl[0], by); + list.add(deadline); + + //output + printDuke(LINE); + printDuke(GOT_IT); + printDuke(deadline.toString()); + printDuke("Now you have " + list.size() + " tasks in the list"); + printDuke(LINE); + } catch (ArrayIndexOutOfBoundsException exception) { + printDuke(LINE); + printDuke("☹ OOPS!!! Please enter when the deadline is due"); + printDuke(LINE); + } + } catch (ArrayIndexOutOfBoundsException exception) { + printDuke(LINE); + printDuke("☹ OOPS!!! The description of a deadline cannot be empty."); + printDuke(LINE); + } + break; + + case "event": + try { + String eventAndDate = cmdArr[1]; + String e[] = eventAndDate.split("/", 2); + try { + String at = e[1].substring(3); + Event event = new Event(e[0], at); + list.add(event); + + //output(LINE); + printDuke(LINE); + printDuke(GOT_IT); + printDuke(event.toString()); + printDuke("Now you have " + list.size() + " tasks in the list"); + printDuke(LINE); + } catch (ArrayIndexOutOfBoundsException exception) { + printDuke(LINE); + printDuke("☹ OOPS!!! Please enter when the event is happening"); + printDuke(LINE); + } + } catch (ArrayIndexOutOfBoundsException exception) { + printDuke(LINE); + printDuke("☹ OOPS!!! The description of an event cannot be empty."); + printDuke(LINE); + } + break; default: - Task t = new Task(cmd); - list.add(t); printDuke(LINE); - System.out.println(TAB + "added: " + cmd); + printDuke("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); printDuke(LINE); } } diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 0000000000..14520e6d71 --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,15 @@ +public class Event extends Task { + + protected String at; + + public Event(String description, String at) { + super(description); + this.at = at; + this.event = "event"; + } + + @Override + public String toString() { + return " [E]" + super.toString() + "(at: " + at + ")"; + } +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 0c06ad52dc..da47a6c8e8 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,6 +1,9 @@ public class Task { protected String description; protected boolean isDone; + protected String type; + protected String deadline; + protected String event; public Task(String description) { this.description = description; @@ -11,12 +14,32 @@ public String getStatusIcon() { return (isDone ? "\u2713" : "\u2718"); //return tick or X symbols } - public void isDone(boolean boo) { - this.isDone = boo; + public String getType() { + if (type.equals("todo")) { + return "T"; + } else if (type.equals("deadline")) { + return "D"; + } else { + return "E"; + } } public String getDesc() { return this.description; } - //... + + /* mutators */ + + public void isDone(boolean boo) { + this.isDone = boo; + } + + public void addType(String type) { + this.type = type; + } + + @Override + public String toString() { + return "[\u2718] " + description; + } } \ No newline at end of file diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 0000000000..6e6703668c --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,14 @@ +public class Todo extends Task { + + protected String at; + + public Todo(String description) { + super(description); + this.type = "todo"; + } + + @Override + public String toString() { + return " [T]" + super.toString(); + } +} From a526b7181597ac37a5dc2f698cf96a8c8c4dd61e Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Fri, 6 Sep 2019 05:17:27 +0800 Subject: [PATCH 11/37] added level-6 --- src/main/java/Duke.java | 33 +++++++++++++++++++++++++++------ src/main/java/Task.java | 2 +- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 71c9fe6ed9..585063d16b 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -41,10 +41,12 @@ public static void main(String[] args) { case "list": printDuke(LINE); - System.out.println(" Here are the tasks in your list:"); if (list.isEmpty()) { + printDuke("There is nothing in your list."); + printDuke(LINE); break; } + System.out.println(" Here are the tasks in your list:"); for (int i = 0; i < list.size(); i++) { Task task = list.get(i); printDuke((i + 1) + ". [" + task.getType() + "][" + @@ -79,7 +81,7 @@ public static void main(String[] args) { printDuke(LINE); } catch (ArrayIndexOutOfBoundsException exception) { printDuke(LINE); - printDuke("☹ OOPS!!! The description of a todo cannot be empty."); + printDuke("\u2639 OOPS!!! The description of a todo cannot be empty."); printDuke(LINE); } break; @@ -101,12 +103,12 @@ public static void main(String[] args) { printDuke(LINE); } catch (ArrayIndexOutOfBoundsException exception) { printDuke(LINE); - printDuke("☹ OOPS!!! Please enter when the deadline is due"); + printDuke("\u2639 OOPS!!! Please enter when the deadline is due"); printDuke(LINE); } } catch (ArrayIndexOutOfBoundsException exception) { printDuke(LINE); - printDuke("☹ OOPS!!! The description of a deadline cannot be empty."); + printDuke("\u2639 OOPS!!! The description of a deadline cannot be empty."); printDuke(LINE); } break; @@ -128,15 +130,34 @@ public static void main(String[] args) { printDuke(LINE); } catch (ArrayIndexOutOfBoundsException exception) { printDuke(LINE); - printDuke("☹ OOPS!!! Please enter when the event is happening"); + printDuke("\u2639 OOPS!!! Please enter when the event is happening"); printDuke(LINE); } } catch (ArrayIndexOutOfBoundsException exception) { printDuke(LINE); - printDuke("☹ OOPS!!! The description of an event cannot be empty."); + printDuke("\u2639 OOPS!!! The description of an event cannot be empty."); printDuke(LINE); } break; + + case "delete": + try { + int deleteNum = Integer.valueOf(cmdArr[1]); + Task deletedTask = list.get(deleteNum - 1); + list.remove(deleteNum - 1); + + printDuke(LINE); + printDuke("Noted. I've removed this task:"); + printDuke(deletedTask.toString()); + printDuke("Now you have " + list.size() + " tasks in the list"); + printDuke(LINE); + } catch (ArrayIndexOutOfBoundsException exception) { + printDuke(LINE); + printDuke("\u2639 OOPS!!! Please add the task number"); + printDuke(LINE); + } + break; + default: printDuke(LINE); printDuke("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); diff --git a/src/main/java/Task.java b/src/main/java/Task.java index da47a6c8e8..9ad152f33f 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -40,6 +40,6 @@ public void addType(String type) { @Override public String toString() { - return "[\u2718] " + description; + return "[" + this.getStatusIcon() + "] " + description; } } \ No newline at end of file From 3ff017e6a677372acb35f4ec2b60cfc38b11951b Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 11 Sep 2019 00:23:17 +0800 Subject: [PATCH 12/37] fixed printing error for list --- src/main/java/Duke.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 585063d16b..a04c63a638 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -50,7 +50,7 @@ public static void main(String[] args) { for (int i = 0; i < list.size(); i++) { Task task = list.get(i); printDuke((i + 1) + ". [" + task.getType() + "][" + - task.getStatusIcon() + "]" + task.getDesc()); + task.getStatusIcon() + "] " + task.getDesc()); } printDuke(LINE); From 27a6b76ac9d707b108a7d8063cadc5b404734d81 Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 11 Sep 2019 00:23:39 +0800 Subject: [PATCH 13/37] Revert "fixed printing error for list" This reverts commit 3ff017e6a677372acb35f4ec2b60cfc38b11951b. --- src/main/java/Duke.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index a04c63a638..585063d16b 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -50,7 +50,7 @@ public static void main(String[] args) { for (int i = 0; i < list.size(); i++) { Task task = list.get(i); printDuke((i + 1) + ". [" + task.getType() + "][" + - task.getStatusIcon() + "] " + task.getDesc()); + task.getStatusIcon() + "]" + task.getDesc()); } printDuke(LINE); From 51c544fdd750f596bcdeb29fbfc3e7cfa9a04a95 Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 11 Sep 2019 00:28:24 +0800 Subject: [PATCH 14/37] Revert "fixed printing error for list" This reverts commit 3ff017e6a677372acb35f4ec2b60cfc38b11951b. --- src/main/java/Duke.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index a04c63a638..585063d16b 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -50,7 +50,7 @@ public static void main(String[] args) { for (int i = 0; i < list.size(); i++) { Task task = list.get(i); printDuke((i + 1) + ". [" + task.getType() + "][" + - task.getStatusIcon() + "] " + task.getDesc()); + task.getStatusIcon() + "]" + task.getDesc()); } printDuke(LINE); From fee74d8b48153a8f3ab80d5674568c66188a5964 Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 11 Sep 2019 04:49:57 +0800 Subject: [PATCH 15/37] added Level-7 --- src/main/java/Deadline.java | 12 +++++- src/main/java/Duke.java | 25 +++++++++++-- src/main/java/Event.java | 11 ++++++ src/main/java/Saved.java | 74 +++++++++++++++++++++++++++++++++++++ src/main/java/Task.java | 17 ++++++++- src/main/java/Todo.java | 7 +++- src/main/java/data.txt | 4 ++ text-ui-test/EXPECTED.txt | 12 +++--- text-ui-test/input.txt | 7 ++-- 9 files changed, 153 insertions(+), 16 deletions(-) create mode 100644 src/main/java/Saved.java create mode 100644 src/main/java/data.txt diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index b3ba1a4e75..c94be025db 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -5,7 +5,17 @@ public class Deadline extends Task { public Deadline(String description, String by) { super(description); this.by = by; - this.type = "deadline"; + this.type = "D"; + } + + @Override + public String getType() { + return this.type; + } + + @Override + public String getBy() { + return this.by; } @Override diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 585063d16b..3f5bd44756 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,15 +1,33 @@ +import java.io.IOException; +import java.text.ParseException; import java.util.Scanner; import java.util.ArrayList; +import java.io.IOException; +import java.text.ParseException; + public class Duke { - public static void main(String[] args) { + + private ArrayList list; + private Saved savedFile; + private Scanner scan; + + public static void main(String[] args) throws IOException, ParseException { + new Duke("src/main/java/data.txt").run(); + } + + public Duke(String filePath) throws IOException { + scan = new Scanner(System.in); + savedFile = new Saved(filePath); + list = savedFile.loadData(); + } + + public void run() throws IOException, ParseException { final String LINE = "____________________________________________________________"; final String TAB = " "; final String GOT_IT = "Got it. I've added this task:"; String cmd; - Scanner scan = new Scanner(System.in); - ArrayList list = new ArrayList(); /* String logo = " ____ _ \n" @@ -164,6 +182,7 @@ public static void main(String[] args) { printDuke(LINE); } } + savedFile.saveToFile(list); } public static void printDuke(String toPrint) { diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 14520e6d71..67867db6e0 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -6,6 +6,17 @@ public Event(String description, String at) { super(description); this.at = at; this.event = "event"; + this.type = "E"; + } + + @Override + public String getType() { + return this.type; + } + + @Override + public String getAt() { + return this.at; } @Override diff --git a/src/main/java/Saved.java b/src/main/java/Saved.java new file mode 100644 index 0000000000..3bcf577142 --- /dev/null +++ b/src/main/java/Saved.java @@ -0,0 +1,74 @@ +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Scanner; + +import java.io.FileWriter; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; + +public class Saved { + private String filePath; + + public Saved(String filePath) { + this.filePath = filePath; + } + + public ArrayList loadData() throws FileNotFoundException { + File file = new File(filePath); + Scanner scan = new Scanner(file); + + ArrayList list = new ArrayList<>(); + + while(scan.hasNext()) { + String[] text = scan.nextLine().split(" \\| ", 4); + + Task t; + + switch (text[0]) { + case "T": + t = new Todo(text[2]); + break; + case "D": + t = new Deadline(text[2], text[3]); + break; + case "E": + t = new Event(text[2], text[3]); + break; + default: + t = new Task(""); + break; + } + + if (text[1].equals("1")) { + t.isDone = true; + } + + list.add(t); + } + return list; + } + + public void saveToFile(ArrayList list) throws IOException, ParseException { + FileWriter newFile = new FileWriter(this.filePath); + String listToFile = ""; + String s; + + for (Task task: list) { + if (task instanceof Event) { + s = "E" + " | "+ task.getStatusIcon() + " | " + task.getDesc() + " | " + task.getAt(); + } else if (task instanceof Deadline) { + s = "D | " + task.getStatusIcon() + " | " + task.getDesc() + " | " + task.getBy(); + } else { + s = "T | " + task.getStatusIcon() + " | " + task.getDesc(); + } + newFile.write(s); + newFile.write("\n"); + } + + + newFile.write(listToFile); + newFile.flush(); + //newFile.close(); + } +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 9ad152f33f..eb90afbc80 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,3 +1,5 @@ +import java.text.ParseException; + public class Task { protected String description; protected boolean isDone; @@ -19,15 +21,24 @@ public String getType() { return "T"; } else if (type.equals("deadline")) { return "D"; - } else { + } else if (type.equals("event")){ return "E"; } + return "error"; } public String getDesc() { return this.description; } + public String getAt() { + return ""; + } + + public String getBy() { + return ""; + } + /* mutators */ public void isDone(boolean boo) { @@ -42,4 +53,8 @@ public void addType(String type) { public String toString() { return "[" + this.getStatusIcon() + "] " + description; } + + public String toFile() throws ParseException { + return ""; + } } \ No newline at end of file diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index 6e6703668c..24360a24ce 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -4,7 +4,12 @@ public class Todo extends Task { public Todo(String description) { super(description); - this.type = "todo"; + this.type = "T"; + } + + @Override + public String getType() { + return this.type; } @Override diff --git a/src/main/java/data.txt b/src/main/java/data.txt new file mode 100644 index 0000000000..00cd08f7c8 --- /dev/null +++ b/src/main/java/data.txt @@ -0,0 +1,4 @@ +T | ✓ | read book +D | ✘ | return book | June 6th +E | ✘ | project meeting | Aug 6th 2-4pm +T | ✓ | join sports club diff --git a/text-ui-test/EXPECTED.txt b/text-ui-test/EXPECTED.txt index 9cfe2e1376..c2bbe3dccb 100644 --- a/text-ui-test/EXPECTED.txt +++ b/text-ui-test/EXPECTED.txt @@ -5,14 +5,12 @@ list ____________________________________________________________ - list + Here are the tasks in your list: + 1. [T][✓]read book + 2. [D][✘]return book (by: June 6th) + 3. [E][✘]project meeting (at: Aug 6th 2-4pm) + 4. [T][✓]join sports club ____________________________________________________________ - -blah - ____________________________________________________________ - blah - ____________________________________________________________ - bye ____________________________________________________________ Bye. Hope to see you again soon! diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 53883c7fad..34eebc882e 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,3 +1,4 @@ -list -blah -bye \ No newline at end of file +T | 1 | read book +D | 0 | return book | June 6th +E | 0 | project meeting | Aug 6th 2-4pm +T | 1 | join sports club \ No newline at end of file From 13c47ef5b22f28f5c383c5acc8da73dc15ce4257 Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 11 Sep 2019 05:43:02 +0800 Subject: [PATCH 16/37] added Level-8 --- src/main/java/Deadline.java | 11 ++++++++++- src/main/java/Duke.java | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index b3ba1a4e75..bcb0ab0158 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,11 +1,20 @@ +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + public class Deadline extends Task { + private SimpleDateFormat deadline; protected String by; + private Date date; - public Deadline(String description, String by) { + public Deadline(String description, String by) throws ParseException { super(description); this.by = by; this.type = "deadline"; + + deadline = new SimpleDateFormat("dd/MM/yyyy HHmm"); + date = deadline.parse(this.by); } @Override diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 585063d16b..d09562591c 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,4 @@ +import java.text.ParseException; import java.util.Scanner; import java.util.ArrayList; @@ -105,6 +106,10 @@ public static void main(String[] args) { printDuke(LINE); printDuke("\u2639 OOPS!!! Please enter when the deadline is due"); printDuke(LINE); + } catch (ParseException exception) { + printDuke(LINE); + printDuke("\u2639 OOPS!!! Please enter a valid deadline"); + printDuke(LINE); } } catch (ArrayIndexOutOfBoundsException exception) { printDuke(LINE); From 198f8fe5853bf797a3b205fc037e409c4f47fc56 Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 11 Sep 2019 09:46:16 +0800 Subject: [PATCH 17/37] added level-9, with changes to level-8 --- src/main/java/Deadline.java | 2 +- src/main/java/Duke.java | 279 +++++++++++++++++++----------------- src/main/java/Event.java | 2 +- src/main/java/Todo.java | 2 +- 4 files changed, 151 insertions(+), 134 deletions(-) diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 42eee9eb6a..8f86faf5c5 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -42,7 +42,7 @@ public String convertEventTime() throws ParseException, DateTimeException { @Override public String toString() { try { - return " [D]" + super.toString() + " (by: " + convertEventTime() + ")"; + return "[D]" + super.toString() + " (by: " + convertEventTime() + ")"; } catch (ParseException exception) { return "Error"; } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 46548a4b2f..aa7b45eeb8 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -2,15 +2,18 @@ import java.text.ParseException; import java.util.Scanner; import java.util.ArrayList; +import java.util.List; +import java.util.Collection; -import java.io.IOException; -import java.text.ParseException; +//import java.io.IOException; +//import java.text.ParseException; public class Duke { private ArrayList list; private Saved savedFile; private Scanner scan; + final private static String LINE = "____________________________________________________________"; public static void main(String[] args) throws IOException, ParseException { new Duke("src/main/java/data.txt").run(); @@ -24,24 +27,10 @@ public Duke(String filePath) throws IOException, ParseException { public void run() throws IOException, ParseException { - final String LINE = "____________________________________________________________"; - final String TAB = " "; final String GOT_IT = "Got it. I've added this task:"; String cmd; - /* - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); - */ - - printDuke(LINE); - printDuke("Hello! I'm Duke"); - printDuke("What can I do for you?"); - printDuke(LINE); + printIntro(); Boolean isNotBye = true; while(isNotBye) { @@ -50,142 +39,170 @@ public void run() throws IOException, ParseException { String firstWord = cmdArr[0]; switch (firstWord) { - case "bye": - printDuke(LINE); - printDuke("Bye. Hope to see you again soon!"); - printDuke(LINE); - isNotBye = false; - break; - - case "list": - printDuke(LINE); - if (list.isEmpty()) { - printDuke("There is nothing in your list."); - printDuke(LINE); - break; - } - System.out.println(" Here are the tasks in your list:"); - for (int i = 0; i < list.size(); i++) { - Task task = list.get(i); - printDuke((i + 1) + ". " + task.toString()); - - } - - printDuke(LINE); + case "bye": + printLine(); + printDuke("Bye. Hope to see you again soon!"); + printLine(); + isNotBye = false; + break; + + case "list": + printLine(); + if (list.isEmpty()) { + System.out.println(" There is nothing in your list."); + printLine(); break; - - case "done": - printDuke(LINE); - int taskNum = Integer.valueOf(cmdArr[1]); - list.get(taskNum - 1).isDone(true); - printDuke("Nice! I've marked this task as done"); - System.out.println(" " + taskNum + ". [" + list.get(taskNum - 1).getStatusIcon() + "]" + } + printList(list); + break; + + case "done": + printLine(); + int taskNum = Integer.valueOf(cmdArr[1]); + list.get(taskNum - 1).isDone(true); + printDuke("Nice! I've marked this task as done"); + System.out.println(" " + taskNum + ". [" + list.get(taskNum - 1).getStatusIcon() + "]" + list.get(taskNum - 1).getDesc()); - //printDuke(); - printDuke(LINE); - break; - - case "todo": + printLine(); + break; + + case "todo": + try { + String task = cmdArr[1]; + Todo todo = new Todo(task); + list.add(todo); + + //output + printLine(); + printDuke(GOT_IT); + printDuke(todo.toString()); + printDuke("Now you have " + list.size() + " tasks in the list"); + printLine(); + } catch (ArrayIndexOutOfBoundsException exception) { + printLine(); + printDuke("\u2639 OOPS!!! The description of a todo cannot be empty."); + printLine(); + } + break; + + case "deadline": + try { + String taskAndDate = cmdArr[1]; + String dl[] = taskAndDate.split("/", 2); try { - String task = cmdArr[1]; - Todo todo = new Todo(task); - list.add(todo); - + String by = dl[1].substring(3); + Deadline deadline = new Deadline(dl[0], by); + list.add(deadline); //output - printDuke(LINE); printDuke(GOT_IT); - printDuke(todo.toString()); + printDuke(deadline.toString()); printDuke("Now you have " + list.size() + " tasks in the list"); - printDuke(LINE); + printLine(); } catch (ArrayIndexOutOfBoundsException exception) { - printDuke(LINE); - printDuke("\u2639 OOPS!!! The description of a todo cannot be empty."); - printDuke(LINE); + printLine(); + printDuke("\u2639 OOPS!!! Please enter when the deadline is due"); + printLine(); } - break; - - case "deadline": - try { - String taskAndDate = cmdArr[1]; - String dl[] = taskAndDate.split("/", 2); - try { - String by = dl[1].substring(3); - Deadline deadline = new Deadline(dl[0], by); - list.add(deadline); - - //output - printDuke(LINE); - printDuke(GOT_IT); - printDuke(deadline.toString()); - printDuke("Now you have " + list.size() + " tasks in the list"); - printDuke(LINE); - } catch (ArrayIndexOutOfBoundsException exception) { - printDuke(LINE); - printDuke("\u2639 OOPS!!! Please enter when the deadline is due"); - printDuke(LINE); - } - } catch (ArrayIndexOutOfBoundsException exception) { - printDuke(LINE); - printDuke("\u2639 OOPS!!! The description of a deadline cannot be empty."); - printDuke(LINE); + } catch (ArrayIndexOutOfBoundsException exception) { + printLine(); + printDuke("\u2639 OOPS!!! The description of a deadline cannot be empty."); + printLine(); } - break; + break; - case "event": + case "event": + try { + String eventAndDate = cmdArr[1]; + String e[] = eventAndDate.split("/", 2); try { - String eventAndDate = cmdArr[1]; - String e[] = eventAndDate.split("/", 2); - try { - String at = e[1].substring(3); - Event event = new Event(e[0], at); - list.add(event); - - //output(LINE); - printDuke(LINE); - printDuke(GOT_IT); - printDuke(event.toString()); - printDuke("Now you have " + list.size() + " tasks in the list"); - printDuke(LINE); - } catch (ArrayIndexOutOfBoundsException exception) { - printDuke(LINE); - printDuke("\u2639 OOPS!!! Please enter when the event is happening"); - printDuke(LINE); - } - } catch (ArrayIndexOutOfBoundsException exception) { - printDuke(LINE); - printDuke("\u2639 OOPS!!! The description of an event cannot be empty."); - printDuke(LINE); - } - break; + String at = e[1].substring(3); + Event event = new Event(e[0], at); + list.add(event); - case "delete": - try { - int deleteNum = Integer.valueOf(cmdArr[1]); - Task deletedTask = list.get(deleteNum - 1); - list.remove(deleteNum - 1); - - printDuke(LINE); - printDuke("Noted. I've removed this task:"); - printDuke(deletedTask.toString()); + //output + printLine(); + printDuke(GOT_IT); + printDuke(event.toString()); printDuke("Now you have " + list.size() + " tasks in the list"); - printDuke(LINE); + printLine(); } catch (ArrayIndexOutOfBoundsException exception) { - printDuke(LINE); - printDuke("\u2639 OOPS!!! Please add the task number"); - printDuke(LINE); + printLine(); + printDuke("\u2639 OOPS!!! Please enter when the event is happening"); + printLine(); } - break; - - default: - printDuke(LINE); + } catch (ArrayIndexOutOfBoundsException exception) { + printLine(); + printDuke("\u2639 OOPS!!! The description of an event cannot be empty."); + printLine(); + } + break; + + case "delete": + try { + int deleteNum = Integer.valueOf(cmdArr[1]); + Task deletedTask = list.get(deleteNum - 1); + list.remove(deleteNum - 1); + + printLine(); + printDuke("Noted. I've removed this task:"); + printDuke(deletedTask.toString()); + printDuke("Now you have " + list.size() + " tasks in the list"); + printLine(); + } catch (ArrayIndexOutOfBoundsException exception) { + printLine(); + printDuke("\u2639 OOPS!!! Please add the task number"); + printLine(); + } + break; + + case "find": + String keyword = cmdArr[1]; + ArrayList matchingTasks = new ArrayList<>(); + for (Task task : list) { + if (task.getDesc().contains(keyword)) { + matchingTasks.add(task); + } + } + printList(matchingTasks); + break; + default: + printLine(); printDuke("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); - printDuke(LINE); + printLine(); } } savedFile.saveToFile(list); } + public static void printIntro() { + /* + String logo = " ____ _ \n" + + "| _ \\ _ _| | _____ \n" + + "| | | | | | | |/ / _ \\\n" + + "| |_| | |_| | < __/\n" + + "|____/ \\__,_|_|\\_\\___|\n"; + System.out.println("Hello from\n" + logo); + */ + printLine(); + System.out.println(" Hello! I'm Duke"); + System.out.println(" What can I do for you?"); + printLine(); + } + public static void printLine() { + System.out.println(" " + LINE); + } + public static void printDuke(String toPrint) { System.out.println(" " + toPrint); } + public void printList(ArrayList list) { + System.out.println(" Here are the tasks in your list:"); + for (int i = 0; i < list.size(); i++) { + Task task = list.get(i); + System.out.println(" " + (i + 1) + ". " + task.toString()); + + } + + printLine(); + } } \ No newline at end of file diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 71a72183ff..58fcc55f0f 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -37,7 +37,7 @@ public String convertEventTime() throws ParseException, DateTimeException { @Override public String toString() { try { - return " [E]" + super.toString() + " (at: " + convertEventTime() + ")"; + return "[E]" + super.toString() + " (at: " + convertEventTime() + ")"; } catch (ParseException exception) { return "Error"; } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index 24360a24ce..835c4b3668 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -14,6 +14,6 @@ public String getType() { @Override public String toString() { - return " [T]" + super.toString(); + return "[T]" + super.toString(); } } From 345e316bf36d97aa7fd2662260b5bf45253b659c Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 18 Sep 2019 03:20:49 +0800 Subject: [PATCH 18/37] added increments: A-MoreOOP, A-Packages --- src/main/java/Duke.java | 208 ------------------ src/main/java/data.txt | 12 +- src/main/java/duke/Duke.java | 51 +++++ src/main/java/duke/Parser.java | 60 +++++ src/main/java/{ => duke}/Saved.java | 9 +- src/main/java/duke/TaskList.java | 53 +++++ src/main/java/duke/command/AddCommand.java | 21 ++ src/main/java/duke/command/Command.java | 13 ++ src/main/java/duke/command/DeleteCommand.java | 20 ++ src/main/java/duke/command/DoneCommand.java | 20 ++ src/main/java/duke/command/ExitCommand.java | 12 + src/main/java/duke/command/FindCommand.java | 18 ++ src/main/java/duke/command/ListCommand.java | 12 + .../java/duke/exception/DukeException.java | 7 + .../exception/EmptyDateTimeDukeException.java | 7 + .../exception/EmptyTaskNumberException.java | 7 + .../exception/UnknownInputDukeException.java | 7 + src/main/java/{ => duke/task}/Deadline.java | 4 + src/main/java/{ => duke/task}/Event.java | 6 +- src/main/java/{ => duke/task}/Task.java | 17 +- src/main/java/{ => duke/task}/Todo.java | 4 + src/main/java/duke/ui/Ui.java | 52 +++++ 22 files changed, 393 insertions(+), 227 deletions(-) delete mode 100644 src/main/java/Duke.java create mode 100644 src/main/java/duke/Duke.java create mode 100644 src/main/java/duke/Parser.java rename src/main/java/{ => duke}/Saved.java (93%) create mode 100644 src/main/java/duke/TaskList.java create mode 100644 src/main/java/duke/command/AddCommand.java create mode 100644 src/main/java/duke/command/Command.java create mode 100644 src/main/java/duke/command/DeleteCommand.java create mode 100644 src/main/java/duke/command/DoneCommand.java create mode 100644 src/main/java/duke/command/ExitCommand.java create mode 100644 src/main/java/duke/command/FindCommand.java create mode 100644 src/main/java/duke/command/ListCommand.java create mode 100644 src/main/java/duke/exception/DukeException.java create mode 100644 src/main/java/duke/exception/EmptyDateTimeDukeException.java create mode 100644 src/main/java/duke/exception/EmptyTaskNumberException.java create mode 100644 src/main/java/duke/exception/UnknownInputDukeException.java rename src/main/java/{ => duke/task}/Deadline.java (96%) rename src/main/java/{ => duke/task}/Event.java (90%) rename src/main/java/{ => duke/task}/Task.java (72%) rename src/main/java/{ => duke/task}/Todo.java (88%) create mode 100644 src/main/java/duke/ui/Ui.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java deleted file mode 100644 index aa7b45eeb8..0000000000 --- a/src/main/java/Duke.java +++ /dev/null @@ -1,208 +0,0 @@ -import java.io.IOException; -import java.text.ParseException; -import java.util.Scanner; -import java.util.ArrayList; -import java.util.List; -import java.util.Collection; - -//import java.io.IOException; -//import java.text.ParseException; - -public class Duke { - - private ArrayList list; - private Saved savedFile; - private Scanner scan; - final private static String LINE = "____________________________________________________________"; - - public static void main(String[] args) throws IOException, ParseException { - new Duke("src/main/java/data.txt").run(); - } - - public Duke(String filePath) throws IOException, ParseException { - scan = new Scanner(System.in); - savedFile = new Saved(filePath); - list = savedFile.loadData(); - } - - public void run() throws IOException, ParseException { - - final String GOT_IT = "Got it. I've added this task:"; - String cmd; - - printIntro(); - - Boolean isNotBye = true; - while(isNotBye) { - cmd = scan.nextLine(); - String cmdArr[] = cmd.split(" ", 2); - String firstWord = cmdArr[0]; - - switch (firstWord) { - case "bye": - printLine(); - printDuke("Bye. Hope to see you again soon!"); - printLine(); - isNotBye = false; - break; - - case "list": - printLine(); - if (list.isEmpty()) { - System.out.println(" There is nothing in your list."); - printLine(); - break; - } - printList(list); - break; - - case "done": - printLine(); - int taskNum = Integer.valueOf(cmdArr[1]); - list.get(taskNum - 1).isDone(true); - printDuke("Nice! I've marked this task as done"); - System.out.println(" " + taskNum + ". [" + list.get(taskNum - 1).getStatusIcon() + "]" - + list.get(taskNum - 1).getDesc()); - printLine(); - break; - - case "todo": - try { - String task = cmdArr[1]; - Todo todo = new Todo(task); - list.add(todo); - - //output - printLine(); - printDuke(GOT_IT); - printDuke(todo.toString()); - printDuke("Now you have " + list.size() + " tasks in the list"); - printLine(); - } catch (ArrayIndexOutOfBoundsException exception) { - printLine(); - printDuke("\u2639 OOPS!!! The description of a todo cannot be empty."); - printLine(); - } - break; - - case "deadline": - try { - String taskAndDate = cmdArr[1]; - String dl[] = taskAndDate.split("/", 2); - try { - String by = dl[1].substring(3); - Deadline deadline = new Deadline(dl[0], by); - list.add(deadline); - //output - printDuke(GOT_IT); - printDuke(deadline.toString()); - printDuke("Now you have " + list.size() + " tasks in the list"); - printLine(); - } catch (ArrayIndexOutOfBoundsException exception) { - printLine(); - printDuke("\u2639 OOPS!!! Please enter when the deadline is due"); - printLine(); - } - } catch (ArrayIndexOutOfBoundsException exception) { - printLine(); - printDuke("\u2639 OOPS!!! The description of a deadline cannot be empty."); - printLine(); - } - break; - - case "event": - try { - String eventAndDate = cmdArr[1]; - String e[] = eventAndDate.split("/", 2); - try { - String at = e[1].substring(3); - Event event = new Event(e[0], at); - list.add(event); - - //output - printLine(); - printDuke(GOT_IT); - printDuke(event.toString()); - printDuke("Now you have " + list.size() + " tasks in the list"); - printLine(); - } catch (ArrayIndexOutOfBoundsException exception) { - printLine(); - printDuke("\u2639 OOPS!!! Please enter when the event is happening"); - printLine(); - } - } catch (ArrayIndexOutOfBoundsException exception) { - printLine(); - printDuke("\u2639 OOPS!!! The description of an event cannot be empty."); - printLine(); - } - break; - - case "delete": - try { - int deleteNum = Integer.valueOf(cmdArr[1]); - Task deletedTask = list.get(deleteNum - 1); - list.remove(deleteNum - 1); - - printLine(); - printDuke("Noted. I've removed this task:"); - printDuke(deletedTask.toString()); - printDuke("Now you have " + list.size() + " tasks in the list"); - printLine(); - } catch (ArrayIndexOutOfBoundsException exception) { - printLine(); - printDuke("\u2639 OOPS!!! Please add the task number"); - printLine(); - } - break; - - case "find": - String keyword = cmdArr[1]; - ArrayList matchingTasks = new ArrayList<>(); - for (Task task : list) { - if (task.getDesc().contains(keyword)) { - matchingTasks.add(task); - } - } - printList(matchingTasks); - break; - default: - printLine(); - printDuke("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); - printLine(); - } - } - savedFile.saveToFile(list); - } - - public static void printIntro() { - /* - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); - */ - printLine(); - System.out.println(" Hello! I'm Duke"); - System.out.println(" What can I do for you?"); - printLine(); - } - public static void printLine() { - System.out.println(" " + LINE); - } - - public static void printDuke(String toPrint) { - System.out.println(" " + toPrint); - } - public void printList(ArrayList list) { - System.out.println(" Here are the tasks in your list:"); - for (int i = 0; i < list.size(); i++) { - Task task = list.get(i); - System.out.println(" " + (i + 1) + ". " + task.toString()); - - } - - printLine(); - } -} \ No newline at end of file diff --git a/src/main/java/data.txt b/src/main/java/data.txt index 4886f81fb0..94d6e04b85 100644 --- a/src/main/java/data.txt +++ b/src/main/java/data.txt @@ -1,4 +1,8 @@ -T | 1 | read book -D | 1 | return book | 06/06/2019 2000 -E | 0 | project meeting | 06/08/2019 1400-1600 -T | 1 | join sports club +D | 1 | A-MoreOOP | 04/09/2019 1300 +D | 0 | A-JUnit | 04/09/2019 1300 +D | 0 | A-Jar | 04/09/2019 1300 +T | 1 | A-Packages +D | 0 | A-JavaDoc | 04/09/2019 1300 +D | 1 | A-CodingStandard | 04/09/2019 1300 +D | 1 | Level-9 | 04/09/2019 1300 +E | 0 | cs2103 group meeting | 19/09/2019 1800 diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java new file mode 100644 index 0000000000..6c5e668dab --- /dev/null +++ b/src/main/java/duke/Duke.java @@ -0,0 +1,51 @@ +package duke; + +import duke.exception.DukeException; +import duke.ui.Ui; +import java.io.IOException; +import java.text.ParseException; +import java.util.Scanner; +import duke.command.Command; + +public class Duke { + private TaskList tasks; + private Saved savedFile; + private Scanner scan; + private Ui ui; + + public Duke(String filePath) throws IOException, ParseException { + ui = new Ui(); + savedFile = new Saved(filePath); + + tasks = new TaskList(savedFile.loadData()); + } + + public void run() throws IOException, ParseException { + String input; + Command cmd; + + ui.printIntro(); + + Boolean isBye = false; + while(!isBye) { + try { + input = ui.scanCmd(); + ui.printLine(); + cmd = Parser.parse(input); + cmd.execute(tasks, ui, savedFile); + isBye = cmd.isBye(); + } catch (DukeException error) { + ui.printError(error.getMessage()); + } + ui.printLine(); + } + savedFile.saveToFile(tasks.getTaskArrayList()); + + } + + public static void main(String[] args) throws IOException, ParseException { + new Duke("src/main/java/data.txt").run(); + } + + +} \ No newline at end of file diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java new file mode 100644 index 0000000000..7c6ceefceb --- /dev/null +++ b/src/main/java/duke/Parser.java @@ -0,0 +1,60 @@ +package duke; + +import duke.command.*; //wildcard is used bc all methods are used +import duke.task.*; +import duke.exception.*; + +import java.util.Arrays; +import java.util.List; + +public class Parser { + public static Command parse (String input) throws DukeException { + assert input != null; + + String[] inputArr = input.split(" ", 2); + String cmd = inputArr[0]; + + List list = Arrays.asList(inputArr); + + switch (cmd) { + case "bye": + return new ExitCommand(); + case "list": + return new ListCommand(); + case "done": + int taskNum = Integer.valueOf(inputArr[1]); + return new DoneCommand(taskNum); + case "todo": + String desc = inputArr[1]; + return new AddCommand(new Todo(desc)); + case "deadline": + try { + String taskAndDate = inputArr[1]; + String[] deadline = taskAndDate.split(" /by ", 2); + return new AddCommand(new Deadline(deadline[0], deadline[1])); + } catch (ArrayIndexOutOfBoundsException exception) { + throw new EmptyDateTimeDukeException(); + } + case "event": + try { + String descAndDate = inputArr[1]; + String[] event = descAndDate.split(" /at", 2); + return new AddCommand(new Event(event[0], event[1])); + } catch (ArrayIndexOutOfBoundsException exception) { + throw new EmptyDateTimeDukeException(); + } + case "delete": + try { + int deleteNum = Integer.valueOf(inputArr[1]); + return new DeleteCommand(deleteNum); + } catch (ArrayIndexOutOfBoundsException exception) { + throw new EmptyTaskNumberException(); + } + case "find": + return new FindCommand(inputArr[1]); + default: + throw new UnknownInputDukeException(); + } + + } +} diff --git a/src/main/java/Saved.java b/src/main/java/duke/Saved.java similarity index 93% rename from src/main/java/Saved.java rename to src/main/java/duke/Saved.java index dd95b464da..fdd1e8ae12 100644 --- a/src/main/java/Saved.java +++ b/src/main/java/duke/Saved.java @@ -1,3 +1,10 @@ +package duke; + +import duke.task.Deadline; +import duke.task.Event; +import duke.task.Task; +import duke.task.Todo; + import java.text.ParseException; import java.util.ArrayList; import java.util.Scanner; @@ -41,7 +48,7 @@ public ArrayList loadData() throws FileNotFoundException, ParseException { } if (text[1].equals("1")) { - t.isDone = true; + t.setAsDone(); } list.add(t); diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java new file mode 100644 index 0000000000..b800dc625e --- /dev/null +++ b/src/main/java/duke/TaskList.java @@ -0,0 +1,53 @@ +package duke; + +import duke.task.Task; +import duke.ui.Ui; + +import java.util.ArrayList; + +public class TaskList { + private ArrayList list; + + public TaskList() { + this.list = new ArrayList(); + } + + public TaskList(ArrayList tasks) { + assert tasks != null; + this.list = tasks; + } + + public void add(Task task) { + assert task != null; + list.add(task); + } + + public Task delete(int taskNum) { + Task task = list.remove(taskNum - 1); + return task; + } + + public int size() { + return list.size(); + } + + public ArrayList getTaskArrayList() { + return this.list; + } + + public Task setDone(int taskNum) { + Task task = list.get(taskNum - 1); + task.setAsDone(); + return task; + } + + public ArrayList findMatch(String keyword) { + ArrayList matchingTasks = new ArrayList<>(); + for (Task task : list) { + if (task.getDesc().contains(keyword)) { + matchingTasks.add(task); + } + } + return matchingTasks; + } +} diff --git a/src/main/java/duke/command/AddCommand.java b/src/main/java/duke/command/AddCommand.java new file mode 100644 index 0000000000..8c32ee2876 --- /dev/null +++ b/src/main/java/duke/command/AddCommand.java @@ -0,0 +1,21 @@ +package duke.command; + +import duke.Saved; +import duke.TaskList; +import duke.ui.Ui; +import duke.task.Task; + +public class AddCommand extends Command { + private Task task; + + public AddCommand(Task task) { + this.task = task; + } + + public void execute(TaskList tasks, Ui ui, Saved file) { + tasks.add(this.task); + ui.printDuke("Got it. I've added this task:\n " + + "\t" + this.task + "\n" + + "\t Now you have " + tasks.size() + " tasks in the list.\n"); + } +} diff --git a/src/main/java/duke/command/Command.java b/src/main/java/duke/command/Command.java new file mode 100644 index 0000000000..a286f9adee --- /dev/null +++ b/src/main/java/duke/command/Command.java @@ -0,0 +1,13 @@ +package duke.command; + +import duke.Saved; +import duke.TaskList; +import duke.ui.Ui; + +public abstract class Command { + public abstract void execute(TaskList tasks, Ui ui, Saved file); + + public boolean isBye() { + return this instanceof ExitCommand; + } +} diff --git a/src/main/java/duke/command/DeleteCommand.java b/src/main/java/duke/command/DeleteCommand.java new file mode 100644 index 0000000000..85caab65c7 --- /dev/null +++ b/src/main/java/duke/command/DeleteCommand.java @@ -0,0 +1,20 @@ +package duke.command; + +import duke.Saved; +import duke.TaskList; +import duke.task.Task; +import duke.ui.Ui; + +public class DeleteCommand extends Command { + private int taskNum; + + public DeleteCommand(int taskNum) { + this.taskNum = taskNum; + } + + public void execute(TaskList tasks, Ui ui, Saved file) { + Task task = tasks.delete(this.taskNum); + ui.printDuke("Noted. I've removed this task: \n" + + "\t" + task + "\n \tNow you have " + tasks.size() + " tasks in the list.\n"); + } +} diff --git a/src/main/java/duke/command/DoneCommand.java b/src/main/java/duke/command/DoneCommand.java new file mode 100644 index 0000000000..c46784e342 --- /dev/null +++ b/src/main/java/duke/command/DoneCommand.java @@ -0,0 +1,20 @@ +package duke.command; + +import duke.Saved; +import duke.TaskList; +import duke.task.Task; +import duke.ui.Ui; + +public class DoneCommand extends Command { + private int taskNum; + + public DoneCommand(int taskNum) { + this.taskNum = taskNum; + } + + public void execute(TaskList tasks, Ui ui, Saved file) { + Task task = tasks.setDone(this.taskNum); + ui.printDuke("Nice! I've marked this task as done: \n" + + "\t" + task + "\n"); + } +} diff --git a/src/main/java/duke/command/ExitCommand.java b/src/main/java/duke/command/ExitCommand.java new file mode 100644 index 0000000000..77fb3ee584 --- /dev/null +++ b/src/main/java/duke/command/ExitCommand.java @@ -0,0 +1,12 @@ +package duke.command; + +import duke.Saved; +import duke.TaskList; +import duke.task.Task; +import duke.ui.Ui; + +public class ExitCommand extends Command { + public void execute(TaskList tasks, Ui ui, Saved file) { + ui.printDuke("Bye. Hope to see you again soon!\n"); + } +} diff --git a/src/main/java/duke/command/FindCommand.java b/src/main/java/duke/command/FindCommand.java new file mode 100644 index 0000000000..a3c9b0fed9 --- /dev/null +++ b/src/main/java/duke/command/FindCommand.java @@ -0,0 +1,18 @@ +package duke.command; + +import duke.Saved; +import duke.TaskList; +import duke.task.Task; +import duke.ui.Ui; + +public class FindCommand extends Command { + private String keyword; + + public FindCommand(String keyword) { + this.keyword = keyword; + } + + public void execute(TaskList tasks, Ui ui, Saved file) { + ui.printList(tasks.findMatch(this.keyword)); + } +} diff --git a/src/main/java/duke/command/ListCommand.java b/src/main/java/duke/command/ListCommand.java new file mode 100644 index 0000000000..40cfd9ab77 --- /dev/null +++ b/src/main/java/duke/command/ListCommand.java @@ -0,0 +1,12 @@ +package duke.command; + +import duke.Saved; +import duke.TaskList; +import duke.task.Task; +import duke.ui.Ui; + +public class ListCommand extends Command { + public void execute(TaskList tasks, Ui ui, Saved file) { + ui.printList(tasks.getTaskArrayList()); + } +} diff --git a/src/main/java/duke/exception/DukeException.java b/src/main/java/duke/exception/DukeException.java new file mode 100644 index 0000000000..46caf9b89b --- /dev/null +++ b/src/main/java/duke/exception/DukeException.java @@ -0,0 +1,7 @@ +package duke.exception; + +public class DukeException extends Exception { + public DukeException(String s) { + super(s); + } +} diff --git a/src/main/java/duke/exception/EmptyDateTimeDukeException.java b/src/main/java/duke/exception/EmptyDateTimeDukeException.java new file mode 100644 index 0000000000..1bedc7329b --- /dev/null +++ b/src/main/java/duke/exception/EmptyDateTimeDukeException.java @@ -0,0 +1,7 @@ +package duke.exception; + +public class EmptyDateTimeDukeException extends DukeException { + public EmptyDateTimeDukeException() { + super("\u2639 OOPS!!! The date and time inputs cannot empty!\n"); + } +} diff --git a/src/main/java/duke/exception/EmptyTaskNumberException.java b/src/main/java/duke/exception/EmptyTaskNumberException.java new file mode 100644 index 0000000000..343fe48507 --- /dev/null +++ b/src/main/java/duke/exception/EmptyTaskNumberException.java @@ -0,0 +1,7 @@ +package duke.exception; + +public class EmptyTaskNumberException extends DukeException { + public EmptyTaskNumberException() { + super("\u2639 OOPS!!! Please enter a task number!\n"); + } +} diff --git a/src/main/java/duke/exception/UnknownInputDukeException.java b/src/main/java/duke/exception/UnknownInputDukeException.java new file mode 100644 index 0000000000..b35935d3ca --- /dev/null +++ b/src/main/java/duke/exception/UnknownInputDukeException.java @@ -0,0 +1,7 @@ +package duke.exception; + +public class UnknownInputDukeException extends DukeException { + public UnknownInputDukeException() { + super("\u2639 OOPS!!! I'm sorry, but I don't know what that means :-(\n"); + } +} diff --git a/src/main/java/Deadline.java b/src/main/java/duke/task/Deadline.java similarity index 96% rename from src/main/java/Deadline.java rename to src/main/java/duke/task/Deadline.java index 8f86faf5c5..b61c3c76fe 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/duke/task/Deadline.java @@ -1,3 +1,7 @@ +package duke.task; + +import duke.task.Task; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.DateTimeException; diff --git a/src/main/java/Event.java b/src/main/java/duke/task/Event.java similarity index 90% rename from src/main/java/Event.java rename to src/main/java/duke/task/Event.java index 58fcc55f0f..f1ca0f8fb5 100644 --- a/src/main/java/Event.java +++ b/src/main/java/duke/task/Event.java @@ -1,15 +1,17 @@ +package duke.task; + +import duke.task.Task; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.DateTimeException; import java.util.Date; -import java.time.LocalTime; public class Event extends Task { protected String at; private SimpleDateFormat eventTime; private Date date; - //protected int dd, mm, yyyy, startTime, startHrs, startMin, endTime, endHrs, endMin; public Event(String description, String at) throws DateTimeException { super(description); diff --git a/src/main/java/Task.java b/src/main/java/duke/task/Task.java similarity index 72% rename from src/main/java/Task.java rename to src/main/java/duke/task/Task.java index f41ded9b24..4eb1ef2bf0 100644 --- a/src/main/java/Task.java +++ b/src/main/java/duke/task/Task.java @@ -1,3 +1,5 @@ +package duke.task; + import java.text.ParseException; public class Task { @@ -13,19 +15,10 @@ public Task(String description) { } public String getStatusIcon() { - return (isDone ? "\u2713" : "\u2718"); //return tick or X symbols + return isDone ? "\u2713" : "\u2718"; //return tick or X symbols } public String getType() { - /* - if (type.equals("todo")) { - return "T"; - } else if (type.equals("deadline")) { - return "D"; - } else if (type.equals("event")){ - return "E"; - } - */ return "error"; } @@ -47,8 +40,8 @@ public String getDone() { /* mutators */ - public void isDone(boolean boo) { - this.isDone = boo; + public void setAsDone() { + this.isDone = true; } public void addType(String type) { diff --git a/src/main/java/Todo.java b/src/main/java/duke/task/Todo.java similarity index 88% rename from src/main/java/Todo.java rename to src/main/java/duke/task/Todo.java index 835c4b3668..de8423ac46 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/duke/task/Todo.java @@ -1,3 +1,7 @@ +package duke.task; + +import duke.task.Task; + public class Todo extends Task { protected String at; diff --git a/src/main/java/duke/ui/Ui.java b/src/main/java/duke/ui/Ui.java new file mode 100644 index 0000000000..f1dc417064 --- /dev/null +++ b/src/main/java/duke/ui/Ui.java @@ -0,0 +1,52 @@ +package duke.ui; + +import duke.task.Task; +import duke.TaskList; + +import java.util.ArrayList; +import java.util.Scanner; + +public class Ui { + Scanner scan = new Scanner(System.in); + final private static String LINE = "____________________________________________________________"; + + + public void printIntro() { + String logo = "\t ____ _ \n" + + "\t | _ \\ _ _| | _____ \n" + + "\t | | | | | | | |/ / _ \\\n" + + "\t | |_| | |_| | < __/\n" + + "\t |____/ \\__,_|_|\\_\\___|\n"; + System.out.println("\t Hello from\n" + logo); + printLine(); + printDuke("Hello! I'm Duke\n"); + printDuke("What can I do for you?\n"); + printLine(); + } + + public void printLine() { + System.out.println(" " + LINE); + } + + public String scanCmd() { + return scan.nextLine(); + } + + public void printDuke(String toPrint) { + System.out.print(" " + toPrint); + } + + public void printList(ArrayList list) { + System.out.println("\t Here are the tasks in your list:"); + for (int i = 0; i < list.size(); i++) { + Task task = list.get(i); + System.out.println("\t" + (i + 1) + ". " + task.toString()); + + } + } + + public void printError(String error) { + printDuke(error); + } + +} From 4c122a8f68e818f903651512027b6cdf3b885ace Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 18 Sep 2019 04:39:13 +0800 Subject: [PATCH 19/37] added test code folder --- src/test/java/DukeTest.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/test/java/DukeTest.java diff --git a/src/test/java/DukeTest.java b/src/test/java/DukeTest.java new file mode 100644 index 0000000000..e69de29bb2 From c4493e86d58765b190242f0954960fa63471a046 Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 18 Sep 2019 05:32:52 +0800 Subject: [PATCH 20/37] added gradle plugins: shadowjar done checkstyle --- build.gradle | 23 ++- gradle/wrapper/gradle-wrapper.jar | Bin 55190 -> 55616 bytes gradlew | 18 +- gradlew.bat | 184 ++++++++++-------- src/main/java/duke/Duke.java | 2 +- src/main/java/duke/Parser.java | 95 +++++---- src/main/java/duke/Saved.java | 37 ++-- src/main/java/duke/command/AddCommand.java | 6 +- src/main/java/duke/command/Command.java | 8 +- src/main/java/duke/command/DeleteCommand.java | 4 +- src/main/java/duke/command/DoneCommand.java | 4 +- .../exception/EmptyDateTimeDukeException.java | 2 +- .../exception/EmptyTaskNumberException.java | 2 +- .../exception/UnknownInputDukeException.java | 2 +- src/main/java/duke/task/Deadline.java | 3 +- src/main/java/duke/task/Event.java | 1 + src/main/java/duke/ui/Ui.java | 6 +- 17 files changed, 229 insertions(+), 168 deletions(-) diff --git a/build.gradle b/build.gradle index ce97c7ba2e..8c2cfb5b2f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,8 @@ plugins { id 'java' id 'application' + id 'checkstyle' + id 'com.github.johnrengelman.shadow' version '5.1.0' } group 'seedu.duke' @@ -12,7 +14,26 @@ repositories { application { // Change this to your main class. - mainClassName = "seedu.duke.Duke" + mainClassName = "duke.Duke" +} + +checkstyle { + toolVersion = '8.23' +} + +shadowJar { + archiveBaseName = "duke" + archiveVersion = "0.1.3" + archiveClassifier = null + archiveAppendix = null +} + +dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0' +} + +test { + useJUnitPlatform() } run { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 87b738cbd051603d91cc39de6cb000dd98fe6b02..5c2d1cf016b3885f6930543d57b744ea8c220a1a 100644 GIT binary patch delta 3320 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 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 +@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 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/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index 6c5e668dab..d844c7a1b1 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -27,7 +27,7 @@ public void run() throws IOException, ParseException { ui.printIntro(); Boolean isBye = false; - while(!isBye) { + while (!isBye) { try { input = ui.scanCmd(); ui.printLine(); diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index 7c6ceefceb..ec150431f5 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -1,14 +1,27 @@ package duke; -import duke.command.*; //wildcard is used bc all methods are used -import duke.task.*; -import duke.exception.*; +import duke.command.AddCommand; +import duke.command.ExitCommand; +import duke.command.DeleteCommand; +import duke.command.Command; +import duke.command.ListCommand; +import duke.command.DoneCommand; +import duke.command.FindCommand; + +import duke.task.Todo; +import duke.task.Deadline; +import duke.task.Event; + +import duke.exception.DukeException; +import duke.exception.EmptyDateTimeDukeException; +import duke.exception.EmptyTaskNumberException; +import duke.exception.UnknownInputDukeException; import java.util.Arrays; import java.util.List; public class Parser { - public static Command parse (String input) throws DukeException { + public static Command parse(String input) throws DukeException { assert input != null; String[] inputArr = input.split(" ", 2); @@ -17,43 +30,43 @@ public static Command parse (String input) throws DukeException { List list = Arrays.asList(inputArr); switch (cmd) { - case "bye": - return new ExitCommand(); - case "list": - return new ListCommand(); - case "done": - int taskNum = Integer.valueOf(inputArr[1]); - return new DoneCommand(taskNum); - case "todo": - String desc = inputArr[1]; - return new AddCommand(new Todo(desc)); - case "deadline": - try { - String taskAndDate = inputArr[1]; - String[] deadline = taskAndDate.split(" /by ", 2); - return new AddCommand(new Deadline(deadline[0], deadline[1])); - } catch (ArrayIndexOutOfBoundsException exception) { - throw new EmptyDateTimeDukeException(); - } - case "event": - try { - String descAndDate = inputArr[1]; - String[] event = descAndDate.split(" /at", 2); - return new AddCommand(new Event(event[0], event[1])); - } catch (ArrayIndexOutOfBoundsException exception) { - throw new EmptyDateTimeDukeException(); - } - case "delete": - try { - int deleteNum = Integer.valueOf(inputArr[1]); - return new DeleteCommand(deleteNum); - } catch (ArrayIndexOutOfBoundsException exception) { - throw new EmptyTaskNumberException(); - } - case "find": - return new FindCommand(inputArr[1]); - default: - throw new UnknownInputDukeException(); + case "bye": + return new ExitCommand(); + case "list": + return new ListCommand(); + case "done": + int taskNum = Integer.valueOf(inputArr[1]); + return new DoneCommand(taskNum); + case "todo": + String desc = inputArr[1]; + return new AddCommand(new Todo(desc)); + case "deadline": + try { + String taskAndDate = inputArr[1]; + String[] deadline = taskAndDate.split(" /by ", 2); + return new AddCommand(new Deadline(deadline[0], deadline[1])); + } catch (ArrayIndexOutOfBoundsException exception) { + throw new EmptyDateTimeDukeException(); + } + case "event": + try { + String descAndDate = inputArr[1]; + String[] event = descAndDate.split(" /at", 2); + return new AddCommand(new Event(event[0], event[1])); + } catch (ArrayIndexOutOfBoundsException exception) { + throw new EmptyDateTimeDukeException(); + } + case "delete": + try { + int deleteNum = Integer.valueOf(inputArr[1]); + return new DeleteCommand(deleteNum); + } catch (ArrayIndexOutOfBoundsException exception) { + throw new EmptyTaskNumberException(); + } + case "find": + return new FindCommand(inputArr[1]); + default: + throw new UnknownInputDukeException(); } } diff --git a/src/main/java/duke/Saved.java b/src/main/java/duke/Saved.java index fdd1e8ae12..2371729bff 100644 --- a/src/main/java/duke/Saved.java +++ b/src/main/java/duke/Saved.java @@ -17,53 +17,51 @@ public class Saved { private String filePath; - public Saved(String filePath) { + Saved(String filePath) { this.filePath = filePath; } - public ArrayList loadData() throws FileNotFoundException, ParseException { + ArrayList loadData() throws FileNotFoundException { File file = new File(filePath); Scanner scan = new Scanner(file); ArrayList list = new ArrayList<>(); - while(scan.hasNext()) { + while (scan.hasNext()) { String[] text = scan.nextLine().split(" \\| ", 4); - Task t; switch (text[0]) { - case "T": - t = new Todo(text[2]); - break; - case "D": - t = new Deadline(text[2], text[3]); - break; - case "E": - t = new Event(text[2], text[3]); - break; - default: - t = new Task(""); - break; + case "T": + t = new Todo(text[2]); + break; + case "D": + t = new Deadline(text[2], text[3]); + break; + case "E": + t = new Event(text[2], text[3]); + break; + default: + t = new Task(""); + break; } if (text[1].equals("1")) { t.setAsDone(); } - list.add(t); } return list; } - public void saveToFile(ArrayList list) throws IOException, ParseException { + public void saveToFile(ArrayList list) throws IOException { FileWriter newFile = new FileWriter(this.filePath); String listToFile = ""; String s; for (Task task: list) { if (task instanceof Event) { - s = "E" + " | "+ task.getDone() + " | " + task.getDesc() + " | " + task.getAt(); + s = "E" + " | " + task.getDone() + " | " + task.getDesc() + " | " + task.getAt(); } else if (task instanceof Deadline) { s = "D | " + task.getDone() + " | " + task.getDesc() + " | " + task.getBy(); } else { @@ -76,6 +74,5 @@ public void saveToFile(ArrayList list) throws IOException, ParseException newFile.write(listToFile); newFile.flush(); - //newFile.close(); } } diff --git a/src/main/java/duke/command/AddCommand.java b/src/main/java/duke/command/AddCommand.java index 8c32ee2876..03216de17b 100644 --- a/src/main/java/duke/command/AddCommand.java +++ b/src/main/java/duke/command/AddCommand.java @@ -14,8 +14,8 @@ public AddCommand(Task task) { public void execute(TaskList tasks, Ui ui, Saved file) { tasks.add(this.task); - ui.printDuke("Got it. I've added this task:\n " + - "\t" + this.task + "\n" + - "\t Now you have " + tasks.size() + " tasks in the list.\n"); + ui.printDuke("Got it. I've added this task:\n " + + "\t" + this.task + "\n" + + "\t Now you have " + tasks.size() + " tasks in the list.\n"); } } diff --git a/src/main/java/duke/command/Command.java b/src/main/java/duke/command/Command.java index a286f9adee..2cca72a7a5 100644 --- a/src/main/java/duke/command/Command.java +++ b/src/main/java/duke/command/Command.java @@ -5,9 +5,9 @@ import duke.ui.Ui; public abstract class Command { - public abstract void execute(TaskList tasks, Ui ui, Saved file); + public abstract void execute(TaskList tasks, Ui ui, Saved file); - public boolean isBye() { - return this instanceof ExitCommand; - } + public boolean isBye() { + return this instanceof ExitCommand; + } } diff --git a/src/main/java/duke/command/DeleteCommand.java b/src/main/java/duke/command/DeleteCommand.java index 85caab65c7..9c892704c3 100644 --- a/src/main/java/duke/command/DeleteCommand.java +++ b/src/main/java/duke/command/DeleteCommand.java @@ -14,7 +14,7 @@ public DeleteCommand(int taskNum) { public void execute(TaskList tasks, Ui ui, Saved file) { Task task = tasks.delete(this.taskNum); - ui.printDuke("Noted. I've removed this task: \n" + - "\t" + task + "\n \tNow you have " + tasks.size() + " tasks in the list.\n"); + ui.printDuke("Noted. I've removed this task: \n" + + "\t" + task + "\n \tNow you have " + tasks.size() + " tasks in the list.\n"); } } diff --git a/src/main/java/duke/command/DoneCommand.java b/src/main/java/duke/command/DoneCommand.java index c46784e342..b486c1d48f 100644 --- a/src/main/java/duke/command/DoneCommand.java +++ b/src/main/java/duke/command/DoneCommand.java @@ -14,7 +14,7 @@ public DoneCommand(int taskNum) { public void execute(TaskList tasks, Ui ui, Saved file) { Task task = tasks.setDone(this.taskNum); - ui.printDuke("Nice! I've marked this task as done: \n" + - "\t" + task + "\n"); + ui.printDuke("Nice! I've marked this task as done: \n" + + "\t" + task + "\n"); } } diff --git a/src/main/java/duke/exception/EmptyDateTimeDukeException.java b/src/main/java/duke/exception/EmptyDateTimeDukeException.java index 1bedc7329b..717d3513f9 100644 --- a/src/main/java/duke/exception/EmptyDateTimeDukeException.java +++ b/src/main/java/duke/exception/EmptyDateTimeDukeException.java @@ -2,6 +2,6 @@ public class EmptyDateTimeDukeException extends DukeException { public EmptyDateTimeDukeException() { - super("\u2639 OOPS!!! The date and time inputs cannot empty!\n"); + super("OOPS!!! The date and time inputs cannot empty!\n"); } } diff --git a/src/main/java/duke/exception/EmptyTaskNumberException.java b/src/main/java/duke/exception/EmptyTaskNumberException.java index 343fe48507..958e87356a 100644 --- a/src/main/java/duke/exception/EmptyTaskNumberException.java +++ b/src/main/java/duke/exception/EmptyTaskNumberException.java @@ -2,6 +2,6 @@ public class EmptyTaskNumberException extends DukeException { public EmptyTaskNumberException() { - super("\u2639 OOPS!!! Please enter a task number!\n"); + super("OOPS!!! Please enter a task number!\n"); } } diff --git a/src/main/java/duke/exception/UnknownInputDukeException.java b/src/main/java/duke/exception/UnknownInputDukeException.java index b35935d3ca..bc3ed658c3 100644 --- a/src/main/java/duke/exception/UnknownInputDukeException.java +++ b/src/main/java/duke/exception/UnknownInputDukeException.java @@ -2,6 +2,6 @@ public class UnknownInputDukeException extends DukeException { public UnknownInputDukeException() { - super("\u2639 OOPS!!! I'm sorry, but I don't know what that means :-(\n"); + super("OOPS!!! I'm sorry, but I don't know what that means :-(\n"); } } diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java index b61c3c76fe..7ee15a9480 100644 --- a/src/main/java/duke/task/Deadline.java +++ b/src/main/java/duke/task/Deadline.java @@ -12,7 +12,6 @@ public class Deadline extends Task { private SimpleDateFormat deadline; protected String by; private Date date; - protected int dd, mm, yyyy, hrs, min, time; public Deadline(String description, String by) throws DateTimeException { super(description); @@ -38,7 +37,7 @@ public String convertEventTime() throws ParseException, DateTimeException { date = deadline.parse(this.by); return deadline.format(date); } catch (ParseException exception) { - System.out.println("\u2639 OOPS!!! Please enter a valid deadline"); + System.out.println("OOPS!!! Please enter a valid deadline"); } return ""; } diff --git a/src/main/java/duke/task/Event.java b/src/main/java/duke/task/Event.java index f1ca0f8fb5..f0f29c4594 100644 --- a/src/main/java/duke/task/Event.java +++ b/src/main/java/duke/task/Event.java @@ -36,6 +36,7 @@ public String convertEventTime() throws ParseException, DateTimeException { this.date = eventTime.parse(this.at); return this.eventTime.format(date); } + @Override public String toString() { try { diff --git a/src/main/java/duke/ui/Ui.java b/src/main/java/duke/ui/Ui.java index f1dc417064..50305f0583 100644 --- a/src/main/java/duke/ui/Ui.java +++ b/src/main/java/duke/ui/Ui.java @@ -1,14 +1,12 @@ package duke.ui; import duke.task.Task; -import duke.TaskList; import java.util.ArrayList; import java.util.Scanner; public class Ui { - Scanner scan = new Scanner(System.in); - final private static String LINE = "____________________________________________________________"; + private Scanner scan = new Scanner(System.in); public void printIntro() { @@ -25,7 +23,7 @@ public void printIntro() { } public void printLine() { - System.out.println(" " + LINE); + System.out.println("\t____________________________________________________________"); } public String scanCmd() { From 331d9c111ddf90d45b9a963ffa19bf72c10c154a Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 18 Sep 2019 07:01:56 +0800 Subject: [PATCH 21/37] Added JavaDoc comments for code --- src/main/java/duke/Duke.java | 26 ++++++++-- src/main/java/duke/Parser.java | 7 +++ src/main/java/duke/Saved.java | 12 +++++ src/main/java/duke/TaskList.java | 42 ++++++++++++++-- src/main/java/duke/command/AddCommand.java | 10 ++++ src/main/java/duke/command/Command.java | 3 +- src/main/java/duke/command/DeleteCommand.java | 6 +++ src/main/java/duke/command/DoneCommand.java | 10 ++++ src/main/java/duke/command/ExitCommand.java | 4 ++ src/main/java/duke/command/FindCommand.java | 15 +++++- src/main/java/duke/command/ListCommand.java | 7 +++ .../java/duke/exception/DukeException.java | 6 +++ .../exception/EmptyDateTimeDukeException.java | 4 ++ .../exception/EmptyTaskNumberException.java | 4 ++ .../exception/UnknownInputDukeException.java | 4 ++ src/main/java/duke/task/Deadline.java | 36 ++++++++++--- src/main/java/duke/task/Event.java | 29 ++++++++++- src/main/java/duke/task/Task.java | 50 +++++++++++-------- src/main/java/duke/task/Todo.java | 18 ++++--- src/main/java/duke/ui/Ui.java | 27 +++++++++- 20 files changed, 275 insertions(+), 45 deletions(-) diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index d844c7a1b1..80e1f5f64c 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -13,14 +13,28 @@ public class Duke { private Scanner scan; private Ui ui; - public Duke(String filePath) throws IOException, ParseException { + /** + * Creates a Duke object. + * Initialise the storage, task list and ui objects. + * + * @param filePath the local path to the storage file + * @throws IOException filePath is inaccessible or cannot be found + */ + public Duke(String filePath) throws IOException { ui = new Ui(); savedFile = new Saved(filePath); tasks = new TaskList(savedFile.loadData()); } - public void run() throws IOException, ParseException { + /** + * Obtains user input from command line, parses it and executes the commands. + * Shows errors to the user in case of invalid input. + * Saves updated tasks back into the local file + * + * @throws IOException filePath is inaccessible or cannot be found + */ + public void run() throws IOException { String input; Command cmd; @@ -43,7 +57,13 @@ public void run() throws IOException, ParseException { } - public static void main(String[] args) throws IOException, ParseException { + /** + * Required main method. + * + * @param args command line arguments + * @throws IOException local file is inaccessible or cannot be found + */ + public static void main(String[] args) throws IOException { new Duke("src/main/java/data.txt").run(); } diff --git a/src/main/java/duke/Parser.java b/src/main/java/duke/Parser.java index ec150431f5..88b23ea041 100644 --- a/src/main/java/duke/Parser.java +++ b/src/main/java/duke/Parser.java @@ -21,6 +21,13 @@ import java.util.List; public class Parser { + + /** + * Interprets user's input and returns the respective command. + * @param input user's input + * @return command according to interpretation of user's input + * @throws ArrayIndexOutOfBoundsException empty description of task or unknown command + */ public static Command parse(String input) throws DukeException { assert input != null; diff --git a/src/main/java/duke/Saved.java b/src/main/java/duke/Saved.java index 2371729bff..dcc5da7043 100644 --- a/src/main/java/duke/Saved.java +++ b/src/main/java/duke/Saved.java @@ -21,6 +21,12 @@ public class Saved { this.filePath = filePath; } + /** + * Loads the tasks stored in local file and returns them as a list of tasks. + * + * @return list of tasks stored in the text document + * @throws FileNotFoundException local file cannot be found + */ ArrayList loadData() throws FileNotFoundException { File file = new File(filePath); Scanner scan = new Scanner(file); @@ -54,6 +60,12 @@ ArrayList loadData() throws FileNotFoundException { return list; } + /** + * Saves updated list of tasks into local file. + * + * @param list list of tasks + * @throws IOException local file cannot be found or inaccessible. + */ public void saveToFile(ArrayList list) throws IOException { FileWriter newFile = new FileWriter(this.filePath); String listToFile = ""; diff --git a/src/main/java/duke/TaskList.java b/src/main/java/duke/TaskList.java index b800dc625e..d4892b5d8d 100644 --- a/src/main/java/duke/TaskList.java +++ b/src/main/java/duke/TaskList.java @@ -1,7 +1,7 @@ package duke; +import duke.exception.DukeException; import duke.task.Task; -import duke.ui.Ui; import java.util.ArrayList; @@ -17,37 +17,73 @@ public TaskList(ArrayList tasks) { this.list = tasks; } + /** + * Adds a new task to the list of tasks. + * + * @param task task to be added + */ public void add(Task task) { assert task != null; list.add(task); } + /** + * Deletes an existing task from the list of tasks. + * + * @param taskNum index of task to be deleted + */ public Task delete(int taskNum) { Task task = list.remove(taskNum - 1); return task; } + /** + * Adds a new task to the list of tasks. + * + * @return size of list + */ public int size() { return list.size(); } + /** + * Get TaskList as an ArrayList (for printing). + * + * @return ArrayList of tasks + */ public ArrayList getTaskArrayList() { return this.list; } + /** + * Sets task as done. + * + * @param taskNum index of task number + * @return task with updated status + */ public Task setDone(int taskNum) { Task task = list.get(taskNum - 1); task.setAsDone(); return task; } - public ArrayList findMatch(String keyword) { + /** + * Searches TaskList to find if any of the tasks matches the keyword. + * + * @param keyword keyword to be searched from user's input + * @return list of tasks that contain the keyword or DukeException if no matches are found + */ + public ArrayList findMatch(String keyword) throws DukeException { ArrayList matchingTasks = new ArrayList<>(); for (Task task : list) { if (task.getDesc().contains(keyword)) { matchingTasks.add(task); } } - return matchingTasks; + if (matchingTasks.isEmpty()) { + throw new DukeException("There are no matching tasks found!"); + } else { + return matchingTasks; + } } } diff --git a/src/main/java/duke/command/AddCommand.java b/src/main/java/duke/command/AddCommand.java index 03216de17b..94f8d65920 100644 --- a/src/main/java/duke/command/AddCommand.java +++ b/src/main/java/duke/command/AddCommand.java @@ -8,10 +8,20 @@ public class AddCommand extends Command { private Task task; + /** + * Create add commands. + * @param task task to be added + */ public AddCommand(Task task) { this.task = task; } + /** + * Adds task to list of tasks, gives feedback to user after execution. + * + * @param tasks contains the current list of tasks + * @param ui to give feedback to the user + */ public void execute(TaskList tasks, Ui ui, Saved file) { tasks.add(this.task); ui.printDuke("Got it. I've added this task:\n " diff --git a/src/main/java/duke/command/Command.java b/src/main/java/duke/command/Command.java index 2cca72a7a5..e07f343f86 100644 --- a/src/main/java/duke/command/Command.java +++ b/src/main/java/duke/command/Command.java @@ -2,10 +2,11 @@ import duke.Saved; import duke.TaskList; +import duke.exception.DukeException; import duke.ui.Ui; public abstract class Command { - public abstract void execute(TaskList tasks, Ui ui, Saved file); + public abstract void execute(TaskList tasks, Ui ui, Saved file) throws DukeException; public boolean isBye() { return this instanceof ExitCommand; diff --git a/src/main/java/duke/command/DeleteCommand.java b/src/main/java/duke/command/DeleteCommand.java index 9c892704c3..4957e518b5 100644 --- a/src/main/java/duke/command/DeleteCommand.java +++ b/src/main/java/duke/command/DeleteCommand.java @@ -12,6 +12,12 @@ public DeleteCommand(int taskNum) { this.taskNum = taskNum; } + /** + * Deletes task from TaskList, gives feedback to user after execution. + * + * @param tasks task to be deleted + * @param ui to give feedback to the user + */ public void execute(TaskList tasks, Ui ui, Saved file) { Task task = tasks.delete(this.taskNum); ui.printDuke("Noted. I've removed this task: \n" diff --git a/src/main/java/duke/command/DoneCommand.java b/src/main/java/duke/command/DoneCommand.java index b486c1d48f..726165d4ff 100644 --- a/src/main/java/duke/command/DoneCommand.java +++ b/src/main/java/duke/command/DoneCommand.java @@ -8,10 +8,20 @@ public class DoneCommand extends Command { private int taskNum; + /** + * Creates a done command. + * @param taskNum the id of the task + */ public DoneCommand(int taskNum) { this.taskNum = taskNum; } + /** + * Marks task as done, gives feedback to user. + * + * @param tasks contains the current list of tasks + * @param ui to give feedback to the user + */ public void execute(TaskList tasks, Ui ui, Saved file) { Task task = tasks.setDone(this.taskNum); ui.printDuke("Nice! I've marked this task as done: \n" diff --git a/src/main/java/duke/command/ExitCommand.java b/src/main/java/duke/command/ExitCommand.java index 77fb3ee584..150e4c558b 100644 --- a/src/main/java/duke/command/ExitCommand.java +++ b/src/main/java/duke/command/ExitCommand.java @@ -6,6 +6,10 @@ import duke.ui.Ui; public class ExitCommand extends Command { + + /** + * Relays to the driver class that the user wishes to exit Duke. + */ public void execute(TaskList tasks, Ui ui, Saved file) { ui.printDuke("Bye. Hope to see you again soon!\n"); } diff --git a/src/main/java/duke/command/FindCommand.java b/src/main/java/duke/command/FindCommand.java index a3c9b0fed9..e2305c2dc4 100644 --- a/src/main/java/duke/command/FindCommand.java +++ b/src/main/java/duke/command/FindCommand.java @@ -2,17 +2,30 @@ import duke.Saved; import duke.TaskList; +import duke.exception.DukeException; import duke.task.Task; import duke.ui.Ui; public class FindCommand extends Command { private String keyword; + /** + * Creates a find command. + * + * @param keyword to search for + */ public FindCommand(String keyword) { this.keyword = keyword; } - public void execute(TaskList tasks, Ui ui, Saved file) { + /** + * Finds tasks that contain the keyword. + * + * @param tasks to access the list of tasks + * @param ui to give feedback to user + * @throws DukeException when no matches are found + */ + public void execute(TaskList tasks, Ui ui, Saved file) throws DukeException { ui.printList(tasks.findMatch(this.keyword)); } } diff --git a/src/main/java/duke/command/ListCommand.java b/src/main/java/duke/command/ListCommand.java index 40cfd9ab77..e7c3b6fb4a 100644 --- a/src/main/java/duke/command/ListCommand.java +++ b/src/main/java/duke/command/ListCommand.java @@ -6,6 +6,13 @@ import duke.ui.Ui; public class ListCommand extends Command { + + /** + * Show the user the current list of tasks. + * + * @param tasks to access the list of tasks + * @param ui to give feedback to user + */ public void execute(TaskList tasks, Ui ui, Saved file) { ui.printList(tasks.getTaskArrayList()); } diff --git a/src/main/java/duke/exception/DukeException.java b/src/main/java/duke/exception/DukeException.java index 46caf9b89b..f1b5b6764c 100644 --- a/src/main/java/duke/exception/DukeException.java +++ b/src/main/java/duke/exception/DukeException.java @@ -1,6 +1,12 @@ package duke.exception; public class DukeException extends Exception { + + /** + * Creates an exception specific for Duke. + * + * @param s a string containing description of the problem + */ public DukeException(String s) { super(s); } diff --git a/src/main/java/duke/exception/EmptyDateTimeDukeException.java b/src/main/java/duke/exception/EmptyDateTimeDukeException.java index 717d3513f9..91905a9824 100644 --- a/src/main/java/duke/exception/EmptyDateTimeDukeException.java +++ b/src/main/java/duke/exception/EmptyDateTimeDukeException.java @@ -1,6 +1,10 @@ package duke.exception; public class EmptyDateTimeDukeException extends DukeException { + + /** + * Creates an EmptyDateTimeDukeException. + */ public EmptyDateTimeDukeException() { super("OOPS!!! The date and time inputs cannot empty!\n"); } diff --git a/src/main/java/duke/exception/EmptyTaskNumberException.java b/src/main/java/duke/exception/EmptyTaskNumberException.java index 958e87356a..f1888fbd4e 100644 --- a/src/main/java/duke/exception/EmptyTaskNumberException.java +++ b/src/main/java/duke/exception/EmptyTaskNumberException.java @@ -1,6 +1,10 @@ package duke.exception; public class EmptyTaskNumberException extends DukeException { + + /** + * Creates an EmptyTaskNumberException. + */ public EmptyTaskNumberException() { super("OOPS!!! Please enter a task number!\n"); } diff --git a/src/main/java/duke/exception/UnknownInputDukeException.java b/src/main/java/duke/exception/UnknownInputDukeException.java index bc3ed658c3..8ca3b197c9 100644 --- a/src/main/java/duke/exception/UnknownInputDukeException.java +++ b/src/main/java/duke/exception/UnknownInputDukeException.java @@ -1,6 +1,10 @@ package duke.exception; public class UnknownInputDukeException extends DukeException { + + /** + * Creates an UnknownInputDukeException. + */ public UnknownInputDukeException() { super("OOPS!!! I'm sorry, but I don't know what that means :-(\n"); } diff --git a/src/main/java/duke/task/Deadline.java b/src/main/java/duke/task/Deadline.java index 7ee15a9480..cfe6278d0f 100644 --- a/src/main/java/duke/task/Deadline.java +++ b/src/main/java/duke/task/Deadline.java @@ -13,6 +13,12 @@ public class Deadline extends Task { protected String by; private Date date; + /** + * Creates a task with a deadline. + * + * @param description description of the task + * @param by the deadline of the task + */ public Deadline(String description, String by) throws DateTimeException { super(description); this.by = by; @@ -21,17 +27,32 @@ public Deadline(String description, String by) throws DateTimeException { this.deadline = new SimpleDateFormat("dd/MM/yyyy HHmm"); } - @Override + /** + * Returns deadline as the task type. + * + * @return type of task + */ public String getType() { return this.type; } + /** + * Returns deadline of the task. + * + * @return deadline of task + */ @Override public String getBy() { return this.by; } - public String convertEventTime() throws ParseException, DateTimeException { + /** + * Converts the deadline from SimpleDateFormat to String. + * + * @return deadline of task in the form of a string + * @throws DateTimeException deadline is in the wrong format + */ + public String convertEventTime() throws DateTimeException { try { date = deadline.parse(this.by); @@ -42,12 +63,13 @@ public String convertEventTime() throws ParseException, DateTimeException { return ""; } + /** + * Represents the task in a format suitable for the user to read. + * + * @return string representation of task + */ @Override public String toString() { - try { - return "[D]" + super.toString() + " (by: " + convertEventTime() + ")"; - } catch (ParseException exception) { - return "Error"; - } + return "[D]" + super.toString() + " (by: " + convertEventTime() + ")"; } } diff --git a/src/main/java/duke/task/Event.java b/src/main/java/duke/task/Event.java index f0f29c4594..dac1ba3ae9 100644 --- a/src/main/java/duke/task/Event.java +++ b/src/main/java/duke/task/Event.java @@ -13,6 +13,12 @@ public class Event extends Task { private SimpleDateFormat eventTime; private Date date; + /** + * Creates an event task. + * + * @param description description of the task + * @param at time of the event + */ public Event(String description, String at) throws DateTimeException { super(description); this.at = at.trim(); @@ -22,21 +28,42 @@ public Event(String description, String at) throws DateTimeException { eventTime = new SimpleDateFormat("dd/MM/yyyy HHmm"); } - @Override + /** + * Returns event as the task type. + * + * @return type of task + */ public String getType() { return this.type; } + /** + * Returns time of the event. + * + * @return time of event + */ @Override public String getAt() { return this.at; } + /** + * Converts event time from SimpleDateFormat to a string. + * + * @return time of event as a string + * @throws ParseException when user does not input a time + * @throws DateTimeException when format of date/time is incorrect + */ public String convertEventTime() throws ParseException, DateTimeException { this.date = eventTime.parse(this.at); return this.eventTime.format(date); } + /** + * Represents the task in a format suitable for the user to read. + * + * @return string representation of task + */ @Override public String toString() { try { diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java index 4eb1ef2bf0..fbec8ff513 100644 --- a/src/main/java/duke/task/Task.java +++ b/src/main/java/duke/task/Task.java @@ -3,25 +3,36 @@ import java.text.ParseException; public class Task { - protected String description; - protected boolean isDone; + private String description; + private boolean isDone; protected String type; - protected String deadline; protected String event; + /** + * Creates a task object. + * Called by task, deadline and event. + * + * @param description description of task + */ public Task(String description) { this.description = description; this.isDone = false; } - public String getStatusIcon() { - return isDone ? "\u2713" : "\u2718"; //return tick or X symbols - } - - public String getType() { - return "error"; + /** + * Returns status of task. + * + * @return tick or X symbols to represent whether task is done. + */ + private String getStatusIcon() { + return isDone ? "✓" : "✗"; } + /** + * Returns description of task. + * + * @return description of task + */ public String getDesc() { return this.description; } @@ -34,26 +45,25 @@ public String getBy() { return ""; } + /** + * Returns whether task is done in the form of a string. + * + * @return status of task + */ public String getDone() { return this.isDone ? "1" : "0"; } - /* mutators */ - public void setAsDone() { - this.isDone = true; - } - - public void addType(String type) { - this.type = type; } + /** + * Represents the task in a format suitable for the user to read. + * + * @return string representation of task + */ @Override public String toString() { return "[" + this.getStatusIcon() + "] " + description; } - - public String toFile() throws ParseException { - return ""; - } } \ No newline at end of file diff --git a/src/main/java/duke/task/Todo.java b/src/main/java/duke/task/Todo.java index de8423ac46..d2c507a399 100644 --- a/src/main/java/duke/task/Todo.java +++ b/src/main/java/duke/task/Todo.java @@ -3,19 +3,23 @@ import duke.task.Task; public class Todo extends Task { + private String type; - protected String at; - + /** + * Creates a Todo task. + * + * @param description description of task + */ public Todo(String description) { super(description); this.type = "T"; } - @Override - public String getType() { - return this.type; - } - + /** + * Represents the task in a format suitable for the user to read. + * + * @return string representation of task + */ @Override public String toString() { return "[T]" + super.toString(); diff --git a/src/main/java/duke/ui/Ui.java b/src/main/java/duke/ui/Ui.java index 50305f0583..0c70ba29fd 100644 --- a/src/main/java/duke/ui/Ui.java +++ b/src/main/java/duke/ui/Ui.java @@ -8,7 +8,9 @@ public class Ui { private Scanner scan = new Scanner(System.in); - + /** + * Prints welcome message for user. + */ public void printIntro() { String logo = "\t ____ _ \n" + "\t | _ \\ _ _| | _____ \n" @@ -22,18 +24,34 @@ public void printIntro() { printLine(); } + /** + * Prints line that encloses Duke's dialogues. + */ public void printLine() { System.out.println("\t____________________________________________________________"); } + /** + * Scans command from user input. + */ public String scanCmd() { return scan.nextLine(); } + /** + * Prints messages from Duke. + * + * @param toPrint string to be printed + */ public void printDuke(String toPrint) { - System.out.print(" " + toPrint); + System.out.print("\t" + toPrint); } + /** + * Prints a list in Duke format. + * + * @param list list containing tasks + */ public void printList(ArrayList list) { System.out.println("\t Here are the tasks in your list:"); for (int i = 0; i < list.size(); i++) { @@ -43,6 +61,11 @@ public void printList(ArrayList list) { } } + /** + * Prints error messages. + * + * @param error the type of error + */ public void printError(String error) { printDuke(error); } From 5a0f7544f00f349092c11221fc24a2ee5a5fb9c5 Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 18 Sep 2019 07:04:24 +0800 Subject: [PATCH 22/37] Tweaked the code to comply with coding standard --- src/main/java/data.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/data.txt b/src/main/java/data.txt index 94d6e04b85..55d94bac31 100644 --- a/src/main/java/data.txt +++ b/src/main/java/data.txt @@ -1,8 +1,8 @@ D | 1 | A-MoreOOP | 04/09/2019 1300 -D | 0 | A-JUnit | 04/09/2019 1300 -D | 0 | A-Jar | 04/09/2019 1300 +D | 1 | A-JUnit | 04/09/2019 1300 +D | 1 | A-Jar | 04/09/2019 1300 T | 1 | A-Packages -D | 0 | A-JavaDoc | 04/09/2019 1300 +D | 1 | A-JavaDoc | 04/09/2019 1300 D | 1 | A-CodingStandard | 04/09/2019 1300 D | 1 | Level-9 | 04/09/2019 1300 E | 0 | cs2103 group meeting | 19/09/2019 1800 From ce5cb3478443062d7432c65bba8365a300610c27 Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 18 Sep 2019 08:38:32 +0800 Subject: [PATCH 23/37] added javaFX plugin, completed 3/4 of GUI --- build.gradle | 8 +- src/main/java/duke/DialogBox.java | 47 ++++++ src/main/java/duke/Duke.java | 18 ++- src/main/java/duke/Launcher.java | 12 ++ src/main/java/duke/Main.java | 139 ++++++++++++++++++ .../main/resources/images}/DaDuke.png | Bin .../main/resources/images}/DaUser.png | Bin tutorials/javaFxTutorialPart3.md | 4 +- 8 files changed, 223 insertions(+), 5 deletions(-) create mode 100644 src/main/java/duke/DialogBox.java create mode 100644 src/main/java/duke/Launcher.java create mode 100644 src/main/java/duke/Main.java rename {tutorials/assets => src/main/resources/images}/DaDuke.png (100%) rename {tutorials/assets => src/main/resources/images}/DaUser.png (100%) diff --git a/build.gradle b/build.gradle index 8c2cfb5b2f..7bfc961034 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,7 @@ plugins { id 'application' id 'checkstyle' id 'com.github.johnrengelman.shadow' version '5.1.0' + id 'org.openjfx.javafxplugin' version '0.0.7' } group 'seedu.duke' @@ -14,7 +15,7 @@ repositories { application { // Change this to your main class. - mainClassName = "duke.Duke" + mainClassName = "duke" } checkstyle { @@ -36,6 +37,11 @@ test { useJUnitPlatform() } +javafx { + version = "11.0.2" + modules = [ 'javafx.controls', 'javafx.fxml' ] +} + run { standardInput = System.in } \ No newline at end of file diff --git a/src/main/java/duke/DialogBox.java b/src/main/java/duke/DialogBox.java new file mode 100644 index 0000000000..1264ec57f7 --- /dev/null +++ b/src/main/java/duke/DialogBox.java @@ -0,0 +1,47 @@ +package duke; + +import javafx.geometry.Pos; +import javafx.scene.control.Label; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.scene.Node; + +public class DialogBox extends HBox { + + private Label text; + private ImageView displayPicture; + + public DialogBox(Label l, ImageView iv) { + text = l; + displayPicture = iv; + + text.setWrapText(true); + displayPicture.setFitWidth(100.0); + displayPicture.setFitHeight(100.0); + + this.setAlignment(Pos.TOP_RIGHT); + this.getChildren().addAll(text, displayPicture); + } + + /** + * Flips the dialog box such that the ImageView is on the left and text on the right. + */ + private void flip() { + this.setAlignment(Pos.TOP_LEFT); + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + FXCollections.reverse(tmp); + this.getChildren().setAll(tmp); + } + + public static DialogBox getUserDialog(Label l, ImageView iv) { + return new DialogBox(l, iv); + } + + public static DialogBox getDukeDialog(Label l, ImageView iv) { + var db = new DialogBox(l, iv); + db.flip(); + return db; + } +} \ No newline at end of file diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index 80e1f5f64c..2ecfe49c7d 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -3,16 +3,23 @@ import duke.exception.DukeException; import duke.ui.Ui; import java.io.IOException; -import java.text.ParseException; import java.util.Scanner; import duke.command.Command; -public class Duke { +import javafx.application.Application; +import javafx.scene.Scene; +import javafx.scene.control.Label; +import javafx.stage.Stage; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; + +public class Duke extends Application { private TaskList tasks; private Saved savedFile; private Scanner scan; private Ui ui; + /** * Creates a Duke object. * Initialise the storage, task list and ui objects. @@ -67,5 +74,12 @@ public static void main(String[] args) throws IOException { new Duke("src/main/java/data.txt").run(); } + @Override + public void start(Stage stage) { + Label helloWorld = new Label("Hello World!"); // Creating a new Label control + Scene scene = new Scene(helloWorld); // Setting the scene to be our Label + stage.setScene(scene); // Setting the stage to show our screen + stage.show(); // Render the stage. + } } \ No newline at end of file diff --git a/src/main/java/duke/Launcher.java b/src/main/java/duke/Launcher.java new file mode 100644 index 0000000000..5483e63637 --- /dev/null +++ b/src/main/java/duke/Launcher.java @@ -0,0 +1,12 @@ +package duke; + +import javafx.application.Application; + +/** + * A launcher class to workaround classpath issues. + */ +public class Launcher { + public static void main(String[] args) { + Application.launch(Main.class, args); + } +} \ No newline at end of file diff --git a/src/main/java/duke/Main.java b/src/main/java/duke/Main.java new file mode 100644 index 0000000000..4619bec155 --- /dev/null +++ b/src/main/java/duke/Main.java @@ -0,0 +1,139 @@ +package duke; + +import javafx.application.Application; +import javafx.scene.Scene; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; +import javafx.scene.layout.Region; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; + +/** + * A GUI for Duke using FXML. + */ +public class Main extends Application { + private ScrollPane scrollPane; + private VBox dialogContainer; + private TextField userInput; + private Button sendButton; + private Scene scene; + private Image user = new Image(this.getClass().getResourceAsStream("/images/DaUser.png")); + private Image duke = new Image(this.getClass().getResourceAsStream("/images/DaDuke.png")); + + public static void main(String[] args) { + // ... + } + + @Override + public void start(Stage stage) { + //Step 1. Setting up required components + //The container for the content of the chat to scroll. + scrollPane = new ScrollPane(); + dialogContainer = new VBox(); + scrollPane.setContent(dialogContainer); + + userInput = new TextField(); + sendButton = new Button("Send"); + + AnchorPane mainLayout = new AnchorPane(); + mainLayout.getChildren().addAll(scrollPane, userInput, sendButton); + + scene = new Scene(mainLayout); + + stage.setScene(scene); + stage.show(); + + //Step 2. Formatting the window to look as expected + stage.setTitle("Duke"); + stage.setResizable(false); + stage.setMinHeight(600.0); + stage.setMinWidth(400.0); + + mainLayout.setPrefSize(400.0, 600.0); + + scrollPane.setPrefSize(385, 535); + scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); + scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS); + + scrollPane.setVvalue(1.0); + scrollPane.setFitToWidth(true); + + dialogContainer.setPrefHeight(Region.USE_COMPUTED_SIZE); + + userInput.setPrefWidth(325.0); + + sendButton.setPrefWidth(55.0); + + AnchorPane.setTopAnchor(scrollPane, 1.0); + + AnchorPane.setBottomAnchor(sendButton, 1.0); + AnchorPane.setRightAnchor(sendButton, 1.0); + + AnchorPane.setLeftAnchor(userInput , 1.0); + AnchorPane.setBottomAnchor(userInput, 1.0); + + sendButton.setOnMouseClicked((event) -> { + dialogContainer.getChildren().add(getDialogLabel(userInput.getText())); + userInput.clear(); + }); + + userInput.setOnAction((event) -> { + dialogContainer.getChildren().add(getDialogLabel(userInput.getText())); + userInput.clear(); + }); + + //Scroll down to the end every time dialogContainer's height changes. + dialogContainer.heightProperty().addListener((observable) -> scrollPane.setVvalue(1.0)); + + //Part 3. Add functionality to handle user input. + sendButton.setOnMouseClicked((event) -> { + handleUserInput(); + }); + + userInput.setOnAction((event) -> { + handleUserInput(); + }); + } + + /** + * Iteration 1: + * Creates a label with the specified text and adds it to the dialog container. + * @param text String containing text to add + * @return a label with the specified text that has word wrap enabled. + */ + private Label getDialogLabel(String text) { + // You will need to import `javafx.scene.control.Label`. + Label textToAdd = new Label(text); + textToAdd.setWrapText(true); + + return textToAdd; + } + + /** + * Iteration 2: + * Creates two dialog boxes, one echoing user input and the other containing Duke's reply and then appends them to + * the dialog container. Clears the user input after processing. + */ + private void handleUserInput() { + Label userText = new Label(userInput.getText()); + Label dukeText = new Label(getResponse(userInput.getText())); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(userText, new ImageView(user)), + DialogBox.getDukeDialog(dukeText, new ImageView(duke)) + ); + userInput.clear(); + } + + /** + * You should have your own function to generate a response to user input. + * Replace this stub with your completed method. + */ + private String getResponse(String input) { + return "Duke heard: " + input; + } +} diff --git a/tutorials/assets/DaDuke.png b/src/main/resources/images/DaDuke.png similarity index 100% rename from tutorials/assets/DaDuke.png rename to src/main/resources/images/DaDuke.png diff --git a/tutorials/assets/DaUser.png b/src/main/resources/images/DaUser.png similarity index 100% rename from tutorials/assets/DaUser.png rename to src/main/resources/images/DaUser.png diff --git a/tutorials/javaFxTutorialPart3.md b/tutorials/javaFxTutorialPart3.md index a9e1bdddd3..ce9a6b2da8 100644 --- a/tutorials/javaFxTutorialPart3.md +++ b/tutorials/javaFxTutorialPart3.md @@ -107,8 +107,8 @@ For this tutorial, we have two images `DaUser.png` and `DaDuke.png` to represent Image|Filename ---|--- -![DaDuke](assets/DaUser.png) | `DaUser.png` -![DaUser](assets/DaDuke.png) | `DaDuke.png` +![DaDuke](../src/main/resources/images/DaUser.png) | `DaUser.png` +![DaUser](../src/main/resources/images/DaDuke.png) | `DaDuke.png` ```java From cb6776eb87c90f7f73c3652511e094bd4cab6eb5 Mon Sep 17 00:00:00 2001 From: Wang Rong Shirley Date: Wed, 18 Sep 2019 10:02:58 +0800 Subject: [PATCH 24/37] added A-JavaFx and Level-10 GUI --- build.gradle | 2 +- src/main/java/DialogBox.java | 59 ++++++++ src/main/java/{duke => }/Launcher.java | 2 - src/main/java/Main.java | 38 +++++ src/main/java/MainWindow.java | 52 +++++++ src/main/java/duke/DialogBox.java | 47 ------ src/main/java/duke/Duke.java | 45 +++--- src/main/java/duke/Main.java | 139 ------------------ src/main/java/duke/command/AddCommand.java | 6 +- src/main/java/duke/command/Command.java | 2 +- src/main/java/duke/command/DeleteCommand.java | 5 +- src/main/java/duke/command/DoneCommand.java | 5 +- src/main/java/duke/command/ExitCommand.java | 4 +- src/main/java/duke/command/FindCommand.java | 4 +- src/main/java/duke/command/ListCommand.java | 4 +- src/main/java/duke/task/Task.java | 2 +- src/main/java/duke/ui/Ui.java | 49 ++++-- src/main/resources/view/DialogBox.fxml | 16 ++ src/main/resources/view/MainWindow.fxml | 19 +++ 19 files changed, 264 insertions(+), 236 deletions(-) create mode 100644 src/main/java/DialogBox.java rename src/main/java/{duke => }/Launcher.java (93%) create mode 100644 src/main/java/Main.java create mode 100644 src/main/java/MainWindow.java delete mode 100644 src/main/java/duke/DialogBox.java delete mode 100644 src/main/java/duke/Main.java create mode 100644 src/main/resources/view/DialogBox.fxml create mode 100644 src/main/resources/view/MainWindow.fxml diff --git a/build.gradle b/build.gradle index 7bfc961034..6112c41752 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ repositories { application { // Change this to your main class. - mainClassName = "duke" + mainClassName = "Launcher" } checkstyle { diff --git a/src/main/java/DialogBox.java b/src/main/java/DialogBox.java new file mode 100644 index 0000000000..60636ac988 --- /dev/null +++ b/src/main/java/DialogBox.java @@ -0,0 +1,59 @@ +import java.io.IOException; +import java.util.Collections; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; + +/** + * An example of a custom control using FXML. + * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label + * containing text from the speaker. + */ +public class DialogBox extends HBox { + @FXML + private Label dialog; + @FXML + private ImageView displayPicture; + + private DialogBox(String text, Image img) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml")); + fxmlLoader.setController(this); + fxmlLoader.setRoot(this); + fxmlLoader.load(); + } catch (IOException e) { + e.printStackTrace(); + } + + dialog.setText(text); + displayPicture.setImage(img); + } + + /** + * Flips the dialog box such that the ImageView is on the left and text on the right. + */ + private void flip() { + ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); + Collections.reverse(tmp); + getChildren().setAll(tmp); + setAlignment(Pos.TOP_LEFT); + } + + public static DialogBox getUserDialog(String text, Image img) { + return new DialogBox(text, img); + } + + public static DialogBox getDukeDialog(String text, Image img) { + var db = new DialogBox(text, img); + db.flip(); + return db; + } +} \ No newline at end of file diff --git a/src/main/java/duke/Launcher.java b/src/main/java/Launcher.java similarity index 93% rename from src/main/java/duke/Launcher.java rename to src/main/java/Launcher.java index 5483e63637..11dbf00c62 100644 --- a/src/main/java/duke/Launcher.java +++ b/src/main/java/Launcher.java @@ -1,5 +1,3 @@ -package duke; - import javafx.application.Application; /** diff --git a/src/main/java/Main.java b/src/main/java/Main.java new file mode 100644 index 0000000000..c78604cc76 --- /dev/null +++ b/src/main/java/Main.java @@ -0,0 +1,38 @@ +import java.io.IOException; + +import duke.Duke; +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.layout.AnchorPane; +import javafx.stage.Stage; + +/** + * A GUI for Duke using FXML. + */ +public class Main extends Application { + + private Duke duke = new Duke(); + + @Override + public void start(Stage stage) { + try { + FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml")); + AnchorPane ap = fxmlLoader.load(); + Scene scene = new Scene(ap); + stage.setScene(scene); + fxmlLoader.getController().setDuke(duke); + stage.show(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * You should have your own function to generate a response to user input. + * Replace this stub with your completed method. + */ + private String getResponse(String input) { + return "Duke heard: " + input; + } +} diff --git a/src/main/java/MainWindow.java b/src/main/java/MainWindow.java new file mode 100644 index 0000000000..0726df4ed0 --- /dev/null +++ b/src/main/java/MainWindow.java @@ -0,0 +1,52 @@ +import duke.Duke; + +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.image.Image; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.VBox; + +/** + * Controller for MainWindow. Provides the layout for the other controls. + */ +public class MainWindow extends AnchorPane { + @FXML + private ScrollPane scrollPane; + @FXML + private VBox dialogContainer; + @FXML + private TextField userInput; + @FXML + private Button sendButton; + + private Duke duke; + + private Image userImage = new Image(this.getClass().getResourceAsStream("/images/DaUser.png")); + private Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/DaDuke.png")); + + @FXML + public void initialize() { + scrollPane.vvalueProperty().bind(dialogContainer.heightProperty()); + } + + public void setDuke(Duke d) { + duke = d; + } + + /** + * Creates two dialog boxes, one echoing user input and the other containing Duke's reply and then appends them to + * the dialog container. Clears the user input after processing. + */ + @FXML + private void handleUserInput() { + String input = userInput.getText(); + String response = duke.getResponse(input); + dialogContainer.getChildren().addAll( + DialogBox.getUserDialog(input, userImage), + DialogBox.getDukeDialog(response, dukeImage) + ); + userInput.clear(); + } +} \ No newline at end of file diff --git a/src/main/java/duke/DialogBox.java b/src/main/java/duke/DialogBox.java deleted file mode 100644 index 1264ec57f7..0000000000 --- a/src/main/java/duke/DialogBox.java +++ /dev/null @@ -1,47 +0,0 @@ -package duke; - -import javafx.geometry.Pos; -import javafx.scene.control.Label; -import javafx.scene.image.ImageView; -import javafx.scene.layout.HBox; -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; -import javafx.scene.Node; - -public class DialogBox extends HBox { - - private Label text; - private ImageView displayPicture; - - public DialogBox(Label l, ImageView iv) { - text = l; - displayPicture = iv; - - text.setWrapText(true); - displayPicture.setFitWidth(100.0); - displayPicture.setFitHeight(100.0); - - this.setAlignment(Pos.TOP_RIGHT); - this.getChildren().addAll(text, displayPicture); - } - - /** - * Flips the dialog box such that the ImageView is on the left and text on the right. - */ - private void flip() { - this.setAlignment(Pos.TOP_LEFT); - ObservableList tmp = FXCollections.observableArrayList(this.getChildren()); - FXCollections.reverse(tmp); - this.getChildren().setAll(tmp); - } - - public static DialogBox getUserDialog(Label l, ImageView iv) { - return new DialogBox(l, iv); - } - - public static DialogBox getDukeDialog(Label l, ImageView iv) { - var db = new DialogBox(l, iv); - db.flip(); - return db; - } -} \ No newline at end of file diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java index 2ecfe49c7d..869977639d 100644 --- a/src/main/java/duke/Duke.java +++ b/src/main/java/duke/Duke.java @@ -7,31 +7,29 @@ import duke.command.Command; import javafx.application.Application; -import javafx.scene.Scene; -import javafx.scene.control.Label; import javafx.stage.Stage; -import javafx.scene.image.Image; -import javafx.scene.image.ImageView; +/** + * Main class duke to start the programme. + */ public class Duke extends Application { private TaskList tasks; private Saved savedFile; private Scanner scan; private Ui ui; - /** * Creates a Duke object. * Initialise the storage, task list and ui objects. - * - * @param filePath the local path to the storage file - * @throws IOException filePath is inaccessible or cannot be found */ - public Duke(String filePath) throws IOException { + public Duke() { + savedFile = new Saved("src/main/java/data.txt"); ui = new Ui(); - savedFile = new Saved(filePath); - - tasks = new TaskList(savedFile.loadData()); + try { + tasks = new TaskList(savedFile.loadData()); + } catch (IOException e) { + tasks = new TaskList(); + } } /** @@ -53,7 +51,7 @@ public void run() throws IOException { input = ui.scanCmd(); ui.printLine(); cmd = Parser.parse(input); - cmd.execute(tasks, ui, savedFile); + cmd.execute(tasks, ui); isBye = cmd.isBye(); } catch (DukeException error) { ui.printError(error.getMessage()); @@ -71,15 +69,22 @@ public void run() throws IOException { * @throws IOException local file is inaccessible or cannot be found */ public static void main(String[] args) throws IOException { - new Duke("src/main/java/data.txt").run(); + new Duke().run(); } - @Override - public void start(Stage stage) { - Label helloWorld = new Label("Hello World!"); // Creating a new Label control - Scene scene = new Scene(helloWorld); // Setting the scene to be our Label + /** + * Gets response from the user. + */ + public String getResponse(String input) { + try { + Command cmd = Parser.parse(input); + return cmd.execute(tasks, ui); + } catch (DukeException e) { + return e.getMessage(); + } + } - stage.setScene(scene); // Setting the stage to show our screen - stage.show(); // Render the stage. + @Override + public void start(Stage start) { } } \ No newline at end of file diff --git a/src/main/java/duke/Main.java b/src/main/java/duke/Main.java deleted file mode 100644 index 4619bec155..0000000000 --- a/src/main/java/duke/Main.java +++ /dev/null @@ -1,139 +0,0 @@ -package duke; - -import javafx.application.Application; -import javafx.scene.Scene; -import javafx.scene.control.Button; -import javafx.scene.control.ScrollPane; -import javafx.scene.control.TextField; -import javafx.scene.layout.AnchorPane; -import javafx.scene.layout.VBox; -import javafx.stage.Stage; -import javafx.scene.layout.Region; -import javafx.scene.control.Label; -import javafx.scene.image.Image; -import javafx.scene.image.ImageView; - -/** - * A GUI for Duke using FXML. - */ -public class Main extends Application { - private ScrollPane scrollPane; - private VBox dialogContainer; - private TextField userInput; - private Button sendButton; - private Scene scene; - private Image user = new Image(this.getClass().getResourceAsStream("/images/DaUser.png")); - private Image duke = new Image(this.getClass().getResourceAsStream("/images/DaDuke.png")); - - public static void main(String[] args) { - // ... - } - - @Override - public void start(Stage stage) { - //Step 1. Setting up required components - //The container for the content of the chat to scroll. - scrollPane = new ScrollPane(); - dialogContainer = new VBox(); - scrollPane.setContent(dialogContainer); - - userInput = new TextField(); - sendButton = new Button("Send"); - - AnchorPane mainLayout = new AnchorPane(); - mainLayout.getChildren().addAll(scrollPane, userInput, sendButton); - - scene = new Scene(mainLayout); - - stage.setScene(scene); - stage.show(); - - //Step 2. Formatting the window to look as expected - stage.setTitle("Duke"); - stage.setResizable(false); - stage.setMinHeight(600.0); - stage.setMinWidth(400.0); - - mainLayout.setPrefSize(400.0, 600.0); - - scrollPane.setPrefSize(385, 535); - scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); - scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS); - - scrollPane.setVvalue(1.0); - scrollPane.setFitToWidth(true); - - dialogContainer.setPrefHeight(Region.USE_COMPUTED_SIZE); - - userInput.setPrefWidth(325.0); - - sendButton.setPrefWidth(55.0); - - AnchorPane.setTopAnchor(scrollPane, 1.0); - - AnchorPane.setBottomAnchor(sendButton, 1.0); - AnchorPane.setRightAnchor(sendButton, 1.0); - - AnchorPane.setLeftAnchor(userInput , 1.0); - AnchorPane.setBottomAnchor(userInput, 1.0); - - sendButton.setOnMouseClicked((event) -> { - dialogContainer.getChildren().add(getDialogLabel(userInput.getText())); - userInput.clear(); - }); - - userInput.setOnAction((event) -> { - dialogContainer.getChildren().add(getDialogLabel(userInput.getText())); - userInput.clear(); - }); - - //Scroll down to the end every time dialogContainer's height changes. - dialogContainer.heightProperty().addListener((observable) -> scrollPane.setVvalue(1.0)); - - //Part 3. Add functionality to handle user input. - sendButton.setOnMouseClicked((event) -> { - handleUserInput(); - }); - - userInput.setOnAction((event) -> { - handleUserInput(); - }); - } - - /** - * Iteration 1: - * Creates a label with the specified text and adds it to the dialog container. - * @param text String containing text to add - * @return a label with the specified text that has word wrap enabled. - */ - private Label getDialogLabel(String text) { - // You will need to import `javafx.scene.control.Label`. - Label textToAdd = new Label(text); - textToAdd.setWrapText(true); - - return textToAdd; - } - - /** - * Iteration 2: - * Creates two dialog boxes, one echoing user input and the other containing Duke's reply and then appends them to - * the dialog container. Clears the user input after processing. - */ - private void handleUserInput() { - Label userText = new Label(userInput.getText()); - Label dukeText = new Label(getResponse(userInput.getText())); - dialogContainer.getChildren().addAll( - DialogBox.getUserDialog(userText, new ImageView(user)), - DialogBox.getDukeDialog(dukeText, new ImageView(duke)) - ); - userInput.clear(); - } - - /** - * You should have your own function to generate a response to user input. - * Replace this stub with your completed method. - */ - private String getResponse(String input) { - return "Duke heard: " + input; - } -} diff --git a/src/main/java/duke/command/AddCommand.java b/src/main/java/duke/command/AddCommand.java index 94f8d65920..d9c3eb76fd 100644 --- a/src/main/java/duke/command/AddCommand.java +++ b/src/main/java/duke/command/AddCommand.java @@ -22,10 +22,8 @@ public AddCommand(Task task) { * @param tasks contains the current list of tasks * @param ui to give feedback to the user */ - public void execute(TaskList tasks, Ui ui, Saved file) { + public String execute(TaskList tasks, Ui ui) { tasks.add(this.task); - ui.printDuke("Got it. I've added this task:\n " - + "\t" + this.task + "\n" - + "\t Now you have " + tasks.size() + " tasks in the list.\n"); + return ui.showAddTaskMessage(tasks.size(), task.toString()); } } diff --git a/src/main/java/duke/command/Command.java b/src/main/java/duke/command/Command.java index e07f343f86..70fef51d59 100644 --- a/src/main/java/duke/command/Command.java +++ b/src/main/java/duke/command/Command.java @@ -6,7 +6,7 @@ import duke.ui.Ui; public abstract class Command { - public abstract void execute(TaskList tasks, Ui ui, Saved file) throws DukeException; + public abstract String execute(TaskList tasks, Ui ui) throws DukeException; public boolean isBye() { return this instanceof ExitCommand; diff --git a/src/main/java/duke/command/DeleteCommand.java b/src/main/java/duke/command/DeleteCommand.java index 4957e518b5..8eab2839d4 100644 --- a/src/main/java/duke/command/DeleteCommand.java +++ b/src/main/java/duke/command/DeleteCommand.java @@ -18,9 +18,8 @@ public DeleteCommand(int taskNum) { * @param tasks task to be deleted * @param ui to give feedback to the user */ - public void execute(TaskList tasks, Ui ui, Saved file) { + public String execute(TaskList tasks, Ui ui) { Task task = tasks.delete(this.taskNum); - ui.printDuke("Noted. I've removed this task: \n" - + "\t" + task + "\n \tNow you have " + tasks.size() + " tasks in the list.\n"); + return ui.showDeleteMessage(task.toString(), tasks.size()); } } diff --git a/src/main/java/duke/command/DoneCommand.java b/src/main/java/duke/command/DoneCommand.java index 726165d4ff..ae24ac1c1d 100644 --- a/src/main/java/duke/command/DoneCommand.java +++ b/src/main/java/duke/command/DoneCommand.java @@ -22,9 +22,8 @@ public DoneCommand(int taskNum) { * @param tasks contains the current list of tasks * @param ui to give feedback to the user */ - public void execute(TaskList tasks, Ui ui, Saved file) { + public String execute(TaskList tasks, Ui ui) { Task task = tasks.setDone(this.taskNum); - ui.printDuke("Nice! I've marked this task as done: \n" - + "\t" + task + "\n"); + return ui.showDone(task); } } diff --git a/src/main/java/duke/command/ExitCommand.java b/src/main/java/duke/command/ExitCommand.java index 150e4c558b..d9b21ec011 100644 --- a/src/main/java/duke/command/ExitCommand.java +++ b/src/main/java/duke/command/ExitCommand.java @@ -10,7 +10,7 @@ public class ExitCommand extends Command { /** * Relays to the driver class that the user wishes to exit Duke. */ - public void execute(TaskList tasks, Ui ui, Saved file) { - ui.printDuke("Bye. Hope to see you again soon!\n"); + public String execute(TaskList tasks, Ui ui) { + return ui.showBye(); } } diff --git a/src/main/java/duke/command/FindCommand.java b/src/main/java/duke/command/FindCommand.java index e2305c2dc4..7cb5895961 100644 --- a/src/main/java/duke/command/FindCommand.java +++ b/src/main/java/duke/command/FindCommand.java @@ -25,7 +25,7 @@ public FindCommand(String keyword) { * @param ui to give feedback to user * @throws DukeException when no matches are found */ - public void execute(TaskList tasks, Ui ui, Saved file) throws DukeException { - ui.printList(tasks.findMatch(this.keyword)); + public String execute(TaskList tasks, Ui ui) throws DukeException { + return ui.showList(tasks.findMatch(this.keyword)); } } diff --git a/src/main/java/duke/command/ListCommand.java b/src/main/java/duke/command/ListCommand.java index e7c3b6fb4a..0277e15fbf 100644 --- a/src/main/java/duke/command/ListCommand.java +++ b/src/main/java/duke/command/ListCommand.java @@ -13,7 +13,7 @@ public class ListCommand extends Command { * @param tasks to access the list of tasks * @param ui to give feedback to user */ - public void execute(TaskList tasks, Ui ui, Saved file) { - ui.printList(tasks.getTaskArrayList()); + public String execute(TaskList tasks, Ui ui) { + return ui.showList(tasks.getTaskArrayList()); } } diff --git a/src/main/java/duke/task/Task.java b/src/main/java/duke/task/Task.java index fbec8ff513..787cc96300 100644 --- a/src/main/java/duke/task/Task.java +++ b/src/main/java/duke/task/Task.java @@ -24,7 +24,7 @@ public Task(String description) { * * @return tick or X symbols to represent whether task is done. */ - private String getStatusIcon() { + public String getStatusIcon() { return isDone ? "✓" : "✗"; } diff --git a/src/main/java/duke/ui/Ui.java b/src/main/java/duke/ui/Ui.java index 0c70ba29fd..09ffd474eb 100644 --- a/src/main/java/duke/ui/Ui.java +++ b/src/main/java/duke/ui/Ui.java @@ -12,12 +12,12 @@ public class Ui { * Prints welcome message for user. */ public void printIntro() { - String logo = "\t ____ _ \n" - + "\t | _ \\ _ _| | _____ \n" - + "\t | | | | | | | |/ / _ \\\n" - + "\t | |_| | |_| | < __/\n" - + "\t |____/ \\__,_|_|\\_\\___|\n"; - System.out.println("\t Hello from\n" + logo); + String logo = "\t____ _ \n" + + "\t| _ \\ _ _| | _____ \n" + + "\t| | | | | | | |/ / _ \\\n" + + "\t| |_| | |_| | < __/\n" + + "\t|____/ \\__,_|_|\\_\\___|\n"; + System.out.println("\tHello from\n" + logo); printLine(); printDuke("Hello! I'm Duke\n"); printDuke("What can I do for you?\n"); @@ -52,15 +52,29 @@ public void printDuke(String toPrint) { * * @param list list containing tasks */ - public void printList(ArrayList list) { - System.out.println("\t Here are the tasks in your list:"); + public String showList(ArrayList list) { + StringBuilder msg = new StringBuilder(); + + System.out.println("\tHere are the tasks in your list:"); for (int i = 0; i < list.size(); i++) { Task task = list.get(i); - System.out.println("\t" + (i + 1) + ". " + task.toString()); + msg.append("\t" + (i + 1) + ". " + task.toString() + "\n"); } + return msg.toString(); } + /** + * Returns a message to be printed once a task is added. + * @param numOfTasks total number of tasks after a task has been added + * @param taskDescription description of the newly added task + */ + public String showAddTaskMessage(int numOfTasks, String taskDescription) { + StringBuilder msg = new StringBuilder(); + msg.append("Got it. I've added this task:\n " + taskDescription + "\n"); + msg.append("Now you have " + numOfTasks + " task(s) in the list."); + return msg.toString(); + } /** * Prints error messages. * @@ -70,4 +84,21 @@ public void printError(String error) { printDuke(error); } + public String showDeleteMessage(String removedTask, int numOfTasks) { + StringBuilder msg = new StringBuilder(); + msg.append("Noted. I've removed this task:\n " + removedTask + "\n"); + msg.append("Now you have " + numOfTasks + " task(s) in the list."); + return msg.toString(); + } + + public String showBye() { + return "Bye! Hope to see you again!"; + } + + public String showDone(Task task) { + StringBuilder msg = new StringBuilder(); + msg.append("Nice! I've marked this task as done:\n"); + msg.append("\t[" + task.getStatusIcon() + "] " + task.getDesc()); + return msg.toString(); + } } diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml new file mode 100644 index 0000000000..e433809947 --- /dev/null +++ b/src/main/resources/view/DialogBox.fxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml new file mode 100644 index 0000000000..5acfc9e2f0 --- /dev/null +++ b/src/main/resources/view/MainWindow.fxml @@ -0,0 +1,19 @@ + + + + + + + + + + + +