From 53cc8cb2cc689bb966ca2ffb5d37da7ad1d50fc1 Mon Sep 17 00:00:00 2001
From: Sara-Sadiya <Sara-Sadiya@MyPreciousJr>
Date: Sun, 23 Apr 2017 14:34:35 -0400
Subject: [PATCH 1/4] got rid of git's comments

---
 src/model/FinancialStatement.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java
index c3f2d1d..d96f3e5 100644
--- a/src/model/FinancialStatement.java
+++ b/src/model/FinancialStatement.java
@@ -204,10 +204,7 @@ public class FinancialStatement
 	{
 		return _totalIncome;
 	}
-	
-<<<<<<< HEAD
 
-=======
 	//income getters
 	public int getIncome() 
 	{

From 3ecb1a4749ee3a6648ac1f7d2639616993130419 Mon Sep 17 00:00:00 2001
From: Joe Hill <hillj1895@yahoo.com>
Date: Sun, 23 Apr 2017 14:49:34 -0400
Subject: [PATCH 2/4] trying to pull

---
 bin/controller/Cashflow.class      | Bin 2286 -> 2693 bytes
 bin/model/FinancialStatement.class | Bin 4498 -> 6352 bytes
 bin/view/FSWindow.class            | Bin 7552 -> 7572 bytes
 src/controller/Cashflow.java       |  18 ++++++++++++++++++
 src/model/FinancialStatement.java  |   3 ---
 src/view/FSWindow.java             |  13 +++++++------
 6 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index e57c612d6a538afdf0ea50ce975543e4715354f6..17ef4fcbdad8d9166c3bb431e99b4dd093af0411 100644
GIT binary patch
delta 1274
zcmaKs>rWhI6vlt=?kuyN4wurd+DKaxF@;)6FfEBtsA2)RSC-OltCf+NF1su{+u7mL
zdRb9wy|h|g@A}10e8whQB1ZeoM8Eh~_|ZS1cxD#^#>CC$&6#(e=RD^;=VboccQa=E
z_VCA_fs=f@ZhRLi==3Y97gNqsTYvmQDr>t-27Ocq$Dqj&!wMtkIXTO72F?#E_BD^p
zyS9^QJD0JpJ6>1IQ~(_{8N*Q2<Y(Qb-UZ)xvuB-oHzG>%J6dNj!K6-HQJ1zBt+tGn
zO}0(WdIiU_P0ll=h~zVllT&ETLqX1qT+&G>4)5Rxv%ceb3pwAh`<7>%oS$;DCYJ-<
z+MJil`f=ZynVa;i8AlPywFk%33YAnu|7lL3BfGjSxJzAv5Pajv{|gChkMHFD=Pl39
z>j<O1;zMsLdDgKqWo-jHu+C=IBt@q}Pda`)b;Hq_Q#`t(5cj3tWbeY0sf_J-2J^T&
z*?+lHftcjDRy+}I+M6bCvIk!gE8Yzs*gq9zQ9A5wG)S{-a-AE+)o@qT=5>=dc(eFx
zxbd;KWO|h{gSrh0ylwIhtHrHw({pLwHMzyA*yFnuIfK)@Z*m4d=;A|@+uTuvbFK`g
zrnzN%^g*t!C?DUmwH2kFDgGHr$GQp8!y`P)A$mC?aWj2Ir)tzt`>7(>gsa7$s?HQP
z=}X*aV6636i5FT+j2vKmgBRB@I<<pZi3_by$%}Oq=a?cPix8$p*q!Bbh$zF<F+vlg
zoRF<M#kkZv!2of&ofK9=c$Z`^USgV8aImNq{z<7J%9Vm#x5#6ifL@kJNupk^NQogy
zaYP8yB6wNA7O$eo4ICu2C0R9{C(8fhx~#m?xmYCwnZb}GdqLe6c$L5(Y+_4`SBIs;
z<mqtt8to0*bk7g8Z;~z~4sDRRk5|7?V(C~ziPs)bD6t|>C2p2@Z#ASE9{+yp4`F{W
z8XRL4W}^Nhp&j21-TgwW+{qE{(AGE=)3oW1$TlbzDeD%tg=1p%f0Q*9(?t6Bb?Ktw
zdQaKAq&PQAwd`~~b28)%-4gfV$_FAR{^#Yb&kBpOPRrbpT`Wobi>zVb{DiQhY;c!P
z5Lh+$_>`iUR!aw;NfeTlNBLZ$uq0gM3%-=Qajx-|L}6CxD&sUs-BQLy%5yo4_K<oV
ZTdCG9`iTUgj(pS#3fe{CYmpD}&EH|OCma9(

delta 800
zcmZXRO;1x{5QU$&_m*3(<-;ab(N<ZINQnp~f`;;C2uh))3IY}dDYn$|)e03Al}dtf
zqZ@DH%9yxf<pN0xkwjU$a^=p2f54vrPSGfd$<5@vGjq<&J@d@{^RW44_v0tv98cHH
zH#V=rmhl%tgF+=0#o5F{wlg*#UohygzH3L12PrWL5_Zx@v%*LwvID85guxZ7RQDA1
zbIoADs@L7xAVXHSUeyrcx|3p}3U_sADz+G_n~BXO>jtv(skvmpH{{@kOl+<+i7@J9
zj9b=QJ>Uoub27ng>xW)>ETJ%G)A7ViU11rMI7ugWNLdy3s*4e(oy?F@II`*AvL-Fe
zIcX<aST^J2F7pa4lg=ngt9_w=S^)>yjb;0aQs-Y8Q|<sZp&p?PFCCl`TurByGr}gX
zDMAykI;?L-dv0BjjZ%pxF(h{5kV)nAP(?3i3DHPc7Kl(L)k<MHxIh;^d6iSoB|%Dh
zJzN%Dn;6uMDVal{UZ6`3cD4ydH|g!I$rEbPTG#M<^zpV2__uRJqTVg8ZZhl|$#b*D
zlV^N~c%Dgl<(bMeyJ}OO6YuuE3OgMxguVh(h^_^pojKTguuyxjpf%}hG`e+tyvhEj
z$!(Xp-oJz0`u~%y_r(>tLHXk$N*KmPR4g5#Rd5%h;?bD+5|aZ?up+m7&Ll5Mk{A4$
z>3zrgh3#OAdn}3*C2Vk?2jWi|O*|B26UEak3DQJwkw-k1Ttp82M3Ba62Z8-YU8H^c
ijdr<b;avJIE`y*_wR>^~djT56<x}975zEqLBlipEA*J~M

diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
index 3594fa4b0e6a3e39064b32923f7f6efc1bc21f76..959a1912e1cd9fdf4e1cff94aefa0a48e90b227a 100644
GIT binary patch
literal 6352
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
VITHLvB>0*zxHA&`rY`h*{|j=&<);7u

literal 4498
zcmb7`J#ZUE6vy8g$NI1=+lupnNkE1`BrrCFKp-{-Tak%C{=jk^5+KLww3aqG-D&Pt
zj@44r(9luRrG^<YlMEFz&`?lNP*G4&P*6}%WO#d8olfy$vW?#D*Kgnc_rK5n;la1}
z0N^~Z7z`P3vgy{SJ-^Bv;#iE>6;3#9QisQ2*no+fWRJ|-#Hr73RBuv?8!&3NJa?D+
zK64!dGUe|2&9HC5fRt$wzp+Aaoka~WN(RJC=2&hMTQSqe0k0!STSYN()pl<ikTB_f
zi#k5_4Hz*w*%u#EW&;<kxgM{RI^854ks0o4`c}hr?XpXpuyY)D^#*z}rsdHZ;|1c?
z!f9#K<qhf;!_6kl7WE1ZX4hn&IDpe`23;P-L&i+v`;=ooaZG-XIrSh%pS#vA1IDBT
z716}gkD4AOcF`9?8gQ%}NZ97go?rGn(kU~a<E%u5)g8jy9?qFl%~_P#joS{bZH2^z
zr9fbtkt(wpXF{d10hL7heR*&=(Gv#0QKV3kOSFnwrp>17@P^%~$ZJWPEj%vUqa}G`
zDU-XL*u7@D+l&e*35D=7V`hW+SA{{0>v)}u%wc>9#mF7BOMb_I;R2d41}|cMeZv(!
z&-LOkZ@~H$$D_V$@6lQoP1IsG;po0B8nJ5A=EZC>QRz5nnJg7+vN*)uTj-_PEP9)A
zn#CLU@i*v9CSev{PC*{d1sU~stZ)zSc0pt`US<wmZ#S#d+a|b)aJp*|dxv<ayiH~2
zFmEtaby^<l;48w*8fmv`ffXLh<#*z6(SVu%JrBOTI^~;#_kip1C5_=gV6`1$w=u7A
zY<E3UlszLBaaP*+z=m_BJjx%(y9ibofC%gut+qS(VA1v*XHEAm<zc4@9pX4uu04_~
zl|)y<r#6;}!25Ahs|D`_eS~=k1BA~$jZbEvL!^W2k76aj7vj@_L2;~p5y6+A%OCVg
zcbDy`8xy#$=S=b4bFtt>%gZRX`<9JkYr9)wj^pQLRgsy(fy%)$Gl|_;PzDN(m|6(m
zRak1o9c~O3n+$esK3r~ubm+By!4U^pmL(^N-<4j`5qV4L#iDYw3J4=a57HH@e**NW
z5JBdSt>7eK*4=6#QeGRZ2cj#Gyf2?Pg`6cWaW^R7$%@<dEV|0XYdLZ7Da?t71~Y&z
z#J@kMVF-@E2!0Jg4B|md$e5IIRK}EyV=|^?9G7uI#z`47G9Hz2O2%U{9+&Y1oDBAT
z9Hud=CxY)&n9pfB{-lgg$(WUKM#iUQd`8AIGCnKgb26TV9J0^i9(i~ke_z1Xc~oHt
zWAZM{UdzmV125eV_J0L`M{o|nPdEo46?`Y*Rd_8JzW}dC2x4BB@P>kLLqPyofW=29
zI0}LRZ)y<sm4qb?!lz2YTkv+|6n!OCI(()iEW=8KaJZ76D+vX-6d@d*!xu_I5mqAv
z@h<-RHosI7-qG;GS4zTV4Z<BIp`>w}Un>dk!g~=N4p;K7l2Fzle5WL=!FnWz!~O8R
zlCYtn!;ebBrUv0>CE<My!Y@j~mImQhC8450_)SUJ)*$?@BwW!T{GlZ5Xb}EX60T|x
z{!$V?&>;M+BwW)V{G%jX*C0Gl5<Yx%f-$5de565$D+wQK5K>CQ4GqGil3;2OPALhW
vXb`eW0?{CxQ4*>egq)IKX%J?WgqjB7oRUB_2p5!uT@Avbl28x+qig&Nyl3~P

diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class
index a99b9ee9acd71012a523a6c3c5cd9e721aeb7fc5..99b261e6ffe2db6b87b44fc63761501571c6af77 100644
GIT binary patch
delta 1923
zcmZvdc}!GS6vn^vmV2KtA|k^$0!l%xCKzj*v<XnGg8N=vI@WE35l~<Z;9BZvY~0$W
z>JzONwNi1RS{K{}t3|D-btf&_YPCsiHEB$&NtZO~dGi>hrt{C-`F-E{?z!jAn^~B;
zCUx&1(apdb0wmTFqNaOid*}8nnUi0X+jH<}@6-Zc7|QXn0}iY=XNaD|J|T!fMcMvB
zpMi}8eYAJ3uOtlV*zCZk=u0qieWgKYppxJm$j*de{^HVHZ>}$4q<3DSuc*}WZ*`!`
zyf5NYw-efBW#{?*1qnm_-lCSCoeor6nbDkSTP#O&h=E;ZZ|O??!ht=OsV$o_yv6@<
z?Bnc=VqZ>vX#z_*EwgJJIAE@lu`eGYM2slS^A#ubn>*82RAL|JhyzEh)JRSZsv*(9
zar3rpuhltl!u(6d4n66>Da#qb&f&8PGxG8aa*BOL2I_ej&#KN4WR`a}4>mZiuN^pN
zRfSncv$28mrq_rbe33_-RqD^45j0+M;Id_GZ5b^()>|-(hkupe$n?*7Ixhp)30j7~
zq|`touZDXIeKlu{*NDn%{%O@9oO~IG0rv@nUxb0~eCO3Qw<1?6WA!?y9yMxJmPd;+
zv$8z$d0;#bBE@qgCFVHFJ?<E{^Dx$>xZGOQ26K12v_J)CCLhA4BUsA8dUMqln|@}~
zP}Vk^?yza7iO+4i+oqvT_S$s6O`o=N(8h<Gu}p5>@R-eOxs@;Tf?|q0*s$B(-fFl5
zH~f{kCOS26+IF6`6G9C)Fpc_%PY~+$f^GZ8&Wa0W#kpgxtawp}`8>`ttL6$HI_g?h
zN=I3Tg&vh9Ytk(xb~V!*yd1z6z!lal=q>OwDmciBu*@Oq5mrG;r(hSI+#R_Kv)ozR
ziZ3L|ooIa;AJc16bH%e;cnZY-?i9L!r?$}SLm;JVaKo<dF4h*m##|=TJnBj$v*vr(
zCJJo93}rtGl+!3wt|Lcj#7yNLij{{bQ66KKs$#YphB<01=Bm9gPaS~y>O{PwmY_^s
zfp^s{SfCzbPc0Uy4OpyR!+YvYEK?s~x%vnzG{XCu3m<6R@S&E5<ytycYD2JEn*vjt
zhBX1L4CUHttkrg4opy?0JvL}pP@y$pqxK6nX^*g3`vY5aLZ#jcTXi?8^iJ5Ozl802
zf9%jFV5eS;YJCawW!SBkV~<{iz4|Wf<FD0z{Ss>QJ2;>}!9gK#NI0=qxNuZ-#&OXD
zfm)G<I+2MJVkl0EF*qeAqF(rMS}ejDVdAW)!a1=Y4dOg5h$dVW4{=@mi5oHkjWQ13
z%5G?qui&QagIjVeevmo1Eob76EW?j-8ScuJxF^@+Cs~P~<xbp36hIaBgN=3pM1x<l
zno=o^pL<<a(d(2B1rf4>dea+FktCN=AL<JY$#MZ@ARIa}<uuCV-v@zF(nI~IKmRop
z$aEUO%s{zx(m;N1g-U7AAXdZp^iOCovvB_5s-_{la!_{>SVTj4*_vJzr8JC<5tJ|b
z&~RpLXtiihBX|`_n?*Q{WVJ0_)4!up%%bRTeGk3Kt9FW^S5g+M(aI>@L!)U7oJynC
zNMmUnVw8K@IeLpcaH*=coyN1;UaeJsqqkXg2h;}jE=^#$gZe-{NfTL))zZ}hn#6LP
zHbk9FlUa?|rl^By3acHpdgVTOS?#1<QEt*yRui-)<tk-U4qnjR$|~})FHv8nB+@kY
zCF$jglXBVDS+7!b%44;QaFI#*)MgyIiq5ozrnCH_=wU97+e~C8#V6~J`E0+NqvMnR
E1)8Sz=l}o!

delta 1877
zcmZvcYfw~W7{~w5Iq!Mj1FX7oUjZRZQwPT`Gtq!qf}|KKifN>&D{O*tF<24J+?;M&
zY2pDiMM(1kmVqL81C<ohOie|d)H1sH$!xmL)Hu_7_UsBD+AsU;@Be=;@AK|CmC3Iq
zH>LA<fl5N~0%w`Cd}Qg8{G$0ICroqBD{uwEK(!4vY%pHtBS(Bd;ORv<#f2^%n+e)9
zXSu615TmihhFYW$^!YBg7wY)XILD*eHXA-N?(i7eVFZZ*Y?lr7#xM~Ty_;Z9b(X|s
z6g!LJGM!5cT}5uQ&?h$RG3JU$Pa`2DwZxU1?~aqc+}@tOHtaK-h011@#dP?J=-5x_
zJK3G*Dv3)gU*sw(wI*z};eeTBmq}jLFX}i%=$|R=sd@PYxxS<TdGygZVnf?{J&GN*
z;g}Jthj}{W5qlC(5JZ-<Os>njgiaeynJofk3m?{Tn$Rz^#Fdj@ytp)OqRZ_pDAn<W
z++&uzIA@_Z?@JrbnR$K8Jd;j$7A%$<zCf^zEnaeeKRO~W5?E?+sawZo8BKDU7jcDv
z=1x74$Y{P7aE6B|2tzpJ7J#6G&@l`U)y+5T>y#AM4mDd1uE@&D7QJG<S8V4!Ka#?a
zz{qxlJHig2Dk;Ljf;So+A)`E-va(r1D{2nnZCOdvtg3Yu-D*+pquVXI)1tyh8!Y;<
zMRgzj)S^umwfjpnTe!uCMS{<M(Bg;XDD8P(G0EW_*x`sY2Ob~?K5o>9CVM`!oF}ac
z{((Q2H28ga0)L}3mhG%nE81Ht+7V^eis9{8CRexI%sDR)9sE^R(m>IU*RoY9nOp5G
zNtcgalHs`EE;FOcTvjjKL%A$umN3nJn$69Gq*(71v5tXq3Zo&cEkIt#AV<9Ut0?@D
z*}jaPTeuJS|90|Uz<ry4_kNHx#M^L)W3bucUiby-GR{TBQ&;n^5w+y0!9t}T1xgDF
zm1D?NI<QDNj}qk?N|jq!tlUMJ@)wq<0_AE9ma30onVODQ)HztLmf=-(4OXZ-QKr^o
zrP_km)uVVrJ%v^3RjgKT;vMx4-eoG@W1(2XhGI1vj&&>%>sba2HWif~mWL{~0@bV%
z8`vHR8?lMCp@wy03+qBHyNNpXBet?T*v9_Ec1^<$EeJccXzbD+MZGp24cct%)=DII
zV~@5Hjamhow2j!SHDI517|q&Q?AN-{qWy+ePH5sP4skn<a0fhXd??!a!#K*Hz;QkX
z9XuT;_)MJSh3MoSoZ=NY&1-Rnx8f}C#6^A$m-$cV;{V`^&~Z(K;%gC$>tY0Mh!lJy
zGV!gLg<B#I-w8Lm#d3Tv-oy`LEq)eNxQ$?dYOIGCAs&Q6end4T(<u3jYodalq|s2&
zSFEC^=xL}JBuZ%vrGOzpETB{bLBm)vmBz|<0ml@PMrrg61Pa7(8Yh{KDnT?}eg|M1
z|AW${8i*F&O%o&wlJBZ&dR9g@8pb_^lp(`D^f;eO6Q!{)<?|6VNwR*lo->*(BRkb;
ze^aJZ`_m=uBu$YlnEur^(^MISD7v<mvZNZSOwrP48a;<FrGs6e=`;i3%6WF0o~LX?
zD0kT|dO@m@YQ6dk&6KLcqqeBsG)u|@)T`=odQr+zY`9uLv!xu(64g00N2)O_L!Cf#
zr8<x`D!0ig)mYZ1T&H<bjbok4MarREJfLYx1-YazUUMt)^pf-q(pD;AG++82)G8E>
r@}xSLt7K3<^_zhq+)i)N0x3Vl9ma;}I#P_pm<0J}(eb;H7nATGoZ{*D

diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index fde4514..631612b 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -41,6 +41,7 @@ public class Cashflow
 	{
 		while(!isWinner())
 		{
+			
 			// TODO Play method
 			// Get player whose turn it is
 			// Display their financial statement
@@ -51,6 +52,7 @@ public class Cashflow
 			// Call tile's getLandedOn method
 			// Update current/all players' financials
 			// Increment player array (Also needs to wrap like tiles array)
+
 		}
 	}
 	
@@ -76,6 +78,22 @@ public class Cashflow
 		g.movePlayer(p1, 5);
 		System.out.println(p1.getLocation());
 		
+
+		FSWindow  FSWindow = new FSWindow();  
+		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);
+		
 	}
 	
 	
diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java
index c3f2d1d..d96f3e5 100644
--- a/src/model/FinancialStatement.java
+++ b/src/model/FinancialStatement.java
@@ -204,10 +204,7 @@ public class FinancialStatement
 	{
 		return _totalIncome;
 	}
-	
-<<<<<<< HEAD
 
-=======
 	//income getters
 	public int getIncome() 
 	{
diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java
index c40270d..054490d 100644
--- a/src/view/FSWindow.java
+++ b/src/view/FSWindow.java
@@ -22,7 +22,7 @@ public class FSWindow {
 //		FSWindow.prepareGUI();
 //		FSWindow.showButtonDemo();
 //	}
-	private void prepareGUI(Player p)
+	public void prepareGUI(Player p)
 	{
 		FinancialStatement currentFS = p.getFinancialStatement();
 		
@@ -103,10 +103,10 @@ public class FSWindow {
 				{"Interest/dividends", "0"},
 				
 				//another table for real estate 
-				{"Real Estate/Business",/**business of user*/},
-				{"Real Estate/Business",/**business of user*/},
-				{"Real Estate/Business",/**business of user*/},
-				{"Real Estate/Business",/**business of user*/},
+				{"Real Estate/Business",""/**business of user*/},
+				{"Real Estate/Business",""/**business of user*/},
+				{"Real Estate/Business",""/**business of user*/},
+				{"Real Estate/Business",""/**business of user*/},
 			};
 		
 		JTable incomeTable = new JTable(income, incomeColumns);
@@ -238,7 +238,8 @@ public class FSWindow {
 	    panel.add(filler);
 	    return panel;
 	}
-	private void showButtonDemo(){
+	
+	public void showButtonDemo(){
 	mainFrame.setVisible(true);  
 	}
 }

From 918fd8b4308afca4ea2ccab4e74910346f255654 Mon Sep 17 00:00:00 2001
From: Sara-Sadiya <Sara-Sadiya@MyPreciousJr>
Date: Sun, 23 Apr 2017 14:57:32 -0400
Subject: [PATCH 3/4] The numbers that weren't showing in tab 1 should show
 now.

---
 bin/model/FinancialStatement.class | Bin 4498 -> 6352 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
index 19aae0e83a7eb3284d376822f6c1f66439b1f6fa..959a1912e1cd9fdf4e1cff94aefa0a48e90b227a 100644
GIT binary patch
literal 6352
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
VITHLvB>0*zxHA&`rY`h*{|j=&<);7u

literal 4498
zcmb7`J8&CC7{|Xej$W4KN1O*HAu<Fafw93n0<kgJicAFZ1IuwpfE=sSTH54vr@31>
zR!dDoLq|zR4KrjW3>7obP*6}%QBY7&P*6~0`1Z6qo#Mr08-2I0-+uew|9<ul_rJLZ
z01Lq4Fl4~#rdy--{2FtJV=-b^IN`KO9Ug~a1IBNWeKKzor#`<~y+ti<z=+xM+&$|1
z%ykTyEO*y$g?)<#q)m(Xja7o{ENXyJG9Yd;$8ww4ikm(TcpX97E{ch3wtL5bq)882
z)bXirK+NRiKzvM@4P3PDdc02Rbc=LEX1J^ATMgH>%Pw)k&N1B88|axdEsxe1FA%R5
zPRp1sZ&0roZZ>YVs8?t(yC(a@0i1R-=<+BYGHw#zryTQ1VDkISsRudw+_i2SFe)Xe
zh$fzX#Ple!i@p%jfD`3F!Zv62{EFw1PMP@}XC*7F?hxMgaL$}+&XUA#-f?JcJ0vbH
z2LjuSRGG~<6Do}ks3g+w%Y(zoo-p{0B88G%rd8B3V>VrfH|$PDUQ5Po;c?kMEy){8
zo80BZ?lm*rW>i2)D1?_8HygyiCJbWS!0TLM4&%!xM((g(^1B8M7tn-pcn<UH8?NYi
zu9tv$12(QY9`#*&pVqQyq876WNB3pXh*g_5FJ)87O2<LVWT{w_#UbwAMla1~(c6^M
zEZ(?}zd>gz1+(x%8uG9ZWYpiW!acm(MUl~1nK^W$-K<h?hu|i{>8?fWUE-ngHkF;j
zyunb_X?d)}uLv(I)^61TD?F0R?<U}q0W<%59(;Lq%C`pZ0oUV88pVOYYP-a4V_sv}
z?s}vsdtw%GR@?Z%hI6Gn%Adfy2v!(?2<#ZCwmbM>(e@l?P4_P4L8l2F5;#?^J(eq#
zL|4+MHkOIN`w3F31@8oXgn0-9gwH;MPiCM)q=V~^V<o^B;?sdaajbq3!Iz)QANERj
zmz}5^len(uO!3`wvEW6^%LumnmQ7%5r(0r9;^!4rk(t7Q%Hc9If!$b81`3UsS_t1&
zSZc%_ZVnckN$lEsu-pjg&};pIBM!16OHK;EE4`v4@|MzzMdfG}5Jrd|q$^hc1n5&C
zg3KLT!AZibyVXFXygpbDL{}hrUp{dPIZIsPUQobO6}RnKbd8DEa_aC?m=g~TW&mA?
ze}B%x5FCRTehon!5<yJLn38cs#<Yy1GG=5PlW|<e2^lA4JTBvuj3;C~DdQ<P9qjuk
zOk-A$1>a{dpR;oOaT(9an3Zux#wTQaQpWQ#J|*MRGG2fjvM=Bsd3XkYpT*WosKOA&
z)LodpJ~{U_JpXO5|BLt=!#Myy;T(W;@STE};gw+gBD@+Qh<RPYYYM_m1p#0YmL8hm
zC<q3;u0c3Z5|%XxA1euOz?+d%^p#ZU@QISJ0;>_i(Mo=*BoyFsgm82YpD77NSc?$E
zyZG<h{9H+ROT!OeC<#|I2wy4*C5_wsN=bMd-ihdNw32s~gt7+VJ0)QqHX=D3?T7D`
zgiQ?{epC{+GzdQ{3GZqUeo+#(H3+{d2^9^(Z%V?B2H|%l;i?AV4<%t&gYc)4a7}~o
zmy+<F2H|fd;kpLlA0^?22I0Pv@czRSj3FiA0}Vn#N%&BMkX90IY7i!r1XF`>MoIWc
ugOF7chz8-jl2Fwk<dg(UgD|Tk)HDbSN&?j&TvQVFGzd#dLOuA8uJJFKQTL?)


From be35d7b038e3816faa908943491c19ea1a13aae1 Mon Sep 17 00:00:00 2001
From: Sadiya <Sara-Sadiya@MyPreciousJr>
Date: Sun, 23 Apr 2017 15:09:25 -0400
Subject: [PATCH 4/4] endturn button added to maintab

---
 bin/view/FSWindow.class | Bin 7662 -> 8013 bytes
 src/view/FSWindow.java  |  31 ++++++++++++++++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class
index c7b6db6f97901188da7125ae06276c2dd1a8f1ea..ab8c40f419a2d2e3acae9822a66d3bf05c0c0b59 100644
GIT binary patch
literal 8013
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

literal 7662
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
J)bf{q{tx{`)lUEb

diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java
index 66a5cfd..7eb2b39 100644
--- a/src/view/FSWindow.java
+++ b/src/view/FSWindow.java
@@ -44,6 +44,11 @@ public class FSWindow {
 		JPanel mainTab = new JPanel();
 
 		mainTab.setLayout(new BoxLayout(mainTab, BoxLayout.Y_AXIS));
+		
+//		JLabel name = new JLabel();
+//		JTextField playername = new JTextField(p.getNameI|());
+//		name.add(playername);
+//		mainTab.add(name);
 
 		JLabel salary = new JLabel();
 		JTextField salarynum = new JTextField(currentFS.getSalary());
@@ -56,7 +61,7 @@ public class FSWindow {
 		mainTab.add(plusSymbol);
 		
 		JLabel passiveincome = new JLabel();
-		JTextField pIncome = new JTextField(currentFS.getREcashFlow());
+		JTextField pIncome = new JTextField(Integer.toString(currentFS.getREcashFlow()));
 		passiveincome.add(pIncome);
 		JLabel passiveMes = new JLabel("Cash Flow from Interest/Dividends and Real Estate/Business");
 		passiveincome.setFont(new Font("Verdana",1,35));
@@ -72,7 +77,7 @@ public class FSWindow {
 		mainTab.add(equalSymbol);
 		
 		JLabel totalincome = new JLabel();
-		JTextField tincomenum = new JTextField(currentFS.getTotalIncome());
+		JTextField tincomenum = new JTextField(Integer.toString(currentFS.getTotalIncome()));
 		totalincome.add(tincomenum);
 		totalincome.setFont(new Font("Verdana",1,35));
 		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
@@ -84,10 +89,10 @@ public class FSWindow {
 		mainTab.add(minusSymbol);
 		
 		JLabel totalexpense = new JLabel();
-		JTextField texpensenum = new JTextField(currentFS.getTotalExpenses());
-		totalincome.add(texpensenum);
-		totalincome.setFont(new Font("Verdana",1,35));
-		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
+		JTextField texpensenum = new JTextField(Integer.toString(currentFS.getTotalExpenses()));
+		totalexpense.add(texpensenum);
+		totalexpense.setFont(new Font("Verdana",1,35));
+		totalexpense.setAlignmentX(Component.CENTER_ALIGNMENT);
 		mainTab.add(totalexpense);
 		
 		JLabel equalSymbol2 = new JLabel("=");
@@ -96,12 +101,24 @@ public class FSWindow {
 		mainTab.add(equalSymbol2);
 		
 		JLabel cashflow = new JLabel();
-		JTextField cashflownum = new JTextField(currentFS.getMonthlyCashflow());
+		JTextField cashflownum = new JTextField(Integer.toString(currentFS.getMonthlyCashflow()));
 		cashflow.add(cashflownum);
 		totalincome.setFont(new Font("Verdana",1,35));
 		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
 		mainTab.add(cashflow);
 		
+		//switchplayers button here
+		JButton endTurn = new JButton("End Turn");
+		endTurn.addActionListener(new ActionListener() {
+	         public void actionPerformed(ActionEvent e) {
+	        	 tabbedPane.setVisible(false);
+	        	 //switch to next player update method here   
+	        	 tabbedPane.setVisible(true);
+	         }	
+	      });
+		
+		mainTab.add(endTurn);
+		
 		tabbedPane.addTab("Total CashFlow", mainTab);
 		tabbedPane.setMnemonicAt(0, KeyEvent.VK_1);