Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
trying to pull
  • Loading branch information
Joe Hill committed Apr 23, 2017
1 parent 597b3db commit 3ecb1a4
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 9 deletions.
Binary file modified bin/controller/Cashflow.class
Binary file not shown.
Binary file modified bin/model/FinancialStatement.class
Binary file not shown.
Binary file modified bin/view/FSWindow.class
Binary file not shown.
18 changes: 18 additions & 0 deletions src/controller/Cashflow.java
Expand Up @@ -41,6 +41,7 @@ public class Cashflow
{ {
while(!isWinner()) while(!isWinner())
{ {

// TODO Play method // TODO Play method
// Get player whose turn it is // Get player whose turn it is
// Display their financial statement // Display their financial statement
Expand All @@ -51,6 +52,7 @@ public class Cashflow
// Call tile's getLandedOn method // Call tile's getLandedOn method
// Update current/all players' financials // Update current/all players' financials
// Increment player array (Also needs to wrap like tiles array) // Increment player array (Also needs to wrap like tiles array)

} }
} }


Expand All @@ -76,6 +78,22 @@ public class Cashflow
g.movePlayer(p1, 5); g.movePlayer(p1, 5);
System.out.println(p1.getLocation()); System.out.println(p1.getLocation());



FSWindow FSWindow = new FSWindow();
FSWindow.prepareGUI(p1);
FSWindow.showButtonDemo();


// Delay to check how the financial statement updates
try {
Thread.sleep(10000);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

FSWindow.prepareGUI(p2);

} }




Expand Down
3 changes: 0 additions & 3 deletions src/model/FinancialStatement.java
Expand Up @@ -204,10 +204,7 @@ public class FinancialStatement
{ {
return _totalIncome; return _totalIncome;
} }

<<<<<<< HEAD


=======
//income getters //income getters
public int getIncome() public int getIncome()
{ {
Expand Down
13 changes: 7 additions & 6 deletions src/view/FSWindow.java
Expand Up @@ -22,7 +22,7 @@ public class FSWindow {
// FSWindow.prepareGUI(); // FSWindow.prepareGUI();
// FSWindow.showButtonDemo(); // FSWindow.showButtonDemo();
// } // }
private void prepareGUI(Player p) public void prepareGUI(Player p)
{ {
FinancialStatement currentFS = p.getFinancialStatement(); FinancialStatement currentFS = p.getFinancialStatement();


Expand Down Expand Up @@ -103,10 +103,10 @@ public class FSWindow {
{"Interest/dividends", "0"}, {"Interest/dividends", "0"},


//another table for real estate //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*/},
{"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); JTable incomeTable = new JTable(income, incomeColumns);
Expand Down Expand Up @@ -238,7 +238,8 @@ public class FSWindow {
panel.add(filler); panel.add(filler);
return panel; return panel;
} }
private void showButtonDemo(){
public void showButtonDemo(){
mainFrame.setVisible(true); mainFrame.setVisible(true);
} }
} }

0 comments on commit 3ecb1a4

Please sign in to comment.