Merge branch 'master' of

https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git Conflicts: bin/.gitignore bin/view/FSWindow$1.class bin/view/FSWindow.class
joh13010 · Apr 21, 2017 · 2b7a5f9 · 2b7a5f9
2 parents e8f1d7a + 4299ebf
commit 2b7a5f9
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 24 deletions.
diff --git a/bin/.gitignore b/bin/.gitignore
@@ -1,3 +1,10 @@
+<<<<<<< HEAD
 /view/
 /controller/
 /model/
+=======
+/.DS_Store
+/controller/
+/model/
+/view/
+>>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class
diff --git a/bin/view/FSWindow$1.class b/bin/view/FSWindow$1.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
@@ -26,24 +26,69 @@ public class FSWindow {
 		splitPane.setDividerLocation(150);
 
 		JTabbedPane tabbedPane = new JTabbedPane();
-		ImageIcon icon = createImageIcon("images/middle.gif");
-
-		String[] columnNames = {"First Name", "Last Name"};
-		Object[][] data = {
-			    {"Kathy", "Smith"},
-			    {"John", "Doe"},
-			    {"Sue", "Black"},
-			    {"Jane", "White"},
-			    {"Joe", "Brown"}
-			};
-
-		JTable table = new JTable(data, columnNames);
 
-		tabbedPane.addTab("Total CashFlow", table);
+		JPanel mainTab = new JPanel();
+
+		mainTab.setLayout(new BoxLayout(mainTab, BoxLayout.Y_AXIS));
+
+		JLabel salary = new JLabel();
+		//set salary to salary variable here
+		mainTab.add(salary);
+
+		JLabel plusSymbol = new JLabel("+");
+		plusSymbol.setFont(new Font("Verdana",1,50));
+		plusSymbol.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(plusSymbol);
+
+		JLabel passiveincome = new JLabel();
+		//set passiveincome to passiveincome variable here
+		JLabel passiveMes = new JLabel("Cash Flow from Interest/Dividends and Real Estate/Business");
+		passiveincome.setFont(new Font("Verdana",1,35));
+		passiveincome.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(passiveincome);
+		passiveMes.setFont(new Font("Verdana",1,10));
+		passiveMes.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(passiveMes);
+
+		JLabel equalSymbol = new JLabel("=");
+		equalSymbol.setFont(new Font("Verdana",1,50));
+		equalSymbol.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(equalSymbol);
+
+		JLabel totalincome = new JLabel();
+		//set totalincome to totalincome variable here
+		totalincome.setFont(new Font("Verdana",1,35));
+		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(totalincome);
+
+		JLabel minusSymbol = new JLabel("-");
+		minusSymbol.setFont(new Font("Verdana",1,50));
+		minusSymbol.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(minusSymbol);
+
+		JLabel totalexpense = new JLabel();
+		//set totalexpense to totalexpense variable here
+		totalincome.setFont(new Font("Verdana",1,35));
+		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(totalexpense);
+
+		JLabel equalSymbol2 = new JLabel("=");
+		equalSymbol2.setFont(new Font("Verdana",1,50));
+		equalSymbol2.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(equalSymbol2);
+
+		JLabel cashflow = new JLabel();
+		//set cashflow to cashflow variable here
+		totalincome.setFont(new Font("Verdana",1,35));
+		totalincome.setAlignmentX(Component.CENTER_ALIGNMENT);
+		mainTab.add(cashflow);
+
+		tabbedPane.addTab("Total CashFlow", mainTab);
 		tabbedPane.setMnemonicAt(0, KeyEvent.VK_1);
 
 		String[] incomeColumns = {"Description", "CashFlow"};
 		Object[][] income = {
+				{"Description", "CashFlow"},
 				{"Salary",""/**salary of user*/},
 				{"Interest/dividends", ""/**call interest of user*/},
 				{"Real Estate/Business",""/**business of user*/},
@@ -60,6 +105,7 @@ public class FSWindow {
 
 		String[] expenseColumns = {"Description", "CashFlow"};
 		Object[][] expense = {
+				{"Description", "CashFlow"},
 				{"Taxes",""/**user variable*/},
 				{"Home Mortgage Payment", ""/**user variable**/},
 				{"School Loan Payment",""/**user variable**/},
@@ -77,8 +123,10 @@ public class FSWindow {
 		tabbedPane.setMnemonicAt(2, KeyEvent.VK_3);
 
 
+
 		String[] assetColumns = {"Description", "CashFlow"};
 		Object[][] asset = {
+				{"Description", "CashFlow"},
 				{"Savings",""/**user variable*/},
 				{"Precious Metals", ""/**user variable**/},
 				{"Stocks",""/**user variable**/}, //total stocks number and total money
@@ -88,47 +136,52 @@ public class FSWindow {
 
 		String[] assetColumns2 = {"Description", "Down Payment", "Cost"};
 		Object[][] asset2 = {
+				{"Description", "Down Payment", "Cost"},
 				{"Name",""/**user variable*/,""},
 				{"Name", ""/**user variable**/,""},
 				{"Name",""/**user variable**/, ""/**user variable**/,""}, //total stocks number and total money
 			};
 
 		JTable assetTable2 = new JTable(asset2, assetColumns2 );
-
-		tabbedPane.addTab("Assets", assetTable2);
 
+		Container assetTab = new Container();
+		assetTab.setLayout(new BoxLayout(assetTab, BoxLayout.Y_AXIS));	
+		assetTab.add(assetTable);
+		assetTab.add(assetTable2);
+
+		tabbedPane.addTab("Assets", assetTab);
 		tabbedPane.setMnemonicAt(3, KeyEvent.VK_4);
 
 		String[] liabiltiesColumns = {"Description", "Liabilities"};
 		Object[][] liabilties = {
+				{"Description", "Liabilities"},
 				{"Home Mortgage",""/**user variable*/},
 				{"School Loans", ""/**user variable**/},
 				{"Car Loans",""/**user variable**/, ""/**user variable**/}, 
 				{"Credit Card Debt", ""/**user variable**/},
 				{"Bank Loans", ""/**user variable**/},
-
-
 			};
 
 		JTable liabiltiesTable = new JTable(liabilties, liabiltiesColumns );
 
-
 		String[] liabiltiesColumns2 = {"Real Estate/Business", "Mortgage/Liability"};
 		Object[][] liabilties2 = {
+				{"Real Estate/Business", "Mortgage/Liability"},
 				{"Name",""/**user variable*/},
 				{"Name", ""/**user variable**/},
 				{"Name",""/**user variable**/, ""/**user variable**/}, 
 				{"Name", ""/**user variable**/},
 				{"Name", ""/**user variable**/},
-
-
 			};
 
 		JTable liabiltiesTable2 = new JTable(liabilties2, liabiltiesColumns2 );
 
+		Container liabilitiesTab = new Container();
+		liabilitiesTab.setLayout(new BoxLayout(liabilitiesTab, BoxLayout.Y_AXIS));	
+		liabilitiesTab.add(liabiltiesTable);
+		liabilitiesTab.add(liabiltiesTable2);
 
-		Component panel5 = (JComponent) makeTextPanel("Panel #5");
-		tabbedPane.addTab("Liabilities", panel5);
+		tabbedPane.addTab("Liabilities", liabilitiesTab);
 		tabbedPane.setMnemonicAt(4, KeyEvent.VK_5);
 
 		incomeTable.setPreferredSize(new Dimension(410, 250));
@@ -137,7 +190,7 @@ public class FSWindow {
 		assetTable2.setPreferredSize(new Dimension(410, 250));
 		mainFrame = new JFrame("CashFlow");
 		mainFrame.getContentPane().setBackground(new Color(149, 32, 216));
-		mainFrame.setSize(400,250);
+		mainFrame.setSize(1000,750);
 		//need to set this to null and position everything manually
 		mainFrame.setLayout(new FlowLayout());
 
@@ -181,4 +234,3 @@ public class FSWindow {
 	mainFrame.setVisible(true);  
 	}
 }
-