diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class index c7b6db6..ab8c40f 100644 Binary files a/bin/view/FSWindow.class and b/bin/view/FSWindow.class differ diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java index 66a5cfd..7eb2b39 100644 --- a/src/view/FSWindow.java +++ b/src/view/FSWindow.java @@ -44,6 +44,11 @@ public class FSWindow { 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 +61,7 @@ public class FSWindow { 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 +77,7 @@ public class FSWindow { 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 +89,10 @@ public class FSWindow { 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 +101,24 @@ public class FSWindow { 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);