Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
getters for FS
  • Loading branch information
Joe Hill committed Apr 21, 2017
1 parent da734c8 commit 45eedbe
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 4 deletions.
Binary file modified bin/model/FinancialStatement.class
Binary file not shown.
Binary file removed bin/view/FSWindow$1.class
Binary file not shown.
Binary file modified bin/view/FSWindow.class
Binary file not shown.
24 changes: 24 additions & 0 deletions src/model/FinancialStatement.java
Expand Up @@ -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;
}

}


Expand Down
14 changes: 10 additions & 4 deletions src/view/FSWindow.java
Expand Up @@ -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.
Expand All @@ -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);
Expand Down Expand Up @@ -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*/},
Expand Down

0 comments on commit 45eedbe

Please sign in to comment.