Skip to content
Permalink
Browse files

Merge branch 'master' of

https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git

Conflicts:
	bin/controller/Cashflow.class
	bin/model/FinancialStatement.class
	bin/model/Player.class
  • Loading branch information
afortuna2016
afortuna2016 committed Apr 23, 2017
2 parents 36fd4f9 + 1378185 commit 454e127905543b3a474cda933f371264bd1d46ca
BIN +407 Bytes (120%) bin/controller/Cashflow.class
Binary file not shown.
BIN +0 Bytes (100%) bin/model/CardStack.class
Binary file not shown.
BIN +318 Bytes (100%) bin/view/FSWindow.class
Binary file not shown.
BIN +392 Bytes (110%) bin/view/GameboardWindow.class
Binary file not shown.
BIN -302 Bytes (73%) bin/view/TileButton.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);

}


@@ -3,8 +3,9 @@
import java.awt.Window;
import java.awt.event.*;
import javax.swing.*;
import model.*;

import controller.*;
import model.*;

public class FSWindow {

@@ -30,11 +31,12 @@ public static void main(String[] args){
// FSWindow.prepareGUI();
// FSWindow.showButtonDemo();
// }
private void prepareGUI(Player p)


public void prepareGUI(Player p)
{
FinancialStatement currentFS = p.getFinancialStatement();


JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
splitPane.setOneTouchExpandable(true);
splitPane.setDividerLocation(150);
@@ -44,6 +46,11 @@ private void prepareGUI(Player p)
JPanel mainTab = new JPanel();

mainTab.setLayout(new BoxLayout(mainTab, BoxLayout.Y_AXIS));

// JLabel name = new JLabel();
// JTextField playername = new JTextField(p.getNameI|());
// name.add(playername);
// mainTab.add(name);

JLabel salary = new JLabel();
JTextField salarynum = new JTextField(currentFS.getSalary());
@@ -56,7 +63,7 @@ private void prepareGUI(Player p)
mainTab.add(plusSymbol);

JLabel passiveincome = new JLabel();
JTextField pIncome = new JTextField(currentFS.getREcashFlow());
JTextField pIncome = new JTextField(Integer.toString(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));
@@ -72,7 +79,7 @@ private void prepareGUI(Player p)
mainTab.add(equalSymbol);

JLabel totalincome = new JLabel();
JTextField tincomenum = new JTextField(currentFS.getTotalIncome());
JTextField tincomenum = new JTextField(Integer.toString(currentFS.getTotalIncome()));
totalincome.add(tincomenum);
totalincome.setFont(new Font("Verdana",1,35));
totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
@@ -84,10 +91,10 @@ private void prepareGUI(Player p)
mainTab.add(minusSymbol);

JLabel totalexpense = new JLabel();
JTextField texpensenum = new JTextField(currentFS.getTotalExpenses());
totalincome.add(texpensenum);
totalincome.setFont(new Font("Verdana",1,35));
totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
JTextField texpensenum = new JTextField(Integer.toString(currentFS.getTotalExpenses()));
totalexpense.add(texpensenum);
totalexpense.setFont(new Font("Verdana",1,35));
totalexpense.setAlignmentX(Component.CENTER_ALIGNMENT);
mainTab.add(totalexpense);

JLabel equalSymbol2 = new JLabel("=");
@@ -96,12 +103,24 @@ private void prepareGUI(Player p)
mainTab.add(equalSymbol2);

JLabel cashflow = new JLabel();
JTextField cashflownum = new JTextField(currentFS.getMonthlyCashflow());
JTextField cashflownum = new JTextField(Integer.toString(currentFS.getMonthlyCashflow()));
cashflow.add(cashflownum);
totalincome.setFont(new Font("Verdana",1,35));
totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
mainTab.add(cashflow);

//switchplayers button here
JButton endTurn = new JButton("End Turn");
endTurn.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
tabbedPane.setVisible(false);
//switch to next player update method here
tabbedPane.setVisible(true);
}
});

mainTab.add(endTurn);

tabbedPane.addTab("Total CashFlow", mainTab);
tabbedPane.setMnemonicAt(0, KeyEvent.VK_1);

@@ -120,10 +139,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*/},

};

@@ -256,7 +275,8 @@ protected Component makeTextPanel(String text) {
panel.add(filler);
return panel;
}
private void showButtonDemo(){

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

0 comments on commit 454e127

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