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/view/FSWindow.class
	src/view/FSWindow.java

bin/.gitignore

@@ -1,10 +1,15 @@
 <<<<<<< HEAD
-/view/
-/controller/
-/model/
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
 /.DS_Store
 /controller/
 /model/
+<<<<<<< HEAD
+>>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
+/view/
+/Instructions.class
+=======
 /view/
 >>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git

src/controller/Cashflow.java

@@ -1,27 +1,24 @@
 package controller;
 
 import view.*;
+
+import java.util.ArrayList;
+
 import model.*;
 
 public class Cashflow
 {
-
-
 	private GameBoard _board;
-	private Player[] _players;
+	public Player[] players;
 	//private CardStack[] _cards;
+	public GameboardWindow gameboard;
+	public static int numPlayers;
+
 
-	public static void main(String[] args)
-	{
-		/*
-		 * Just testing stuff in here for now. Main method will call the go() method when game is built
-		 */
-		testGamePlay();
-
-	}
 
-	public void go()
+	public static void go()
 	{
+		System.out.println("Start game");
 		// Joe
 		// Initialize game board
 		// Initialize GUI
@@ -59,7 +56,7 @@ public class Cashflow
 	public boolean isWinner()
 	{
 		boolean isWinner = false;
-		for(Player p : _players)
+		for(Player p : players)
 		{
 			if(p.hasWon())
 			{

src/model/Instructions.java

@@ -0,0 +1,10 @@
+package model;
+
+public class Instructions 
+{
+	public static void getClicked()
+	{
+		System.out.println("You thought we were just going to GIVE you the instructions?");
+		System.out.println("HAHAHAHAH");
+	}
+}

src/model/Player.java

@@ -6,7 +6,7 @@ public class Player
 	private boolean _donate;
 	private int _charityCount; //charity counter
 	private int _downsizeCount; //down size counter
-	private int _location;
+	private int _location;//refers to a tile number
 	private boolean _hasWon;
 
 	public Player()

src/view/DealCardWindow.java

@@ -88,8 +88,8 @@ public class DealCardWindow {
 		JButton BigDeal = new JButton("BigDeal");        
 		JButton SmallDeal = new JButton("SmallDeal");
 		SmallDeal.setHorizontalTextPosition(SwingConstants.LEFT);   
-		JButton AcceptDeal = new JButton("Accept Deal");        
-		JButton DeclineDeal = new JButton("Decline Deal");
+		final JButton AcceptDeal = new JButton("Accept Deal");        
+		final JButton DeclineDeal = new JButton("Decline Deal");
 		DeclineDeal.setHorizontalTextPosition(SwingConstants.LEFT);
 
 		BigDeal.addActionListener(new ActionListener() {
@@ -143,5 +143,5 @@ public class DealCardWindow {
 		controlPanel.add(SmallDeal);       
 		mainFrame.setVisible(true);  
 		return response;
-	}
+	}   
 }

src/view/DoodadCardWindow.java

@@ -16,14 +16,16 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 
+import model.DoodadCard;
+
 public class DoodadCardWindow {
 	private JFrame mainFrame;
 	private JLabel headerLabel;
 	private JLabel statusLabel;
 	private JPanel controlPanel;
 
 	public DoodadCardWindow(){
-		prepareGUI();
+		prepareGUI(null);
 	}
 	public static void main(String[] args){
 		DoodadCardWindow  DoodadCardWindow = new DoodadCardWindow();      

src/view/FSWindow.java

@@ -3,8 +3,9 @@ import java.awt.*;
 import java.awt.Window;
 import java.awt.event.*;
 import javax.swing.*;
-import model.*;
+
 import controller.*;
+import model.*;
 
 public class FSWindow {
 
@@ -17,11 +18,20 @@ public class FSWindow {
 	public FSWindow(){
 
 	}
+/*
+	public static void main(String[] args){
+		FSWindow  FSWindow = new FSWindow();  
+		FSWindow.prepareGUI();
+		FSWindow.showButtonDemo();
+	}*/
+	//private void prepareGUI()
+
 //	public static void main(String[] args){
 //		FSWindow  FSWindow = new FSWindow();  
 //		FSWindow.prepareGUI();
 //		FSWindow.showButtonDemo();
 //	}
+
 	public void prepareGUI(Player p)
 	{
 		FinancialStatement currentFS = p.getFinancialStatement();
@@ -99,14 +109,30 @@ public class FSWindow {
 		String[] incomeColumns = {"Description", "CashFlow"};
 		Object[][] income = {
 				{"Description", "CashFlow"},
+
+				//{"Salary","" currentFS.getSalary()},
+				{"Interest/dividends", ""/**call interest 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*/},
+
 				{"Salary",currentFS.getMonthlySalary()},
 				{"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);

src/view/GameboardWindow.java

@@ -1,27 +1,27 @@
 package view;
 import model.*;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Image;
-
-import java.awt.Point;
-import java.awt.geom.Path2D;
+import controller.*;
+import java.awt.*;
 import java.util.ArrayList;
 
 import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 
+import controller.Cashflow;
+
 public class GameboardWindow extends JPanel {
+
 
 	private static final long serialVersionUID = 1L;
 	private Image img = new ImageIcon(this.getClass().getResource(
 			"gameboard.png")).getImage();
 
-	private GameBoard board; //
+	private GameBoard board; 
 	private Point[] points = new Point[24];
 
 	private ArrayList<Positioner> Positioners;
 
+
 	public GameboardWindow(GameBoard board) {
 		this.board = board;
 		Dimension size = new Dimension(img.getWidth(null), img.getHeight(null));
@@ -45,6 +45,7 @@ public class GameboardWindow extends JPanel {
 	public void setUpTiles() {
 // implement the tiles into the graphical boardspace
 // the buttons are going to be a little off as i couldnt figure out how to rotate jbuttons
+// i guess it doesnt really matter what tile is which but the position matters - 0 is starting
 		TileButton t1 = new TileButton("Deal", 0, board);
 		this.add(t1);
 		t1.setBounds(125,532,95,20); //xstart,ystart,width,height
@@ -182,11 +183,10 @@ public class GameboardWindow extends JPanel {
 
 	}
 
-	public void update(ArrayList<Integer> locP) {
-		for (int i = 0; i < locP.size(); i++) {
-			int x = (int) points[locP.get(i)].getX();
-			int y = (int) points[locP.get(i)].getY();
-
+	public void update() { //updates the location of the player on the board
+		for (int i = 0; i < Cashflow.numPlayers; i++) {
+			int x = (int) points[Player[i].getLocation()].getX(); // i will fix this later
+			int y = (int) points[Player[i].getLocation()].getY(); // hopefully lol
 			Positioners.get(i).setX(x);
 			Positioners.get(i).setY(y);
 
@@ -197,4 +197,5 @@ public class GameboardWindow extends JPanel {
 
 
 
+
 }