From a9fbf555d6458df486e2e01931e51d9675297c71 Mon Sep 17 00:00:00 2001 From: Tal Moran Date: Wed, 21 Sep 2016 17:21:34 +0300 Subject: [PATCH] Refactored voting-booth-gui to use gradle and match maven directory style --- .../voting-booth-gui/main/ChainBuilder.class | Bin 3064 -> 0 bytes .../voting-booth-gui/main/Main.class | Bin 862 -> 0 bytes .../voting-booth-gui/main/TwoWayNode.class | Bin 1088 -> 0 bytes .../main/VotingBoothGUIManager.class | Bin 4769 -> 0 bytes .../BallotSummaryController.class | Bin 957 -> 0 bytes .../ballot_summary/BallotSummaryLoader.class | Bin 1351 -> 0 bytes .../cast_or_audit/CastOrAuditController.class | Bin 794 -> 0 bytes .../cast_or_audit/CastOrAuditLoader.class | Bin 1331 -> 0 bytes .../SelectCandidateByPictureController.class | Bin 1015 -> 0 bytes .../SelectCandidateByPictureLoader.class | Bin 1497 -> 0 bytes .../select_candidate_by_picture.fxml | 220 ------- .../SelectCandidateNameController.class | Bin 992 -> 0 bytes .../SelectCandidateNameLoader.class | Bin 1435 -> 0 bytes .../select_candidate_name.fxml | 245 -------- .../StraightChannelSectionController.class | Bin 851 -> 0 bytes .../StraightChannelSectionLoader.class | Bin 1473 -> 0 bytes .../VoteHaveBeenCastController.class | Bin 352 -> 0 bytes .../VoteHaveBeenCastLoader.class | Bin 1402 -> 0 bytes .../WelcomeSplashController.class | Bin 799 -> 0 bytes .../welcome_splash/WelcomeSplashLoader.class | Bin 1358 -> 0 bytes .../welcome_splash/welcome_splash_screen.fxml | 99 --- settings.gradle | 1 + voting-booth-gui/build.gradle | 223 +++++++ voting-booth-gui/gradlew | 1 + .../main/ballot_summary/ballot_summary.fxml | 287 --------- .../src/main/cast_or_audit/cast_or_audit.fxml | 260 -------- .../meerkat/voting/gui}/ChainBuilder.java | 16 +- .../{ => java/meerkat/voting/gui}/Main.java | 2 +- .../meerkat/voting/gui}/TwoWayNode.java | 2 +- .../voting/gui}/VotingBoothGUIManager.java | 2 +- .../BallotSummaryController.java | 4 +- .../ballot_summary/BallotSummaryLoader.java | 7 +- .../cast_or_audit/CastOrAuditController.java | 4 +- .../gui}/cast_or_audit/CastOrAuditLoader.java | 7 +- .../SelectCandidateByPictureController.java | 4 +- .../SelectCandidateByPictureLoader.java | 7 +- .../SelectCandidateNameController.java | 4 +- .../SelectCandidateNameLoader.java | 7 +- .../StraightChannelSectionController.java | 4 +- .../StraightChannelSectionLoader.java | 6 +- .../VoteHaveBeenCastController.java | 4 +- .../VoteHaveBeenCastLoader.java | 7 +- .../WelcomeSplashController.java | 4 +- .../welcome_splash/WelcomeSplashLoader.java | 6 +- .../voting/ui/GraphicalUserInterface.java | 2 +- voting-booth-gui/src/main/pics/barcode.png | Bin 1183 -> 0 bytes .../src/main/pics/blacktriangle.png | Bin 371 -> 0 bytes voting-booth-gui/src/main/pics/bullets.png | Bin 407 -> 0 bytes voting-booth-gui/src/main/pics/exit.png | Bin 384 -> 0 bytes voting-booth-gui/src/main/pics/paperFold.png | Bin 3056 -> 0 bytes voting-booth-gui/src/main/pics/printer.png | Bin 20222 -> 0 bytes voting-booth-gui/src/main/pics/profile.png | Bin 3115 -> 0 bytes voting-booth-gui/src/main/pics/settings.png | Bin 996 -> 0 bytes voting-booth-gui/src/main/pics/stickPaper.png | Bin 2171 -> 0 bytes voting-booth-gui/src/main/pics/walkingMan.png | Bin 1379 -> 0 bytes voting-booth-gui/src/main/pics/women.png | Bin 930 -> 0 bytes .../printing_commitment_barcode.fxml | 147 ----- .../src/main/resources/images}/barcode.png | Bin .../main/resources/images}/blacktriangle.png | Bin .../src/main/resources/images}/bullets.png | Bin .../src/main/resources/images}/exit.png | Bin .../src/main/resources/images}/paperFold.png | Bin .../src/main/resources/images}/printer.png | Bin .../src/main/resources/images}/profile.png | Bin .../src/main/resources/images}/settings.png | Bin .../src/main/resources/images}/stickPaper.png | Bin .../src/main/resources/images}/walkingMan.png | Bin .../src/main/resources/images}/women.png | Bin .../main/resources/view}/ballot_summary.fxml | 2 +- .../main/resources/view}/cast_or_audit.fxml | 2 +- .../view}/printing_commitment_barcode.fxml | 4 +- .../view}/select_candidate_by_picture.fxml | 8 +- .../view}/select_candidate_name.fxml | 2 +- .../view}/straight_channel_section.fxml | 2 +- .../resources/view}/thank_for_auditing.fxml | 0 .../resources/view}/vote_have_been_cast.fxml | 8 +- .../view}/welcome_splash_screen.fxml | 2 +- .../resources/view}/write_candidate_name.fxml | 0 .../straight_channel_section.fxml | 322 ---------- .../thank_for_auditing.fxml | 127 ---- .../vote_have_been_cast.fxml | 249 -------- .../write_candidate_name.fxml | 565 ------------------ 82 files changed, 288 insertions(+), 2587 deletions(-) delete mode 100644 classes/production/voting-booth-gui/main/ChainBuilder.class delete mode 100644 classes/production/voting-booth-gui/main/Main.class delete mode 100644 classes/production/voting-booth-gui/main/TwoWayNode.class delete mode 100644 classes/production/voting-booth-gui/main/VotingBoothGUIManager.class delete mode 100644 classes/production/voting-booth-gui/main/ballot_summary/BallotSummaryController.class delete mode 100644 classes/production/voting-booth-gui/main/ballot_summary/BallotSummaryLoader.class delete mode 100644 classes/production/voting-booth-gui/main/cast_or_audit/CastOrAuditController.class delete mode 100644 classes/production/voting-booth-gui/main/cast_or_audit/CastOrAuditLoader.class delete mode 100644 classes/production/voting-booth-gui/main/select_candidate_by_picture/SelectCandidateByPictureController.class delete mode 100644 classes/production/voting-booth-gui/main/select_candidate_by_picture/SelectCandidateByPictureLoader.class delete mode 100644 classes/production/voting-booth-gui/main/select_candidate_by_picture/select_candidate_by_picture.fxml delete mode 100644 classes/production/voting-booth-gui/main/select_candidate_name/SelectCandidateNameController.class delete mode 100644 classes/production/voting-booth-gui/main/select_candidate_name/SelectCandidateNameLoader.class delete mode 100644 classes/production/voting-booth-gui/main/select_candidate_name/select_candidate_name.fxml delete mode 100644 classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionController.class delete mode 100644 classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionLoader.class delete mode 100644 classes/production/voting-booth-gui/main/vote_have_been_cast/VoteHaveBeenCastController.class delete mode 100644 classes/production/voting-booth-gui/main/vote_have_been_cast/VoteHaveBeenCastLoader.class delete mode 100644 classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashController.class delete mode 100644 classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashLoader.class delete mode 100644 classes/production/voting-booth-gui/main/welcome_splash/welcome_splash_screen.fxml create mode 100644 voting-booth-gui/build.gradle create mode 120000 voting-booth-gui/gradlew delete mode 100644 voting-booth-gui/src/main/ballot_summary/ballot_summary.fxml delete mode 100644 voting-booth-gui/src/main/cast_or_audit/cast_or_audit.fxml rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/ChainBuilder.java (89%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/Main.java (95%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/TwoWayNode.java (97%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/VotingBoothGUIManager.java (99%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/ballot_summary/BallotSummaryController.java (88%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/ballot_summary/BallotSummaryLoader.java (83%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/cast_or_audit/CastOrAuditController.java (84%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/cast_or_audit/CastOrAuditLoader.java (85%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/select_candidate_by_picture/SelectCandidateByPictureController.java (87%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/select_candidate_by_picture/SelectCandidateByPictureLoader.java (87%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/select_candidate_name/SelectCandidateNameController.java (88%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/select_candidate_name/SelectCandidateNameLoader.java (90%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/straight_channel_section/StraightChannelSectionController.java (86%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/straight_channel_section/StraightChannelSectionLoader.java (90%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/vote_have_been_cast/VoteHaveBeenCastController.java (70%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/vote_have_been_cast/VoteHaveBeenCastLoader.java (89%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/welcome_splash/WelcomeSplashController.java (85%) rename voting-booth-gui/src/main/{ => java/meerkat/voting/gui}/welcome_splash/WelcomeSplashLoader.java (86%) rename {voting-booth => voting-booth-gui}/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java (99%) delete mode 100644 voting-booth-gui/src/main/pics/barcode.png delete mode 100644 voting-booth-gui/src/main/pics/blacktriangle.png delete mode 100644 voting-booth-gui/src/main/pics/bullets.png delete mode 100644 voting-booth-gui/src/main/pics/exit.png delete mode 100644 voting-booth-gui/src/main/pics/paperFold.png delete mode 100644 voting-booth-gui/src/main/pics/printer.png delete mode 100644 voting-booth-gui/src/main/pics/profile.png delete mode 100644 voting-booth-gui/src/main/pics/settings.png delete mode 100644 voting-booth-gui/src/main/pics/stickPaper.png delete mode 100644 voting-booth-gui/src/main/pics/walkingMan.png delete mode 100644 voting-booth-gui/src/main/pics/women.png delete mode 100644 voting-booth-gui/src/main/printing_commitment_barcode/printing_commitment_barcode.fxml rename {classes/production/voting-booth-gui/main/pics => voting-booth-gui/src/main/resources/images}/barcode.png (100%) rename {classes/production/voting-booth-gui/main/pics => voting-booth-gui/src/main/resources/images}/blacktriangle.png (100%) rename {classes/production/voting-booth-gui/main/pics => voting-booth-gui/src/main/resources/images}/bullets.png (100%) rename {classes/production/voting-booth-gui/main/pics => voting-booth-gui/src/main/resources/images}/exit.png (100%) rename {classes/production/voting-booth-gui/main/pics => voting-booth-gui/src/main/resources/images}/paperFold.png (100%) rename {classes/production/voting-booth-gui/main/pics => voting-booth-gui/src/main/resources/images}/printer.png (100%) rename {classes/production/voting-booth-gui/main/pics => voting-booth-gui/src/main/resources/images}/profile.png (100%) rename {classes/production/voting-booth-gui/main/pics => voting-booth-gui/src/main/resources/images}/settings.png (100%) rename {classes/production/voting-booth-gui/main/pics => voting-booth-gui/src/main/resources/images}/stickPaper.png (100%) rename {classes/production/voting-booth-gui/main/pics => voting-booth-gui/src/main/resources/images}/walkingMan.png (100%) rename {classes/production/voting-booth-gui/main/pics => voting-booth-gui/src/main/resources/images}/women.png (100%) rename {classes/production/voting-booth-gui/main/ballot_summary => voting-booth-gui/src/main/resources/view}/ballot_summary.fxml (99%) rename {classes/production/voting-booth-gui/main/cast_or_audit => voting-booth-gui/src/main/resources/view}/cast_or_audit.fxml (99%) rename {classes/production/voting-booth-gui/main/printing_commitment_barcode => voting-booth-gui/src/main/resources/view}/printing_commitment_barcode.fxml (96%) rename voting-booth-gui/src/main/{select_candidate_by_picture => resources/view}/select_candidate_by_picture.fxml (97%) rename voting-booth-gui/src/main/{select_candidate_name => resources/view}/select_candidate_name.fxml (99%) rename {classes/production/voting-booth-gui/main/straight_channel_section => voting-booth-gui/src/main/resources/view}/straight_channel_section.fxml (99%) rename {classes/production/voting-booth-gui/main/thank_for_auditing => voting-booth-gui/src/main/resources/view}/thank_for_auditing.fxml (100%) rename {classes/production/voting-booth-gui/main/vote_have_been_cast => voting-booth-gui/src/main/resources/view}/vote_have_been_cast.fxml (97%) rename voting-booth-gui/src/main/{welcome_splash => resources/view}/welcome_splash_screen.fxml (98%) rename {classes/production/voting-booth-gui/main/write_candidate_name => voting-booth-gui/src/main/resources/view}/write_candidate_name.fxml (100%) delete mode 100644 voting-booth-gui/src/main/straight_channel_section/straight_channel_section.fxml delete mode 100644 voting-booth-gui/src/main/thank_for_auditing/thank_for_auditing.fxml delete mode 100644 voting-booth-gui/src/main/vote_have_been_cast/vote_have_been_cast.fxml delete mode 100644 voting-booth-gui/src/main/write_candidate_name/write_candidate_name.fxml diff --git a/classes/production/voting-booth-gui/main/ChainBuilder.class b/classes/production/voting-booth-gui/main/ChainBuilder.class deleted file mode 100644 index db2922b8cac6e827f67e2e3068c38c32fc1a99e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3064 zcmb7GOLG%P5dPMdwbFVmzrfA{CcLr1ARY>kwRzd$Eo?x>#vzGV$&0*1-WAfy*yI7^ zkTbVbE~!*b+>%^G5?7HURXOI88$TfDR1P_$^3AR#ulxwcRUXZBf7AW-On1-z_U|t* z03`5*g59_-DbHlg;+T=iQ__)ivPOQ~C|Y8@C=9vNR!Kr< za>lUi`0zBxp|X{qGK&Ken!Krm-Mz_s#;kF7E?#ntoEcAvaiGr=#>=jik6$$k#H)p( zHDeU#J-vhttL>t%2WCF&%$TV{-Y88c9fQs!^!W@Hb?K6)j8CkD(oc7tg<;2bi%vc- zthD=9#vV8m#{38mg6J(Jw`f?oX_wL2wwX_vS=Vyxs^dX_OBIyP`lxithcVc-chmZ| z>c)EOK~h@D%+uJgVNY38hHH)(GiKHMu|@A5BAu;5(l#;i)LQ%Kw`UcjL8n`n>4)a8 zSy{JSta(1WhUd(Dy5J+1`(I{)BzCOjB*>&QW90LWn<~$U+^7b=c;CJ*UGkOjp_Nd& z>8`U7wB4RHO73X!Y+=AhB8S;sXm8nfn*Y1(3A z)$(EAvQVd|sZVDJ;H8z^`1q<@=w#D!V?j@y;+n^trF3N-iP9C-7A&l;`qG^*RLeI} z4;}QEdBe_$ytVAyfKPeJ!@wz$QqIj~&4Q?cl8n5BXv)gjhR6;Hm)BG5>voiK%EhdC z-VzO{J=k6jiWpVw!Cnb_z2@`!(iiX<6*e3Ry0@oVd~Z~>DhhC9+*eUVNrekGz=Ut^ z&B{`rdUHl8RYj#y^GE7leuj0=~=hDw6MivRuWSz{Wl7`tw%BJRB7d@rjI2 zReXled3#Gqd69janJVLvipO|Doo7FIy%O3yyqAijnS1Pi?EId{a^japYYE8eUOnOX zl(k(j-MSZmCVCeeMOPKPPq-2LI9GiD_M@Mx2oB&N8pY;@EPvYoseJ(r zlQhtn++RWH>H?a?Dm-$a0$C6BYoQ7vTByH*=mHd>YSx>yrV3O&tc8U(s)e*LK?`UR z>XJ56c)?C3xU8P#}A#~#~dT<0gag_RZI39zJ<2Z{GxX9TJ3}O-| zaR;Z6!x`MCW)4Gmgkjn`ho?A?uW$k1;1ZtUGQP(ZRB#0^@IGRDQzwlFO7_p(I3>NnGWu0VAA`db4Z)0TZQUB>(^b diff --git a/classes/production/voting-booth-gui/main/Main.class b/classes/production/voting-booth-gui/main/Main.class deleted file mode 100644 index c8dc67e2def097bf7f8a9a224f956daa53f8075c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 zcmZuvO>fgc5Ph3Caq1Y_rZnNRgpWenKn;Rh5fW4&A*HBNt8(D9O_pTAv8{~_D8rmLi;kFfbJh-^)V%^0( zf$B3I>GZikxwCO7;OxW$C9v4jk$RhrkCZu(M4`wSHUw16BqYM z%@z@8cHZalK`5gkL5+@vIjSSgkYrZoJiF)+Z$HjVU%l40odrvF%kuNF0MEsSk4<#R zdRHm)Nv7?+I1CBhCP~Y|#RDG?vE?Ix=i?Dt1UYM4U~Sr~Op;Ld^OWGl%qA}zP>?=r zY?@Yh-$bc0CQDK^_$OdFudy>C-ItjT2g-25xh1eZf5OFhvQ&rsl7v6fIR6g-Jf$eUu?hz4J{ tPK9HhyF)_+7V;|gK^LS1F*HQr0O{s$w)wch{$ diff --git a/classes/production/voting-booth-gui/main/TwoWayNode.class b/classes/production/voting-booth-gui/main/TwoWayNode.class deleted file mode 100644 index e556ffa52e3db4c61f109053429781e3ed79f9f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1088 zcmZ{iZEwgF!}rdaU|A*Gal>|eZ|lObR5GNix7{PR$KDE5znk^3JZ))uoa3=-s%p(_ zNOUDYa};<3Cpc5WydWL1L&Md1QsiB{zbje#NNLt*+@yq!ykR4eDHW^!zh?RbMrSw< zdhTmaj4I7-*p>$~v5K;Zd$@0+0MkTK!ZJ$q^x}hxx@KYpCP@pfYFLp3yYKjic5F?$ z#vjGtPnG6JdNgB!Xk?9OB#fgDJ`~D~SGck{Y8*3-b7Yq$XIJ1B~dPiX7zvsl-ABVG6DjC$(=}ic2rzHi+B21b0*6ZsE4N z-JZIg-e^vcS!8V?11rJOXIIm)LBr%~o2V()E7~fZ78}2ye`uZ~J3(#{Y168m1hP0o f7I6o6BP5?+A?MD2NA4@xN#~zMm__FwM5?WS=Zn0e diff --git a/classes/production/voting-booth-gui/main/VotingBoothGUIManager.class b/classes/production/voting-booth-gui/main/VotingBoothGUIManager.class deleted file mode 100644 index fc91a8f75f7c7e956707dd67e6f5da5a28501711..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4769 zcmc&%YkLz#6h6~i(j;73E|r23pkOJ;A{IqbE4@=q3s~Bss5se7lWjMSi6^O$Br{3H1c?-_Q7J*?1X+xFY`0Vr9;5!e>y-@OUK?FE z@`{#YbY#==LvG*ajIR>|Q(=m|!n&2Pu_qs^U?u@rcg zQ_AHl+;WVETka~~UUZ8hHx3a!W0qqDRnspRq+nIItx%?>NGnvbpaIV7wU4 zSA_63cwkgLH*gE#nxWk>6fxx9M_k(-h zL|C*C{hPyWn}Et3f{K0MOxtK&ny1`W0wM;bX^|l3$MeSl!b#NoJYRyaa^5yxV zIHY=BwA--$Hkx!^ANMy@QalKSuWkZHGx}Q5eKK$PL9T5NsA}nbx-0XjzERXwt3)Qq zWpr43x{l50cFVC{+gfjdW={AnLAcQ~nmpn7TXGJt+g7}m&XJz`DWH)6FZ<;8t&ZD| zyKXqR|4U6};18K)*Y(9znd9EIk^E|=SQJ|-8Pb%^zWgHff8|t+vHPH%)F|)>n1itNU^{HMVQ}A8(H6&3zf- zLq4dc+SsTh=vjug={cjfWPC7q@@mya2xR9lCU*CX&eq4b&G;6GF;WfRYMzef(3)UF zQRN8Yd0{mW#ppnSzGZZ-F1xiUM57_5_xhPV@MBvrqf2$RR?*G<2GiZE57s+SpK>Ou z%yK3}%Pz{U)U9@mF2;}V4J}ZAl=RpF;N3Vsh1tSq36}*w6UNY`dg9v=;)r=dVYc(A#tX*JC|47~aJ-~)2krg!OvGCmEnM!|m*{Mx6I@;)d!G#}vnE&8wq{{(Ai9X=Tge;e>Q z1)tSNW8o!eM+@j}P&8-`pkwi%y|JLv0G-(b^rOh;IMDG3^kabDQQ0Gdy$rg{BIW2* zEa(D27Zs?^qjZC%5(@KXlT)Wb(e}+?H%oH>kWezFkyF#LP^*A?w1<6nX&&OBsfwg_ zYF(kbl#kxs1B`~h588uv;0u5^|5f6Lrhd!H|J}-CFwLqGddF&C|6p Cb_M?c diff --git a/classes/production/voting-booth-gui/main/ballot_summary/BallotSummaryController.class b/classes/production/voting-booth-gui/main/ballot_summary/BallotSummaryController.class deleted file mode 100644 index fda60f052cc7ef3fcce98d0e44a3745b3b5eaa1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 957 zcmb7CT~8B16g|@x`nB@0mewMQ;8$COeen%r0*&}mkl3agU(9wp$e7(3vNK!SpJie& z@xdS9k22ob(qK#o`ml5FxqI(9ckbMuzrOzf@EkiO6tP-F0e4GS!#(TWx8Axv9$2`M z$7UW68RlOIDa=cTY@^v{$hFmwGc0z5q}6YnKMVHiqXmBax*5Oxx4*IaDJHt(Q>vV%u>oW~Of zPc3Mm>7a!z2hS|rMw4OdKPE=ck!JVK)jNN3ls=FXBymhL=^FnN^;DT%L|g2oQM!sd zo99)OVJ--jrkcW8%twNz`Db}L_^v&vyr8*BeTLd!Z!=9vH%6bTb6On9#|9g;T1DDH zAPX8B%5*w}JhF`JTUU0WQ;+5;1hhnnBhke0 zvwxKFyKTo9zhIW$d(XM&eCIolyFY(_{su6Ol{h+(iDE+R*(fGsn2JNe!#F~C)P@Ki zi{*(Br=xf(_GeK%k0XH>VtE+wxm(!E=jS$db{9Y9)!p^E&1DHG^-%kw zDW+zXl!EIRR%u2;B4=9_SF_x0&8+GYv;ba0_eDlU-O`nHO_WX4rf6HPW1FU^ z&E)k&*?_=YI2Y`yQ`8p?QGvcDUVcJTqK7j2Fe{-)oY|Wzb(irPEcw`fmWcWKnbqq! zCGetnE8`vJM5uWgJ?NFug>D%+yr)MHxpFCW84KcS;@Yr{gk>yZNyakz*@wn(uI(M_ zMK_3|7`C#qcF{Bm;j|c=SV?ztrdHuFh;}ucJtZrdyrPoOPL~b6;uToJh(D1{&mq9E zbXVEhPzll*7}Yi2z?z(UzKo`*K4p3&1h0#ZN@y$Su0I;=XX6oEs@sg04$Zs)#V{Xv z2mcYm7(gddV1ATBXyL~OcxQIQ+X;z&>IW!&@+^SC%o(K2FNAh7HH1?wHME`~dWu+P z;uLM)J-=IAQ;Y-lHA1XD{_YUzwx_iPWvQ)Iykj#FgVF)6456Oa1?S$&VD0L4Anf3?_`G5g|b|!b9 V7Myk@X*EWKA^O&-q2A}xqSDPmJiohcn;&mhk@4WEUC zio}8s;G+%7_|Eey@Km9nxBLun-G-c?FlZlzWvJDGK# zOo}|+d$->sc~M_iWhVBd8@lz^As#!OF_sa=|lec!2f|btICqb?pywWl&sCP8keUYCAG7 S^u;wgb1K%!GpcgJH+}=|D!e)X diff --git a/classes/production/voting-booth-gui/main/cast_or_audit/CastOrAuditLoader.class b/classes/production/voting-booth-gui/main/cast_or_audit/CastOrAuditLoader.class deleted file mode 100644 index a23f44ac3a7c272388f986912702afbe9ce24e25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1331 zcma)5YflqV5ItK8g|bknyj27QECpE~_yixdJd^SWEvR2?F3VDvEW2d8Rrpt$NJ%s? zeD+5f&)sex@IlRH@0~k$=FH5QxxapY{|R6YYf*F|8NsyNXCk=UirFYM+>0WF`)vs0 zfm|NS<6H!fA{5@p7P8G{oQL&0a1zq(?+}t}f zbT0^@nU1!$S!rF4r?6^u|0b06hDhTB2ZBKIcVOeDXd zwT$Qm+A|eVy+FtM%yb!@GgP#d5u5o!!w_WfJ|+u7wG*lj6Vy!-GT|pMQUMGSXlHTb WwBVQ{MyoqS7@==9l?3Gwrv3ovFhl(S diff --git a/classes/production/voting-booth-gui/main/select_candidate_by_picture/SelectCandidateByPictureController.class b/classes/production/voting-booth-gui/main/select_candidate_by_picture/SelectCandidateByPictureController.class deleted file mode 100644 index 75604944ba0a140cbf464589b361a3d15b615f39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1015 zcmb_aTW=CU6#fQixve5tsnknty%bQpFTT~72x)zxq!EI~7cwkUJ7#x=?9Nj7Sth0? zKKKLtQN}Y%NsWoY2Os9#&v!0!e*FCQ9l#6h7m&wR9y#18;4bc2>Asb=EqP$ooh){< zc*wB+QYvX)F{JB_0Yj#($AY2MkxF#qU?jpmANgddbhO9)0S~3sFO3;H5)QYC5EVEB%f$tu@KkiU#m87*6_kC@8aS-ru&QR#-IP}DkvJ>tHd#6bZ? z2aoVLizg2DtWrnAK@(3MJhSR^G#J|dVW;$w2}=K5zvJ_6^0kf^haoMlXZS~Idt*6m zWOX;O+Ig2tzp^r{dA^P)CpQVjRMN_SPfvcQXDOxUB4HAlVe^jmKEbUiT^ah+sm5r7hIB>plg6lIe?5Kj@` zYJNfL0%^Z|XAu diff --git a/classes/production/voting-booth-gui/main/select_candidate_by_picture/SelectCandidateByPictureLoader.class b/classes/production/voting-booth-gui/main/select_candidate_by_picture/SelectCandidateByPictureLoader.class deleted file mode 100644 index f2384e5468cb58371198d7072b29dfc8c4c7676f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1497 zcmbtUTT|0O6#ljp3nd6vDBi^j3I&N5ykAQw%1lItR+JYzOIT`{kT7Yg@UL`6>x|Ag zKKr8_zfIbLj=tzacF&$Y=R4n?OTPd3{1w0q7P1&bA%jW1Pi1ha2h&-YxST}_S9+1g zRlQu($C(VS>-|OsH?!!+Exp{%;Euppxn!5DO4TYZ&MnLpE2Zk}YISMBsytsVRp(zm zwW~|T$`gT{y(!;F)02M9EJva1*X|1RTY+DXq#vzFub~7CrxAwAkIIp(@i-LwZ0wk{ zsVTZ~rB`-iXUnq#xvoNiBW)Y4GuXf2LYsG)c=J>ol!{X7JF!BNR2CSp#{D7#PB^0Sj}? zb&FnoUkVMB^p*9`-1ZV@U>=VRJi$?c!MzE2wzkRMYDG8Qz+8CN=@5agaoxK;H5FN& ztg|C^L+m-nO5G5@sRa7yvaITHp#;t*WAV#Ows3qEna`JPf*fiYwKeh7cpN^C=Pywc z%Jk^hygHpB&|6kf(t4cMy-D1c&%5z+XckWc&hWQ0$bVE9j^Pk;;QM$=p_?BI6U(ep zyb}^fsXxZktJnfKRrmx^_=41Gp^2_scM}IbA@dPEg~^ZTeINTB=bB?25GPFxjdGGG zC#cC2k0?B!;;yCBjLJ@;oaTOp-&ve%MXhu1;>}p$1A3asenX#~h{iYcKb@Lv;@}h& zy-f^Ey`y0YI(VLBL6|-Q<#B - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
- -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - -
- - -
- - - - - -
- - -
- - - - - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - diff --git a/classes/production/voting-booth-gui/main/select_candidate_name/SelectCandidateNameController.class b/classes/production/voting-booth-gui/main/select_candidate_name/SelectCandidateNameController.class deleted file mode 100644 index b7d08186be9a250e7e5b724053ab5737f6a587e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 992 zcmbVKTW=CU6#fP%3v?BWEtPty#T%e@Uwkmum?*KnP|^rN<4ZGLrZQ%CrrDjP^k^EW+Y>VXPuBs z<;5ZpzB%x@8peLagBaiv7SP;YcT@i9M| zc(E^(@T59UjJKzgSiBw!Wp-?@ZfO1eNW`%iGHhNzVW_=Ll#!tr$XL=4FO|}U8>tn| zP?@ujCSl<1zTfLmZ)*$9zdE(;Gn9HdiF~mu?Plr=L4QuTZRc=N!m^9IxaZ)$iwD+e zpy{H8hb|sj_c59bPyct1^kONsf1=;<({B2PuAf8^?W$+^M{09*K45HpFGcP8=X*X! z8J7G&$HXZdM`A2#%fHjp2kBW!^g=95YBQ`ayxBA)J*s%5Pw2Lkm>6u)^%dz%fh=f~ zSSIO`=aFWlms(%JK9iBbC6f6Rba9z%cN%~)uB880P@yPG{y;iIdZYCPnKNXqqAzzw z=~5(rp0R=)MV8@EmI_u-BWbf&rx|A1DHpC{l`5{$Kifr>bO!4e)pY(|vr08B{~Fb- M{c}x5@wRg97sM~%7ytkO diff --git a/classes/production/voting-booth-gui/main/select_candidate_name/SelectCandidateNameLoader.class b/classes/production/voting-booth-gui/main/select_candidate_name/SelectCandidateNameLoader.class deleted file mode 100644 index 6aeae428d6a7d5e8834f65f7e01544ec82495793..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1435 zcmbVMTTc@~6#k}E3uO^3S`d_rS18DOK}5hyEk#L|YG_4$u^Gx(*KBvmc2W3OnrKZl zF+BUDjNk0G+`I3ZdwQQq;C>QanAOXJ1m*;Wi+L-bE0uHE!s7B`wv;ayvMc%W(wh~l{4!g5 zE|9W5%1_dCq+2zMfp5Fjd4aB+=hg%125ZvUQUXS0%lDNV6a!i1@m%Qhe%qu?Rnd(r zy^`;@YmVi~4dn~;w`{c1)B&R#+MQmoT|0Or&^OjHItVnrCJ@hg8w}KK*{&*V)z+0? zlIspNDa)%!XHELHJ~x%|;DcQkn6YZocFnqSR3#`^q`P5n$Uv1{StH3%n`#2)Y@!Y`o97h*z?t~ezO-)~oRP?s|idwRDoraDf9OXNu`)!~f3(QQ*?BkIh z8F&b`XZnB2DKHS_f209ZIz|GI4Lm_shkt4yjXneCaNa-;i!5A|P5nTH4CM9I?8&I? z*TujRo*8(K3j#g+lm24;BWI);(zHEu`Ndw-1=_~+47OKQkaJ|6lcgKI?;I*w@a`ij zflj)ts(RQ5fy>c&A9`C&99ISAt5u62XPZVXO*s7y9}%C~p{NmMdUR=CdyN<9D5@YD zC%(G<7j>YB^I - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
- -
- - - - - - - - - - - -
- - - - - - - - - - - - diff --git a/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionController.class b/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionController.class deleted file mode 100644 index efec09cf638edc27cc1c41b1e2a6e438b7b39a8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 851 zcmbtST~8B16g^W)3+n<}3RwI=QMB~Ieen%LG>tr!hPX{NzL4p5pksDt%+4&-pJie& z@xdS9k22nwZG-WJ2b=8uzNhEjJHLMa_zB=8Isuk&cNulG0&L@+v+g_VffEnw*s0?Y zL+zDR(jGD_wD*S$)vg{3hP9qlqF-bqkq`JNrAVWv6P^xvE}cIMR_#O@hS$A}OBETL zb9p|or^$pXCDKzP5-YWe;#s0w#^W;F)yn2NO+|jduz8Z}M2PV~_jx8_k(M6Wo~(?l;E=Mc*XLOjN99Zy0$bK?7~_081xXsGF< z5>xwktKWR=B(*LXVZF_;_0Mt26910OL|@YAb$W#ER{?X|AbE?th%_U;*!d3j)u%&} zH6L8X3fW;J`EHNbMT2fhtuth{ig}CR*6= c=$j?N44tqjyH5Yuq-w`vgET!#k`-+I0ey(nX8-^I diff --git a/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionLoader.class b/classes/production/voting-booth-gui/main/straight_channel_section/StraightChannelSectionLoader.class deleted file mode 100644 index a51271667f5f7f54da7ac30a6d7361965c4c7d5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1473 zcmbVMSx*yD6#i~07Rn%4p)865ZcvbM!5x)a)?@@iE9#5QrCiF8VTMcxg@2`qltdH5 zvp>rC-Is+;75I5+)ub5yQh~#PLWk zkM(stfhT%@n!vLpTJc;jFA{huFpw`SXXj_<3dP)9c41-KDq4%#sp;k7%%}HOaVcAv z6G&N`@~bo*>6XoW;M;Ebl|XCGb1Q*#gB9uQC;_9iR4l~b&!Qebp6(&kcOfadZMFFBA<6S3}Tvd2h!rsTo^mZs2_KQTSuJ2@G^&g0%IS z#XVCv1FylFy}Wpi1^Vh4Ia`}C?JR+}1}2f!Jl+{dqsu@CIt}D7#T?gYRZis0z_fmP za}iF*nKCegSp#$E5okZ2hQ-xQc1X>!X?y1U;!#ToGz{rJZ7QoE=g11XPxrvFaVTU7 z+RlgsT4=JYDq&>=2BQ%;HGef6R|V#WWs4wJYD#rUI3W%PjiY$VYebnAt(wlqC-ZpfPNecx7!K9K_QwE!FYWvnHJ}$)kOJf5Erv#ZtVwugfx?}T=%Kuqw=bav za3ga7k@=0-=S&q1sm3ZU9U!rfrp(Abntz0L*SMzW2gHlB+}*_M<9eNvH1UYS`wi~; zbdy>F{XECH5AYkrt(w;g_XfV)$^1l970E-iSkciqMC<#}kt!~aQqWvQ+vs;H#-N?2 qNfv}`AzT`_DZ4|+dm(}T2(U(=g~8qCE2jf(xJ#YbDJnxD=J0=mA$}nM diff --git a/classes/production/voting-booth-gui/main/vote_have_been_cast/VoteHaveBeenCastController.class b/classes/production/voting-booth-gui/main/vote_have_been_cast/VoteHaveBeenCastController.class deleted file mode 100644 index 31fb7c13678727c3d535af7ba0bc8e8347d394c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmbV|ze>bF5Ql%0%O8!=6JJ2=)WQ^Mv_ zYC17TrEOJLDW?bC%Fr+Mns8mNls0*9J=aUsbKNkTx>akRSK=N--H9ng6xMiWyN=xr zA$_zP*Ydp{8XW(9_2NbKDnp2faQTl`GS67Gc(qUJZ7vhy1cCg*ut>JNEEx;sBLmU- c2k2cyfJ8DD4eVk^G8@m4P%1>&lMImk0yfiFa{vGU diff --git a/classes/production/voting-booth-gui/main/vote_have_been_cast/VoteHaveBeenCastLoader.class b/classes/production/voting-booth-gui/main/vote_have_been_cast/VoteHaveBeenCastLoader.class deleted file mode 100644 index 318e3dea01f33bb108fa0dbf92abbf2562ba0fd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1402 zcmb7EX-^YT6g^XlEoHD!*%1U3Ed?17a03^pWl72sTC0Asd6Y*PGR%tC#7*ldQgvVh_L}1`a1OZGoA&94H znNr8;5N4Eo7Q*ugTJS$DuWjs;jvE8@XIWnkIlr-Z?tH{pL zzLj>wwsbXgpX(^lPywr7sCR45v`z1ghOYRz(p5*JISs+2v&}%!v}wz=^8S`|vtr94 z5=%P;VdaEts&fqtdb?&x!(@72n6`1~crw2$4rP8zN;_W=CC|taTPCzXBuU^R7yZCB z_l0}x*T51|M+JG{nJhm9rg~>ddiAzMtFHCIPB<}`GwJ)2h75FM|< zUKsz$9XqV*ts{CuIS=8jj(3<>aTj!SqDx0RI&>uQp5)ciC|#jMM@oH~x^WJdMCe$= zl8$BcumhK)yuP(33tlanVLHaj`bBFsG{n`Ag^SWlTB5|!Q60TB_CYcnt%Ec)(_~YY zeBw0>SLgTI<*E6xrDuHDOw&nQP3au*$J^p9;XS$*wVE<5T2x*aoz~ElkzRFlNc!cK zxx(M9Uk=s$F~$)83$6T#G@uu4h=KL-6hI?iHp1VtE54*l^bqgm>5H!c3?xpWC4M3B zIZ;7Ftg(VyrwE-OoESSn(|6ylk86x^!2Sm5tD8?hJ>B(@0M`MY2PoC<9;0d)t6TjHEvw^W72F;t&{RQm{2LVmP{BKyEa>*vo{R9T94r>WCv$zM;;1xiWT94>qkhbTk#JLY(^dFBlUorpy diff --git a/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashController.class b/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashController.class deleted file mode 100644 index c217cd6549967093491057b3d0d8ad55bec23610..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 799 zcmb7CT~E|N6g{()E!0t9L2wa8@oQP5een%rVu(ByLR_*KU(8Sjc1$}%I#YK2StbS( zAN&FSDC3=3HW(9QY}5OF&zyTZKYo7u4&Vj431)C>7BSihR&m=~Yu>u!#oZX|G43%m zUn;HKD~74gW}hM2Hph}-E>l|W)#Z__4#ZJGkyd7MQS?Qnynh*t+(21|XIUwfPKUC{ zO({RvvqIQGdN_7_!P_?4Ri-FpwMAGxCo0!BPU+MA%H+}#$VMmoD9**nD7CrNGFAGl zcImFEt$cGXwcGOacp37}{@Z?NllI$|~ahT5IEkQ%2K?tx5OEs4UW* zce@#JOM0fRa=D}Y&})C0;kjqZF^h!bJ~m=J;CSerM|jNf1Rah|Bn(ggV=uJyP<=2o zhvL&-_zgU-tBPi)eVr1Wr3qo{{WL`VIwyO(iZV>+g|XBVX*qJgw}$2Ryrk9{D_yV| zR{q%kxFp;OJ1|3-ZmBk`tlgz5}mLpw@4>0QMG4r MlQhFJ$p%(_0pRq%WB>pF diff --git a/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashLoader.class b/classes/production/voting-booth-gui/main/welcome_splash/WelcomeSplashLoader.class deleted file mode 100644 index b3007c8201513721491535b2db8fa64b5551f9b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1358 zcma)6TT|0e5dKan6xv|1YDH88Z$P=k3tqts)*{XXVJw2a*a`7a!lVh4rUL&;XQa&N zjKi}(%JDl%puh`0^qk$z?zi7wPXGM<`5V9_-loxmLJFhm9!p`o6BB9ZxRXW#ce{|p zJ$2ky>SPKJ)cr7pM`?89u{xfl@Km68rDPNr=1Z0GqA^pRtIU3!H!6!WOLGD_W5fJv z>W=AF^>X0bZgonayXd*~z;uIU(`iTn&1(3*bc1qWR;iv3W7f8H`cx&ucrq%zwq0`! z&-@~NrabUbMqMS0zR<5@+IH>WxxmHY1E-@vBg+EGqW6V~vWD%-ca7Sr^q0(4hnAe- zS*EjW`nJ+zV=`E`>jEQ2&9q&8OFEWUla>0WW7gO8l}Igz+93yR)3Ok)?UQt04YK9tmF)ff+GG}w5?;4(gEg$;N776slmBoFm z)Gc31cS6CY@Iu2&%&3g7G~{tn!+BiLP{eCCDke}r(g6)6^=b6f?5(;r%;JrPIb7m6 zT06S1x*@F~&Z66%{&wMTb^>j~YI{1XGAMHR+zB(X_s3p+O9|sW1oJM#P5|?Q2qxL!U0Qw7i5QSezd@3~2mTPaK zV-KlabQVT;(e*uyyUa7kJRnYz7z*VoQLfOECmvC#_w!cLHD(nUpq%7A$lrC`h_lvt zxADuZ!Vh#dk={qfh(v84-ScCkO`I8{p{t4P*f%;RppxfF7KF(VD39B;4N)2i2@FJl cF@X$e-NY>>%_B?CAtDSg_JGPT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - -
- -
- - - - - - - - - - - diff --git a/settings.gradle b/settings.gradle index 542a831..8401a04 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,3 +6,4 @@ include 'restful-api-common' include 'mixer' include 'bulletin-board-client' include 'distributed-key-generation' +include 'voting-booth-gui' diff --git a/voting-booth-gui/build.gradle b/voting-booth-gui/build.gradle new file mode 100644 index 0000000..0a74494 --- /dev/null +++ b/voting-booth-gui/build.gradle @@ -0,0 +1,223 @@ + +plugins { + id "us.kirchmeier.capsule" version "1.0.2" + id 'com.google.protobuf' version '0.8.0' +} + +apply plugin: 'java' +apply plugin: 'eclipse' +apply plugin: 'idea' + +apply plugin: 'maven-publish' + +// Uncomment the lines below to define an application +// (this will also allow you to build a "fatCapsule" which includes +// the entire application, including all dependencies in a single jar) +apply plugin: 'application' +mainClassName='meerkat.voting.gui.Main' + +// Is this a snapshot version? +ext { isSnapshot = false } + +ext { + groupId = 'org.factcenter.meerkat' + nexusRepository = "https://cs.idc.ac.il/nexus/content/groups/${isSnapshot ? 'unstable' : 'public'}/" + + // Credentials for IDC nexus repositories (needed only for using unstable repositories and publishing) + // Should be set in ${HOME}/.gradle/gradle.properties + nexusUser = project.hasProperty('nexusUser') ? project.property('nexusUser') : "" + nexusPassword = project.hasProperty('nexusPassword') ? project.property('nexusPassword') : "" +} + +description = "GUI for voting booth" + +// Your project version +version = "0.1" + +version += "${isSnapshot ? '-SNAPSHOT' : ''}" + + + +dependencies { + // Meerkat common + compile project(':meerkat-common') + compile project(':voting-booth') + + + // Logging + compile 'org.slf4j:slf4j-api:1.7.7' + runtime 'ch.qos.logback:logback-classic:1.1.2' + runtime 'ch.qos.logback:logback-core:1.1.2' + + // Google protobufs + compile 'com.google.protobuf:protobuf-java:3.+' + + testCompile 'junit:junit:4.+' + + runtime 'org.codehaus.groovy:groovy:2.4.+' +} + + +/*==== You probably don't have to edit below this line =======*/ + +// Setup test configuration that can appear as a dependency in +// other subprojects +configurations { + testOutput.extendsFrom (testCompile) +} + +task testJar(type: Jar, dependsOn: testClasses) { + classifier = 'tests' + from sourceSets.test.output +} + +artifacts { + testOutput testJar +} + +// The run task added by the application plugin +// is also of type JavaExec. +tasks.withType(JavaExec) { + // Assign all Java system properties from + // the command line to the JavaExec task. + systemProperties System.properties +} + + +protobuf { + // Configure the protoc executable + protoc { + // Download from repositories + artifact = 'com.google.protobuf:protoc:3.+' + } +} + + +idea { + module { + project.sourceSets.each { sourceSet -> + + def srcDir = "${protobuf.generatedFilesBaseDir}/$sourceSet.name/java" + + println "Adding $srcDir" + // add protobuf generated sources to generated source dir. + if ("test".equals(sourceSet.name)) { + testSourceDirs += file(srcDir) + } else { + sourceDirs += file(srcDir) + } + generatedSourceDirs += file(srcDir) + + } + + // Don't exclude build directory + excludeDirs -= file(buildDir) + } +} + + +/*=================================== + * "Fat" Build targets + *===================================*/ + + +if (project.hasProperty('mainClassName') && (mainClassName != null)) { + + task mavenCapsule(type: MavenCapsule) { + description = "Generate a capsule jar that automatically downloads and caches dependencies when run." + applicationClass mainClassName + destinationDir = buildDir + } + + task fatCapsule(type: FatCapsule) { + description = "Generate a single capsule jar containing everything. Use -Pfatmain=... to override main class" + + destinationDir = buildDir + + def fatMain = hasProperty('fatmain') ? fatmain : mainClassName + + applicationClass fatMain + + def testJar = hasProperty('test') + + if (hasProperty('fatmain')) { + appendix = "fat-${fatMain}" + } else { + appendix = "fat" + } + + if (testJar) { + from sourceSets.test.output + } + } +} + + +/*=================================== + * Repositories + *===================================*/ + +repositories { + + // Prefer the local nexus repository (it may have 3rd party artifacts not found in mavenCentral) + maven { + url nexusRepository + + if (isSnapshot) { + credentials { username + password + + username nexusUser + password nexusPassword + } + } + } + + // Use local maven repository + mavenLocal() + + // Use 'maven central' for other dependencies. + mavenCentral() +} + +task "info" << { + println "Project: ${project.name}" +println "Description: ${project.description}" + println "--------------------------" + println "GroupId: $groupId" + println "Version: $version (${isSnapshot ? 'snapshot' : 'release'})" + println "" +} +info.description 'Print some information about project parameters' + + +/*=================================== + * Publishing + *===================================*/ + +publishing { + publications { + mavenJava(MavenPublication) { + groupId project.groupId + pom.withXml { + asNode().appendNode('description', project.description) + } + from project.components.java + + } + } + repositories { + maven { + url "https://cs.idc.ac.il/nexus/content/repositories/${project.isSnapshot ? 'snapshots' : 'releases'}" + credentials { username + password + + username nexusUser + password nexusPassword + } + } + } +} + + + diff --git a/voting-booth-gui/gradlew b/voting-booth-gui/gradlew new file mode 120000 index 0000000..502f5a2 --- /dev/null +++ b/voting-booth-gui/gradlew @@ -0,0 +1 @@ +../gradlew \ No newline at end of file diff --git a/voting-booth-gui/src/main/ballot_summary/ballot_summary.fxml b/voting-booth-gui/src/main/ballot_summary/ballot_summary.fxml deleted file mode 100644 index e9d84d6..0000000 --- a/voting-booth-gui/src/main/ballot_summary/ballot_summary.fxml +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- -
- - -
- -
- - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-
- - -
-
- - - - - - - -
-
- - -
-
- - -
-
- - -
-
- - - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - - - - - - - -
- - - - - - - - - - - - - - - diff --git a/voting-booth-gui/src/main/cast_or_audit/cast_or_audit.fxml b/voting-booth-gui/src/main/cast_or_audit/cast_or_audit.fxml deleted file mode 100644 index 5d4a586..0000000 --- a/voting-booth-gui/src/main/cast_or_audit/cast_or_audit.fxml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/voting-booth-gui/src/main/ChainBuilder.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/ChainBuilder.java similarity index 89% rename from voting-booth-gui/src/main/ChainBuilder.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/ChainBuilder.java index d1834aa..30932c9 100644 --- a/voting-booth-gui/src/main/ChainBuilder.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/ChainBuilder.java @@ -1,13 +1,13 @@ -package main; +package meerkat.voting.gui; import javafx.stage.Stage; -import main.ballot_summary.BallotSummaryLoader; -import main.cast_or_audit.CastOrAuditLoader; -import main.select_candidate_by_picture.SelectCandidateByPictureLoader; -import main.select_candidate_name.SelectCandidateNameLoader; -import main.straight_channel_section.StraightChannelSectionLoader; -import main.vote_have_been_cast.VoteHaveBeenCastLoader; -import main.welcome_splash.WelcomeSplashLoader; +import meerkat.voting.gui.ballot_summary.BallotSummaryLoader; +import meerkat.voting.gui.cast_or_audit.CastOrAuditLoader; +import meerkat.voting.gui.select_candidate_by_picture.SelectCandidateByPictureLoader; +import meerkat.voting.gui.select_candidate_name.SelectCandidateNameLoader; +import meerkat.voting.gui.straight_channel_section.StraightChannelSectionLoader; +import meerkat.voting.gui.vote_have_been_cast.VoteHaveBeenCastLoader; +import meerkat.voting.gui.welcome_splash.WelcomeSplashLoader; import java.io.IOException; import java.util.HashMap; diff --git a/voting-booth-gui/src/main/Main.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/Main.java similarity index 95% rename from voting-booth-gui/src/main/Main.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/Main.java index 41a4c6e..3035b47 100644 --- a/voting-booth-gui/src/main/Main.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/Main.java @@ -1,4 +1,4 @@ -package main; +package meerkat.voting.gui; import javafx.application.Application; import javafx.stage.Stage; diff --git a/voting-booth-gui/src/main/TwoWayNode.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/TwoWayNode.java similarity index 97% rename from voting-booth-gui/src/main/TwoWayNode.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/TwoWayNode.java index cbf12cc..897f213 100644 --- a/voting-booth-gui/src/main/TwoWayNode.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/TwoWayNode.java @@ -1,4 +1,4 @@ -package main; +package meerkat.voting.gui; import javafx.scene.Parent; import javafx.scene.Scene; diff --git a/voting-booth-gui/src/main/VotingBoothGUIManager.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothGUIManager.java similarity index 99% rename from voting-booth-gui/src/main/VotingBoothGUIManager.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothGUIManager.java index 0f69099..7ae33a3 100644 --- a/voting-booth-gui/src/main/VotingBoothGUIManager.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothGUIManager.java @@ -1,4 +1,4 @@ -package main; +package meerkat.voting.gui; import com.google.common.util.concurrent.FutureCallback; import javafx.application.Application; diff --git a/voting-booth-gui/src/main/ballot_summary/BallotSummaryController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryController.java similarity index 88% rename from voting-booth-gui/src/main/ballot_summary/BallotSummaryController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryController.java index daf9977..9c46379 100644 --- a/voting-booth-gui/src/main/ballot_summary/BallotSummaryController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryController.java @@ -1,8 +1,8 @@ -package main.ballot_summary; +package meerkat.voting.gui.ballot_summary; import javafx.fxml.FXML; import javafx.scene.input.MouseEvent; -import main.TwoWayNode; +import meerkat.voting.gui.TwoWayNode; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/ballot_summary/BallotSummaryLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryLoader.java similarity index 83% rename from voting-booth-gui/src/main/ballot_summary/BallotSummaryLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryLoader.java index 55eba17..928b015 100644 --- a/voting-booth-gui/src/main/ballot_summary/BallotSummaryLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryLoader.java @@ -1,10 +1,9 @@ -package main.ballot_summary; +package meerkat.voting.gui.ballot_summary; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.stage.Stage; -import main.TwoWayNode; -import main.select_candidate_by_picture.SelectCandidateByPictureController; +import meerkat.voting.gui.TwoWayNode; import java.io.IOException; @@ -13,7 +12,7 @@ import java.io.IOException; * BallotSummaryLoader gives the option to whatch summary of voter actions */ public class BallotSummaryLoader { - private static final String BALLOT_SUMMARY_FXML_PATH = "ballot_summary.fxml"; + private static final String BALLOT_SUMMARY_FXML_PATH = "/view/ballot_summary.fxml"; private Stage currentStage; private FXMLLoader fxmlLoader; diff --git a/voting-booth-gui/src/main/cast_or_audit/CastOrAuditController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditController.java similarity index 84% rename from voting-booth-gui/src/main/cast_or_audit/CastOrAuditController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditController.java index e7aecae..8a8c9d9 100644 --- a/voting-booth-gui/src/main/cast_or_audit/CastOrAuditController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditController.java @@ -1,8 +1,8 @@ -package main.cast_or_audit; +package meerkat.voting.gui.cast_or_audit; import javafx.fxml.FXML; import javafx.scene.input.MouseEvent; -import main.TwoWayNode; +import meerkat.voting.gui.TwoWayNode; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/cast_or_audit/CastOrAuditLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditLoader.java similarity index 85% rename from voting-booth-gui/src/main/cast_or_audit/CastOrAuditLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditLoader.java index b93c0e0..fdab41f 100644 --- a/voting-booth-gui/src/main/cast_or_audit/CastOrAuditLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditLoader.java @@ -1,10 +1,9 @@ -package main.cast_or_audit; +package meerkat.voting.gui.cast_or_audit; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.stage.Stage; -import main.TwoWayNode; -import main.ballot_summary.BallotSummaryController; +import meerkat.voting.gui.TwoWayNode; import java.io.IOException; @@ -13,7 +12,7 @@ import java.io.IOException; * CastOrAuditLoader creates starlight channel section object and sets its controller */ public class CastOrAuditLoader { - private static final String CAST_OR_AUDIT_FXML_PATH = "cast_or_audit.fxml"; + private static final String CAST_OR_AUDIT_FXML_PATH = "/view/cast_or_audit.fxml"; private Stage currentStage; private FXMLLoader fxmlLoader; diff --git a/voting-booth-gui/src/main/select_candidate_by_picture/SelectCandidateByPictureController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureController.java similarity index 87% rename from voting-booth-gui/src/main/select_candidate_by_picture/SelectCandidateByPictureController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureController.java index bed0e8a..9581f5a 100644 --- a/voting-booth-gui/src/main/select_candidate_by_picture/SelectCandidateByPictureController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureController.java @@ -1,8 +1,8 @@ -package main.select_candidate_by_picture; +package meerkat.voting.gui.select_candidate_by_picture; import javafx.fxml.FXML; import javafx.scene.input.MouseEvent; -import main.TwoWayNode; +import meerkat.voting.gui.TwoWayNode; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/select_candidate_by_picture/SelectCandidateByPictureLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureLoader.java similarity index 87% rename from voting-booth-gui/src/main/select_candidate_by_picture/SelectCandidateByPictureLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureLoader.java index 500cc70..43892e5 100644 --- a/voting-booth-gui/src/main/select_candidate_by_picture/SelectCandidateByPictureLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureLoader.java @@ -1,10 +1,9 @@ -package main.select_candidate_by_picture; +package meerkat.voting.gui.select_candidate_by_picture; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.stage.Stage; -import main.TwoWayNode; -import main.select_candidate_name.SelectCandidateNameController; +import meerkat.voting.gui.TwoWayNode; import java.io.IOException; @@ -14,7 +13,7 @@ import java.io.IOException; */ public class SelectCandidateByPictureLoader { - private static final String SELECT_CANDIDATE_BY_PICTURE_FXML_PATH = "select_candidate_by_picture.fxml"; + private static final String SELECT_CANDIDATE_BY_PICTURE_FXML_PATH = "/view/select_candidate_by_picture.fxml"; private Stage currentStage; private FXMLLoader fxmlLoader; diff --git a/voting-booth-gui/src/main/select_candidate_name/SelectCandidateNameController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameController.java similarity index 88% rename from voting-booth-gui/src/main/select_candidate_name/SelectCandidateNameController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameController.java index 69e91da..e352c33 100644 --- a/voting-booth-gui/src/main/select_candidate_name/SelectCandidateNameController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameController.java @@ -1,9 +1,9 @@ -package main.select_candidate_name; +package meerkat.voting.gui.select_candidate_name; import javafx.fxml.FXML; import javafx.scene.Scene; import javafx.scene.input.MouseEvent; -import main.TwoWayNode; +import meerkat.voting.gui.TwoWayNode; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/select_candidate_name/SelectCandidateNameLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameLoader.java similarity index 90% rename from voting-booth-gui/src/main/select_candidate_name/SelectCandidateNameLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameLoader.java index 47a0948..b1b30f8 100644 --- a/voting-booth-gui/src/main/select_candidate_name/SelectCandidateNameLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameLoader.java @@ -1,9 +1,10 @@ -package main.select_candidate_name; +package meerkat.voting.gui.select_candidate_name; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.stage.Stage; -import main.TwoWayNode; +import meerkat.voting.gui.TwoWayNode; + import java.io.IOException; /** @@ -11,7 +12,7 @@ import java.io.IOException; * SelectCandidateNameLoader creates the option to choose by name */ public class SelectCandidateNameLoader { - private static final String SELECT_CANDIDATE_NAME_FXML_PATH = "select_candidate_name.fxml"; + private static final String SELECT_CANDIDATE_NAME_FXML_PATH = "/view/select_candidate_name.fxml"; private Stage currentStage; private FXMLLoader fxmlLoader; diff --git a/voting-booth-gui/src/main/straight_channel_section/StraightChannelSectionController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionController.java similarity index 86% rename from voting-booth-gui/src/main/straight_channel_section/StraightChannelSectionController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionController.java index 93ec0e4..bcd77f2 100644 --- a/voting-booth-gui/src/main/straight_channel_section/StraightChannelSectionController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionController.java @@ -1,11 +1,11 @@ -package main.straight_channel_section; +package meerkat.voting.gui.straight_channel_section; import javafx.fxml.FXML; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.input.MouseEvent; import javafx.stage.Stage; -import main.TwoWayNode; +import meerkat.voting.gui.TwoWayNode; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/straight_channel_section/StraightChannelSectionLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionLoader.java similarity index 90% rename from voting-booth-gui/src/main/straight_channel_section/StraightChannelSectionLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionLoader.java index 5580344..c8c73d7 100644 --- a/voting-booth-gui/src/main/straight_channel_section/StraightChannelSectionLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionLoader.java @@ -1,9 +1,9 @@ -package main.straight_channel_section; +package meerkat.voting.gui.straight_channel_section; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.stage.Stage; -import main.TwoWayNode; +import meerkat.voting.gui.TwoWayNode; import java.io.IOException; @@ -12,7 +12,7 @@ import java.io.IOException; * StraightChannelSectionLoader creates starlight channel section object and sets its controller */ public class StraightChannelSectionLoader { - private static final String STRAIGHT_CHANNEL_LOADER_FXML_PATH = "straight_channel_section.fxml"; + private static final String STRAIGHT_CHANNEL_LOADER_FXML_PATH = "/view/straight_channel_section.fxml"; private Stage currentStage; private FXMLLoader fxmlLoader; diff --git a/voting-booth-gui/src/main/vote_have_been_cast/VoteHaveBeenCastController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastController.java similarity index 70% rename from voting-booth-gui/src/main/vote_have_been_cast/VoteHaveBeenCastController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastController.java index 42ef459..5680048 100644 --- a/voting-booth-gui/src/main/vote_have_been_cast/VoteHaveBeenCastController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastController.java @@ -1,6 +1,6 @@ -package main.vote_have_been_cast; +package meerkat.voting.gui.vote_have_been_cast; -import main.TwoWayNode; +import meerkat.voting.gui.TwoWayNode; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/vote_have_been_cast/VoteHaveBeenCastLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastLoader.java similarity index 89% rename from voting-booth-gui/src/main/vote_have_been_cast/VoteHaveBeenCastLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastLoader.java index 956541d..fa00f57 100644 --- a/voting-booth-gui/src/main/vote_have_been_cast/VoteHaveBeenCastLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastLoader.java @@ -1,10 +1,9 @@ -package main.vote_have_been_cast; +package meerkat.voting.gui.vote_have_been_cast; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.stage.Stage; -import main.TwoWayNode; -import main.cast_or_audit.CastOrAuditController; +import meerkat.voting.gui.TwoWayNode; import java.io.IOException; @@ -13,7 +12,7 @@ import java.io.IOException; * VoteHaveBeenCastLoader laods the screen that in charge of handling the voting end */ public class VoteHaveBeenCastLoader { - private static final String VOTE_HAVE_BEEN_CAST_FXML_PATH = "vote_have_been_cast.fxml"; + private static final String VOTE_HAVE_BEEN_CAST_FXML_PATH = "/view/vote_have_been_cast.fxml"; private Stage currentStage; private FXMLLoader fxmlLoader; diff --git a/voting-booth-gui/src/main/welcome_splash/WelcomeSplashController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashController.java similarity index 85% rename from voting-booth-gui/src/main/welcome_splash/WelcomeSplashController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashController.java index 9aacbf4..be83e69 100644 --- a/voting-booth-gui/src/main/welcome_splash/WelcomeSplashController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashController.java @@ -1,9 +1,9 @@ -package main.welcome_splash; +package meerkat.voting.gui.welcome_splash; import javafx.fxml.FXML; import javafx.scene.Scene; import javafx.scene.input.MouseEvent; -import main.TwoWayNode; +import meerkat.voting.gui.TwoWayNode; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/welcome_splash/WelcomeSplashLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashLoader.java similarity index 86% rename from voting-booth-gui/src/main/welcome_splash/WelcomeSplashLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashLoader.java index 6131968..ed70d90 100644 --- a/voting-booth-gui/src/main/welcome_splash/WelcomeSplashLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashLoader.java @@ -1,11 +1,11 @@ -package main.welcome_splash; +package meerkat.voting.gui.welcome_splash; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.stage.Stage; -import main.TwoWayNode; +import meerkat.voting.gui.TwoWayNode; import java.io.IOException; @@ -14,7 +14,7 @@ import java.io.IOException; * WelcomeSplashLoader creates welcome spalash object and sets its controller */ public class WelcomeSplashLoader { - private static final String WELCOME_SPLASH_FXML_PATH = "welcome_splash_screen.fxml"; + private static final String WELCOME_SPLASH_FXML_PATH = "/view/welcome_splash_screen.fxml"; private Stage currentStage; private FXMLLoader fxmlLoader; diff --git a/voting-booth/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java b/voting-booth-gui/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java similarity index 99% rename from voting-booth/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java rename to voting-booth-gui/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java index 07e0364..6fba00d 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java @@ -1,6 +1,6 @@ package meerkat.voting.ui; -import main.VotingBoothGUIManager; +import meerkat.voting.gui.VotingBoothGUIManager; import meerkat.protobuf.Voting; import meerkat.voting.controller.callbacks.*; import meerkat.voting.ui.uicommands.*; diff --git a/voting-booth-gui/src/main/pics/barcode.png b/voting-booth-gui/src/main/pics/barcode.png deleted file mode 100644 index 10af4e28d60d0e83a9ecbd4519589fbed6c4d93c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1183 zcmeAS@N?(olHy`uVBq!ia0vp^XGHYjhthJHh`~Lm= z^E)A0Q~j1Vch0<+wRPI`>4isDig2}V-n`jfk;l|)ZOr=XhL?PI#(cBkcQ#&d{k5mE z%(-3_p&8jzqAE*EMGwz8na%EO{NU9quH!{vT#4%fv!1rLvhoy{m6x|Kl)R8(QlOLm zX`aB0>?MIeKYtbmD*gFW@_5m-g{MC89X)c!!q)ca!#g$JPfzPl+IKfk{ISupyLqSW zWi3|7{`6;cI8E#OtH|emWVt`Rx1c=FZ`-lE5k;Xc{1apgZ9TuZ7}h;|vQIFKZ-dc> zPa0vzqI#w>ui;r^(=~OYSn|^Y_K}rO)LGT~PKQ4I82DLHM|x?PoaL8?4;96Pib5lE z^74`_Rjj$zNG=VV=D%Y1?%fwHEI%H3|LytOqW$;RhppbE_5RJ{$H|#VKb-|uPR)I? z_S2OJ%LAv@oH;P;d8@EK`u|rxW=MKSU4B0;Yto zUrTwoMY~;r!mBpz$=N72*}mz(rogP!e|0=-jvkX2{#Vt*G_4ovxivcGku#?Pk!zop zxm0h~)>}Ddg|bzZl@n(R@7=%uvE#n_l9HC)Zr870uV{LI+HFVl+EdqdNPDmAdcn9! zd7XOaJdI=L=iD*>lsvV#6)m+Vr1F9jk49);+bwOe?yXU0KkeQ#%W7_4P204`4;Ne$ zP!hX)Bw(?A$h>o>PI0NF9ZoQqu+L)7Y@SfDPjQDY@MM_HwwShAG9)f0=7>SMxw*N- zEXL{6r-Q}r-Me?pAYHg#@8$9n@s@p0-|QE7Cbcwd-`>4P4a~n*$qE}M=jZdc7b~oP zbRV3lbfVT?1A<>$w5FaqA^v0Y<42E@l9QR)|L&SQcW&PH?ntqSN~z6jd^R6~W>%Q< hp*i^e`S1VPUmCu8Ib)s6MPQ-A;OXk;vd$@?2>>g*ME?K) diff --git a/voting-booth-gui/src/main/pics/blacktriangle.png b/voting-booth-gui/src/main/pics/blacktriangle.png deleted file mode 100644 index e90203f6e6c0f9e7a9f884102159675509f6839f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmV-(0gV2MP)c`Uchx=jt?z#K=Rgl#>={RaDJ`Q6d5iTh)@cJS zF-TdWk5ep#nxd`3e)xaIA!bwEbjn7+D)1w=L;XY>s(>Yi8TcA&8MqPfE2FV3iFoI0&#p@V73o3jBbrTy0ZemA{u*Wwcvmg|BsEn7-3S{$A8NS2d%9dH!d~ zH^Pzn%cgX(6I3?Zln8pm5#|!;+qGyU7zl-5$64Rrzb7%3A>r1+KJJ<<^JVLB20``^)K8BsW zU}xbAh_#JPK*10Y5u&jQh=^Zty(#XTcy{;hDr)5)hB;@>%%7P#Glg~(C^OxR^HXSr ze=VLv&=V=Rfd@=s9ebF^H++t_MooMfZ!0*;eFj1=g;R+kY-jg=G8^&DMAQnshEeR} z77Lj4*w;EdU^hFzEt)m9>B#0H^lXOH3rQnxfhBcz3SuhIuw~MF@j~)*lemsX3W!L^Bp(2 zG4*Uw`(ST*-e7-?`2U}h266{KBE!Gfz;FFmuf#!i@4~0Z?nUVA;Rj5p*6t_9@e%iW z_ppIOT%t%Nr&O=;2X|pRk8{5rEy5?~sm=PG;vZLCV->x3Qr!Rm002ovPDHLkV1l_y Bv-AJ} diff --git a/voting-booth-gui/src/main/pics/exit.png b/voting-booth-gui/src/main/pics/exit.png deleted file mode 100644 index ca9675a667219f6429df2e1f05ccd31b4b5ef934..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmV-`0e}99P)H$FFBCv)d zuwa8&6a`Wi9Vg?#lX#@a@#N>lp7{=>QOP)=ETXO&5>+LlAzhHG2JV1Y;8>p38BkF9 z3*Zen)9|?LBVeblh2*CW>`G}rFlDMFu@=F%fz}ReE91H3J7}P<#l3-^NPgzPR(iWS zN}x9mELUq6+5!#mDD$6ESPr@o;IBX$xxZGhFb0IaNdPYb{SxSd+} diff --git a/voting-booth-gui/src/main/pics/paperFold.png b/voting-booth-gui/src/main/pics/paperFold.png deleted file mode 100644 index d222114a5071f79fda6d6ff6635549b891cca547..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3056 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 diff --git a/voting-booth-gui/src/main/pics/printer.png b/voting-booth-gui/src/main/pics/printer.png deleted file mode 100644 index 6dd516c641b219c9e13944ca130139624ab5267e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20222 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 JPDHLkV1l|rcl7`O diff --git a/voting-booth-gui/src/main/pics/profile.png b/voting-booth-gui/src/main/pics/profile.png deleted file mode 100644 index 7ac604793bca8e45dd8c676740907792570598cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3115 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 FV1o3~AbJ1* diff --git a/voting-booth-gui/src/main/pics/settings.png b/voting-booth-gui/src/main/pics/settings.png deleted file mode 100644 index e6e5a267c52814e3acf3ede4618bf384b0a50f23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 996 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 diff --git a/voting-booth-gui/src/main/pics/women.png b/voting-booth-gui/src/main/pics/women.png deleted file mode 100644 index 55fa39e0b4c51390a223f84c7ad0053f8c86ccd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 930 zcmV;T16}-yP)h$KZ6#=ozsx_54-XJ=<-=XOEiI8HbOQN&YD0}&4d z!NBAKVKEUw3^X%QL=7|$5fec$GE*=!F&({wvc({Icy0iY!xgqs^4 zyOJYaIh*ajad2?(3V>sm2QkZfuVz{AO-U(0I}Y`|UY8`f@R8)5b7h|APwwyUzfUrf ztVoKa0Qj=3u7nW2N|NN7q@+Cu05~ie2?4@2B17Yd~uQHaa#rw zU>T#0s;as_gz(dFxb{evWiL7Bb|m-)j9Az8y=HM0V0pYGw*X1N%+5;6dcE$;olfVA zEbF~J9*^$n^?I*4$G-stGutrJq{--X;G&Mh5W=^ePUkbTxMF4<=iF|;pS?aBjqV!^ zR-X$Yd?#6d*>@Qz32@H+MWR}Ckz|w<%^SKG|a|8W;_G|-U z*@{&pjD)payyc8+{s*AJpue@bxq(F!P!#1=0M(Ip2uNTf6&Q)wf+!sgr$wM@J}<5w zNdzFg_df$jBqeRCMxq8#H$kc9i@H5G32elV#Cv}YXvP;vx-?C<0Tz;-l{AzP+JL7m zk|@3RKV(_&y>7Sr7D;e1vD+tRW|qbn?}#y8h|z8{voWAdf+tavJRse!_wIM^{dMpC zb?00y$pa!sqoE5Su&IqwlJizuOH=%$Nm?u?sk3O#e+eYN`tDrCN&o-=07*qoM6N<$ Eg0D%hKL7v# diff --git a/voting-booth-gui/src/main/printing_commitment_barcode/printing_commitment_barcode.fxml b/voting-booth-gui/src/main/printing_commitment_barcode/printing_commitment_barcode.fxml deleted file mode 100644 index 1139084..0000000 --- a/voting-booth-gui/src/main/printing_commitment_barcode/printing_commitment_barcode.fxml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
- -
- - - - - - - -
- - - - - -
- - -
- - - - - -
- - - - - - - - - - - - - diff --git a/classes/production/voting-booth-gui/main/pics/barcode.png b/voting-booth-gui/src/main/resources/images/barcode.png similarity index 100% rename from classes/production/voting-booth-gui/main/pics/barcode.png rename to voting-booth-gui/src/main/resources/images/barcode.png diff --git a/classes/production/voting-booth-gui/main/pics/blacktriangle.png b/voting-booth-gui/src/main/resources/images/blacktriangle.png similarity index 100% rename from classes/production/voting-booth-gui/main/pics/blacktriangle.png rename to voting-booth-gui/src/main/resources/images/blacktriangle.png diff --git a/classes/production/voting-booth-gui/main/pics/bullets.png b/voting-booth-gui/src/main/resources/images/bullets.png similarity index 100% rename from classes/production/voting-booth-gui/main/pics/bullets.png rename to voting-booth-gui/src/main/resources/images/bullets.png diff --git a/classes/production/voting-booth-gui/main/pics/exit.png b/voting-booth-gui/src/main/resources/images/exit.png similarity index 100% rename from classes/production/voting-booth-gui/main/pics/exit.png rename to voting-booth-gui/src/main/resources/images/exit.png diff --git a/classes/production/voting-booth-gui/main/pics/paperFold.png b/voting-booth-gui/src/main/resources/images/paperFold.png similarity index 100% rename from classes/production/voting-booth-gui/main/pics/paperFold.png rename to voting-booth-gui/src/main/resources/images/paperFold.png diff --git a/classes/production/voting-booth-gui/main/pics/printer.png b/voting-booth-gui/src/main/resources/images/printer.png similarity index 100% rename from classes/production/voting-booth-gui/main/pics/printer.png rename to voting-booth-gui/src/main/resources/images/printer.png diff --git a/classes/production/voting-booth-gui/main/pics/profile.png b/voting-booth-gui/src/main/resources/images/profile.png similarity index 100% rename from classes/production/voting-booth-gui/main/pics/profile.png rename to voting-booth-gui/src/main/resources/images/profile.png diff --git a/classes/production/voting-booth-gui/main/pics/settings.png b/voting-booth-gui/src/main/resources/images/settings.png similarity index 100% rename from classes/production/voting-booth-gui/main/pics/settings.png rename to voting-booth-gui/src/main/resources/images/settings.png diff --git a/classes/production/voting-booth-gui/main/pics/stickPaper.png b/voting-booth-gui/src/main/resources/images/stickPaper.png similarity index 100% rename from classes/production/voting-booth-gui/main/pics/stickPaper.png rename to voting-booth-gui/src/main/resources/images/stickPaper.png diff --git a/classes/production/voting-booth-gui/main/pics/walkingMan.png b/voting-booth-gui/src/main/resources/images/walkingMan.png similarity index 100% rename from classes/production/voting-booth-gui/main/pics/walkingMan.png rename to voting-booth-gui/src/main/resources/images/walkingMan.png diff --git a/classes/production/voting-booth-gui/main/pics/women.png b/voting-booth-gui/src/main/resources/images/women.png similarity index 100% rename from classes/production/voting-booth-gui/main/pics/women.png rename to voting-booth-gui/src/main/resources/images/women.png diff --git a/classes/production/voting-booth-gui/main/ballot_summary/ballot_summary.fxml b/voting-booth-gui/src/main/resources/view/ballot_summary.fxml similarity index 99% rename from classes/production/voting-booth-gui/main/ballot_summary/ballot_summary.fxml rename to voting-booth-gui/src/main/resources/view/ballot_summary.fxml index e9d84d6..eadc6fa 100644 --- a/classes/production/voting-booth-gui/main/ballot_summary/ballot_summary.fxml +++ b/voting-booth-gui/src/main/resources/view/ballot_summary.fxml @@ -7,7 +7,7 @@ - + diff --git a/classes/production/voting-booth-gui/main/cast_or_audit/cast_or_audit.fxml b/voting-booth-gui/src/main/resources/view/cast_or_audit.fxml similarity index 99% rename from classes/production/voting-booth-gui/main/cast_or_audit/cast_or_audit.fxml rename to voting-booth-gui/src/main/resources/view/cast_or_audit.fxml index 5d4a586..8d8270f 100644 --- a/classes/production/voting-booth-gui/main/cast_or_audit/cast_or_audit.fxml +++ b/voting-booth-gui/src/main/resources/view/cast_or_audit.fxml @@ -7,7 +7,7 @@ - + diff --git a/classes/production/voting-booth-gui/main/printing_commitment_barcode/printing_commitment_barcode.fxml b/voting-booth-gui/src/main/resources/view/printing_commitment_barcode.fxml similarity index 96% rename from classes/production/voting-booth-gui/main/printing_commitment_barcode/printing_commitment_barcode.fxml rename to voting-booth-gui/src/main/resources/view/printing_commitment_barcode.fxml index 1139084..2c3adde 100644 --- a/classes/production/voting-booth-gui/main/printing_commitment_barcode/printing_commitment_barcode.fxml +++ b/voting-booth-gui/src/main/resources/view/printing_commitment_barcode.fxml @@ -119,7 +119,7 @@
- +
@@ -128,7 +128,7 @@
- +
diff --git a/voting-booth-gui/src/main/select_candidate_by_picture/select_candidate_by_picture.fxml b/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml similarity index 97% rename from voting-booth-gui/src/main/select_candidate_by_picture/select_candidate_by_picture.fxml rename to voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml index 887fd6e..ef16d71 100644 --- a/voting-booth-gui/src/main/select_candidate_by_picture/select_candidate_by_picture.fxml +++ b/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml @@ -7,7 +7,7 @@ - + @@ -150,7 +150,7 @@
- +
@@ -159,7 +159,7 @@
- +
@@ -168,7 +168,7 @@
- +
diff --git a/voting-booth-gui/src/main/select_candidate_name/select_candidate_name.fxml b/voting-booth-gui/src/main/resources/view/select_candidate_name.fxml similarity index 99% rename from voting-booth-gui/src/main/select_candidate_name/select_candidate_name.fxml rename to voting-booth-gui/src/main/resources/view/select_candidate_name.fxml index 288e463..616b281 100644 --- a/voting-booth-gui/src/main/select_candidate_name/select_candidate_name.fxml +++ b/voting-booth-gui/src/main/resources/view/select_candidate_name.fxml @@ -6,7 +6,7 @@ - + diff --git a/classes/production/voting-booth-gui/main/straight_channel_section/straight_channel_section.fxml b/voting-booth-gui/src/main/resources/view/straight_channel_section.fxml similarity index 99% rename from classes/production/voting-booth-gui/main/straight_channel_section/straight_channel_section.fxml rename to voting-booth-gui/src/main/resources/view/straight_channel_section.fxml index c53fac5..8959884 100644 --- a/classes/production/voting-booth-gui/main/straight_channel_section/straight_channel_section.fxml +++ b/voting-booth-gui/src/main/resources/view/straight_channel_section.fxml @@ -6,7 +6,7 @@ - + diff --git a/classes/production/voting-booth-gui/main/thank_for_auditing/thank_for_auditing.fxml b/voting-booth-gui/src/main/resources/view/thank_for_auditing.fxml similarity index 100% rename from classes/production/voting-booth-gui/main/thank_for_auditing/thank_for_auditing.fxml rename to voting-booth-gui/src/main/resources/view/thank_for_auditing.fxml diff --git a/classes/production/voting-booth-gui/main/vote_have_been_cast/vote_have_been_cast.fxml b/voting-booth-gui/src/main/resources/view/vote_have_been_cast.fxml similarity index 97% rename from classes/production/voting-booth-gui/main/vote_have_been_cast/vote_have_been_cast.fxml rename to voting-booth-gui/src/main/resources/view/vote_have_been_cast.fxml index 11d45da..9ee4093 100644 --- a/classes/production/voting-booth-gui/main/vote_have_been_cast/vote_have_been_cast.fxml +++ b/voting-booth-gui/src/main/resources/view/vote_have_been_cast.fxml @@ -8,7 +8,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@
- +
@@ -226,7 +226,7 @@
- +
diff --git a/voting-booth-gui/src/main/welcome_splash/welcome_splash_screen.fxml b/voting-booth-gui/src/main/resources/view/welcome_splash_screen.fxml similarity index 98% rename from voting-booth-gui/src/main/welcome_splash/welcome_splash_screen.fxml rename to voting-booth-gui/src/main/resources/view/welcome_splash_screen.fxml index 0c3d611..24de823 100644 --- a/voting-booth-gui/src/main/welcome_splash/welcome_splash_screen.fxml +++ b/voting-booth-gui/src/main/resources/view/welcome_splash_screen.fxml @@ -5,7 +5,7 @@ - + diff --git a/classes/production/voting-booth-gui/main/write_candidate_name/write_candidate_name.fxml b/voting-booth-gui/src/main/resources/view/write_candidate_name.fxml similarity index 100% rename from classes/production/voting-booth-gui/main/write_candidate_name/write_candidate_name.fxml rename to voting-booth-gui/src/main/resources/view/write_candidate_name.fxml diff --git a/voting-booth-gui/src/main/straight_channel_section/straight_channel_section.fxml b/voting-booth-gui/src/main/straight_channel_section/straight_channel_section.fxml deleted file mode 100644 index c53fac5..0000000 --- a/voting-booth-gui/src/main/straight_channel_section/straight_channel_section.fxml +++ /dev/null @@ -1,322 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - -
- - - - - -
- - -
- - - - - -
- - -
- - - - - -
- - - - - - - - - - - - - - - -
- -
- - - -
- -
- - -
- -
- - - - - - - - - - - - - - - - -
- -
- - -
- -
- - -
- -
- - -
- -
- - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - -
- - - - - -
- - - - - - - - - - - - - - -
- -
- - - - - diff --git a/voting-booth-gui/src/main/thank_for_auditing/thank_for_auditing.fxml b/voting-booth-gui/src/main/thank_for_auditing/thank_for_auditing.fxml deleted file mode 100644 index c0a4df6..0000000 --- a/voting-booth-gui/src/main/thank_for_auditing/thank_for_auditing.fxml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
- -
- - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - diff --git a/voting-booth-gui/src/main/vote_have_been_cast/vote_have_been_cast.fxml b/voting-booth-gui/src/main/vote_have_been_cast/vote_have_been_cast.fxml deleted file mode 100644 index 11d45da..0000000 --- a/voting-booth-gui/src/main/vote_have_been_cast/vote_have_been_cast.fxml +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - -
- - - - - -
- - -
- - - - - -
- - - - - - - - - - - - - - - - - diff --git a/voting-booth-gui/src/main/write_candidate_name/write_candidate_name.fxml b/voting-booth-gui/src/main/write_candidate_name/write_candidate_name.fxml deleted file mode 100644 index 94610fc..0000000 --- a/voting-booth-gui/src/main/write_candidate_name/write_candidate_name.fxml +++ /dev/null @@ -1,565 +0,0 @@ - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - - - - - - - - - -
- -
- - - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - - - - - - - - - - - - - - - - - - - -
- -
- - - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
- -
- - - - - - - - - - - - - - - - - - -