From 4299ebfc8a9533283ddf3b7a78fe22f598a5dc96 Mon Sep 17 00:00:00 2001
From: Sara-Sadiya <Sara-Sadiya@MyPreciousJr>
Date: Fri, 21 Apr 2017 11:19:16 -0400
Subject: [PATCH] hi

---
 bin/.gitignore            |   4 ++
 bin/model/CardStack.class | Bin 1828 -> 1828 bytes
 bin/view/FSWindow$1.class | Bin 662 -> 662 bytes
 bin/view/FSWindow$2.class | Bin 632 -> 0 bytes
 bin/view/FSWindow.class   | Bin 2279 -> 6635 bytes
 src/view/FSWindow.java    | 100 +++++++++++++++++++++++++++++---------
 6 files changed, 80 insertions(+), 24 deletions(-)
 create mode 100644 bin/.gitignore
 delete mode 100644 bin/view/FSWindow$2.class

diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 0000000..66905d0
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1,4 @@
+/.DS_Store
+/controller/
+/model/
+/view/
diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class
index 158a0abd37987cf05ebabaeda4e8f892d442f058..d9e4bf91d77e8940b9adac3ddc072f4a7d4d563c 100644
GIT binary patch
delta 19
bcmZ3&w}fxQYPQLb*bFAGU^AaA#4ZE?Ooj%h

delta 19
bcmZ3&w}fxQYPQMu*i0s`U^AX9#4ZE?Olk(B

diff --git a/bin/view/FSWindow$1.class b/bin/view/FSWindow$1.class
index 420404da53fb25e8436740d206773d76735bc618..a359fb74843337038ac2d0d94169b6e8157c4221 100644
GIT binary patch
delta 23
fcmbQnI*oOM2ovMc$)Zd)tj8Hx7*0$MV{!lhPjm)s

delta 23
ecmbQnI*oOM2os~sWKkv?RyhV12KmWhOb!4%PXuuQ

diff --git a/bin/view/FSWindow$2.class b/bin/view/FSWindow$2.class
deleted file mode 100644
index 82524437a06406cfd664ae92218353d2c9f5b9a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 632
zcmaJ;T}vB56g^|oY?H1grW(JELLOoY-4ZH@5yAQa!fFLYpC_9!nXs9G-AVGh`XB`#
z`~m$@#XDn)q=*l*Gxywk&OP_;pTCb!0KQ|}!wf@lB*i#5yS|gEqsO(Thb%*>&qq9n
zx#|W#+kFuk4>^Vnhw`xr#7HO;97RTI70T2IB@%|5>B+SAjWok4(H5l+q>|>4p<Mqj
zw{y#oJ=PtO2g9rn4<8H2py(ry5<{kL3yPss;&M1>i{ys4V?jEhj(B{_6KUfKn6(BN
z=BHcKnq;8Jo!Kjq-0Nf@It<l%_~tyPcD9zY#gi^gv;JNkL*ZHvlSrINYisu3BEMQ~
zYI~}pSf^5TFNEpoj)x5@n%a(!svUGL?dkE4p)p#Wh=FGC&lPR;IOb_8Qf$$7GITzG
zl}dI=^b2R`<WV5>6TS8*wn(Az<pF-<H|Bo1nt6-4jAiemOtDWKi+;ue-3*JUOjLF$
qwkqtEoO8v8j#!xpy$~&R3Cr}&V8szvu|{_m>)0gAwgq!+dOiaJXoX7v

diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class
index d04cbaf81af151171d221cc7521628ff9f8e8c47..82fe9703241713bf31effd4b19a1a682e62646e3 100644
GIT binary patch
literal 6635
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
PVkw{Uj}piE<iGz1S#h0c

literal 2279
zcmaJ?-*XdH6#ljZl7?+b(oz&qX~CKlArugifZ7&Pf}tR7g8@ai$+lfccI)n@q4)zt
z5r2!$_~2jQvoo@pv7_($?u@TK%Aeqa<9BvLo3xCX$?m=9o_o&so$uVczyJI5uK*6?
z+b}v5bS)ZsJ)NDrXqaWI9!5w(?5eh?r7M~_mp(UhRWG>;I;)ytW^JviE9lM3`t`I^
zH|TN3w`LS<p4YXqZs)Zby|T{9w~CYFYHrPGI;kbgbZx70UNaxD$G39NrsIZbxGyT$
zkW3X6gvPA09>oU4RH*2RLP0`B54sdY7i@h&v-R=moPsTR!_+5g)fwHM(q<|Ip2%Az
zty0izL*`9m$elMF@ouXF(}skyg1+QspKnl)N!KRnOsXJhWAfOk;t9#!?aW*C(VFX8
z=1IM3aldBIF>uc#wkwFN7JPuf))zE_Jqp5O^91WIMbVEzVf&1Nt;t8h=_HbrijCML
zzI#<Xi+#j2r@Lb;v2MCjOd*pBc58JvEi0s`+nF%ZboNyb7Alq<#eNJ+&Vy7Snakyb
z^I;qb<GCi_bXyP=&*LcD$<f_Wt#ob9wrXaX^qX*3;`+7g$1xQd94AHkPZ~FfZ6lMU
z3Sm&_o)swLwo%S&OIFQ|;sjn6JjaFMsERS1WM6W7u&!W7ORB(jRx`CZ@{_PxYTPFA
zp5Z7?;k1Ngw<MBl8bIjw;}sQooK+Cl%H`mM<PC@Q)NKU=E&23C);Qhn;io;fR$agK
zBY0H-qL{#><ew5{*2~Irh^_?{VMN6FH5El%V$rB;mg*5#tDs`aghp;j<TvnU7+0vr
zN-1Sk#aqyLPIyj@MLh`7lgwpXy21}4$x159pe~|N;K>@bMI%AMH>aXAz;`T+t84lC
zr#K1&G4ZXc#I`vMo{v?LvlXlUP-Ih1m4Q)t91#VGxrRj^ek!0~s0G59Rb8-5);-e#
zf7K|Pud7(X4H71Yg5encH4sW(N);k_m#46KzWRml`zmhA0TaGc`gJ#g4+yg9v8${*
zCEHkV4a*GU!zTKbJ1{u+5!_*_Nvo;{^C)g(FpN*ub>6`!?&7p8f3D&Sd>QoDNJ*mq
zUw^fGu>8CZd`Z>-;q65jHM^u|4Y~Nb9^N+lMLz{<&SVFVRW!%Z9hQmJ<rg7@4!J-$
z>X3%>-xSt=Q#9X$d(lPzZq71%vy0I=)W8=0<3IYYy?l220lOJ;3j@Tkl{PhSMjy7x
zCOn46n}Kpn*g;#@GL&Ki+w*%H*s(TPf`NJ%q}LDD7i_?jc#0b%#J!7Q6<YZr2*N5;
z<RbVU3@xL-nAqLG)Ax}a`Uy!7H0>|O@m*|J9Dg=&z{4R~h%5Kv_{YNwGFirn;-*jo
zFL@XV=BJ9JIqu;Mw@(xk=QlKP;XbCh=>I)j3?(jmc-_NHo5w6YX5-40SlPooR}8Ye
zb{`d*E6XrBTk!C9Fk1u5rd2RcdvGo`$CZ}x?89-$Lw&VoS;Wb_kG0r_L6-Uuw)4W=
zi3=Fu6|fsF_DFN$D<ttfQuqNw_=O*h->?sV@aF#uY5a`?Ey6u$3fCc@yQXkUe$N2I
z0x<E8hxa&`P2A#O8Mljxj~e(mzjqmTrEZ^k_)G}21KsX7+#&YEVI**r5RVbk2vd)?
h2tC|PzLT~)1T8{;O@bY`hi~{!aCC}q`P~g({{els6R7|I

diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java
index 637a0f6..d4b9212 100644
--- a/src/view/FSWindow.java
+++ b/src/view/FSWindow.java
@@ -26,24 +26,69 @@ public class FSWindow {
 		splitPane.setDividerLocation(150);
 
 		JTabbedPane tabbedPane = new JTabbedPane();
-		ImageIcon icon = createImageIcon("images/middle.gif");
-		
-		String[] columnNames = {"First Name", "Last Name"};
-		Object[][] data = {
-			    {"Kathy", "Smith"},
-			    {"John", "Doe"},
-			    {"Sue", "Black"},
-			    {"Jane", "White"},
-			    {"Joe", "Brown"}
-			};
-		
-		JTable table = new JTable(data, columnNames);
 		
-		tabbedPane.addTab("Total CashFlow", table);
+		JPanel mainTab = new JPanel();
+
+		mainTab.setLayout(new BoxLayout(mainTab, BoxLayout.Y_AXIS));
+
+		JLabel salary = new JLabel();
+		//set salary to salary variable here
+		mainTab.add(salary);
+		
+		JLabel plusSymbol = new JLabel("+");
+		plusSymbol.setFont(new Font("Verdana",1,50));
+		plusSymbol.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(plusSymbol);
+		
+		JLabel passiveincome = new JLabel();
+		//set passiveincome to passiveincome variable here
+		JLabel passiveMes = new JLabel("Cash Flow from Interest/Dividends and Real Estate/Business");
+		passiveincome.setFont(new Font("Verdana",1,35));
+		passiveincome.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(passiveincome);
+		passiveMes.setFont(new Font("Verdana",1,10));
+		passiveMes.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(passiveMes);
+		
+		JLabel equalSymbol = new JLabel("=");
+		equalSymbol.setFont(new Font("Verdana",1,50));
+		equalSymbol.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(equalSymbol);
+		
+		JLabel totalincome = new JLabel();
+		//set totalincome to totalincome variable here
+		totalincome.setFont(new Font("Verdana",1,35));
+		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(totalincome);
+		
+		JLabel minusSymbol = new JLabel("-");
+		minusSymbol.setFont(new Font("Verdana",1,50));
+		minusSymbol.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(minusSymbol);
+		
+		JLabel totalexpense = new JLabel();
+		//set totalexpense to totalexpense variable here
+		totalincome.setFont(new Font("Verdana",1,35));
+		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(totalexpense);
+		
+		JLabel equalSymbol2 = new JLabel("=");
+		equalSymbol2.setFont(new Font("Verdana",1,50));
+		equalSymbol2.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(equalSymbol2);
+		
+		JLabel cashflow = new JLabel();
+		//set cashflow to cashflow variable here
+		totalincome.setFont(new Font("Verdana",1,35));
+		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(cashflow);
+		
+		tabbedPane.addTab("Total CashFlow", mainTab);
 		tabbedPane.setMnemonicAt(0, KeyEvent.VK_1);
 
 		String[] incomeColumns = {"Description", "CashFlow"};
 		Object[][] income = {
+				{"Description", "CashFlow"},
 				{"Salary",""/**salary of user*/},
 				{"Interest/dividends", ""/**call interest of user*/},
 				{"Real Estate/Business",""/**business of user*/},
@@ -60,6 +105,7 @@ public class FSWindow {
 		
 		String[] expenseColumns = {"Description", "CashFlow"};
 		Object[][] expense = {
+				{"Description", "CashFlow"},
 				{"Taxes",""/**user variable*/},
 				{"Home Mortgage Payment", ""/**user variable**/},
 				{"School Loan Payment",""/**user variable**/},
@@ -77,8 +123,10 @@ public class FSWindow {
 		tabbedPane.setMnemonicAt(2, KeyEvent.VK_3);
 
 		
+		
 		String[] assetColumns = {"Description", "CashFlow"};
 		Object[][] asset = {
+				{"Description", "CashFlow"},
 				{"Savings",""/**user variable*/},
 				{"Precious Metals", ""/**user variable**/},
 				{"Stocks",""/**user variable**/}, //total stocks number and total money
@@ -88,47 +136,52 @@ public class FSWindow {
 		
 		String[] assetColumns2 = {"Description", "Down Payment", "Cost"};
 		Object[][] asset2 = {
+				{"Description", "Down Payment", "Cost"},
 				{"Name",""/**user variable*/,""},
 				{"Name", ""/**user variable**/,""},
 				{"Name",""/**user variable**/, ""/**user variable**/,""}, //total stocks number and total money
 			};
 		
 		JTable assetTable2 = new JTable(asset2, assetColumns2 );
-			
-		tabbedPane.addTab("Assets", assetTable2);
 		
+		Container assetTab = new Container();
+		assetTab.setLayout(new BoxLayout(assetTab, BoxLayout.Y_AXIS));	
+		assetTab.add(assetTable);
+		assetTab.add(assetTable2);
+		
+		tabbedPane.addTab("Assets", assetTab);
 		tabbedPane.setMnemonicAt(3, KeyEvent.VK_4);
 		
 		String[] liabiltiesColumns = {"Description", "Liabilities"};
 		Object[][] liabilties = {
+				{"Description", "Liabilities"},
 				{"Home Mortgage",""/**user variable*/},
 				{"School Loans", ""/**user variable**/},
 				{"Car Loans",""/**user variable**/, ""/**user variable**/}, 
 				{"Credit Card Debt", ""/**user variable**/},
 				{"Bank Loans", ""/**user variable**/},
-
-
 			};
 		
 		JTable liabiltiesTable = new JTable(liabilties, liabiltiesColumns );
 		
-		
 		String[] liabiltiesColumns2 = {"Real Estate/Business", "Mortgage/Liability"};
 		Object[][] liabilties2 = {
+				{"Real Estate/Business", "Mortgage/Liability"},
 				{"Name",""/**user variable*/},
 				{"Name", ""/**user variable**/},
 				{"Name",""/**user variable**/, ""/**user variable**/}, 
 				{"Name", ""/**user variable**/},
 				{"Name", ""/**user variable**/},
-
-
 			};
 		
 		JTable liabiltiesTable2 = new JTable(liabilties2, liabiltiesColumns2 );
 		
+		Container liabilitiesTab = new Container();
+		liabilitiesTab.setLayout(new BoxLayout(liabilitiesTab, BoxLayout.Y_AXIS));	
+		liabilitiesTab.add(liabiltiesTable);
+		liabilitiesTab.add(liabiltiesTable2);
 		
-		Component panel5 = (JComponent) makeTextPanel("Panel #5");
-		tabbedPane.addTab("Liabilities", panel5);
+		tabbedPane.addTab("Liabilities", liabilitiesTab);
 		tabbedPane.setMnemonicAt(4, KeyEvent.VK_5);
 		
 		incomeTable.setPreferredSize(new Dimension(410, 250));
@@ -137,7 +190,7 @@ public class FSWindow {
 		assetTable2.setPreferredSize(new Dimension(410, 250));
 		mainFrame = new JFrame("CashFlow");
 		mainFrame.getContentPane().setBackground(new Color(149, 32, 216));
-		mainFrame.setSize(400,250);
+		mainFrame.setSize(1000,750);
 		//need to set this to null and position everything manually
 		mainFrame.setLayout(new FlowLayout());
 
@@ -181,4 +234,3 @@ public class FSWindow {
 	mainFrame.setVisible(true);  
 	}
 }
-