Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of 
https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git

Conflicts:
	bin/model/FinancialStatement.class
	bin/view/FSWindow.class
  • Loading branch information
Joe Hill committed Apr 23, 2017
2 parents 12cc15c + be35d7b commit 1378185
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 14 deletions.
Binary file modified bin/model/FinancialStatement.class
View file
Binary file not shown.
Binary file modified bin/view/FSWindow.class
View file
Binary file not shown.
39 changes: 25 additions & 14 deletions src/view/FSWindow.java
View file
Expand Up @@ -36,6 +36,7 @@ public class FSWindow {
{ {
FinancialStatement currentFS = p.getFinancialStatement(); FinancialStatement currentFS = p.getFinancialStatement();



JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT); JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
splitPane.setOneTouchExpandable(true); splitPane.setOneTouchExpandable(true);
splitPane.setDividerLocation(150); splitPane.setDividerLocation(150);
Expand All @@ -45,6 +46,11 @@ public class FSWindow {
JPanel mainTab = new JPanel(); JPanel mainTab = new JPanel();


mainTab.setLayout(new BoxLayout(mainTab, BoxLayout.Y_AXIS)); 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(); JLabel salary = new JLabel();
JTextField salarynum = new JTextField(currentFS.getSalary()); JTextField salarynum = new JTextField(currentFS.getSalary());
Expand All @@ -57,7 +63,7 @@ public class FSWindow {
mainTab.add(plusSymbol); mainTab.add(plusSymbol);


JLabel passiveincome = new JLabel(); JLabel passiveincome = new JLabel();
JTextField pIncome = new JTextField(currentFS.getREcashFlow()); JTextField pIncome = new JTextField(Integer.toString(currentFS.getREcashFlow()));
passiveincome.add(pIncome); passiveincome.add(pIncome);
JLabel passiveMes = new JLabel("Cash Flow from Interest/Dividends and Real Estate/Business"); JLabel passiveMes = new JLabel("Cash Flow from Interest/Dividends and Real Estate/Business");
passiveincome.setFont(new Font("Verdana",1,35)); passiveincome.setFont(new Font("Verdana",1,35));
Expand All @@ -73,7 +79,7 @@ public class FSWindow {
mainTab.add(equalSymbol); mainTab.add(equalSymbol);


JLabel totalincome = new JLabel(); JLabel totalincome = new JLabel();
JTextField tincomenum = new JTextField(currentFS.getTotalIncome()); JTextField tincomenum = new JTextField(Integer.toString(currentFS.getTotalIncome()));
totalincome.add(tincomenum); totalincome.add(tincomenum);
totalincome.setFont(new Font("Verdana",1,35)); totalincome.setFont(new Font("Verdana",1,35));
totalincome.setAlignmentX(Component.CENTER_ALIGNMENT); totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
Expand All @@ -85,10 +91,10 @@ public class FSWindow {
mainTab.add(minusSymbol); mainTab.add(minusSymbol);


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


JLabel equalSymbol2 = new JLabel("="); JLabel equalSymbol2 = new JLabel("=");
Expand All @@ -97,12 +103,24 @@ public class FSWindow {
mainTab.add(equalSymbol2); mainTab.add(equalSymbol2);


JLabel cashflow = new JLabel(); JLabel cashflow = new JLabel();
JTextField cashflownum = new JTextField(currentFS.getMonthlyCashflow()); JTextField cashflownum = new JTextField(Integer.toString(currentFS.getMonthlyCashflow()));
cashflow.add(cashflownum); cashflow.add(cashflownum);
totalincome.setFont(new Font("Verdana",1,35)); totalincome.setFont(new Font("Verdana",1,35));
totalincome.setAlignmentX(Component.CENTER_ALIGNMENT); totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
mainTab.add(cashflow); 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.addTab("Total CashFlow", mainTab);
tabbedPane.setMnemonicAt(0, KeyEvent.VK_1); tabbedPane.setMnemonicAt(0, KeyEvent.VK_1);


Expand All @@ -121,18 +139,11 @@ public class FSWindow {
{"Interest/dividends", "0"}, {"Interest/dividends", "0"},


//another table for real estate //another table for real estate
<<<<<<< HEAD
{"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*/},
=======
{"Real Estate/Business",/**business of user*/},
{"Real Estate/Business",/**business of user*/},
{"Real Estate/Business",/**business of user*/},
{"Real Estate/Business",/**business of user*/},


>>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
}; };


JTable incomeTable = new JTable(income, incomeColumns); JTable incomeTable = new JTable(income, incomeColumns);
Expand Down

0 comments on commit 1378185

Please sign in to comment.