From 5b732a0e35e93e80fd61851eef808384cd754e36 Mon Sep 17 00:00:00 2001
From: Sara-Sadiya <Sara-Sadiya@MyPreciousJr>
Date: Fri, 21 Apr 2017 13:08:23 -0400
Subject: [PATCH] getters added, updated mostof FS Statement

---
 bin/model/FinancialStatement.class | Bin 4692 -> 6352 bytes
 bin/view/CharityWindow$2.class     | Bin 1141 -> 946 bytes
 bin/view/CharityWindow$3.class     | Bin 713 -> 713 bytes
 bin/view/CharityWindow.class       | Bin 2612 -> 2505 bytes
 bin/view/FSWindow.class            | Bin 1607 -> 7552 bytes
 src/model/FinancialStatement.java  | 107 ++++++++++++++++++++++++++---
 src/view/CharityWindow.java        |   6 +-
 src/view/FSWindow.java             |  73 +++++++++++---------
 8 files changed, 137 insertions(+), 49 deletions(-)

diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
index 14738b8d04baece62bfdb60049dcdbc7bd83cc01..959a1912e1cd9fdf4e1cff94aefa0a48e90b227a 100644
GIT binary patch
delta 1384
zcmZwF&ubGw6bJA(1=}?BN3v9V=s`iD#eyXuB32JIv{p#98u8-A?Pkm_-R#KjmKqeI
z2gQ>pIr!sm@Ss#YhzMRi2?`!OdGO$&+N#mk+UnbvlD3a`+01<RGjC@m@BO~Fx%8XW
z7q0-|pn|9A`P5)%S;r>>$5ga}Z8$zV;@FWp>YEt_T{s`Pa#;tFjuh;|+1R}&-L-BU
z6dl(XzhLZO!md_y5G%-HoVUYGSwi!nE_unDQj2CVJ{`L{T(53nG@--1>-nX%RKa!(
zPfb@S40WI&*==n&igb({O5vm!8)vEs3!Xjc`CjZLo85u$#_&+%CXCB=84s6ybKC^6
z>sO1mZ->=pbk4-Kzj+&LDv$SYiS8j?G}ED@M?D|w^vtF@Ev5Qqd(({$HCNACJFVPf
zywNtekI!~c_<UDi&K~Xg01t4ym69#+5FX)7!PjI-{}5mDQN-T}ALICwh=&Ou=lHXT
z=Lw(S_=|`a2p2e>6Y+P#XE<IE@eji1Ic|vfC*cbmFNwH8_#($EBK}2ql3}Gp{F`uz
z;|>wK39fk@cZqlr4r7N5V4obpeo8tiv;P@PJ%^XgpVuz0li5%w)9SIMR-HktqM*LV
zYVQyE+TIOo*ZcDioo<HX-6Fn9_!`H1MSPv`4UYRne3S4kjt4}%O!zj(IT8OQe23#h
UB3?=Gfx8?JiFg(Nur~PjA5}v9mjD0&

delta 49
zcmca$ctwTl)W2Q(7#J8#7~XH>`oOVSmrH?>QE;;#_gD7G4Z`Y-mnMG{5@ml2RKdjX
F4gk@-5bgi~

diff --git a/bin/view/CharityWindow$2.class b/bin/view/CharityWindow$2.class
index 2dee356c24fde4658c8057aa0c1d5c0e2e6ef6d8..b3d08afa43958a38ad45b53e6b20ac8229b21366 100644
GIT binary patch
delta 235
zcmey$v5B4Q)W2Q(7#J8#7|b_vZDAA>$Vx0r)Xz!GOV<ysEG|jS<zdiZ(40J<X|6Oo
zgE1q6P+4YbxxRBoVo_#EWq4*@N`5&HgXv^@=I;731||k(pi#mi4B|T&B$qRA`08w9
zkZ0b(pt6yH5h%gNz{#KhR3Zpui!rbQNe7^qBLf$MGXo!kD}xY&8xS*q)c}nFLJ=Sj
z#L{BW2AaUdz`~%zpbNA{4=Bpcz~sr!puhq&P#?%;l3_4lFa$DK7>t0vF$1!=fO<go
G0s#PDsv}bX

delta 431
zcmZXPJ5Rz;7>3_dh^<Xyv|@}7QWA`SXi@Q6Z%Cqn;H1$w9%!RAl_s>@CN>w{n4O(5
zgb)XRfU|$a)%ex8afa{ue$SipCVoru=g<2GfGqMoxz9Rk!?v1w{*KpdzkO|2O}D8a
zfh2>(D;3N0;u(fiqBJTqlBIjz;4R&2+SOaVSmI^NF(fQAES<TosTJLFOuKRGn(0=#
zZ<!i*9IfrvYnsO!bmGNilvkjOSY=R0Sqd^(V-P*dzqDFD!%X7OQFl1`UHCO(7|AOc
z8`u<)Wta>Y|J%0bTMr7hu-*M)FChiF?z8aJd4zxveLot(>=1LWkj~QsL{ohzL&Vk8
z0O`;W>pd_MjbR)b$)~8Erw%x#n1hTwCU8o#0v1q&N}E7OSWF{AIjDB9OB5Ml?7<-0
geVV342n7*ZnA8W<3pm6P<uDeBeL|H?H-R_3U-UX$XaE2J

diff --git a/bin/view/CharityWindow$3.class b/bin/view/CharityWindow$3.class
index 275ba13ce904975e13e8e3f8279e3d691567c848..ee0ab41f162d83a335d79d9d7e195f776a1d016e 100644
GIT binary patch
delta 23
ecmX@fdXja6I}@YlWDh1ARv!iy2H(k@Ob!5100sE~

delta 23
ecmX@fdXja6I}@YtWDh1A)&K?;hQP_4Ob!51bOr?g

diff --git a/bin/view/CharityWindow.class b/bin/view/CharityWindow.class
index b5cac5e674f3ba57d68243dda7e68605a022a77c..20005582253f8ad23e4b023f95fa3a62e72a841b 100644
GIT binary patch
delta 69
zcmdlYa#EP<)W2Q(7#J8#80K!|N@JV6f-Q=XWivDTTqZ$J24@C;1|Nn%hERrJhFFG>
Z$s0M<co>)%W&zbRG0bL|Gg*vF4gj}}5b6K`

delta 175
zcmX>pyhViT)W2Q(7#J8#80K%}N@FwQNK8&nEiP6uU}VtJ@F~koE!TI>NG!@MsSMA|
zOUW;{*7V6rEK97=FD}o_OV{`ENlZ%3v7VgA7Q@K8`83;HCP7~YXNF(~ABIpM3}=XC
zh?rc-sb(+0!7z(qHUlFAAJ8&YAk7G*S+%w>q-_8)m>5KWBpX<ei$N4D0ur4AX3b@o
JH+eOu8~{9aC~W`$

diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class
index 701d99f6eceda0ee81472fb47c864b2c34df3e0d..a99b9ee9acd71012a523a6c3c5cd9e721aeb7fc5 100644
GIT binary patch
literal 7552
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
Y75)W9&R53C1#%&u5q@x~=9B;a4=9qm&;S4c

literal 1607
zcmaJ>+j1L45IrNUEo&p^;#>?)AR7~4rN~hrhCm!b5+`yTl#nVpP8ps?(pZ{gcSkil
zvMh=Z;FUjtD$1(DRq)P#gj*GS0!7bi6JJpAGOOw7KHcYZw|@EO$DaT!;<Fqw4AWau
z^eff+QyH~XKL>~5_%pu6D*=z%mCqZ`MAI<jLoTDL=AmFXRkQEgmAEg-<3VCwVmQ(f
zyd`vvH$?Csr^ITVV#7@@PMr!(6&bC9$2=MnlUONc@`jA0xyg|Ai|Y)|vT6wzSsX8*
zfN6$fH5rLVy|5wl8gB$t;Y>|6d9cp4wD;8Ln2wCC_W{C$?^tdOXZ$Y{Vk6>pqlw*8
zaXp9EC}>ZSds-_!g*k?=pF~>3D%cV&uc^YW47iah^1514*6_OL=GQvH3x(;Z7Fk7?
zYq9cV)qfoDfzU-yMxG%DGw2HMWdl4Jdyz68?{)*(wB>u7N+*6?w|k+8OzinZ*TpQ(
zSpnW)IPH%soWb48$#BB2g(O^18D%GCQ@FtJ?f;XAEsOdfGJM+;mbpg+je0I3Z@$^n
zn#!rx=gS@e3qw>$;?eT~?rmY}Jm7lZ6Y1FNMJ=&OJ!`$9mPjy?+@+BW`E#)*woN)0
z{y2Uk%DitX%cQ-EsFI}|-lpasn9c;k#YMbp#qz1!{uj2XrNfTNNV+KEoIMr_xQq%7
zMJ&vHrR7&Ns64nG$aZ8~U}07*%zF$cli9F^tZ3P)@qy|Y7guoACR}8g@K?#zmhfQ#
z*YFW76M>HW7|y2LZ2ZXfkVm{NG&RV^TrXe=H)!^GtHn^-=e<X}I8F;H(U6388TN)Z
zooXtoJ6gHPO&J72GaQXOs(+_vjEe4xQ02j}T)+e-UEIS;4%NeYC2L>6eXFTUgw|y&
zljU>ks;8TxD(xmtzntsKwg_Ax*ew0|ILKIR`jtTrQ^_}<eq9`)`viH?cGG#3Zdd8c
zthF@6vF{W26Lh*14$KhTDLO#`i4#uJ9mwM}&ZGb(N^9TTUCeIGygtO)pXru?MVU-q
zW)lR9m%*DjpT;dxoVAVOyfJZ&eVN@fvx9lOl_GpYR2)Jm@8aS{c8GT#?xMJHX^2aY
z7P31ill{tu;|%fs4n8O^?BL_4<?oUzY;ALiNH2)XuaxIETKeB<DE>eRe<pcLBkVLU
zWx*%7NtyGM|5Fk&Ltb;ZMbcUxw_gc*jc!(teCY?=advR`u&94g$lv>@<<k@lt4VPW
F{sq4Bd3yi=

diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java
index b09e122..8b08f21 100644
--- a/src/model/FinancialStatement.java
+++ b/src/model/FinancialStatement.java
@@ -205,27 +205,114 @@ public class FinancialStatement
 		return _totalIncome;
 	}
 	
-	public int getSalary()
+	//income getters
+	public int getIncome() 
+	{
+		return _income;
+	}
+	public int getSalary() 
 	{
 		return _salary;
 	}
+	public int getREcashFlow()
+	{
+		return _REcashFlow;
+	} 
 	
-	public int getSalary()
+	//expense getters
+	public int getExpenses()
 	{
-		return _salary;
+		return _expenses;
+	}
+	public int getTaxes()
+	{
+		return _taxes;
+	}
+	public int getHomeMortgagePayment()
+	{
+		return _homeMortgagePayment;
+	}
+	public int getSchoolLoanPayment()
+	{
+		return _schoolLoanPayment;
+	}
+	public int getCarLoanPayment()
+	{
+		return _carLoanPayment;
+	}
+	public int getCreditCardPayment()
+	{
+		return _creditCardPayment;
+	}
+	public int getOtherExpenses()
+	{
+		return _otherExpenses;
+	}
+	public int getPerChildExpense()
+	{
+		return _perChildExpense;
+	}
+	public int getNumChildren()
+	{
+		return _numChildren;
 	}
 	
-	public int getSalary()
+	//assets getters
+	public int getAssets()
 	{
-		return _salary;
-	} 
-	public int getSalary()
+		return _assets;
+	}
+	public int getSavings()
 	{
-		return _salary;
+		return _savings;
 	}
-	public int getSalary()
+	
+	public int getStock()
 	{
-		return _salary;
+		return _stock.getNumShares() * _stock.getSharePrice();
+	}
+	//for realestate,maybe
+//	public int get()
+//	{
+//		return _;
+//	}
+	
+	//liabilities getters
+	public int getLiabilities()
+	{
+		return _liabilities;
+	}
+	public int getHomeMortgage()
+	{
+		return _homeMortgage;
+	}
+	public int getSchoolLoans()
+	{
+		return _schoolLoans;
+	}
+	public int getCarLoans()
+	{
+		return _carLoans;
+	}
+	public int getCreditCardDebt()
+	{
+		return _creditCardDebt;
+	}
+	
+	//additonal cash flow getters
+	public int getMonthlySalary()
+	{
+		return _monthlySalary;
+	}
+
+	public int getTotalExpenses()
+	{
+		return _totalExpenses;
+	}
+
+	public int getMonthlyCashflow() {
+		// TODO Auto-generated method stub
+		return _monthlyCashFlow;
 	}
 	
 }
diff --git a/src/view/CharityWindow.java b/src/view/CharityWindow.java
index 99f61e2..24acc1d 100644
--- a/src/view/CharityWindow.java
+++ b/src/view/CharityWindow.java
@@ -59,17 +59,13 @@ public class CharityWindow {
 
       Donate.addActionListener(new ActionListener() {
          public void actionPerformed(ActionEvent e) {
-        	 //put message that they donated xx dollars after 10 seconds, close window        	     	
+        	 //update cashbalance for player        	     	
 			try {
 				Thread.sleep(1000);
 			} catch (InterruptedException e1) {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();
 			}
-			
-        	statusLabel.setText("Good Job! You donated all your savings!");
-        	 
-        	 
         	 System.exit(0);
          }          
       });
diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java
index 9585627..c40270d 100644
--- a/src/view/FSWindow.java
+++ b/src/view/FSWindow.java
@@ -3,7 +3,6 @@ import java.awt.*;
 import java.awt.Window;
 import java.awt.event.*;
 import javax.swing.*;
-
 import model.*;
 import controller.*;
 
@@ -18,11 +17,11 @@ public class FSWindow {
 	public FSWindow(){
 		
 	}
-	public static void main(String[] args){
-		FSWindow  FSWindow = new FSWindow();  
-		FSWindow.prepareGUI();
-		FSWindow.showButtonDemo();
-	}
+//	public static void main(String[] args){
+//		FSWindow  FSWindow = new FSWindow();  
+//		FSWindow.prepareGUI();
+//		FSWindow.showButtonDemo();
+//	}
 	private void prepareGUI(Player p)
 	{
 		FinancialStatement currentFS = p.getFinancialStatement();
@@ -38,7 +37,8 @@ public class FSWindow {
 		mainTab.setLayout(new BoxLayout(mainTab, BoxLayout.Y_AXIS));
 
 		JLabel salary = new JLabel();
-		//set salary to salary variable here
+		JTextField salarynum = new JTextField(currentFS.getSalary());
+		salary.add(salarynum);
 		mainTab.add(salary);
 		
 		JLabel plusSymbol = new JLabel("+");
@@ -47,7 +47,8 @@ public class FSWindow {
 		mainTab.add(plusSymbol);
 		
 		JLabel passiveincome = new JLabel();
-		//set passiveincome to passiveincome variable here
+		JTextField pIncome = new JTextField(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));
 		passiveincome.setAlignmentX(Component.CENTER_ALIGNMENT);
@@ -62,7 +63,8 @@ public class FSWindow {
 		mainTab.add(equalSymbol);
 		
 		JLabel totalincome = new JLabel();
-		//set totalincome to totalincome variable here
+		JTextField tincomenum = new JTextField(currentFS.getTotalIncome());
+		totalincome.add(tincomenum);
 		totalincome.setFont(new Font("Verdana",1,35));
 		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
 		mainTab.add(totalincome);
@@ -73,7 +75,8 @@ public class FSWindow {
 		mainTab.add(minusSymbol);
 		
 		JLabel totalexpense = new JLabel();
-		//set totalexpense to totalexpense variable here
+		JTextField texpensenum = new JTextField(currentFS.getTotalExpenses());
+		totalincome.add(texpensenum);
 		totalincome.setFont(new Font("Verdana",1,35));
 		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
 		mainTab.add(totalexpense);
@@ -84,7 +87,8 @@ public class FSWindow {
 		mainTab.add(equalSymbol2);
 		
 		JLabel cashflow = new JLabel();
-		//set cashflow to cashflow variable here
+		JTextField cashflownum = new JTextField(currentFS.getMonthlyCashflow());
+		cashflow.add(cashflownum);
 		totalincome.setFont(new Font("Verdana",1,35));
 		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
 		mainTab.add(cashflow);
@@ -95,12 +99,14 @@ public class FSWindow {
 		String[] incomeColumns = {"Description", "CashFlow"};
 		Object[][] income = {
 				{"Description", "CashFlow"},
-				{"Salary","" currentFS.getSalary()},
-				{"Interest/dividends", ""/**call interest 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*/},
+				{"Salary",currentFS.getMonthlySalary()},
+				{"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*/},
 			};
 		
 		JTable incomeTable = new JTable(income, incomeColumns);
@@ -111,15 +117,13 @@ public class FSWindow {
 		String[] expenseColumns = {"Description", "CashFlow"};
 		Object[][] expense = {
 				{"Description", "CashFlow"},
-				{"Taxes",""/**user variable*/},
-				{"Home Mortgage Payment", ""/**user variable**/},
-				{"School Loan Payment",""/**user variable**/},
-				{"Car Loan Payment",""/**user variable**/},
-				{"Credit Card Payment",""/**user variable**/},
-				{"Other Expenses",""/**user variable**/},
-				{"Bank Loan Payment",""/**user variable**/},
-				{"Per Child Expense",""/**user variable**/},
-
+				{"Taxes", currentFS.getTaxes()},
+				{"Home Mortgage Payment", currentFS.getHomeMortgagePayment()},
+				{"School Loan Payment",currentFS.getSchoolLoanPayment()},
+				{"Car Loan Payment",currentFS.getCarLoanPayment()},
+				{"Credit Card Payment",currentFS.getCreditCardPayment()},
+				{"Other Expenses", currentFS.getOtherExpenses()},
+				{"Per Child Expense",currentFS.getPerChildExpense()*currentFS.getNumChildren()},
 			};
 		
 		JTable expenseTable = new JTable(expense, expenseColumns);
@@ -127,12 +131,14 @@ public class FSWindow {
 		tabbedPane.addTab("Expenses", expenseTable);
 		tabbedPane.setMnemonicAt(2, KeyEvent.VK_3);
 
+//		private ArrayList<OwnedRealEstate> _realEstate;
+		//find how to keep adding rows from array
 		String[] assetColumns = {"Description", "CashFlow"};
 		Object[][] asset = {
 				{"Description", "CashFlow"},
-				{"Savings",""/**user variable*/},
-				{"Precious Metals", ""/**user variable**/},
-				{"Stocks",""/**user variable**/}, //total stocks number and total money
+				{"Savings",currentFS.getSavings()},
+				{"Precious Metals", "0"},
+				{"Stocks",currentFS.getStockValue()}, //total stocks number and total money
 			};
 		
 		JTable assetTable = new JTable(asset, assetColumns );
@@ -158,11 +164,10 @@ public class FSWindow {
 		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**/},
+				{"Home Mortgage",currentFS.getHomeMortgage()},
+				{"School Loans", currentFS.getSchoolLoans()},
+				{"Car Loans",currentFS.getCarLoans()}, 
+				{"Credit Card Debt", currentFS.getCreditCardDebt()},
 			};
 		
 		JTable liabiltiesTable = new JTable(liabilties, liabiltiesColumns );