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/38] 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/38] 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/38] 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/38] 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 6dfbb70ef1910e774cfd9fcbae13ad1217c4a4b7 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Mon, 26 Aug 2019 22:01:38 +0800 Subject: [PATCH 05/38] Level-1 --- src/main/java/Duke.java | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5d313334cc..6d73542eef 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,10 +1,22 @@ +import java.util.Scanner; + public class Duke { public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); + + System.out.println("Hello! I'm Duke What can I do for you?"); + + Scanner scanner = new Scanner(System.in); + + String command = scanner.nextLine(); + + while (command.equals("bye") == false) { + + System.out.println(command); + + command = scanner.nextLine(); + } + + System.out.println("Bye. Hope to see you again soon!"); + } } From 87fb84e872e255edd9dce90f7e5d8b0a5fdab167 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Mon, 26 Aug 2019 22:09:24 +0800 Subject: [PATCH 06/38] Level-1 --- 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 6d73542eef..00095ea336 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -3,7 +3,7 @@ public class Duke { public static void main(String[] args) { - System.out.println("Hello! I'm Duke What can I do for you?"); + System.out.println("Hello! I'm Duke\nWhat can I do for you?"); Scanner scanner = new Scanner(System.in); From 24796d0a4bad24ef760113ee7ef238d6962edb73 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Mon, 26 Aug 2019 22:44:55 +0800 Subject: [PATCH 07/38] Level-2 --- src/main/java/Duke.java | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 00095ea336..5fe3e0fbcc 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,4 @@ +import java.util.Arrays; import java.util.Scanner; public class Duke { @@ -9,9 +10,27 @@ public static void main(String[] args) { String command = scanner.nextLine(); + String[] list = new String[100]; + int listIndex = 0; + while (command.equals("bye") == false) { - System.out.println(command); + String[] words = command.split(" ",2); + + if (words[0].equals("added:")) { + String addMe = words.length < 2 ? "" : words[1]; + list[listIndex++] = addMe; + + } else if (command.equals("list")) { + + for (int i = 0; i < listIndex; i++) { + System.out.print(i+1 + ". "); + System.out.println(list[i]); + } + + } else { + System.out.println(command); + } command = scanner.nextLine(); } From f302e6b32fdccec190c727d4432566493e70e07b Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Tue, 27 Aug 2019 00:03:22 +0800 Subject: [PATCH 08/38] Level-2 --- src/main/java/Duke.java | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 5fe3e0fbcc..3ab0c88eb1 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,4 @@ +import java.util.ArrayList; import java.util.Arrays; import java.util.Scanner; @@ -10,27 +11,41 @@ public static void main(String[] args) { String command = scanner.nextLine(); + //Task[] list = new Task[100]; String[] list = new String[100]; int listIndex = 0; while (command.equals("bye") == false) { + if (command.equals("list") == true) { + for (int i = 0; i < listIndex; i++) { + System.out.print(i+1 + ". "); + System.out.println(list[i]); + } + } else { + list[listIndex++] = command; + } + + /* String[] words = command.split(" ",2); if (words[0].equals("added:")) { - String addMe = words.length < 2 ? "" : words[1]; - list[listIndex++] = addMe; + String description = words.length < 2 ? "" : words[1]; + list[listIndex++] = new Task(description); + } else if (words[0].equals("done") && words.length == 2) { + int index = Integer.valueOf(words[1]); + list[index].isDone = true; } else if (command.equals("list")) { for (int i = 0; i < listIndex; i++) { - System.out.print(i+1 + ". "); + System.out.print(i+1 + list[i].getStatusIcon() + ". "); System.out.println(list[i]); } } else { System.out.println(command); - } + }*/ command = scanner.nextLine(); } From e5ec66b4ab04c96d0ff275f610572228d26c64c5 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Tue, 27 Aug 2019 00:16:46 +0800 Subject: [PATCH 09/38] Level-3 --- src/main/java/Duke.java | 37 +++++++++++++++---------------------- src/main/java/Task.java | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 src/main/java/Task.java diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 3ab0c88eb1..2d62dbb328 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -11,41 +11,34 @@ public static void main(String[] args) { String command = scanner.nextLine(); - //Task[] list = new Task[100]; - String[] list = new String[100]; + Task[] list = new Task[100]; int listIndex = 0; while (command.equals("bye") == false) { - if (command.equals("list") == true) { - for (int i = 0; i < listIndex; i++) { - System.out.print(i+1 + ". "); - System.out.println(list[i]); - } - } else { - list[listIndex++] = command; - } - - /* String[] words = command.split(" ",2); - if (words[0].equals("added:")) { - String description = words.length < 2 ? "" : words[1]; - list[listIndex++] = new Task(description); + if (words[0].equals("done") && words.length == 2) { + + System.out.println("Nice! I've marked this task as done:"); + + int index = Integer.valueOf(words[1]) - 1; - } else if (words[0].equals("done") && words.length == 2) { - int index = Integer.valueOf(words[1]); list[index].isDone = true; + + System.out.println(list[index]); + } else if (command.equals("list")) { + System.out.println("Here are the tasks in your list:"); + for (int i = 0; i < listIndex; i++) { - System.out.print(i+1 + list[i].getStatusIcon() + ". "); - System.out.println(list[i]); + System.out.println(i+1 + "." + list[i]); } - } else { - System.out.println(command); - }*/ + } else if (command.equals("") == false) { + list[listIndex++] = new Task(command); + } command = scanner.nextLine(); } diff --git a/src/main/java/Task.java b/src/main/java/Task.java new file mode 100644 index 0000000000..ef689e17cb --- /dev/null +++ b/src/main/java/Task.java @@ -0,0 +1,21 @@ +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 + } + + @Override + public String toString () { + return "[" + getStatusIcon() + "]" + " " + this.description; + } + + //... +} From 76204fe69f53b5eb6ce56a713a58ea0108a66f38 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Tue, 27 Aug 2019 15:37:14 +0800 Subject: [PATCH 10/38] Level-4 --- .gitignore | 6 ++++ src/main/java/Deadline.java | 15 +++++++++ src/main/java/Duke.java | 42 ++++++++++++++++++++++++- src/main/java/Event.java | 14 +++++++++ src/main/java/Task.java | 4 +++ src/main/java/Todo.java | 11 +++++++ src/out/production/main/Deadline.class | Bin 0 -> 979 bytes src/out/production/main/Event.class | Bin 0 -> 970 bytes src/out/production/main/Task.class | Bin 0 -> 1195 bytes src/out/production/main/Todo.class | Bin 0 -> 853 bytes 10 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 src/main/java/Deadline.java create mode 100644 src/main/java/Event.java create mode 100644 src/main/java/Todo.java create mode 100644 src/out/production/main/Deadline.class create mode 100644 src/out/production/main/Event.class create mode 100644 src/out/production/main/Task.class create mode 100644 src/out/production/main/Todo.class diff --git a/.gitignore b/.gitignore index 99712178bf..f10c06736f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,9 @@ src/main/resources/docs/ .DS_Store *.iml bin/ +src/.idea/$PRODUCT_WORKSPACE_FILE$ +src/.idea/.gitignore +src/.idea/misc.xml +src/.idea/modules.xml +src/.idea/vcs.xml +src/out/production/main/Duke.class diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java new file mode 100644 index 0000000000..a1a150db94 --- /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; + } + + @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 2d62dbb328..3274c0e327 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -24,10 +24,48 @@ public static void main(String[] args) { int index = Integer.valueOf(words[1]) - 1; - list[index].isDone = true; + list[index].markAsDone(); System.out.println(list[index]); + } else if (words[0].equals("todo") && words.length == 2) { + + System.out.println("Got it. I've added this task:"); + + String description = words[1]; + + list[listIndex++] = new Todo(description); + + System.out.printf("Now you have %d tasks in the list.\n", listIndex); + + } else if (words[0].equals("deadline") && words.length == 2) { + + System.out.println("Got it. I've added this task:"); + + String[] split = words[1].split(" /by ", 2); + + String description = split[0]; + + String by = split[1]; + + list[listIndex++] = new Deadline(description, by); + + System.out.printf("Now you have %d tasks in the list.\n", listIndex); + + } else if (words[0].equals("event") && words.length == 2) { + + System.out.println("Got it. I've added this task:"); + + String[] split = words[1].split(" /at ", 2); + + String description = split[0]; + + String at = split[1]; + + list[listIndex++] = new Event(description, at); + + System.out.printf("Now you have %d tasks in the list.\n", listIndex); + } else if (command.equals("list")) { System.out.println("Here are the tasks in your list:"); @@ -38,6 +76,8 @@ public static void main(String[] args) { } else if (command.equals("") == false) { list[listIndex++] = new Task(command); + + System.out.println("added: " + command); } command = scanner.nextLine(); diff --git a/src/main/java/Event.java b/src/main/java/Event.java new file mode 100644 index 0000000000..6874b47c39 --- /dev/null +++ b/src/main/java/Event.java @@ -0,0 +1,14 @@ +public class Event extends Task { + + protected String at; + + public Event(String description, String at) { + super(description); + this.at = at; + } + + @Override + public String toString() { + return "[E]" + super.toString() + " (at: " + at + ")"; + } +} diff --git a/src/main/java/Task.java b/src/main/java/Task.java index ef689e17cb..0413c7f792 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -17,5 +17,9 @@ public String toString () { return "[" + getStatusIcon() + "]" + " " + this.description; } + public void markAsDone () { + this.isDone = true; + } + //... } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java new file mode 100644 index 0000000000..ff3e58dfcd --- /dev/null +++ b/src/main/java/Todo.java @@ -0,0 +1,11 @@ +public class Todo extends Task { + + public Todo (String description) { + super(description); + } + + @Override + public String toString() { + return "[T]" + super.toString(); + } +} diff --git a/src/out/production/main/Deadline.class b/src/out/production/main/Deadline.class new file mode 100644 index 0000000000000000000000000000000000000000..4109447db755102dd1bc7f6bb3ad87f887c8c9fa GIT binary patch literal 979 zcmaJ<-EI;=7(D|m%g?q{Y_0XDqEZXA+DjWTUP#kuf*J$Ci^hv#cT%QoXUOi*gg5aq zG|@Eag%99E8NXS!5wpaLo&A2#cg}qC>-W`90MGHXh#WQwSjH`DZB{6H*TFpp_Zc#S zDMO`m#xM9mz}4wN*Mw4?wit3RrIO|q!)`sDPDdJjhNZUl1w*+bm3TinABeEW2LVMY z9qsX;&qHbbB)DXTGGZupjs*7uYN4SeUqoIg$3|+!kT-fphhe?mNYA9^uAYRRIF@$G z$~Dk4E5}6v+b$gBUEDy0VePfnCNd!(zY}Jt{ivM7gFLD(9^w%VyY40(Jsyo1HWmnP z^ow|m8iRXs^qE!bgXxPZYcOn{^O0z4<#F>#nju+{;mVM{!v!d5DGSs&*s;_Iy!LlJ zQeEhgNVYVacg#Jb!>NNkT3Scz(PT{Y-YO-+cEF=Z5Q#7IBod6-Exh5%4@6X(HMY{s z<|6+z_NHU8p!{U6{=?u*c&0V4ErDqBAm~aXS`PLZc2fElabwv2e;r-cGCgpBHfZ-w zR)*{XigcF9`$&G4{-x&LC0KL+2QuH{BA3q9IF%y^hZ^!&p;&cRPPsC9)QC08u-LK# zEIhrf1pYAg38{IBZ1X!ZSHuHfsX7BYAs2VLF|r%ms|j)zH{+^x)ah^OK0y<^*urh{ K?Zhqm?)(8(Qtx>H literal 0 HcmV?d00001 diff --git a/src/out/production/main/Event.class b/src/out/production/main/Event.class new file mode 100644 index 0000000000000000000000000000000000000000..140282fcc5984bc0eaa3e0534ff51594d8d98a29 GIT binary patch literal 970 zcmaJ<-EI;=7(D}pg=H-jTWkHPsMG?j_R>a-7m_xbppAjxMdQV=Ov;q)4A~t>`X)Yx zCYmO_@Bw@%<2TDDVwQNZv)}Le&Y5q1{l5MQ;02z!$YZ039Bx}{vqI5(4(>a6z>wjF zq0%|$Gky?ob#~A-p;TurhWsn3q0D~5v6b1n?)^+tLigWJ{9&=<$jj&Ng? z=T?Y^BDOs^D0sMu3d7nPtxaS?K6x+9NDrfO9uEtsdU%A#47s?K==XRuX4qJwx6ya; z1T_Zl^yo9I*136EWetYS3qBTYt$c1iNi!lVGF%ywb+`m2EnSW0fH@U4b?Ce<1TMF7oJHjZ=AoaHyex8x*U~%PChTj~cN?85Uc1fQ6@r zmB1gyJ|Q))kZpcP=9+lmD^+J;C*jynA<-KS_`7hAYPzMZ&5 G-`zirOYA8C literal 0 HcmV?d00001 diff --git a/src/out/production/main/Task.class b/src/out/production/main/Task.class new file mode 100644 index 0000000000000000000000000000000000000000..61e0cad20dc3629e3cd97e463e9b5b7f48fea8a2 GIT binary patch literal 1195 zcmaJ=T~E|N6g{)uZM&tgvhty#2nxCs1;4?pF~K!Nl0_btU?TBh=uV()X*caG3BSV^ zOnmoM6VZeRe}F&3A7Z@IHnL4!7rzbz!NA^=^TG=} z`I2F@(uQ+$^ z>TGNqJNv?w=R&D23yXNbP}pW4rWnKc0dI*~7`R-%^W+}wV#xzZ!&vS!+1?@anTvsk zO4d_`nKM0Ja2U2k_BYddtK5}gbYx&jO+E};oi>BL76c-y`8F}!Ey=4?N?)wc-imHKShS{F}`e|dBycmaRdJjc< z4msr2C7@ki-GgLhbT>+%A4%Q@A#${qoS$IM{0VZ7b^`4ig>o1sTc$)nCu6Q&P7pBVVPJsWaz0v`;Y0`7bDx3tuUuCFFW?Y$t?v3e5<|31c8< zuNb&O2Uq`dE>m5_Ipq9+PQ1BO!a-4{dQ-~bF3O>dlHnRAC|9-pBxBK?{JCzeq^nUB ksGjOF6{Tkk8m=dGZcsj`Uxr6`hR39ChJ2I!S^Dn$118r6d;kCd literal 0 HcmV?d00001 diff --git a/src/out/production/main/Todo.class b/src/out/production/main/Todo.class new file mode 100644 index 0000000000000000000000000000000000000000..70940db39c0f82087de3c0215b4deee6326a5478 GIT binary patch literal 853 zcmaJ<%Wl&^6g`uscIq0EhCV2dLTOr(BGC;J3!^TGRDl#=k*Hl%EGG7-nZ})oJd;ZO z6Fvi0mAc>q_$b63+Y&*Eu;e@U+&TB$hvwJsyPp8wq7z^l51d(VQsAMFZ6A*qymwMb zd(5!W?p^Y0ew1=`an!e&R2Na_l%d+yiD0Prq!OQ}S3{8v_%NkNv!`R8p7KmOTn4Ll zBn_$d20GCZ!)hW-oXLrmTDg?D5)3t~i*gL>?am@b(AU!}7AMk`U2)2}kX#E{ds%t$KEp2 z=3CSo!_NPC*hQ6|q5CSJUBD+>BXmr-LZ^55>K5!re!oIC$fGW2nS5ZgU||&@A>!j6 z?vn;RQZ!1fH#w% Date: Tue, 27 Aug 2019 22:29:23 +0800 Subject: [PATCH 11/38] Level-5 --- src/main/java/Bot.java | 90 +++++++++++++++++++ src/main/java/Duke.java | 92 ++++++++------------ src/main/java/DukeException.java | 6 ++ src/out/production/main/Bot$1.class | Bin 0 -> 659 bytes src/out/production/main/Bot$TaskType.class | Bin 0 -> 999 bytes src/out/production/main/Bot.class | Bin 0 -> 3312 bytes src/out/production/main/DukeException.class | Bin 0 -> 331 bytes 7 files changed, 131 insertions(+), 57 deletions(-) create mode 100644 src/main/java/Bot.java create mode 100644 src/main/java/DukeException.java create mode 100644 src/out/production/main/Bot$1.class create mode 100644 src/out/production/main/Bot$TaskType.class create mode 100644 src/out/production/main/Bot.class create mode 100644 src/out/production/main/DukeException.class diff --git a/src/main/java/Bot.java b/src/main/java/Bot.java new file mode 100644 index 0000000000..bb6cc9a774 --- /dev/null +++ b/src/main/java/Bot.java @@ -0,0 +1,90 @@ +public class Bot { + + enum TaskType { + TODO, DEADLINE, EVENT; + } + + Task[] list = new Task[100]; + int listIndex = 0; + + public void greeting () { + System.out.println("Hello! I'm Duke\nWhat can I do for you?"); + } + + public void bye() { + System.out.println("Bye. Hope to see you again soon!"); + } + + public void add (String command, TaskType taskType) throws DukeException { + + DukeException emptyDescription = new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); + + String[] words = command.split(" ",2); + + if (words.length == 1) throw emptyDescription; + + String description; + + switch (taskType) { + case TODO: + description = words[1]; + + if (description.isBlank()) throw emptyDescription; + + list[listIndex++] = new Todo(description); + break; + case DEADLINE: + String[] split = words[1].split(" /by ", 2); + + if (split.length == 1) throw emptyDescription; + + description = split[0]; + String by = split[1]; + + if (description.isBlank() || by.isBlank()) throw emptyDescription; + + list[listIndex++] = new Deadline(description, by); + break; + case EVENT: + split = words[1].split(" /at ", 2); + + if (split.length == 1) throw emptyDescription; + + description = split[0]; + String at = split[1]; + + if (description.isBlank() || at.isBlank()) throw emptyDescription; + + list[listIndex++] = new Event(description, at); + break; + } + + System.out.println("Got it. I've added this task:"); + + System.out.println(list[listIndex-1]); + + System.out.printf("Now you have %d tasks in the list.\n", listIndex); + } + + public void done (String command) { + + String[] words = command.split(" ", 2); + + System.out.println("Nice! I've marked this task as done:"); + + int index = Integer.valueOf(words[1]) - 1; + + list[index].markAsDone(); + + System.out.println(list[index]); + + } + + public void list() { + System.out.println("Here are the tasks in your list:"); + + for (int i = 0; i < listIndex; i++) { + System.out.println(i+1 + "." + list[i]); + } + } +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 3274c0e327..54e573db2a 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -3,87 +3,65 @@ import java.util.Scanner; public class Duke { - public static void main(String[] args) { + public static void main(String[] args) throws DukeException { + + Bot bot = new Bot(); + + bot.greeting(); - System.out.println("Hello! I'm Duke\nWhat can I do for you?"); Scanner scanner = new Scanner(System.in); String command = scanner.nextLine(); - Task[] list = new Task[100]; - int listIndex = 0; + while (command.equals("bye") == false) { String[] words = command.split(" ",2); - if (words[0].equals("done") && words.length == 2) { - - System.out.println("Nice! I've marked this task as done:"); - - int index = Integer.valueOf(words[1]) - 1; - - list[index].markAsDone(); - - System.out.println(list[index]); - - } else if (words[0].equals("todo") && words.length == 2) { - - System.out.println("Got it. I've added this task:"); - - String description = words[1]; - - list[listIndex++] = new Todo(description); - - System.out.printf("Now you have %d tasks in the list.\n", listIndex); + if (words[0].equals("todo")) { - } else if (words[0].equals("deadline") && words.length == 2) { + try { + bot.add(command, Bot.TaskType.TODO); + } catch (DukeException e) { + System.out.println(e.getMessage()); + } - System.out.println("Got it. I've added this task:"); - String[] split = words[1].split(" /by ", 2); - String description = split[0]; + } else if (words[0].equals("deadline")) { + try { + bot.add(command, Bot.TaskType.DEADLINE); + } catch (DukeException e) { + System.out.println(e.getMessage()); + } + } else if (words[0].equals("event")) { + try { + bot.add(command, Bot.TaskType.EVENT); + } catch (DukeException e) { + System.out.println(e.getMessage()); + } + } else if (words[0].equals("done")) { - String by = split[1]; - - list[listIndex++] = new Deadline(description, by); - - System.out.printf("Now you have %d tasks in the list.\n", listIndex); - - } else if (words[0].equals("event") && words.length == 2) { - - System.out.println("Got it. I've added this task:"); - - String[] split = words[1].split(" /at ", 2); - - String description = split[0]; - - String at = split[1]; - - list[listIndex++] = new Event(description, at); - - System.out.printf("Now you have %d tasks in the list.\n", listIndex); + bot.done(command); } else if (command.equals("list")) { + bot.list(); - System.out.println("Here are the tasks in your list:"); - - for (int i = 0; i < listIndex; i++) { - System.out.println(i+1 + "." + list[i]); - } - - } else if (command.equals("") == false) { - list[listIndex++] = new Task(command); + } else { + try { + throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); + } catch (DukeException e) { + System.out.println(e.getMessage()); + } - System.out.println("added: " + command); - } + } command = scanner.nextLine(); } - System.out.println("Bye. Hope to see you again soon!"); + bot.bye(); } } diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java new file mode 100644 index 0000000000..09da9a6ad9 --- /dev/null +++ b/src/main/java/DukeException.java @@ -0,0 +1,6 @@ +public class DukeException extends Exception { + + public DukeException (String message) { + super(message); + } +} diff --git a/src/out/production/main/Bot$1.class b/src/out/production/main/Bot$1.class new file mode 100644 index 0000000000000000000000000000000000000000..422a74d1bd591baf807843437e966818e2695244 GIT binary patch literal 659 zcmZ8e!EVz)5Ph3CwiDdeO&c0YfkM+Zp)D0ihyw@#jVq!i&LLJf^t5qSjoZar*-jBZ zz^`xyB!m#^2k=pdS*s#|8gKab&v~ZtcRjce#>*`E5MHWAa5T zP+>DKzXq4$0-eSDm~Sj%^!^wasOE$vDh5I|ve)xW4eR8qB(}-Jwdt`M8ZYX<0mtuw ADgXcg literal 0 HcmV?d00001 diff --git a/src/out/production/main/Bot$TaskType.class b/src/out/production/main/Bot$TaskType.class new file mode 100644 index 0000000000000000000000000000000000000000..89dc3c632c593fd3c63bfa764d0a2f64107be37d GIT binary patch literal 999 zcmZuvU2hUm5Iq+bcG+&BrHK7fYefaBg=%XxkcPIbkz@l8APF%(EV$yo>_ZBU*F3BC{&Y77rXYQ}x-+ltv#j^+`Y^ZpEhcc2fHdREC<40aWOr>C+ zBeoPQaQjF>g4@S3wi%>Gtz2VJ8s^}A9%T3}&zhgR0)3bT{xQ67KJt`Hyn$Hj}+OF;I zF(m&}zLIH@F#bE6SV!u1*ERj2N0owU9#D!MXPmq?QCfG0z2Y>lJyJ`p_lI7`dT#Tn z6q0h2PeXsJ*1&(!ANVqMG+g6*OKNz6U0T4T;2Ku&RKpr>YltDPVSyhB#A!1Zy71=2 zj}mDq9jEV7vqU;GL9f<6vN}Ey+L;_!Y`HK2`zP>p?LsL}FD6RQO)4#M9spUQA}p~1 z=9c*s9DxX~V-XBXG literal 0 HcmV?d00001 diff --git a/src/out/production/main/Bot.class b/src/out/production/main/Bot.class new file mode 100644 index 0000000000000000000000000000000000000000..8ffeaf57b50b44ce99412f28add4a09768d9bc87 GIT binary patch literal 3312 zcmaJ^TTmO<8UBv6(ynCLV6d@ez+Gan1u@W&#%_T+4q%K@E_OxjV)x=jI>1`euBu%y zN-s&;v}uw$z2#!3mvr)ynZ7lXKM!kW0BK-J$8sEp)O1Bb*#@rb$j4DYQ9U~bT=h^= z!?)rHp=`iwp;tF_tm~)jPI%+$%e?}mj>b*q$aW}_pP1Cj`XIG1hvOI4s7AR?%cC%LDl2x|Vb4{rE zE4C*PnI3a}VjIh4DSg{nCfZ_!o5EHuCvYq^ecf8K1`C$6JecvzR2We^y6?L=qAc&p zNiSQrOTO(o%G?86XvZrRY_e&++GsVj$Y6vl#Ww2}i|O!`7$m9+QUZN=IDwPs*YTYMzKib(9G{Yf zg4<=LPZUk%b^P**<(pZ{G1F$wHJ9A7S#eh%*YR`$&)`V`bF3l<%qh1dP2V*=Db>1Z zEnBu@damnqk>w8h0;m3Q>yPH#+=Wb6SC=`zBF(xSneLKl5s9{F)Ny@tQJO(W2bAkH zD9i*#@N5F##}5*C4nIubM|fUQ;wA>f99*oJ+rmECCW$J@E(|y1qAdI9+X?ouZ28 z%OWA%RYDxBHiqpEUSON~)R$I~W!xGN-zjFFl$26|?Urg#wCUc4ZFZm;@{0|xs_6-Dg7p)} zYj~Z}5CcNsP|?cEao5RO{$<-=;mq?b$LDF%o=R7b?0W3l;i==6Dx6=jV7FsoJ8N!U z*3Q=|Yj*1-J2t9UO#}7a zgBrXEY7paAp^&kCIilmY0zD59YUG>1(f_Z9F218X_?8Uu;@Qa&>iFasg-|Ce$ItTV z95n>*t$mviea*SM2)&1JU-&&}f1o&oM>y_7m?IA^=-3MbLwrh9x8YHIE?9eP3-WXg zGWHH4Ezu3=+d%654eTLAq7Eds1#+q}h|vI~i6G4lK~CfIG(&QsO_Gh#@zDBF+R$($$(_x& z)td_NNl7xEyay~uLdy+p;D}mi*Y2WYAOFio=Xf2hQRsCSl?N9)gWy{6_1+I!@qO^x}CI-c1(W zn=H3GOzd5v{F$l#D;~q&a0(wWPyfQO*n=~o6=y{^#>5E5gPcCa0-5CJ;}@1#OmBhsmcaM`{ ztLVi9ku_QXzc3P?qC-ba$K?yd1b{IN(DAbXvDh2aNjs*WVI_oqE z(Lj?pO7$L&Ao4#7G_Q(IqoXliX*|hM_3F!XQ{#Q8R>U(ZWuIX#PijN&!`wiZmOG=8 z+R1!AR7}8NG#0O4_w+%CGjJJLm?u`kWAN-~0P^ZM8AW;6Dof zp+E~i`;YT}5(|M#Z7NT!uW1@po!MV=PUR_v&?ijd$2{*eGEoQCEZL}2E<}(NOA!ol em~;M`4N7{@d-gDHf1aGFaGIPS|dGsva#55N=o5rS8Itwonf_qy$ zNy0EvT0Ye4r7R!CGG}HS6{*M*Q7VgnN!P4YWz~!NMc%!q^3|w9hXj8ut4d^zZ*LDF zh>N;R<-KZ>Tjpyk@54oxFlbE(C;w4@%P@h%KeR=B*vH*tG-ux7+q=B_0B!i?z~>$` atkreVV|@0b!U0cgc{oJB$r> Date: Tue, 27 Aug 2019 23:13:44 +0800 Subject: [PATCH 12/38] Level-6 --- src/main/java/Bot.java | 53 +++++++++++++++------ src/main/java/Duke.java | 41 +++++++++------- src/out/production/main/Bot$1.class | Bin 659 -> 659 bytes src/out/production/main/Bot$TaskType.class | Bin 999 -> 999 bytes src/out/production/main/Bot.class | Bin 3312 -> 3871 bytes 5 files changed, 63 insertions(+), 31 deletions(-) diff --git a/src/main/java/Bot.java b/src/main/java/Bot.java index bb6cc9a774..00154fc5f8 100644 --- a/src/main/java/Bot.java +++ b/src/main/java/Bot.java @@ -1,11 +1,14 @@ +import java.util.ArrayList; + public class Bot { + DukeException emptyDescription = new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); + enum TaskType { TODO, DEADLINE, EVENT; } - Task[] list = new Task[100]; - int listIndex = 0; + ArrayList list = new ArrayList<>(); public void greeting () { System.out.println("Hello! I'm Duke\nWhat can I do for you?"); @@ -17,8 +20,6 @@ public void bye() { public void add (String command, TaskType taskType) throws DukeException { - DukeException emptyDescription = new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); - String[] words = command.split(" ",2); if (words.length == 1) throw emptyDescription; @@ -31,7 +32,7 @@ public void add (String command, TaskType taskType) throws DukeException { if (description.isBlank()) throw emptyDescription; - list[listIndex++] = new Todo(description); + list.add(new Todo(description)); break; case DEADLINE: String[] split = words[1].split(" /by ", 2); @@ -43,7 +44,7 @@ public void add (String command, TaskType taskType) throws DukeException { if (description.isBlank() || by.isBlank()) throw emptyDescription; - list[listIndex++] = new Deadline(description, by); + list.add(new Deadline(description, by)); break; case EVENT: split = words[1].split(" /at ", 2); @@ -55,36 +56,60 @@ public void add (String command, TaskType taskType) throws DukeException { if (description.isBlank() || at.isBlank()) throw emptyDescription; - list[listIndex++] = new Event(description, at); + list.add(new Event(description, at)); break; } System.out.println("Got it. I've added this task:"); - System.out.println(list[listIndex-1]); + System.out.println(list.get(list.size() - 1)); - System.out.printf("Now you have %d tasks in the list.\n", listIndex); + System.out.printf("Now you have %d tasks in the list.\n", list.size()); } - public void done (String command) { + public void done (String command) throws DukeException { String[] words = command.split(" ", 2); + if (words.length == 1) throw emptyDescription; + + if (words[1].isBlank()) throw emptyDescription; + System.out.println("Nice! I've marked this task as done:"); int index = Integer.valueOf(words[1]) - 1; - list[index].markAsDone(); + list.get(index).markAsDone(); - System.out.println(list[index]); + System.out.println(list.get(index)); } public void list() { System.out.println("Here are the tasks in your list:"); - for (int i = 0; i < listIndex; i++) { - System.out.println(i+1 + "." + list[i]); + for (int i = 0; i < list.size(); i++) { + System.out.println(i+1 + "." + list.get(i)); } } + + public void delete (String command) throws DukeException { + + String[] words = command.split(" ", 2); + + if (words.length == 1) throw emptyDescription; + + if (words[1].isBlank()) throw emptyDescription; + + System.out.println("Noted. I've removed this task:"); + + int index = Integer.valueOf(words[1]) - 1; + + Task task = list.remove(index); + + System.out.println(task); + + System.out.printf("Now you have %d tasks in the list.\n", list.size()); + + } } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 54e573db2a..687b7bacb8 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -12,56 +12,63 @@ public static void main(String[] args) throws DukeException { Scanner scanner = new Scanner(System.in); - String command = scanner.nextLine(); + while (true) { + String command = scanner.nextLine(); - while (command.equals("bye") == false) { + String[] words = command.split(" ", 2); - String[] words = command.split(" ",2); - - if (words[0].equals("todo")) { + switch (words[0]) { + case "todo": try { bot.add(command, Bot.TaskType.TODO); } catch (DukeException e) { System.out.println(e.getMessage()); } - - - } else if (words[0].equals("deadline")) { + continue; + case "deadline": try { bot.add(command, Bot.TaskType.DEADLINE); } catch (DukeException e) { System.out.println(e.getMessage()); } - } else if (words[0].equals("event")) { + continue; + case "event": try { bot.add(command, Bot.TaskType.EVENT); } catch (DukeException e) { System.out.println(e.getMessage()); } - } else if (words[0].equals("done")) { - + continue; + case "done": bot.done(command); + continue; + case "delete": + bot.delete(command); + continue; + } - } else if (command.equals("list")) { + switch (command) { + case "list": bot.list(); - - } else { + break; + case "bye": + bot.bye(); + return; + default: try { throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); } catch (DukeException e) { System.out.println(e.getMessage()); } - + break; } - command = scanner.nextLine(); } - bot.bye(); } } diff --git a/src/out/production/main/Bot$1.class b/src/out/production/main/Bot$1.class index 422a74d1bd591baf807843437e966818e2695244..3feb0de41dc6f5b495c9580af28dca397cf6feae 100644 GIT binary patch delta 13 UcmbQtI+=BYJrkqsWCx~T02*@xXaE2J delta 13 UcmbQtI+=BYJrkqMWCx~T02*!sX8-^I diff --git a/src/out/production/main/Bot$TaskType.class b/src/out/production/main/Bot$TaskType.class index 89dc3c632c593fd3c63bfa764d0a2f64107be37d..3c8153be096d5be308dc9c9dfc8af5dab572d307 100644 GIT binary patch delta 35 ocmaFP{+xZo2_{DN$tRigf#gpnJ0NMn+`!7gpw7TPc`vgT0M1$o&Hw-a delta 35 ocmaFP{+xZo2_{D7$tRigf#gpnJ0NMn+`!7hpw7TNc`vgT0L>-|x&QzG diff --git a/src/out/production/main/Bot.class b/src/out/production/main/Bot.class index 8ffeaf57b50b44ce99412f28add4a09768d9bc87..48d177d66883f983f2a79128fcafe8b60a53a8c1 100644 GIT binary patch literal 3871 zcma)9TYKDA6xom zP0S@R2B#j~IG;o>=4F~SkV~QoXXT)4!ZVOhVlyt7@C^h>w8$`&)dhJi3fz*3iv|iw zJc7^2{Ie!5$>ekL`n-WJB(V!$H1VY-lKqN_$K~V`2EJ(q)PRhPrTM@dk&0>!~TQZTX(>5o$#QBnvOlEh&}k@6TjxHuTVEOOE>jtE)7m5S6XdfF<8Gd=wwjnJXh_&xH_~1%XS;N5hGk(l ztaeGXCC|^0{rZW}PR}2=^HER+jvDxehGbc9ZqYNI%WyVT2}G#ZI&MZ?)S!*tceatA3^_eaQTRn9fs`}Zrqx5md$ zOtiJNS(9_hs*ua_&RMnT|p z8g>nTr2QAw~dNeDGcGs6uyh^rSN?`mBJ5jh2l(-a0-X>GwCsSw zxQf27;%6zmfTtufx=G>Zl1FP;`DDsRT$cS)B|jq2NB;w!7Y3nk=Z~v!&dUT1b+~5Y z#T0&lmo(fy=7lN~hwQ7Iw^&Jlj(>^g*lMgM>LhJ-C$E^w_F5HTssC1+3PGrHgzy#! z5nn2f*L#AU8gjp~b8PNX^{h6t)$+0_%Ui0WN^^|tsoJSq+9#HrFg?efYhO(?G0he- z*q4rLXUV8zkIbE5fZ1Uqaen6i+OU+dezEVa!eH%15#4fu^N3tevq}Q)7}-;?Ee3oK zH|+Mtm2w$zLp7^>Qe3pN3u^qFhRv(d;vI6)MoMwVfhsgBWx5qniPLJqiBm1gO8zSz zO=jkl@Z!ZIb$cWjVx=bWEBu~;Y<9v4Rlk8(HSAmyP&IDs)c45UA-$j57@f%i#CXp@7$4M}1SWh;=JK@dPR9s)MAefHV=LxhlwE9HASAnYhf4Ba`I1_BO4rEn>r1_nZ1vn4Pbp_O0t^=qh4k z&r2lqmnZ^>5d10w4)M9%t?%#CTl69tpN^04ocRWtPPgdGXfEPIQ`hh;cQtJi?7rHT z+7u$AvERIr6gx3ZkJQ`I&c z!wyWL9cTC{s?dQ8=)@BC;u1f9pXAr?3)qJjS%k0f#9J)AKe6!M=E=V?TmPiC|Hcum z5rf)Z{_&Pd%Cn*bcL0N|uq767X{0zG!co@TC88hWtd5w6W82&Gd_Qdl@q6ME%ye8z zG8*P8>yV=ne4G_wYVG(0@oF$iuNRPd7tIEaTkoRLz}P!z{tv&-X}F1PFbs6jXrPyd zXdrJu{}(n@Y%|wxBZBO^$uEDsa+NN}`AFYMdz`?@QjwCrG#2ncT%^alR?4VL-(Qhs zN!kvkl-AeKUc^p4b5OF!gtq<>yNcKyCtD0m@=7Z2kT#$oCWUBb_-*94haB#~0~BeJ zTuw!)=qxe0B_dZ#BFZ_DF2NJ6v`)k#)+138as8^`?kczOV+53z-!I%d$i3#kwz%M) z$95XG=?}}CmD>6`DS=xa)wF9j|GGkcGb;c%P4d&&ga=s*)2xxR5#h~5PhvMin27G2 z{V{dPa6~Sty~8rq@X4~?|6myjp!z_1cUISXFZJ%z$zR&>19j6b@{yk6|BXz+Ii_Ha z@t&ukSyr!0f%9DPqp0pK5iF-cmDBK0ISu>bGz_pCPq82MsH&?bM8~J-Izb7~@VAbm nZnkL;$G0($-TcKyla?;*JG>RY#dZ9SE&pYjO)B>&pU3_OS;uro delta 1847 zcmZ`)U2GIp6#nka?B1E_K+Cq4Znv$4cA?$=$ttaEORW?Oiv_`=xS+_wE~QYn$Rf7* zvqe!<1jG>){Hei25}%YnOG=8*n)u=qzL4mPiHU|sL%{mo-K7wOP3GJ?=ic+(bI$kO z*|Dmt{>)GRPF@1ghA|rzSSzv4LJ&_X(`R8lo-*;YjSYClL`-6%iA^>vJZs`P8!NEc z!U8;RqYhitYg}ThjX7$0n?%A!36dtZOZ3~AtEM{?)PRYd61!{+;)QL>kuou)-gYbV zq74muOr(8G>t%^yi4g%Ono1@2bPvYU>10}Bzks7WOq`)7#v9N6_A^Hm9JgE zQjTaUksKBfQFpDle*E{K+pCos9TKm&JG3@2;7)0E70qa2xQcQRLW6@wG)cVb;5EGN zZq^&T83&_SC3<-FuTegl=Gr{G_ zcw%rMm2}XIcig}Aus(`+-6o^G;5`S2@xFs2IO?X2`dNo@%)ti==r~&3?~EnZhbCMH zAK`>s=K0IjWr@4UTj~yaf7L(6C+?$7cY<4b{{J7!k7C(MRSkW_mZ+Ll3s>?v={JmU#N%gV(Mc5(I>#=>&cWDd zY+AeBX89;U_mtf|98O~LR<^;<66fb_Zlw)=m%P`0xJ8)QMEzw zr)QP09e&PBV51bpC}V#r(1j}Wpc-p29|Nf2^$ubfnT0rjdK{wqj!=1H)Z8S=og&PS zr27{v#$~kP3c0$9h$uj(C`Om4#WK;3?kunSDUu$3dzK&q50P5)vtg>X9UY|h2uWVb zRY}ZcdEXVPyc3ZO<#Cw@<$|ezyvEe*5r&Xq&bsg@6={nw!@F5yv8cy#LK{2+{6IK2 zP$6MS^weBOp~Q-72;5-(bW9@vQzA&GL|txEcHTn^WW+zHylpEn?y{9Y+$*M04$mDM zc)n7e!AvbaQLLg>SN16LG&qLyN?xs4yPtG68sQ759>+W*(HY86pq1owex77CFTZsW z%h^5fY?Hu6c$_q@CT&lUopssXhjK^UY#M#JrkUhZHArJbDdU=$jG*u4_hgiD>WVjI zR8}?2O793LEuBUsJpp5jQd}TBiCTcG2ZcB@{o5^pm6B=jFNyz1@bPbB0mnwfvN@G1 zswlEvo~kZrQ$9OIl?ClOdAx>sOkgz~OEs)vJ?eX>5v2|bIWK3n3pk?4q$h~_t}>j& R=Qu@K@1@%$?n`|3{Rh3+BKQCR From a504967a6c0e0e535eea9164d13f19fcb434b17d Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Wed, 28 Aug 2019 19:23:17 +0800 Subject: [PATCH 13/38] Level-7 --- src/main/java/Bot.java | 58 +++++++++++++++++- src/main/java/Deadline.java | 5 ++ src/main/java/Duke.java | 24 ++++++-- src/main/java/Event.java | 6 ++ src/main/java/FileWriterClass.java | 23 +++++++ src/main/java/Task.java | 4 +- src/main/java/Todo.java | 5 ++ src/out/production/main/Bot$1.class | Bin 659 -> 659 bytes src/out/production/main/Bot$TaskType.class | Bin 999 -> 999 bytes src/out/production/main/Bot.class | Bin 3871 -> 5496 bytes src/out/production/main/Deadline.class | Bin 979 -> 1426 bytes src/out/production/main/Event.class | Bin 970 -> 1417 bytes src/out/production/main/FileWriterClass.class | Bin 0 -> 1004 bytes src/out/production/main/Task.class | Bin 1195 -> 1216 bytes src/out/production/main/Todo.class | Bin 853 -> 1288 bytes 15 files changed, 118 insertions(+), 7 deletions(-) create mode 100644 src/main/java/FileWriterClass.java create mode 100644 src/out/production/main/FileWriterClass.class diff --git a/src/main/java/Bot.java b/src/main/java/Bot.java index 00154fc5f8..bb8d574338 100644 --- a/src/main/java/Bot.java +++ b/src/main/java/Bot.java @@ -1,4 +1,8 @@ -import java.util.ArrayList; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.lang.reflect.Array; +import java.util.*; public class Bot { @@ -18,7 +22,7 @@ public void bye() { System.out.println("Bye. Hope to see you again soon!"); } - public void add (String command, TaskType taskType) throws DukeException { + public Task add (String command, TaskType taskType) throws DukeException { String[] words = command.split(" ",2); @@ -65,6 +69,8 @@ public void add (String command, TaskType taskType) throws DukeException { System.out.println(list.get(list.size() - 1)); System.out.printf("Now you have %d tasks in the list.\n", list.size()); + + return list.get(list.size() - 1); } public void done (String command) throws DukeException { @@ -112,4 +118,52 @@ public void delete (String command) throws DukeException { System.out.printf("Now you have %d tasks in the list.\n", list.size()); } + + public void retrieve () throws FileNotFoundException { + File f = new File(FileWriterClass.DUKE_TXT_PATH); // create a File for the given file path + Scanner s = new Scanner(f); // create a Scanner using the File as the source + while (s.hasNext()) { + String text = s.nextLine(); + + System.out.println(text); + + String[] split = text.split(" \\| "); + + System.out.println(Arrays.toString(split)); + + String description = split[2]; + + Task t = null; + + switch (split[0]) { + case "T": + t = new Todo(description); + break; + case "D": + t = new Deadline(description, split[3]); + break; + case "E": + t = new Event(description, split[3]); + break; + } + + boolean isDone = split[1].equals("1"); + + if (t != null) { + t.isDone = isDone; + list.add(t); + } + } + } + + public void save () throws IOException { + + String s = ""; + + for (Task t : list) { + s += t.saveFormat() + System.lineSeparator(); + } + + FileWriterClass.writeToFile(FileWriterClass.DUKE_TXT_PATH, s); + } } diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index a1a150db94..46ab3be5b6 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -12,4 +12,9 @@ public String toString() { return "[D]" + super.toString() + " (by: " + by + ")"; } + @Override + public String saveFormat() { + return String.format("D | %d | %s | %s", this.isDone ? 1 : 0, this.description, this.by); + } + } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 687b7bacb8..8b3a8b36c5 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,15 +1,25 @@ +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Scanner; public class Duke { - public static void main(String[] args) throws DukeException { + + public static void main(String[] args) throws DukeException, IOException { Bot bot = new Bot(); bot.greeting(); + try { + bot.retrieve(); + } catch (FileNotFoundException e) { + FileWriterClass.makeDirectory(FileWriterClass.DATA_FOLDER_PATH); + } + Scanner scanner = new Scanner(System.in); @@ -22,9 +32,11 @@ public static void main(String[] args) throws DukeException { switch (words[0]) { case "todo": + try { bot.add(command, Bot.TaskType.TODO); - } catch (DukeException e) { + bot.save(); + } catch (DukeException | IOException e) { System.out.println(e.getMessage()); } @@ -32,22 +44,26 @@ public static void main(String[] args) throws DukeException { case "deadline": try { bot.add(command, Bot.TaskType.DEADLINE); - } catch (DukeException e) { + bot.save(); + } catch (DukeException | IOException e) { System.out.println(e.getMessage()); } continue; case "event": try { bot.add(command, Bot.TaskType.EVENT); - } catch (DukeException e) { + bot.save(); + } catch (DukeException | IOException e) { System.out.println(e.getMessage()); } continue; case "done": bot.done(command); + bot.save(); continue; case "delete": bot.delete(command); + bot.save(); continue; } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 6874b47c39..7d9dc45f46 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -11,4 +11,10 @@ public Event(String description, String at) { public String toString() { return "[E]" + super.toString() + " (at: " + at + ")"; } + + @Override + public String saveFormat() { + return String.format("E | %d | %s | %s", this.isDone ? 1 : 0, this.description, this.at); + } + } diff --git a/src/main/java/FileWriterClass.java b/src/main/java/FileWriterClass.java new file mode 100644 index 0000000000..9d396bb420 --- /dev/null +++ b/src/main/java/FileWriterClass.java @@ -0,0 +1,23 @@ +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Scanner; + +public class FileWriterClass { + + public static String DATA_FOLDER_PATH = "../data"; + public static String DUKE_TXT_PATH = "../data/duke.txt"; + + public static void makeDirectory (String filePath) throws IOException { + File file = new File(filePath); + file.mkdirs(); + } + + public static void writeToFile(String filePath, String textToAdd) throws IOException { + FileWriter fw = new FileWriter(filePath); + fw.write(textToAdd); + fw.close(); + } + +} \ No newline at end of file diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 0413c7f792..7e4fc70eff 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,4 +1,4 @@ -public class Task { +public abstract class Task { protected String description; protected boolean isDone; @@ -21,5 +21,7 @@ public void markAsDone () { this.isDone = true; } + public abstract String saveFormat(); + //... } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index ff3e58dfcd..feb394c265 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -8,4 +8,9 @@ public Todo (String description) { public String toString() { return "[T]" + super.toString(); } + + @Override + public String saveFormat() { + return String.format("T | %d | %s", this.isDone ? 1 : 0, this.description); + } } diff --git a/src/out/production/main/Bot$1.class b/src/out/production/main/Bot$1.class index 3feb0de41dc6f5b495c9580af28dca397cf6feae..a3993b3261f1afce59ce6b9b3082c534e1964470 100644 GIT binary patch delta 13 UcmbQtI+=BYJrkqiWCx~T02+q_YybcN delta 13 UcmbQtI+=BYJrkqsWCx~T02*@xXaE2J diff --git a/src/out/production/main/Bot$TaskType.class b/src/out/production/main/Bot$TaskType.class index 3c8153be096d5be308dc9c9dfc8af5dab572d307..9e716180ebf1064a3cd8960c754c3b7755e73f48 100644 GIT binary patch delta 35 ocmaFP{+xZo2_{DF$tRigf#gpnJ0NMn+`!7ipw7TOc`vgT0MCvI;s5{u delta 35 ocmaFP{+xZo2_{DN$tRigf#gpnJ0NMn+`!7gpw7TPc`vgT0M1$o&Hw-a diff --git a/src/out/production/main/Bot.class b/src/out/production/main/Bot.class index 48d177d66883f983f2a79128fcafe8b60a53a8c1..e6cdcd0ae79e5cfda37dff9c1aa043efbe5da153 100644 GIT binary patch literal 5496 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 O;7-qRtaE&x|GB@TZF)!m delta 348 zcmXX>yH3ME5S+6epC3mO0s%ry97qB&0i~n>QSj)X0?|-evK0c6jbe-cz%Ka?8VU+Z zTD}EJ#NLVG_GWf8v%7`+#rvPXZ|?vOuZFB@U zEP+Kd80sf!nrHbue7ubFyEMvbCVUHBflX{NSZ8q<&8A7rU|fgU14DCoaUVW~<5`$Y z##i}#noJIZ8wWk~3oWuZ2GSao-&(*%rLVsldkllZ=#)SDs9mA001A^U5YhQ;R>Q$jrHR%XWiiHJYUDb0*s}TcS)Jb6q$t0OW_o$o~!#|ffrqYG-3x%uyejQ7s XYgopRemQ*`yVyYsYs6)4i{APlghwi9 diff --git a/src/out/production/main/Event.class b/src/out/production/main/Event.class index 140282fcc5984bc0eaa3e0534ff51594d8d98a29..c5fa96b579b5b91968287caafc7c2bb14772360b 100644 GIT binary patch literal 1417 zcmah}>rN9v6#k~SEz5E%Hx(~MLE3`golEgXX_cf%ObG^wKZbUIrDeC-oi-uyukWBw z;9pHN5E6X=A4)v4U8SUrChhDw-<iI=s5ZQ-o*?Fu2Wyj|p#4eprA_rZ|dGhGHPpREf^l455`xJAdTO4GI& zqS9{U!Z46XwhA)nF0YH6?Hs5Yx(bpP%d5QVv1^#oaGOF3cFie@oT;+VJ)vn;tAQTe zG0=r>1H-t$(7R;Y(v=Rct_rzlm)xER?nZIXz)G1&z9>oq z4>7A@&cHkt3=ApmG!_}co-Va#oxA082mch@ExnpoRm7)q=(Q}_|;8twQ4ns1Xwo3fi({M8K6t5gy0SmR*2wM9+Hxr6J6RnaE= zKehQ38D6OrOexYDatz}w^|i~5;p)HRFiP*aK_39RbLx(h6(qX{y|ng`_X+_*fX>w9 z5m;*K8vO9=$XruWFFpYwcTN*y7X z`ij5_<$=!>-B5^lCk>C;@a%4%nc?DJmiLr_Qb@(Zk?)9XDkkkCw9qGng2#v!HbaDT z6gI<3qHqjdDFnS58VY?)3MpUV62(j+a7tTDqwGT(Ml@WeA3LQj4-21Rj0mp~9>7&B W(Nm|Co?;o#DADWWN6EiI|FPeH)l7N- delta 369 zcmXX>Jxc>Y5Pf^=-QML^6Qf2iew`XWa*4HqU?JFPA=pbG0YUJBci386%Ki}rLm-9r z!C&BSu(uQ6UQ+DLo0&K7%|3@?)foScJ^&oyumlfF0bJB9TCTFYs<5W8{&M8C*J@7 diff --git a/src/out/production/main/FileWriterClass.class b/src/out/production/main/FileWriterClass.class new file mode 100644 index 0000000000000000000000000000000000000000..d7de3c89eb762d57ce82a1af35b8695d74f55943 GIT binary patch literal 1004 zcmZvbeNWR+6vm%BwskFKgAP#f4PSY6^&MY`$-*ESrVy#1CWe%)K%uOrD}o=(kYFN- zAHWY~d=9M+mHu(hx%ZxPe$PGk_Q%g}-vLbFiGd(#}o^IXBIZ@HgbJ8)YY_EH@At&OJ&J+(LU zv#ZWqCk@I^`z=3yrqDGywycny37eimsqVMDSGzlFUgWrI0avVg*l>eoH}YkkE@tCR zzpc<$pYsE6CGul0nhD%?TR1!Jwpa5buMvmQXN7^$|J4Yvu+G#)H{K*$T!ms1=!dpc zWhrBJzu|q1{jk;6@Iaw^Pe@KE+X^G66h0lL$KHPIgw85Qo!m&0O+1qA$C9U2Dt6P2S*Caar0;! zLD=?ig>R_H*O!4V3h3!Vq|JijQRdjsnN6!`bK_s3zR<~FfMfo6QNtj8GYP;MoaIc% zISesMlIPJy4=5cW^Nt0&>Jx{^u5`*282~ELsijCAQf@Fw!TD5G9v5(th)diPZI>B6 zO#KPs11m_4@)2@^$iJKzZ#m5Ri&}f*3AwGB@+>8;|QN@qeX&3*O>^YZ4;7+ a@gsp0yM;6coE`{0Zr4W~C1%N7W>tRCxE#{} delta 170 zcmWkmI}UVmMs4r{bAGFh4&8N`3I C;TXdJ diff --git a/src/out/production/main/Todo.class b/src/out/production/main/Todo.class index 70940db39c0f82087de3c0215b4deee6326a5478..c8da7caa64837bf62d8e5b439dd859137e1ca6af 100644 GIT binary patch literal 1288 zcmah}>rN9v6#k}Ny6v*a9mNZRTr5Sw3tq5@N)3^u$d5J{B>ouM0hTU1&F-`biSaq~ z3H+;x34}x+z=smgbXQwKquJf*oHOTq=ljmg^yjaW9{?U9XQ30<^f1y#jvGmgo0v$! z!lZ>M+|;wQg<(va$e5U6NGv*@qm~#3)A@Z~=W{OicIOJpcf8%~^ag{GlV!osop(I( zx^}QF{373W$4$C3V2QXjrblDih5JS(h zlqyg@udWHTC(A*10<%fX*|>wd#I!j2esr>|2NKZJB)Y!6FG|YBJ=`}jZ{q6w#P! zw<#@f(LPbbo#3VPNIQGW(Ay-x>M5}+dks0HYv@d8;(h|vQiGBZbDUuhOYH;q=qYoLRk9@k+bA;Fl6~Y&a4Dk}Q2BaETc4KZuSadG`B7C4~I&Qqr==hF~&3NV;5}#lipJBw0 zVHP$G@+1q#NNMPJgK7wUp#^$8g1$sCGl-oMS7wqV!^E(O%k;8ST59+@nm$H=SI8g3 ZRqBiG0mCAm<0<`-T_-z9_9%U0zX2&DEfD|! delta 283 zcmXYrO-=$q5QV><8G43x6a-}kK~enW0LJLj#Ep@i7a+mJ#6=4;hhR(k5S~C6l6U}C zZoH1MdSWH@^WLkMs)hN{gZ1y{7jVVMP^0b3PD_Y9rW>=jynb_`%5OArN`t1Nd24N1 zl=I2!_^Euh)1sm2CG=DFIZ#B8c4~c_6fcGWhwek&CoxA}KXuDsq|V(ccvly07Cy8i zx#uH5AvdHZ?mNsb>%tjf!Ee-LhE9bw8>E7e{Y|#Sq5NZ&vmf>Dyi*H;dgV&1+5Edg YwnYhOaU$J_Hsp+By6g&01a~B}KhgOgQUCw| From 0ec0fe439dcacbe1de5bded708ac0dd51396daaf Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Wed, 28 Aug 2019 21:29:09 +0800 Subject: [PATCH 14/38] Level-8 --- src/main/java/Bot.java | 15 ++++++++++--- src/main/java/DateClass.java | 21 ++++++++++++++++++ src/main/java/Deadline.java | 6 +++++ src/main/java/Event.java | 6 +++++ src/out/production/main/Bot$1.class | Bin 659 -> 659 bytes src/out/production/main/Bot.class | Bin 3871 -> 3899 bytes src/out/production/main/DateClass.class | Bin 0 -> 960 bytes src/out/production/main/Deadline.class | Bin 979 -> 1114 bytes src/out/production/main/Event.class | Bin 970 -> 1105 bytes .../main/META-INF/main.kotlin_module | Bin 0 -> 16 bytes 10 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 src/main/java/DateClass.java create mode 100644 src/out/production/main/DateClass.class create mode 100644 src/out/production/main/META-INF/main.kotlin_module diff --git a/src/main/java/Bot.java b/src/main/java/Bot.java index 00154fc5f8..ef92929948 100644 --- a/src/main/java/Bot.java +++ b/src/main/java/Bot.java @@ -24,6 +24,8 @@ public void add (String command, TaskType taskType) throws DukeException { if (words.length == 1) throw emptyDescription; + Task task = null; + String description; switch (taskType) { @@ -32,8 +34,10 @@ public void add (String command, TaskType taskType) throws DukeException { if (description.isBlank()) throw emptyDescription; - list.add(new Todo(description)); + task = new Todo(description); + break; + case DEADLINE: String[] split = words[1].split(" /by ", 2); @@ -44,8 +48,10 @@ public void add (String command, TaskType taskType) throws DukeException { if (description.isBlank() || by.isBlank()) throw emptyDescription; - list.add(new Deadline(description, by)); + task = new Deadline(description, by); + break; + case EVENT: split = words[1].split(" /at ", 2); @@ -56,10 +62,13 @@ public void add (String command, TaskType taskType) throws DukeException { if (description.isBlank() || at.isBlank()) throw emptyDescription; - list.add(new Event(description, at)); + task = new Event(description, at); + break; } + list.add(task); + System.out.println("Got it. I've added this task:"); System.out.println(list.get(list.size() - 1)); diff --git a/src/main/java/DateClass.java b/src/main/java/DateClass.java new file mode 100644 index 0000000000..65df163d16 --- /dev/null +++ b/src/main/java/DateClass.java @@ -0,0 +1,21 @@ +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +public class DateClass { + + public static Date stringToDate (String string) { + + SimpleDateFormat format = new SimpleDateFormat("d/MM/yyyy HHmm"); + + Date date = null; + + try { + date = format.parse(string); + } catch (ParseException e) { + System.out.println(e.getMessage()); + } + + return date; + } +} diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index a1a150db94..3da009ee5d 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,10 +1,16 @@ +import java.util.Date; + public class Deadline extends Task { protected String by; + protected Date date; + public Deadline(String description, String by) { super(description); this.by = by; + + this.date = DateClass.stringToDate(by); } @Override diff --git a/src/main/java/Event.java b/src/main/java/Event.java index 6874b47c39..10b35f07c2 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,10 +1,16 @@ +import java.util.Date; + public class Event extends Task { protected String at; + protected Date date; + public Event(String description, String at) { super(description); this.at = at; + + this.date = DateClass.stringToDate(at); } @Override diff --git a/src/out/production/main/Bot$1.class b/src/out/production/main/Bot$1.class index 3feb0de41dc6f5b495c9580af28dca397cf6feae..4dfded2e9f33c26c26b1638b304b5882c6598918 100644 GIT binary patch delta 13 UcmbQtI+=BYJrkq+WCx~T02+M*Y5)KL delta 13 UcmbQtI+=BYJrkqsWCx~T02*@xXaE2J diff --git a/src/out/production/main/Bot.class b/src/out/production/main/Bot.class index 48d177d66883f983f2a79128fcafe8b60a53a8c1..c4bcb19eb9f7736f27cbd007a4713f3dbf27ad30 100644 GIT binary patch delta 1045 zcmZ`&%T5yk6g|_K&P>M^q(EUHBKY7{N&^Np1)@|y#0uplpg~fgA(Xc*7-Z4JxNs-Q ztROM6GwMn(?Sd!^7Jh&WUAZx?U1|u5XG$Ytbdo#0xsP+tJ$L%FXsc+YsV;~K8$5_; z@M2O!5K{`KH8^oc#f*Yk4Y`<8F|XjRhJ4IvkP&^g_({l+Vxj1y06Eah-+H6lGGuI9 z7KI+;yg0!3W6|#sU@i8JEENk-o5P{8sfn4e9T%{giicv1TU!>xGch|ZV{P-Ns8|e9 z$uVkVmn*kC5D6`Yyi=i>ac}2HBs?0cuei0@BCm+?=j31mgmSmjVND>T!}C^Jhg$g> z)@{KjZ6LEMf#cOLz~>!Jpoz2snveFtBh~t>I$N_=(`{RD4(iqPaT@J7i$0WL0F@X;6=qS51>ScVHCVwp zJV71SS^bh~B+-C3?ApO4d_)tzpcP-yhHq#W90&+yxPf|Vb{}?D6~d1zuwo$&ciJ6g zxEU=x$uh^bGOeV54`Mqwg{zFI98#X{;Ndv5k)Wp6#w-s+?;43)pbEvfPCOAV!HEFJ zOXy%}9QHkAE9l(A83pmuJ!B~e?!xhdyED8`a;kzV1{HW2P*9rk=>!4kJ2L;MwEeS^ zIA-ZSceVaiKn7hjiCir-u^T-`)INWri>vkU0)5oJ9~Bs+wzs*`5X*-R!QpoGGAE{1 zu)%V$f&*QK-!beTVe=UOU}35`#^a2qq;_$F#`E1|qxtF9rqwc4NI_`AE=rl|Cx_3D thb5DQnI?x>a+oKFC^;-p?0Xb+iNMRoqYQWP0S`aFk3&(9FnXU6_ysw#v#tOD delta 971 zcmZ{i%TE(w6vfYU9^Wv~YFjCc1}u^IXbaUwFoH&CMG$L|halEqAYc>_DG+pHx^asd zX9Y3Qg+}8}YRZBrD_1OxJ6Fd4z=a!wD4v-T#Sj;F=F6RXfA`F}-*V-X%7@K$DcmSR z4Mq(_F=ilzaeAmGVM50(fk^`aWOPgkOdBwfc|H4CvW8u0k1{hjJtjd*_VC?k zy>;D@I<0#75}yy`xLSfH%v&GjGVg)}H5eV73G&@CJ2Eko`y~sP71hcuRSV@>wfk~* zjstZ-iiCY`H4jg!=AH5sdgu+*l|}4`_Z=_aT)tDf`iB) zgxd(?E_e5ct9y>ac!?Nt>{vlP-s2cn+4%*H_(q3*pjq-FA%$_88DJ8{4mXYj6q1g> zIb{h?u%rbl(P55Fa49*iv5;Hk=vL+g2h~3*iI3BEtc!bTx>EyxNMF^5 zl4#-&@JFd%%Oy{~9<+sfB>IlNkDYP# z-U%6|>#u~8JFW=BZ3Zh;eaG(}2HMH6QmG${kHU6^-?f`jXuCRc4V2^BI*Y0prOuDs zN}eeDK=ecT`lKy;$_ac*NRD8&k}G%=eHZjSp%@k}VKg1D=Soem8$}5v-ibuzt_nyu zm1uuxh+fnihs|-H!E6SDep~K3dIlK{6}7pcC0MYKCe@LgNc6viRMN2<4f~Y7^4^~3 z>5@$g4^Uv3yQrINmgAv?M|f=E3AQ+%T6l&{hSWJbL+)Y(Z(7H)O^si2jiyZGQP%mC z8H)eg1#Lai)6<^BI1QEb=vf2<0xyo{`K*;VJNy(U8s!rdU@3h zvyqC)QU>1BK(3D^=ohO$1N3;1CYzy~O(&x>Q9A?s8iliDlOrc`^ly#-XOO2`3bQDX zM;CuW3~@S_f53Q~kDVc2XN}d`5Q)ZTWcI&-uMaUbL~88|RajJCB;*)0!yqlrJ!BE&) zXh-b)4SVCAl~~N&d(ND5?wwEl%cy_+3||2>(6C@2Z9+%J!VG3rH>bFHo8K38Ea}J- z#PJ=$?u`;D?ZoY#5@LrJ?yXz9>9*Rn17>=AZ<#O(5+*Di%MvRnN=!gXOd;t-DQT7r zI1*)4yec_af~kD_ZMV}Q$WHgVb$Nbtr8q*q=si$6`k%gQVHH)cNoS#&irDntsYKh} zH}$nTq2R?t!5fMEz0R8h0-D-`J58vtv kOvty|ezf%a$T&KHl&_k`23Iv=4O>`88d=5$;~bxbUxTPRVgLXD delta 336 zcmXYrJ5B>Z5JcbXvR{w+7%&(XY`}axHlz>`Z~zic-~{;^oWa_QfP`hq0RbTq5*dd< z)QlZWPj^*yb^Yc)S^w*A@d4a&U6Qg}kkIzsUQ6gQVff?45Xl6!r6+gZt@&&`1cTpFqFDO+Tnw~Vr z`WtRI$GFjq=q-q>>UyA3rOULC(-hWQ%EfJH(juE;Oz8XpZ?B{)`#Z)Skd>PgyLY06 ng77LN!k>pC_BH#H9le8pfRG(L diff --git a/src/out/production/main/Event.class b/src/out/production/main/Event.class index 140282fcc5984bc0eaa3e0534ff51594d8d98a29..23355faa485d03aca19876698bf4ffa05de3a8e1 100644 GIT binary patch delta 510 zcmZWl%TB^j6r58EEwwx>zVL~P0tKz_M~E9Waf2(_x@ZC-hJc~ft>0k!1Ac-g5)2D< z&CcKOBaG)3R=T*oXXebAIlX=5OSStyy>|fn*w>&U8HR#s4KtV()tunw4el=~SXPiG zNVZEbN;mesZ8hv>&AM>g^=7R|kSn%ZCBz54JGb7jPMLW;`Z$bWMMoH#f>j+EWOa-{ z*D;O>)*rW8uH&}t+w-b>-KsdT5OOL^9eEVIEM?9JVPSOAupNh>vz7zPEx{4e+5fxb z{;W{cu!eQ7OjjXG*lv5Dl%rkmn>w`TJxQeph5r+fAd4-zlEs2PLx>;>LX6QRD*}8c z%zPJQ7CMm3!W#k|$S=M)&R>Iv!6rer(0JJ3@lj?{gHgr_Mr?vH?vr0RB2{9*FEY$J z@G%fIy9k=Eka`FK&n%Z9VnY6?;alr|9UWQ+FzKtNu*J8C*uV}pk;DRHm2ryC;x9uZ BOfCQb delta 360 zcmXX>Jx>Bb5PiGH?R~Hc;wOrT3LjV4-I*jrdy7-NFQ?ucCPZy@_eG?9=HV{1a^ zA2PmOD0XJvo0<1!f5TbOp8ZX~0bJlDhQfLT9~-vXtdZRb&l)mcf_5n{$N(JisZTu#ynM3RjmKirUJTy`zRs{<~CSR&V&kF!@H z;v%Z-2v=DHE6*P+K^H5@bBdykNy Ni#oQ5t!15W`yc-wBlZ9Q diff --git a/src/out/production/main/META-INF/main.kotlin_module b/src/out/production/main/META-INF/main.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..2983af70661ad375cc499ebc4da5a68ca46c532e GIT binary patch literal 16 RcmZQzU|?ooU|@t|egFVe02KfL literal 0 HcmV?d00001 From e26dc7061b6c9b7f25599a07a437aee93c196408 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Wed, 28 Aug 2019 21:59:01 +0800 Subject: [PATCH 15/38] Level-7 (removing a few print lines that I had put for debugging) --- src/main/java/Bot.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/Bot.java b/src/main/java/Bot.java index bb8d574338..0345c5ca4c 100644 --- a/src/main/java/Bot.java +++ b/src/main/java/Bot.java @@ -125,12 +125,8 @@ public void retrieve () throws FileNotFoundException { while (s.hasNext()) { String text = s.nextLine(); - System.out.println(text); - String[] split = text.split(" \\| "); - System.out.println(Arrays.toString(split)); - String description = split[2]; Task t = null; From 9559d8a84bd4e1e8fa5faef51f484c98225e2665 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Wed, 28 Aug 2019 22:12:42 +0800 Subject: [PATCH 16/38] Level-8 (won't display error message if the date inputted by the uses does not follow the dd/MM/yyyy... format) --- src/main/java/DateClass.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/DateClass.java b/src/main/java/DateClass.java index 65df163d16..e6408e835f 100644 --- a/src/main/java/DateClass.java +++ b/src/main/java/DateClass.java @@ -13,7 +13,7 @@ public static Date stringToDate (String string) { try { date = format.parse(string); } catch (ParseException e) { - System.out.println(e.getMessage()); + } return date; From e8daed218f90397b610a967a28f91a535b048f62 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Mon, 2 Sep 2019 16:00:12 +0800 Subject: [PATCH 17/38] Making it more OOP --- src/.idea/uiDesigner.xml | 124 ++++++++++++++++++ src/main/java/Bot.java | 16 +-- src/main/java/Duke.java | 54 ++++++-- src/main/java/FileWriterClass.java | 23 ---- src/main/java/Parser.java | 33 +++++ src/main/java/Storage.java | 56 ++++++++ src/main/java/TaskType.java | 3 + src/main/java/Ui.java | 12 ++ src/out/production/main/Bot$1.class | Bin 659 -> 0 bytes src/out/production/main/Bot$TaskType.class | Bin 999 -> 0 bytes src/out/production/main/Bot.class | Bin 5496 -> 0 bytes src/out/production/main/Deadline.class | Bin 1426 -> 0 bytes src/out/production/main/Event.class | Bin 1417 -> 0 bytes src/out/production/main/FileWriterClass.class | Bin 1004 -> 0 bytes .../main/META-INF/main.kotlin_module | Bin 0 -> 16 bytes src/out/production/main/Task.class | Bin 1216 -> 0 bytes src/out/production/main/Todo.class | Bin 1288 -> 0 bytes 17 files changed, 270 insertions(+), 51 deletions(-) create mode 100644 src/.idea/uiDesigner.xml delete mode 100644 src/main/java/FileWriterClass.java create mode 100644 src/main/java/Parser.java create mode 100644 src/main/java/Storage.java create mode 100644 src/main/java/TaskType.java create mode 100644 src/main/java/Ui.java delete mode 100644 src/out/production/main/Bot$1.class delete mode 100644 src/out/production/main/Bot$TaskType.class delete mode 100644 src/out/production/main/Bot.class delete mode 100644 src/out/production/main/Deadline.class delete mode 100644 src/out/production/main/Event.class delete mode 100644 src/out/production/main/FileWriterClass.class create mode 100644 src/out/production/main/META-INF/main.kotlin_module delete mode 100644 src/out/production/main/Task.class delete mode 100644 src/out/production/main/Todo.class diff --git a/src/.idea/uiDesigner.xml b/src/.idea/uiDesigner.xml new file mode 100644 index 0000000000..e96534fb27 --- /dev/null +++ b/src/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/Bot.java b/src/main/java/Bot.java index 0345c5ca4c..f480a0267d 100644 --- a/src/main/java/Bot.java +++ b/src/main/java/Bot.java @@ -1,27 +1,15 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import java.lang.reflect.Array; import java.util.*; public class Bot { DukeException emptyDescription = new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); - enum TaskType { - TODO, DEADLINE, EVENT; - } ArrayList list = new ArrayList<>(); - public void greeting () { - System.out.println("Hello! I'm Duke\nWhat can I do for you?"); - } - - public void bye() { - System.out.println("Bye. Hope to see you again soon!"); - } - public Task add (String command, TaskType taskType) throws DukeException { String[] words = command.split(" ",2); @@ -120,7 +108,7 @@ public void delete (String command) throws DukeException { } public void retrieve () throws FileNotFoundException { - File f = new File(FileWriterClass.DUKE_TXT_PATH); // create a File for the given file path + File f = new File(Storage.DUKE_TXT_PATH); // create a File for the given file path Scanner s = new Scanner(f); // create a Scanner using the File as the source while (s.hasNext()) { String text = s.nextLine(); @@ -160,6 +148,6 @@ public void save () throws IOException { s += t.saveFormat() + System.lineSeparator(); } - FileWriterClass.writeToFile(FileWriterClass.DUKE_TXT_PATH, s); + Storage.writeToFile(Storage.DUKE_TXT_PATH, s); } } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 8b3a8b36c5..eb77596d76 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,23 +1,22 @@ -import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Scanner; public class Duke { public static void main(String[] args) throws DukeException, IOException { + Ui ui = new Ui(); Bot bot = new Bot(); - bot.greeting(); + ui.greeting(); + try { bot.retrieve(); } catch (FileNotFoundException e) { - FileWriterClass.makeDirectory(FileWriterClass.DATA_FOLDER_PATH); + Storage.makeDirectory(Storage.DATA_FOLDER_PATH); } Scanner scanner = new Scanner(System.in); @@ -27,23 +26,50 @@ public static void main(String[] args) throws DukeException, IOException { String command = scanner.nextLine(); - String[] words = command.split(" ", 2); + TaskType taskType = Parser.returnsTaskType(command); + + if (taskType == TaskType.TODO || taskType == TaskType.DEADLINE || taskType == TaskType.EVENT) { + + bot.add(command, taskType); + bot.save(); + + } else { + switch (taskType) { + case DONE: + bot.done(command); + bot.save(); + continue; + case DELETE: + bot.delete(command); + bot.save(); + continue; + + case LIST: + bot.list(); + break; + case BYE: + ui.bye(); + break; + default: + throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); - switch (words[0]) { - case "todo": + } + /* + switch (taskType) { + case TODO, EVENT: try { - bot.add(command, Bot.TaskType.TODO); + bot.add(command, TaskType.TODO); bot.save(); } catch (DukeException | IOException e) { System.out.println(e.getMessage()); } continue; - case "deadline": + case DEADLINE: try { - bot.add(command, Bot.TaskType.DEADLINE); + bot.add(command, TaskType.DEADLINE); bot.save(); } catch (DukeException | IOException e) { System.out.println(e.getMessage()); @@ -51,7 +77,7 @@ public static void main(String[] args) throws DukeException, IOException { continue; case "event": try { - bot.add(command, Bot.TaskType.EVENT); + bot.add(command, TaskType.EVENT); bot.save(); } catch (DukeException | IOException e) { System.out.println(e.getMessage()); @@ -72,7 +98,7 @@ public static void main(String[] args) throws DukeException, IOException { bot.list(); break; case "bye": - bot.bye(); + ui.bye(); return; default: try { @@ -83,7 +109,7 @@ public static void main(String[] args) throws DukeException, IOException { break; } - } + }*/ } diff --git a/src/main/java/FileWriterClass.java b/src/main/java/FileWriterClass.java deleted file mode 100644 index 9d396bb420..0000000000 --- a/src/main/java/FileWriterClass.java +++ /dev/null @@ -1,23 +0,0 @@ -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileWriter; -import java.io.IOException; -import java.util.Scanner; - -public class FileWriterClass { - - public static String DATA_FOLDER_PATH = "../data"; - public static String DUKE_TXT_PATH = "../data/duke.txt"; - - public static void makeDirectory (String filePath) throws IOException { - File file = new File(filePath); - file.mkdirs(); - } - - public static void writeToFile(String filePath, String textToAdd) throws IOException { - FileWriter fw = new FileWriter(filePath); - fw.write(textToAdd); - fw.close(); - } - -} \ No newline at end of file diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java new file mode 100644 index 0000000000..28c4f0b2d9 --- /dev/null +++ b/src/main/java/Parser.java @@ -0,0 +1,33 @@ +import java.io.IOException; + +public class Parser { + + public static TaskType returnsTaskType (String command) throws DukeException { + + String[] words = command.split(" ", 2); + + + switch (words[0]) { + case "todo": + return TaskType.TODO; + case "deadline": + return TaskType.DEADLINE; + case "event": + return TaskType.EVENT; + case "done": + return TaskType.DONE; + case "delete": + return TaskType.DELETE; + } + + switch (command) { + case "list": + return Bot.TaskType.LIST; + case "bye": + return Bot.TaskType.BYE; + } + + throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); + + } +} diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java new file mode 100644 index 0000000000..a186892414 --- /dev/null +++ b/src/main/java/Storage.java @@ -0,0 +1,56 @@ +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Scanner; + +public class Storage { + + public static String DATA_FOLDER_PATH = "../data"; + public static String DUKE_TXT_PATH = "../data/duke.txt"; + + public static void makeDirectory (String filePath) throws IOException { + File file = new File(filePath); + file.mkdirs(); + } + + public static void writeToFile(String filePath, String textToAdd) throws IOException { + FileWriter fw = new FileWriter(filePath); + fw.write(textToAdd); + fw.close(); + } + + public void retrieve () throws FileNotFoundException { + File f = new File(Storage.DUKE_TXT_PATH); // create a File for the given file path + Scanner s = new Scanner(f); // create a Scanner using the File as the source + while (s.hasNext()) { + String text = s.nextLine(); + + String[] split = text.split(" \\| "); + + String description = split[2]; + + Task t = null; + + switch (split[0]) { + case "T": + t = new Todo(description); + break; + case "D": + t = new Deadline(description, split[3]); + break; + case "E": + t = new Event(description, split[3]); + break; + } + + boolean isDone = split[1].equals("1"); + + if (t != null) { + t.isDone = isDone; + list.add(t); + } + } + } + +} \ No newline at end of file diff --git a/src/main/java/TaskType.java b/src/main/java/TaskType.java new file mode 100644 index 0000000000..e110348799 --- /dev/null +++ b/src/main/java/TaskType.java @@ -0,0 +1,3 @@ +public enum TaskType { + TODO, DEADLINE, EVENT, DONE, DELETE, LIST, BYE; +} diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java new file mode 100644 index 0000000000..073a2c3477 --- /dev/null +++ b/src/main/java/Ui.java @@ -0,0 +1,12 @@ +public class Ui { + + public void greeting () { + System.out.println("Hello! I'm Duke\nWhat can I do for you?"); + } + + public void bye() { + System.out.println("Bye. Hope to see you again soon!"); + } + + +} diff --git a/src/out/production/main/Bot$1.class b/src/out/production/main/Bot$1.class deleted file mode 100644 index a3993b3261f1afce59ce6b9b3082c534e1964470..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 659 zcmZ8e+iuf95IvhXwiDdeO&c1@t)-z&%B2Dc@c=?V^AIaM^l9U)nr&TgWjjUv zf&L25fP@f2{Qy1+F>6%>ki0W4ZI{Sv@)JgQ&?^)hVSC{whm;Y|y-G`OwJ z9Se6YtTU`M1|MV=PI~;b@m6JxfTzd7`Ke$i9CR4$mtiDhnZ05tHd{jmV^@voa-l0@ z;ZILSA_@2?qD-}`LLLoyA~n8B&J8ji9#icrTp6fo5{f;k6*j&1_=ulzD(A&vq*56l z_Cz*OV+;4_-WO^1PNkWJ4F~tJ>7asZ4z|#A(84yus#fnrJU-m<)nFP<_N0i$UXrN9 z!2?Zuh$cfxH}-_V>BO-}b|apqB4u!A>i+0Rgc>5~__^*^E z)@U?+_D31#UeH48lH6hLoH=u5=KlKq?I(aeJPSd>riur6C?g?bOGN}(e&iHHRSM=f zVq3u?w~rLWxqU2She2x8N;L+hVGQ0kK7KG6w6f!v{Uh5L49o#Tq;lwb$-m(|K}-5U zsZy@$3<15VR~rm+vUyN>sn;2zuP(!bCx$)bL<_0(m7sLwzM+!QishKqVXtlW8%Eov z8(C!4-ZE^YD#yl&k+lt{o2`3&%jxFRmy5(IZpW~jM&IJ;6AsBSdPEhwn$Hj{SdQiG zGbH{)Ursk^Fy1?hREO$T*D<_dpP2k99#9G$dy>39MXfu-USU?(K21xlyTg9Rd~Wfs z6dL6g?}q+X&4KsA9e6T!HC*F+OK5n4JzBu@z%{JmsfKmj)(}NZ!y-T8h|y*)=E94U zK1!sebZpn5V)0aZN?xsfY<4^nv^(9f*m8af_HV$m-1%aTUQC3Zn^aupIsmdHMOab; z%&+h+I07MD#}XKp$=e{yKXnB51-^6mKat0Ass*&$i7*@?T8Koo7Y zXsy+1ZEL}5>shS!P?QA0tA|>T-j`ObR$F`6TkAo=^!v|lHXF0r?(a9V^WMDoz3+d0 z@6A*1?SB}+QZ*qA6PIYXRL3X6@L@+D>T#Kd%fkra5@~!g4_Dw*I<5@k)3{2<)jB>C zMklVx!x~&0Mgu-8&FeILE{sC#kcpqy@dXXnhf$0#>e#7aR~RMoc!RwClH6_-xSMo* zS;JStxEZ%d`&JFN>9}3mcgXFlVa&pA9d{Oz?ALXCLuP(c!?*Hq5AF?P0d{EE6Gk=e zliU4r+pA+x2n~g?4-d%GejNwo|3MuO>3CSjBYA{_6TA63uO-?Ux7@x2@k(=z zS=J;A)-LDR(6VSe>MmFCSIpZ$R&0Znh)O%% z8F0IzNrhljog?e&oeA4^qw!9nwGVKT--<*ODk@SOVphDfy2VX!K&{LuAF;Z2UW$)G zek9xQ!twLCSh6=3rSU~)<$CLDA5idFe6MvlJv~;O>+5dDyA#K*OSG*{B0>`;w76DB z_gbshvrNM|8lF)IXPnLxmpdu4AURmCe5O|JIv)tT(rtS~WUUeu{x6OGyQt|Et`RHqm5mJUnus8+)dxJc6K zw>A7w!;eV2#pz3Q*fNjS)6-RwC-iQ!opjgQ64j)E_4p|59+O%MOJ3RefVpnn`j)b? zGPAYIHnRd^I-5<)be)J}%F>Q&w%ewcu2q7z#lR^zl^k;1!G7Ch65A0|Qr(nL))@GWpudEdh23uzW;HuoJwja!f;pRG zIV@?Cn@bN$tyYCu*`8m#B3ReH#qMx5ykg*0{LaAd@tP3z@}#^u+F^@p2-RaHy0e!y ztt9;uw@Kku{K3EQ;rexs<0jpN)w|YqyPQa}AcQ~b zc-_EX@K=SI&5mnF(k3VD9;ZKhWv=))yiD!#j7TS?hQAy52R1289*ucAEyc6{H1IDx zZ{Q8QN%PE2+r1F|TfUd zF_O}>x^Z3B(5!&A3?yBCq3V@EF$#Syp=_L& zQ|G3Yw``5N9bHtc^07Ai&Y}QmRJCZ_ijh&pJZVRhb<8}<5Ze@(F(Q`A##-s0n?u~j z%dEFiB%>ElUHqN47+ldfFKbvD@B@~iR;JR$D}~0mYj@i8vDR4O)pOUT>cPZ9$D;mc;C3~IpUP!}I^~QZyG<#zr%FOf52O`j?pIU!z>lv-* zu3y>OK-Z;Br%~R%AhFQ8tYovdljw2&$=Q(RjbpZKuyS zseD*tbx=MAG?h=&n;fURuUBDbHmmfclpr_ov=XzE<*AXiu-cMuC zIt2Ixl+GW5ntuSkwnG090(%i;Bh)qoZ7=kDy{Rp{PlTU$jg#^)83kx%%SZv>bZlTt zVPgh-DHjy*ygkS(3=blI6i7Z)z;6v5MOh$u8IUt_gBUqLiU~3;CrBI46V$9}e6Meg6FjKC%Y|3kET%>Mjy`*0TVfl_h*$!RzXUfyFg}lE5G) z?@CYMJpBL)+e!jMC>q3+jk|FpM-@&L?3!Rna1^~H=$F|+VuU=58<1ZT8i!R(tdh_W zrlruD1?`9rMbk29+BmclLDPmXUC_k&Gw3(|3vamw@sU7e5T%2dDQ}MqJOs1NpMJ9s zWi5j^YUBF{KZ;rR&>enABDCWO-e=IMrHo)1j^%gP37F0A$+=8`3Oas1Y<}FGk1A~C zC*4I@gzIn&?%>Efu>|+wcszm{Jce34jT7-QUHt}D@!V0bCgWsPiAFD^y~rnS8P38c zCf!z|q@HY!JsamBNaRYK%eNt7o|Nu;nhefkpGN$u^b7_+on7)|@hwx6PwnVnlIUtF zBE<8PHOSgHgdz=_%|n>1q4OY$4)a5p9mBL)(@@V&4Grw@9^?)L-oezYVfy%CM38aA zO#DFhTQ1qfOG;5HCWknLWVu9; zF)n4~1~E4sf9YV{r4&=4JW48q@}N@|idZdWbo@Nl@^LtWPCk=`xXBB}{1lTBCvs%U zi8_TwT<7DAQgkDhc48iUDJM=CV_Z|FvM(c`sK8?3UP12uWi!$_cq@)%=ZwI4(q{6O z?k6R1$PT4;55F)F=5V`Ada`YCJc5a3}j$(F&Ii;`m*d<6olhhROB`Ub{FT?MZCcc$$v6@N_vyU9Ji3M)?6yS%W2k&|+$<^b{Td)iK>OU3gMyYYDtWD+xW0 zDJ7w)+FmS^yc3zGv=4jxU#eC%Fv)-mDN5Thh0-$v7sJHIx$>nHxg8X=%PB%v(5fr( zAg;m_xEfF48a#(<@d5?#bzG0Pu#+;kOZjjEzo>3h1-Qxcz-bJ>$#230>&;KJ7d?t&DbQn8jz-NI`)yeZu5-F>#nw{F#B`;t_$mfD2qWk}{;85~!txCpM*Oclp`{ z4`7ADF3jY^NeZln=1Qi^%6+KYFY#{LJ^T{0t8yP!kCwo6S_RxfxZ5xjw{z>bgFe{J zt>RA4JEX(@iJtv(23eZ6+RqJTnqPhtBj2-Y`#~oE2rN9v6#k~P-BK2iyNY5_khUOr=Tf}US|uqGQ-VR_k7+x=(q*^V9hx-pukWBw z;9pHN5E6X=A4)v4U2I7kP1@OWzB%Xn&N(x?zkZ+m1Tc>mQRukVi7v#HHQrC?WCS-g zOeruPMFL4>O-C_`84b5I%rXQDHHQA&KCkjQlUuuUdFdF|Zi*qiY*>bT%rF&i-EKt^ zn+(CUT@nnvIl~gK4i5^#+293}kp7%q*0S$8+Zc|9!K6HvAYp6oH&$MP$ z$2xj(M@Kh$bd2C4!-W;wmacSoWlhLEyX5wUaW{f{I_~2EZD(TdW0NJdxZXlgV{+?- zeNmJ;9%5d@f{sNj=@?erDJ)YnXVNsM4eplD<({=Uu-(*Uosgz7)aC>dn^8Oh9gn`9 zdBC9}{McKDzDCQd zmK3|fVbH4FJQV9Y48!r&W(q$--KQP@m=@dA(WdQY7QZ$PPt-}I873Mv7*^FT3;*8M z8_)8hw4IuU=Oml6?ebxT=Co>A!bzLlbp=i1V{;WgNBz)Wa;sztccPw{Y8_D%axQVB zRuOH&|I?dKk>;kEH>5~u$TCc}^w+L7hOvLgVVqugoxTKg=hQVPtAp%bT%fg&yw?a2 z0(2#(kHC^M-x2sqZUE}@(c^7}5rT#&A{ZbnRu9J@hRCBtb;F5FSxO*4HoZzd{etHc zQ}PHM$!`dpP#yR}(RGEem#KTqx@Y(J%nX85Me+{0R9s=s)oXm#k08 diff --git a/src/out/production/main/Event.class b/src/out/production/main/Event.class deleted file mode 100644 index c5fa96b579b5b91968287caafc7c2bb14772360b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1417 zcmah}>rN9v6#k~SEz5E%Hx(~MLE3`golEgXX_cf%ObG^wKZbUIrDeC-oi-uyukWBw z;9pHN5E6X=A4)v4U8SUrChhDw-<iI=s5ZQ-o*?Fu2Wyj|p#4eprA_rZ|dGhGHPpREf^l455`xJAdTO4GI& zqS9{U!Z46XwhA)nF0YH6?Hs5Yx(bpP%d5QVv1^#oaGOF3cFie@oT;+VJ)vn;tAQTe zG0=r>1H-t$(7R;Y(v=Rct_rzlm)xER?nZIXz)G1&z9>oq z4>7A@&cHkt3=ApmG!_}co-Va#oxA082mch@ExnpoRm7)q=(Q}_|;8twQ4ns1Xwo3fi({M8K6t5gy0SmR*2wM9+Hxr6J6RnaE= zKehQ38D6OrOexYDatz}w^|i~5;p)HRFiP*aK_39RbLx(h6(qX{y|ng`_X+_*fX>w9 z5m;*K8vO9=$XruWFFpYwcTN*y7X z`ij5_<$=!>-B5^lCk>C;@a%4%nc?DJmiLr_Qb@(Zk?)9XDkkkCw9qGng2#v!HbaDT z6gI<3qHqjdDFnS58VY?)3MpUV62(j+a7tTDqwGT(Ml@WeA3LQj4-21Rj0mp~9>7&B W(Nm|Co?;o#DADWWN6EiI|FPeH)l7N- diff --git a/src/out/production/main/FileWriterClass.class b/src/out/production/main/FileWriterClass.class deleted file mode 100644 index d7de3c89eb762d57ce82a1af35b8695d74f55943..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1004 zcmZvbeNWR+6vm%BwskFKgAP#f4PSY6^&MY`$-*ESrVy#1CWe%)K%uOrD}o=(kYFN- zAHWY~d=9M+mHu(hx%ZxPe$PGk_Q%g}-vLbFiGd(#}o^IXBIZ@HgbJ8)YY_EH@At&OJ&J+(LU zv#ZWqCk@I^`z=3yrqDGywycny37eimsqVMDSGzlFUgWrI0avVg*l>eoH}YkkE@tCR zzpc<$pYsE6CGul0nhD%?TR1!Jwpa5buMvmQXN7^$|J4Yvu+G#)H{K*$T!ms1=!dpc zWhrBJzu|q1{jk;6@Iaw^Pe@KE+X^G66h0lL$KHPIgw85Qo!m&0O+1qA$C9U2Dt6P2S*Caar0;! zLD=?ig>R_H*O!4V3h3!Vq|JijQRdjsnN6!`bK_s3zR<~FfMfo6QNtj8GYP;MoaIc% zISesMlIPJy4=5cW^Nt0&>Jx{^u5`*282~ELsijCAQf@Fw!TD5G9v5(th)diPZI>B6 zO#KPs11m_4@)2@^$iJKT~8B16g|^!yW3@!IYi)~%O{z7# zCsbW=)eYBOEoi*B*k6WVgmIf2yc5xwSYoi0j1@E3Z5}jVB%;$rt;!Dhp{UBB%@sLy z*$rG#^|Y*7Mun*Iz@HoF}LXWjQjP-*cn6eQxf zS46@QPvAB88!Zve$BE^BWj&E|iCaeVN9f)7bY&!!KHtkYgAWrj+DM5OT4L5!a-BUdSlA59?Fq~lHoF@DOb0> zny_R`#<_0osH+JY(qs=qHfAswu25WyzZ%t>!9!YY;(S2=QmdqLfqaYnoAkT&7ij?r A`Tzg` diff --git a/src/out/production/main/Todo.class b/src/out/production/main/Todo.class deleted file mode 100644 index c8da7caa64837bf62d8e5b439dd859137e1ca6af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1288 zcmah}>rN9v6#k}Ny6v*a9mNZRTr5Sw3tq5@N)3^u$d5J{B>ouM0hTU1&F-`biSaq~ z3H+;x34}x+z=smgbXQwKquJf*oHOTq=ljmg^yjaW9{?U9XQ30<^f1y#jvGmgo0v$! z!lZ>M+|;wQg<(va$e5U6NGv*@qm~#3)A@Z~=W{OicIOJpcf8%~^ag{GlV!osop(I( zx^}QF{373W$4$C3V2QXjrblDih5JS(h zlqyg@udWHTC(A*10<%fX*|>wd#I!j2esr>|2NKZJB)Y!6FG|YBJ=`}jZ{q6w#P! zw<#@f(LPbbo#3VPNIQGW(Ay-x>M5}+dks0HYv@d8;(h|vQiGBZbDUuhOYH;q=qYoLRk9@k+bA;Fl6~Y&a4Dk}Q2BaETc4KZuSadG`B7C4~I&Qqr==hF~&3NV;5}#lipJBw0 zVHP$G@+1q#NNMPJgK7wUp#^$8g1$sCGl-oMS7wqV!^E(O%k;8ST59+@nm$H=SI8g3 ZRqBiG0mCAm<0<`-T_-z9_9%U0zX2&DEfD|! From 8219d3d7d2c10b165705d513a81e25e274188f12 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Mon, 2 Sep 2019 19:02:06 +0800 Subject: [PATCH 18/38] A-MoreOOP --- src/main/java/AddCommand.java | 22 +++ src/main/java/Bot.java | 162 -------------------- src/main/java/Command.java | 10 ++ src/main/java/DeleteCommand.java | 20 +++ src/main/java/DoneCommand.java | 20 +++ src/main/java/Duke.java | 131 ++++------------ src/main/java/DukeException.java | 4 + src/main/java/ExitCommand.java | 14 ++ src/main/java/ListCommand.java | 11 ++ src/main/java/Parser.java | 108 +++++++++++-- src/main/java/Storage.java | 37 ++++- src/main/java/TaskList.java | 44 ++++++ src/main/java/Ui.java | 43 ++++++ src/out/production/main/AddCommand.class | Bin 0 -> 729 bytes src/out/production/main/Command.class | Bin 0 -> 414 bytes src/out/production/main/DateClass.class | Bin 960 -> 750 bytes src/out/production/main/Deadline.class | Bin 0 -> 1561 bytes src/out/production/main/DeleteCommand.class | Bin 0 -> 807 bytes src/out/production/main/DoneCommand.class | Bin 0 -> 774 bytes src/out/production/main/DukeException.class | Bin 331 -> 483 bytes src/out/production/main/Event.class | Bin 0 -> 1552 bytes src/out/production/main/ExitCommand.class | Bin 0 -> 586 bytes src/out/production/main/ListCommand.class | Bin 0 -> 541 bytes src/out/production/main/Parser$1.class | Bin 0 -> 633 bytes src/out/production/main/Parser.class | Bin 0 -> 3260 bytes src/out/production/main/Storage.class | Bin 0 -> 3241 bytes src/out/production/main/Task.class | Bin 0 -> 1216 bytes src/out/production/main/TaskList.class | Bin 0 -> 1831 bytes src/out/production/main/TaskType.class | Bin 0 -> 1102 bytes src/out/production/main/Todo.class | Bin 0 -> 1288 bytes src/out/production/main/Ui.class | Bin 0 -> 2301 bytes 31 files changed, 351 insertions(+), 275 deletions(-) create mode 100644 src/main/java/AddCommand.java delete mode 100644 src/main/java/Bot.java create mode 100644 src/main/java/Command.java create mode 100644 src/main/java/DeleteCommand.java create mode 100644 src/main/java/DoneCommand.java create mode 100644 src/main/java/ExitCommand.java create mode 100644 src/main/java/ListCommand.java create mode 100644 src/main/java/TaskList.java create mode 100644 src/out/production/main/AddCommand.class create mode 100644 src/out/production/main/Command.class create mode 100644 src/out/production/main/Deadline.class create mode 100644 src/out/production/main/DeleteCommand.class create mode 100644 src/out/production/main/DoneCommand.class create mode 100644 src/out/production/main/Event.class create mode 100644 src/out/production/main/ExitCommand.class create mode 100644 src/out/production/main/ListCommand.class create mode 100644 src/out/production/main/Parser$1.class create mode 100644 src/out/production/main/Parser.class create mode 100644 src/out/production/main/Storage.class create mode 100644 src/out/production/main/Task.class create mode 100644 src/out/production/main/TaskList.class create mode 100644 src/out/production/main/TaskType.class create mode 100644 src/out/production/main/Todo.class create mode 100644 src/out/production/main/Ui.class diff --git a/src/main/java/AddCommand.java b/src/main/java/AddCommand.java new file mode 100644 index 0000000000..78b2844261 --- /dev/null +++ b/src/main/java/AddCommand.java @@ -0,0 +1,22 @@ +import java.io.IOException; + +public class AddCommand extends Command { + + private Task task; + + public AddCommand (Task task) { + this.task = task; + } + + + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + + taskList.add(task); + + ui.add(taskList.list); + + storage.save(taskList.list); + + } +} diff --git a/src/main/java/Bot.java b/src/main/java/Bot.java deleted file mode 100644 index 96476be7b7..0000000000 --- a/src/main/java/Bot.java +++ /dev/null @@ -1,162 +0,0 @@ -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.*; - -public class Bot { - - DukeException emptyDescription = new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); - - - ArrayList list = new ArrayList<>(); - - public Task add (String command, TaskType taskType) throws DukeException { - - String[] words = command.split(" ",2); - - if (words.length == 1) throw emptyDescription; - - Task task = null; - - String description; - - switch (taskType) { - case TODO: - description = words[1]; - - if (description.isBlank()) throw emptyDescription; - - task = new Todo(description); - - break; - - case DEADLINE: - String[] split = words[1].split(" /by ", 2); - - if (split.length == 1) throw emptyDescription; - - description = split[0]; - String by = split[1]; - - if (description.isBlank() || by.isBlank()) throw emptyDescription; - - task = new Deadline(description, by); - - break; - - case EVENT: - split = words[1].split(" /at ", 2); - - if (split.length == 1) throw emptyDescription; - - description = split[0]; - String at = split[1]; - - if (description.isBlank() || at.isBlank()) throw emptyDescription; - - task = new Event(description, at); - - break; - } - - list.add(task); - - System.out.println("Got it. I've added this task:"); - - System.out.println(list.get(list.size() - 1)); - - System.out.printf("Now you have %d tasks in the list.\n", list.size()); - - return list.get(list.size() - 1); - } - - public void done (String command) throws DukeException { - - String[] words = command.split(" ", 2); - - if (words.length == 1) throw emptyDescription; - - if (words[1].isBlank()) throw emptyDescription; - - System.out.println("Nice! I've marked this task as done:"); - - int index = Integer.valueOf(words[1]) - 1; - - list.get(index).markAsDone(); - - System.out.println(list.get(index)); - - } - - public void list() { - System.out.println("Here are the tasks in your list:"); - - for (int i = 0; i < list.size(); i++) { - System.out.println(i+1 + "." + list.get(i)); - } - } - - public void delete (String command) throws DukeException { - - String[] words = command.split(" ", 2); - - if (words.length == 1) throw emptyDescription; - - if (words[1].isBlank()) throw emptyDescription; - - System.out.println("Noted. I've removed this task:"); - - int index = Integer.valueOf(words[1]) - 1; - - Task task = list.remove(index); - - System.out.println(task); - - System.out.printf("Now you have %d tasks in the list.\n", list.size()); - - } - - public void retrieve () throws FileNotFoundException { - File f = new File(Storage.DUKE_TXT_PATH); // create a File for the given file path - Scanner s = new Scanner(f); // create a Scanner using the File as the source - while (s.hasNext()) { - String text = s.nextLine(); - - String[] split = text.split(" \\| "); - - String description = split[2]; - - Task t = null; - - switch (split[0]) { - case "T": - t = new Todo(description); - break; - case "D": - t = new Deadline(description, split[3]); - break; - case "E": - t = new Event(description, split[3]); - break; - } - - boolean isDone = split[1].equals("1"); - - if (t != null) { - t.isDone = isDone; - list.add(t); - } - } - } - - public void save () throws IOException { - - String s = ""; - - for (Task t : list) { - s += t.saveFormat() + System.lineSeparator(); - } - - Storage.writeToFile(Storage.DUKE_TXT_PATH, s); - } -} diff --git a/src/main/java/Command.java b/src/main/java/Command.java new file mode 100644 index 0000000000..528cc50fdd --- /dev/null +++ b/src/main/java/Command.java @@ -0,0 +1,10 @@ +import java.io.IOException; + +public abstract class Command { + + public abstract void execute (TaskList taskList, Ui ui, Storage storage) throws IOException; + + public boolean isExit() { + return false; + } +} diff --git a/src/main/java/DeleteCommand.java b/src/main/java/DeleteCommand.java new file mode 100644 index 0000000000..11119f64fc --- /dev/null +++ b/src/main/java/DeleteCommand.java @@ -0,0 +1,20 @@ +import java.io.IOException; + +public class DeleteCommand extends Command { + + int index; + + public DeleteCommand (int index) { + this.index = index; + } + + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + + Task task = taskList.delete(index); + + ui.delete(taskList.list, task); + + storage.save(taskList.list); + } +} diff --git a/src/main/java/DoneCommand.java b/src/main/java/DoneCommand.java new file mode 100644 index 0000000000..0a7344e90a --- /dev/null +++ b/src/main/java/DoneCommand.java @@ -0,0 +1,20 @@ +import java.io.IOException; + +public class DoneCommand extends Command { + + int index; + + public DoneCommand (int index) { + this.index = index; + } + + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + + Task task = taskList.done(this.index); + + ui.done(task); + + storage.save(taskList.list); + } +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index eb77596d76..69d8480f81 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -4,113 +4,48 @@ public class Duke { - public static void main(String[] args) throws DukeException, IOException { - - Ui ui = new Ui(); - Bot bot = new Bot(); - - - - ui.greeting(); + private Storage storage; + private TaskList tasks; + private Ui ui; + public Duke(String filePath, String folderPath) { + ui = new Ui(); + storage = new Storage(filePath, folderPath); try { - bot.retrieve(); + tasks = new TaskList(storage.retrieve()); } catch (FileNotFoundException e) { - Storage.makeDirectory(Storage.DATA_FOLDER_PATH); - } - - Scanner scanner = new Scanner(System.in); - - - while (true) { - - String command = scanner.nextLine(); - - TaskType taskType = Parser.returnsTaskType(command); - - if (taskType == TaskType.TODO || taskType == TaskType.DEADLINE || taskType == TaskType.EVENT) { - bot.add(command, taskType); - bot.save(); - - } else { - switch (taskType) { - case DONE: - bot.done(command); - bot.save(); - continue; - case DELETE: - bot.delete(command); - bot.save(); - continue; - - case LIST: - bot.list(); - break; - case BYE: - ui.bye(); - break; - default: - throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); - - - } - - /* - switch (taskType) { - case TODO, EVENT: - try { - bot.add(command, TaskType.TODO); - bot.save(); - } catch (DukeException | IOException e) { - System.out.println(e.getMessage()); - } - - continue; - case DEADLINE: - try { - bot.add(command, TaskType.DEADLINE); - bot.save(); - } catch (DukeException | IOException e) { - System.out.println(e.getMessage()); - } - continue; - case "event": - try { - bot.add(command, TaskType.EVENT); - bot.save(); - } catch (DukeException | IOException e) { - System.out.println(e.getMessage()); - } - continue; - case "done": - bot.done(command); - bot.save(); - continue; - case "delete": - bot.delete(command); - bot.save(); - continue; + try { + storage.makeDirectory(folderPath); + tasks = new TaskList(); + } catch (IOException ex) { + ui.abort(); + System.exit(0); } + } + } - switch (command) { - case "list": - bot.list(); - break; - case "bye": - ui.bye(); - return; - default: - try { - throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); - } catch (DukeException e) { - System.out.println(e.getMessage()); - } - break; + public void run() { + ui.greeting(); + boolean isExit = false; + while (!isExit) { + try { + String fullCommand = ui.readCommand(); + // ui.showLine(); // show the divider line ("_______") + Command c = Parser.parse(fullCommand); + c.execute(tasks, ui, storage); + isExit = c.isExit(); + } catch (DukeException | IOException e) { + ui.showError(e.getMessage()); + } finally { + //ui.showLine(); } + } + } - }*/ + public static void main(String[] args) throws DukeException, IOException { + new Duke("../data/duke.txt", "../data").run(); } } diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java index 09da9a6ad9..8a36354295 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/DukeException.java @@ -3,4 +3,8 @@ public class DukeException extends Exception { public DukeException (String message) { super(message); } + + public static DukeException emptyDescription () { + return new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); + } } diff --git a/src/main/java/ExitCommand.java b/src/main/java/ExitCommand.java new file mode 100644 index 0000000000..baed38c529 --- /dev/null +++ b/src/main/java/ExitCommand.java @@ -0,0 +1,14 @@ +import java.io.IOException; + +public class ExitCommand extends Command { + + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + ui.bye(); + } + + @Override + public boolean isExit() { + return true; + } +} diff --git a/src/main/java/ListCommand.java b/src/main/java/ListCommand.java new file mode 100644 index 0000000000..419f9a239b --- /dev/null +++ b/src/main/java/ListCommand.java @@ -0,0 +1,11 @@ +import java.io.IOException; + +public class ListCommand extends Command { + + + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + ui.list(); + taskList.list(); + } +} diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 28c4f0b2d9..834c14e48e 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -1,33 +1,123 @@ -import java.io.IOException; +import java.util.DuplicateFormatFlagsException; public class Parser { - public static TaskType returnsTaskType (String command) throws DukeException { + public static Command parse (String command) throws DukeException { String[] words = command.split(" ", 2); + Task task = null; + int index; switch (words[0]) { case "todo": - return TaskType.TODO; + task = Parser.parsesAdd(command, TaskType.TODO); + return new AddCommand(task); case "deadline": - return TaskType.DEADLINE; + task = Parser.parsesAdd(command, TaskType.DEADLINE); + return new AddCommand(task); case "event": - return TaskType.EVENT; + task = Parser.parsesAdd(command, TaskType.EVENT); + return new AddCommand(task); case "done": - return TaskType.DONE; + index = Parser.parsesDone(command); + return new DoneCommand(index); case "delete": - return TaskType.DELETE; + index = Parser.parsesDone(command); + return new DeleteCommand(index); } switch (command) { case "list": - return Bot.TaskType.LIST; + return new ListCommand(); case "bye": - return Bot.TaskType.BYE; + return new ExitCommand(); } throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); } + + public static int parsesDone (String command) throws DukeException { + + String[] words = command.split(" ", 2); + + if (words.length == 1) throw DukeException.emptyDescription(); + + if (words[1].isBlank()) throw DukeException.emptyDescription(); + + int index = Integer.valueOf(words[1]) - 1; + + return index; + + } + + public static Task parsesAdd (String command, TaskType taskType) throws DukeException { + + String[] words = command.split(" ", 2); + + if (words.length == 1) throw DukeException.emptyDescription(); + + Task task = null; + + String description; + + switch (taskType) { + case TODO: + description = words[1]; + + if (description.isBlank()) throw DukeException.emptyDescription(); + + task = new Todo(description); + + break; + + case DEADLINE: + String[] split = words[1].split(" /by ", 2); + + if (split.length == 1) throw DukeException.emptyDescription(); + + description = split[0]; + String by = split[1]; + + if (description.isBlank() || by.isBlank()) throw DukeException.emptyDescription(); + + task = new Deadline(description, by); + + break; + + case EVENT: + split = words[1].split(" /at ", 2); + + if (split.length == 1) throw DukeException.emptyDescription(); + + description = split[0]; + String at = split[1]; + + if (description.isBlank() || at.isBlank()) throw DukeException.emptyDescription(); + + task = new Event(description, at); + + break; + + } + + return task; + + } + + public static int parsesDelete (String command) throws DukeException { + String[] words = command.split(" ", 2); + + if (words.length == 1) throw DukeException.emptyDescription(); + + if (words[1].isBlank()) throw DukeException.emptyDescription(); + + System.out.println("Noted. I've removed this task:"); + + int index = Integer.valueOf(words[1]) - 1; + + return index; + } + } diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index a186892414..c8122d0833 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -2,27 +2,39 @@ import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; +import java.util.ArrayList; import java.util.Scanner; public class Storage { - public static String DATA_FOLDER_PATH = "../data"; - public static String DUKE_TXT_PATH = "../data/duke.txt"; + public String folderPath; + public String filePath; - public static void makeDirectory (String filePath) throws IOException { + public Storage(String filePath, String folderPath) { + this.filePath = filePath; + this.folderPath = folderPath; + + } + + public void makeDirectory (String filePath) throws IOException { File file = new File(filePath); file.mkdirs(); } - public static void writeToFile(String filePath, String textToAdd) throws IOException { + public void writeToFile(String filePath, String textToAdd) throws IOException { FileWriter fw = new FileWriter(filePath); fw.write(textToAdd); fw.close(); } - public void retrieve () throws FileNotFoundException { - File f = new File(Storage.DUKE_TXT_PATH); // create a File for the given file path + public ArrayList retrieve () throws FileNotFoundException { + + ArrayList list = new ArrayList<>(); + + File f = new File(filePath); // create a File for the given file path Scanner s = new Scanner(f); // create a Scanner using the File as the source + + while (s.hasNext()) { String text = s.nextLine(); @@ -51,6 +63,19 @@ public void retrieve () throws FileNotFoundException { list.add(t); } } + + return list; + } + + public void save (ArrayList list) throws IOException { + + String s = ""; + + for (Task t : list) { + s += t.saveFormat() + System.lineSeparator(); + } + + this.writeToFile(filePath, s); } } \ No newline at end of file diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java new file mode 100644 index 0000000000..7b361ee7ca --- /dev/null +++ b/src/main/java/TaskList.java @@ -0,0 +1,44 @@ +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.*; + +public class TaskList { + + ArrayList list; + + public TaskList (ArrayList list) { + this.list = list; + } + + public TaskList() { + this.list = new ArrayList(); + } + + public void add (Task task) { + + list.add(task); + } + + public Task done (int index) { + Task task = list.get(index); + task.markAsDone(); + + return task; + } + + public void list() { + + for (int i = 0; i < list.size(); i++) { + System.out.println(i+1 + "." + list.get(i)); + } + } + + public Task delete (int index) { + + Task task = list.remove(index); + + return task; + + } +} diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index 073a2c3477..e4d2541826 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -1,5 +1,10 @@ +import java.util.ArrayList; +import java.util.Scanner; + public class Ui { + private Scanner scanner = new Scanner(System.in); + public void greeting () { System.out.println("Hello! I'm Duke\nWhat can I do for you?"); } @@ -8,5 +13,43 @@ public void bye() { System.out.println("Bye. Hope to see you again soon!"); } + public void list () { System.out.println("Here are the tasks in your list:"); } + + public void add (ArrayList list) { + + System.out.println("Got it. I've added this task:"); + + System.out.println(list.get(list.size() - 1)); + + System.out.printf("Now you have %d tasks in the list.\n", list.size()); + + } + + public void delete(ArrayList list, Task task) { + + System.out.println(task); + + System.out.printf("Now you have %d tasks in the list.\n", list.size()); + } + + public void done(Task task) { + + System.out.println("Nice! I've marked this task as done:"); + + System.out.println(task); + } + + public void showError(String message) { + System.out.println(message); + } + + public String readCommand() { + + return scanner.nextLine(); + } + + public void abort() { + System.out.println("SORRY SOMETHING WENT SERIOUSLY WRONG! \nGoodbye!"); + } } diff --git a/src/out/production/main/AddCommand.class b/src/out/production/main/AddCommand.class new file mode 100644 index 0000000000000000000000000000000000000000..643ffa7b59b560c5fc00a636850ef3025d505df1 GIT binary patch literal 729 zcmZuu*>2N76g}gZPVAb7CKQ^owPj14wkhzyLl9C`Q3=U{hc55a*lGuo79H=}3wWI>wQ)?)UK%F?jYyA^Pvz(&$qv=YkeOzb4%F~iW!l7( zq+6WnTp);c<9II}jnp_Mu}m(KL0PbArDBeBUi70Q-H#56G*hQZ-;AmoJ*Fh!TLBg( z;FOv=44hPX)j*NcUcx_I43ck!PRF^#2IGUY%m&H6HbNUSE!$tzxe73kFn|YNq8nfn zL4Yl6OY}^zBk?N0YwVC^*2uw=bp%?5q^Hx~$IsKT0=14^!CYmvLQTanWe@E>OOb6V z3q9=ZW|{i_Z?z+?w%qw|)$qy5{g5bE=Ly#MrggqCFU2fC&!In$fah&S`-~l0KfHkm zyH{|2Sj+;?1=M&-xMcA7H5lEi(71y|M(ne!f^1E+STmd>T9>xn4KLwbqqf<-gnNx! zTa}%gjc8h6g98>x*}^iG?3l13n2u@VE-S*2Qo?;JqD^$05?7dYS$n|$A$+W59?Jd z^QnkaV!B)>BAtm`*}5V<^Q;PnCLik6N@Vkh!IvAEtPQ<5>+`87Ubreu#2;0}Cr0OD zAtUP(j5djUHA-iNj}!WaDn=V+%5OYTd!pBQBJY&7ZdK~nOYtUJ@K7V0ieueKCZy3TDW${v@xP6C4u|%(#|7<)8eyHPkRqd4yZi+Epu~YsST9Kz4a!^F0W=W+ o9>ZSA>{G|1&H>#vI)qm4ilUWs+;@vRT8$koXRAe%hviiF56ag{bpQYW literal 0 HcmV?d00001 diff --git a/src/out/production/main/DateClass.class b/src/out/production/main/DateClass.class index de64ad878db3654a458604bd0174f04c41d8ed57..99177b307a6f8565ef1802bbfe469f7f5186dc10 100644 GIT binary patch delta 290 zcmXYrJ5Iwu6h+U>*cscHkPkS40CB=Ed|!iTvi7~z#vKZ`+}>Oy$8#d$8Tp$TFZRr7z{WJyy>i+0UQ z-{6SU`_I_3j(a3JG1cM0195drG&{Nzm(yWIc}@z}XoQ*TRo%bjQm(c|bk#GOEQ_so dateC7tS`U7{>XNoRgd+`FkXS;2Ku$E{{qK79xng@ delta 536 zcmY+AJ8u&~6otRpwLSJSgv9Y0NWeG-g5x-B!XxHUQy|4CQYy-owX%%jhr9y{4G}G! z<(3*s9)%-;gsAgl@)Ll&>oja}?wvd5o^xi;vcGlf^v{o9K#M0H7pQ4&=DFqJa65r@ z&7A^uHav1PJT_@+wlsGq^$!&lDOUDgg>S;ZMn^W-565xz?5GosY;QQ2e2FuGW_!A> zs;=SU^tsy38+Hu$C{5q1RbO-8@PLPgU0Rw)hR5toKdR2LVlkCH3IH!db_vPOJuHuIRinut5X)F}5 zh>y+elEEq^?yux=*~S$Et`_hKJ~gw?3OJ9?ZG2(lOMy)5NTAesCJ*JRC;h$ErVd?y zZ(YFZNUa2BlfAxnz12Dq?&NN`zN>EvT&j!)jv`ABNmdIwB%5itzIxC`FOb(klBmGx%F?JNgClvUHiGa# zYJusdmhJAA?8O2$zOr$ZN18!DY^x2|Br<)Xb;Wq$U=C{zW-x2xnuF_DcW??N2k+wp zdU7`ibfiPs+fsTz=tMI)+{oi=2RCtx+x7BK<;9K}qIe)QFnGK5OtrOx+qh%nu7eut z4&KA8gKx0G%1-j2X*)9Nz7=~?^W5X1k`qE&bY{$T81pC1z12J!(Nl+M^L}>%g9$8* z3rV;KH(tQExW~}P^(UfSX&qfJizR{i1KCxzz;8?aqpSBhi?sALHP*(E4&|E^u|D?J za&A-)d?qFy37i_3w&`oNr$PbyP32L8 zEhK^KqZSPzZw2lg_0*W-|5IB^QInq6blJ!@z86>=sc&3v0_Xnw94_$7QsgHm1Iu&` zXO?LgKC=*PrqdkHaP@>IvV6`}mtR0sSDqtNT{%YfIjlbjXK3iOtN2W;kbqrc!J18Yos@V50gbGB1$>e&^{#B^O7QVrD0v7gJ_| z58tr-%q)yTwPff1LVh<(rpaGnTff1|9`hTrYY~}h?#2?$V>m`38`qI2%nvD4Q-yOp zvy99uCN6ANXxTV#qs*Up#jO~d7+`{g7l>!@5gL3Jn9_Ybz;`raiR(PqRsNS>14^!P AfdBvi literal 0 HcmV?d00001 diff --git a/src/out/production/main/DeleteCommand.class b/src/out/production/main/DeleteCommand.class new file mode 100644 index 0000000000000000000000000000000000000000..ba2eda36583b7ef1bc6a312cba0ab12137a91d23 GIT binary patch literal 807 zcmZuv*>2N76g}fOb?mw=q!hZjP*x{t8KocPYwk{TVUpuid6Pm!1UX-4!8ZdCj}M)70LJc;6x@z;Ypu=szKZh`<*aRI-mSB zvrj73)o*2AW^z9s48o|_60qb@cJqw5RX;ci(=UNavsQ4dTESr!C*eog(rT4#awXtg zlnEHQq7_|Es&otxu%}pFY9#F!C{{V|hF$qJQ*o49XfQvF^Q0>eRN?)Sy`9hDY3O1W zTP|!k7PejNpy}c+LQlV=uoT|CDNfw@aq+L<&du&8;ODsHwvOvMFCe$m)@&$QSp zW<&d&@VQ;H&v^(e1qDZ*sebcKl7!!iF|q$+_P^m@c{`@iBGzP-oJJa+a@NaNBWfLN z@=a9uMg$joW;A%7h08d{?0~t!-KqbAsIUEm@uR4jXPifg(Sk_^o8JPno8xL+!*yoF z6|8(xsA7?Kn)5qxW$s?1eg^j zg2V$Kz(*mDoiyzOvUX-?cg~qJ*8-;Bu65}4qn;9240Nd84F{(xK9;9_o>YUVEBhT8>nxrg zn(0TK2+Rj>qfqTfgMkctEdfi7RCkyXwdx1QGWi_nBy9yJx)mIyQ7k{GR#vN&POk)< z%QOLFs3{~%Csi^52-q_$FEb>?=O|`52cxd~lIkc-EHoG&MZ>tO4t1uyaz)(ECwV4a zl(FT)hGSvd#SWSl9%ufEi>G*IVb{fTybvf~K~l=JL4l==rKzK4`~9r2K*7(Oy6BfG zdz=b|bFvpgjT5$JPll4u!0dB00?R>8IZSoG`6iC#w|ru(Ih_~D5_v|l75~4PwGP(# z+e>@~f{U%u8r+xR(#|tFWNgqo^`8*+wI49P=Q#_s3nY?&S-gK$=2S)zVUVqUsF+!h8!ptD$kj%5JS zj0`{vfg}fzX9wg@W@8jc%ui5(6_>j%zmqQ=|~{b_SLWKt4zfNIfHvKxl83foF1SiUNPCTn5%)-FR$iVATnw{!ek(^pk zl9``3*_u&0mKmslfq@YSfhvF`8<1zmzyyR03~XB3+Zh-)0$EH9>_CzWEDBP`%D@5S ai$PQ|Z~|pOfQ^Bhfd_0BFObK?zy|=iL=mt6 diff --git a/src/out/production/main/Event.class b/src/out/production/main/Event.class new file mode 100644 index 0000000000000000000000000000000000000000..eb468924e25d0d05dc4d6d53a900890498770ad7 GIT binary patch literal 1552 zcmah}?M@Rx6g|@}-LfnNi-4b46tol+zeT_=3Mg7cQ=&n_kD(o5?XuhKPMeVU*LTn- z@UJEk2#G#`52fDOU2RPpP1@Oe&&)md-ZOjm`;WtK0B+&AffUYlq8lRyMsZ$Q7ZjFF z)BZ#f7j;}x;G}`exT3792F~D`j_W#ZFvPfINEhDlI-j(;vo%?ip5<)KFlc2i1w(JR zSCf`KIZp`fBxWtgl6M&{WLpDUk+ByE(?@wB$HDZEv_X%mtzxFv4C;GU)Y z2-M`ZozvNj}X}JzVQo3Q43`etLtqB+PuSx{H#RD$BeY zuD)p6UzG-ga3LE6MgoFX;mTvz(iZ3)#3*WK@DkFHs6SnG;tpfbj+E^W8TCG^qN?}B11<| z1ZlO({mNf~zq{>QZ)!GVBXRoM+=9})Q(afy<~~VjQq6R&tFFQrM%smh+>MJi@DPtE zbbVoiWwKmOXV@6S;0~{dyz7*>d}+yTvV6%MNjaw4kT%sDHZjxoz7m!{?>bZ%d&O|1 zq1cim#g_2sRj6~jCRScE3}ly@DWVhVt$ZEb_w6=yv=OeEC8|xwlDf!c5~xvw<<#AZ zh~^?}e36%=>+R}Tp|l0pt<r(!`*tks(V{(?ZWU7){bq zTKmb{pc8R=_T|R+!EzIOh~*{@5Z{CLncx@(XiZZvV4wqCw04u9!XP1;FcimdoID~? zLqo*MQb}WE({x6urUD;G<@V8$`-0dZ62K=q9cD=ck?DZh4D3|I%y9Y-%R8z6VX0lM}PTKs^%9%~vQUB$H^MezWp$`B9w2r~>eWynPthUm;VVn3;Hrc;NS rjx#zk^kYA1E5JG$7$d@A!ecm#0zC~X=`o(-2?;Sqev#)g+M{GRpnQ&ZsyzQtxa!c z_f2xxTP385t!ZB|ug!5k}pL45GTK!Q=XHJW5h&j2_`u@bB^r1bDDD=iwUe8N}^ zJ8Xl1MJX*%o6 literal 0 HcmV?d00001 diff --git a/src/out/production/main/ListCommand.class b/src/out/production/main/ListCommand.class new file mode 100644 index 0000000000000000000000000000000000000000..fc75fd4a1e3c63130d1263a2b65f941b0e8cadaf GIT binary patch literal 541 zcmYjN%TB^T6g@)=rR6F31mA8DjVxVY+z?Gn8eQ;6To!0_6sV!C;kVpi;=&K`ql{;u z0!=#ian3#W%>4X*eFM0}iG?_JER;~Tu#2*RJp=m!i7Pph!L@)^IqeAO4X^JCjH*5aeHCFsZzymIsU7H z>vmh#?PlPOohP@hb|r%d60nvufmkSMMA0eb&j$p|#VqMJlb-t)NN?mDIAGoM!g0^N zmC9*;#mvQv^X{aPfMMV;jUyG01yU;%?ueWV6cxQDz1rQwVgvoOm7f9cK+pfzp_a}U zRbLEzMi@MktZIycF<$+I_?W>a&%~^$!D61C6OdvC<{4xuqJ|$?>5S(26tS}@w5326 r8i6EXlczNks?N!g5XX>1ekN{W4F!s-UJ>h@-C(X0+vLB+JcjK*?ww+7 literal 0 HcmV?d00001 diff --git a/src/out/production/main/Parser$1.class b/src/out/production/main/Parser$1.class new file mode 100644 index 0000000000000000000000000000000000000000..0c287db0decfa9cfb4d6a7c9f3caa3c41dd704d2 GIT binary patch literal 633 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 literal 0 HcmV?d00001 diff --git a/src/out/production/main/Storage.class b/src/out/production/main/Storage.class new file mode 100644 index 0000000000000000000000000000000000000000..a453838c58e0ae52f698c0002d04ca68e08b83cc GIT binary patch literal 3241 zcmaJ@TTmod8UA|cnbXrWund>oA&`&_dtn9^LzLZxb>jw>EGw|d&Sa5X)ZUo}dKtP& zcf&3k?}@jVyO*qqCSD?HyjEpFmnyZa(z1N8$||dT@+nWg&-V%2 zA8{S3P#&bP5{1&;|D#KpAseA;s=Ch=Ovee$ZQTy;%3=lJjw<#|(@#VOoTLeLxxg&U zPne5gKm@)hFe30J0+q989Wz++Xx?qRBTywq^-T%YzH+SIfmHVefiElQ-1T--iVUir zbC<<+#h+qXxc$rD0BaGWMb-YvS! zoe|3{mYDxi#Cw<@rb;c*Vf0Qs16? zTsQCo&s?0af;qS7Hze>K4c|5JJ$&E52`O5XAtHC^Kv>D=E?#2sR6Hd@W9K$&VjE*r z@(Mbt5u0>_QFqBHRy~Oj4Ivw2d6+Cr1vQ6dz!D4dMcZRu^2j8PhsDOVP;z}HL}NMR zmGYEN#GL6*hJ~X!Tx6qQ8CFtkdoS9p?{x24W*Vi=MZJfnjL|ad(IvA)%eFO;2%8~k zYmF(JfF=t*@~E|9!!}Q4ol864X=7Oub5`d5sOv45k7KIa>RC) z-Fd6r^dk#K&9LJN{8Y9m*PUNlWR;D{4l`Ubecz&4FIJmXmJwy=8Ph42EWayyIJDEU zD$2Hpc{ZzE*sFtF3EEB(!)B?JV+4l;ex~5S4*zzuO~I}2&WGFi!OZf@8G|Bw4R?xc zJY3`4v8FlS$0OzZ$>Os^8mR+H5*W;v+IaY^sFH3B{5pcWfQrnNORy-sg%jzeNN!XYDbn&Tdh zJjedDmTF!@%T*k#8Az_8ljqj(+^Wj+9-jAx=R|xU*^>M*-<;u)zZgfF;}FO34eXmv zC)SZ36szdkKpRi#c%pwDw@6BA1MQoX4r!*^pSqQT2eh>KBO249MZ1REvT3n~&Z*U# z?b%;Ysv6pR9?jf$Lc@OU?m!0)qKjHH=qB=62DFz!?86&G@wa^Od&c0e%&xyNi{502 z-y;71Ch~9NZuXs1ipuYp%*2No!wmjTEPAQwF8qb`5ys#+{zQy=nJg#p2aMug{*8SL zP4fFi8yKH*j5XZAS$vQw)Qo>&JWQ+({1X$HB;FErgLe_vecato$|P!UphKWmKozLF zNrEnr*(3;@7s!S40nRLoh6bapuJJ#pze&gWW{X!wppr>>JV5C&T%evQd??B&T<01m z{aEVuiR>EoPxk&AcPRV@cXHFE;CDDMsP?4QH5~jE4qeA#U}E*=KQc1unEBl@>!TR7 z5e*sn8hYGLpR@G$2#r5VKP8qj``cN;5-nLm$2RNWSQ(=lMr0zag9ntkB)Fbv^ uXrbrRZ}U%l#j~NZXAe^MLzEn2++-H&^z?`L34X*J{4~!R&!6G=?Ee6C=G3kL literal 0 HcmV?d00001 diff --git a/src/out/production/main/Task.class b/src/out/production/main/Task.class new file mode 100644 index 0000000000000000000000000000000000000000..c486f07cd6ed7cda628d07dd01fdf8aecd9f28dd GIT binary patch literal 1216 zcmaJ>T~8B16g|^!yW3@!IYi)~%O{z7# zCsbW=)eYBOEoi*B*k6WVgmIf2yc5xwSYoi0j1@E3Z5}jVB%;$rt;!Dhp{UBB%@sLy z*$rG#^|Y*7Mun*Iz@HoF}LXWjQjP-*cn6eQxf zS46@QPvAB88!Zve$BE^BWj&E|iCaeVN9f)7bY&!!KHtkYgAWrj+DM5OT4L5!a-BUdSlA59?Fq~lHoF@DOb0> zny_R`#<_0osH+JY(qs=qHfAswu25WyzZ%t>!9!YY;(S2=QmdqLfqaYnoAkT&7ij?r A`Tzg` literal 0 HcmV?d00001 diff --git a/src/out/production/main/TaskList.class b/src/out/production/main/TaskList.class new file mode 100644 index 0000000000000000000000000000000000000000..fd3d157d0b036f279687ac8e64eef9ebc6ade7e2 GIT binary patch literal 1831 zcmaJ>TXWk)6#iCrtyn0waV||UX#-6g+X*rE0uF)1C9PYh4LBq%ys)u%64kQgk=7Z^ zGe3f7UU&rt+?g`N@XT-EmoN-)R+1g1HH=4lIeX6eE-UNzzn}aH;07KV$YM2(4AykK zVjzK4HLRBKd~f;`RaeEVYkvJj2WczfD}mril;mAyH73Cbm?;HflO?N zZ&%0@x9w+BxHW~_ChEAOdqs>V!>+ZGji!z z1g9ka=_0yiqszU{mVYyFDCt{YkxcTHY>7cM2fh?tI&k}EFPG(3_B_jxP3Z~Vts1zG zJxXEgjNxLJcSOx~T3jAl@`P5tH& z+fR9->z)c7A1e<(WmrCwZ8@iIM^wV>klzk(N!J_bI8<+p>vsA*2D9!s!mHWb_XUyu zCT?xiBfPHL+-cjwUk(eaF=-K_Sma#cKE3G^(m#*ohZkFon-jIDaocWMQqbT20mHRt z^iAT%aQXl9@DhD{vh-PD^w3L9v--$rm_drxvzVjxJVhSRtkGK>G!WhmVnr zFtr$FhA^}A%LSNW-&}-A+HqyvZ^Zs5Xsbh9I8^MzPDa3VmYC1|2lFLziM|+k8CRoz z$_=GCU#5PAAyU6V-(4GGYVG@R-_Vr>QhSN`6@uPNVb$1`JeF~ddYa_6LeXfQ!^njJ zsZ*Yp6B`8uG(`GaT=@}3A^F7!_z8KAAs{$!jCUA_in@V^X1uIp^MAzrXziu!eF9D(>r8!K#K?4G(mTVvWtZz?e?K zbzQdQ=zHGVCwc4!9j~PzoiAJp zs5_09o`M0(552w4(Z1KLy88inG+9x3rC=s+9lFQvQs9OMOLn{IhX=(%Z}Y6xsJlVU zZTei=tye?$h}vZTttIUxKlIxh3P%6adbd!cq1vx~Qk$~P@xz!tWt=Xub;4eS`0$AW<|j2oC> zGs$L(O^(epn;DEN=)YJCpHEj*4;mqzHk>c?XshfWdi6FbTJ4>7CvaP>Vo%!N&0g+W z++3y?GD^=+Y)-H$fRKbqByAE&ok|+B5?|p^JACtZ;{71%R(Ln8K-qp7N59`IQ;-^ zej)b-$xkxed)!62hTAM1cVx~Y1eUPa74m@w;qU!-s7_Xke}OnbN)la_q)!qfAxT=2 z{-h)Wl4LYV1|`V~NrogD&Yb0qWV9dDJs!~;bkqoawv&jEww+{z0o&0c4BC!}Fl0L! da*fz0P(e$%X&` literal 0 HcmV?d00001 diff --git a/src/out/production/main/Todo.class b/src/out/production/main/Todo.class new file mode 100644 index 0000000000000000000000000000000000000000..c8da7caa64837bf62d8e5b439dd859137e1ca6af GIT binary patch literal 1288 zcmah}>rN9v6#k}Ny6v*a9mNZRTr5Sw3tq5@N)3^u$d5J{B>ouM0hTU1&F-`biSaq~ z3H+;x34}x+z=smgbXQwKquJf*oHOTq=ljmg^yjaW9{?U9XQ30<^f1y#jvGmgo0v$! z!lZ>M+|;wQg<(va$e5U6NGv*@qm~#3)A@Z~=W{OicIOJpcf8%~^ag{GlV!osop(I( zx^}QF{373W$4$C3V2QXjrblDih5JS(h zlqyg@udWHTC(A*10<%fX*|>wd#I!j2esr>|2NKZJB)Y!6FG|YBJ=`}jZ{q6w#P! zw<#@f(LPbbo#3VPNIQGW(Ay-x>M5}+dks0HYv@d8;(h|vQiGBZbDUuhOYH;q=qYoLRk9@k+bA;Fl6~Y&a4Dk}Q2BaETc4KZuSadG`B7C4~I&Qqr==hF~&3NV;5}#lipJBw0 zVHP$G@+1q#NNMPJgK7wUp#^$8g1$sCGl-oMS7wqV!^E(O%k;8ST59+@nm$H=SI8g3 ZRqBiG0mCAm<0<`-T_-z9_9%U0zX2&DEfD|! literal 0 HcmV?d00001 diff --git a/src/out/production/main/Ui.class b/src/out/production/main/Ui.class new file mode 100644 index 0000000000000000000000000000000000000000..4d44f9cc9f9b56b7ddbd6ac99ae281996162e035 GIT binary patch literal 2301 zcma)8YgZdp6x{_rAu&%xeD*mZ~&vX>ic#4vGE*p5J5I#4sp`)Tf_xFY4 zNKeC1@ufHx`9@&Z@|7sKs3EyzJ9cniLvL<+TSH>SwWNlDqV331qrNA-O|e&FWU%P& zi`usEZ1o%m6TyM)v#7Xb6UwN1QUMt^cy;iPIu?7gf`d zt~(k=JA0lUo%bE@RHDI}%E4&l z_5=+VJSnUdw_XNxc+drsLQgSYXHhD-mkhK|h) zwy>=db~1PiV;OvbU5>miYc+S$EZnG@j~jlP}lYTM_rsbM1T+cjp8xM4RnZa}1 z<^eo9m2>90dnC=kHGL`7zA380c1+)Ook^ywOHZ1DpWuKWYV4cbWu9j$4=rdIUvmS~ z4(8bRn5mW}EhgK3n9a-cRR&+Lhu z*7DvOF0Dpa6vd*~eG_Qs2<_peI zBcLs$sMFo&H|dQH<Q(MnyWO|yaN1wmru(`a0Lv_yoNUO2YPm2 zq4zZszoPGFhI{Z{SklAq1b>nk=PDDGU;>x4}DksFNU80o<@S2LK6d7Y3~FXNZl|K|Up(I2Hlrx_*)tSFdqEIL7g#T3-)Cf;YO z78$kIA~Q!ac~Xw-Q)H$RDXYX7ibW!+*0D$3rzk=W101C#K(;ABHteYp^A>K$$PZ)W zQ1*`FQ-AHj3Y|P#Xhsvwz#V)@6b*MVAEPN$ Date: Mon, 2 Sep 2019 23:57:44 +0800 Subject: [PATCH 19/38] A-JUnit --- src/out/test/test/DukeTest.class | Bin 0 -> 469 bytes src/test/java/DukeTest.java | 11 +++++++++++ 2 files changed, 11 insertions(+) create mode 100644 src/out/test/test/DukeTest.class create mode 100644 src/test/java/DukeTest.java diff --git a/src/out/test/test/DukeTest.class b/src/out/test/test/DukeTest.class new file mode 100644 index 0000000000000000000000000000000000000000..908c301b304228418b0b9e52759592d167bfaa03 GIT binary patch literal 469 zcmZuuO-sW-6r63Fq+L_3^|RnXZ>t2Tl`C@f zwN49Bs8o|_FHEy(Ff%lraIOlO1!As(GKSx$CL7CZWrsJH`A0MHEPOa{J#72f!7f96 z*<@(hb`T3a4Q@v>Ii?l%|DV#&bD5Q!_+mk>o{WfTF{e8i^dcOfN|$Ay3P^-Y=n)I3 zGOEtu8`$fjT_?0{644;^%Xf|yVvM*;A=Z4n2&1nZ=N*+_HzytBb-@25xWsHila9?_ LrAq&Xu!7bP2QXeP literal 0 HcmV?d00001 diff --git a/src/test/java/DukeTest.java b/src/test/java/DukeTest.java new file mode 100644 index 0000000000..73a4c60138 --- /dev/null +++ b/src/test/java/DukeTest.java @@ -0,0 +1,11 @@ +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class DukeTest { + + @Test + public void dummyTest() { + assertEquals(2, 2); + } +} From e5b08a3b623a3edc050c281e3e72be94e25574d7 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Tue, 3 Sep 2019 15:15:12 +0800 Subject: [PATCH 20/38] Level-9 (Now Able to Find Tasks!) --- src/.idea/artifacts/src_jar.xml | 8 ++++ src/main/java/FindCommand.java | 19 ++++++++ src/main/java/META-INF/MANIFEST.MF | 3 ++ src/main/java/Parser.java | 48 +++++++++++++------ src/main/java/TaskList.java | 13 +++++ src/main/java/Ui.java | 9 ++++ src/out/artifacts/src_jar/src.jar | Bin 0 -> 16750 bytes src/out/production/main/FindCommand.class | Bin 0 -> 725 bytes src/out/production/main/META-INF/MANIFEST.MF | 3 ++ src/out/production/main/Parser$1.class | Bin 633 -> 633 bytes src/out/production/main/Parser.class | Bin 3260 -> 3477 bytes src/out/production/main/TaskList.class | Bin 1831 -> 2484 bytes src/out/production/main/Ui.class | Bin 2301 -> 2566 bytes 13 files changed, 88 insertions(+), 15 deletions(-) create mode 100644 src/.idea/artifacts/src_jar.xml create mode 100644 src/main/java/FindCommand.java create mode 100644 src/main/java/META-INF/MANIFEST.MF create mode 100644 src/out/artifacts/src_jar/src.jar create mode 100644 src/out/production/main/FindCommand.class create mode 100644 src/out/production/main/META-INF/MANIFEST.MF diff --git a/src/.idea/artifacts/src_jar.xml b/src/.idea/artifacts/src_jar.xml new file mode 100644 index 0000000000..7aadf97768 --- /dev/null +++ b/src/.idea/artifacts/src_jar.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/out/artifacts/src_jar + + + + + \ No newline at end of file diff --git a/src/main/java/FindCommand.java b/src/main/java/FindCommand.java new file mode 100644 index 0000000000..032b17b05c --- /dev/null +++ b/src/main/java/FindCommand.java @@ -0,0 +1,19 @@ +import java.io.IOException; + +public class FindCommand extends Command { + + String text; + + public FindCommand(String text) { + this.text = text; + } + + + @Override + public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + + Task[] matchedTasks = taskList.find(text); + + ui.find(matchedTasks); + } +} diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..d2ffd5b4d2 --- /dev/null +++ b/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: Duke + diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 834c14e48e..f93caf7741 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -8,6 +8,7 @@ public static Command parse (String command) throws DukeException { Task task = null; int index; + String text; switch (words[0]) { case "todo": @@ -23,8 +24,12 @@ public static Command parse (String command) throws DukeException { index = Parser.parsesDone(command); return new DoneCommand(index); case "delete": - index = Parser.parsesDone(command); + index = Parser.parsesDelete(command); return new DeleteCommand(index); + case "find": + text = Parser.parsesFind(command); + return new FindCommand(text); + } switch (command) { @@ -38,6 +43,33 @@ public static Command parse (String command) throws DukeException { } + private static String parsesFind(String command) throws DukeException { + + String[] words = command.split(" ", 2); + + if (words.length == 1) throw DukeException.emptyDescription(); + + if (words[1].isBlank()) throw DukeException.emptyDescription(); + + String text = words[1]; + + return text; + } + + public static int parsesDelete (String command) throws DukeException { + + String[] words = command.split(" ", 2); + + if (words.length == 1) throw DukeException.emptyDescription(); + + if (words[1].isBlank()) throw DukeException.emptyDescription(); + + int index = Integer.valueOf(words[1]) - 1; + + return index; + + } + public static int parsesDone (String command) throws DukeException { String[] words = command.split(" ", 2); @@ -106,18 +138,4 @@ public static Task parsesAdd (String command, TaskType taskType) throws DukeExce } - public static int parsesDelete (String command) throws DukeException { - String[] words = command.split(" ", 2); - - if (words.length == 1) throw DukeException.emptyDescription(); - - if (words[1].isBlank()) throw DukeException.emptyDescription(); - - System.out.println("Noted. I've removed this task:"); - - int index = Integer.valueOf(words[1]) - 1; - - return index; - } - } diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 7b361ee7ca..7bf41c8aca 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -41,4 +41,17 @@ public Task delete (int index) { return task; } + + public Task[] find(String text) { + + ArrayList tasks = new ArrayList<>(); + + for (Task task : list) { + if (task.description.toLowerCase().contains(text.toLowerCase())) { + tasks.add(task); + } + } + + return tasks.toArray(new Task[tasks.size()]); + } } diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index e4d2541826..808b59bfad 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -52,4 +52,13 @@ public String readCommand() { public void abort() { System.out.println("SORRY SOMETHING WENT SERIOUSLY WRONG! \nGoodbye!"); } + + public void find(Task[] matchedTasks) { + + System.out.println("Here are the matching tasks in your list:"); + + for (Task task : matchedTasks) { + System.out.println(task); + } + } } diff --git a/src/out/artifacts/src_jar/src.jar b/src/out/artifacts/src_jar/src.jar new file mode 100644 index 0000000000000000000000000000000000000000..a2860c1740189f22ce5fb82f69c9a8949b095c7a GIT binary patch literal 16750 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 literal 0 HcmV?d00001 diff --git a/src/out/production/main/META-INF/MANIFEST.MF b/src/out/production/main/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..d2ffd5b4d2 --- /dev/null +++ b/src/out/production/main/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: Duke + diff --git a/src/out/production/main/Parser$1.class b/src/out/production/main/Parser$1.class index 0c287db0decfa9cfb4d6a7c9f3caa3c41dd704d2..73a897e9e33553cd8811810ba77a83424d6014bc 100644 GIT binary patch delta 13 Ucmey#@{?tQE)!$oWIZNt03>q+N&o-= delta 13 Ucmey#@{?tQE)%2UWIZNt03*``DgXcg diff --git a/src/out/production/main/Parser.class b/src/out/production/main/Parser.class index 17a0d2b0a7aaf79044e0ab0579714606c4d32878..bee64c5053f836f9dce052726a7eb80e3eae879a 100644 GIT binary patch literal 3477 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 diff --git a/src/out/production/main/TaskList.class b/src/out/production/main/TaskList.class index fd3d157d0b036f279687ac8e64eef9ebc6ade7e2..065c772f7e32899cac69865fd588caf35f35f8b5 100644 GIT binary patch literal 2484 zcmaJ@TXz#x6#h<6e`L^NI{^8RMQqs@C|-E+ zN64!$ys8Vs5|=KXebiTf2}{NA%uJ>!L|0bMnR8~J{ayB+Nq+n1@vi`m;$9lta4dxp z9M@1xBaUNgm{!9H4JXsk@U~iw~+M89wdz)|s@2jDdV(?rV^H@;B z1$FlW4IgSKYgiOW)J@kD*jlKdM(Eg*wHIyy0j?W zTJa=f`=?FI^iB$l=6XdI^A`y>V^^7KsAO8ke56mIAZYI1H z(-lbj7$KvPje%>;PVjh7)QF!#kLUbRR;yH&3z++?JZhkTV23QLwna{<+-$zH)n{5& zW&fUQ)FBXA5nPOZaEd>oT(fdP(~{g4yaP;co} zQ3tN#nud>ce1cB}hR@ix=X#E8&Kcf{U3G{0@mUhrbx15}sOYG|&~XEobu42=hl!gy zYN+dI;E)DOhmEF=TX1x^pdu}jnC#FcjL*+kxv+H8s3_&@lxID|k)G|a3A;TDB8&N} zEZef7T2xiz`AlrPbVE9|)9zWnWC_>2ORrdH)~O4(yykjFgE#D!N)_ZW?WqeajK}gA zvcU(fg;j=#143Y1L)MHL+p0+KlIgAR%Jrn>u^ad1W?!Vy%`B{Tr!E^&Xi-yP)~)CC zc6x+u+V2<*dzCVhX5`ICE`;zO(T-=7udPUT-tQ)grdbKgUu@~bciGP9O;y9KIA+r` zZ4&4<$Zt^wcy`IYZ8$U1C4r4uB4NpjZF$nP=*EUVpIMPk*|^m*tcu}RPV;R4Z6c7% zUF+dmk39{yRr`G|FtJ{2(^|D_M)({BRXHasY??I#%=_*uFOUE-CgwrnJv=3z={I59T@KnMa_2ePKT3 zhSHoVFkiNf{wL7pCfi6(ei!8pTp6X>G4jj$xyOT3kt-QYVn1{0=!Zgy@p=>;7uKjw zd0vQ5XBAKzsc*6C2c)x!>mA_7^c-#IUkmZz*`Mn*$?zRqEfF zy^r%kSmn7u>EQhSpD-kF9|c|v3lQ{pVl43xFSU_j2{UbMzK`_eSVEQa!LvUm>3`}M zXl-nHf~|^P!ta#r^cI*x5(hCs*duroCvX_2_-ARHcM6P~V2zaj%Cm)t_yQvjk!F&A zj}9{;Mh}DT4R*5JQN9f!{x^m-#5Ek5eCoS(l-n`9g}a>7OmPQaV2vqexK46?mfv^& E1^Jj5v;Y7A delta 704 zcmZ{h%Tg0T6o$W^A?eB34l!47j0B@bK#dn7C|-zoH(o)(1&b^Z78amYE?u~CMfDT7 za&47vT=)R$#uxDcEX(rrBqnaGsqQ}K%=!QG|J@(*@1o@|zdwBjW_S`Z%v6SmqncwO zK2vTx?zV>JM2P03OHO4t&2&ycvms|W=W27B^O_5ap^dezZAEeCZQ=b+Q`wwXX%(m# zvg}dhpLSk!8qc@aHX5zX&CbiVG#mDF(Qt`*K`(W-)(tHOxXgm)is35P>@%-ax*l-D zaFbh_+lDrG40oBg-@K|-{wx0;_w8%{O`v(;x*pjmHKCU6Z0e(0u|HDnS|s*B$r34Y zIs+bg(h?UaN?fw5>3Fd$^++s1$Pl~8U>K3CBpt3c%3e8L)a8jKHVLn*B^X;B7^usLiGL(SeF;%tg4dJaOQ(CBNtTieP(0)@i-KrM9>|O{vS$7O D9x+1l diff --git a/src/out/production/main/Ui.class b/src/out/production/main/Ui.class index 4d44f9cc9f9b56b7ddbd6ac99ae281996162e035..3f01db8b3cd690810f40389d05bf9832e7816103 100644 GIT binary patch delta 1212 zcmZuw$x;(h6g{t#baz67L52tf2!lWd=1BuGhyyA(fjA&&69Nf@K#^b-RaRwVxpHIm zA6Qnoa3c;ZT<`&|_ykv0xp3#gjp)7IF~O=-DzERm@7{AxpZofE>GSf;m!r=I00yz; zf*a!s&O0%I3ob~w=!6HCczapJqzhMYRmC+GQ!1uixQ-jV+~oW%6}J`4xG;-5yq{BX zml5u%xUb@Yf_VWY715K)=(a%F)SCW8@7zhp6PT2$O7plg7MX&F8Wymqp&E}g zoI;g`$Iy*WQczyf5J9i;O^UgfHAJzZVHGh>#*IbWP|=!(btE)wAZfg|`E8pRG!AWj z0smxlJL=QvpN>U+rp$P9)t6?WzIf8NyScONOT<&@@CV7B7BwF76%b?x(Nk1JG0COX zYrJ$c2Wu(EW&w8k$*7}9qf?*^_3+VCpdnlT)lr?v*E^w7XTIKp?Gflcq7^;rCO? z>0kk)L!`O=7@C?xQ_+WhLJ=7Z(7-IX9!@Y^;3FLSD1S$>H8;!nZWGF~?H`oDncU3& z8+=6pJ^l2C1IIw<_GGfx?JUAs6)%WWCgvbtpGrarPKORgYyCU&L4NM$5lYQuZPjc~&p%)HboZz9pU$P9f4~0#Fo9JMK2AEAba4u& zJ(xJ-B7-T}PAklKIE!-%=M^p}T=Z}Wmu0yk{;LYt99;Ks12<(qt8hyQw-xR@ zX0UB`4fP;vp!0R@L#_P&-K#g{xy9Pr+VZ-CyBha!U!w=}8eQntcz}n&Z?j}S(s+zY zP_$P4CmIWQs__iZ#aRo!Sd+V7Xe?q$V;L`lUslmtK{ZGv#3Mg8VTI*x z!A`n6P@CMCh#`9j>1YcnG$5l*kV?{Pq1YkbZ%a6U0p837S!ZTmA}0AjAkBywR-zka zMv(L~Q~|^F^u;RRAi0O=jY=V&!}J`X$3&6VAW9*7%Nbq}b_Xo3eQ=N`rx0@c>%ORr zavE{PI*MbwA4ib0IKmJkl$i&66ilhS(HqoMY9r3oZ{+HSB!kKkR7B4#rb(6;DHgrd zQZ1QB@P@(c V2KKheXPh0WHbLS+Iv$2P@ek-;QON)R From e56bf4d5765f86418e714f33289cf39de7649c14 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Tue, 3 Sep 2019 16:56:27 +0800 Subject: [PATCH 21/38] A-JavaDoc (Added Java Doc for every class & every method) --- src/main/java/AddCommand.java | 14 ++++++++ src/main/java/Command.java | 14 ++++++++ src/main/java/DateClass.java | 8 +++++ src/main/java/Deadline.java | 16 +++++++++ src/main/java/DeleteCommand.java | 15 ++++++++ src/main/java/DoneCommand.java | 15 ++++++++ src/main/java/Duke.java | 19 ++++++++++- src/main/java/DukeException.java | 11 ++++++ src/main/java/Event.java | 11 ++++++ src/main/java/ExitCommand.java | 14 ++++++++ src/main/java/ListCommand.java | 10 ++++++ src/main/java/Parser.java | 28 +++++++++++++++ src/main/java/Storage.java | 31 ++++++++++++++++- src/main/java/Task.java | 22 ++++++++++++ src/main/java/TaskList.java | 20 +++++++++++ src/main/java/TaskType.java | 5 ++- src/main/java/Todo.java | 11 ++++++ src/main/java/Ui.java | 36 ++++++++++++++++++++ src/out/production/main/AddCommand.class | Bin 729 -> 729 bytes src/out/production/main/Command.class | Bin 414 -> 414 bytes src/out/production/main/DateClass.class | Bin 750 -> 750 bytes src/out/production/main/Deadline.class | Bin 1561 -> 1561 bytes src/out/production/main/DeleteCommand.class | Bin 807 -> 807 bytes src/out/production/main/DoneCommand.class | Bin 774 -> 774 bytes src/out/production/main/DukeException.class | Bin 483 -> 483 bytes src/out/production/main/Event.class | Bin 1552 -> 1552 bytes src/out/production/main/ExitCommand.class | Bin 586 -> 586 bytes src/out/production/main/ListCommand.class | Bin 541 -> 541 bytes src/out/production/main/Parser$1.class | Bin 633 -> 633 bytes src/out/production/main/Parser.class | Bin 3260 -> 3260 bytes src/out/production/main/Storage.class | Bin 3241 -> 3241 bytes src/out/production/main/Task.class | Bin 1216 -> 1216 bytes src/out/production/main/TaskList.class | Bin 1831 -> 1831 bytes src/out/production/main/TaskType.class | Bin 1102 -> 910 bytes src/out/production/main/Todo.class | Bin 1288 -> 1288 bytes src/out/production/main/Ui.class | Bin 2301 -> 2301 bytes 36 files changed, 297 insertions(+), 3 deletions(-) diff --git a/src/main/java/AddCommand.java b/src/main/java/AddCommand.java index 78b2844261..fd5e2569c7 100644 --- a/src/main/java/AddCommand.java +++ b/src/main/java/AddCommand.java @@ -1,14 +1,28 @@ import java.io.IOException; +/** + * This class is initiased and its execute method is called whenever you want to add something to the task list. + */ public class AddCommand extends Command { private Task task; + /** + * Intialise this class with a task + * @param task The Task + */ public AddCommand (Task task) { this.task = task; } + /** + * Add the task to the task list + * @param taskList T + * @param ui + * @param storage + * @throws IOException + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { diff --git a/src/main/java/Command.java b/src/main/java/Command.java index 528cc50fdd..580b9045f4 100644 --- a/src/main/java/Command.java +++ b/src/main/java/Command.java @@ -1,9 +1,23 @@ import java.io.IOException; +/** + * Represents a command that has to be carried out + */ public abstract class Command { + /** + * Executes the Command + * @param taskList + * @param ui + * @param storage + * @throws IOException + */ public abstract void execute (TaskList taskList, Ui ui, Storage storage) throws IOException; + /** + * Checks whether the command is to exit the program + * @return + */ public boolean isExit() { return false; } diff --git a/src/main/java/DateClass.java b/src/main/java/DateClass.java index e6408e835f..560c746b94 100644 --- a/src/main/java/DateClass.java +++ b/src/main/java/DateClass.java @@ -2,8 +2,16 @@ import java.text.SimpleDateFormat; import java.util.Date; +/** + * Class that converts strings to dates + */ public class DateClass { + /** + * Converts String object to Date object + * @param string The String + * @return The Date + */ public static Date stringToDate (String string) { SimpleDateFormat format = new SimpleDateFormat("d/MM/yyyy HHmm"); diff --git a/src/main/java/Deadline.java b/src/main/java/Deadline.java index 5cf2e9a563..62effe5e67 100644 --- a/src/main/java/Deadline.java +++ b/src/main/java/Deadline.java @@ -1,11 +1,19 @@ import java.util.Date; +/** + * Represents a type of task + */ public class Deadline extends Task { protected String by; protected Date date; + /** + * Initialises the Deadline Class with the description of the deadline and when it is due + * @param description Description of the Deadline + * @param by When it is due + */ public Deadline(String description, String by) { super(description); this.by = by; @@ -13,11 +21,19 @@ public Deadline(String description, String by) { this.date = DateClass.stringToDate(by); } + /** + * Returns user-readable string + * @return User-readable String + */ @Override public String toString() { return "[D]" + super.toString() + " (by: " + by + ")"; } + /** + * Returns formatted string used while saving + * @return Formatted String + */ @Override public String saveFormat() { return String.format("D | %d | %s | %s", this.isDone ? 1 : 0, this.description, this.by); diff --git a/src/main/java/DeleteCommand.java b/src/main/java/DeleteCommand.java index 11119f64fc..4d06a27fd9 100644 --- a/src/main/java/DeleteCommand.java +++ b/src/main/java/DeleteCommand.java @@ -1,13 +1,28 @@ import java.io.IOException; +/** + * This class is initiased and its execute method is called whenever you want to delete something from the task list. + */ public class DeleteCommand extends Command { int index; + /** + * Intialise this class with an index + * @param index The Index + */ public DeleteCommand (int index) { this.index = index; } + + /** + * Deletes the Task in the task list for the given index + * @param taskList + * @param ui + * @param storage + * @throws IOException + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { diff --git a/src/main/java/DoneCommand.java b/src/main/java/DoneCommand.java index 0a7344e90a..2c0c036c22 100644 --- a/src/main/java/DoneCommand.java +++ b/src/main/java/DoneCommand.java @@ -1,13 +1,28 @@ import java.io.IOException; +/** + * This class is initiased and its execute method is called whenever you want to change the done status of a task in the task list. + */ public class DoneCommand extends Command { int index; + /** + * Intialises this class with an index + * @param index The Index + */ public DoneCommand (int index) { this.index = index; } + + /** + * Changes the done status of the task in the task list found from the given index + * @param taskList + * @param ui + * @param storage + * @throws IOException + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 69d8480f81..1805cf2bf7 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -2,12 +2,21 @@ import java.io.IOException; import java.util.Scanner; +/** + * Class where the main logic is executed + */ public class Duke { private Storage storage; private TaskList tasks; private Ui ui; + /** + * Intialises all the classes needed to run this Application. + * It also retrieves the previous tasks saved in the last session. + * @param filePath File Path of duke.txt + * @param folderPath Folder Path in which duke.txt is saved + */ public Duke(String filePath, String folderPath) { ui = new Ui(); storage = new Storage(filePath, folderPath); @@ -25,6 +34,9 @@ public Duke(String filePath, String folderPath) { } } + /** + * Runs the main logic of the application + */ public void run() { ui.greeting(); boolean isExit = false; @@ -43,7 +55,12 @@ public void run() { } } - + /** + * This is the starting point of the application + * @param args + * @throws DukeException + * @throws IOException + */ public static void main(String[] args) throws DukeException, IOException { new Duke("../data/duke.txt", "../data").run(); diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java index 8a36354295..407d432475 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/DukeException.java @@ -1,9 +1,20 @@ +/** + * Deal with errors such as incorrect inputs entered by the user. + */ public class DukeException extends Exception { + /** + * Initialises DukeException with the error message + * @param message The Error Message + */ public DukeException (String message) { super(message); } + /** + * Returns a DukeException indicating that the description is empty + * @return The DukeException + */ public static DukeException emptyDescription () { return new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); } diff --git a/src/main/java/Event.java b/src/main/java/Event.java index e5a1292c6c..7f2237e30a 100644 --- a/src/main/java/Event.java +++ b/src/main/java/Event.java @@ -1,5 +1,8 @@ import java.util.Date; +/** + * Represents a type of task + */ public class Event extends Task { protected String at; @@ -13,11 +16,19 @@ public Event(String description, String at) { this.date = DateClass.stringToDate(at); } + /** + * Returns user-readable string + * @return User-readable string + */ @Override public String toString() { return "[E]" + super.toString() + " (at: " + at + ")"; } + /** + * Returns formatted string used while saving + * @return Formatted String + */ @Override public String saveFormat() { return String.format("E | %d | %s | %s", this.isDone ? 1 : 0, this.description, this.at); diff --git a/src/main/java/ExitCommand.java b/src/main/java/ExitCommand.java index baed38c529..8ce460ff6d 100644 --- a/src/main/java/ExitCommand.java +++ b/src/main/java/ExitCommand.java @@ -1,12 +1,26 @@ import java.io.IOException; +/** + * This class is initiased and its execute method is called whenever you want to exit from the application. + */ public class ExitCommand extends Command { + /** + * Bids farewell to the user + * @param taskList + * @param ui + * @param storage + * @throws IOException + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { ui.bye(); } + /** + * Marks isExit as true to exit the program + * @return + */ @Override public boolean isExit() { return true; diff --git a/src/main/java/ListCommand.java b/src/main/java/ListCommand.java index 419f9a239b..7e873c9102 100644 --- a/src/main/java/ListCommand.java +++ b/src/main/java/ListCommand.java @@ -1,8 +1,18 @@ import java.io.IOException; +/** + * This class is initiased and its execute method is called whenever you want get all the tasks in the task list. + */ public class ListCommand extends Command { + /** + * Lists all the tasks in the task list + * @param taskList + * @param ui + * @param storage + * @throws IOException + */ @Override public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { ui.list(); diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 834c14e48e..2c55d6847f 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -1,7 +1,16 @@ import java.util.DuplicateFormatFlagsException; +/** + * This class deals with making sense of the user command + */ public class Parser { + /** + * Parses the input given by the user + * @param command The inputted text + * @return + * @throws DukeException + */ public static Command parse (String command) throws DukeException { String[] words = command.split(" ", 2); @@ -38,6 +47,12 @@ public static Command parse (String command) throws DukeException { } + /** + * Parses the done string and returns the index of the done task + * @param command done string + * @return index of done task + * @throws DukeException + */ public static int parsesDone (String command) throws DukeException { String[] words = command.split(" ", 2); @@ -52,6 +67,13 @@ public static int parsesDone (String command) throws DukeException { } + /** + * Parses the add string and returns the task + * @param command add string + * @param taskType type of task (todo, event, deadline) + * @return The Task to be added + * @throws DukeException + */ public static Task parsesAdd (String command, TaskType taskType) throws DukeException { String[] words = command.split(" ", 2); @@ -106,6 +128,12 @@ public static Task parsesAdd (String command, TaskType taskType) throws DukeExce } + /** + * parses the delete string to get the index of the Task to be deleted + * @param command delete string + * @return index of the task to be deleted + * @throws DukeException + */ public static int parsesDelete (String command) throws DukeException { String[] words = command.split(" ", 2); diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index c8122d0833..769b3e3b3f 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -5,28 +5,52 @@ import java.util.ArrayList; import java.util.Scanner; +/** + * This class deals with loading tasks from the file and saving tasks in the file + */ public class Storage { public String folderPath; public String filePath; + /** + * Initialises a Storage Class with a filePath and a folderPath + * @param filePath + * @param folderPath + */ public Storage(String filePath, String folderPath) { this.filePath = filePath; this.folderPath = folderPath; } - public void makeDirectory (String filePath) throws IOException { + /** + * Makes the directory of the folder if it didn't exist before + * @param the folder path to make the directory + * @throws IOException + */ + public void makeDirectory (String folderPath) throws IOException { File file = new File(filePath); file.mkdirs(); } + /** + * Saves the file in the specified filePath + * @param filePath specified filePath + * @param textToAdd the data (text) to save inside the file + * @throws IOException + */ public void writeToFile(String filePath, String textToAdd) throws IOException { FileWriter fw = new FileWriter(filePath); fw.write(textToAdd); fw.close(); } + /** + * Retrives the preivously saved tasks form the filePath + * @return Previously saved tasks + * @throws FileNotFoundException + */ public ArrayList retrieve () throws FileNotFoundException { ArrayList list = new ArrayList<>(); @@ -67,6 +91,11 @@ public ArrayList retrieve () throws FileNotFoundException { return list; } + /** + * Saves the Tasks in a file + * @param list The list of tasks to save + * @throws IOException + */ public void save (ArrayList list) throws IOException { String s = ""; diff --git a/src/main/java/Task.java b/src/main/java/Task.java index 7e4fc70eff..647f97e169 100644 --- a/src/main/java/Task.java +++ b/src/main/java/Task.java @@ -1,26 +1,48 @@ +/** + * Represents a task that the user has to do/attend + */ public abstract class Task { protected String description; protected boolean isDone; + /** + * Initialises a Task object with a description + * @param description + */ public Task(String description) { this.description = description; this.isDone = false; } + /** + * Gets the done status of the task + * @return + */ public String getStatusIcon() { return (isDone ? "\u2713" : "\u2718"); //return tick or X symbols } + /** + * Returns user-readable string of the task + * @return user-readable string + */ @Override public String toString () { return "[" + getStatusIcon() + "]" + " " + this.description; } + /** + * Marks the current task's done status as true + */ public void markAsDone () { this.isDone = true; } + /** + * Formats the string so that it can be saved + * @return + */ public abstract String saveFormat(); //... diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 7b361ee7ca..c37ec63830 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -3,6 +3,9 @@ import java.io.IOException; import java.util.*; +/** + * This class contains the task list e.g., it has operations to add/delete tasks in the list + */ public class TaskList { ArrayList list; @@ -15,11 +18,20 @@ public TaskList() { this.list = new ArrayList(); } + /** + * Adds the task to the task list + * @param task The Task + */ public void add (Task task) { list.add(task); } + /** + * Marks the task as done + * @param index The Index of the Task + * @return + */ public Task done (int index) { Task task = list.get(index); task.markAsDone(); @@ -27,6 +39,9 @@ public Task done (int index) { return task; } + /** + * Lists all the tasks + */ public void list() { for (int i = 0; i < list.size(); i++) { @@ -34,6 +49,11 @@ public void list() { } } + /** + * Deletes a task + * @param index The index of the task + * @return The deleted task + */ public Task delete (int index) { Task task = list.remove(index); diff --git a/src/main/java/TaskType.java b/src/main/java/TaskType.java index e110348799..c06c49eedb 100644 --- a/src/main/java/TaskType.java +++ b/src/main/java/TaskType.java @@ -1,3 +1,6 @@ +/** + * Represents different types of tasks + */ public enum TaskType { - TODO, DEADLINE, EVENT, DONE, DELETE, LIST, BYE; + TODO, DEADLINE, EVENT; } diff --git a/src/main/java/Todo.java b/src/main/java/Todo.java index feb394c265..39fe509bf6 100644 --- a/src/main/java/Todo.java +++ b/src/main/java/Todo.java @@ -1,14 +1,25 @@ +/** + * Represents a type of task + */ public class Todo extends Task { public Todo (String description) { super(description); } + /** + * Returns user-readable string + * @return user-readable string + */ @Override public String toString() { return "[T]" + super.toString(); } + /** + * Returns formatted string used while saving + * @return formatted string + */ @Override public String saveFormat() { return String.format("T | %d | %s", this.isDone ? 1 : 0, this.description); diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index e4d2541826..b8698510e9 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -1,20 +1,36 @@ import java.util.ArrayList; import java.util.Scanner; +/** + * This class deals with interactions with the user + */ public class Ui { private Scanner scanner = new Scanner(System.in); + /** + * Greets the user + */ public void greeting () { System.out.println("Hello! I'm Duke\nWhat can I do for you?"); } + /** + * Bids farewell to the user + */ public void bye() { System.out.println("Bye. Hope to see you again soon!"); } + /** + * Lists all the Tasks to the user + */ public void list () { System.out.println("Here are the tasks in your list:"); } + /** + * Notifies user that a Task was added to the tasks list + * @param list + */ public void add (ArrayList list) { System.out.println("Got it. I've added this task:"); @@ -26,6 +42,11 @@ public void add (ArrayList list) { } + /** + * Notifies the user that a task was deleted from the task list + * @param task list + * @param task Task that was deleted + */ public void delete(ArrayList list, Task task) { System.out.println(task); @@ -33,6 +54,10 @@ public void delete(ArrayList list, Task task) { System.out.printf("Now you have %d tasks in the list.\n", list.size()); } + /** + * Notifies user that a task was completed (done status changed to true) + * @param task Task that was completed + */ public void done(Task task) { System.out.println("Nice! I've marked this task as done:"); @@ -40,15 +65,26 @@ public void done(Task task) { System.out.println(task); } + /** + * Shows an error to the user + * @param message The error message + */ public void showError(String message) { System.out.println(message); } + /** + * Reads input from the user + * @return The input read from the user + */ public String readCommand() { return scanner.nextLine(); } + /** + * Aborts the application + */ public void abort() { System.out.println("SORRY SOMETHING WENT SERIOUSLY WRONG! \nGoodbye!"); } diff --git a/src/out/production/main/AddCommand.class b/src/out/production/main/AddCommand.class index 643ffa7b59b560c5fc00a636850ef3025d505df1..08bb907e0d31fb8b4a60a0ba02683e325ab5736d 100644 GIT binary patch delta 39 ucmcb~dXsg7DibFk0}BH`11E#PWId)RUReeX26+Yn21N!52Ia|9nOp#h5C$Ir delta 39 tcmcb~dXsg7DibF=0}BHO11AILWId)RUVb23kU@Y!m_dR;bn;Xt7XXEE1=0Wj diff --git a/src/out/production/main/Command.class b/src/out/production/main/Command.class index 310170f8927e290f960f35f26446537caa583768..488066b1627d6d50f270a0a641b406b185822b49 100644 GIT binary patch delta 43 scmbQoJdb&UDI+7>WHUx@S#Aan1_lNm21X#s#K6hG1*91n1i?HZ0EFBFy#N3J delta 43 scmbQoJdb&UDI+8EWHUx@Sq=sc1_lNm21X#s#K6hG1*91n1i?HZ0E8R^w*UYD diff --git a/src/out/production/main/DateClass.class b/src/out/production/main/DateClass.class index 99177b307a6f8565ef1802bbfe469f7f5186dc10..488cf993976211d2c7d49b859bf4d584a2c2d694 100644 GIT binary patch delta 39 tcmaFI`i^yjDH9{dWHY94Q62^^20jKJ20;cP1`!5PASuQmHhB?~4*;3=21@_{ delta 39 ucmaFI`i^yjDH9{>WHY94QBDRf25tr(20jKM20;c<27U%H2I0wzn0x@3iv~6T diff --git a/src/out/production/main/Deadline.class b/src/out/production/main/Deadline.class index bbed7704f2cf17710fbeebef1fbc55444ba32ffc..a58fe8044b642f760330f972eb840881a87d6a95 100644 GIT binary patch delta 37 tcmbQqGm~e-Qx;xc237_>1}+8x1|bH)$)8vv8AT`iuqHA}OE4FH*J2v-0A delta 37 tcmbQqGm~e-Qx;w>237`c1}+9(1|bH%$)8vv8HFbMuqHB!PhQ8G4FH%Z2t@z@ diff --git a/src/out/production/main/DeleteCommand.class b/src/out/production/main/DeleteCommand.class index ba2eda36583b7ef1bc6a312cba0ab12137a91d23..c9bf90417978b2fba392b270038b60c5f94478ed 100644 GIT binary patch delta 39 ucmZ3^ww!H4DibFk0}BH`11E#P!Ga7$g{kC+}eL0|0dV1)cx^ diff --git a/src/out/production/main/DukeException.class b/src/out/production/main/DukeException.class index 2b792901577f94325d16e3a423606b155ac8a8ef..aa78361f5e565ecad29db98af83a745158e29ed3 100644 GIT binary patch delta 29 kcmaFN{Fr$|2O}#x11kf^1}+8x1|bH)$uC(V8AT^MvnDc1O2JXpc7!w)!C+jiE004SE2M7QF delta 29 lcmX@ba*Aa`7b7F{EHP{KkGQ6CyaSkm;CGP7vVKcLM;aCcT7 zVuM1fQ?v>$u0gc6NO!!4?>pa}`ltS3TT`0V(Z=dj$A$wPC-1oUz|9;FUwB!t$qFCe z1o&l(KekyDR2%H5I$>oJQIG6)pKPD5m{|6u8z;m8dmLJZJ*~>ef=>jeM491;Gm>OE z=Yk?R4D!?{V9NDCiDw~iROoR@pDPAjGm^xF8)nqysXLaK){kx|@4cuSqHfA!izqK7 JcpHjQ{`u diff --git a/src/out/production/main/Storage.class b/src/out/production/main/Storage.class index a453838c58e0ae52f698c0002d04ca68e08b83cc..67d3f6ca0cc49e24abeee530f3d37f8670597843 100644 GIT binary patch delta 167 zcmWN}OA7&E7{&4bn_0Xggow#t;ZiP1Zi6JZY&68uUimm`zJsz;?3KNR@(t{5?5sRJ zt6%4w=VYC%b4Lfm7(_6M5+deJ_0~*?k|N7H>V41_r9~NOWG^Xmr`#Nx0x^mbl*m(- ztJ0)Kk2(VyTxoHm%^im)U0(EgGvvdFFJpd8lwzg~=9h=xQSk*nTx^z9SjnTc3^$$? GIQ#(^hZ^qy delta 167 zcmWN}OA7%}0EXfBWEN*+h=v+7N{A40o#d8gBiFsX@^jSu2Q@o2_R8Ku`3Lqkc2>^j zt7q}OffZPnfiw&>;^-vQCVfxtbyF#=l=08FC7TpZXzK^D$s;LXQY1&25*2Dx z=~8D%gE1|xw7JpYPLC&jUbws&@nOQ3DL-aHFc%tL_=vh9y&%F8hn0$~X|h#^oo~fX EfAv`!fB*mh diff --git a/src/out/production/main/Task.class b/src/out/production/main/Task.class index c486f07cd6ed7cda628d07dd01fdf8aecd9f28dd..7993175c033a784bbea076161b14ed520af5187b 100644 GIT binary patch delta 47 zcmX@Wd4O|6H#09M0}BHe11AGF10Ms=dG6yk=OtxXMWtCuHWssa)$KnJ4 D<-7?w delta 47 zcmX@Wd4O|6H#09A0}BH?11AFq10MtD9K`C#DgqQ21&WJLUe9X7DZ#+Q pAju%WAU*jDYbmb+122OjgEE5xgC>LWo=lAOea7Z(TP0^!7*&*dn@tC8kuI3W=M64;Xk??JJM7(^l?M+cqdu>FDW3-W25#r{`l54lb?%elz-N`bPn?8LQe8lzpEfUhbF$oS zWmEx)B8E|PNMw0tSnc6(p*8LyTw4G1jAG220|jp{9I>?38a}hE*@HD=$RG z*vgyA_kJ6erQ}aAa;$`a+$@-`Y+%U)r&7(0hz>&e|GvL=hc&&O^^hsxvJqaaV@~8J zYDaI_-N3O%{d+6lioQ!`4T-h8_K=x&H!@_l{e+=wCg1Yp4v0{c0p@h{CRA!FNm7JIXU;9^WMFA8~(K8AHTkQ1NtO0_}q@z;!enF$lZuV z`U=~YrAV6F>bPfVD&M!Xly@v`Cs`&49@8|t1)}*OX|-FF&hkGdThol z(THg(v=rJ39ff6u6&jQ8=H+-%_O!cAb%U@3981Qr#2ib~v4kB<9;z*54mrVRhBeM( zSQn+NPc+4RqH>D&QIz3=VBmU2{2N@vj9p-hiYrGozxSClr}!GE{1@m-B`#fD;fqY&k(rg9ft7({@;7F0MxMz|EK!VtljpKz0|0fX2dV%7 delta 29 lcmeC+>fqY&k(rf+ft7)E@;7F0M$XAjEK!VnljpKz0|0df2c7@` diff --git a/src/out/production/main/Ui.class b/src/out/production/main/Ui.class index 4d44f9cc9f9b56b7ddbd6ac99ae281996162e035..61dc3b5b80f0540fc8a92c04d8d5b4aecad29307 100644 GIT binary patch delta 127 zcmew>_*ZblepXg?1{Ma+$wycnSa}#Y7V%EF7M!`an5@$w3^R Tj3$%ka5%790A($KX2}2mysjAS delta 127 zcmew>_*ZblepXf%1{Mak$wycnSUDLu7`P@s Date: Tue, 3 Sep 2019 17:06:52 +0800 Subject: [PATCH 22/38] A-CodingStandard (Changed the Access Modifier of some class variables & Wrapped Single statement conditionals & Single statement classes with curly brackets) --- src/main/java/DeleteCommand.java | 2 +- src/main/java/DoneCommand.java | 2 +- src/main/java/Duke.java | 3 +-- src/main/java/Parser.java | 40 ++++++++++++++++++++++++-------- src/main/java/TaskList.java | 5 +--- src/main/java/Ui.java | 4 +++- 6 files changed, 37 insertions(+), 19 deletions(-) diff --git a/src/main/java/DeleteCommand.java b/src/main/java/DeleteCommand.java index 11119f64fc..e5587a67fb 100644 --- a/src/main/java/DeleteCommand.java +++ b/src/main/java/DeleteCommand.java @@ -2,7 +2,7 @@ public class DeleteCommand extends Command { - int index; + private int index; public DeleteCommand (int index) { this.index = index; diff --git a/src/main/java/DoneCommand.java b/src/main/java/DoneCommand.java index 0a7344e90a..f0d1beaccd 100644 --- a/src/main/java/DoneCommand.java +++ b/src/main/java/DoneCommand.java @@ -2,7 +2,7 @@ public class DoneCommand extends Command { - int index; + private int index; public DoneCommand (int index) { this.index = index; diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 69d8480f81..c73135e565 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -43,9 +43,8 @@ public void run() { } } - public static void main(String[] args) throws DukeException, IOException { - new Duke("../data/duke.txt", "../data").run(); } + } diff --git a/src/main/java/Parser.java b/src/main/java/Parser.java index 834c14e48e..6a587b6728 100644 --- a/src/main/java/Parser.java +++ b/src/main/java/Parser.java @@ -42,9 +42,13 @@ public static int parsesDone (String command) throws DukeException { String[] words = command.split(" ", 2); - if (words.length == 1) throw DukeException.emptyDescription(); + if (words.length == 1) { + throw DukeException.emptyDescription(); + } - if (words[1].isBlank()) throw DukeException.emptyDescription(); + if (words[1].isBlank()) { + throw DukeException.emptyDescription(); + } int index = Integer.valueOf(words[1]) - 1; @@ -56,7 +60,9 @@ public static Task parsesAdd (String command, TaskType taskType) throws DukeExce String[] words = command.split(" ", 2); - if (words.length == 1) throw DukeException.emptyDescription(); + if (words.length == 1) { + throw DukeException.emptyDescription(); + } Task task = null; @@ -66,7 +72,9 @@ public static Task parsesAdd (String command, TaskType taskType) throws DukeExce case TODO: description = words[1]; - if (description.isBlank()) throw DukeException.emptyDescription(); + if (description.isBlank()) { + throw DukeException.emptyDescription(); + } task = new Todo(description); @@ -75,12 +83,16 @@ public static Task parsesAdd (String command, TaskType taskType) throws DukeExce case DEADLINE: String[] split = words[1].split(" /by ", 2); - if (split.length == 1) throw DukeException.emptyDescription(); + if (split.length == 1) { + throw DukeException.emptyDescription(); + } description = split[0]; String by = split[1]; - if (description.isBlank() || by.isBlank()) throw DukeException.emptyDescription(); + if (description.isBlank() || by.isBlank()) { + throw DukeException.emptyDescription(); + } task = new Deadline(description, by); @@ -89,12 +101,16 @@ public static Task parsesAdd (String command, TaskType taskType) throws DukeExce case EVENT: split = words[1].split(" /at ", 2); - if (split.length == 1) throw DukeException.emptyDescription(); + if (split.length == 1) { + throw DukeException.emptyDescription(); + } description = split[0]; String at = split[1]; - if (description.isBlank() || at.isBlank()) throw DukeException.emptyDescription(); + if (description.isBlank() || at.isBlank()) { + throw DukeException.emptyDescription(); + } task = new Event(description, at); @@ -109,9 +125,13 @@ public static Task parsesAdd (String command, TaskType taskType) throws DukeExce public static int parsesDelete (String command) throws DukeException { String[] words = command.split(" ", 2); - if (words.length == 1) throw DukeException.emptyDescription(); + if (words.length == 1) { + throw DukeException.emptyDescription(); + } - if (words[1].isBlank()) throw DukeException.emptyDescription(); + if (words[1].isBlank()) { + throw DukeException.emptyDescription(); + } System.out.println("Noted. I've removed this task:"); diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 7b361ee7ca..202079d971 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -5,7 +5,7 @@ public class TaskList { - ArrayList list; + protected ArrayList list; public TaskList (ArrayList list) { this.list = list; @@ -16,7 +16,6 @@ public TaskList() { } public void add (Task task) { - list.add(task); } @@ -37,8 +36,6 @@ public void list() { public Task delete (int index) { Task task = list.remove(index); - return task; - } } diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index e4d2541826..ad12c5cfc4 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -13,7 +13,9 @@ public void bye() { System.out.println("Bye. Hope to see you again soon!"); } - public void list () { System.out.println("Here are the tasks in your list:"); } + public void list () { + System.out.println("Here are the tasks in your list:"); + } public void add (ArrayList list) { From d7086107147baef3265984be250cf87c65387135 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Tue, 3 Sep 2019 18:09:22 +0800 Subject: [PATCH 23/38] Fixed a bug (there was a merge conflict so it wasn't compiling) --- build.gradle | 2 +- src/main/java/Duke.java | 4 +- src/main/java/Duke.java.orig | 71 ++++++++ src/main/java/Parser.java.orig | 186 ++++++++++++++++++++ src/main/java/Ui.java.orig | 95 ++++++++++ src/out/production/main/Command.class | Bin 414 -> 414 bytes src/out/production/main/DateClass.class | Bin 750 -> 750 bytes src/out/production/main/Deadline.class | Bin 1561 -> 1561 bytes src/out/production/main/DeleteCommand.class | Bin 807 -> 807 bytes src/out/production/main/DoneCommand.class | Bin 774 -> 774 bytes src/out/production/main/Duke.java.orig | 71 ++++++++ src/out/production/main/DukeException.class | Bin 483 -> 483 bytes src/out/production/main/Event.class | Bin 1552 -> 1552 bytes src/out/production/main/ExitCommand.class | Bin 586 -> 586 bytes src/out/production/main/ListCommand.class | Bin 541 -> 541 bytes src/out/production/main/Parser$1.class | Bin 633 -> 633 bytes src/out/production/main/Parser.class | Bin 3260 -> 3509 bytes src/out/production/main/Parser.java.orig | 186 ++++++++++++++++++++ src/out/production/main/Storage.class | Bin 3241 -> 3244 bytes src/out/production/main/Task.class | Bin 1216 -> 1216 bytes src/out/production/main/TaskList.class | Bin 1831 -> 2484 bytes src/out/production/main/Todo.class | Bin 1288 -> 1288 bytes src/out/production/main/Ui.class | Bin 2301 -> 2570 bytes src/out/production/main/Ui.java.orig | 95 ++++++++++ 24 files changed, 706 insertions(+), 4 deletions(-) create mode 100644 src/main/java/Duke.java.orig create mode 100644 src/main/java/Parser.java.orig create mode 100644 src/main/java/Ui.java.orig create mode 100644 src/out/production/main/Duke.java.orig create mode 100644 src/out/production/main/Parser.java.orig create mode 100644 src/out/production/main/Ui.java.orig diff --git a/build.gradle b/build.gradle index ce97c7ba2e..5ca4f90444 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ repositories { application { // Change this to your main class. - mainClassName = "seedu.duke.Duke" + mainClassName = "Duke" } run { diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 9969d9a20f..cb8ed2a8d8 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -55,15 +55,13 @@ public void run() { } } -<<<<<<< HEAD /** * This is the starting point of the application * @param args * @throws DukeException * @throws IOException */ -======= ->>>>>>> branch-A-CodingStandard + public static void main(String[] args) throws DukeException, IOException { new Duke("../data/duke.txt", "../data").run(); } diff --git a/src/main/java/Duke.java.orig b/src/main/java/Duke.java.orig new file mode 100644 index 0000000000..9969d9a20f --- /dev/null +++ b/src/main/java/Duke.java.orig @@ -0,0 +1,71 @@ +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.Scanner; + +/** + * Class where the main logic is executed + */ +public class Duke { + + private Storage storage; + private TaskList tasks; + private Ui ui; + + /** + * Intialises all the classes needed to run this Application. + * It also retrieves the previous tasks saved in the last session. + * @param filePath File Path of duke.txt + * @param folderPath Folder Path in which duke.txt is saved + */ + public Duke(String filePath, String folderPath) { + ui = new Ui(); + storage = new Storage(filePath, folderPath); + try { + tasks = new TaskList(storage.retrieve()); + } catch (FileNotFoundException e) { + + try { + storage.makeDirectory(folderPath); + tasks = new TaskList(); + } catch (IOException ex) { + ui.abort(); + System.exit(0); + } + } + } + + /** + * Runs the main logic of the application + */ + public void run() { + ui.greeting(); + boolean isExit = false; + while (!isExit) { + try { + String fullCommand = ui.readCommand(); + // ui.showLine(); // show the divider line ("_______") + Command c = Parser.parse(fullCommand); + c.execute(tasks, ui, storage); + isExit = c.isExit(); + } catch (DukeException | IOException e) { + ui.showError(e.getMessage()); + } finally { + //ui.showLine(); + } + } + } + +<<<<<<< HEAD + /** + * This is the starting point of the application + * @param args + * @throws DukeException + * @throws IOException + */ +======= +>>>>>>> branch-A-CodingStandard + public static void main(String[] args) throws DukeException, IOException { + new Duke("../data/duke.txt", "../data").run(); + } + +} diff --git a/src/main/java/Parser.java.orig b/src/main/java/Parser.java.orig new file mode 100644 index 0000000000..101830370f --- /dev/null +++ b/src/main/java/Parser.java.orig @@ -0,0 +1,186 @@ +import java.util.DuplicateFormatFlagsException; + +/** + * This class deals with making sense of the user command + */ +public class Parser { + + /** + * Parses the input given by the user + * @param command The inputted text + * @return + * @throws DukeException + */ + public static Command parse (String command) throws DukeException { + + String[] words = command.split(" ", 2); + + Task task = null; + int index; + String text; + + switch (words[0]) { + case "todo": + task = Parser.parsesAdd(command, TaskType.TODO); + return new AddCommand(task); + case "deadline": + task = Parser.parsesAdd(command, TaskType.DEADLINE); + return new AddCommand(task); + case "event": + task = Parser.parsesAdd(command, TaskType.EVENT); + return new AddCommand(task); + case "done": + index = Parser.parsesDone(command); + return new DoneCommand(index); + case "delete": + index = Parser.parsesDelete(command); + return new DeleteCommand(index); + case "find": + text = Parser.parsesFind(command); + return new FindCommand(text); + + } + + switch (command) { + case "list": + return new ListCommand(); + case "bye": + return new ExitCommand(); + } + + throw new DukeException("☹ OOPS!!! I'm sorry, but I don't know what that means :-("); + + } + + /** + * Parses the done string and returns the index of the done task + * @param command done string + * @return index of done task + * @throws DukeException + */ + + private static String parsesFind(String command) throws DukeException { + + String[] words = command.split(" ", 2); + + if (words.length == 1) throw DukeException.emptyDescription(); + + if (words[1].isBlank()) throw DukeException.emptyDescription(); + + String text = words[1]; + + return text; + } + + /** + * parses the delete string to get the index of the Task to be deleted + * @param command delete string + * @return index of the task to be deleted + * @throws DukeException + */ + public static int parsesDelete (String command) throws DukeException { + + String[] words = command.split(" ", 2); + + if (words.length == 1) throw DukeException.emptyDescription(); + + if (words[1].isBlank()) throw DukeException.emptyDescription(); + + int index = Integer.valueOf(words[1]) - 1; + + return index; + + } + + public static int parsesDone (String command) throws DukeException { + + String[] words = command.split(" ", 2); + + if (words.length == 1) { + throw DukeException.emptyDescription(); + } + + if (words[1].isBlank()) { + throw DukeException.emptyDescription(); + } + + int index = Integer.valueOf(words[1]) - 1; + + return index; + + } + + /** + * Parses the add string and returns the task + * @param command add string + * @param taskType type of task (todo, event, deadline) + * @return The Task to be added + * @throws DukeException + */ + public static Task parsesAdd (String command, TaskType taskType) throws DukeException { + + String[] words = command.split(" ", 2); + + if (words.length == 1) { + throw DukeException.emptyDescription(); + } + + Task task = null; + + String description; + + switch (taskType) { + case TODO: + description = words[1]; + + if (description.isBlank()) { + throw DukeException.emptyDescription(); + } + + task = new Todo(description); + + break; + + case DEADLINE: + String[] split = words[1].split(" /by ", 2); + + if (split.length == 1) { + throw DukeException.emptyDescription(); + } + + description = split[0]; + String by = split[1]; + + if (description.isBlank() || by.isBlank()) { + throw DukeException.emptyDescription(); + } + + task = new Deadline(description, by); + + break; + + case EVENT: + split = words[1].split(" /at ", 2); + + if (split.length == 1) { + throw DukeException.emptyDescription(); + } + + description = split[0]; + String at = split[1]; + + if (description.isBlank() || at.isBlank()) { + throw DukeException.emptyDescription(); + } + + task = new Event(description, at); + + break; + + } + + return task; + + } + +} diff --git a/src/main/java/Ui.java.orig b/src/main/java/Ui.java.orig new file mode 100644 index 0000000000..e006a6b72e --- /dev/null +++ b/src/main/java/Ui.java.orig @@ -0,0 +1,95 @@ +import java.util.ArrayList; +import java.util.Scanner; + +/** + * This class deals with interactions with the user + */ +public class Ui { + + private Scanner scanner = new Scanner(System.in); + + /** + * Greets the user + */ + public void greeting () { + System.out.println("Hello! I'm Duke\nWhat can I do for you?"); + } + + /** + * Bids farewell to the user + */ + public void bye() { + System.out.println("Bye. Hope to see you again soon!"); + } + + + /** + * Lists all the Tasks to the user + */ + public void list () { + System.out.println("Here are the tasks in your list:"); + } + + + /** + * Notifies user that a Task was added to the tasks list + * @param list + */ + public void add (ArrayList list) { + + System.out.println("Got it. I've added this task:"); + + System.out.println(list.get(list.size() - 1)); + + System.out.printf("Now you have %d tasks in the list.\n", list.size()); + + } + + + /** + * Notifies the user that a task was deleted from the task list + * @param task list + * @param task Task that was deleted + */ + public void delete(ArrayList list, Task task) { + + System.out.println(task); + + System.out.printf("Now you have %d tasks in the list.\n", list.size()); + } + + /** + * Notifies user that a task was completed (done status changed to true) + * @param task Task that was completed + */ + public void done(Task task) { + + System.out.println("Nice! I've marked this task as done:"); + + System.out.println(task); + } + + /** + * Shows an error to the user + * @param message The error message + */ + public void showError(String message) { + System.out.println(message); + } + + /** + * Reads input from the user + * @return The input read from the user + */ + public String readCommand() { + + return scanner.nextLine(); + } + + /** + * Aborts the application + */ + public void abort() { + System.out.println("SORRY SOMETHING WENT SERIOUSLY WRONG! \nGoodbye!"); + } +} diff --git a/src/out/production/main/Command.class b/src/out/production/main/Command.class index 488066b1627d6d50f270a0a641b406b185822b49..4a3d43f1cc3fcfd1c2400891388879d4d40aad2f 100644 GIT binary patch delta 37 mcmbQoJdb%pBcrSs0|x^G0}lfukYr-uWZ(kQj0}Qco)7?C{sQ;_ delta 37 mcmbQoJdb%pBcm)g0|x^G0}lfukYr-uWZ(kQj0}Qco)7?BzXI(5 diff --git a/src/out/production/main/DateClass.class b/src/out/production/main/DateClass.class index 488cf993976211d2c7d49b859bf4d584a2c2d694..0804ee1f8d1efbda8cddc9cdfd253c350a5ed220 100644 GIT binary patch delta 33 ncmaFI`i^x&FO#Ss0~doZ0}q23gAjuxgD8VIkR?5N5t9!9a<2uJ delta 33 ncmaFI`i^x&FOw(_0~Z4y0}q2BgAjuVgD8*`V-TCXh{*>4aP0+n diff --git a/src/out/production/main/Deadline.class b/src/out/production/main/Deadline.class index a58fe8044b642f760330f972eb840881a87d6a95..df8b53a7aa6533e754beb48b518f7ece19e12c84 100644 GIT binary patch delta 37 tcmbQqGm~e-Qx;w!237`P1}+9s1|bHq$)8vv8RaJXuqHC9PhQ8G4FH?m2!Q|q delta 37 tcmbQqGm~e-Qx;xc237_>1}+8x1|bH)$)8vv8AT`iuqHA}OE4FH*J2v-0A diff --git a/src/out/production/main/DeleteCommand.class b/src/out/production/main/DeleteCommand.class index c9bf90417978b2fba392b270038b60c5f94478ed..02ce8c729f3092112f747302ddab6c346c4f5553 100644 GIT binary patch delta 31 ncmZ3^ww!H)E)yfuWId*Nys`{j4Dt*j42ldg3`&!4GWh`jY99t5 delta 31 ncmZ3^ww!H)E)yfeWId*NyrK+T4B`wT43Z2o3{sPCGWh`jXpsf} diff --git a/src/out/production/main/DoneCommand.class b/src/out/production/main/DoneCommand.class index aff22c85459de05231e78da3a7358c4cd9ae0da6..76005e27fcd7aa83fdd9933d02186250817da00a 100644 GIT binary patch delta 31 mcmZo;Yh&9Wz{JQjS&(TKuPg%>gFJ%(gCc_jgVN+3Onv}d83lI$ delta 31 mcmZo;Yh&9Wz{JQfS&(TKuP6f-gE)f#gCv6lgVf|5Onv}biv?8x diff --git a/src/out/production/main/Duke.java.orig b/src/out/production/main/Duke.java.orig new file mode 100644 index 0000000000..9969d9a20f --- /dev/null +++ b/src/out/production/main/Duke.java.orig @@ -0,0 +1,71 @@ +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.Scanner; + +/** + * Class where the main logic is executed + */ +public class Duke { + + private Storage storage; + private TaskList tasks; + private Ui ui; + + /** + * Intialises all the classes needed to run this Application. + * It also retrieves the previous tasks saved in the last session. + * @param filePath File Path of duke.txt + * @param folderPath Folder Path in which duke.txt is saved + */ + public Duke(String filePath, String folderPath) { + ui = new Ui(); + storage = new Storage(filePath, folderPath); + try { + tasks = new TaskList(storage.retrieve()); + } catch (FileNotFoundException e) { + + try { + storage.makeDirectory(folderPath); + tasks = new TaskList(); + } catch (IOException ex) { + ui.abort(); + System.exit(0); + } + } + } + + /** + * Runs the main logic of the application + */ + public void run() { + ui.greeting(); + boolean isExit = false; + while (!isExit) { + try { + String fullCommand = ui.readCommand(); + // ui.showLine(); // show the divider line ("_______") + Command c = Parser.parse(fullCommand); + c.execute(tasks, ui, storage); + isExit = c.isExit(); + } catch (DukeException | IOException e) { + ui.showError(e.getMessage()); + } finally { + //ui.showLine(); + } + } + } + +<<<<<<< HEAD + /** + * This is the starting point of the application + * @param args + * @throws DukeException + * @throws IOException + */ +======= +>>>>>>> branch-A-CodingStandard + public static void main(String[] args) throws DukeException, IOException { + new Duke("../data/duke.txt", "../data").run(); + } + +} diff --git a/src/out/production/main/DukeException.class b/src/out/production/main/DukeException.class index aa78361f5e565ecad29db98af83a745158e29ed3..71fd4559e6dad718070c337b7e53f3b0da472bc7 100644 GIT binary patch delta 29 kcmaFN{Fr$|2O}#t11kg1Z2$lO delta 13 Ucmey#@{?tQE)%26WIZNt03+fAEdT%j diff --git a/src/out/production/main/Parser.class b/src/out/production/main/Parser.class index e7eeee8e8a6ae18ca7e6858fb05eb7616a2f3901..0812a280eaaacf9c31db239547118e473154d0cc 100644 GIT binary patch literal 3509 zcmbtWTW}j!8U9vUY1iv@qBwD=(p=>FCixPlZgE??4Y^1L61x1mf=cm zB9}5UBSzj5cyUp-CoRfQ6N5&+VCH)z_-4dR!oG0gj4@|)W{m7a=a8MZvJ<_L#PQtp zw2@5a@)TTWI(n4hc%iWg*9WE}y2dou?|%$+l6LqBn_QLdvfhvW?VK zzcJ%js^D7+VhUcCpv4wa=8SFSvXrGc))x9`jD+TjCReaYce$cw#cGZ~9f@{BEVFgR0%%YucfHrW+? zoA^*}HlH&4ERnhDK_@u}g(t+4X2I?^MP>^+x^WM45Yll1uju#=E{JU8(m5U9#j8}2 zHjQ+Kr9l1WoSCIoIqmr4PZzzH#~C~wuVGZjmoY@$^s$&{A^&w9Z-~8%V)zmUX@Q7H z8O0?X17f|#4QOenA4w96+?1BOahVomtO5=3jx7r35=4so#9|B9CRP)joia=5meBi` zi|>U71_p=f>+3`Dmg!I-m(MS@hsI{@P&`DxTI|qNHa8!dpET@{Erw~+$QD999bp}B z;(I#2k1Gm(pyMijsN*eM(D62Yq~pg<;D#AE1}fA!wisgUqQ%&WC|q;aDUdMc2GZ}Q zMM7Y+#0JLBm?@E3cdzlzExYb9VgN*ekVpVG|KSQ16^~RrDC(q9m~;<0Pdv-iZ$2_> zWOx|1)Uj(xZ{(y zF3t+gKCGQ0_?zs=j#ZlKyoeZE5^jF<(Sy!&yQLo&R``@Ep1)`v~vz{W5=KT{g*J} z?e<^CAaTXP`(%M1A+9=jw@=`Qh*vpyvtQsL;+li+Rs;NMNR)2wvD#0VEYmm0v})4v2|e;wTIWRb9CPdb}hB8qK?>Z zfqh0`xAn+t2#yBj73^7R-5Mq)M8sZt;_rm5=vul$xQBM%?)u@xLHM!P^@DM!^NW~9 z96k>Gg8W4?>({VvbOrmD)^LC@L|8vsd&deIKIE>~$#9alJP?42T8K;jceo9Iq=diX zcKi){@lWi>M>rrUsF!ryA=RN#+Jh#k0WDGlVd*ZkORwOdbP!-169fMF5#1%ZK;EQ01vF5Q| ze0p;r5U8nH$98zjDAv(fi9_F`tdqN(5((;%skNRqv2(kXjI)f2mpe@xmE87$d=<(n z8b554yOz;(sf6^mFOkp<;%=vWjxdPF7{(|cLVakU8zLAXSKx-bd@Q-{Hc+JqhU;z> zJhxCwPxUg(s>DT8wCsG*vX1|6*(#cs(ITfG*!#}MEF7YRCureAv~Uz{I8|n0N6Esb zqJ?c#EmHW27V?TLT6p2pS-4-c5E!&D#rJ5MR!*=4Cu!*vEuH@Kmh!fDE%lsW=2a^D zb1|0v?WHVB$(snbEhBPJGzWga;LoaalDL;pr1Z&lxvNJG%A57DhF0f1wBkt`#~ItFu#2tlUOdM({sNERIlj|hVt`)82%l93pHq`~6&b#T z@_Y&{;4-P+B*hhCS2=qd*Z7L~8OL|=6Rh9{-p4!m4Of1PCHx7?PM~H`P5D6#JBL2c zCgsiy?w+7lA0;l#1?elv#sB~S literal 3260 zcmai0TW}j!8U9vUY1iv@ttfR`xlSrKPAvJFxQz>T5|UUpRgq-}8&fBgvXVCO#=1qj zzEMb_P%fdAdq`3!<<>C3gPR9C;Asml%m7b3G1D1_nZ7c^^f53Y;XAvsEK?8F%-M7P z|NQ6wzyEfQ{&e@ZZvuE6ztC_PvntML7{gid`Gkt6#r#PXs63PVMv0n^B8IE0)6 zQ$rKZ3C?-(nG3Mz^UN*W%-tb($JRxw{xQPI!_TYMa0XFWfjfzLLp;Trj1OVoN%g?HS#k? z#S(OtDLZo(b*QOHqhgztVF`hIM&6$durW_+XKW>y=hzh={;FN;P z6136ftXX!fQjxke7p9#k6^XTFC#=NP;0c|~7j=9cFENQuDOb|*4SbUpbEc8YGn<5CE}BJxkaMov!JKPK$G0%0 zBZYAqrLWZ-3B}*m@g1@EUGaGmAE9Xxu{w$GG2jVTO_fRQdCR5|e`ZAhPm!o?HI6P@ zTU1kGVcx7IMZ)kqSAP?on3$YuZ*Pw#I}1^}RH>}=L^BIcG#Mr4PA58FEG{S6GH# zq9la23V9-P!OV)>dwU&+x9xhp!LW%6qL7%p0*UQVa>@9PO`y&h_MF$bY-5&g(7d={ zO(Z5*;xVssMeD1H(UXZ(GCeB%pBYV0Q!17eJKL0OHZ%Dlvru+c z67?m&D;7^}%PU(_vFua42k0Ha(e|#b*d&XNdETs0X3@wmm=otDbnf7Gysq=BN2ph| ziq4EU#=D_oYRPi4bL{($tqA(gira;^hgCH4J8P~}T<_Qx!l@P8F$;uVT3`-aJbA0s zKglc2;Stj)5Xx@%z;-rGmxWNih<4uohxwEM0Z5`_`5h$H&sh@Ou60PSbK&D_0|Z@W z5Fg-L_XO}k43TQUFpg4+hkZ%-DGBLPSJ)R=gFhvWcl!s1WZz&QBCkRI73D8+1Xjmz`>3#CsPjNmOk;BvzyoNFVVBiK$kXBrJP!{wd(yB`z z3;(cnkXY2AXDj)^Xn| z8O{I82yJKF!mi^R2+!_a$L`fGkGfw_EvsGIU3VktV|e~aTU{7feT8!?G4Am&yFLoc z4|tgAV@p89DbC^J5WfhANKpF*9-LiAWOW0roFC%cHXEkdeQ$Bs@7fx}F0M7G%$bH} z5FCET=l+j;>i>ckyp0F&4j=k|@R5HP58+?fi@Vq-DQK5+*e~UAKyvtqi>yD!LV1_j zK8EAeez&%wJNOVzP(qa!aT2G9PUEQ&B#3#G{6`VKhbItJFs9(c3YT2bg=YTrM?#@c z(`_`}MTg67)?1a^TqSu>rm8j?;yv#b7%tPapF6#q1=jth{3?`Nc=)Yud0-9EYc=8) z+Sl-ioIBR`Yaa08v4=hYeT>H;MqvOC)2nV)uJAAFDc3>ygh`f%2=^MDr-EgO9t)W09P}3XB^oH0GY%1SVvV~p7o4AGOA;yXUWe*y+h zBTuTrPFp7DMLdP8JpD4B#%p*6uTx?j8N7iUYx5lbMro0kG8(BXf;4r@JRPsD42Elh z)fS+({g~u#ka`}k^4?%RPm`xm=fUa;CZ(EPvHB>n@WRGl-8}n<`_FF8`rVpcgzn|} z4i2zl?;ymQ{WtXguxpt8du$fPt>f8>42{w8|EeQW4vFYHwQt>SX#rK`ebsuo!OOX$Q38}!+_7C2ICf!=Bh eJo^4E;Acj~9rbZ$)oa`Vsug#S+jV38v)llWL9Q5ep<-tt+JkrXc_JiUy1`pPb%Qzk@(I5jS* zlb|7|nv}Sq$}KDIc%#LRdp@!G;(>3T_~Dsf+WgT`imuY=EkC>k74FLq17ZxhVkB9w K6c{_EG5H5R;Uu~M delta 208 zcmZ1@xl(e283(Tb0}F#711EzJ10RFPWM>Xzolpj5AY@?R-_5`hslA5qON#?FNldoqP-Ntse4N9JR|d$J1I|$58k6f-oB-+i B33~tl delta 47 zcmX@Wd4O|6H#09M0}BHe11AGF10Ms=dG6yk=OtxXMWtCuHWssa)$KnJ4 D<-7?w diff --git a/src/out/production/main/TaskList.class b/src/out/production/main/TaskList.class index b0f50df7e166a618349ba379c31593934e9b71b1..3ee73902d2d5617c6967792560147ef71708a148 100644 GIT binary patch literal 2484 zcmaJ@TXz#x6#h<}$r*q1BiBm|7X(sebH$Qg%P|D@_R5(qElIal zIL+MtY11;j(*nD4y)p~q7YSFit1LBCGA(1F)mS#1CAnN@BvZ00vVKuIrrL+WgtuzC z0%;#3WHholalP3|9_@)5@l)vWoWIIymCAAfbDxz*4HOVW$g*l%S%Ao;ev@&5*wMxeeIH+S6b_;Cl(K{V4d}< zz*St+@R5#>@rl6jS=;tp&yme}!&|kh?odBIP2#!^iDeBH9aR`QZs4+x6|CwoaZ^VP zbsY^H(_rba(bRDZjt&=8q(u^w9lC_^`S~grmv0&srF?_(oM$-FvmFj$w`W0SVf-rF zwqmFeRo!^D62~sxkWOvJJ?FP9;hJ~p6&uYyb>WuRUC(In3%jLC1$9h&>H-_%u|0-t z@Ih-~jVWSM2<&Xgno+c^iu5j--YV~0Pg)+Q@lbB=c^ci!!fto^vKfUIH5F#vdPZ+& zMmVPZj?u8!C?jb`-i+iz2>%i7ct-i!s&p6pX`*PFm9YHH_D+76?aba%HQb70Ha*iO zfo_BR5oLmBm+aeyQllcq&CHqCi)RXSzkR?Dy|hTl2Ov;DV;KrVN! zhig4z8g8rc`%GYLquHjlX4j1HISRTmD=QqDbq!yr2iLZ1t)_rJXIbQ4m#%A&+&A3= z71jtQ{k*iQb;BJC4i>tog(ABmn+`7Vh0`Owhmh`(2ul=YyV3fL9`0hu^35;!n%K+xeT-b@HO6Z?{}3X7_(#OP=Pr)@TnBjt z23TPbDGXthyOAK9^ISYHpxQAElglW-84XTFu4FKQBdn>T9||SL`(5a`uugT# z^L%_dtAN@_eT)4+Ae~KI?*Ko-7N8CNYa#AG{d1!y8J-0u*_A0A;B_2FBXu$QGU?;8 zcF1Ll*(t>SLQFg%S%Fs~u@^$IgCXXCFLpy{VBkrLD0GP&j6@DbB4d%rqj;4Vs@1=< zdLOTgVVCCvrGpDce!`HzJ>+>aEI`nciQS0@*xE*hEzGpB?H~ zKx;|vatUY@joeg-csF#5@BHhQpJ)5D^^rL zfh*Tm>BfZ*fNppZAHcFK|DL2KZmg;9KBwpW-}%qX=isBacKYY*Hvm(3|?MiKDr*TkcvBm)IXv|}Q>ea^XmPXAA?qX5lp2mGVFz;j- zKFr{e#$!BDc&bsylEyPEm>;regmdUT#|v}h9A^|>+NxK^OO1&&GoAV(*3HjUz2tE` zKyc9tPdk7_fHdPgdKiahBOR^u^4{Y}KqopFWvT097P10xaSrEs+NjBi80(m8Z-Ru} zA9D-bL-Rd7RB3a&$@NJMVs2BLYjFj?#$c?8R8+MZH}2a@AASGvQN$1x0vAw5W#>H18~)h)-TUy$9&+7h2J3@1(`MwnRw zP;OC27-u1WLyBK~DKOeHww@W>XpdB8(}{mfd5I}6F(q5395%JTtBh5iE}6@CjTI`Y L%rneya!vgOhaE$3 diff --git a/src/out/production/main/Todo.class b/src/out/production/main/Todo.class index 028a2a8d65e18e44e62c1fbffc3952bb53ea95cc..9b4f2666bbb99b316ac351d20a5d5e7342b97193 100644 GIT binary patch delta 19 acmeC+>fqYo$igTv*@-2JQF8KJmTUks6a^Om delta 19 acmeC+>fqYo$im1o*@-2JQE>8HmTUkrzy%8c diff --git a/src/out/production/main/Ui.class b/src/out/production/main/Ui.class index 61dc3b5b80f0540fc8a92c04d8d5b4aecad29307..1a946af9658bef1d7aa95060de3247761ad491dc 100644 GIT binary patch delta 1234 zcmZuwOHUI~7(I9Tm}wcHyye+JP@zSNfS`Z~B8Uq306|62feug}g+MVOF=6A%xH0n& zjEM_3;)8_?et;`}f-4jEF5HNoJFT=PUCf>De)s#%IdkqezYAUz?|wb{asZ$c8-4`P zui}ai1GwskfUTlFMzGzoX%-d}>Cv6S39E-m{;g*S!#nM+N*1(<2k+)=GEdq=3F= zCgzu{s7!3JJ9Q+GJDxD-S4Pc^33G1MQqg0_mGb5aR0ndoW=f8Y97l#lWrQUX9wDGo+x4$9lXXQT&qmT!_X&q_EG$vaq>33PJYsXO4{}h zO3)Z*+*teHIFw}3Geh3l3=q!LZfXcG(%htqm*n&kEi8wslqliRrh{Hrhr7gG{TgLW zCGOTP56{XeG4Husy#4b-j-AUHyHa=<&ygoehb+|d9pbMi=UCoZ6;I^-$f~e(LteWK byU|1bON?`&93h~hSBPKyrvxrDsi5yKJiwFT delta 885 zcmZva%Tg0T6o$W z1f+_E3m?E2ap4QN!SeJZW@43_p3|q#|DC^2&xbwR$))eVzkUNISoQEZ<}l@QoD&{4 zCtcEvx*yra8q&1VQynZ+rg&Y zJCY%5k$l;F*Q~sK^Ws%yZn3$xw!H3eTXToInhf)rUivimxF7to%ZUe?htz^nY}J3H zS>Une2~SP38GMdS?RchHWJ$Bk^WaCU6kB0D=!w@iU&q(2Tw1OKmN*fnM4rUrLDt;I zM6tX#OxdzJ#Btdtk(NW~p`W~bEe2ZU!E7S?KC0I!c6Qafo%+F6y=W(-tzo%eNTl2? z)P`(qB8V@LZ1^v$Syy=*d3nEica{oSZRHU!b zrKJk0ZTluFFeKaql5LH`WQHYkP%<_pi4IW?*;`I^!LWA`leHj2EDC2RQ5>&7EQY% z{;FL{)ln)&sf)s5jPX$UQ)PyYvNhp)sA^5)uga3=4gaH{>}I=uq)GAE=&FxiWHOvz F;|~o6O?3bO diff --git a/src/out/production/main/Ui.java.orig b/src/out/production/main/Ui.java.orig new file mode 100644 index 0000000000..e006a6b72e --- /dev/null +++ b/src/out/production/main/Ui.java.orig @@ -0,0 +1,95 @@ +import java.util.ArrayList; +import java.util.Scanner; + +/** + * This class deals with interactions with the user + */ +public class Ui { + + private Scanner scanner = new Scanner(System.in); + + /** + * Greets the user + */ + public void greeting () { + System.out.println("Hello! I'm Duke\nWhat can I do for you?"); + } + + /** + * Bids farewell to the user + */ + public void bye() { + System.out.println("Bye. Hope to see you again soon!"); + } + + + /** + * Lists all the Tasks to the user + */ + public void list () { + System.out.println("Here are the tasks in your list:"); + } + + + /** + * Notifies user that a Task was added to the tasks list + * @param list + */ + public void add (ArrayList list) { + + System.out.println("Got it. I've added this task:"); + + System.out.println(list.get(list.size() - 1)); + + System.out.printf("Now you have %d tasks in the list.\n", list.size()); + + } + + + /** + * Notifies the user that a task was deleted from the task list + * @param task list + * @param task Task that was deleted + */ + public void delete(ArrayList list, Task task) { + + System.out.println(task); + + System.out.printf("Now you have %d tasks in the list.\n", list.size()); + } + + /** + * Notifies user that a task was completed (done status changed to true) + * @param task Task that was completed + */ + public void done(Task task) { + + System.out.println("Nice! I've marked this task as done:"); + + System.out.println(task); + } + + /** + * Shows an error to the user + * @param message The error message + */ + public void showError(String message) { + System.out.println(message); + } + + /** + * Reads input from the user + * @return The input read from the user + */ + public String readCommand() { + + return scanner.nextLine(); + } + + /** + * Aborts the application + */ + public void abort() { + System.out.println("SORRY SOMETHING WENT SERIOUSLY WRONG! \nGoodbye!"); + } +} From 0f9f7bdb2b2cc9453aa46eafdef6a08440f2f991 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Wed, 4 Sep 2019 15:38:26 +0800 Subject: [PATCH 24/38] Created my first GUI application! (a window that says Hello World) --- build.gradle | 7 +++++++ src/main/java/Duke.java | 31 +++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5ca4f90444..22118d35d7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,13 @@ plugins { id 'java' id 'application' + + id 'org.openjfx.javafxplugin' version '0.0.7' +} + +javafx { + version = "11.0.2" + modules = [ 'javafx.controls', 'javafx.fxml' ] } group 'seedu.duke' diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index cb8ed2a8d8..38695984c5 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,3 +1,8 @@ +import javafx.application.Application; +import javafx.scene.Scene; +import javafx.scene.control.Label; +import javafx.stage.Stage; + import java.io.FileNotFoundException; import java.io.IOException; import java.util.Scanner; @@ -5,12 +10,16 @@ /** * Class where the main logic is executed */ -public class Duke { +public class Duke extends Application { private Storage storage; private TaskList tasks; private Ui ui; + public Duke() { + super(); + } + /** * Intialises all the classes needed to run this Application. * It also retrieves the previous tasks saved in the last session. @@ -62,8 +71,26 @@ public void run() { * @throws IOException */ + public static void main(String[] args) throws DukeException, IOException { - new Duke("../data/duke.txt", "../data").run(); + + Application.launch(Duke.class, args); + //new Duke("../data/duke.txt", "../data").run(); } + /** + * This is the primary stage that JavaFX provides. + * @param stage Primary Stage + * @throws Exception + */ + @Override + public void start(Stage stage) throws Exception { + + 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. + + } } From 2e58d6b36fa787e0ff7efb532e85c23f668a122c Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Wed, 4 Sep 2019 17:34:42 +0800 Subject: [PATCH 25/38] Created the GUI for Duke (but without any functionality) --- src/main/java/Duke.java | 66 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 38695984c5..9a4f3e4e23 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,11 +1,16 @@ import javafx.application.Application; import javafx.scene.Scene; -import javafx.scene.control.Label; +import javafx.scene.control.Button; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.layout.Region; import javafx.stage.Stage; import java.io.FileNotFoundException; import java.io.IOException; -import java.util.Scanner; + +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.VBox; /** * Class where the main logic is executed @@ -16,6 +21,13 @@ public class Duke extends Application { private TaskList tasks; private Ui ui; + private ScrollPane scrollPane; + private VBox dialogContainer; + private TextField userInput; + private Button sendButton; + private Scene scene; + + public Duke() { super(); } @@ -86,11 +98,53 @@ public static void main(String[] args) throws DukeException, IOException { @Override public void start(Stage stage) throws Exception { - Label helloWorld = new Label("Hello World!"); // Creating a new Label control - Scene scene = new Scene(helloWorld); // Setting the scene to be our Label + //Step 1. Setting up required components + + 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("My name is Duke!"); + + stage.setResizable(false); + stage.setMinHeight(600); + stage.setMinWidth(400); + + mainLayout.setPrefSize(400, 600); + + 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); + sendButton.setPrefWidth(55); + + AnchorPane.setTopAnchor(scrollPane, 1.0); + + AnchorPane.setBottomAnchor(sendButton, 1.0); + AnchorPane.setRightAnchor(sendButton, 1.0); + + AnchorPane.setBottomAnchor(userInput,1.0); + AnchorPane.setLeftAnchor(userInput, 1.0); - stage.setScene(scene); // Setting the stage to show our screen - stage.show(); // Render the stage. } } From 59acd1a12d9cdf96b28758ef3cc96d36c1a535bc Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Wed, 4 Sep 2019 17:50:53 +0800 Subject: [PATCH 26/38] =?UTF-8?q?Iteration=201=20=E2=80=93=20Echoing=20the?= =?UTF-8?q?=20User?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Duke.java | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 9a4f3e4e23..23c61dbb0b 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,6 +1,7 @@ import javafx.application.Application; import javafx.scene.Scene; import javafx.scene.control.Button; +import javafx.scene.control.Label; import javafx.scene.control.ScrollPane; import javafx.scene.control.TextField; import javafx.scene.layout.Region; @@ -145,6 +146,35 @@ public void start(Stage stage) throws Exception { AnchorPane.setBottomAnchor(userInput,1.0); AnchorPane.setLeftAnchor(userInput, 1.0); + //Step 3. Add functionality to handle user input. + sendButton.setOnMouseClicked(mouseEvent -> { + 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)); + + + } + + /** + * 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) { + + Label textToAdd = new Label(text); + textToAdd.setWrapText(true); + + return textToAdd; } + } From 5131533e9b345a731c10fa6bbfa4a73bc16bba03 Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Wed, 4 Sep 2019 18:43:33 +0800 Subject: [PATCH 27/38] =?UTF-8?q?Iteration=202=20=E2=80=93=20Adding=20Dial?= =?UTF-8?q?og=20Boxes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/DialogBox.java | 27 ++++++ src/main/java/Duke.java | 116 +------------------------ src/main/java/FX.java | 123 +++++++++++++++++++++++++++ src/main/java/Launcher.java | 10 +++ src/main/resources/images/DaDuke.png | Bin 0 -> 32657 bytes src/main/resources/images/DaUser.png | Bin 0 -> 37794 bytes 6 files changed, 164 insertions(+), 112 deletions(-) create mode 100644 src/main/java/DialogBox.java create mode 100644 src/main/java/FX.java create mode 100644 src/main/java/Launcher.java create mode 100644 src/main/resources/images/DaDuke.png create mode 100644 src/main/resources/images/DaUser.png diff --git a/src/main/java/DialogBox.java b/src/main/java/DialogBox.java new file mode 100644 index 0000000000..dd7a04657b --- /dev/null +++ b/src/main/java/DialogBox.java @@ -0,0 +1,27 @@ +import javafx.geometry.Pos; +import javafx.scene.control.Label; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; + + +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); + + } + + +} diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 23c61dbb0b..8eacffc421 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,38 +1,15 @@ -import javafx.application.Application; -import javafx.scene.Scene; -import javafx.scene.control.Button; -import javafx.scene.control.Label; -import javafx.scene.control.ScrollPane; -import javafx.scene.control.TextField; -import javafx.scene.layout.Region; -import javafx.stage.Stage; - import java.io.FileNotFoundException; import java.io.IOException; -import javafx.scene.layout.AnchorPane; -import javafx.scene.layout.VBox; - /** * Class where the main logic is executed */ -public class Duke extends Application { +public class Duke { private Storage storage; private TaskList tasks; private Ui ui; - private ScrollPane scrollPane; - private VBox dialogContainer; - private TextField userInput; - private Button sendButton; - private Scene scene; - - - public Duke() { - super(); - } - /** * Intialises all the classes needed to run this Application. * It also retrieves the previous tasks saved in the last session. @@ -59,7 +36,7 @@ public Duke(String filePath, String folderPath) { /** * Runs the main logic of the application */ - public void run() { + public void run (String input) { ui.greeting(); boolean isExit = false; while (!isExit) { @@ -84,97 +61,12 @@ public void run() { * @throws IOException */ - + /* public static void main(String[] args) throws DukeException, IOException { Application.launch(Duke.class, args); //new Duke("../data/duke.txt", "../data").run(); - } - - /** - * This is the primary stage that JavaFX provides. - * @param stage Primary Stage - * @throws Exception - */ - @Override - public void start(Stage stage) throws Exception { - - //Step 1. Setting up required components - - 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("My name is Duke!"); - - stage.setResizable(false); - stage.setMinHeight(600); - stage.setMinWidth(400); + }*/ - mainLayout.setPrefSize(400, 600); - - 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); - sendButton.setPrefWidth(55); - - AnchorPane.setTopAnchor(scrollPane, 1.0); - - AnchorPane.setBottomAnchor(sendButton, 1.0); - AnchorPane.setRightAnchor(sendButton, 1.0); - - AnchorPane.setBottomAnchor(userInput,1.0); - AnchorPane.setLeftAnchor(userInput, 1.0); - - //Step 3. Add functionality to handle user input. - sendButton.setOnMouseClicked(mouseEvent -> { - 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)); - - - } - - /** - * 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) { - - Label textToAdd = new Label(text); - textToAdd.setWrapText(true); - - return textToAdd; - } } diff --git a/src/main/java/FX.java b/src/main/java/FX.java new file mode 100644 index 0000000000..845d907954 --- /dev/null +++ b/src/main/java/FX.java @@ -0,0 +1,123 @@ +import javafx.application.Application; +import javafx.scene.Scene; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; + +public class FX extends Application { + + private Duke duke; + + private ScrollPane scrollPane; + private VBox dialogContainer; + private TextField userInput; + private Button sendButton; + private Scene scene; + + private Image userImage = new Image(this.getClass().getResourceAsStream("/images/DaUser.png")); + private Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/DaDuke.png")); + + /** + * Setting up the JavaFX Controls + * @param stage Primary Stage + * @throws Exception + */ + @Override + public void start(Stage stage) throws Exception { + + duke = new Duke("../data/duke.txt", "../data"); + + //Step 1. Setting up required components + + 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("My name is Duke!"); + + stage.setResizable(false); + stage.setMinHeight(600); + stage.setMinWidth(400); + + mainLayout.setPrefSize(400, 600); + + 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); + sendButton.setPrefWidth(55); + + AnchorPane.setTopAnchor(scrollPane, 1.0); + + AnchorPane.setBottomAnchor(sendButton, 1.0); + AnchorPane.setRightAnchor(sendButton, 1.0); + + AnchorPane.setBottomAnchor(userInput,1.0); + AnchorPane.setLeftAnchor(userInput, 1.0); + + //Step 3. Add functionality to handle user input. + sendButton.setOnMouseClicked(mouseEvent -> { + handleUserInput(); + }); + + userInput.setOnAction((event) -> { + handleUserInput(); + }); + + //Scroll down to the end every time dialogContainer's height changes. + dialogContainer.heightProperty().addListener((observable) -> scrollPane.setVvalue(1.0)); + + + } + + /** + * 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( + new DialogBox(userText, new ImageView(userImage)), + new DialogBox(dukeText, new ImageView(dukeImage)) + ); + 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) { + //duke.run(input); + return "Duke heard: " + input; + } + +} diff --git a/src/main/java/Launcher.java b/src/main/java/Launcher.java new file mode 100644 index 0000000000..9ab7410f7c --- /dev/null +++ b/src/main/java/Launcher.java @@ -0,0 +1,10 @@ +import javafx.application.Application; + +public class Launcher { + + public static void main(String[] args) throws DukeException { + + Application.launch(FX.class, args); + } + +} diff --git a/src/main/resources/images/DaDuke.png b/src/main/resources/images/DaDuke.png new file mode 100644 index 0000000000000000000000000000000000000000..d893658717e29b50b4ceedada235d9f75835a118 GIT binary patch literal 32657 zcmV)5K*_&}P)Zf>Tg`t%N;{PE9Y2%-o7`CdniQG#9szpJX+ zcrVK`zK7pG^!n{1T{qo3os(XNkTqW0IXIfGihv^wpO4cHg6YjrzS7VYZJZVWev% z!fK9RcD(ntf zCxMCmC7oRZecuOe6J~p&f5@?I;U2zE;O2T?Vy_8UZ1S4i=b>l%q0jeYAI+i(>K zsIun-!&|SPodfa+5u7Z5yhtd`XRjxuF+Ww~1H4xg)(?GXYLo{q2VPiixh(3*`0iyFHj`V{p-_+Q4jWKC=o6ohr zW)q;Nb7IxtY}qD4RyBpAMv`rR!YytU)sgEIa8F)wX(O<=RwjYY+sLdy0`5o0>=a zd(GePvuhIc}2|`2Y7OgN%4u~XV>q*3e$65qJ;}bK0Li-Wh%~iQn_FhV_*O6|& z$E%S!>BN;~l+|jbw5B2<783HDuPYE-T1Z)&EZTFhZGIj)nseO*|7}7`Vz4%vMl&l& z!c*D(>n3|ulhD`D1FzG)Tik79GgrpJ#HE0O)y{gM#c%L1=xtu`A<9oj(;}Q6cpHb= zIjOSNTO3vD|G|N_tH+^nj?I`D4+@;j;9`s4!*lY>X2_|khHWO LGkWs%c&z?S( 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 z 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 KMNUMnLSTa5`eeEQ literal 0 HcmV?d00001 From 85bffc6c804c28f8ceae847b81d4255e2b1a43fe Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Wed, 4 Sep 2019 21:20:23 +0800 Subject: [PATCH 28/38] Duke GUI now responds to user input! --- src/main/java/AddCommand.java | 6 +- src/main/java/Command.java | 2 +- src/main/java/DeleteCommand.java | 6 +- src/main/java/DoneCommand.java | 6 +- src/main/java/Duke.java | 174 +++++++++++++++++++++++++++---- src/main/java/ExitCommand.java | 4 +- src/main/java/FX.java | 123 ---------------------- src/main/java/FindCommand.java | 4 +- src/main/java/Launcher.java | 10 -- src/main/java/ListCommand.java | 6 +- src/main/java/Storage.java | 2 +- src/main/java/TaskList.java | 10 -- src/main/java/Ui.java | 68 ++++++------ 13 files changed, 202 insertions(+), 219 deletions(-) delete mode 100644 src/main/java/FX.java delete mode 100644 src/main/java/Launcher.java diff --git a/src/main/java/AddCommand.java b/src/main/java/AddCommand.java index fd5e2569c7..f15b5f0c0d 100644 --- a/src/main/java/AddCommand.java +++ b/src/main/java/AddCommand.java @@ -22,15 +22,15 @@ public AddCommand (Task task) { * @param ui * @param storage * @throws IOException + * @return */ @Override - public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + public String execute(TaskList taskList, Ui ui, Storage storage) throws IOException { taskList.add(task); - ui.add(taskList.list); - storage.save(taskList.list); + return ui.add(taskList.list); } } diff --git a/src/main/java/Command.java b/src/main/java/Command.java index 580b9045f4..92d6d218cf 100644 --- a/src/main/java/Command.java +++ b/src/main/java/Command.java @@ -12,7 +12,7 @@ public abstract class Command { * @param storage * @throws IOException */ - public abstract void execute (TaskList taskList, Ui ui, Storage storage) throws IOException; + public abstract String execute (TaskList taskList, Ui ui, Storage storage) throws IOException; /** * Checks whether the command is to exit the program diff --git a/src/main/java/DeleteCommand.java b/src/main/java/DeleteCommand.java index 590fd32897..a46ecf021d 100644 --- a/src/main/java/DeleteCommand.java +++ b/src/main/java/DeleteCommand.java @@ -24,12 +24,12 @@ public DeleteCommand (int index) { * @throws IOException */ @Override - public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + public String execute(TaskList taskList, Ui ui, Storage storage) throws IOException { Task task = taskList.delete(index); - ui.delete(taskList.list, task); - storage.save(taskList.list); + + return ui.delete(taskList.list, task); } } diff --git a/src/main/java/DoneCommand.java b/src/main/java/DoneCommand.java index 636b07d4a2..eeee480d4d 100644 --- a/src/main/java/DoneCommand.java +++ b/src/main/java/DoneCommand.java @@ -24,12 +24,12 @@ public DoneCommand (int index) { * @throws IOException */ @Override - public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + public String execute(TaskList taskList, Ui ui, Storage storage) throws IOException { Task task = taskList.done(this.index); - ui.done(task); - storage.save(taskList.list); + + return ui.done(task); } } diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java index 8eacffc421..755e44f3de 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -1,15 +1,45 @@ +import javafx.application.Application; +import javafx.scene.Scene; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.Region; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; + import java.io.FileNotFoundException; import java.io.IOException; /** * Class where the main logic is executed */ -public class Duke { +public class Duke extends Application { private Storage storage; private TaskList tasks; private Ui ui; + private Duke duke; + + private ScrollPane scrollPane; + private VBox dialogContainer; + private TextField userInput; + private Button sendButton; + private Scene scene; + + private Image userImage = new Image(this.getClass().getResourceAsStream("/images/DaUser.png")); + private Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/DaDuke.png")); + + private boolean isExit = false; + + public Duke() { + this("data/duke.txt", "data"); + } + /** * Intialises all the classes needed to run this Application. * It also retrieves the previous tasks saved in the last session. @@ -36,22 +66,17 @@ public Duke(String filePath, String folderPath) { /** * Runs the main logic of the application */ - public void run (String input) { - ui.greeting(); - boolean isExit = false; - while (!isExit) { - try { - String fullCommand = ui.readCommand(); - // ui.showLine(); // show the divider line ("_______") - Command c = Parser.parse(fullCommand); - c.execute(tasks, ui, storage); - isExit = c.isExit(); - } catch (DukeException | IOException e) { - ui.showError(e.getMessage()); - } finally { - //ui.showLine(); - } + public String run (String fullCommand) { + + try { + Command c = Parser.parse(fullCommand); + this.isExit = c.isExit(); + return c.execute(tasks, ui, storage); + } catch (IOException | DukeException e) { + return ui.showError(e.getMessage()); } + + } /** @@ -61,12 +86,123 @@ public void run (String input) { * @throws IOException */ - /* + public static void main(String[] args) throws DukeException, IOException { Application.launch(Duke.class, args); - //new Duke("../data/duke.txt", "../data").run(); - }*/ + } + + //Fx Functions + + /** + * Setting up the JavaFX Controls + * @param stage Primary Stage + * @throws Exception + */ + @Override + public void start(Stage stage) throws Exception { + + //Step 1. Setting up required components + + 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("My name is Duke!"); + + stage.setResizable(false); + stage.setMinHeight(600); + stage.setMinWidth(400); + + mainLayout.setPrefSize(400, 600); + + 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); + sendButton.setPrefWidth(55); + + AnchorPane.setTopAnchor(scrollPane, 1.0); + + AnchorPane.setBottomAnchor(sendButton, 1.0); + AnchorPane.setRightAnchor(sendButton, 1.0); + + AnchorPane.setBottomAnchor(userInput,1.0); + AnchorPane.setLeftAnchor(userInput, 1.0); + + //Step 3. Add functionality to handle user input. + sendButton.setOnMouseClicked(mouseEvent -> { + handleUserInput(); + }); + + userInput.setOnAction((event) -> { + handleUserInput(); + }); + + //Scroll down to the end every time dialogContainer's height changes. + dialogContainer.heightProperty().addListener((observable) -> scrollPane.setVvalue(1.0)); + + greetUser(); + + } + + /** + * 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( + new DialogBox(userText, new ImageView(userImage)), + new DialogBox(dukeText, new ImageView(dukeImage)) + ); + userInput.clear(); + + if (this.isExit) { + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + System.exit(0); + } + System.exit(0); + } + } + + private void greetUser() { + Label dukeText = new Label(ui.greeting()); + dialogContainer.getChildren().addAll( + new DialogBox(dukeText, new ImageView(dukeImage)) + ); + } + + /** + * 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 this.run(input); + } } diff --git a/src/main/java/ExitCommand.java b/src/main/java/ExitCommand.java index 8ce460ff6d..9145efc40a 100644 --- a/src/main/java/ExitCommand.java +++ b/src/main/java/ExitCommand.java @@ -13,8 +13,8 @@ public class ExitCommand extends Command { * @throws IOException */ @Override - public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { - ui.bye(); + public String execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + return ui.bye(); } /** diff --git a/src/main/java/FX.java b/src/main/java/FX.java deleted file mode 100644 index 845d907954..0000000000 --- a/src/main/java/FX.java +++ /dev/null @@ -1,123 +0,0 @@ -import javafx.application.Application; -import javafx.scene.Scene; -import javafx.scene.control.Button; -import javafx.scene.control.Label; -import javafx.scene.control.ScrollPane; -import javafx.scene.control.TextField; -import javafx.scene.image.Image; -import javafx.scene.image.ImageView; -import javafx.scene.layout.AnchorPane; -import javafx.scene.layout.Region; -import javafx.scene.layout.VBox; -import javafx.stage.Stage; - -public class FX extends Application { - - private Duke duke; - - private ScrollPane scrollPane; - private VBox dialogContainer; - private TextField userInput; - private Button sendButton; - private Scene scene; - - private Image userImage = new Image(this.getClass().getResourceAsStream("/images/DaUser.png")); - private Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/DaDuke.png")); - - /** - * Setting up the JavaFX Controls - * @param stage Primary Stage - * @throws Exception - */ - @Override - public void start(Stage stage) throws Exception { - - duke = new Duke("../data/duke.txt", "../data"); - - //Step 1. Setting up required components - - 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("My name is Duke!"); - - stage.setResizable(false); - stage.setMinHeight(600); - stage.setMinWidth(400); - - mainLayout.setPrefSize(400, 600); - - 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); - sendButton.setPrefWidth(55); - - AnchorPane.setTopAnchor(scrollPane, 1.0); - - AnchorPane.setBottomAnchor(sendButton, 1.0); - AnchorPane.setRightAnchor(sendButton, 1.0); - - AnchorPane.setBottomAnchor(userInput,1.0); - AnchorPane.setLeftAnchor(userInput, 1.0); - - //Step 3. Add functionality to handle user input. - sendButton.setOnMouseClicked(mouseEvent -> { - handleUserInput(); - }); - - userInput.setOnAction((event) -> { - handleUserInput(); - }); - - //Scroll down to the end every time dialogContainer's height changes. - dialogContainer.heightProperty().addListener((observable) -> scrollPane.setVvalue(1.0)); - - - } - - /** - * 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( - new DialogBox(userText, new ImageView(userImage)), - new DialogBox(dukeText, new ImageView(dukeImage)) - ); - 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) { - //duke.run(input); - return "Duke heard: " + input; - } - -} diff --git a/src/main/java/FindCommand.java b/src/main/java/FindCommand.java index 032b17b05c..cc22664b80 100644 --- a/src/main/java/FindCommand.java +++ b/src/main/java/FindCommand.java @@ -10,10 +10,10 @@ public FindCommand(String text) { @Override - public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + public String execute(TaskList taskList, Ui ui, Storage storage) throws IOException { Task[] matchedTasks = taskList.find(text); - ui.find(matchedTasks); + return ui.find(matchedTasks); } } diff --git a/src/main/java/Launcher.java b/src/main/java/Launcher.java deleted file mode 100644 index 9ab7410f7c..0000000000 --- a/src/main/java/Launcher.java +++ /dev/null @@ -1,10 +0,0 @@ -import javafx.application.Application; - -public class Launcher { - - public static void main(String[] args) throws DukeException { - - Application.launch(FX.class, args); - } - -} diff --git a/src/main/java/ListCommand.java b/src/main/java/ListCommand.java index 7e873c9102..4981775811 100644 --- a/src/main/java/ListCommand.java +++ b/src/main/java/ListCommand.java @@ -14,8 +14,8 @@ public class ListCommand extends Command { * @throws IOException */ @Override - public void execute(TaskList taskList, Ui ui, Storage storage) throws IOException { - ui.list(); - taskList.list(); + public String execute(TaskList taskList, Ui ui, Storage storage) throws IOException { + + return ui.list(taskList.list); } } diff --git a/src/main/java/Storage.java b/src/main/java/Storage.java index 769b3e3b3f..d89465a7e6 100644 --- a/src/main/java/Storage.java +++ b/src/main/java/Storage.java @@ -30,7 +30,7 @@ public Storage(String filePath, String folderPath) { * @throws IOException */ public void makeDirectory (String folderPath) throws IOException { - File file = new File(filePath); + File file = new File(folderPath); file.mkdirs(); } diff --git a/src/main/java/TaskList.java b/src/main/java/TaskList.java index 83138bc414..9f89df1c30 100644 --- a/src/main/java/TaskList.java +++ b/src/main/java/TaskList.java @@ -38,16 +38,6 @@ public Task done (int index) { return task; } - /** - * Lists all the tasks - */ - public void list() { - - for (int i = 0; i < list.size(); i++) { - System.out.println(i+1 + "." + list.get(i)); - } - } - /** * Deletes a task * @param index The index of the task diff --git a/src/main/java/Ui.java b/src/main/java/Ui.java index 5ff4f0e0a9..927ea97d8c 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -6,28 +6,34 @@ */ public class Ui { - private Scanner scanner = new Scanner(System.in); - /** * Greets the user */ - public void greeting () { - System.out.println("Hello! I'm Duke\nWhat can I do for you?"); + public String greeting () { + + return "Hello! I'm Duke\nWhat can I do for you?"; } /** * Bids farewell to the user */ - public void bye() { - System.out.println("Bye. Hope to see you again soon!"); + public String bye() { + return "Bye. Hope to see you again soon!"; } /** * Lists all the Tasks to the user */ - public void list () { - System.out.println("Here are the tasks in your list:"); + public String list (ArrayList list) { + + String text = "Here are the tasks in your list:\n"; + + for (int i = 0; i < list.size(); i++) { + text += i+1 + "." + list.get(i) +"\n"; + } + + return text; } @@ -35,14 +41,9 @@ public void list () { * Notifies user that a Task was added to the tasks list * @param list */ - public void add (ArrayList list) { - - System.out.println("Got it. I've added this task:"); - - System.out.println(list.get(list.size() - 1)); - - System.out.printf("Now you have %d tasks in the list.\n", list.size()); + public String add (ArrayList list) { + return "Got it. I've added this task:\n" + list.get(list.size() - 1) + "\n" + String.format("Now you have %d tasks in the list.\n", list.size()); } @@ -51,54 +52,43 @@ public void add (ArrayList list) { * @param task list * @param task Task that was deleted */ - public void delete(ArrayList list, Task task) { + public String delete(ArrayList list, Task task) { - System.out.println(task); - - System.out.printf("Now you have %d tasks in the list.\n", list.size()); + return task + "\n" + String.format("Now you have %d tasks in the list.\n", list.size()); } /** * Notifies user that a task was completed (done status changed to true) * @param task Task that was completed */ - public void done(Task task) { - - System.out.println("Nice! I've marked this task as done:"); + public String done(Task task) { - System.out.println(task); + return "Nice! I've marked this task as done:\n" + task; } /** * Shows an error to the user * @param message The error message */ - public void showError(String message) { - System.out.println(message); - } - - /** - * Reads input from the user - * @return The input read from the user - */ - public String readCommand() { - - return scanner.nextLine(); + public String showError(String message) { + return message; } /** * Aborts the application */ - public void abort() { - System.out.println("SORRY SOMETHING WENT SERIOUSLY WRONG! \nGoodbye!"); + public String abort() { + return "SORRY SOMETHING WENT SERIOUSLY WRONG! \nGoodbye!"; } - public void find(Task[] matchedTasks) { + public String find(Task[] matchedTasks) { - System.out.println("Here are the matching tasks in your list:"); + String text = "Here are the matching tasks in your list:\n"; for (Task task : matchedTasks) { - System.out.println(task); + text += task + "\n"; } + + return text; } } From 07298f9185a23c01224c5a09ba79a15ec51cfbec Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Mon, 30 Sep 2019 17:01:23 +0800 Subject: [PATCH 29/38] Making JUnit work with Gradle (and adding more unit testing functions) --- build.gradle | 9 +++++ src/test/java/DukeTest.java | 11 ------ src/test/java/TaskListTest.java | 63 +++++++++++++++++++++++++++++++++ src/test/java/TaskTest.java | 40 +++++++++++++++++++++ 4 files changed, 112 insertions(+), 11 deletions(-) delete mode 100644 src/test/java/DukeTest.java create mode 100644 src/test/java/TaskListTest.java create mode 100644 src/test/java/TaskTest.java diff --git a/build.gradle b/build.gradle index 5ca4f90444..01d70930cb 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,11 @@ repositories { mavenCentral() } +dependencies { + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1' +} + application { // Change this to your main class. mainClassName = "Duke" @@ -17,4 +22,8 @@ application { run { standardInput = System.in +} + +test { + useJUnitPlatform() } \ No newline at end of file diff --git a/src/test/java/DukeTest.java b/src/test/java/DukeTest.java deleted file mode 100644 index 73a4c60138..0000000000 --- a/src/test/java/DukeTest.java +++ /dev/null @@ -1,11 +0,0 @@ -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class DukeTest { - - @Test - public void dummyTest() { - assertEquals(2, 2); - } -} diff --git a/src/test/java/TaskListTest.java b/src/test/java/TaskListTest.java new file mode 100644 index 0000000000..3e8def481e --- /dev/null +++ b/src/test/java/TaskListTest.java @@ -0,0 +1,63 @@ +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class TaskListTest { + + @Test + public void addTaskSuccessfully() throws DukeException { + + assertEquals("[T][\u2718] DESCRIPTION", Parser.parsesAdd("todo DESCRIPTION", TaskType.TODO).toString()); + + assertEquals("[D][\u2718] DESCRIPTION (by: DATE)", + Parser.parsesAdd("deadline DESCRIPTION /by DATE", TaskType.DEADLINE).toString()); + + assertEquals("[E][\u2718] DESCRIPTION (at: DATE)", Parser.parsesAdd("event DESCRIPTION /at DATE", TaskType.EVENT).toString()); + } + + @Test + public void addTaskUnsuccessfully() throws DukeException { + + try { + Parser.parsesAdd("todo", TaskType.TODO).toString(); + } catch (DukeException e) { + assertEquals(DukeException.emptyDescription().getMessage(), e.getMessage()); + } + + try { + Parser.parsesAdd("", TaskType.TODO).toString(); + } catch (DukeException e) { + assertEquals(DukeException.emptyDescription().getMessage(), e.getMessage()); + } + + + try { + Parser.parsesAdd("deadline", TaskType.DEADLINE).toString(); + } catch (DukeException e) { + assertEquals(DukeException.emptyDescription().getMessage(), e.getMessage()); + } + + try { + Parser.parsesAdd("", TaskType.DEADLINE).toString(); + } catch (DukeException e) { + assertEquals(DukeException.emptyDescription().getMessage(), e.getMessage()); + } + + + try { + Parser.parsesAdd("event", TaskType.EVENT).toString(); + } catch (DukeException e) { + assertEquals(DukeException.emptyDescription().getMessage(), e.getMessage()); + } + + try { + Parser.parsesAdd("", TaskType.EVENT).toString(); + } catch (DukeException e) { + assertEquals(DukeException.emptyDescription().getMessage(), e.getMessage()); + } + + } + + + +} diff --git a/src/test/java/TaskTest.java b/src/test/java/TaskTest.java new file mode 100644 index 0000000000..104f57a9df --- /dev/null +++ b/src/test/java/TaskTest.java @@ -0,0 +1,40 @@ +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class TaskTest { + + @Test + public void descriptionTest() { + + assertEquals("DESCRIPTION", new Todo("DESCRIPTION").description); + assertEquals("DESCRIPTION", new Deadline("DESCRIPTION", "DUMMY").description); + assertEquals("DESCRIPTION", new Event("DESCRIPTION", "DUMMY").description); + + } + + @Test + public void isDoneTest() { + + assertEquals(false, new Deadline("DUMMY", "DUMMY").isDone); + + Deadline deadline = new Deadline("DUMMY", "DUMMY"); + deadline.markAsDone(); + + assertEquals(true, deadline.isDone); + } + + @Test + public void dateTest() { + assertEquals("DATE", new Deadline("DUMMY", "DATE").by); + assertEquals("DATE", new Event("DUMMY", "DATE").at); + } + + @Test + public void taskObjectTest() { + assertEquals("[T][\u2718] DESCRIPTION", new Todo("DESCRIPTION").toString()); + assertEquals("[D][\u2718] DESCRIPTION (by: DATE)", new Deadline("DESCRIPTION", "DATE").toString()); + assertEquals("[E][\u2718] DESCRIPTION (at: DATE)", new Event("DESCRIPTION", "DATE").toString()); + } + +} From 8f60f0fb5c2ce86216f5824b78d9de6ff10dc60d Mon Sep 17 00:00:00 2001 From: Karan Dev Sapra <> Date: Mon, 30 Sep 2019 19:09:23 +0800 Subject: [PATCH 30/38] Made the DialogBox have resizable width (through SceneBuilder) so that all the text fits as the TaskList shrinks or grows --- src/main/java/DialogBox.java | 62 +++++++++--- src/main/java/Duke.java | 122 +----------------------- src/main/java/DukeException.java | 4 + src/main/java/Launcher.java | 12 +++ src/main/java/Main.java | 30 ++++++ src/main/java/MainWindow.java | 56 +++++++++++ src/main/java/Ui.java | 6 +- src/main/resources/view/DialogBox.fxml | 16 ++++ src/main/resources/view/MainWindow.fxml | 19 ++++ 9 files changed, 189 insertions(+), 138 deletions(-) create mode 100644 src/main/java/Launcher.java create mode 100644 src/main/java/Main.java create mode 100644 src/main/java/MainWindow.java create mode 100644 src/main/resources/view/DialogBox.fxml create mode 100644 src/main/resources/view/MainWindow.fxml diff --git a/src/main/java/DialogBox.java b/src/main/java/DialogBox.java index dd7a04657b..60636ac988 100644 --- a/src/main/java/DialogBox.java +++ b/src/main/java/DialogBox.java @@ -1,27 +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 { - - private Label text; + @FXML + private Label dialog; + @FXML 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); + 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.java b/src/main/java/Duke.java index 755e44f3de..23bba8ca1f 100644 --- a/src/main/java/Duke.java +++ b/src/main/java/Duke.java @@ -17,7 +17,7 @@ /** * Class where the main logic is executed */ -public class Duke extends Application { +public class Duke { private Storage storage; private TaskList tasks; @@ -76,131 +76,13 @@ public String run (String fullCommand) { return ui.showError(e.getMessage()); } - - } - - /** - * This is the starting point of the application - * @param args - * @throws DukeException - * @throws IOException - */ - - - public static void main(String[] args) throws DukeException, IOException { - - Application.launch(Duke.class, args); - } - - //Fx Functions - - /** - * Setting up the JavaFX Controls - * @param stage Primary Stage - * @throws Exception - */ - @Override - public void start(Stage stage) throws Exception { - - //Step 1. Setting up required components - - 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("My name is Duke!"); - - stage.setResizable(false); - stage.setMinHeight(600); - stage.setMinWidth(400); - - mainLayout.setPrefSize(400, 600); - - 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); - sendButton.setPrefWidth(55); - - AnchorPane.setTopAnchor(scrollPane, 1.0); - - AnchorPane.setBottomAnchor(sendButton, 1.0); - AnchorPane.setRightAnchor(sendButton, 1.0); - - AnchorPane.setBottomAnchor(userInput,1.0); - AnchorPane.setLeftAnchor(userInput, 1.0); - - //Step 3. Add functionality to handle user input. - sendButton.setOnMouseClicked(mouseEvent -> { - handleUserInput(); - }); - - userInput.setOnAction((event) -> { - handleUserInput(); - }); - - //Scroll down to the end every time dialogContainer's height changes. - dialogContainer.heightProperty().addListener((observable) -> scrollPane.setVvalue(1.0)); - - greetUser(); - - } - - /** - * 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( - new DialogBox(userText, new ImageView(userImage)), - new DialogBox(dukeText, new ImageView(dukeImage)) - ); - userInput.clear(); - - if (this.isExit) { - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - System.exit(0); - } - System.exit(0); - } - } - - private void greetUser() { - Label dukeText = new Label(ui.greeting()); - dialogContainer.getChildren().addAll( - new DialogBox(dukeText, new ImageView(dukeImage)) - ); } /** * 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) { + public String getResponse(String input) { return this.run(input); } diff --git a/src/main/java/DukeException.java b/src/main/java/DukeException.java index 407d432475..fe25ce63f6 100644 --- a/src/main/java/DukeException.java +++ b/src/main/java/DukeException.java @@ -18,4 +18,8 @@ public DukeException (String message) { public static DukeException emptyDescription () { return new DukeException("☹ OOPS!!! The description of a todo cannot be empty."); } + + public static DukeException outOfBounds () { + return new DukeException("☹ OOPS!!! The number you inputted is out of bounds \uD83D\uDE22"); + } } diff --git a/src/main/java/Launcher.java b/src/main/java/Launcher.java new file mode 100644 index 0000000000..fd31fedf59 --- /dev/null +++ b/src/main/java/Launcher.java @@ -0,0 +1,12 @@ +import javafx.application.Application; + +public class Launcher { + + /** + * This is the starting point of the application + * @param args + */ + public static void main (String[] args) { + Application.launch(Main.class, args); + } +} diff --git a/src/main/java/Main.java b/src/main/java/Main.java new file mode 100644 index 0000000000..0d8d97f0cc --- /dev/null +++ b/src/main/java/Main.java @@ -0,0 +1,30 @@ + +import java.io.IOException; + +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(); + } + } +} \ No newline at end of file diff --git a/src/main/java/MainWindow.java b/src/main/java/MainWindow.java new file mode 100644 index 0000000000..25f3ea0f80 --- /dev/null +++ b/src/main/java/MainWindow.java @@ -0,0 +1,56 @@ +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; + greetUser(); + } + + private void greetUser() { + dialogContainer.getChildren().addAll( + DialogBox.getDukeDialog(Ui.greeting(), dukeImage) + ); + } + + /** + * 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/Ui.java b/src/main/java/Ui.java index 927ea97d8c..eb18bfdb8e 100644 --- a/src/main/java/Ui.java +++ b/src/main/java/Ui.java @@ -9,7 +9,7 @@ public class Ui { /** * Greets the user */ - public String greeting () { + public static String greeting () { return "Hello! I'm Duke\nWhat can I do for you?"; } @@ -17,7 +17,7 @@ public String greeting () { /** * Bids farewell to the user */ - public String bye() { + public static String bye() { return "Bye. Hope to see you again soon!"; } @@ -77,7 +77,7 @@ public String showError(String message) { /** * Aborts the application */ - public String abort() { + public static String abort() { return "SORRY SOMETHING WENT SERIOUSLY WRONG! \nGoodbye!"; } diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml new file mode 100644 index 0000000000..e84aa9b73d --- /dev/null +++ b/src/main/resources/view/DialogBox.fxml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml new file mode 100644 index 0000000000..435f3ce0d8 --- /dev/null +++ b/src/main/resources/view/MainWindow.fxml @@ -0,0 +1,19 @@ + + + + + + + + + + + +