From 40306a90fa6944c978df9bd17298b4fdb2ee522c Mon Sep 17 00:00:00 2001
From: Sara-Sadiya <Sara-Sadiya@MyPreciousJr>
Date: Fri, 21 Apr 2017 11:30:35 -0400
Subject: [PATCH] a;dljfaldksf

---
 bin/view/FSWindow$1.class | Bin 662 -> 662 bytes
 bin/view/FSWindow.class   | Bin 6635 -> 6538 bytes
 src/view/FSWindow.java    |  25 +++++++++++--------------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/bin/view/FSWindow$1.class b/bin/view/FSWindow$1.class
index a359fb74843337038ac2d0d94169b6e8157c4221..6869d3a5316fd7596687914e9a2097442862e32f 100644
GIT binary patch
delta 23
fcmbQnI*oOM2ovLh$)Zd)tcMs_7!FSkV{!lhPU8k$

delta 23
fcmbQnI*oOM2ovMc$)Zd)tj8Hx7*0$MV{!lhPjm)s

diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class
index 82fe9703241713bf31effd4b19a1a682e62646e3..3967feb2043d2dd6b9dfd0772164f651b37735a5 100644
GIT binary patch
delta 1480
zcmY+D32anV6o&uv?lPU}Ydc+GD20O5F0^SYl3<DoQIMDdA_;Y3gp72=!7>A7Xn|M;
z5@a($VQhm7YD7>Z7`DCvCV&Y-z?6M!Wi2hTRI4b93slblCh(GX?|;wtznhbD-su>y
zWWa{eanIOrfRI$<^VSv*A6wz`R|abPl{(ObLncfdCZyz*KSIm$$2qVaM@<~V@$mO?
zWeG)yI4~HeVjnbzZT2kZk0xx0iv`b^IE!=PC+)eq)x<@#g+2D%&?OW0`~0$rE0{#E
zP4@=J`eu9WAY3!yK)ek<6H+I8YCOfB+F<eUsz7bIXI5ZF(18v(9Vo&6SRPNsmLaj_
zcN2dgpWxuD#`&iEUa#`T!Z%IaLJq;n;bAj_UVo)mRgMjMf}3~PM;T$C`Sh4RvCQ*1
zU3$!<elc?fn@0qyeX|4ppr>kRm2Z-Niq{{s(c=&2^g^|-@<C3NgGPc3dS?c?WZ`L)
z7QSV^K`Q)O!g{;K)#wZ8uFa{5X*%RAb!I1{If6YF_7!ZwjwqVk1rZ#yaHKGbP3~m6
zk!*BEu*JfOf+z;NQ>sM-CmYei?t8C=(=z3}g$ou&KjLU-M|(1jcUD^XiAjk&f+rer
zmBUw~=-|^YAq#`<A9uSSPNkEBoXS0qg<oSQep@X3R`EbzeMq<eucd|SG49kBZp1|Y
z80lYV;daGF00z={c@fK5cjvad!adS2hkQmICL8ndmQjx?V-2Pl5%`UL2pBDxYII<l
zaTnDh3DZR{OcvRw6-AgO24c1tjJHKO>cq>KBPJpwf|x7b!94K+#~LtStil4Z6$`~q
zEE31DSX{#r3A`&^SST~GROaD*SsKDJIRwk)2!!QJsF$yxK~BI58Ni3K1|P|V_*kyM
zCvq)T%3b(W9>!<#JhN7OAv^J<?80iLutsIzE0v3{)gY`@qwtNIfOX2xY%0E0b=aU5
zV56$XCbbfq)oL`V^{~_yY*nGX*ruAXU0p*|-N6oR$4=b`-{}(U)kCpQkH&sI5kKf@
zXwr2!s2AaoZopx^4oCGi9MgMnTpz&+eHJJ6C7jZoXx6uJTHnPPqyseW{tt%?bmO|)
z^-cVVzj(H?bSwVGKOt^Qj&8vn#6zG=@5WukL1Ludh%QzNGxTEo%SvOeo<m?|<CF#x
zv5LcWoj?ZfcFI(3Bv?7<ITa<zDxRjOWu#b{RIhxbStZa>RY*4UMxrrBuBT8O*^y+7
zm!Fe^;^8#v<UBGNCyQ)xjuM!rh$3->5}Broa<Pe$n5Kya@g_N$ri)eLRZ3=>A-0O)
zl)|)|%rx34m1%dGXPl%orY>1(9H4Z{Ko1!(-lJ~p%apAlBa6DTv8U`boaAC-mh3V>
zJs9^=Q)ww>GVQJEXdd-snynVlOv>VG`an`I>dmE0<ialEO7Y(X9@`SPh*0*(*tqtO
zVA!Z4VNu`0DCM}Nj8HBQU15=hXDbRfus>YpGK<giG+aOmTDeCT(GP7XKzpovyx+U@
dLHGE2%A@>njq7=JnTvTPyvvniYhoWi{{fMzerf;!

delta 1520
zcmZvc32anl5Xb-XzGIKR((cleLMce;NtQw|n3e>i5-{aZ60jzgRM^yob{E>U5VS4|
z0-~5Sj}nZc0s%zDK%l$T3aA7E;V4jqa%kno7K(s)0y^6Qk;F~jd;f2KlW*pmnQxa2
z?HIagygk{8uW-P`L6j40)!yJl-(0T^hpbvhN>(%Cqxdl!juPT(eBRlfQ4=To{L=!n
z2NXEbf@3C39Jl=TRDHt4Nu08l+6#vj;fJXGM?z9|@$|BqGEYUBzuYr1SmpDV7mmr9
z<N)C(6E@hLD8gA2=WyOK99jC3iOcxe@;I`Fb(nB;^8-=$P7_YVI58M|qbZGyzHXSf
zi5!BH)1Kt3_PtoK<)mYr@pRnODsNfPJEpR%+&gA!z)#5gpFDE9Qk&zcp3PZ#9yk{g
zbahvz1h+Md60B@<M1KG1fpR!o8emc;GWlp6babG~H#gu9mQ_4n;Vbu7di_BgWm$D*
zigO?u2r}rM6SVf2FOjwiVmCV0^O5@l`sS8Pu?aflLVbLO3#}3C3S&?1R%~;L%Pylc
zjQ!C?6PimRI2^{2?o~@kZUo<l(VE+Yq7rwNh~RVs+8A~{VVsff3t?OgWBfxN?d;L+
zqSE+jVO(J{n0Fo0fU6a3zxp7^@b1;ll83Uo#@228w1x4@<a_$+e{}nOEyK7T<#|y<
zUVa$APTmZ_Kmxx;q0YLVa4j_5sKpFp0V<4oR2u8xHzEiadoa^Dfmuces*F3R7I6rQ
zbj%PLm?H*Zt{8?_L=i%w81uxlcwJ1z8zPAL;!P|N%h<LYi^LkdB^t3rY{%Q;DBcn6
zSSo>cWh$1)G}Os#Sh665WpX6y<!CII6R<))hxg<Zye|XzK-OTTT!ath3Vb9t;A6Q1
ztK=c9mTk<=V6E)LdU+S0D1{9w37@Jge5Quub2Sbd)f9Z8{LE%zv#P}wwGdlXJsQ+X
zgw<L!s*U(kZAFs`?Z(%t728xhwyWFNp&j@}_s6%|gPnQ=cIjg5)6ZkS_Tzwl70r4v
z4r>cX^eVJyZoS@#W4al~^(nOKb2y=|;H18R(?|qpQukyb3CUb{hi=C${Kgljk3NRq
z@dtMzGo%mVPsBi=P&eW)*dZ}iufyN06kgV^;WjIcdAb^RSlO^w=i)9aJFaU3|M1sA
zX{wdL%1KYCO+>6>s8TH?gOy43s+0t)SURHmkwjngFrJaCNs&e<&M1}jWFtG`japel
z4#qB#AzH}E*ewQ$-4w&LrzjTd$z+-!mWvlCmT96`BPLJ}rb(hv6jB`1WSM5PQasZX
znQiPN7t>T(V0=ez>WN-5U@V{n_Dhpz3^yf)*s-_lG!!MVV;^~!Zc#GhbTyOaQwr0*
zs+MXfm1zc_sFHf|HvM2w8ujK<_Ta)k%3mWo*tF^Xcyq<LAZUxWfy>`T@3kT7*N4)X
zOX^EQGVX1%n9I%MiTvng6cOq-HhQD;B6w=tAQ7fV@|$R2iIfq_w)Us=@|@*=!gFxr
rJh%1&2H+xcaj7d>Zud41qUBQ#rCW)qPx6S_(P5RQX4+af5dZ!KoXUP#

diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java
index d4b9212..788d617 100644
--- a/src/view/FSWindow.java
+++ b/src/view/FSWindow.java
@@ -102,7 +102,6 @@ public class FSWindow {
 		tabbedPane.addTab("Income", incomeTable);
 		tabbedPane.setMnemonicAt(1, KeyEvent.VK_2);
 
-		
 		String[] expenseColumns = {"Description", "CashFlow"};
 		Object[][] expense = {
 				{"Description", "CashFlow"},
@@ -122,8 +121,6 @@ public class FSWindow {
 		tabbedPane.addTab("Expenses", expenseTable);
 		tabbedPane.setMnemonicAt(2, KeyEvent.VK_3);
 
-		
-		
 		String[] assetColumns = {"Description", "CashFlow"};
 		Object[][] asset = {
 				{"Description", "CashFlow"},
@@ -188,11 +185,9 @@ public class FSWindow {
 		expenseTable.setPreferredSize(new Dimension(410, 250));
 		assetTable.setPreferredSize(new Dimension(410, 250));
 		assetTable2.setPreferredSize(new Dimension(410, 250));
+		
 		mainFrame = new JFrame("CashFlow");
-		mainFrame.getContentPane().setBackground(new Color(149, 32, 216));
-		mainFrame.setSize(1000,750);
-		//need to set this to null and position everything manually
-		mainFrame.setLayout(new FlowLayout());
+		mainFrame.getContentPane().setBackground(new Color(49, 32, 216));
 
 		mainFrame.addWindowListener(new WindowAdapter() {
 			public void windowClosing(WindowEvent windowEvent){
@@ -200,6 +195,8 @@ public class FSWindow {
 			}        
 		});    
 
+		tabbedPane.setPreferredSize(new Dimension(500, 750));
+		
 		headerLabel = new JLabel("", JLabel.CENTER);       
 		headerLabel.setFont(headerLabel.getFont().deriveFont(Font.BOLD, 16f));
 		statusLabel = new JLabel("",JLabel.CENTER);    
@@ -208,20 +205,20 @@ public class FSWindow {
 
 		controlPanel = new JPanel();
 		controlPanel.setLayout(new FlowLayout());
-		controlPanel.setBackground(new Color(149, 32, 216));
+		controlPanel.setBackground(new Color(49, 32, 216));
 
+		mainFrame.setLayout(new FlowLayout());
 		mainFrame.add(headerLabel);
 		mainFrame.add(controlPanel);
 		mainFrame.add(statusLabel);
-		mainFrame.setVisible(true);  
+		mainFrame.setVisible(true);
+		mainFrame.setExtendedState(JFrame.MAXIMIZED_BOTH);
 		mainFrame.add(splitPane);
+		//add game window like so
+	//  splitPane.add(gamewindow);
 		splitPane.add(tabbedPane);
-		
-	}
-	private ImageIcon createImageIcon(String string) {
-		// TODO Auto-generated method stub
-		return null;
 	}
+
 	protected Component makeTextPanel(String text) {
 	    JPanel panel = new JPanel(false);
 	    JLabel filler = new JLabel(text);