From af04e34a15134039de4f5388c8a9267a6dcc08b9 Mon Sep 17 00:00:00 2001 From: Joe Hill Date: Tue, 25 Apr 2017 18:00:27 -0400 Subject: [PATCH 1/2] Did some GUI --- bin/controller/Cashflow.class | Bin 3387 -> 3949 bytes bin/model/DealTile.class | Bin 1764 -> 2287 bytes bin/view/CharityWindow$1.class | Bin 692 -> 692 bytes bin/view/CharityWindow$2.class | Bin 935 -> 1186 bytes bin/view/CharityWindow$3.class | Bin 713 -> 1186 bytes bin/view/CharityWindow.class | Bin 2505 -> 2854 bytes src/controller/Cashflow.java | 66 ++++++++++------------- src/model/DealTile.java | 19 +++++-- src/view/CharityWindow.java | 92 ++++++++++++++++++++++++++------- src/view/GameboardWindow.java | 2 +- 10 files changed, 119 insertions(+), 60 deletions(-) diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index e2c2ff7829459f595a7538b1c867414f852d222e..7ce900b6392fda4bd783f12fd48082b0bc12d7c8 100644 GIT binary patch literal 3949 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 diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class index 7d9238f751af57726f7b2af5ec591975942d5d68..16e5fb87ecaed9f8ede410c262f64d21f2b5e2d7 100644 GIT binary patch delta 1193 zcmZWoOK%fb6#nk`F=0A3B&3N+qclhm*${9`lR^?+!A^)F4u+%&NgwpuzO{#pXI#%D z#(lYMXpz{?iX}oQ>!ih?qOwN(3Kr~$(kLjny4pJWnR3AhjE1A zgL0EwOWQDtqcX<+$2HrqY*A5h497{@T(KEGoc5$NGnuPthCOSOT4l_o zKB;2drB;fju+pZ%ZJ{8A2^ndIo$sOYoQNlJnnA9*OuFHwxs;e!5Jg7C8JuNkt7?Vi z6t7W=(RgCIVitv-bic=BWEuLl%FYxq&l zZPtw(Z&ZX~yDn2j)pfPIAa0c>b+b<6WR$4ymq2NBz+#BS{TuU!gRV<6N@JN!#_jV8 z>M~ZDgqU+viiK2MLBqKdIOx0xTxV;y)`G100uq8WYq|RvSiFmPcCdxS!a5?IIB*Zi zbp&Sy|Hkl**UvUFLe_~EPPy9+L^iRrg{hf!C~qx4VwfUWb^|nM=)x{cBY+-K7^Q0m zVrZkY2ztr;F}j-QCuc8qV-NihaU8-vjF5E{2WhkpBa0(AM<*We3wJ4VtptnFmkacoCHf+4qNIlOI~JG`!M+09nNG~9-5=`F|JG!qu2 z8J1LZh7}F5NIKx@*n|LOYSodBF+1M0jWK1(?O}oy`WYskGxTE0;Qr>qV zGk2BfAyV13czu-{X1VPeE?1F8Rz`-QFT_g(6%D7ZA%}UdA`a!#SkQ0{1qOMWyG6V0 zG6t#HjXwQH|p~RW0aM zT!2m|h6zkk?WO(|@g&-Z$2v%^9AUOL-oYHLJgw`rN{3j?iWBF=4sIV1F%*wNq<(*j zW~VWT84S^X^_^0oTGxqmQN_K$eHg2_Pva70cz`uZJ_s4>ct}zVk5KC-D$wq~Nufmf vk9hpgR1NOaG?fXw24W%c#7qe+7zsS}-YFL^Erhgy#ZFkP8;Rjr@Scr7o-uqg diff --git a/bin/view/CharityWindow$1.class b/bin/view/CharityWindow$1.class index f38a143228dc335dd84c844977e3d5d669964701..775ba0c4e2c3aadc3fe5b8feb104c22735314352 100644 GIT binary patch delta 33 pcmdnOx`mbF)W2Q(7#J8#Hgae&G0IIgX0l;bU|?ZToLs`>006Le2#Npz delta 33 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 literal 2505 zcmaJ?S$7j<7=ES%l7?w%Qd(qDTb7b8G}0^YeF|1j=vqN{vf8L_E>ZHOqEvJ>ce+?nQuDUuI<|RIvzD>(rLaIRouRj5FAOtZ9c@)NgdR(ol& zx9*JM5RQmnHqW}ma{VC0Tk(R5ERHFNX@x>CHCdy`%<7JU%~g^08D=}VP{RjsVsV}Q zafslQ0z`2fg92hmYP7V#OpH``L`4`8QGQWH4riG@RyfT%5?6I;MbsBMa9upVj90=q z&&tdtRZdl0fX3P3>>4wA;G!{+NmuoU??i&-RTRJqNv#6Scokt^ExM%Gi^W{#P_Uxl_TQXz@2IR3zDnQKBnBj%M3MlBPf{?N&r)-OP z@2i48FBId;Dz4xv36sN!Q8fIkA(S}VJ`%y}3L=$BYZbn4s<!U%eQY&6t{3hLVT*?GkhNO=YhP~{$GDC)bRWB-trN8 zqqr*(46wZo7OT_4|^9n^M|u!jHG55DSJKI?slb#z%z2W!wo znHngg8SBIdk70eqQHB9)D61<&$(67n+gZZK#m-`M6sMC$-&u2DfG6-I4I{+eLbnQ~ z{3Hc#l_7Ewd=ERyXwAj9l(6jq5*+6!M`?aM7eBe8gwqc&%tQb0;Y=ug&cjO{Mi*#|QDZEooNp+2 znBa*)mX{vDq}VLO;%>^rtHEv&EQeCTJnW%(rm{Ax)?<&>ArG_jIZGo(=1t5+GuoJ$ zUM4$*jX2F}U%+O#*utLOhTGVVuaLm^Xvfd!#Bcm?{ed0$i(j9=k*q4*!%E?5Yl65h@FtM|A%*0s{Z2c2cyk~Dte;Z9c>cV+zr z*R(V{J$xx7&92HKv5-}_--SJFo?iCCZfwF{vfD@8{oG~9@B}{+r!b5`Ub{m+`j!A; q1^p%r;3n=9e;f9Y`F+3jz9xqne1mWK-a!3Be9P}v@ZtdazyAQ%##omC diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index 675ca46..bcfaa1b 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -39,7 +39,6 @@ public class Cashflow // Initialize game board _board = new GameBoard(_players); - // Initialize GUI @@ -75,7 +74,7 @@ public class Cashflow public boolean isWinner() { boolean isWinner = false; - for(Player p : players) + for(Player p : _players) { if(p.hasWon()) { @@ -95,7 +94,7 @@ public class Cashflow players.add(p2); GameBoard g = new GameBoard(players); System.out.println(p1.getLocation()); - g.movePlayer(p1, 5); + g.movePlayer(p1, 4); System.out.println(p1.getLocation()); @@ -103,14 +102,7 @@ public class Cashflow FSWindow.prepareGUI(p1); FSWindow.showButtonDemo(); - - // Delay to check how the financial statement updates - try { - Thread.sleep(10000); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + FSWindow.prepareGUI(p2); @@ -145,33 +137,31 @@ public class Cashflow } -// -// public void setUpScreen() -// { -// frame = new JFrame("Cashflow"); -// frame.setLayout(new FlowLayout()); -// window = new GameboardWindow(_board); -// -// sidewindow = new JWindow(); -// sidewindow.setLayout(new GridLayout(5, 5)); -// -// frame.add(window); -// -// -// frame.pack(); -// -// frame.setVisible(true); -// frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); -// } -// public static void main(String[] args) { -// new Cashflow(4); -// -// } -// public Cashflow(int numPlayers) -// { -// //this.setUpScreen(); // just did this to test the screen -// -// } + + public void setUpScreen() + { + frame = new JFrame("Cashflow"); + frame.setLayout(new FlowLayout()); + window = new GameboardWindow(_board); + + sidewindow = new JWindow(); + sidewindow.setLayout(new GridLayout(5, 5)); + + frame.add(window); + + + frame.pack(); + + frame.setVisible(true); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + } + + + public Cashflow(int numPlayers) + { + //this.setUpScreen(); // just did this to test the screen + + } } diff --git a/src/model/DealTile.java b/src/model/DealTile.java index c2edcd0..50617dc 100644 --- a/src/model/DealTile.java +++ b/src/model/DealTile.java @@ -20,13 +20,24 @@ public class DealTile extends Tile public void getLandedOn(Player p) { // TODO - // For now, using a scanner to interact with user until GUI is ready: // Ask user to decide big/small deal: + CharityWindow charityWindow = new CharityWindow(); + charityWindow.showButtonDemo(); + + + while(!charityWindow.hasAnswered) + { + try { + Thread.sleep(200); + } catch(InterruptedException e) { + + } + } + System.out.println(charityWindow.doesDonate); - // Pick card from big/small deal stack: Card c; - if(input.equals("1")) + if(charityWindow.doesDonate) { c = _smallDealStack.pickCard(); } @@ -41,6 +52,8 @@ public class DealTile extends Tile // If property, ask user if they want to do it (and check if they can afford the down payment): // If yes, call ButIncomeProperty method: // Else, do nothing: + System.out.println(charityWindow.hasAnswered); + charityWindow = null; } public void buyIncomeProperty(Player p, DealCard d) diff --git a/src/view/CharityWindow.java b/src/view/CharityWindow.java index 39595e0..cd4d271 100644 --- a/src/view/CharityWindow.java +++ b/src/view/CharityWindow.java @@ -9,13 +9,16 @@ public class CharityWindow { private JLabel headerLabel; private JLabel statusLabel; private JPanel controlPanel; + public boolean doesDonate; + public boolean hasAnswered = false; public CharityWindow(){ prepareGUI(); } public static void main(String[] args){ CharityWindow CharityWindow = new CharityWindow(); - CharityWindow.showButtonDemo(); + boolean b = CharityWindow.showButtonDemo(); + System.out.println(b); } private void prepareGUI(){ mainFrame = new JFrame("Charity"); @@ -46,7 +49,7 @@ public class CharityWindow { mainFrame.setVisible(true); } - private void showButtonDemo(){ + public boolean showButtonDemo(){ headerLabel.setText("Charity!"); statusLabel.setText("Charity description"); @@ -57,29 +60,82 @@ public class CharityWindow { JButton DontDonate = new JButton("Don't Donate"); DontDonate.setHorizontalTextPosition(SwingConstants.LEFT); - Donate.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - //update cashbalance for player - try { - Thread.sleep(1); - } catch (InterruptedException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - System.exit(0); - } + boolean donate = false; + + Donate.addMouseListener(new MouseListener() { + @Override + public void mouseClicked(MouseEvent e) { + // TODO Auto-generated method stub + hasAnswered = true; + doesDonate = true; + mainFrame.dispose(); + } + + @Override + public void mousePressed(MouseEvent e) { + // TODO Auto-generated method stub + + } + + @Override + public void mouseReleased(MouseEvent e) { + // TODO Auto-generated method stub + + } + + @Override + public void mouseEntered(MouseEvent e) { + // TODO Auto-generated method stub + + } + + @Override + public void mouseExited(MouseEvent e) { + // TODO Auto-generated method stub + + } }); - DontDonate.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - //put message that they are greedy. after 10 seconds, close window - System.exit(0); - } + DontDonate.addMouseListener(new MouseListener() { + + @Override + public void mouseClicked(MouseEvent e) { + // TODO Auto-generated method stub + hasAnswered = true; + doesDonate = false; + mainFrame.dispose(); + } + + @Override + public void mousePressed(MouseEvent e) { + // TODO Auto-generated method stub + + } + + @Override + public void mouseReleased(MouseEvent e) { + // TODO Auto-generated method stub + + } + + @Override + public void mouseEntered(MouseEvent e) { + // TODO Auto-generated method stub + + } + + @Override + public void mouseExited(MouseEvent e) { + // TODO Auto-generated method stub + + } }); controlPanel.add(Donate); controlPanel.add(DontDonate); mainFrame.setVisible(true); + + return doesDonate; } } diff --git a/src/view/GameboardWindow.java b/src/view/GameboardWindow.java index efec53c..62a8a00 100644 --- a/src/view/GameboardWindow.java +++ b/src/view/GameboardWindow.java @@ -42,7 +42,7 @@ public class GameboardWindow extends JPanel { setMaximumSize(size); setSize(size); setLayout(null); - + setUpTiles(); Positioners = new ArrayList(); From d34d54a9df5772ffdb2d6e224f4797eb959d3cb0 Mon Sep 17 00:00:00 2001 From: Joe Hill Date: Tue, 25 Apr 2017 18:08:24 -0400 Subject: [PATCH 2/2] Did some GUI stuff --- bin/model/CharityTile.class | Bin 887 -> 1360 bytes bin/model/DealTile.class | Bin 2287 -> 2292 bytes bin/view/CharityWindow$2.class | Bin 1186 -> 1186 bytes bin/view/CharityWindow$3.class | Bin 1186 -> 1186 bytes bin/view/CharityWindow.class | Bin 2854 -> 2829 bytes src/model/CharityTile.java | 20 ++++++++++++++++++++ src/model/DealTile.java | 2 +- src/view/CharityWindow.java | 1 - 8 files changed, 21 insertions(+), 2 deletions(-) diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class index 80cfd9721fc1e82e383149e0fc449453f19e49c1..5f0c2fdf629b9cbe8a8036e0c97d3cf36bf2804f 100644 GIT binary patch delta 837 zcmZXS%}*0S7{;F|-ELS06lfCy2q+4Lf)zpJL*=7@6ampaLck&PSHR+E^uh*VyFua#MOTf$3V=suTQxhaK zf~xk}Kp%oS`Wepen+Ik%W7>P+&2(OvDUJaQGH7l_h#Z4AxKbL3*Asb&V;EN%8q%ga zXS+p_7bymosK+&2*D-R26+3jL$a0KgjI5o4WC*O*tSl$Ik+*CaljN42R^)Mxn~H3t z9N{iFwkd^yNlfdQVrbnjsSM9<uu9p<|Pw>u>#|wiNk%Atyy@@kLVP zq~+MHI zO@8#g!<8dwQ{Ledget$ky+N3w8&yoGp@Kfzcc+5x5RG%bXH_gJ&`=f8mwv22FTSc` z;}~?O=s*`@sDnXn<7lM58CnT`3Ik|CTTRk|PV`XRPyGlkV}ha?dS_7#VuxlLXxkvX wDq-*%L`9DfCkqW*^gV`$=I>)02{PNM*?4~64?USk7}Da;y}LyjTY_FUo1 zdPnqZ|CT{Bt){By4HU4zkh+xqU$O38yZ#T+P{fjfB9@8h|0kkm!#d|!g%yX%Fx~aq z(kUO?u5eqnaDo~es~T8S_7h}(>iNQHxGk?M_3HCbtw+_pX`rkwNZW3!Cq-Y@MZa?- z9CDGtnRXaFX)>084j$yAmBAfi&}d4l6e4p%VP=SYiSoRD5n@rP>mgR|Gbml%JcQU7 z5v+kz%u*|mqL_w3qh)EE$YGq+!mlamNji}|wy+IGY!N%CAVS{?BrwT7VaDm%40|L* Gu>TF|kxRM& diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class index 16e5fb87ecaed9f8ede410c262f64d21f2b5e2d7..641fd5f78e324ece9ba4060f4aff22570ac414cc 100644 GIT binary patch delta 498 zcmXYt+iDY06o$W@naLi*v^HXkEmjm%DyDd&ND4wRm9}6G)?=)Pj?LI=bFj&1jE7cR zPxt#Byf#)wQSbqJ;VbwCir}3^Trp+yueDhJ`q#hMKa;5jDGQSC6j!c5ef z)q>xu1l6!Z-Sb#x$-J`%+&LN^y9muUdpQ1phnlAOWe-~|9+{-`Nxj(EbSBl_JrQSf z?@6aVa3bQg%C=GTF~A^MGpdWLc?!~Tnc^HX#7JXto(mE)^lVob<)3!rY|*DVJf+EU zV2ilsk|?iGl-MH^>%?&+A37RwHTQ+NVk+X6U{O#O)IL%lvquN*i2H3Bj4_09+|+pY z22t{uC(?G<&r??9hJ9#Od4??>&sp1c8kZcC1+F+PZm@2a-PDebRLOg3-nwHuyDJs1 I{`Yum6osF6hUwsBT8o;7lBUr_O&c*JMi<_)$UW!WbMyWQ{SH~*|9<%foab%N`lab6OYihu zwd!~E#mG(8O>Qada<$-kv8?B`-I~n?xBZ`bTy6Q&fyh*zg2^4l*pRf~I$px56>MDY z`YVBxojfI*ZFUr9(QPEE^@c*9nN3;b@odTiWK58SYO9iU+GV%W7(i8<`vWL65IObI zWv|*wl$=V@wb(??I6_?!o=NXGO(*6F5L<54wkySpsZ?rq)#4#7lcv%L`&&lXuz5t= zpD;eF?%oe$QB57~lgxY|9{tFLK9|%|55+hWOp^A`nYm7eD>4a^B+FGa;^*C*#H0l diff --git a/bin/view/CharityWindow$3.class b/bin/view/CharityWindow$3.class index 2476f5bbe3a97e3bc313396f67cc96118af6657a..e4625f38726f63835b1c396772e1843ade6ff9fa 100644 GIT binary patch delta 67 zcmZ3)xrlSaHzvlU$={iRc+(j;7%~_H7%~~87_ugZF*`99OqOSnpS*)vnXwGa`VC~& Q09j6qO+Zq1ay^SO0Dle=3IG5A delta 67 zcmZ3)xrlSaHzvm9$={iRcrzF{7%~|I7_u0o7_ujaF*`99PL^kppS*)vnXw$q`VC~& Q0$EOs%|KFiay^SO0DxH%6951J diff --git a/bin/view/CharityWindow.class b/bin/view/CharityWindow.class index 788f787a48334ff4140ab7d0069f10ba8858fcd3..55725daeb4e030b573a0edabc45271b3f828bce9 100644 GIT binary patch delta 152 zcmZ1`)+@$!>ff$?3=9k=44XG{@vv`}XTQkAd4hq3ff*>6H2Ei|_GC3KhiE+pZXn;3 zfs?_EL5RVML59JGL5;zdL7TyW!JHw9!I`0j!H1!ZA(WwmA(o+wK?z6XP3GX10{}n@9HamM delta 154 zcmeAbTPDVJ>ff$?3=9k=3|lsG@vt+orEKPBzrn#s z#K1E-j!WF%oGSkJo!DB8~_UmA2R>| diff --git a/src/model/CharityTile.java b/src/model/CharityTile.java index a732946..d23b593 100644 --- a/src/model/CharityTile.java +++ b/src/model/CharityTile.java @@ -1,5 +1,7 @@ package model; +import view.CharityWindow; + public class CharityTile extends Tile { @@ -15,6 +17,24 @@ public class CharityTile extends Tile FinancialStatement f = p.getFinancialStatement(); // call view method // TODO + CharityWindow charityWindow = new CharityWindow(); + charityWindow.showButtonDemo(); + + + while(!charityWindow.hasAnswered) + { + try { + Thread.sleep(200); + } catch(InterruptedException e) { + + } + } + System.out.println(charityWindow.doesDonate); + + // Pick card from big/small deal stack: + Card c; + if(charityWindow.doesDonate) + if (p.donateCharity()) { diff --git a/src/model/DealTile.java b/src/model/DealTile.java index 50617dc..3decb40 100644 --- a/src/model/DealTile.java +++ b/src/model/DealTile.java @@ -43,7 +43,7 @@ public class DealTile extends Tile } else { - c = _smallDealStack.pickCard(); + c = _bigDealStack.pickCard(); } // If stock, update price, then ask user if they want to buy and ask everyone if they want to sell: diff --git a/src/view/CharityWindow.java b/src/view/CharityWindow.java index cd4d271..ebba336 100644 --- a/src/view/CharityWindow.java +++ b/src/view/CharityWindow.java @@ -60,7 +60,6 @@ public class CharityWindow { JButton DontDonate = new JButton("Don't Donate"); DontDonate.setHorizontalTextPosition(SwingConstants.LEFT); - boolean donate = false; Donate.addMouseListener(new MouseListener() { @Override