From 8d355699cb5b45a6523c80a8d40ba0a7d110fa14 Mon Sep 17 00:00:00 2001
From: deadlocker <deadlocker@gmx.de>
Date: Mon, 18 Apr 2016 19:54:36 +0200
Subject: [PATCH] Fixed #2
---
class/application/Controller$4.class | Bin 3337 -> 3337 bytes
class/application/Controller$5.class | Bin 1580 -> 1580 bytes
class/application/Controller$6.class | Bin 1498 -> 1498 bytes
class/application/Controller$7.class | Bin 2481 -> 2481 bytes
class/application/Controller$8.class | Bin 2452 -> 2452 bytes
class/application/Controller.class | Bin 20749 -> 20904 bytes
class/application/Main.class | Bin 1861 -> 1990 bytes
src/application/Controller.java | 195 ++++++++++++++++-----------
src/application/Main.java | 5 +-
9 files changed, 119 insertions(+), 81 deletions(-)
diff --git a/class/application/Controller$4.class b/class/application/Controller$4.class
index 18e172e014f9f90cf9c77aac8d174c5207080d6d..4f60b496f10af4cf9f947231cbafa5df3c3fee53 100644
GIT binary patch
delta 104
zcmeB_>Xh1Wh>I~|^I<L>#?V*>X~uX4CB{SsC&pBUV8(QYXvPeN6vj-3a>gu%I>u~<
zF2-DjIgI%XOBo9oHZT@3>|iWr*vDAHaG0@-;TU5%!*Rw+hSQAI4Cff@7_KokGQ44I
Jne4)I6aa2_9F+h7
delta 104
zcmeB_>Xh1Wh>J0N^I<L>#?TlBX~sAPCB_5>C&m<pV8%3tXvTDg6vhmOa>h)CI>s!9
zF2)>&IgEJ>OBwSSHZT@4>|iWn*vDARaG0@_;TU5X!*Rw6hSQ8y4CfeY8LlxlFuY-G
Jp6tSN6aZ=s9DV=*
diff --git a/class/application/Controller$5.class b/class/application/Controller$5.class
index 8af2d7a21736cb309334f3db6649df62f7150a7c..214ee6007f791e9e7d1f629ec33131901f2caec7 100644
GIT binary patch
delta 43
zcmZ3(vxa8_6D#BN$;_<nl5-f?8RszwG0tZYWn9D{!?=XOfN?2<KjX5=i&;AX?iLF8
delta 43
zcmZ3(vxa8_6D#Ai$;_<nlCv4u8Rs$xG0tNUWn9Q0!?>8ifN=?fKjYHLi&;AX?R*OG
diff --git a/class/application/Controller$6.class b/class/application/Controller$6.class
index c6e728912a18f3fbf8453904330e8e10bf5fec52..e54264ca2edcfce086383ee75a7c51216832f40a 100644
GIT binary patch
delta 43
zcmcb`eT#d;eip`4lMk>|NS<e4XS~QD#CVB8l<_Kq4C8eMb;cVE4vaS^2eNho08A_m
A=>Px#
delta 43
zcmcb`eT#d;eip`)lMk>|NS<S0XS~25#CVZGl<^9K4C6Hhb;j!q4vaS@2eNho085e$
A;Q#;t
diff --git a/class/application/Controller$7.class b/class/application/Controller$7.class
index 924830cc9a644c72f247fc5b0f8afae39ecf9e96..d61976a7aeeb3560e3825f3ec598fed2f17e03c1 100644
GIT binary patch
delta 83
zcmdleyis_=4tB;*lXtRza{SJ~&G>^si18<bDC2JiO~$_r`iwsrESMM>!kCyCvY40|
p%9&UhI+)lQCNps`Ok?6^Sjfb~u!4z~VFME%!!9O)$!|E00s#AM6>0zg
delta 83
zcmdleyis_=4tB<mlXtRza{R`?&G?-`i17!5DB~{%O~yYA`iwsqESMM=!k8EtvY40{
p%9&UgI+)lPCNr@!Ok?6=Sjfc9u!4z)VFME{!!9QN$!|E00s#1}6<7cO
diff --git a/class/application/Controller$8.class b/class/application/Controller$8.class
index 317db5cfe359ab74d87b9e022e8e2e9ded25904a..0bb9c120efd23b4a10e1fa46428acd8e6f9724ca 100644
GIT binary patch
delta 83
zcmbOtJVkiJGIqv^lb5qUcbvw+%`}}sh-n6cDAOzkO{O^v`b;wzESMHB1TZaRh-O;E
qkioQsp^|ACLkH7xhHj=+4AYoaGt6aL!?2WTEyH@I^^?zY90dT_t{9>K
delta 83
zcmbOtJVkiJGIquZlb5qUcbv+=%`}Zch-o^5DAP;^O{Uol`b^UqESTmq1TZaNh-O;I
qkioQ=p^|ASLkH6`hHj>n4AYoaG0bIJ&9Ibd4a0h-b(7C?90dT??ii2&
diff --git a/class/application/Controller.class b/class/application/Controller.class
index 5cfe2b26c0c85dea77f618ede9f90e9d5812753a..d79542545c43205b875435062864f7c1a9df6c34 100644
GIT binary patch
delta 8789
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
IxxhgZ0E<x$4gdfE
delta 8807
zcmZ3nn6Y;eBiE^ayY?|KFqkmsZRCn%W;(#JIh9#dfQ_AT3nPR4<d4GgI$VsK8T>dI
zni#k9Fz#S*VPxPA33Buc4sZ-|^$X!*+|20B#W0_7HxJ_;#=Vmt3YW|5XFSNxcz}_C
zFDE}eGg;p`u_z^^vLKa*@et$T$t5C+GW!|xI2rdd9^+v=&Ul!SfhFA2$AydWB;#pz
z##56wil{Q5VLUtericaSdB%(Ej29Rg<R*U*kz?gyT*G*2vaP5p+Z7(htBltsXNVd|
z-{4`q$#{*Cfg`CXGd-guwFqR;Z63xujCUt*7PZQ|&%^kDVIw00TY73qP-+SnLlfg8
z9>&KYA&&Ia68ECi)I5;jQy#`=AVK!@)Dowh(o~Sx3m(RoATh4=)Dr)K#N^D9N|5kt
z9tJPQH;fGI8ZIs_E}CK7jPDpfurt1gxKn~VyeP9IwTOrDBjcyZbz=H*CmGgrF`i`D
z4$}LLhw(eexojzkMcJuE?2JDrPvDW_HsNCY!T1|w?w`#c#EcomIeD1480;AtSfX5m
z{J9wBGx6{+@iOsEwvzB*5nyCcnS4h|MU0DypTUpKq27T31h|+)nZ((d#3mn*kYtu%
zlAL@;LY;%3Nt%aAhDmlZx1<gSKa)HUlLC|CWP3@~dVVHl9wrq=QAP&d;?xr7%H*6>
z=ls&V5-uiwCN&-=b%uA041C3@C61*f`9Y~=sYS)9ASq2ACN0K^j0_ybsU>bj`MD7w
zK^-0@U1Y&Xkc;(sm<&Ln$C92}62Zk#!lVyUYRtoA0#a(sR-9TAk{<z5X~x534pSKk
zQfUTKX~n~24N?hF7|G6L3koVeQ!XYOCVL(RFD3^@29wDj6%{7ONr@@&Gdb}vIWx*Y
zyyKtemYJ7XoROLWGRc*P$!+o!sZE0ZJPbSxyj)CyOu_6-L5vJ?6JN`*@-T%kg-))L
zw&jdqRAOg}WMojB94M#g%gz+d$RL=NSeBSpp<kSwnwP5Ym!Fc##T3O9%fl4MsKv;@
znx0zXnZm)8z{tRqn90Sc%9O;zl+0)dm2u%>oW_*O!?>6!ZL*$>qFe@37CTcWBZC0Q
zQ2m_5ymbBGlA_GKbRMQ`rku&SGTLl;Oa<&r`IG0#h%py36;0kQqaI(v!&J&xz{tRy
zn3BTH6v3#^&Qt+2qqHP5M?WYrFC{;hi>aK!kBh0CshWqWhN+g3fjuv^qQo<=gpq+o
z!&B3fiz$z(o`<Oc<T{SbyppiQoYGWwrY3NpnsG5TGPQsLwUv><4jQPun<vS(FosNL
zWZ+FHN-THG%gjwI$;{6KMcGUqrdbT3j0~*Bpb!9w%;9003yLn5VsLcNXPVE$v;Za$
z$;}kORKmr;$h4S;X$jNP$yxH+jLX4Rn{zQOV_FHadKDvs!Q_vMQj>4U`%7$K+QiPZ
zk&%H1QiufPBvz&t@i1+kY_A|K=M75l3=C`zkd)8B=3oX90Y$;4$@vQFwU6>J9b-Dq
z$N<XEE~&}cj0}7lnm!Q2KzwU1hW|__d6-Tyou2Hes48)m={!5rIYtI9gc2U63rrU$
zw<#J3U*=)#V(bPv|0)mDex{}DOxHnf=eFQty2f-9<n~*W-zf%iL@?duVY<h3f3mxh
zn!-b-$Lvgx7#W1Xu?>zX&yv)l#FG3X9;PQuPbc>(DJx_!=5aGUWO~WN^oqfok%6r!
zH8;O36(sbAhv_ZTyU7=n(zQPGFx_VG=3-P}y35GGk^=S(don1qrWP?Wa3_}*6{Y5t
zI42gRO!iZrD*cCtDVwo?&B3ez94L$ooMnkQnJFM&Pv%jv7CFYq%jRGSmSf;zn9t0`
z!^}N7Ma6aUIu$V%K}H6ti3dd|-&JAf6lNA>XBJ^(Pyq?ps`9h)FpDvZPZm?P<Pl(&
z<YDk)mSSYk)R=fcY_hGYfSP6)2eS+#1KZ&_NvTB&9L#cz3>=9C1$udjxv5+XiOdQ-
z%!<rPlb5TS*9$PK@Gz@_5)h~y3CS$UN#$Y|U{>d0)&L2DN+gfe#FW&ckkpD24rVPz
z2HvpLqT<Z_JSznd;9%BaWZ(f6N}2h2U<){y^%xoWc)45>OG<MgiWE4Q4Ukl&B$lLd
zFdH#4DDqB@RZ~(HU^d}lHU(J+D(0N?^GZ_lN<j93Tw>0{Y{6_fd6Ak0n>E8qc4nK&
z57gAy?0A^%nH?tcsB1|(@i03xg)%aLDiP1*{Jdh2E>|9AH)i+Af$B>I{CF5V7(BTc
zotOi7m;;%ECbMZMq=)b@hcYNKGB7*(_;4~hF^BUoM}YXOPCky#-XM`E9_DC}2#b?X
zs4GYymWMeGB*5w(<m&1N5=r1;P6UZC2f4a{_{luXDIh*uq^pmQe>gjH+U8!3=S-aU
z8Q2*Z85kI9C)a8lGm9{oP2Q+opl!+E%izG^$KcKo$PmF0%8<wq#*oDj&QQz{!BE4X
z%`lCDfq@62Z?lh%6es6F27U%k1_s93$@!)(^)j;<<##h~j@-_;)rv)uWfSAJZHzm0
zC0Q7^G48Tr)!xQ9dlTcnZHz}|GPFZDN5PybW;3?s4Drln?8_OvBw4pHo)BddW#7qo
zj+tQ_<7F_qZp8tTxCN5f&CnDn$+3;`9*B4dBA$SV=lsgq+ZkW&WPHoQ(8A6r%H9sr
z@p;DV{~KD^7)9B@+%J=(%w+44&HuWM@iH-n<1l+OlG!t6|DUHT$-0eUo|YAh?k0w#
zyBU8(YRPCzvgmGS{I!kYg6;+e1_ow^`l$>I3|S0P3=E7$3}%eR47Q9W3@(gj3?7UY
z41tW643Ugh3`vYO3^j~)3{8v<3>}P43=0{Z8O|^|Fx+OeV|c~r#_)mBo#8X17sF3R
zABO*oevG1w{)`TcK8*g1UW{>!L5wMkp^WK_;f&RcZQy8YVc-SD6T@_d8TFvt%~;FW
z#@G&uOU7Epzl{GFm>A3$-5IAcurV+*1TqRU{%2xfU|~pNWMbUI#K^$PP|uLf#KfS?
zz{b$Z5XQvJpv=I|u#iEUiG{(1frH^2Lk3j#4?{3SmQfTY%b3m}#>C1ngMo$7f`NfS
z!h(V8KSL7(J39j-JL4Qic82-vjGNgRPfixFP^o8Q0;NnJ1_p-z3~UT+3=9m#T3Z-v
zH!*Q+W8$`A+0Dcsxt&SSidB+Tgh^-zlgKtEDM?oCZA@~KtSsA@lq6Z1w=t<ovhr<X
z(g2g%U|Bs$mTgRi>E+v)jKF+T5Z?mCx0Gbv&14g)rK_`@$!;4{y`v=SHYS&i3=9lR
z44{ZI0|#6;0}o>_gD7Jkg92kegBs%m1|7zU3`UHT7%UhkGuSasVen&|$`HpmjUktD
z1w#?zN^qdtLEH}tbWoTx6f?Oquz|vyp%@(cOd#Jec`zt4Ff;Hlq%(Ok*w-_#Fo-h5
zF?lh0Gq5r+GWjt1GB7guFfcHcGO#o7FfcIMYHeZi+r|`N#k!kOA#yuYm=zm1>)1)M
zin8xy3TI+Cz!YW0A<40gDP}k0v`As5`0b3dw6`%OZevQ>#<*b{Q~FE>K1nuF_8m;Q
z+n9>O!MR0}bth99Bf~<y|9f^bl}B!8s<dL4WS3;y#;CWAsmhE4YN;ffD91KN`2$RO
z+nDNhGKEjRZ|P7Eju|dk%y3I`BVvYIk`oj)+~BC;21gAyIBGzowj@|uPm&8BH(&u%
zkN`AtxOX!(Mruj2XzOlgYTm}=D9H_t9TsrxBr!-Z#4|9iW#D97#~{SGo<V|fBZC^_
zCI(l=EervS>lxx1cQ9ly?qn!o+|4kFaSy{$#(fMI84obrVm!$3l<^S58^*&7pBRrY
z{9ruF@Q?8rBMakkMp4ESjB1Q08O<4QGuklTnf%vEygq@c4HR*VwoL5|$_z}PcmPKs
zGl&I_LKX&2MiZtErcMS{1|ddmrY=TP1~vv!1}~;=aAr|s&|>Og>Sf?y$Y8k2)W_7%
zz|K&@aFS^PgE9jL!z6~);KaenaFHPgln@xW7;Z5ngVO;wqnRB81A`a?6V!@{Fe{iQ
zF|dL26dwcgKL!bQrU-UM1x9lw21cgIOj8(`7-d1}m}%<di`F9GX!6z4*4o1G7Zinz
zb6B=B*8AxSGfmsZG(%Ts8<XKSrr99cVjI&uXngDLWLn6?5Dtr57D*OF+_LC`qLu|5
zwJhMMWdTPmhy)dS+nDsU7`HPm0_8FzNtSxuZA_+GTNt)%V}iyl%WkG+ky_f@nO1-z
zmIWHI%;1RiVi00rV0^&9&G?8xhVe0jGUF2lZN{ez#*EJx92s9Qcrm_Y2xWZ55Y70S
zA(8P7LptMIhFr#X48@G^8JZbCFid6q$gr46h+zejFgPokFx0a$Ffgoy=f#yws~Jrh
z7#X-3=7EEoi9v>;7aRr53|<WJ;DBdg1T`HYHQq|5)l6#`7#WyAO;kvhWPHfL#=y$J
zz^I~qoMD>Q7KSC;7?y2g*aq>Wp$OC3>~s+ZgLF@=EsQMN>KWO#F|9Xa5oKu?VcL?d
zF?}9GAeg-k%r*wIcYxWVP!mL1SQ6Srn093+uSXTxfg!RDLu3m?1n#DKhT3gRNRHCp
z#<YiM*MPL5x&}!E>KY^wsB4f!wq(~QuLoCuphDG;L70JoNt}U&Ns>XHNs2+6Nt(f&
zNtVHxNuI%<Ns%FuNtL0PNsFPCNuOallPSX{CNqW|Oy&$nm@FACFj+I)VX|d-$K=S!
zz~sg##N-W*VQ^u~r~->%MinMVo|R{)VA{)|%}~$8pv{oOw2wiVfrVicLlIbziD3s!
z44jXI8QA|aBr-D!3jSme{L2sqVlgm*n)T2q=YT{x!$f#=uhH7VuzMSmg$P4MG9t<`
zL$@9r!Pp}kq#reSkwl=uizEUKUL+AvWWz&O4b&!M3Sy9F3T9Ac3S}^43TLoos*hyw
zWQt~pW{PLXWlCYFXUYTzn-&8L0|UcESg<inga=y@(*Xu;1||koln~-%VE)Sx4GtGZ
zrh`m};DyX#a4luXz{bGNz`&>lPV-DhAk>L%OlRu-w6-wpht=a++nFwbDsf2ZBgqP?
zk3r=RgoRWBfhs2CB8W|r4N(NKfhub`Nj7j9#0D;d*uZ5Fh|~tvd8<GbZ$ASA1LI^?
zN3nW6P;mn-k-(ZkB~mS{L|V=eC<zwTgTyJc!2lLA1?jv3D$6XFGiV`{?S<D}n97(X
z*>*Esi`3HA+0JwWRL0e_K?^xZ?UlzM&A`A^z#zm_#3091!l1%b%Amtk#$d)&&fvgQ
z!QjtS#Sp<%&5+Dg!;r;P%TT~n$56&p&rrkEz|h3h#IS&=g<&I8E5i|{HiqL&?F_e=
zIv8FvbuzqT>SAPM>Sh#T>R}XRn!u>Sw2@JhX%oY=7zPFg4@msLBAihR8sQ9#THqp)
zi9v`_0$R7pG4g;5M-~PZMmBKa$jT7Ga0y&EvLOmbkWQvGlS`eH>-iZN)YQ}%7(ty<
zNS0yP&A`OK%)r244y{vsw0APyVPx=K&LF3=lj#8?sJ*g{DMpy-**2!<GZ{E_b~3$S
zWYF2k^qP@j*8lsUrWho+<UlTG+Qz`aw4H&UX$ON4(=G;eracV0Ogk9NnD&E`b3KCs
z#4f1!I2iQ7RWc(3KZ6F-J*M{zOkih&>Qac@L<X4L2L>i^8NkE9^p`;hRF^V6lwx3H
z`iNYUf)Y97HwJbF4h9B>k6PQ9KC#$pZ)5sm#j>2?mLy9(#6yg8{IqmI)hi^4KikGM
z1L}ELa)uWl7`25ZoAx$FJ#ZZ%!8Uy!Lo$@REgQ_WgK~F3xRR2r(5gWOR8!PvCvRh#
zy_~@bMR*5PR0l<L8&p&bMRW^T6ea}9h%HQvk}S~JP(s8;7=tJS1Jhv!7N(;NY)r=)
zq?k@JDAhBaX3%0f!(hpDjv<ukJVOf8MTTOg%M49SR~e=<U1ONRbdzB<(`|-zO!pWL
zGCg28!t|KoI@2?T$4oC6o-rL~_`viE6pakv!kpnFG!_{cJ~Dj;*Vb$dubIAq8(>ll
zXPCY-wlgp@C@~yi>H!zap$zpC!NodK+5~9@RovjHb!1@s&%n>X3hsF*Ffy<+Jp}bL
zI-q?K1yFy4o#`Pv!+d5222oL={|tO+iWwN0elY!n7ka-y>47PVfgM!jGD>LGgA#-t
zI6<&3XJiD$HYkBJ&aq<A0Tpq-XEMlZNwR>G2Ad=sB<d_gnEs}3W16>|K|)KCg?T$;
zy%j=k8`C^VHgMj6Cm}XSqYPUTs)w{VEZL!{WJ|ULJ8BvNagovxh${(mh@mVf4S^E?
zC<#HG2Np#nA!JcR5`v1>gB3&4Pzy8I|Das_?>8ddq%lY`FfhGiU}5^ez{d26L7M3s
zg9_6R23@9~47N<a7#x`XGI%omV+dttWQb*EX2@Y?W$0jLXPC~+$*_!>n_(+6FT)9D
zK8DlGf(-YVg&7_)i!pp*mSFhKEX~MO&n(Bt%k+s+oLK>!j)Fk>lu-hfju<7N>4<?*
zg6Th_DFYJ&8>0|7MKLo-GkgN4C>91?24QfDVq@@xrY$yx4u)26(qe~~A0RWnf|3>k
zi1nXo4FeNnJ*a~lz`y}YWo(dC25OPR5}E-6k{~<d9B}&k!yv-WF#iujDKj|5F(Ipg
zXk=hyW?*K77N^%3Sin`b2ed@-)d3f$e#;s3b$8Yy%2S+uKTch60jmqm(&rFS11?~h
zRTwy!RT=o1)fj}BH5e?IwHWM})fn8Fb-^JDX)k!dLX^P+T77UZI52fE)ps&5G4L~3
zf{R*acu+wkC&J}EFffDjBXUuz&A`aa1oI`U45YWqG*?S|8#A-^HfB~|7CRkKLCd<F
zsR21(X@Oc2Y?5qX|JGx4cF}VUv{Arh18Nh1n@kK0k_-$Crx+L*n^Ce9sP!ts%#LW(
zfpQho9y4xHZb<12$~*C3&NfIkvk|QaN$r5}AlV9J3TC!~iK1pJm?&ztf{8+M6*#Yg
zS}dRfgRvCuVn{Qz9<3c}$q8<Va!ay_Fz9Y$<^;QTOSS~(^mz<$r-L{)V3{2d8Hme4
z%}cn;=fMgDm?+rg^OiH{fE@%Atp_`O-f{*p6k)K_=fQ+P?Y!j-dr+Ld7rg~dp3CbY
zP6wHW>2#PVs?%Yjs4j<zBDoyY(gRnn%t$5M-x@^rxyN8$&%nTJ#K6jI!obCB#=ygD
z!Jx=&#h}h?!{ESd$KcQG!jQx4#?Zs;&M=ADlVLuyH^UlcUxuB`{tRcB0~pRT2Qxfk
z4rO@C9KrB|If~&ob1Wkta{{9jb0VWGb26hXa|)v~a~h*Ja|UAsa~5MNa}Hw>a~@+W
zb3S7Sa}ncg=K2!GdCcXE8<{H^w=mZ*9%rs+yv*Fdc#XM<@f&k9;~(Z$CKl#)CPC&-
zCOPJACT-?kCOhUnCP(IpOd-sZnZlW;F=a8&V9I5l&D6j=kEw@wK2tyQVx~#V7EE)P
zmx2p`D$pnt(_B~qz%&<H0B|u)X8KwWE>n4!CPK?pMW#Y%nX1l|4J}i97$B82JEJYb
zOmH8Alkppj#W0DX8{9|ZW^`tl3}yX+vta#kuw~#97gXSWXAt_&APOos>lxV@Rgp{F
zFlf~d7KD_z><sfkm3|TfH@JXCl>v?Cz^i`92qmflkk%}$S{WFa8S5#~OHeDUW&k?~
zUNi6@ny1XX!JzgC!+ZuNa225nYM+7{BYw*ngmj@zQ&nFroo&p_u;TwUBK?Yi1~Zsf
zGO#eOW)Ndu%OK6Xnn8tm{p1yXip+dWZIjRVY1KbuVBlk5Waek^hE_+f7+An9?g_h@
z1tK>w3vFkX@X-dB#mv&%8E0v2VMr5ZmfglIzm0J@X!Ma;88iX~6Ju6`s?~(6)rP1Q
zX4c)txE!KgA0}j24>QGBdmFRaHfF1B%(e#@miy{#V|LWq!Vm^&8EJ20b_oah3o?YO
z1Zo5@Z)V_T-ol{Cyp_S6c^g9>^LB<B<{b=O%sUzSnRkIxHl*t?0h+S88Csb=m^~R7
z8EP0rn7tTO8JGk(SeU(;eJ20#cdhr0JjTGXA$$k3|Gqt3-ddZOgSRm{3b6SvXJ84}
z+Qb~TjnR<<#);g<=m?jI*~aL|4wH%B#^}fj<0NfkbYy{WA~!SpZeU<z5MYpEkY!F~
zkYiA1&|*$y&}J}UFlSC>ut;TaWN=|lWpHKiV+dqUWe8%3W{6`>Wq^#HK?a#26E>i+
zN>C=zW#IK-XHNgmAi}`N&YTV+QW?D2nXwZB9LyQanUfU*h1L8((-x4BgqUjp4lU5&
uH4}3dXn>J9n>lB4RG_^64+by*SFRw5MlhFwX&IEh2BDdSnFW}09V7u#9P!}*
diff --git a/class/application/Main.class b/class/application/Main.class
index 08935e4292693a679681f849b984d2e497e64a36..9052a30434ad5936f733b59d1de4fb72348f0b71 100644
GIT binary patch
delta 797
zcmX@gcZ{Fw)W2Q(7#J8#7#cTnaWdI(G8ixzu`?JlGRS2mmL;ZD=ocra=B4TfgGk4`
zlFY=M%*5i%ymTH0V+IpO1`a1jA4flDR~JSGg~<n*gr$(xSaUIGGMMo&urio4GFVSm
zV3J^r0x2>?QKT8h#bC)`&CX!O$RGr>v?MV-RX-R+@-Wyi*iMdNk`T0KWMB^U^9QMR
z<Y91PaGu=Cq{?B*;L5|`#^64A6O(3=Cl7-cgBl|PZ+dEpbADb)QGQNNY7skw4<mzE
zVnIPpW^!UlW`3SNLXL~Uo57EV!JmPjk%6N)wFGP@NHCCxA&7yEk%1*MFS7(>X9y2N
zC_~s}TV_-F2u218m`gzcqo0`za<3<d<Y0)JJds&MIGiB{<a1|khB$@<c7}LH2F1yK
z%!;f$42cX$lkYJr7+5l-@Gzu;?I_O3FXv)NXUJq{$Y5j;2AQp&lbDyT?^=<ZS^#n~
z4@1^wJr-U@wrU=R8ivZrj;y7O+>^Jn%5$nSa5AtlFfbHNzR#*s&%B92e>;Pz6^k~@
zHU<lAA-io14%(6|+ZbGQwlR1dVDPqLm1Nc4#^5W-x{V<~dmBUWZietkp~&qF(K{Jp
znHa*gw=pCyXW;PF*~XBzk%5tcfgzJ2hasJTnSqOefx(V}pMilvh(VA+m_d?3ltGt4
zoWY1eg2948lEIEanxWpEL59JXL6#wiL4hHaL6ISoL5U%UL75?!L6xD9L7jn{fq}t;
zfgR*t1|9}p1`sG>$Y#i4U}O+vh+xQN$YWq)kYos8$Y&^EU}n%|uwf`<C}Ln?aA#0r
zC}t>OU}eZ<U|}d_C}Ut^C}&_`;ACL>&XB{-kj}!u$>34JP|3guHs6?m5$t?ctsM+i
p8yOfFn7}^ZVqjumV9;h@VbB3Ph6kdEp_ZYJfq{XMp&qQV0RT40p)CLa
delta 678
zcmX@cf0U2w)W2Q(7#J8#7^*jNaWe68F=#Rv@G!747&0<QO|D^*;L;4^VlZYfWoIy%
zyq`&2$Be<8k%6Z;wInFDII}7-DJPYYfkh)qGmL}5l97Qq)XyKJ+?t2MhQW3+6SFFZ
zF@rr1g9C%(WPN5$NoO7g7X~#(2Hy1466gH9lA`>aoYW$A2DizD%+h+U3?4iTo(%kq
z3>?L&CBY?$>8V@{t_<Eh3_c8Oj0`N9d6^|3)BSiD{22l!?_xG(44V9bSym&2k%2!m
zH!(f6SU)p4KToe9FP)1akRc4@5nFDC2!<$jhDb&R#mT3c6<K*0q8VZ)N3$px7&FB2
zFvNq6F3!j==VC}?NM>h9Vq_4`N-Rs%&q>Tn*LST*PAw?O%+KRtNZGuag_n`7l!u{=
zp?LB>)>2I_25trh1|9}R1_lOJ1|9}p1_lO320jLU21W*U1_nlD26hHE1_p+_$uVpy
z_1hWrtyr{KwlNrK3t4Pqu+o-f*~Va}vyH*&0E4R)t0b%THU@V|)@=-4+S?d>cQXV=
z3I%Ux2;IpL&cqO|y^SGuIRl5U&NhaGjbIB?88R3W8JHQk7#JAr82A|&7z7yv8H5-l
z8AKQ~8N?X$7{nP&7$g|17^E1S8KfENJsD&e{21gJ5*ZX2QW+E(G8mK?G8t4Dav9XX
z{_p^~nIRAA4+e%jhE#?$21W)!h7g8yh71NK21y1VhD?Sm24)6L1{;QKh8zYK24@B(
zhFpd`23Cel1{Q{Vh5`mAhC&7g22KX1?+h9242diZoD4+_#SD|1*oBNrHZm|UFoE67
d#lXbCz@Wvz!k`Vd9u|z{3>DyDtOTp90sw5Pbdvx8
diff --git a/src/application/Controller.java b/src/application/Controller.java
index c3bb0b7..816c6cd 100644
--- a/src/application/Controller.java
+++ b/src/application/Controller.java
@@ -70,10 +70,10 @@ public class Controller
private final ResourceBundle bundle = ResourceBundle.getBundle("application/", Locale.GERMANY);
private final double CARD_HEIGHT = 90.0;
- private final double CARD_WIDTH = 57.0;
+ private final double CARD_WIDTH = 57.0;
private final double CARD_SPACING_LARGE = 14.0;
- private final double CARD_SPACING_MEDIUM = - 3.0;
+ private final double CARD_SPACING_MEDIUM = 0.0;
private final double CARD_SPACING_SMALL = - 25.0;
private final double CARD_SPACING_ULTRA_SMALL = - 35.0;
@@ -306,6 +306,7 @@ public class Controller
ImageView imageView = new ImageView(new Image("images/" + card.getType() + "-" + card.getColor() + ".png"));
imageView.setFitHeight(CARD_HEIGHT);
imageView.setFitWidth(CARD_WIDTH);
+ imageView.setSmooth(true);
if(!valid)
{
@@ -542,21 +543,21 @@ public class Controller
{
if((deckSize * (CARD_WIDTH + CARD_SPACING_SMALL)) > maxWidth)
{
- return (PLAYER_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)));
+ return PLAYER_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)) - CARD_SPACING_ULTRA_SMALL;
}
else
{
- return (PLAYER_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_SMALL)));
+ return PLAYER_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_SMALL)) - CARD_SPACING_SMALL;
}
}
else
{
- return (PLAYER_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_MEDIUM)));
+ return PLAYER_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_MEDIUM)) - CARD_SPACING_MEDIUM;
}
}
else
{
- return (PLAYER_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_LARGE)));
+ return PLAYER_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_LARGE)) - CARD_SPACING_LARGE;
}
}
//AI 1 (Above Player)
@@ -570,21 +571,21 @@ public class Controller
{
if((deckSize * (CARD_WIDTH + CARD_SPACING_SMALL)) > maxWidth)
{
- return (AI_1_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)));
+ return AI_1_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)) - CARD_SPACING_ULTRA_SMALL;
}
else
{
- return (AI_1_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_SMALL)));
+ return AI_1_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_SMALL)) - CARD_SPACING_SMALL;
}
}
else
{
- return (AI_1_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_MEDIUM)));
+ return AI_1_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_MEDIUM)) - CARD_SPACING_MEDIUM;
}
}
else
{
- return (AI_1_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_LARGE)));
+ return AI_1_STARTING_POINT.getX() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_LARGE)) - CARD_SPACING_LARGE;
}
}
}
@@ -600,21 +601,21 @@ public class Controller
{
if((deckSize * (CARD_WIDTH + CARD_SPACING_SMALL)) > maxHeight)
{
- return AI_2_STARTING_POINT.getY() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL));
+ return AI_2_STARTING_POINT.getY() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)) - CARD_SPACING_ULTRA_SMALL;
}
else
{
- return AI_2_STARTING_POINT.getY() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_SMALL));
+ return AI_2_STARTING_POINT.getY() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_SMALL)) - CARD_SPACING_SMALL;
}
}
else
{
- return AI_2_STARTING_POINT.getY() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_MEDIUM));
+ return AI_2_STARTING_POINT.getY() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_MEDIUM)) - CARD_SPACING_MEDIUM;
}
}
else
{
- return AI_2_STARTING_POINT.getY() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_LARGE));
+ return AI_2_STARTING_POINT.getY() + ((deckSize + 1) * (CARD_WIDTH + CARD_SPACING_LARGE)) - CARD_SPACING_LARGE;
}
}
@@ -708,36 +709,43 @@ public class Controller
int counter = 1;
- for(Card currentCard : deck)
- {
- ImageView current = createCard(currentCard, true);
+ for(int i = 0; i < deck.size(); i++)
+ {
+ ImageView current = createCard(deck.get(i), true);
current.setId("player");
- mainPane.getChildren().add(current);
-
- double maxWidth = stage.getScene().getWidth() - (PLAYER_STARTING_POINT.getX() * 2) - CARD_WIDTH;
- if((deck.size() * (CARD_WIDTH + CARD_SPACING_LARGE)) > maxWidth)
+ mainPane.getChildren().add(current);
+
+ if(i == 0)
{
- if((deck.size() * (CARD_WIDTH + CARD_SPACING_MEDIUM)) > maxWidth)
+ current.setX(AI_1_STARTING_POINT.getX() + CARD_WIDTH);
+ }
+ else
+ {
+ double maxWidth = stage.getScene().getWidth() - (PLAYER_STARTING_POINT.getX() * 2) - CARD_WIDTH;
+ if((deck.size() * (CARD_WIDTH + CARD_SPACING_LARGE)) > maxWidth)
{
- if((deck.size() * (CARD_WIDTH + CARD_SPACING_SMALL)) > maxWidth)
+ if((deck.size() * (CARD_WIDTH + CARD_SPACING_MEDIUM)) > maxWidth)
{
- current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)));
+ if((deck.size() * (CARD_WIDTH + CARD_SPACING_SMALL)) > maxWidth)
+ {
+ current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)) - CARD_SPACING_ULTRA_SMALL);
+ }
+ else
+ {
+ current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_SMALL)) - CARD_SPACING_SMALL);
+ }
}
else
{
- current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_SMALL)));
+ current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_MEDIUM)) - CARD_SPACING_MEDIUM);
}
}
else
{
- current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_MEDIUM)));
+ current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_LARGE)) - CARD_SPACING_LARGE);
}
}
- else
- {
- current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_LARGE)));
- }
current.setY(PLAYER_STARTING_POINT.getY());
@@ -751,8 +759,9 @@ public class Controller
int counter = 1;
- for(Card currentCard : deck)
- {
+ for(int i = 0; i < deck.size(); i++)
+ {
+ Card currentCard = deck.get(i);
ImageView current;
if(validDeck.contains(currentCard))
@@ -770,30 +779,36 @@ public class Controller
mainPane.getChildren().add(current);
- double maxWidth = stage.getScene().getWidth() - (PLAYER_STARTING_POINT.getX() * 2) - CARD_WIDTH;
-
- if((deck.size() * (CARD_WIDTH + CARD_SPACING_LARGE)) > maxWidth)
+ if(i == 0)
{
- if((deck.size() * (CARD_WIDTH + CARD_SPACING_MEDIUM)) > maxWidth)
+ current.setX(AI_1_STARTING_POINT.getX() + CARD_WIDTH);
+ }
+ else
+ {
+ double maxWidth = stage.getScene().getWidth() - (PLAYER_STARTING_POINT.getX() * 2) - CARD_WIDTH;
+ if((deck.size() * (CARD_WIDTH + CARD_SPACING_LARGE)) > maxWidth)
{
- if((deck.size() * (CARD_WIDTH + CARD_SPACING_SMALL)) > maxWidth)
+ if((deck.size() * (CARD_WIDTH + CARD_SPACING_MEDIUM)) > maxWidth)
{
- current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)));
+ if((deck.size() * (CARD_WIDTH + CARD_SPACING_SMALL)) > maxWidth)
+ {
+ current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)) - CARD_SPACING_ULTRA_SMALL);
+ }
+ else
+ {
+ current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_SMALL)) - CARD_SPACING_SMALL);
+ }
}
else
{
- current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_SMALL)));
+ current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_MEDIUM)) - CARD_SPACING_MEDIUM);
}
}
else
{
- current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_MEDIUM)));
+ current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_LARGE)) - CARD_SPACING_LARGE);
}
}
- else
- {
- current.setX(PLAYER_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_LARGE)));
- }
counter++;
}
@@ -812,7 +827,6 @@ public class Controller
}
}
- @SuppressWarnings("unused")
public void setAIDeck(AI ai)
{
clearAIDeck(ai);
@@ -821,7 +835,7 @@ public class Controller
int counter = 1;
- for(Card currentCard : deck)
+ for(int i = 0; i < deck.size(); i++)
{
ImageView current = createBackCard();
@@ -831,35 +845,42 @@ public class Controller
double maxWidth;
double maxHeight;
- int deckSize;
+ int deckSize;
switch(ai.getID())
{
case 1: maxWidth = stage.getScene().getWidth() - ((AI_1_STARTING_POINT.getX() + 25.0) * 2) - CARD_WIDTH;
deckSize = ai.getDeckSize();
- if((deckSize * (CARD_WIDTH + CARD_SPACING_LARGE)) > maxWidth)
+ if(i == 0)
{
- if((deckSize * (CARD_WIDTH + CARD_SPACING_MEDIUM)) > maxWidth)
+ current.setX(AI_1_STARTING_POINT.getX() + CARD_WIDTH);
+ }
+ else
+ {
+ if((deckSize * (CARD_WIDTH + CARD_SPACING_LARGE)) > maxWidth)
{
- if((deckSize * (CARD_WIDTH + CARD_SPACING_SMALL)) > maxWidth)
+ if((deckSize * (CARD_WIDTH + CARD_SPACING_MEDIUM)) > maxWidth)
{
- current.setX(AI_1_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)));
+ if((deckSize * (CARD_WIDTH + CARD_SPACING_SMALL)) > maxWidth)
+ {
+ current.setX(AI_1_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)) - CARD_SPACING_ULTRA_SMALL);
+ }
+ else
+ {
+ current.setX(AI_1_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_SMALL)) - CARD_SPACING_SMALL);
+ }
}
else
{
- current.setX(AI_1_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_SMALL)));
+ current.setX(AI_1_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_MEDIUM)) - CARD_SPACING_MEDIUM);
}
}
else
{
- current.setX(AI_1_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_MEDIUM)));
+ current.setX(AI_1_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_LARGE)) - CARD_SPACING_LARGE);
}
}
- else
- {
- current.setX(AI_1_STARTING_POINT.getX() + (counter * (CARD_WIDTH + CARD_SPACING_LARGE)));
- }
current.setY(AI_1_STARTING_POINT.getY());
break;
@@ -867,30 +888,37 @@ public class Controller
case 2: maxHeight = stage.getScene().getHeight() - ((AI_2_STARTING_POINT.getY() + 50.0) * 2) - CARD_WIDTH;
deckSize = ai.getDeckSize();
- current.setRotate(90.0);
-
- if((deckSize * (CARD_WIDTH + CARD_SPACING_LARGE)) > maxHeight)
+ current.setRotate(-90.0);
+
+ if(i == 0)
{
- if((deckSize * (CARD_WIDTH + CARD_SPACING_MEDIUM)) > maxHeight)
+ current.setY(AI_2_STARTING_POINT.getY() + CARD_WIDTH);
+ }
+ else
+ {
+ if((deckSize * (CARD_WIDTH + CARD_SPACING_LARGE)) > maxHeight)
{
- if((deckSize * (CARD_WIDTH + CARD_SPACING_SMALL)) > maxHeight)
+ if((deckSize * (CARD_WIDTH + CARD_SPACING_MEDIUM)) > maxHeight)
{
- current.setY(AI_2_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)));
+ if((deckSize * (CARD_WIDTH + CARD_SPACING_SMALL)) > maxHeight)
+ {
+ current.setY(AI_2_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)) - CARD_SPACING_ULTRA_SMALL);
+ }
+ else
+ {
+ current.setY(AI_2_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_SMALL)) - CARD_SPACING_SMALL);
+ }
}
else
{
- current.setY(AI_2_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_SMALL)));
+ current.setY(AI_2_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_MEDIUM)) - CARD_SPACING_MEDIUM);
}
}
else
{
- current.setY(AI_2_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_MEDIUM)));
+ current.setY(AI_2_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_LARGE)) - CARD_SPACING_LARGE);
}
}
- else
- {
- current.setY(AI_2_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_LARGE)));
- }
current.setX(AI_2_STARTING_POINT.getX());
break;
@@ -900,28 +928,35 @@ public class Controller
current.setRotate(90.0);
- if((deckSize * (CARD_WIDTH + CARD_SPACING_LARGE)) > maxHeight)
+ if(i == 0)
{
- if((deckSize * (CARD_WIDTH + CARD_SPACING_MEDIUM)) > maxHeight)
+ current.setY(AI_3_STARTING_POINT.getY() + CARD_WIDTH);
+ }
+ else
+ {
+ if((deckSize * (CARD_WIDTH + CARD_SPACING_LARGE)) > maxHeight)
{
- if((deckSize * (CARD_WIDTH + CARD_SPACING_SMALL)) > maxHeight)
+ if((deckSize * (CARD_WIDTH + CARD_SPACING_MEDIUM)) > maxHeight)
{
- current.setY(AI_3_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)));
+ if((deckSize * (CARD_WIDTH + CARD_SPACING_SMALL)) > maxHeight)
+ {
+ current.setY(AI_3_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_ULTRA_SMALL)) - CARD_SPACING_ULTRA_SMALL);
+ }
+ else
+ {
+ current.setY(AI_3_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_SMALL)) - CARD_SPACING_SMALL);
+ }
}
else
{
- current.setY(AI_3_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_SMALL)));
+ current.setY(AI_3_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_MEDIUM)) - CARD_SPACING_MEDIUM);
}
}
else
{
- current.setY(AI_3_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_MEDIUM)));
+ current.setY(AI_3_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_LARGE)) - CARD_SPACING_LARGE);
}
}
- else
- {
- current.setY(AI_3_STARTING_POINT.getY() + (counter * (CARD_WIDTH + CARD_SPACING_LARGE)));
- }
current.setX(AI_3_STARTING_POINT.getX());
break;
@@ -942,6 +977,8 @@ public class Controller
}
}
+ //TODO reverse is not working correctly
+
public void about()
{
Alert alert = new Alert(AlertType.INFORMATION);
diff --git a/src/application/Main.java b/src/application/Main.java
index 0199cb4..e83f9ae 100644
--- a/src/application/Main.java
+++ b/src/application/Main.java
@@ -4,6 +4,7 @@ import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
+import javafx.scene.SceneAntialiasing;
import javafx.scene.image.Image;
import javafx.stage.Stage;
@@ -17,7 +18,7 @@ public class Main extends Application
FXMLLoader loader = new FXMLLoader(getClass().getResource("MainGUI.fxml"));
Parent root = (Parent)loader.load();
- Scene scene = new Scene(root, 800, 650);
+ Scene scene = new Scene(root, 800, 650, false, SceneAntialiasing.BALANCED);
stage.setResizable(true);
stage.setTitle("UNO");
@@ -25,7 +26,7 @@ public class Main extends Application
Controller controller = (Controller)loader.getController();
controller.setStage(stage);
- controller.init();
+ controller.init();
//TODO set minWidth and Height
stage.getIcons().add(new Image("images/icon.png"));
--
GitLab