diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class index dfb60c0..14738b8 100644 Binary files a/bin/model/FinancialStatement.class and b/bin/model/FinancialStatement.class differ diff --git a/bin/view/FSWindow$1.class b/bin/view/FSWindow$1.class deleted file mode 100644 index 6869d3a..0000000 Binary files a/bin/view/FSWindow$1.class and /dev/null differ diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class index 3967feb..701d99f 100644 Binary files a/bin/view/FSWindow.class and b/bin/view/FSWindow.class differ diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java index c4a394a..b09e122 100644 --- a/src/model/FinancialStatement.java +++ b/src/model/FinancialStatement.java @@ -204,6 +204,30 @@ public class FinancialStatement { return _totalIncome; } + + public int getSalary() + { + return _salary; + } + + public int getSalary() + { + return _salary; + } + + public int getSalary() + { + return _salary; + } + public int getSalary() + { + return _salary; + } + public int getSalary() + { + return _salary; + } + } diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java index 788d617..9585627 100644 --- a/src/view/FSWindow.java +++ b/src/view/FSWindow.java @@ -4,6 +4,9 @@ import java.awt.Window; import java.awt.event.*; import javax.swing.*; +import model.*; +import controller.*; + public class FSWindow { //please ignore all of this. It's mostly my reference code. I'm going to work on it later. @@ -13,13 +16,16 @@ public class FSWindow { private JPanel controlPanel; public FSWindow(){ - prepareGUI(); + } public static void main(String[] args){ - FSWindow FSWindow = new FSWindow(); + FSWindow FSWindow = new FSWindow(); + FSWindow.prepareGUI(); FSWindow.showButtonDemo(); } - private void prepareGUI(){ + private void prepareGUI(Player p) + { + FinancialStatement currentFS = p.getFinancialStatement(); JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT); splitPane.setOneTouchExpandable(true); @@ -89,7 +95,7 @@ public class FSWindow { String[] incomeColumns = {"Description", "CashFlow"}; Object[][] income = { {"Description", "CashFlow"}, - {"Salary",""/**salary of user*/}, + {"Salary","" currentFS.getSalary()}, {"Interest/dividends", ""/**call interest of user*/}, {"Real Estate/Business",""/**business of user*/}, {"Real Estate/Business",""/**business of user*/},