From 854aefe8fe263174a4890f253b63a21c7c72185b Mon Sep 17 00:00:00 2001 From: ZaykaNya <48089558+ZaykaNya@users.noreply.github.com> Date: Mon, 7 Dec 2020 19:32:59 +0200 Subject: [PATCH 1/4] [Global] Modified classes. --- .../com/Jeans/BackPocket.class | Bin 1689 -> 1715 bytes .../com/Jeans/BottomHem.class | Bin 1295 -> 1320 bytes .../JavaLab1_Clothes/com/Jeans/Button.class | Bin 1636 -> 1662 bytes .../com/Jeans/FrontPocket.class | Bin 1303 -> 1328 bytes .../com/Jeans/InsidePart.class | Bin 1299 -> 1324 bytes .../JavaLab1_Clothes/com/Jeans/Jeans.class | Bin 2581 -> 2963 bytes .../com/Jeans/JeansParts.class | Bin 1147 -> 1370 bytes .../JavaLab1_Clothes/com/Jeans/Main.class | Bin 4135 -> 7867 bytes .../com/Jeans/OutsidePart.class | Bin 1773 -> 1799 bytes .../JavaLab1_Clothes/com/Jeans/Zipper.class | Bin 1625 -> 1651 bytes src/com/Jeans/BackPocket.java | 4 ++-- src/com/Jeans/BottomHem.java | 4 ++-- src/com/Jeans/Button.java | 4 ++-- src/com/Jeans/FrontPocket.java | 4 ++-- src/com/Jeans/InsidePart.java | 4 ++-- src/com/Jeans/Jeans.java | 16 +++++++++++++++- src/com/Jeans/JeansParts.java | 15 +++++++++++++-- src/com/Jeans/OutsidePart.java | 4 ++-- src/com/Jeans/Zipper.java | 4 ++-- test/com/Jeans/BackPocketTest.java | 4 ++-- test/com/Jeans/BottomHemTest.java | 2 +- test/com/Jeans/ButtonTest.java | 2 +- test/com/Jeans/FrontPocketTest.java | 2 +- test/com/Jeans/InsidePartTest.java | 2 +- test/com/Jeans/OutsidePartTest.java | 2 +- test/com/Jeans/PatternTest.java | 2 +- test/com/Jeans/ZipperTest.java | 2 +- 27 files changed, 51 insertions(+), 26 deletions(-) diff --git a/out/production/JavaLab1_Clothes/com/Jeans/BackPocket.class b/out/production/JavaLab1_Clothes/com/Jeans/BackPocket.class index 31b1b9a38bd802562bb29d7e5d21c9976828da03..857f6d8fc031961ce1a280f0b86432e36d35e86f 100644 GIT binary patch delta 339 zcmW-byGjFL5QWd|CI7nF1Qji|Fqk4iqaZdWZeona+ZwNlb`~ySg}|D~u7aJfp!^`% z2)=ocZR=9A+L;FDdi;@BIUSgX24Mj;3Wz$&=eZ{Us_hm&ldZ zO4HOY!cN;KaQmg)rq@iYV?$umLKa){O#K|)CM3_jOF!&*fip=4c4S4fvwH-i-3xjl zdj!kvcKxs(cv0j>0*8d0e9|)VSrw{4OFn9in=2$B_@j}+%#^K-C*D8>TYrVf19IVsCQBQ{H>r743f8-hPyr7n_H>7#jhqgT{5tjkCJ gYi@%;!6vro1zua{$bPDRsz*5CiA8#fb2MT90d`J zeG5Sei#SjZ;v+mFID_ae&iYZ}SINc+q5Kc3d4Ci$^#<*_jV{6N4U=KUgis38G|sw7 zl;?47;X;j#hIvJ(s3%cTUq4mQwY z|4S|wKsqgQUW~OFsZ1M&1-74!Evk?rv51wJo&AdR}nrUmB3xOT%vX^<#;mM)a QW38t+<3=()$0b6zzZzgO#sB~S delta 266 zcmXwvJ4*vW7)8(QjAnNfo1|IM5L2zI7!x(>`hF!su(Yw;B1IqpQ7aou%dku<*xIHN zEUc{j5rUn+Lh`vF1Lxj3_j|EJYd?SA-hqVk%+^$teHXKf;wb%6uH!XlHZ5Ch7f7a= zXU7e_kL5kZ)F8d<-t^LbQc*q!iqgNR-1hFfVxvK0(dWoL=s9)jo^)(lin4pwW%r}2 zSC>r4gCJgtLi36m$;V?wXeD71p8_>$F-91$N?r1=h0LPzwm>z%4v54Vu?=@^9_wqe bdaSb{Swhp4WjE)3&O?r6v0_g+qfIyl5`Zc$ diff --git a/out/production/JavaLab1_Clothes/com/Jeans/Button.class b/out/production/JavaLab1_Clothes/com/Jeans/Button.class index d5f9ce81a8c35afc6482d8e8c619d20f208ebe48..5986defdd4698a7f94c50ecd789b7789a1f3474e 100644 GIT binary patch delta 313 zcmW-by-veW426%An;Wg_6d&4;-MrWCM-}pr@Q)o#r39}t=nrx;yJA}{ zs2f7aYj$Y6XmO^}(h~}B<&Ei;+H#;~3jC(#G7S$UOkiD%Jqd`74QxvNr+N4wLyHJu z8LG)l87c}nhU(aoUBWgZ_MM1gZa69JFgq{xT}fDSdtd6TY#vDN%;>q%3!|54im%1H IMuuAie=55#>;M1& delta 306 zcmXwzyGjF56h-%$xnr)AVZ=uhMHs{hV^Rnbjb4rM9d$H5en19EF_0LDR{ljegdVH+BoS<~x;!IXq0rFH@CjQc^rp3oQ+e5R<4$T@x)5>)4R{M~etRmX;C2u~d~# zSt<&7;_KMtvS(@7`;DTNVy>(2zSX`(4=`**vj%YV#Zy;(c+KxWWxezoe`& Ao&W#< diff --git a/out/production/JavaLab1_Clothes/com/Jeans/FrontPocket.class b/out/production/JavaLab1_Clothes/com/Jeans/FrontPocket.class index 861bdedb8e5dd002013979b4eeff8a553710e0c9..6ab1eb573ade5da271bf3a435a21683726690ca2 100644 GIT binary patch delta 277 zcmXYo%`OB{5QV?G-P0|%WfnrD1z{30NQ`0pHQN7AdkNE#kx1Bxl^2lMP42>Ln3crB z%1YuX*n0y}ZlscPPJO59(LP!G{`2w*WSn+wLuR_!v=qJemqh0sK?;|fyt;0+--y}l zXN)cPVBQ9{h2*-t?c7|JSJ{O0vFqAFD*Ns(7!8kvDfexL-G`}0F(<1vdM3WqggSbSnsDp$E)>f-E^*{cO4lZs%G6-o4NeAzsb2&qAzzeXG z;NaBB#hdUt#LsZxdEfKA-YcypTmD06Rh77sKX4qf6Jt8~r8 znk^kG7JBJ0E1uIlUQ-^Yre_EBbA|Ub$OnZuMeVNN&x#~Z%Q7onF3qbQscZ9XCyx)z z$pb&y3IpdIHIe?q1=ZI~Y7iZMmmDOU8 Yw&XH4`?4HWJgIobg)CZZ!WB0Jf5W9HF8}}l diff --git a/out/production/JavaLab1_Clothes/com/Jeans/InsidePart.class b/out/production/JavaLab1_Clothes/com/Jeans/InsidePart.class index 5bdb9652b5c0f31e327a652f3c084a450950be60..94e2e4f67760efc297e10a1ca7477a8e7de46432 100644 GIT binary patch delta 276 zcmW-YO-chn5QSfLPtu_iRE$}Spcp}jx`@&Eml!pUex`rFK zE&_rpS6(3(5i3o>tB>zhv3IHfb}TR`dHRg&$8-Dh^@-h1^xWxnnCQ zU4xSfR?y>D^}TpTC_hIpaXO5W&Ki}_=SS_=143yqPR6M?LM0rH;xtI2EQ>RPYr+P9 z=~ez!MjPDnLrjpw;yg#Y n*pm-Jn;*Ql*1kA}102d;g2s_Fr!LQ3Uf@z1EA|RE2;u(&3^FW7 delta 286 zcmXwvy-LGS7>1vdM3WqgQ(8IpHz4MEs+%gD#;ddBOPL$1yV%w2vgZ<4SZ3cC z>!W|DSQsXgG#?~cTvr~)it4|p7lVgXY&dMMd7LV|`*AkT#V9KM(J0M(SyB{f;c{-C z?8v!P)Xck8Gv9XO?v^=u;799W;Jlz_^0C+uYDt*K!=))L!V&sx(vtjZ0ZXW|t ztx~CQciSp%Y3NE$`Aue1OF9l{=*gEihOZW^(w2L@_#j`{bnJ2|hBgGF=s>5AE(6^- zsG-ewSVMTzsyOt}?K;?Y?BeivxmYA<+Q^E2uYo=s(hw?H8wCyVIw&qsb!x!C8+elj z@7pWRng(q`bPpRiBD;}dp|t9($<|Q=$8enHoG&+Nu4~GNX^z{pd7I?hU#vKrc7`*c%FwV?*tsk7srW4;9b`v!9OfL?8HgYvpeik*1?DJ?}3~p85aQlX(!GdVo zq9=DFl$;d8b^4xBExor&yi~b17Tj*8jS1I=w-HKCh>a+1OsUqUOb=CAY`a_@B=!a* zGfz7ERASeVO8Squwe>GeYK1nHN_S%oHbQxMeeaO+`j54~E@P4-p{~BGy+q5I2HXF^ zaBQ}`UC9?N*;1o1HGxk^kK!Ky)h?|*R^q8q#^qW25T_nt2 zeHVj2P$`5Dc|DFOuWh_LK;!M`BE&v)(s>t-5~N9(Bk09PJe4DGI>RjHxQgTkA(FtC z&_-p}6P8F4LRd)>gpQk(4F=$9&QO}COd4L%Swu&Nj*O02knhU{K3L>G#6xW!OG}hL z#wTSG4=bzzoUj0Ufc6>$>4UA~G4a-x` z(WT0!d1x0yLa7TuULhcPVdhR~>vm7oXp6|pi#9YYBi{f>k3X7ZLm(?C)RY61Tq^p% ztKo2|$TU>`0;`^Kj>(dAMa&@@aoU&pr6jMhCqtg@RaAthh(r%Dl7dQ=>QhY#U~g_Kf%atrrLaMu~l(* z4)TKS!G$`2eYJe|p@gym$geri$8W4`VSO%bK0-LOll~p8>8E(dgOAWfv4>*Mk2v)Zdgw7iL8;@QYK9|fI$S1oSJ-}6S&7$( zavB4iI9GULma9}~!o^ZUJcmu(CDH+$LWRv9P>tGxu->Y@ly9DnbHX=26L=NAzve38 z93!0gbBysBiQ}P%=%jE-!wZZ~XP)Bf<5z!4YTe<}rv}PRe(lb4>@3jVEzZbA_Rdlb s*8tB7f0B`79>N%hO%7XhS{*6wj>8=pDNzJoBBtYfFE_Ti5x~8F0O^ZBDF6Tf delta 1070 zcmZ`&T~8B16g{)s?w08m6lzhVd_!@m6a++yKm`H$QV|rtMa54Ne}M^!e_>)GzWTt6 zi4xHS9~2Xx{1-m@W_%{%ndwrDscAZU=g!=F&b{}Hs(c=o-+q7m1R#s$bvY}dQMBTS z3*SSVdMawAgoUFX+L2LTMPsxR$6R!Ih@o5k61hk#j(h0E36-^4qFMC2IO$;kgKF7I zMY70wIE7*L(yDP>oEC_ypH@5~F@iA<Jn!Iv&ws;qf0Re{nDX diff --git a/out/production/JavaLab1_Clothes/com/Jeans/JeansParts.class b/out/production/JavaLab1_Clothes/com/Jeans/JeansParts.class index a9c7393674c2b034ebc9f213c486a8cb055d61d3..a4e7c28b48720921d3faa39a6c60ae1a95e76b11 100644 GIT binary patch literal 1370 zcmZ{jQEw7K5Xb)ucTnIc1p%elDr(!~uwWCPtmzBH1cTb7rtb${@EW*lj;jy8`F%{( zL}KEDAHWY~oY_Ud146R9H# zUpa$NAo1Mw-0(~wZq_eT*g`6aw1Er^f#Sd)w_ZB7H&N@k9fT8st+5?CfoqQh3cW?d zi!gA#;VH-1Hju-Pfbq}s!u{w7hz?&C4BX=A`oJIg0b5E2%D7FI>%bkbUpI-0z@13? zwm-i1J;x*Jy1AOTvuf(rF9o!=|Biy@damcZz8UwO;H}*sk)_b{2lnXFrc&s8X4Jy> zF4b7>MUuDZ;UN?)H4M}qdM^#j6cOp&zADY8~Yn<8(O^eKwp=sJeGwC+mR z6opPBMQOGva1mLuZ)1<{pHg57g?-$kollG+i_@% literal 1147 zcmZ{i&2HL26ot=#&0n05P#{T@HcgWz#*xatsj>leQPCfXioGEgb!6Fm+Db*0 zy66M+p{ky1J7573VrG2j&bi;5JAeQE{sZ6@S{3AwFG4e*qoA;TV}G&Rp6!p@ABH#1 zC{ifAc6~RxQplUFK^Y~Ki>MgbfT2(y1(Wt$$M&bm_|XodsX}RDM^5P4oyIx*W6MAl+X}{gX5anlD5$P%)(kunb$t|gL0CjXVQ;BWCz#v@zT=b6G*?S>S3|9V zg4PMHS*6-@edqn%WaxyS?4idL;4U0FZ(O-s zHSSLg{Ze|N9n<0**gWK+Ngw$VG-*dX(|OJ%?(1lB+~wDVnL6i&^$W_nn4xHyGi+M> z+6+5CxRJvi$7Y;VqF9-~3brU-r`$gGEJi7S$2j0DD=Dnvm6XoKD=DrqdWa`!={9G{ z(ygB;e&-@7RfvPtSUQo>Q)z{#I7$y+F6=IHDH!N!oIjfl%|doHI2C^FLSis`UT> diff --git a/out/production/JavaLab1_Clothes/com/Jeans/Main.class b/out/production/JavaLab1_Clothes/com/Jeans/Main.class index 18411d2a0e7d41de1a570f33753a35327532243f..7b17c84deccb716cc1a4270444f368b6947e7ee3 100644 GIT binary patch literal 7867 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 delta 1851 zcmah}3s6*L6#mY>?sE6C;AK&;z||oG1W{D79Z^(#i%x@y=xDRz9VC|Bb-5@uC7Kn9 z+3VMymf1sl6Ii<@si{58%q%T?*ux%{q*<1|)6TssIaAHFJNN(pbMAk>^ZnmB|LrK= z=#}@J*|H6QkDP7tX(FE>TZ-7n&k5BfdfB9;oar*MFi?8F41W7h*h?WH>jh6O8}*g!}euLS}jZ?K_mt`_mCEb5~Q z9>e2=9(Dd&ZFDGD<<~1}^!dE1*Zo1go)8!Bu-qf_NrGG%YKVBRG?+T^G$$Js@dxMm zyb_)f-CP$GwxZpTYn_Z_JgeY2tmQq`nm)x}r^#qVOu=S6&*J#QVJ$e1kSCToJtE>t zFGL5y>0MMaPoMAe8u42dY{PbTa(sp1W(l%$N)4DD2Fy;e)zxbxULquT16r`UEAABq zuNrX)95>nYJMkKyJx<%JFAi(*1g|UDi#J4u(%03BHx0=B2BDFvM+``DiECW$e7sE{ zmbn!N6})4d#;J$O^+-*y+Mswy!FzCU+l1Mpi-JTUhPfLpG(ohx2X;#=*ZozsW&ZFq z|J;Bk;i$MYsX%ll=Oy7c8NcHX34a>$pAjomK85J+>20$SE)x5@Ww`6JCWk_`4Pl8G zKhtp4a4{TlCwg-mTDW|G6`URp9^YrHfM?>_o*M(T@xp=+cr;$K6Cd)ZoLe8pM{FhF zV|>CM4z^~%4JSaI;<)GX2{HI$D2}3}1ErN}t_Ne){xOU<9Rn)WLJuaXMQRyuGhI{7 zJ(n4K%1y_#N_DyiGt?rnHZ`*;hWVzqwoV6?vPX=XW661h`7=-+?&% zV1^(1|17TlH;X0zWU;hKEs9~L$zYb5XQ`2AcBOiS>Q}2`(Efwpl5_mpacy3H6gNh3 z6ECBwij_-}+{xyY96DYC1N_#Eku zR9mWj3pVl>PU5ZU5`(sJNu1P7EqvdtW(ix+$1Il(G8ZY4EjNa73kIN~2`T&y@L)Ys zu^ruU0BJaco?Pw=$%RbHL{l#+fR{?po93VoMUX`c(U+FtVroV|PLo3`kxOgPpEjU? zVi-s}QAoQnnD$}_?MD$E#3ghDL+KcNW*>#&Vk8Zp;s|%yFq(wVcx7cA8K2_|qdln; zU*ag!wl&dFd}XvA!Tbtehef-{3fGoTw*G@XF5Vy5n1%2gO~sEm m&2n1t6Q{7?XZ*r5A05B)bC!&&t+IbMW|0L6WF;@i%PsiUxHAZ!1 zj8UlWjHV;cI`K(FVEJi0rdJ)TVckM4g>i)H!F(;%3CVWrBI?Ag(;!bawg}mOBYz%W zN9-2bQ$-s)>Q;E7NpMxqbWIBf>O<5smq@_kG6NHng`5~lsInYxIIxjHAEr5|@Bzn| zL7Dd-jbId{$%O|)Q;9vHDTx%MrU0}2OPIsFx|e}j!Ge01Z`DOk4J=`qx8U4Il_?7o bE37v3+|+X$yPOR2wa<+j+-MK`I7IFje1kSs delta 307 zcmZqYd&|pp>ff$?3=9lb451Ub^cgiKTB&VJ{KUxU4rENOVv?Uciz#^WPo|}O&Rh&G z46f`9ZafT%4DOTHFdxzJWMtsZO)N<*%1q3$Qefm@@MdHXfe9!SXI7;GMKyAbG&vZ2 zC(mI~V+mwrP@VjdMUG3wCqF;Cw1AxQm;;4PfYLxo1`7sDAPr*4GRQG7f?28zY79(ZmJU#i1W(W zW*Y|E$)8v+IokncnHcOD9Dp( MM*u?*LkNQ;07!{7fB*mh diff --git a/out/production/JavaLab1_Clothes/com/Jeans/Zipper.class b/out/production/JavaLab1_Clothes/com/Jeans/Zipper.class index a2264785c5371aeabcb85f058b032f5373fec039..58b2bd4898da1fbc243ea0c57349c47acd46649e 100644 GIT binary patch delta 319 zcmW-bJ5R$v5QJyXzSvwW2uKtLVUfZFoB|;M0R!g!FpofZ^h8mFf`Wo9DCudV>u9Jc zX(_0v;1}>aB3i_9&Fr@`v(kQhJx_i9zP$s8anV)NG}VnKD1E(rA&RsTB}(;-s497z zwHi$VuMgt7e?wstTMo886tSa!#K+JcA%9c9Yi6x_J02$&`})iB2M!5tqtotW#;fX{ zRkCY@P#3K*=irPGFb4X{jtck4!R1#5qw=J04?FtV9<3?13h2Wu2MHHA#vJB({?ix& zkf9JBgrPEfwxK+G(oh8paJadMSd)ycB`oVirnI6ToGE&3#Ab-jU`z_zJwwpSO1aDb63fIwkB|)34bxQAMcCvsQ=it*da| z!v;1TYz3IYHrw_`x=Zl;*-dwtXT7vUF7^oH|DtrA-*v?%{h5l3eS&*A=naNucgUp5 z>X;C7-Ht~boDw3zh;LOj%%S1PhsLV4q@egk6F^74%e>8~*WGF@e z%TP_6GUSWX(l@cdMV;D parts, String name, double width, double length, JeansType type) throws JeansException { - if(name.equals("")) { + if (name.equals("")) { throw new JeansException(); } this.parts = parts; @@ -23,6 +24,18 @@ public Jeans(Collection parts, String name, double width, double len } + public Collection getParts() { + return parts; + } + + public int getPrice() { + return price; + } + + public void setPrice(int price) { + this.price = price; + } + public String getName() { return name; } @@ -49,6 +62,7 @@ public JeansType getType() { public Jeans addPart(JeansParts part) { this.parts.add(part); + this.price += part.price; return this; } diff --git a/src/com/Jeans/JeansParts.java b/src/com/Jeans/JeansParts.java index 47e9284..6cba3e6 100644 --- a/src/com/Jeans/JeansParts.java +++ b/src/com/Jeans/JeansParts.java @@ -4,11 +4,21 @@ public abstract class JeansParts implements JeansComponent { protected String material; protected double materialSize; protected String color; + protected int price; - public JeansParts(String material, double materialSize, String color) { + public JeansParts(String material, double materialSize, String color, int price) { this.material = material; this.materialSize = materialSize; this.color = color; + this.price = price; + } + + public int getPrice() { + return price; + } + + public void setPrice(int price) { + this.price = price; } public String getMaterial() { @@ -35,5 +45,6 @@ public void setColor(String color) { this.color = color; } - public void print(){} + public void print() { + } } diff --git a/src/com/Jeans/OutsidePart.java b/src/com/Jeans/OutsidePart.java index 7855e81..50261c6 100644 --- a/src/com/Jeans/OutsidePart.java +++ b/src/com/Jeans/OutsidePart.java @@ -3,8 +3,8 @@ public class OutsidePart extends JeansParts { private Pattern pattern; - public OutsidePart(String material, double materialSize, String color, Pattern pattern) { - super(material, materialSize, color); + public OutsidePart(String material, double materialSize, String color, Pattern pattern, int price) { + super(material, materialSize, color, price); this.pattern = pattern; } diff --git a/src/com/Jeans/Zipper.java b/src/com/Jeans/Zipper.java index 492d782..e7aa2c0 100644 --- a/src/com/Jeans/Zipper.java +++ b/src/com/Jeans/Zipper.java @@ -3,8 +3,8 @@ public class Zipper extends JeansParts { private double zipperLength; - public Zipper(String material, double materialSize, String color, double zipperLength) { - super(material, materialSize, color); + public Zipper(String material, double materialSize, String color, double zipperLength, int price) { + super(material, materialSize, color, price); this.zipperLength = zipperLength; } diff --git a/test/com/Jeans/BackPocketTest.java b/test/com/Jeans/BackPocketTest.java index 547d6a3..f6f9d0d 100644 --- a/test/com/Jeans/BackPocketTest.java +++ b/test/com/Jeans/BackPocketTest.java @@ -10,7 +10,7 @@ public class BackPocketTest { public void checkBackPocketConstructor() { BackPocket backPocket = new BackPocket("Denim", 0.5, "blue", - new Button("steel", 0.02, "black", "Pocket Button")); + new Button("steel", 0.02, "black", "Pocket Button", 200), 200); Assertions.assertEquals("Denim", backPocket.getMaterial()); Assertions.assertEquals(0.5, backPocket.getMaterialSize()); @@ -28,7 +28,7 @@ void testBackPocket() { Button button = Mockito.mock(Button.class); button.setButtonType("Pocket Button"); Mockito.when(button.getButtonType()).thenReturn(str); - BackPocket backPocket = new BackPocket("Denim", 0.5, "blue", button); + BackPocket backPocket = new BackPocket("Denim", 0.5, "blue", button, 200); Assertions.assertEquals(backPocket.getBackPocketButton().getButtonType(), str); Mockito.verify(button).getButtonType(); } diff --git a/test/com/Jeans/BottomHemTest.java b/test/com/Jeans/BottomHemTest.java index 5398e37..63eb6a2 100644 --- a/test/com/Jeans/BottomHemTest.java +++ b/test/com/Jeans/BottomHemTest.java @@ -8,7 +8,7 @@ public class BottomHemTest { @Test public void checkBottomHemConstructor() { - BottomHem bottomHem = new BottomHem("Denim", 0.1, "blue"); + BottomHem bottomHem = new BottomHem("Denim", 0.1, "blue", 200); Assertions.assertEquals("Denim", bottomHem.getMaterial()); Assertions.assertEquals(0.1, bottomHem.getMaterialSize()); diff --git a/test/com/Jeans/ButtonTest.java b/test/com/Jeans/ButtonTest.java index a15a959..487a192 100644 --- a/test/com/Jeans/ButtonTest.java +++ b/test/com/Jeans/ButtonTest.java @@ -8,7 +8,7 @@ public class ButtonTest { @Test public void checkButtonConstructor() { - Button button = new Button("steel", 0.04, "black", "Common Button"); + Button button = new Button("steel", 0.04, "black", "Common Button", 200); Assertions.assertEquals(0.04, button.getMaterialSize()); Assertions.assertEquals("Common Button", button.getButtonType()); diff --git a/test/com/Jeans/FrontPocketTest.java b/test/com/Jeans/FrontPocketTest.java index c6e15eb..e898d89 100644 --- a/test/com/Jeans/FrontPocketTest.java +++ b/test/com/Jeans/FrontPocketTest.java @@ -8,7 +8,7 @@ public class FrontPocketTest { @Test public void checkFrontPocketConstructor() { - FrontPocket frontPocket = new FrontPocket("Denim", 0.3, "blue"); + FrontPocket frontPocket = new FrontPocket("Denim", 0.3, "blue", 200); Assertions.assertEquals("Denim", frontPocket.getMaterial()); Assertions.assertEquals(0.3, frontPocket.getMaterialSize()); diff --git a/test/com/Jeans/InsidePartTest.java b/test/com/Jeans/InsidePartTest.java index a70aae7..1dd426b 100644 --- a/test/com/Jeans/InsidePartTest.java +++ b/test/com/Jeans/InsidePartTest.java @@ -8,7 +8,7 @@ public class InsidePartTest { @Test public void checkInsidePartConstructor() { - InsidePart insidePart = new InsidePart("Cotton", 5, "black"); + InsidePart insidePart = new InsidePart("Cotton", 5, "black", 200); Assertions.assertEquals("Cotton", insidePart.getMaterial()); Assertions.assertEquals(5, insidePart.getMaterialSize()); diff --git a/test/com/Jeans/OutsidePartTest.java b/test/com/Jeans/OutsidePartTest.java index 857cdcc..8238aae 100644 --- a/test/com/Jeans/OutsidePartTest.java +++ b/test/com/Jeans/OutsidePartTest.java @@ -9,7 +9,7 @@ public class OutsidePartTest { public void checkOutsidePartConstructor() { OutsidePart outsidePart = new OutsidePart("Denim", 5, "blue", - new OutsidePart.Pattern("Round", "Medium", "white")); + new OutsidePart.Pattern("Round", "Medium", "white"), 200); Assertions.assertEquals("Denim", outsidePart.getMaterial()); Assertions.assertEquals(5, outsidePart.getMaterialSize()); diff --git a/test/com/Jeans/PatternTest.java b/test/com/Jeans/PatternTest.java index 6303c85..1a5d956 100644 --- a/test/com/Jeans/PatternTest.java +++ b/test/com/Jeans/PatternTest.java @@ -11,7 +11,7 @@ void testPattern() { OutsidePart.Pattern pattern = Mockito.mock(OutsidePart.Pattern.class); pattern.setPattern("Round"); Mockito.when(pattern.getPattern()).thenReturn(str); - OutsidePart outsidePart = new OutsidePart("Denim", 5, "blue", pattern); + OutsidePart outsidePart = new OutsidePart("Denim", 5, "blue", pattern, 200); Assertions.assertEquals(outsidePart.getPattern().getPattern(), str); Mockito.verify(pattern).getPattern(); } diff --git a/test/com/Jeans/ZipperTest.java b/test/com/Jeans/ZipperTest.java index 6d3cdba..3f37ccf 100644 --- a/test/com/Jeans/ZipperTest.java +++ b/test/com/Jeans/ZipperTest.java @@ -8,7 +8,7 @@ public class ZipperTest { @Test public void checkZipperConstructor() { - Zipper zipper = new Zipper("Steel", 0.1, "black", 0.15); + Zipper zipper = new Zipper("Steel", 0.1, "black", 0.15, 200); Assertions.assertEquals("Steel", zipper.getMaterial()); Assertions.assertEquals(0.1, zipper.getMaterialSize()); From 67c5885bfef8dc7983ec1f24dd2bb1f6f50bd426 Mon Sep 17 00:00:00 2001 From: ZaykaNya <48089558+ZaykaNya@users.noreply.github.com> Date: Mon, 7 Dec 2020 19:33:14 +0200 Subject: [PATCH 2/4] [Main] Created lambda functions. --- src/com/Jeans/Main.java | 75 ++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 16 deletions(-) diff --git a/src/com/Jeans/Main.java b/src/com/Jeans/Main.java index cd11ee3..1fc7f12 100644 --- a/src/com/Jeans/Main.java +++ b/src/com/Jeans/Main.java @@ -1,6 +1,10 @@ package com.Jeans; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.OptionalInt; +import java.util.stream.Stream; public class Main { @@ -14,37 +18,76 @@ public static void main(String[] args) { Jeans myJeans2 = new Jeans(new ArrayList<>(), "Name", 28, 30, JeansType.flare); myJeans.addPart(new BackPocket("Denim", 0.5, "blue", - new Button("steel", 0.02, "black", "Pocket Button"))) - .addPart(new BottomHem("Denim", 0.1, "blue")) - .addPart(new Button("steel", 0.05, "black", "Common Button")) - .addPart(new FrontPocket("Denim", 0.3, "blue")) - .addPart(new InsidePart("Cotton", 5, "black")) + new Button("steel", 0.02, "black", "Pocket Button", 150), 150)) + .addPart(new BottomHem("Denim", 0.1, "blue", 150)) + .addPart(new Button("steel", 0.05, "black", "Common Button", 250)) + .addPart(new FrontPocket("Denim", 0.3, "blue", 150)) + .addPart(new InsidePart("Cotton", 5, "black", 150)) .addPart(new OutsidePart("Denim", 5, "blue", - new OutsidePart.Pattern("Round", "Medium", "white"))) - .addPart(new Zipper("Steel", 0.1, "black", 0.15)); + new OutsidePart.Pattern("Round", "Medium", "white"), 150)) + .addPart(new Zipper("steel", 0.1, "black", 0.15, 150)); printJeans(myJeans); myJeans2.addPart(new BackPocket("Denim", 0.6, "blue", - new Button("steel", 0.02, "black", "Pocket Button"))) - .addPart(new BottomHem("Denim", 0.1, "blue")) - .addPart(new Button("steel", 0.04, "black", "Common Button")) - .addPart(new FrontPocket("Denim", 0.2, "blue")) - .addPart(new InsidePart("Cotton", 6, "black")) + new Button("steel", 0.02, "black", "Pocket Button", 200), 200)) + .addPart(new BottomHem("Denim", 0.1, "blue", 200)) + .addPart(new Button("steel", 0.04, "black", "Common Button", 200)) + .addPart(new FrontPocket("Denim", 0.2, "blue", 200)) + .addPart(new InsidePart("Cotton", 6, "black", 200)) .addPart(new OutsidePart("Denim", 6, "blue", - new OutsidePart.Pattern("Round", "Medium", "white"))) - .addPart(new Zipper("Steel", 0.1, "black", 0.2)); + new OutsidePart.Pattern("Round", "Medium", "white"), 200)) + .addPart(new Zipper("steel", 0.1, "black", 0.2, 200)); System.out.println(myJeans.equals(myJeans2)); System.out.println(); + + int price = myJeans.getParts().stream().filter(part -> part.getMaterial() == "steel") + .mapToInt(part -> part.getPrice()).reduce(0, (left, right) -> left + right); + + System.out.println("Price: " + price); + + + OptionalInt maxPrice = myJeans.getParts().stream().mapToInt(part -> { + if(part.getMaterial().equals("steel")) { + return part.getPrice(); + } + return 0; + }).max(); + + System.out.println("Max Price: " + maxPrice.getAsInt()); + + + int averagePrice = myJeans.getParts().stream().filter(part -> part.getMaterial() == "steel") + .mapToInt(part -> part.getPrice()).reduce(0, (left, right) -> left + right) + / myJeans.getParts().stream().filter(part -> part.getMaterial() == "steel").toArray().length; + + System.out.println("Average Price: " + averagePrice); + + + ArrayList suitableArray = new ArrayList<>(); + ArrayList unsuitableArray = new ArrayList<>(); + myJeans.getParts().stream().filter(part -> { + if(!part.getMaterial().equals("steel")) { + unsuitableArray.add(part.getColor()); + } + return true; + }).filter(part -> part.getMaterial() == "steel").forEach(part -> suitableArray.add(part.getColor())); + + System.out.println(suitableArray); + System.out.println(unsuitableArray); + + + } catch (JeansException e) { System.err.println(e.getMessage()); } - Button button = new Button("steel", 0.04, "black", "Common Button"); - Button button2 = new Button("plastic", 0.05, "grey", "Common Button"); + + Button button = new Button("steel", 0.04, "black", "Common Button", 200); + Button button2 = new Button("plastic", 0.05, "grey", "Common Button", 200); System.out.println(button.equals(button2)); System.out.println(); From f74eddf3bbe8aaf52c85d32906642820710767ce Mon Sep 17 00:00:00 2001 From: ZaykaNya <48089558+ZaykaNya@users.noreply.github.com> Date: Mon, 7 Dec 2020 20:51:47 +0200 Subject: [PATCH 3/4] [Main] Created lambda functions. --- .../JavaLab1_Clothes/com/Jeans/Main.class | Bin 7867 -> 8561 bytes src/com/Jeans/Main.java | 28 +++++++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/out/production/JavaLab1_Clothes/com/Jeans/Main.class b/out/production/JavaLab1_Clothes/com/Jeans/Main.class index 7b17c84deccb716cc1a4270444f368b6947e7ee3..d11ec34b81b767ef882797192493fcb4aa34c4e8 100644 GIT binary patch delta 3511 zcma)833yc175@MCCbPV}WF|9N2nvh{7!XKUM3}HeKtz(DB$A?FeM!bJVKRx635$Ru zrIaGAqOY#CwOR|6QZ>*HnpEvVEw#1U*1A`V-K(Xgv{t)l&wVq%hbgR8x&F=`pkKdd4 z1O7-9SUo-Q^~4B!v%CDP3;PmnsaSWSwh;H?O%re7&xGgdxRq+KdWh*&cEDR|Z}Obk z*px~}t*+W20@xiy2_6ax@*^JnjTq9_-Bo>Y)JpVbp9|KtMSB#g51a9K6aTuQZA!$E|o zNff9PRW@BA`&FZS1Pcgbd3Rqj+^PI~=@HBel2)QU686w%mlO`2LN5zV6yPxf0T!7o z#=D}_5luB(T~R|;113utB-|33Xri4MZ*P`eCkuy8DkZ$(wXycpsz_Lwmz%8M5D|)b zixSJms>aS&C_@#>8TMm^;km;IUpO93bR0JuVKS`Dd}3Db$h{mXJIt~Ur`GpGv-qP- zj^-G9m^s=M$SMUnR`IC|mfAI;LVHu8f9AOo97B1WU~;0`i#OFR*@-1O6vG;mli-#- z_lP8Aa0;h-c%I2=I7F1%H~UMQvh*)W#@b~2Q#jq^3tJ5qdP=4lIeX8kFp zQ#-p>!qSwo+Ez;eHe0RnsD~}~4F4=nvNr~X+k5=sF~xDKtF_%4)n&yJqbAize5yW# zGq&FDcUM#jT7g4KQ1h*3*lYb$?6>`wYL!*?PJe|xH4w0y1LN$w0-K6IX>cn)<>5Ay zpXT=cqf5Lj`HX>He%54~eF62~Y0nOxQFDuu+9t1KXF&be`rW);$?h<@$(h|{@bkRe z!!M}P{i3}+crg7XiN6zuUC($u*9zht;g#WQu)W?w2gpt%)YBj%YsGHw{yiGA5Jk4e$}!MMe2CK^joD zgC=`;O@NOPPFRLa^YRIzq^U2KQmF_#9Y<(;`5hv3S)%vUg#f=tj5%Je=_Re5(Y92r z;D2A?KWVayi2xHK_@NR!WisY$8OkaMLKSIdm@E*N(J?3aPYI(f>nJiWX?o@Q2o^Eh8-J}%&eS>uAM zq|X)tdTjq&r8~8BrDp)oLmKzX8usCOHGK`pU{FoG132tV1`%9-0HqOMrEh!&Z?shU zCS+e3{B{7pQ}%z-Fn}X!v`2$JfWN3=zm92!Ae9*d_^X4o8^sO#a7<9%7AJ#tf5njW zze=$<_@7`y2@V}Vq*3(83;cT-+#tgYb_R@Tu0ZLug5diRccr_`RaP({aYV$UIC=!8 zUv}%&q3hDST}~|Cz;q`HF1eSyavhA6+h8U_=tCKHpd9z00{bxp&!H0OH*tp09fo5V z!SOgt0yvV(a5g(JiaRix_u(Aw!dMCQI3BYRErX@n6KK+&M6>oZmT8C4lGcu4xei<@{8#8M ztkjEP=_ApqPeZ$2hp4^~9r|Ld(w88nH=$F%3aj;1=yEchkt=Sb_8J%RBDs}jY6rPU zMmi631TW@dxP;z2tY-rXgxLLT6q#G7-N+@p1Rf!n-pWg5=oMadTq+}<5GrDmC>lb? zU^6chXek*kV~d20M2B;Qax8R*a;1z4gmgKtONj2BM&V>3PabDX@^Uz!$nbPJwc^Sl-oru1nqqZj^<(1Bk80EM-BL}25WOC;uT2t zMKLB75u!^E-dS?4vVlJOK~kO z#|E@xBUWLPlfZB~OWnyJ1Y!lRmH<(Jn%Kcr&;o|)Kp#5%8BX3Sp7RfX%LfksYQ_OE zmVTBqo+_|%a$tm8}TrZ{s6?XJP3o`QcDU#T5b+vwv>VtgFu{{;rXfyoD4;_ z1JyeS< z;CBGw02V+inydC8mzjdJ=MF1N*9lFV&lVXW-iGa(u#A!k@@&ANGzDhnyNU|`ehD1JeK6*$d;~@Ojn3#M-ptQAqg#0!Z{?lh?w;Jry|SX__vdVOov?Y}x)Vlw z#V8B;kSr_peYyEJa_R^8D8J>bJnlTd?W}*72l)eMbQ2GqK>JaS!cQH|pYs<&Iw+Z3 Ri7WWL^vW0b5??{({{Z0Ur&$01 delta 2874 zcmb7Fd302F75=_A`^%eTW|B-2mSjp3nv#&PhB7P(X<9&%6dNR@1n5gL&BA11GGS}& zP_a_Lw%FIIMZ1U!E)|97a7xsp=k$-B9?$7NE?BKXU8*e>Yt@R{*86)ifgBGmP3Fwp z-~HYD-R~~%zBd~uR_HIhd-l5kqC9g--|s7aA_PCq8Tct)BHU(ocWfj{EUL7=pI2a2 z>t5^IzUl6t8+aMNuwM4f)pZ=kc>@pOf|XZT?C{`M)+N0x{2K$m#r=dMmPqJ$1-~=! zd%R|q=geMmk?@Sf&Cz6kw-;{^&fY|9j}8q7ym*uFuZhLu!;zt}!LC>$5<)KCGVm<^ zY~7brU539BddKisA~Fy&heo~ln}9VY%%PrW#Dl+EKggMO11{sA23+`#jsV^@@E%?h zquyAu)f|lJxJ(+<=&<}obiRx5Mt1f0B>SQfF{j6%mp)O7dAm|e29-B9DX$#mWmvn7 zNJB2+i^O9?y_0SMgF)ry6Srnt?`6KEl3^K1?iq}TRMZFl=L!74VEe1-sEswGSNTOtJqy1eYt2Q`Sq2&m_7Bd-3^qX;=wK(A6JR&e)?lf!T=1^~KHkP<7 zFt`xUXDYEi(cc{#f64FXBY78t{Vz-hh6%967M}teOdxIqc@?tQRo6tGRq=#b$ zcXHQwXUNOoULB*n+u$I#1=QzWnX{rrYxCUPr*7^u7-wHVeR@Q9ztVlo;CB1;fX;(F zZr&40dswm!FfWuG$$(n7y&7XrI@s#OMnK@1!XJ$Cb+ogIgsp zToA=ql;W!f@8ISDza~YR?%e3**R5dqI_Ef1VVU7ly}WsNc>CChhu^Zch8O4LLIwhE zkc+G*!{LRCo*Es_Pb*|7KqwW%Sp|j8>@&6=i$de5?aY}f5wY2uE zY!4?@Rxe)o!~_fvk<~^6krTtSwcm43dI;l34VxacpWov38i=o5msXs8*x21 zqMQS$;9<<>F;wz6=I|7%cm_3m5vf{Uz&Gox z0=H^+W3~1enziF-)lT9zEsYIA^LFhl+O+4eNjrxQ?IJd7Z=+Lt2U{J)Hirv$I(#r4 zVRSi4(POvfm@KGS+M`^?<(~rUXf0%mNDd)Y%2pLas7>Q- zOx43B48vT{55g@xeY{;H58DJPEUuZb8?J=i053lzclprXlk_zYH+rNm^xzd;=4vN) zW#&v?B@X!qdZo3YzsS^t-fo`2<<|_(x0ioHX7^6YZ($d^(jN8oJZe+eP7@RODq9 zp-DwSn#Iaux>Bg|N^_<_i*MwV#M11EiOQr%Tw&FR9Q4bq3}7aS4_$x>Cw74S+tUD$VQD ztZctZCG$u&+o)1aWo0)}1d%$qB?StYtb#09lNhO|I8Rcl3N1JekMo2y>lslw?Bu2* zW*+i9g#*}KaY6GpC`4H`S;WpPy&_>Jh-uawg>i*y%6Sz!*G_wl%+6XAV%-$dMfSWY z(nWSK+QA%Pp@fpv_x{K?*vJ|3Gp@;AcB_K4&X*OYu5PyaDU6(q$rP(UC+`wTTXSymq zcpP4v+my~`%D-63UngtsrYw4?$|HYDi>2y8;VZAYYm}(=f0RgGn*UFUGBE#MB6%0T z&l1)A*AmG@581sL=7{`0fIRLH-EQvTJ+|~=ruY$C+Ru-2KMzRw2eUU1%Z)le!X16K z)1z0MK6S}5IQ00*%oY;cZH9q`Aw!# F@-L-a`fvaM diff --git a/src/com/Jeans/Main.java b/src/com/Jeans/Main.java index 1fc7f12..a2666bc 100644 --- a/src/com/Jeans/Main.java +++ b/src/com/Jeans/Main.java @@ -1,10 +1,9 @@ package com.Jeans; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.List; import java.util.OptionalInt; -import java.util.stream.Stream; public class Main { @@ -43,14 +42,14 @@ public static void main(String[] args) { System.out.println(); - int price = myJeans.getParts().stream().filter(part -> part.getMaterial() == "steel") + int price = myJeans.getParts().stream().filter(part -> part.getMaterial().equals("steel")) .mapToInt(part -> part.getPrice()).reduce(0, (left, right) -> left + right); System.out.println("Price: " + price); OptionalInt maxPrice = myJeans.getParts().stream().mapToInt(part -> { - if(part.getMaterial().equals("steel")) { + if (part.getMaterial().equals("steel")) { return part.getPrice(); } return 0; @@ -59,7 +58,7 @@ public static void main(String[] args) { System.out.println("Max Price: " + maxPrice.getAsInt()); - int averagePrice = myJeans.getParts().stream().filter(part -> part.getMaterial() == "steel") + int averagePrice = myJeans.getParts().stream().filter(part -> part.getMaterial().equals("steel")) .mapToInt(part -> part.getPrice()).reduce(0, (left, right) -> left + right) / myJeans.getParts().stream().filter(part -> part.getMaterial() == "steel").toArray().length; @@ -69,23 +68,32 @@ public static void main(String[] args) { ArrayList suitableArray = new ArrayList<>(); ArrayList unsuitableArray = new ArrayList<>(); myJeans.getParts().stream().filter(part -> { - if(!part.getMaterial().equals("steel")) { + if (!part.getMaterial().equals("steel")) { unsuitableArray.add(part.getColor()); + return false; } return true; - }).filter(part -> part.getMaterial() == "steel").forEach(part -> suitableArray.add(part.getColor())); + }).forEach(part -> suitableArray.add(part.getColor())); - System.out.println(suitableArray); - System.out.println(unsuitableArray); + System.out.println("Suitable Array: " + suitableArray); + System.out.println("Unsuitable Array: " + unsuitableArray); + ArrayList jeansList = new ArrayList<>(); + jeansList.add(myJeans); + jeansList.add(myJeans2); + + int totalPrice = jeansList.stream().flatMap(jeans -> jeans.getParts().stream()) + .mapToInt(part -> part.getPrice()).reduce(0, Integer::sum); + + System.out.println("Total price: " + totalPrice); + } catch (JeansException e) { System.err.println(e.getMessage()); } - Button button = new Button("steel", 0.04, "black", "Common Button", 200); Button button2 = new Button("plastic", 0.05, "grey", "Common Button", 200); From 9ade295007a291d431c9a5e3f16533831a26f373 Mon Sep 17 00:00:00 2001 From: ZaykaNya <48089558+ZaykaNya@users.noreply.github.com> Date: Tue, 8 Dec 2020 15:04:59 +0200 Subject: [PATCH 4/4] [Main] Little changes. --- src/com/Jeans/JeansParts.java | 5 +++++ src/com/Jeans/Main.java | 18 +++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/com/Jeans/JeansParts.java b/src/com/Jeans/JeansParts.java index 6cba3e6..22c734d 100644 --- a/src/com/Jeans/JeansParts.java +++ b/src/com/Jeans/JeansParts.java @@ -45,6 +45,11 @@ public void setColor(String color) { this.color = color; } + @Override + public String toString() { + return this.material; + } + public void print() { } } diff --git a/src/com/Jeans/Main.java b/src/com/Jeans/Main.java index a2666bc..b8b0b7b 100644 --- a/src/com/Jeans/Main.java +++ b/src/com/Jeans/Main.java @@ -4,6 +4,7 @@ import java.util.Collection; import java.util.List; import java.util.OptionalInt; +import java.util.stream.Collectors; public class Main { @@ -65,18 +66,11 @@ public static void main(String[] args) { System.out.println("Average Price: " + averagePrice); - ArrayList suitableArray = new ArrayList<>(); - ArrayList unsuitableArray = new ArrayList<>(); - myJeans.getParts().stream().filter(part -> { - if (!part.getMaterial().equals("steel")) { - unsuitableArray.add(part.getColor()); - return false; - } - return true; - }).forEach(part -> suitableArray.add(part.getColor())); + var arr = myJeans.getParts(). + stream().collect(Collectors.groupingBy(part -> part.getMaterial().equals("steel") ? "suitable" : "unsuitable")); - System.out.println("Suitable Array: " + suitableArray); - System.out.println("Unsuitable Array: " + unsuitableArray); + System.out.println("Suitable: " + arr.get("suitable")); + System.out.println("Unsuitable: " + arr.get("unsuitable")); ArrayList jeansList = new ArrayList<>(); @@ -87,6 +81,7 @@ public static void main(String[] args) { .mapToInt(part -> part.getPrice()).reduce(0, Integer::sum); System.out.println("Total price: " + totalPrice); + System.out.println(); } catch (JeansException e) { @@ -100,6 +95,7 @@ public static void main(String[] args) { System.out.println(button.equals(button2)); System.out.println(); + int number1 = 10; int number2 = 20; String word = "Hello number ";