From ae525f6c4907f245b4bcd37e3d0cc318bc414bd3 Mon Sep 17 00:00:00 2001 From: Jannik Date: Tue, 6 Jun 2017 16:52:52 +0200 Subject: [PATCH] minor fixes * fixed some issues with the DBController * added an api key as workaround for no (rework of apiQuery is still planed) --- bin/application/DBController.class | Bin 20430 -> 20562 bytes bin/application/apiQuery.class | Bin 9437 -> 9568 bytes src/application/DBController.java | 117 ++++++++++++++++------------- src/application/apiQuery.java | 7 +- 4 files changed, 69 insertions(+), 55 deletions(-) diff --git a/bin/application/DBController.class b/bin/application/DBController.class index b5624fc54b82416f70b4b83f99d0ba4ce5930d7b..fe33f4a2049adc4ede0337fb8327242e6ea6c5a7 100644 GIT binary patch literal 20562 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 XTCW@bYGA=9aD2Gm@B&aO_2T~kt6A-c literal 20430 zcmeHvd3==B)&Dtno@Aa(9=3#_qo@NeNk~Ef5ik*C31~0`BrFC&oFq?RFv-N337h*` zt5TP?R#EFN)mBA?K*Xxm*0oxzc6(p<+SYE`O|4MP`#twQvt>cwe)|6Y`iab(=id9= z<=nG;&$)Ma{_{s3BcjRbWj`sV1H+x2ZIR}1A`%!~9 zm2KgUHI)mS*163IrjhO8NXPO>M@w`=x-rw(y3CFi4A7>U$&z=O3i`E0oxf)G>P54b zoG8`lQ5zDmNXHsf4{Z&vkH#VicXd-+xcLmGgLJFbjg|3cx5KTBw1?NYm9_GT)PvE`0hRB+ZaH1>bG9A&U`ndknnt@jw zugkh*f=cMOfG(ATP1eIE5__{kBf9f5;K^lmh@wK-%YIU*P^;~88&TBw8agOk3tTO zrZG&ulG0^1bKyWN>t#SuC?@3RB_AnrL%ZyW5e7uRIY8oYxlF7@)B<&7otd3QUJ8xE(D_6$ACr zZzUers%<)siC5Z$?aG&aThZ_MmL} zJ2a4v*aStZh`I4-SFG8MS4JRA^0_*#IHG2&Cr)eWTs?8)_|A?s0h&ukOaCW1luwRL z3z#PFw}%YX%j`({Sm@9Ya{P2MxT&Q`YvHU|EWAlnF+htbB<+?sG?a!3walRcL!IJK zp`lhdG}2Hj9V#-^X%3At)aec#V5laC4m4DYLqS8eI&=^nEIqGvD2H-|TIZ0TY^Gs# zkq)=MtG&sMEeSWZ!59>1^T+m3ZGgnMXLg0#P?aThNkLs<6V#%pGAV1C@PxyrvtWbPwKO$XLHS`H zs{(Wmo#&@>nMP^OicP4AMb^8q1>p{u$CyLs(*>|pP`b3OU@9G4So@fje7cA(@zcf0 zz00n4=u-L$x{tewSzU?foM?M{1b)LRSy8$y52oO&4qZ-Hz>K&tm_5&MMWU69VCfUa z{#6HP3ti=>uc1D*hK7^t=5B0uJH_BRbhT(h083cl#^YF3fUc!)`04A(Ic0a~&^JY= z{hcyK8|)=xPY+1j%*?*AX+s(k5dH<>PH&@!Hp7@FT(P@N;kYZSxY41T^eUoV37fvn zH14?RssG}Ma4Z486>5uyTjU!YN>xsuA^f}5q1)(oh??md1Hv4_qF~pOdM#{CmBTvR z$#k-59l|`?+)$)7)DcaD+>Owfct{+?>NfF0p^_NXaPyzzcRvwCLXS6g168c>W zT`vzchnv^BEv5N%H+{!X+aTg;PA4bh&^>f7*x_z;o4XS3(#{slvX77&b5vbgYt#3b zHh$3r%~XUZC7axE40ChCahZ?X8HvNul!uaY7t_)PvmljUZXNeK^nf_1oaVM@91^jG z9(3p-DH*0WUhnFXShyK#xC6$qVQ$^rIZHz0Lh}|cT#&&(;YqhcyJ$C5%Uk=&U2Y6Y zSh9a5S?tEU+7bu@(hgy5l9Nb&tPJRC^h?aO4eOAFm!8_sC1O_p#Y8r}4t+k!jdX+-wT4?T!8Pt0x5@1gZGTgg z`YkamwWZ4fu-@-D^sbhwMFBNv%%?xohkp8iX^b#xzl|OG3;h+_ zgQ@h}anIQM>F=n@qt2KMWph&wo@v4W+u$)>pui&YLQCq6YMWsRruUmd z%7_g-jqE9L4bSuQT%g#L`|mf9!zVDpgiG(^u=zBx83tb1d^*NXLkk(R$>C;3w3c-BdR*}UkicQ;3Dk+H^toM zaJ#%c1aPbQj9D!$b78$UNlnz@PN^BLYZklh(eCepi~S%ejom^eDa9)fEr}%B zfSnpOq*@G=)>0l??1H;-O?7o7BJHR@!R?6Q3ke6UA?2avl2QQ*n|k0*01@9Q z{oKX05;m!}roZ9&(j^1UKqgx)mI)Z|Nt?gJR6YO;)Alx-jn%@$dma9+FmY(ARf>`K zi7~rh42`x}+p}ZHRwVA?h|mU!Az{*DZYvDgT7e1uR|x|RmZcnR+~%FgDtWIMiP(j3 zW`N}wiCBK(+{JT^IE1E$if!(JJ{2RZ`7`fv_)-2obQC5WLX~CiJ)n_^6;jya@h@Uu zpE1E1oigDkF^aa4;(}WdpNJdY6c_Q1X{#wz&1_kf1WX@_*Z+~jPfLVkBiKzK>kI}w zi#%WpY$7anYb@HH>904ebz^SkY7sUu7LCv-&kWHL8f!D6p95ms5nntB~tT3lY7PWWY{>x#=Kl-m5Jpxu@h$RO7KHeA?P88W$YLAJnF75r;S zw?1a`Zy+J%Kuid$RCP$I5m)_%{~+KV!R;5KY@7cCJy{#+*xV&Hhv7UupiO#NsPQ8TN+A`r;<~=6vRtFBy$s97Nu|EAk;^KZT=U0ir$7Qn?DC_I)GVIBuRiW zTPZNv>&{jd)2uH$Vp_!dj;eB@`l)IF*c|br@Tb0*cvXK(B;FP|1MaSP0K?JWl$0*B zm4jHL#Wk`Lk3d;Ev<*>1nd+7BW$HS+uPRfw=lFq=;#5=CDS0GKQQu&_X0fUfg#D2QV$j>}tRj zd|`K4Qx|+aM+orx?!n9u?pNo;{O$>0JV zc+rJ4(%}WXZ7RNi2}=hUcw52=)JvHTH1Lv%G(eajLr=~`8QN`!jo8`>!1>5*pko+k z>}H0V1k`kOykE_Lg~-gnNp{mwGbQgf6rgwB!ulnv=gnGBTh|DLr)DF6q2|D~)CAOA zb%I~v+|6Wb^`Pb()mhEnVWGqPp;OM}_qi;EH27^>|q|JF3Mr^CCzoY<1KcDa_rVgGnih zIBK0P3hTI1irO62E=5)+#6Sw7j_TBX37aI^l){*!;!@~uHi4&JgW;Fb)mXQSQ=fr82d3idD7D1CMr=< z9Z;9hOuxDmNI)YquUtC#Fi(9|UEx=k_l<4zrp*J$T<%8JtW7xTN`*Mgn!T{DhUrkP z>#5M9Pg{(4mAb~St{zYjq)$g(tGC( zzq;MaP7U13QFkf?fO3am&RX0*05&n{WKXyDpSxGv9Q7TY-7+}eukM9u%u>sG z97`eYQQt#GQr#yimzh#Xs@w`$-~*1@t{&8;2?CAuL>~djxTUg8VoOBA>S0IikVx3Z zF6jF!w(7=dtmLRN&*t@+mbu5WdeVf+(>BV7K9^U!kzrMc&rF6@Tb)!8fqo^35|*aY z3Oa+T(-Qgw1JaJcbauux3y8SQ!$C>gCK#Ovk`}glybJvYv5!A?q1;7_y#m zlOgLF_Zc#tNp3Y@E>bp{4#DT4L_C=+y{_(YyXdfSduVK9!4bRZsNGb)izXEu(@j$g zs^w!kKDz1noiqoH<~A0bu#0MU(tPt!ryuI^u&8ktE#65DX>w_rT%INy)8wgXa#fmK zohHL+vUwcuBzIidPFgdrd?!U7)Vw_dpYv!0KF4A;rT8nFnU5Z8;Pc2kQ zQADGgX(C-hlWu}dI=ehP&;+tiKrWI=7L{B$(}3F zek~E;Abo%_6}~Sj=mg^mV%?OufyQ9Y*{s}{V&FC^=~p`lqtV4??8CSnG{?NYo6Z&n z>>$_ILl-LAMnmf!qRYy<>B?@p=0Qws5hZ8?ZNU``VJ-m*7BsIQ}Mp~ve{mq%9F5v_jOB9e~fp%`n=D}XMb#Cq!? z+FEckW*{@`AsF)dih?_O=q^ReD+<2r5j_MOxsB}lif-DT+4A8Y+Nr3@+D1hvUK+G= zdZ%qf<7chUB*&cea5pS>Qrl0Jh*ShIv_1;s#udugUX^8ju3=NfK|2JOSMin3{9_ywz zd{eND1JPvFxQZfc(k^=2EaPH}i>!*rZteY@Zt;l7hw13op0fQGTP!6z==~zB@lOgF ztG{*AKg`Zo3%LLQCj^Py%kC=PqYW3r2zgW$bpJ9@!QzOB6vZ=-;W)y+rgHF#6(;ZmmC zdaLnxD*mqO;RY&eAs_1rUm;ib@N`9WXyF#}Ed8(m53-&6+rR~STV|G7z8;?Aqq3aT_Hiv9 zb7eDoH0dwo1%|TGwjPx|yqGDq!H=8Ke(jAm!h2+G7}6rc6J$gV{+|iLcQOT`-17E& zsjr){1z2Kvj#qSQx+vExT9q#H8-|qIUe#(NFv5!R;mP)%aG65C*U}R$Q)nl-Rz5t> zu&rFPO(v=3Y{~xQ?DN;br?Y76;HW2nSVXiH^YqU{gD=-Y5A6|k$5=uvu{w%}Osb$*MB zeeG6_bpjWwORP(*%V>*rqjigQI~U{oK5ILkcUiAlzew6+en?x|2K3elIIsc^`BXTb zmFRmFoYZOPy@`&aX1KE!swEe-E%;mmTfUZJu-a#XIuCtZ3oCsW=m+4Mc2XzibSA7t zjGm=9{TMd~--HkN1lGM5_X8De<^V1O4yUtuEWXR>e4d1Rel0k`?4pbLLb`;nr%U+( zT+Vx%F5_45{5oCE@8A~OZ_#!yeNEYPl^R7?t0U+dHHofOC)3vvqkU7IP1hkZxIwR`dWvpQ&(Uq_r*yk|o9W zzGLV2w9EG~?Y8o%#|qISRvGQF zCex!<6+L9t&|_9DJ#N+0eO41aWku+RRww<)+C)!V=g~9PCG@OyIX!26ou0R@rypB4 z(od~h=oRZudeypzerDZAKZn%(!rDb|SWnWM){FGE^%}in{fgeT-ozCl_(nbmkO^+i z_(pXtf6Q@C5F=#yJ$Hc;aCab%3^%~~~xPmsfB>Do6f z#-)|B$;U(JFg}OR#e0?X0-vX;7P^qnhjY!r9{=@q= z%g{{8vEjzrjp@K#$Q!^h4a!d!9a}*Jv-UJMN?RaRYBQ zea3U?bH0W4;w+hQ_N&mpk9XrX+!MGD_d|&Ji)?G>0qqfq@?d%)j=;t2;K&e1?_y#U z?}nD7q5Dx}e?}prj{B%#AI%)IkJ|T9V=pejLxMfEM4u1BJt=+|E3r_zMG(GkI^sph zw6gW;cVtR%eT4yV-9TvI&(uQRZJ?@$%Y#<7Pzxjzp&so?b(lNgW90KnWg%tIMOe zaG!Pyy@zwtf2MR`1x!D|mF4jWSgHb=#Dz46N77fhh_2*O^a^bFFFA;dxd-9R(YP0T z2oK>y`7r#skV9}pWB7eQ!4LQd^m`=ESdYRHXtDD1I4$=pC6oma@uG5N^Am7va224$ zdBQ%@Pds<~0q%YpXFLf=&N$xp_;BOIFvs_GSq`Ah5beZrbdY;8`9Gs8lbQl&GmL!D z54a(tBcIdlx^fE~+dgWNdhvC-9;RQYExls#lZBWY<04mIrGoP6qzjMNO7(+GrK zUwzTMifLS|c(jbGgRR?o&q_`vjKanNCxZ}K(i6)~<-aqTKCkwhOk;8~lI$^A4V~=a z2@ti35VfO$ye8wee9D|2?3vRdpx>WrvAP}9E1Hr_NCD-3Mh8L;cpq(0Bjf}7i;H~TF58&n7JikB z#e7GX!U z9}!`REZ^D9?_#!v{2nG(l!KH(AxrM02q_9Ldl0mx{C%DGFi~h#US^pISE~ZSyo|YP zLY2h` zUmEC8+{G>7rTEF?GCGz|q2sxcmhq_w9#_&eyo$cXr{Sk5r@-bn!R9y9hmbgnTY+NM z;v#zlnVxmH>U;)wa2srYJFX2z`5x}%XK=suZG={zazYhwmx3~?V|W9OI5(;@c$3<| zo7Dw;mb#43QCD!2x{1$Mck%@|d$|xtB^POh-YnU7wbN5*pL&Qt)PCYn9B4_nrKkkw zaK<}KQRnGE&Z1-0+1iWbAZWWzD}FBh4D%7i&&7OC(ZQ1+vpz`&Pd4VA$A3Z3d3+sx z#D{|SJ8{l*C(juD@M%f#?h`{)8yIKCHgU4Fk>6X{6ELluO$9mfm(+F)JS zhQGqr==7_a4(lS}#X@abkSoj#FA7Xn7170VR0E9*;zkpBfOk(n7!2ao7#w0AMBzN7 zZc>zm>?I>npM=bJXF_H@kB?DX=4EFw`c?nt=-$ZQyga0oe9D|=G6*qsdeVSSvcSP- z-H|!#zChpL`x$T;$u#=8bQsutDfap@IGnHIV(H}w*{`5-z7q1k1wW|$8a41$_zCCb zNU~gm(EVEI!Z)A`*U?t~7Tt`1{a(HS;n`N?vXOw`o9Ioxnf}Dz2I9YkZN8ODf!`>RpvRW(LC0}{j;-he@GnFVM#R8P`Zz<=!f|K zi4zcW4)h)%NeQ>n(_@ewB-2A*b3S3Ns_qhGq@D>868D^htJ0U`Ve4i z>JUJ1E+L7w88UDdQfYfrvM>X%kNAFEB6t8ca66sB58`*c58+Db!$_{}MDnZ~Kgirg ze?T1e7w(}?_z~L2dl1b%3j6bf-pj>E0D{*^EQ|d&ST;cIdRJkiXrbO!A4b1Y<5q=p zs~FI*q?qoc2B2O^C+&khHpwOdCx?>n6WXj{=y^#Pnnb31wO!0pf|&tLV4*GiA-Z0a zR^>x`Qd{puc4|m}{%4^}!$EU?l4f1MZib6WYixBh~p+q&8mxjC&P7 z1AYzO>F0VEPDGLl>rd_iU7w67K#hepmx!Xm^At6nZuyY3O_p7e#rvUTeL{1({~SH^A#R!Rxoc>$kz{cfjlS!0X?D*S`g? ze+OQ_4_^Nsy#51t{ipvYygm??tWWL&85MK3eN{>#J)5S2U%+f*nIPB;pd8vJKz`Fl zmdS1o{Ad_Th*wPX&&PVqA~TsQ5H^WaAXu5m4m|? zP2^U1gkSKcF0yg@Xea<*ggUwqK-Zrnfs~VEo}3(+27zE8N#+OhlcW=LlH`!!kR&-Y zI5bHP3l2+?!-K<<u26+IZW)PV zl_L5cj$?MI1L#S0AnvaP>6hvt`n5WkK2W3SQ*{Vi>QK&ChjAgUhK^Qa_;6h8ELVqX z5qaNiTv9|33X8P^KE)C4k=pJFbrdK8mldiQl;j*MR0$|S2^Fdol;pZA)HqPEqoB$_ ziC?Qw<)DzQ0aXDCHv~Y9$2US@P?exyA3;q3HAGVrK@HW^Bv9gEE9A%3N$qZRH3G(f*Pr*X`qU5fN_{c^~gu5W0MFcw;8j<_|~j`)}X4t8sj=by?2|X z%1ROvy+*p#aa9rrui2qy?N&9HO|f&Pf~;<7|~;P zv!#PH%gJuGe2`|j+07aUY39#vwsMeWc6PJXgESl7XVj*_+VvUM9jslSan}ykE-!n2 zXAIUZkln6huy*;`?amymos-=zF<84H+3hwA)^2EayUl~O8;c>PrUbUp#9&Hb zDvAaSeYE_YxBTKfzBs@|f#Jh$>wPKXrQwAG#Y^5xa^Fi*Ru#iX>Q-_oMxEcSF2=2| zDt{)3*ONIqXcYyz)mNTS^Mkn$smqG&uk2P|>sH?g=A_GY;q@rg)4|ESy79K&=Zx;$ z)U9syrAd9!q(|NDBi;SvbWP6p)jf^A)NuDSG+L=K?rG>z-$f=gv;Sw!tM}uojCyDr z9aTDj zqpDSfI!-Oc&GU2A40V?}UcIPhsaMr(wNK4apQ~9uTg~-NQ1g8C>O|iXRqI=!PV$|u z>UJhaE9H{brtR4lGLvt|N_hE{2ef9LN zdJM+iPm6qStH+T{v8loLhCZjxQ!mpropcHKR?&2idKCZ2m8A0nIO`9>-61f-Nxz3! z)DOUAxu<4EeKIxblNeP3AiUSBUQMM}^cgh9*8f-Fm(_4`6}@!YAPxL9S2w8~KcSZn z)F;t8AtNW*sa|v=|ImmDuy7LtB8xeVE_(*Y&)dri)l=Q- zN7F~ETPde(dzo)^w|aIv>P=3&KwPX^gQM)V00j{$QtR|yn9GQxlY2p<)sMkh{Ez^x ZUId>EV#B}KhXZu{=8Dxz=u)Yl{13P9%1;0Q diff --git a/bin/application/apiQuery.class b/bin/application/apiQuery.class index 46bc0ca0550c9bad2b6b57447359ce1b7a20c8ba..83ad53e6759326a781e2b30ca9493b802ed0077f 100644 GIT binary patch literal 9568 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 I;gH|`FXp)xF8}}l diff --git a/src/application/DBController.java b/src/application/DBController.java index 9306c0b..91ebfab 100644 --- a/src/application/DBController.java +++ b/src/application/DBController.java @@ -115,16 +115,20 @@ public class DBController { ea.printStackTrace(); } + //getting all files from the selected directory TODO rework String[] entries = new File(mainWindowController.getPath()).list(); - if(mainWindowController.getPath().equals("") || mainWindowController.getPath() == null){ + if(mainWindowController.getPath().equals("") || mainWindowController.getPath() == null){ System.out.println("Kein Pfad angegeben"); //if path == null or "" - }else{ + }else if(new File(mainWindowController.getPath()).exists()) { System.out.println(entries.length); for(int i=0;i!=entries.length;i++){ filmsDir.add(cutOffEnd(entries[i])); } + } else { + System.out.println(mainWindowController.getPath() + "dosen't exist!"); } - + + //getting all entries from the streaming lists for(int v=0; v< mainWindowController.streamingData.size(); v++){ String fileName = mainWindowController.getStreamingPath()+"/"+mainWindowController.streamingData.get(v).getStreamUrl(); try { @@ -138,7 +142,9 @@ public class DBController { } catch (IOException e) { e.printStackTrace(); } - } + } + + //add all entries to filmsAll and filmsdbAl, for later comparing filmsAll.addAll(filmsDir); filmsAll.addAll(filmsStream); filmsdbAll.addAll(filmsdbLocal); @@ -146,6 +152,11 @@ public class DBController { System.out.println("films in directory: "+filmsAll.size()); System.out.println("filme in db: "+filmsdbAll.size()); + /** + * if filmsdbAll.size() == 0 database is empty, we need to fill it + * else check if there is something to remove or to add + * TODO separate local and streaming for better error handling + */ if(filmsdbAll.size() == 0){ System.out.println("creating entries ..."); @@ -155,7 +166,7 @@ public class DBController { if(mainWindowController.getPath().equals("") || mainWindowController.getPath() == null){ System.out.println("Kein Pfad angegeben"); //if path == null or "" - }else{ + }else if(new File(mainWindowController.getPath()).exists()){ for(int j=0;j!=entries.length;j++) //goes through all the files in the directory { ps.setInt(1, 0); //rating as integer 1. column @@ -198,12 +209,10 @@ public class DBController { ps.close(); psS.close(); }catch (SQLException ea) { - System.err.println("Konnte nicht ausgef�hrt werden"); + System.err.println("Ups! an error occured!"); ea.printStackTrace(); } }else { - - try { try { checkAddEntry(); //check if added a new file @@ -271,7 +280,7 @@ public class DBController { try { stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery("SELECT * FROM film_local WHERE titel = '"+name+"';" ); + ResultSet rs = stmt.executeQuery("SELECT * FROM film_local WHERE titel = \""+name+"\";" ); if(rs.getString(4).equals("favorite_black")){ mainWindowController.localFilms.set(i, new tableData(1, 1, 1, rs.getDouble(1), "1", rs.getString(2), rs.getString(3), new ImageView(favorite_black),rs.getBoolean(5))); }else{ @@ -282,7 +291,7 @@ public class DBController { } catch (SQLException e) { try { stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery("SELECT * FROM film_streaming WHERE titel = '"+name+"';" ); + ResultSet rs = stmt.executeQuery("SELECT * FROM film_streaming WHERE titel = \""+name+"\";" ); if(rs.getString(8).equals("favorite_black")){ mainWindowController.streamingFilms.set(i,new tableData(rs.getInt(1), rs.getInt(2), rs.getInt(3), rs.getDouble(4), rs.getString(5), rs.getString(6), rs.getString(7), new ImageView(favorite_black),rs.getBoolean(9))); }else{ @@ -305,25 +314,30 @@ public class DBController { Statement stmt = connection.createStatement(); for(int a=0; a nameText = new ArrayList(); ArrayList responseText = new ArrayList(); String fontFamily = main.getFONT_FAMILY(); diff --git a/src/application/apiQuery.java b/src/application/apiQuery.java index 8ce7105..545ca89 100644 --- a/src/application/apiQuery.java +++ b/src/application/apiQuery.java @@ -38,7 +38,8 @@ public class apiQuery{ private Image im; private String[] responseString = new String[20]; private String posterCache; - private String apiURL = "https://www.omdbapi.com/?"; + private String apiURL = "https://www.omdbapi.com/?apikey="; + private String apiKey = "b9f9fd23"; ArrayList responseText = new ArrayList(); ArrayList nameText = new ArrayList(); @@ -75,7 +76,7 @@ public class apiQuery{ moviename = moviename.replace(" ", "+"); //queryURL is apiURL and additional parameters, response-types: http,json,xml (must be json, since the response is processed with minimal-json ) - queryURL = new URL(apiURL + "t=" + moviename + "&plot=full&r=json"); + queryURL = new URL(apiURL + apiKey + "&t=" + moviename + "&plot=full&r=json"); is = queryURL.openStream(); br = new BufferedReader(new InputStreamReader(is, "UTF-8")); @@ -133,7 +134,7 @@ public class apiQuery{ } //if response == false then show mainWindowController.noFilmFound else create new Texts and add them to flowText - if(responseString[19].equals("False")){ + if(retdata.contains("\"Response\":\"False\"")){ //TODO + FIXME mainWindowController.textFlow.getChildren().add(new Text(mainWindowController.noFilmFound)); im = new Image("resources/icons/close_black_2048x2048.png"); mainWindowController.image1.setImage(im);