Merge branch 'master' of

https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git Conflicts: bin/model/FinancialStatement.class bin/view/FSWindow.class
joh13010 · Apr 23, 2017 · 1378185 · 1378185
2 parents 12cc15c + be35d7b
commit 1378185
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class
diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java
@@ -36,6 +36,7 @@ public class FSWindow {
 	{
 		FinancialStatement currentFS = p.getFinancialStatement();
 
+
 		JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
 		splitPane.setOneTouchExpandable(true);
 		splitPane.setDividerLocation(150);
@@ -45,6 +46,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());
@@ -57,7 +63,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));
@@ -73,7 +79,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);
@@ -85,10 +91,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("=");
@@ -97,12 +103,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);
 
@@ -121,18 +139,11 @@ public class FSWindow {
 				{"Interest/dividends", "0"},
 
 				//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*/},
 
->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
 			};
 
 		JTable incomeTable = new JTable(income, incomeColumns);