Skip to content
Permalink
Browse files

trying to pull

  • Loading branch information
Joe Hill
Joe Hill committed Apr 23, 2017
1 parent 597b3db commit 3ecb1a4749ee3a6648ac1f7d2639616993130419
BIN +407 Bytes (120%) bin/controller/Cashflow.class
Binary file not shown.
Binary file not shown.
BIN +20 Bytes (100%) bin/view/FSWindow.class
Binary file not shown.
@@ -41,6 +41,7 @@ public void play()
{
while(!isWinner())
{

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

}
}

@@ -76,6 +78,22 @@ private static void testGamePlay()
g.movePlayer(p1, 5);
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);

}


@@ -204,10 +204,7 @@ public int getTotalIncome()
{
return _totalIncome;
}

<<<<<<< HEAD

=======
//income getters
public int getIncome()
{
@@ -22,7 +22,7 @@ public FSWindow(){
// FSWindow.prepareGUI();
// FSWindow.showButtonDemo();
// }
private void prepareGUI(Player p)
public void prepareGUI(Player p)
{
FinancialStatement currentFS = p.getFinancialStatement();

@@ -103,10 +103,10 @@ private void prepareGUI(Player p)
{"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*/},
{"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);
@@ -238,7 +238,8 @@ protected Component makeTextPanel(String text) {
panel.add(filler);
return panel;
}
private void showButtonDemo(){

public void showButtonDemo(){
mainFrame.setVisible(true);
}
}

0 comments on commit 3ecb1a4

Please sign in to comment.
You can’t perform that action at this time.