From d34d54a9df5772ffdb2d6e224f4797eb959d3cb0 Mon Sep 17 00:00:00 2001
From: Joe Hill <hillj1895@yahoo.com>
Date: Tue, 25 Apr 2017 18:08:24 -0400
Subject: [PATCH] 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@6amp<k%GoeJE4p1ZquDoIrZqx
zOHcJ5;EW;lEAebR`L7rcp8R;HAyMLNGV|`tGr#AZcjkxht6_Zk_2CnMF+4psW?4x`
z2Sdw&C5qul+RR(>aLck&PSHR+E^uh*VyFua#MOTf$3<LXXmZm|alRm>V=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<<G6*}40=wHGPX)Hq0S$`49BcGe`Bh~IjxskndgXL
zf#KYqkf+lTr(jcNRJ*8BEOFe$GAZ0MidK?%gHgp_!K#jX3~l8R)|TX0Q@|zyZaUJ;
zMD3)L6~3AG71drV`2&uJ3fXGeNjk49BBq<3H>uu9p<|Pw>u>#|wiNk%Atyy@@kLVP
zq~+M<X3u1A^508m@UQ;=6v|5;OEcgDFQ0fuOW)~HsLS3BRpDRzi1zKb=v*JJqI>HI
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~<pkqZx`?8K0n<DWpEqL(c4@5w`hyVZp

delta 379
zcmZ9IzfJ-{5XQgd;K22e7?2nhK}Ee26&3%)3L=RKg`HYZxq*#bJnj-WW2~r*oy}GF
z78G8hg%4om+t?W6tXjF7%w)g$&9^)I&Odbi_Vw}#U>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;<ciOs*CzXHd3(@y+|xe5B2
z*5u5e*qXX*R;<aPS*~lYDZEOp6qJt@%6==Td)(lr`EI38`ilN8lW$go(oEo&&on|m
z3=+%}XiAFSE<Yhu#;=z=ZnI$W_Q6y0-0`@}l0q*8VW!py71qd+>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{`<WC2j-`1r2qf`

delta 518
zcmXYtO>Yum6osF6hUwsBT8o;7lBUr_O&c*JMi<mgBaMZGBHCJuwzh+e&^mwug7}3N
zKlaYgaD_E!H1P+x@lUwcjmyS(k><_)$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;^<ssS#pBW
zgKkCs?ij{C<0hw*CTULWGh%XGls8zDJSvPXBN$Roo#~Uyd}T8i?c+!kCGJU7KJj2K
zaCS1#r_mFlMg-pqM(2k&h?2)Vk+H#Xp7Km?n8xHe9RlL<f|mzQ^HMcg5EQ549=m=s
Y7(FzQDtWK`_rbZt!<CBH|9#&41K6)_Y5)KL

diff --git a/bin/view/CharityWindow$2.class b/bin/view/CharityWindow$2.class
index bc1b15a129d54dcc9af9ca9cadd14b04b77fd4f4..940ee30a547630d3cec03c1acea611271ea79768 100644
GIT binary patch
delta 67
zcmZ3)xrlSaHzr1h$={iRcwHDc7+e_y7~B}77~Cg^F*`B(PL^kppS*)vnK2m5`VC}7
Q0$EOs@jy~`ay^SO08$7L&;S4c

delta 67
zcmZ3)xrlSaHzr2M$={iRcwHGd7~B{H7~C187(6D2F*`B(O_pbopS*)vnK1;+`VC}7
Q0a;Fr2|!YIay^SO08>*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?<l^0b&M&G*C4I
t5W6u<XIR6)2-Ii8uolQ-65wE1$FP3#c`gIa4L}u43>z6XP3GX10{}n@9HamM

delta 154
zcmeAbTPDVJ>ff$?3=9k=3|lsG@vt+orEKPBzrn<LgMkGI85mL~f8f++Vz!$s&E>#s
z#K1E-j!WF%o<Wzvk-?H7nZcEzmBEjpogti|lOdj=n?VYwMGK;lL7G7Z$dh64V3^LZ
xhJlemjlqs#Es(_o)NRhNj)9kfS%8CKJ;R2{+qeukHv-i%F>GSkJo!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