From 9f0956a6747d1b149285b977cb3d5c4eede2a176 Mon Sep 17 00:00:00 2001 From: Jannik Date: Sun, 27 Aug 2017 18:21:56 +0200 Subject: [PATCH] code clean up * smmdb api query is not started anymore on closing the smmdb window * general code clean up --- bin/.gitignore | 1 + bin/application/MainWindowController$1.class | Bin 2199 -> 2199 bytes bin/application/MainWindowController$10.class | Bin 1723 -> 1723 bytes bin/application/MainWindowController$11.class | Bin 1307 -> 1307 bytes bin/application/MainWindowController$12.class | Bin 4908 -> 4908 bytes bin/application/MainWindowController$2.class | Bin 4186 -> 4189 bytes bin/application/MainWindowController$3.class | Bin 4201 -> 4201 bytes bin/application/MainWindowController$4.class | Bin 4209 -> 4209 bytes bin/application/MainWindowController$5.class | Bin 1097 -> 1097 bytes bin/application/MainWindowController$6.class | Bin 1097 -> 1097 bytes bin/application/MainWindowController$7.class | Bin 3505 -> 3505 bytes bin/application/MainWindowController$8.class | Bin 1745 -> 1745 bytes bin/application/MainWindowController$9.class | Bin 1108 -> 1108 bytes bin/application/MainWindowController.class | Bin 44515 -> 44535 bytes bin/application/MainWindows.css | 9 +--- bin/application/SmmdbApiQuery.class | Bin 4109 -> 4184 bytes src/application/MainWindowController.java | 41 +++++++++-------- src/application/MainWindows.css | 9 +--- src/application/SmmdbApiQuery.java | 42 +++++++----------- 19 files changed, 40 insertions(+), 62 deletions(-) diff --git a/bin/.gitignore b/bin/.gitignore index 9eb92dc..0a416df 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1,3 @@ /application/ /datatypes/ +/libraries/ diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index 936e9c3970789b3c99dfc77cca245f477790fb29..5a1b4a70eb0c75b4db134fbbaeb73c90c98a061f 100644 GIT binary patch delta 63 zcmbO(I9+gq5IdvyWMTGQx_%5YjQ$L2i~$UKjDZZ6j6n?cjKK`9j3EpujG+ugjA0Dr TjNuGbj1de?j8T(+vCjnnn>7uW delta 63 zcmbO(I9+gq5IdviWMTGQx;_jtjJ^zNjD8GyjQ$Lki~$VxjDZZUj6n=3jKK^=j3Er= TjG+uwjA0B-j1iN6vCjnnm_H4D diff --git a/bin/application/MainWindowController$10.class b/bin/application/MainWindowController$10.class index e5bb083270713fe871afae503d67d73a06658767..439d001ce5460e7582019af0e28d74c3e76836e1 100644 GIT binary patch delta 43 zcmdnZyPJ2zR8~fv$rUpO& delta 27 icmbQuHJfXL2MeRsWKR|^PFn_UW;+HUX8Xx=Sn2^>)CNQV diff --git a/bin/application/MainWindowController$12.class b/bin/application/MainWindowController$12.class index 75a7966759ce5ac714549073baa3a4125907920f..c8ef48f683bc30914765b474aff0f14db9d24e47 100644 GIT binary patch delta 161 zcmV;S0AByBCafl~-VOoav)>NF0)OKGB?IOFDg);LL<8smOatZsUjys_Y6I;6bp!4I zfCKRWj05rjssr-?$^-TQ^#k_-0R#8}D+BofE(7`jGz0trMg#o;T?76BcLV?deFOmk zi39=xlLP|+p9BN}q67s2$pi-h-vkH&`UD9A69ftZI|K^?J_HN`Xao=fat;I$0(k@z P0)qq;0*V9|lP(heaSJQ3 delta 161 zcmV;S0AByBCafl~-VOobv)>NF0)ONHB?IRGDg)>ML<8vnOatctUjyv`Y6I>7bp!7J zfCKUXj05ukssr=@$^-WR^#k|;0R#B~D+BrgE(7}kGz0wsMg#rWhDAS%UdBKnkfv(Ypr)2aX=o98(dfNUP*OytOezxOH`Jfu5RDNy z2Z8oxS&c%p)X)$_U#sn&3NU0JxuTBL znX)!rr|AZ-x-zmJNd*lW@vH`zlb3l7vmhTKO%T>3iwd!%2+NAIq6BNov93clRAf^n zwscNJWum$yrV4R=5~Gs@Zjy|WVv01=WC)Ta%nqyUriqZF$Q~u~R1Mi+pEnM8r=VU_ zDxmh}0`;liTuoHfwUAHay3ws#erx=pG9$Xvy;{wrG1c@ShpC+TM{njAkE)xoPbSDR g8D%_8!?Q8G7-~e$FD1S;7mU_RmWmmfMKmG4hmjD0& delta 313 zcmXYt&nv@m9LAp)Q{+3#kE3iQPD^eY#YxU~r2Lp+jrlp*i21d?3M+jN{1a*i%O0%F77IjWcS(bFm zigK*#p17Xa&>wLcN#G?(FWZc;!zjCqks`!C5e`x;b4Z3Gu1ND}o+WI`9P`7eS`1WB z^%Z=zs?A&#^{f}6fCiP{#no0vI=tC}MwO3VTGsLHgrtFsqvP?z} N{LYQ1gP4=|*#C7LOS%96 diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class index da7e036cb6ec7164f59f72cc0efc79bc0850a680..87abca3b5218c9b11dad4feba1eee35ea28a5147 100644 GIT binary patch delta 178 zcmWN{J&VBs0LSs)cacHz3S_w1crQR1l)+{+DU`C_WO1c#Qu6$89>S4_>o4coMVV}N ztN!nR<&Mw%F60wmnqP9E9tgPhpLSAkPdZj22CHW{TKt&0vN>bB1b*1@KmWIkS zHKU~sZJp@oOjj3ry7HwPef=@O!Vm`|yiD-(O%Q_+Q^L%Nv*3*-DOP+qS(9f&lP!IA SjQM@GJwF_t?P&blV>|%KH8+3& delta 178 zcmWN{J&VBs0LSs)cexDGy#g7`MlV1al)+{+Db&@iH(4lUQ1W=5<<4WC!#OU>XtP`8 z9k>Pm`SZEjuC{T=OllT3{}WBiL`HV9a*&ggyj&FIp(r1pdZ(l)WyPr|K~))QDpA*h zhPE_yq@@#II`gdyZQbbTPL~(@yfVPe5HBPAOb9R~$bvVPe6S+M4@oO)^8C_dLyxUd Q|CqBg%HH6^>|u%U1g&8=E&u=k diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class index 71c6442f172c9fc0b73e49b3242da891874bc7c4..43cc472dbb174acc5c1e38758fa077e776ae70ec 100644 GIT binary patch delta 178 zcmV~$yKaF20EXf3UDP0{D`@_~+|dQtYGOBK$cplR*ja<;iM?Pe`60OQgO%CdMrXeRyxoGKyPkCr7Oh-|=it(j5-%8R`ioS{r zRAHzpW3`xQ#8fM0Ix*Lk1s0arS>fgfFTeO$a3{ delta 178 zcmV~$yKaF20EXf3T`)-M3dCSG_5y4*u^UYo8W+GMVKdm+jU+@O(XNuFPNk~EF&e^9 zKSfE1=P?|HqY$!ED~7E%VsElgmy?EEH1$YJZrXa{LtZ+1rmGmAiqlhqFQw@#!?(%| z^ukc@jMQPQF%vDB>Ytfz%rUXR#t$Br_*mg*O@IwSeu=Opib0YcDLZ?z{E_28o+Bkr PR5(-R!YkLJ`60+1-`GFF diff --git a/bin/application/MainWindowController$5.class b/bin/application/MainWindowController$5.class index fa9915ffa5b149dd51c7150f0b4c55af4bef0aca..516c9429762530c2087718015b8ec1e73df9f4ff 100644 GIT binary patch delta 27 icmX@fagt+09y24;5^CXUGmnL7Ysrv@(o delta 27 icmX@fagt+09y24uCSC?XCjQ9>nL7Yt=>|&x diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class index 0e7a8c50dd8eedc35a110204b3b61ef24ce9d28d..b8ae180bc7066871f0ee471c3cfc8fbb42557da3 100644 GIT binary patch delta 68 zcmdley-|9@LT*OU&5O9T84V>EM3|%*^qFKCOqt{uf|(Q<%9)fHI+&ChrZA~6%w$q! Yn8&2Xu%1bS;W$vuZ6@u>|9Cb70Om>#$p8QV delta 68 zcmdley-|9@LT*Ok&5O9T84bl4M3^KQ^qHg?OqpaDf|=wQ%9#`xI+zq0rZ6cn%w$q# Yn8&2Tu%1bc;W$vuZ6?jh|9Cb70OH^dtpET3 diff --git a/bin/application/MainWindowController$8.class b/bin/application/MainWindowController$8.class index 95da18fdc8e3ebad26007b5a17c652b9a8cf8a00..9ebc86b3fe16bdb73c6c08aa2cdd6cfa50688500 100644 GIT binary patch delta 39 vcmcb}dy#j;Mpj0>$(vY9L=72unT!}jnM@c|m`oWon9LY-m@Fq-vrPj4$|MMG delta 39 vcmcb}dy#j;Mpj0h$(vY9MD-bXnG6_2nT!}zn2Z@Tm`oUSn9L_zvrPj4$ubCF diff --git a/bin/application/MainWindowController$9.class b/bin/application/MainWindowController$9.class index 19e5083bb9fa80b4b7f0a0f4bd7065859d9ad5f4..656851c6e7c2111bd3813f82392426487a9dadf4 100644 GIT binary patch delta 23 fcmcb@afM^U1ZGCR$rG9FSpyl^nSv%?Wv&MRUQP#0 delta 23 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 delta 12273 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 MypMH`bsh%%KSv0TCIA2c diff --git a/bin/application/MainWindows.css b/bin/application/MainWindows.css index 3a08deb..db8b365 100644 --- a/bin/application/MainWindows.css +++ b/bin/application/MainWindows.css @@ -16,16 +16,14 @@ * TREE TABLE CSS */ - .tree-table-view { - -fx-tree-table-color: rgba(0, 168, 204, 0.2); + -fx-tree-table-color: rgba(0, 168, 204, 0.2); -fx-tree-table-rippler-color: rgba(0, 168, 204, 0.4); } - .tree-table-view:focused .tree-table-row-cell:selected { -fx-background-color: -fx-tree-table-color; - -fx-table-cell-border-color: -fx-tree-table-color; + -fx-table-cell-border-color: -fx-tree-table-color; -fx-text-fill: BLACK; } @@ -33,13 +31,10 @@ -fx-text-fill: BLACK; } - .tree-table-view .jfx-rippler { -jfx-rippler-fill: -fx-tree-table-rippler-color; } - - .tree-table-view .column-header, .tree-table-view .column-header-background, .tree-table-view .column-header-background .filler { diff --git a/bin/application/SmmdbApiQuery.class b/bin/application/SmmdbApiQuery.class index 1ab62e7e629e9bee8c75440987546f4b632da9a1..e01f9146a4472ae52606933b0dad2ab3468e365a 100644 GIT binary patch delta 2171 zcmb7_TW}L)6vzK3x80=Mv`tARQ$|uiv_L6SBw!doq=*G6g%%5~U}Li_fm}+mp{*4H zs6gc=tcW5=0kNP$xu)eJA{TX>k&)3+htUV$nDH{h_~3&`J=;w(&Y%yz?D_BSJ2~fk z=j``otNVL*?icsYUjpzbJ{MphxOV*HI$3+7x@|XKo z`AP$k(kkW(ugboVgn1|;2rU{4hDFR*e=|%d5m8OBXpy~~av^F3JoAqL74v4cHOehY zAQG0aNL^_hG)zPtA-lsptT7Ug#^l&AuUo{k1X^vwQZxv7PAxLI?LItDFt_;Fh2T-Y zGCEbiX}HCYCIPYUCe8skBwUBqUB6!gWE zP=skf_KVoc1BkZ-BR;?Oww?WbaUMuxG!hJo*ugD`Dcl1QD#4@#LL77#!$@mbj%vAg zOL!A+X<20+lzPrGecanTkZ?qa$%=@51VexW@8`f_9-JKZN3{0?9772xL0P~db(Anv zJcz>*1iYut7wRlWBpk*2>Pf*}*ntlv9K&($?lNDjQf^bYn~xON2{>{37onZ#y4qwt zVzbzhgF%2nPzT#QiBp((0aF$`ruAa_s57u9@r2_^ekAc!5_7syR>>ZYD%Stzxqv;# zWV}m~s2K>hn1gB9QLnF6mh@ps5{-^P5-XBu@tRzwBowcuJ3+HtmUDQ4a2bBD*=5$e z*5+E1Snm(>dC1ZC1fcTyJ} zVtbT&={(!Zbc1f9M-594Cu&fPMHqz!jK+G5!3LCKFUIl5SjGiRJY_~m`#P4Lqjo-N>D{*m`@%oq;kHbDo{&vQBU=J`7~e&`Qf7| zUly%sqz*JEs1wU*8v?WwA?iYy4kJQG5u;uxbP;j7j5fM~cKVt>wC}K*ZetDo!S+v- z8O&IRJb->Hycj0MDbNFCs>bI5%w0{q$<|FY*U%v3dC*QCY&wwz86Vg3)*kKy;# PpjXGc`jmHNz-NC0z3KX7 delta 2077 zcmb7^TW}L)6vzLkx$I`UY16G4$h0G&B3ep;0jUy3EntCqDVGA3S}HN!me4dQ$%eKd zgbL+SEC{P0P(@TM^}?+XC`CX<#~Eij@WyuV-0Ayr2(SW{MKZF;~DGeV=7)#XO8B z2(8gzSPO+ERA7OC`Gown{`LN;!N}CgMHTG@B;<}xuGaj4=4DZTKo#(^ z{#RC^_f>*(qqis!iAQ5IpUA{mRZL@%+-E~+NbCSzc^j1`zc5Vc6P#@U-B zypCD{EA=H-ujLKY>6&$(y&kItys00xJ+7a!+H5lXcuW7yIy1k4i%w;d(1pq?OxADLbjP_*&4M)HF9l|u^9<{zI{TXli+Cbx2V-xM@SX1l^`_)8ykax zcu4CI(M6C${+QMhVH#8$MC{-V$6G@Ye}nP1i|6~}Y(O9y357)LCfH({KN=I!L$GSW z7G88O!$@0LjT*W4$=DCw$f|19ntsb3eQ>e9nD&sSJuHP2C1#x^KqYo$8-8KGLmD;Ycn@<;W zU%nhD6g!Bn>IWPrB-?%D;xT~!)E7!+i9Wch&f;0+`6ON}P2wfilg=TB-&hTya;5Uh z1-v#ni7I6&KayC+L;uRFN-v@&iB(D<2{nneKC8!?MA&EVqXi!OAh?`ssQ1}CHe=ET zmm`U{%MwB#9KL*)qf9XQ7L$uM-`f(M*_?hEP+`;c0@8JO+qMxj!keg!x71Lyn)2W>1ajc}82~^8sHHB#%$2RJs zogDX2FCFE0oCYX~etl4WD&a#h=3)}&qm*xiDQLztbYeRH(=)h$SzLk-LzvA)lyez# zaD!*x!~!m5A@1^}aSv5o&LRR9lNHNJ!3r9K8Y zQyoII8tW1iMwDWRQ5)K+3mw#r4YUUd>ctj1hE6(;Z8X5=_9C{^Wj>$7=%!m7f90#{ z5A-09|M~B^c>eRDAfInpk?!Ctd=0)Q=r+EA9a$KIaX5)nu%LwfJ&iN4^2TH&&SHRJ zCpF_7Pqbh^J9nOUZRHd994_D@Z2V@yMs9_Gt292PhK;Y7iMUBpO5I_$m6?NGxt~%G zm~}Ce*qvJ`r7+vUESm}v_#q{W8SY{zvt1`ss+`$wW=^*4U`o|6>tU9|_H9Y2Ftfc} zelEKhOsOtr2bsCp&7~>T%j^)dJa%>Vs7mCqxfUE@sIa{gOvN3y;w&z)oi{S-Zd!4# zQ={DJw3?Dp6&Y2RQL&8b&ZuLCN*GDFx9N04+&`H+XZG+it8bYMqi}@(MT-CuFjl}7 zBUZ>GSPmh>7z>DSlj6V#3LhB}P;ZR!m;HakMvF(|=Ct_Vk<*z=*#1L};E6|SFstKT LUE^J4;k$nTQxV*J diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index f13f299..8ddc456 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -216,7 +216,7 @@ public class MainWindowController { private String color; private String dialogBtnStyle; private String version = "0.1.6"; - private String buildNumber = "033"; + private String buildNumber = "035"; private String versionName = "Throwback Galaxy"; private int xPos = -200; private int yPos = 17; @@ -263,7 +263,6 @@ public class MainWindowController { smmdbApiQuery = new SmmdbApiQuery(); } - @SuppressWarnings("unchecked") //FIXME SuppressWarnings void initUI(){ cemuTextField.setText(cemuPath); romTextField.setText(romPath); @@ -287,7 +286,10 @@ public class MainWindowController { starsColumn.setCellValueFactory(cellData -> cellData.getValue().getValue().stars.asObject()); timeColumn.setCellValueFactory(cellData -> cellData.getValue().getValue().time.asObject()); - courseTreeTable.getColumns().setAll(titleColumn, timeColumn, starsColumn, idColumn); + courseTreeTable.getColumns().add(titleColumn); + courseTreeTable.getColumns().add(timeColumn); + courseTreeTable.getColumns().add(starsColumn); + courseTreeTable.getColumns().add(idColumn); courseTreeTable.getColumns().get(3).setVisible(false); //hide idColumn (important) } @@ -376,7 +378,7 @@ public class MainWindowController { games.remove(selectedUIDataIndex); dbController.removeRom(selectedGameTitleID); //remove all games form gamesAnchorPane (UI) - gamesAnchorPane.getChildren().removeAll(games); + gamesAnchorPane.getChildren().removeAll(gamesAnchorPane.getChildren()); //reset position xPos = -200; yPos = 17; @@ -634,21 +636,19 @@ public class MainWindowController { } else { smmdbAnchorPane.setVisible(true); smmdbTrue = true; - } - //start query - courses.addAll(smmdbApiQuery.startQuery()); - - System.out.println("size: " + courses.size()); - System.out.println(courses.get(3).getNintendoid()); - - //add query response to courseTreeTable - for(int i = 0; i < courses.size(); i++){ - CourseTableDataType helpCourse = new CourseTableDataType(courses.get(i).getTitle(), courses.get(i).getId(), - courses.get(i).getTime(), courses.get(i).getStars()); - - root.getChildren().add(new TreeItem(helpCourse)); //add data to root-node - } + //start query + courses.removeAll(courses); + courses.addAll(smmdbApiQuery.startQuery()); + + //add query response to courseTreeTable + for(int i = 0; i < courses.size(); i++){ + CourseTableDataType helpCourse = new CourseTableDataType(courses.get(i).getTitle(), courses.get(i).getId(), + courses.get(i).getTime(), courses.get(i).getStars()); + + root.getChildren().add(new TreeItem(helpCourse)); //add data to root-node + } + } } @FXML @@ -740,9 +740,7 @@ public class MainWindowController { //get all existing courses in smm directory, new name is highest number +1 for (int j = 0; j < courses.length; j++) { - System.out.println(courses[j].getName()); int courseNumber = Integer.parseInt(courses[j].getName().substring(6)); - if (courseNumber > highestCourseNumber) { highestCourseNumber = courseNumber; } @@ -751,7 +749,7 @@ public class MainWindowController { String number = "000" + (highestCourseNumber +1); courseName = "course" + number.substring(number.length() -3, number.length()); File courseDirectory = new File(outputFile + "mlc01/emulatorSave/" + smmIDs.get(i) + "/"); - System.out.println("Path: " + courseDirectory.getPath()); + destination = courseDirectory.getPath(); } } @@ -763,6 +761,7 @@ public class MainWindowController { //rename zipfile File course = new File(destination + "/course000"); course.renameTo( new File(destination + "/" + courseName)); + System.out.println("Added new course: " + courseName + ", full path is: " + destination + "/" + courseName); } catch (ZipException e) { e.printStackTrace(); System.err.println("an error occurred during unziping the file!"); diff --git a/src/application/MainWindows.css b/src/application/MainWindows.css index 3a08deb..db8b365 100644 --- a/src/application/MainWindows.css +++ b/src/application/MainWindows.css @@ -16,16 +16,14 @@ * TREE TABLE CSS */ - .tree-table-view { - -fx-tree-table-color: rgba(0, 168, 204, 0.2); + -fx-tree-table-color: rgba(0, 168, 204, 0.2); -fx-tree-table-rippler-color: rgba(0, 168, 204, 0.4); } - .tree-table-view:focused .tree-table-row-cell:selected { -fx-background-color: -fx-tree-table-color; - -fx-table-cell-border-color: -fx-tree-table-color; + -fx-table-cell-border-color: -fx-tree-table-color; -fx-text-fill: BLACK; } @@ -33,13 +31,10 @@ -fx-text-fill: BLACK; } - .tree-table-view .jfx-rippler { -jfx-rippler-fill: -fx-tree-table-rippler-color; } - - .tree-table-view .column-header, .tree-table-view .column-header-background, .tree-table-view .column-header-background .filler { diff --git a/src/application/SmmdbApiQuery.java b/src/application/SmmdbApiQuery.java index 0e05384..2524c55 100644 --- a/src/application/SmmdbApiQuery.java +++ b/src/application/SmmdbApiQuery.java @@ -37,92 +37,80 @@ public class SmmdbApiQuery { BufferedReader ina = new BufferedReader(new InputStreamReader(apiUrl.openStream())); output = ina.readLine(); ina.close(); + System.out.println("response from " + URL + " was valid"); } catch (IOException e) { System.out.println("error while making api request or reading response"); + System.out.println("response from " + URL + " was: " + output); e.printStackTrace(); } - System.out.println(URL); - System.out.println("{ \"courses\": " + output + "}"); - - String apiOutput = "{ \"courses\": " + output + "}"; - + String apiOutput = "{ \"courses\": " + output + "}"; JsonArray items = Json.parse(apiOutput).asObject().get("courses").asArray(); + for (JsonValue item : items) { int courseTheme, gameStyle, difficulty, lastmodified, uploaded, autoScroll, stars ,time; String owner, id, nintendoid, title; - - //geht + try { courseTheme = item.asObject().getInt("courseTheme", 9); } catch (Exception e) { courseTheme = 9; } - - //geht + try { gameStyle = item.asObject().getInt("gameStyle", 9); } catch (Exception e) { gameStyle = 9; } - - //geht + try { difficulty = item.asObject().getInt("difficulty", 9); } catch (Exception e) { difficulty = 9; } - - //geht + try { lastmodified = item.asObject().getInt("lastmodified", 9); } catch (Exception e) { lastmodified = 9; } - - //geht + try { uploaded = item.asObject().getInt("uploaded", 9); } catch (Exception e) { uploaded = 9; } - - //geht + try { autoScroll = item.asObject().getInt("autoScroll", 9); } catch (Exception e) { autoScroll = 9; } - - //geht + try { stars = item.asObject().getInt("stars", 9); } catch (Exception e) { stars = 9; } - - //geht + try { time = item.asObject().getInt("time", 9); } catch (Exception e) { time = 9; } - - //geht + try { owner = item.asObject().getString("owner", ""); } catch (Exception e) { owner = "notset"; } - - //geht + try { id = item.asObject().getString("id", ""); } catch (Exception e) { id = "notset"; } - - //geht + try { nintendoid = item.asObject().getString("nintendoid", ""); } catch (Exception e) {