From 4fe2d7b4be3e2fa17f4dd7274beca71cb1f417f8 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Tue, 3 Jan 2017 23:29:45 +0100 Subject: [PATCH] worked on dbcontroller part 3 fixed a few bugs, prepared for favorites --- bin/application/DBController.class | Bin 7881 -> 7938 bytes bin/application/Main.class | Bin 6805 -> 6760 bytes bin/application/MainWindowController$1.class | Bin 2524 -> 2524 bytes bin/application/MainWindowController$2.class | Bin 2589 -> 2589 bytes bin/application/MainWindowController$3.class | Bin 1571 -> 1571 bytes bin/application/MainWindowController$4.class | Bin 1991 -> 1991 bytes bin/application/MainWindowController.class | Bin 34757 -> 34824 bytes src/application/DBController.java | 31 +++++++++++++------ src/application/Main.java | 2 +- src/application/MainWindowController.java | 25 ++++++++------- 10 files changed, 37 insertions(+), 21 deletions(-) diff --git a/bin/application/DBController.class b/bin/application/DBController.class index cd235034b925578a3c27bcfcda9ca76172308fa4..deb954d1215d262dba52a2c567f32680a578b151 100644 GIT binary patch delta 1378 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 Y@F`;l&K14`_>8T}<6X=b`+P&>Up75qV*mgE delta 1530 zcmYjRTX0iV6x}OLbCcVXge3HlLJ6fHG%YDAkG4@LEeMrB!2(iL;F89Y5|Yr|(pJDC zi0=pWh>D`3D8&cE`?h085d6^b#~(lSpBbHj85LBdxNlM!e(pYNKh9qJaqgAb2j{3i zjDB^2h-Tx&Y4y5eUST4owYTbBF>PBs+0h!)bruTRbZ&|3;IBwD{h5iLilGmJtuBI)icr@0S>J>Cfw`E#gQUM59kO#7N#PmoiswF^q zGb)=^(l167)#@~T=?WT&4%woEJ$i|U*Qsz3pRoKR5fcL}(uE_X|ohYAmT3cNB= z5U`F1h2$mpcRY66*fFGsuTEX<-M1eB17`s{SB2Cx0LIeaRn@We) zp4F{sRxm{_6vg&(OchjuX>yYY*rp52K&9L-DnnHQ)nvnAD|B7|8AYCyhDZHHD9 zPt`QHEbfiQ(t13V6u4LZEKXV<05Jt;sojD3Xi%^~o_1E|EkvXI#aV9;W09F?u?)CE zwlGOMmdaLFtu2g)1(wMH*LWR7L?B8*1_TCrMQ zaaD%aVx59VLEbE-Zato;Y02`@5&~_siwD57aNsdKq2O`3z&*8K12%#zEz3aV@~X4Q z)7Y)+spRUubS$hu1C_}=pj{w_C*>t~opp;qT#mX+99sn`WVd6R42-*i zUTODCwD;gCv$UPE+EZfPE%3Bl>X~NSFYp|mml;o0;3d4G;AM~}OEsY-J8GJ_td3Zh zz^iyoe(jmz7=Tpp26tEvczwkJZ<^iDk0w%?n1iO^ErGZ3jx6y`#=El4J0WlwA1HYL zu8FMdiYN8lehYjkGv2kfPX&(Q=-D5=UW>}RnNLM`<7AuExM*qLZRKZo3!;dZRjT` z918^@D_Q6Qu`iXf?JmLk8ZvvkTNud;i}BdD!1tdjuab^L^yJYhDhr+@QTY x8Yj2mV;s$uM&_`2ohUyzj8EkB(kX#K9A|97XW8%P_=2U%L!Zxohc6ra{{bUQXb1oR diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index 32fe9f1ab07f61f62ec3d8a69959ac265de595d0..69a2131edbbaec65740b9a3e60c1037284704ffd 100644 GIT binary patch delta 51 zcmca3d`Eag5eK9HJzn4%}A Hah3r9Vw()5 delta 51 zcmca3d`Eag5eK8sAOkoV|OyLZZm?9>p Hah3r9U*imi diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class index a6e3573d4dfbb2b03808f3e0de5f8c014ea3f616..6456f45a1ef08b48942485db8513f763a59a13e5 100644 GIT binary patch delta 60 zcmbO$GFN27XLiP{&0pA+7&Y@4_?Yq;l$Z(_9GQw3+?k3Q3Ykh6`ho13Ocf0CnJO91 O0qI9f)syWx?*Rb&{}9^% delta 60 zcmbO$GFN27XLiQ)&0pA+7&WsQ_?U7Sl$dfE9GUVN+?fg(3YiKS`ho13Or;F-naUW> O0qI9f6_f2b?*Rb#DiF5- diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class index e3e4960bc275077f1d8e27b2cd102a94e6923c83..065ee4a04136ec4329c68046f71fcb30f8ac5c92 100644 GIT binary patch delta 31 mcmZ3?vzTWC2P6%{**BA+NK7F1MJly~OdO#0;5F6uvIFcG^rurq@cmB-^ky_J>Ko*|754c;0P zlhnHO=!mW+bbyX7Ou;k;JFcXL42=!w|LFy^&wDxc-CskI;Xl{$tQ=lIUC$%UMqb zE{e^e-s;BrHTA)KKAvylbi6>l+&#^hVd6}5tK;3%jS3SzI7cOCma@63CNn*_l7HmF zi*UXJtJQ|go>+rk^=@YWBogcpPKX32j?pe}Fd+(}UAPd>b>PL?<%dE#s85+QPV*dk z$R#FZL3bCs3YVI=4411pSp(P#+9V|+--SNC&!u{w)!M5iIUUsZSz#u{5M|03B&X%5 z&x&K!)a>Y>{w}-%uX5m(YG8H`yc(}j-t6)0I`wpRdhoS+og4HzN*&A2cm9PpnRqka zqB3)e*{#-Yy7cZH|Ug`44d7j8$t19zxpJ(92qcd89N1_w3clMZar;k%+oyvuUD ziBI9vDlE58husVuo|=ZbDo?!&pTp-JxQ9WqO3F>9WSfaEs1>>Woz3`?i7(?TYEN#j zpx1D(17B}lZg5?ld$Eac;F~HXFU{D8?>O*nH8C$C>OBUsp{l`Ct=Ij)#1C=5^5u<= z{+Keh-s7(K*65B;O#BoNssni`{SIkSYOCt0b~(Z8#KUB&I!`@?TSJw%#))4t2&%U# z7?~j$_u*G2evRL#em!4gN7dgwQ(~NWiZ<;rPp{1)1TzH}s3zp6hDipjhvqp<;S@pY z()>&#*c7G+QQPu+u?Te}zjJ()DWbK#opzLa>ztwk&Fk+Ju_~!opZ=W~bnKs$GiOmw z10{XVoT}>TqNE|EgNKf#AqoH1Ic?PFDZ~3aL}#_GSDZ6ZB$;rZNLE{V#V2>8efkv? z<`vGKGl$$RQcVbfP?ty--5nxBp9wRIqq|QX;$38lOkL%5l`LymTbY|-fy5Z(2LgH1?+I86;Tp|ed5HzCEQMw*anQ=?7jWK&~Jh_|V6CM4L@ z1QQaiqeVC&smg9 zfl!@0tg+6m1Hu%QVy>FiH{Cfy%+q$gNL}BzsOJpfHAQV}fgMrjoo_|FOUw{;rl{8) zF0$kluf=wVMs>1p_kImxp0Rt@Zo34F262fgmb4yCdW~~k#9U^I<(f(1OY_flh!tvj zzl>lXY;*}9pXU&()ph;47(Q{iDb}d%{a#_~)bfHv;|6h~Lnw7mK@8p`ZdSVr5`xx? z+Z^In?YEwVvCnwMQht<`E@xI4Q@wkqc5R!5tiC){Fk0__uL}MG~lzH5Bv*$Vm z6%m)W)>AXWTTR8oDYj9WnLXDt`=WDdE8Gp9dZ*Z7alGDok3B~FzR84s(AOz;(OPr7 zH4SA|mv~&Fg;zSnlMFg(H>tFuPPtE;P(b6LT2Fe`ggzQfc8cdIg_AOdG*(qt6eT&u ziiM-Ad~f=oR-*+P z(RF8m26Y-7H=$00dJTRvp*~C94oTI>N}60cBk1U$yWX@qs>O9K84nvBvI|`VT91&4)Jr#+e7n1| zOr~6tU1>l@Y3mSsZvXC6UF;2+VzPZQRbMgG%7HN<#FX)@vqMtNO0-Vwl!HuJB8%-j7*$#4z1SrSDIsN{-l6W#TaSIQF64}TU-z{R*rK>x-E5~TV+hxuqt=8w{oJp#$(FyqDV3-ij8ILHHTcT7L^QUt5kDILhwr2=wh|y38N&PGRGP7Y zeMk%EclyYbAM59eATrlvIs$4cUGf8JTQG5NbG|DY@9HKX@93@{Bw^t3UP4a0Cc42Rk@CLMzem)bw(Ga(tIsbdjc)Pb=< zK9eHE2s7mi^2IR22o0Anh8q?y+LZ5Gyr_0woGCxGc(Lug&ZazQ@eamC;1_lY{K~F_-`M?dg6)Fe*&C7Y2m2iUWGCPx4}rgU zEc~q=pL%!&nzK zoMp3-Y+4!{#m;A=Sp^%*8rV2?85_^8U=!F)Y!X|~CbRok8GDRP+cxIB5*9KYBG?5G zLpF+IGu18USIG(pWgaD`PnK0g%~R8-&x@%cV|XEw)zYX1kj&~Jjn%7 zGj5<6ie}sh1?*-u`og!1Z-WqaJ4CZPpfkG@da%2o54)R8eh&;~_ri2`AIv0Q&Seik zEqf3e*hW~)9)jiUVY1;P>f9N9d<%dBqdQu!%0NVsEwwZ+4Lc(k%akoJ}+rbu6ziDs5E+#|J9KMzUmV<+6_2-P`fKoUJ&#S zdFfs9(tB!+`+T{d!to<@#O;aslq__RR{M->d59wIbMnn$<(@U3eXTany1(alwA=U8 z{{!uIjCT8xcKeBT`kfa2_arMINbhcc5 zH@n-cCVp7k$Ip*Y^9}m>x4IR6{zK+=wl>qxPWt&x#5$Jg=Rf)RuYP_qb31bC9OOqq zq$>)|Xbjzn;ePBu16v}u`FZ56kV<`>gdY=BWksT|6B0$7Wa4zwE#VB^((J&>)(TnL zMQFKb7CjG;G6C;G)^oYYG1ZN|y1^uA^+Yo*_7#wqlo%bu{m8P93$_@o)9253IakJHo% zPoeKT4%75zgyk;0ki%|z^W(=^7LSkc)P~dV5;PuRAU2i&_H#?^5?v=CZrhzRIYadrGl*BjjdgCFD2Z1LLVF zB7?B}7T8oSgouVMk=t_OL=!aa!iQAE+}^&s{p|jYjAP%RjqrU7Gs;QUM|ZODCe|T} zo$|9dZNQkIfQvTy@p0n$Sz?i^1vi(+xteh6PTc0lT}8oh!BO~(AD{K(i$!Lf>Bm=# zLN~&yxX@kr7K7c`Toe))LL;N_-6;03AKx#H3#qj5N96efeMO-6GYiQ8`j3T-0Q%gX zIW7Rdupxyg>#KE)F=9lFjCEvZ<=8q>lLYMBe-vKlkHaVY3HXL@rYE>9 zER1huiF_N&;@epv-@!(4KbyvzSUvSGxI3(bALsA#N%}MbjL6CIF<-g@nf1R z=y)H6hg9jj#F2WfAb1^G@Ov8Lf=^%r{(#5mZOk{I@JIZKN;E({{*1?|n6CoK2lD=O zWax@Q2WxEbUqJ7se^Hy~4RAi^z}LWm`_%Dy6+SClH#I>s1rZr|HDmEQ$ae8+2KStL zn=@x{th$wyQ~9$ zk0tT zbV0_~VUTbkpu2aazYKyrBeVj}HTO5`~|b z%cf%-n}eNLtq%|3v zO;_{k5=EjzB&w_Gl6)zYDHpbg8RgN!y;IC4&!seps?w}zQSBEsSz&&$phYyC(YtV5 zcC@(IFBWHq`o+=~;VW+vD|MKx5>JUs%P~7}8zatT?KhkrbPNIZqz`JnpcD3{r0)Z1 zIIJNf>h1W8|GYw~YOko1dfP5$3XWYVb$I20mr7<9zp&>2TU9*&}Od^8Lgf@4XE zQaYH&!Ff3TGzHENC=l7EKwg^yw2)SST*bt-s7gzs*} z;WiHRledP@|2w0^y?$}OpI7L_vl$PzF-mO4L#+&|Cf1ZkG($W}x6)V6VEC;1V-0zt zb%+>a582$h2)b;>)>ej~M++^;_BO_dvl)JyvC~?#nZQ#v)ZD zZvuVaTIjm~`oTiSd;$2A1%D2pUo7-%0G+VV?*a6ug-!+#T{LLJQ#O)JBgq4Z>JK3q zKn@Ez1IT5e;7kfh(o=?5Ff`B^ZlQ<(in362`$g=1x?Tf4#KzLYYbrgoX3)cGA9_YD zpl8$JSWa1b9#rD_un4Ea6?g$v{R`nyoB>bbOse*7_!MVRm7h)DzAKn70zGU3&S5jL zk}bfwY!y~9h4a|`coExy)oc&WXZx^*9Yint4r{4eFW^B~$2(#@PsIk_fQ@_=F68TQ z5x)x;^T+TK-i%B5%ea)kkIVRBT+V+&AKhYBU?{G{1YCug^mBm%T#X~}G83oZ&vUZ;?7J2jU*04W>53scm(z2fOe&JubYqa+ z;)GwO6&Wouy*$onlHH3OaSrs$%s2;iWW_n6Wwu}T2(-Czj;%6(rz{Ax16yPvtvk5L z8RygkeR4>gljhUZp*emzBF^cTbaPO2P=j~Uv3xi9a09Htdte>j54Yk2a2IX_ z-@W*-RbQvm0}sG`f%;06oM0V=nwm%tH=ItL^?U#?ruv!=OXVavnU0ivSRl*f6nf?! z1Qqfenqj~gD3?>^GS5j;n8%$Mt-G1ZMi@bOHVINl*QH+nKptuG=XeJbSC( zR9|1Q{F7ul*(wv4v$P%5W4=gsN=uUSFxO95`iZUGoblxNv&0YxQV3e63#(MgD`FyV zdhAR?3WplCqF4sgFtdHP1=em)uZUz}YTt?&`nLM0`g%p4?=ks!VAr%ZC(^D@wC`$p z2fnsaf!rDHl$+(2z?@WSwc_-cCZ9MTpd_x;x_rXYFe2(^qbT6 z*)DhdLpBO9|Jky=bK0Dpa);`&DmCog(|EgNvnpHFjWebqE=@|7{uPVMGk?E8ijiy-TC) z?V%=O|5!?MKCzafPow`uBz#

mD|5l4WzqYAmo97>D9o{LAXtj1DMJzMVJzBe^NGfrDISpF$bo)I{j^Ot2B`X2qiu6pWhYs~z=7xmez z0vh^&;RYJ|p_gtpMlkV0jBq2uq9TnLqk~0tG&&ja7L{OhF_J7Q*+?-`Eh^3EZqP3X zX>OL$!^pL$JfoM<+oJjy1xBG!L_18TUn5siJC^>VkN)WP+CaPBZjJs%u`!4~#eU2_ iG)hY1gH5*H>2I<|`Sr7+zUd<4>-fl|0B- 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 Ne+c1Ys2w0e{tqwadFB8B diff --git a/src/application/DBController.java b/src/application/DBController.java index ee23e59..2ab2336 100644 --- a/src/application/DBController.java +++ b/src/application/DBController.java @@ -137,7 +137,8 @@ public class DBController { System.out.println(rs.getString(1)); System.out.println(rs.getString(2)); System.out.println(rs.getString(3)+"\n"); - } + } + stmt.close(); rs.close(); System.out.println("Streaming Entries: \n"); @@ -151,7 +152,8 @@ public class DBController { System.out.println(rsS.getString(5)); System.out.println(rsS.getString(6)); System.out.println(rsS.getString(7)+"\n"); - } + } + stmt.close(); rsS.close(); } catch (SQLException e) { @@ -164,19 +166,30 @@ public class DBController { //gibt die Favorisierung eines bestimmten Films public void getFavStatus(String name){ try{ - Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery("SELECT titel, rating FROM film_local WHERE titel = '"+name+"';" ); //SQL Befehl - System.out.println("local:"+rs.getInt("rating")); + Statement stmta = connection.createStatement(); + ResultSet rs = stmta.executeQuery("SELECT titel, rating FROM film_local WHERE titel = '"+name+"';" ); //SQL Befehl + System.out.println("local:"+rs.getString("rating")); + stmta.close(); + rs.close(); }catch(SQLException e){ + try { - Statement stmtS = connection.createStatement(); - ResultSet rsS = stmtS.executeQuery("SELECT titel, rating FROM film_streaming WHERE titel = '"+name+"';" ); - System.out.println("streaming:"+rsS.getInt("rating")); + System.out.println("streaming"); + Statement stmtSa = connection.createStatement(); + ResultSet rsS = stmtSa.executeQuery("SELECT titel, rating FROM film_streaming WHERE titel = '"+name+"';" ); + System.out.println("streaming:"+rsS.getString("rating")); + stmtSa.close(); + rsS.close(); } catch (SQLException e1) { - System.out.println("Ups! an error occured!"); +// System.out.println("Ups! an error occured!"); e1.printStackTrace(); } + + +// System.out.println("Ups! an error occured!"); +// e.printStackTrace(); } + } //setzt die Defavorisierung eines bestimmten Films public void defavorisieren(String name){ diff --git a/src/application/Main.java b/src/application/Main.java index b507aaf..341c122 100644 --- a/src/application/Main.java +++ b/src/application/Main.java @@ -105,7 +105,7 @@ public class Main extends Application { Runtime.getRuntime().exec("java -jar ProjectHomeFlix.jar"); //start again (preventing Bugs) System.exit(0); //finishes itself } - mainWindowController.loadStreamingSettings(); +// mainWindowController.loadStreamingSettings(); mainWindowController.applyColor(); //setzt die Theme Farbe mainWindowController.cbLocal.getSelectionModel().select(mainWindowController.getLocal()); //setzt local mainWindowController.mainColor.setValue(Color.valueOf(mainWindowController.getColor())); diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index 26494d4..35f68e5 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -102,7 +102,8 @@ public class MainWindowController { private TreeTableView treeTableViewfilm; @FXML private TableView tableViewStreamingdata; - @FXML JFXTextArea ta1; + @FXML + JFXTextArea ta1; @FXML private JFXButton menubtn; @FXML @@ -151,7 +152,8 @@ public class MainWindowController { private Label sizelbl; @FXML private Label aulbl; - @FXML ImageView image1; + @FXML + ImageView image1; @FXML @@ -425,12 +427,12 @@ public class MainWindowController { @FXML private void debugBtnclicked(){ - dbController.main(); //TODO das muss vor einen anderen Befehl warum auch immer - dbController.getFavStatus("House of Cards"); - dbController.favorisieren("House of Cards"); - dbController.getFavStatus("House of Cards"); -// dbController.defavorisieren("House of Cards"); -// dbController.getFavStatus("House of Cards"); +// dbController.ausgeben(); + dbController.getFavStatus("Zootopia"); + dbController.favorisieren("Zootopia"); + dbController.getFavStatus("Zootopia"); + dbController.defavorisieren("Zootopia"); + dbController.getFavStatus("Zootopia"); //for testing } @@ -517,9 +519,10 @@ public class MainWindowController { ApiQuery = new apiQuery(this); dbController = new DBController(this); - System.out.println("Mode: "+mode); + System.out.println("Mode: "+mode); //TODO debugging -// dbController.main(); + loadStreamingSettings(); + dbController.main(); debugBtn.setDisable(false); //debugging btn for tests debugBtn.setVisible(true); @@ -728,7 +731,7 @@ public class MainWindowController { } } - void loadStreamingSettings(){ + private void loadStreamingSettings(){ if(getStreamingPath().equals("")||getStreamingPath().equals(null)){ System.out.println("Kein Pfad angegeben"); //falls der Pfad null oder "" ist }else{