Merge branch 'master' of

https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git Conflicts: bin/view/CharityWindow$2.class bin/view/CharityWindow$3.class bin/view/CharityWindow.class
joh13010 · Apr 25, 2017 · deaa729 · deaa729
2 parents d34d54a + 761816a
commit deaa729
Show file tree

Hide file tree

Showing 51 changed files with 9 additions and 20 deletions.
diff --git a/bin/.gitignore b/bin/.gitignore
@@ -1,15 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< 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
diff --git a/bin/model/BigDealStack.class b/bin/model/BigDealStack.class
diff --git a/bin/model/Card.class b/bin/model/Card.class
diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class
diff --git a/bin/model/DealCard.class b/bin/model/DealCard.class
diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class
diff --git a/bin/model/Die.class b/bin/model/Die.class
diff --git a/bin/model/DoodadCard.class b/bin/model/DoodadCard.class
diff --git a/bin/model/DoodadStack.class b/bin/model/DoodadStack.class
diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
diff --git a/bin/model/MarketCard.class b/bin/model/MarketCard.class
diff --git a/bin/model/MarketStack.class b/bin/model/MarketStack.class
diff --git a/bin/model/OwnedRealEstate.class b/bin/model/OwnedRealEstate.class
diff --git a/bin/model/Profession.class b/bin/model/Profession.class
diff --git a/bin/model/Professions.class b/bin/model/Professions.class
diff --git a/bin/model/SmallDealStack.class b/bin/model/SmallDealStack.class
diff --git a/bin/model/Stock.class b/bin/model/Stock.class
diff --git a/bin/view/CharityWindow$2.class b/bin/view/CharityWindow$2.class
diff --git a/bin/view/CharityWindow$3.class b/bin/view/CharityWindow$3.class
diff --git a/bin/view/CharityWindow.class b/bin/view/CharityWindow.class
diff --git a/bin/view/ChildWindow$1.class b/bin/view/ChildWindow$1.class
diff --git a/bin/view/ChildWindow$2.class b/bin/view/ChildWindow$2.class
diff --git a/bin/view/ChildWindow.class b/bin/view/ChildWindow.class
diff --git a/bin/view/DealCardWindow$1.class b/bin/view/DealCardWindow$1.class
diff --git a/bin/view/DealCardWindow$2.class b/bin/view/DealCardWindow$2.class
diff --git a/bin/view/DealCardWindow$3$1.class b/bin/view/DealCardWindow$3$1.class
diff --git a/bin/view/DealCardWindow$3$2.class b/bin/view/DealCardWindow$3$2.class
diff --git a/bin/view/DealCardWindow$3.class b/bin/view/DealCardWindow$3.class
diff --git a/bin/view/DealCardWindow$4$1.class b/bin/view/DealCardWindow$4$1.class
diff --git a/bin/view/DealCardWindow$4$2.class b/bin/view/DealCardWindow$4$2.class
diff --git a/bin/view/DealCardWindow$4.class b/bin/view/DealCardWindow$4.class
diff --git a/bin/view/DealCardWindow.class b/bin/view/DealCardWindow.class
diff --git a/bin/view/DoodadCardWindow$1.class b/bin/view/DoodadCardWindow$1.class
diff --git a/bin/view/DoodadCardWindow$2.class b/bin/view/DoodadCardWindow$2.class
diff --git a/bin/view/DoodadCardWindow.class b/bin/view/DoodadCardWindow.class
diff --git a/bin/view/DownSizeWindow$1.class b/bin/view/DownSizeWindow$1.class
diff --git a/bin/view/DownSizeWindow.class b/bin/view/DownSizeWindow.class
diff --git a/bin/view/GameboardWindow.class b/bin/view/GameboardWindow.class
diff --git a/bin/view/MainWindow$1.class b/bin/view/MainWindow$1.class
diff --git a/bin/view/MainWindow.class b/bin/view/MainWindow.class
diff --git a/bin/view/MainWindow1$1.class b/bin/view/MainWindow1$1.class
diff --git a/bin/view/MainWindow1.class b/bin/view/MainWindow1.class
diff --git a/bin/view/Positioner.class b/bin/view/Positioner.class
diff --git a/bin/view/SDStockCardWindow$1.class b/bin/view/SDStockCardWindow$1.class
diff --git a/bin/view/SDStockCardWindow$2.class b/bin/view/SDStockCardWindow$2.class
diff --git a/bin/view/SDStockCardWindow$3.class b/bin/view/SDStockCardWindow$3.class
diff --git a/bin/view/SDStockCardWindow.class b/bin/view/SDStockCardWindow.class
diff --git a/bin/view/Window.class b/bin/view/Window.class
diff --git a/src/model/DealTile.java b/src/model/DealTile.java
@@ -21,7 +21,7 @@ public class DealTile extends Tile
 	{
 		// TODO
 		// Ask user to decide big/small deal:
-		CharityWindow charityWindow = new CharityWindow();      
+		CharityWindow charityWindow = new CharityWindow();
 		charityWindow.showButtonDemo();
 
 

diff --git a/src/view/GameboardWindow.java b/src/view/GameboardWindow.java
@@ -1,5 +1,6 @@
 package view;
 import model.*;
+
 import controller.*;
 import java.awt.*;
 import java.util.ArrayList;
@@ -195,17 +196,19 @@ public class GameboardWindow extends JPanel {
 
 	}
 
-	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(); //
+	public void update(ArrayList<Player> _players) { //updates the location of the player on the board
+		for (int i = 0; i < _players.size(); i++) {
+			int x = (int) points[_players.get(i).getLocation()].getX(); // i will fix this later
+			int y = (int) points[_players.get(i).getLocation()].getY(); //
 			Positioners.get(i).setX(x);
 			Positioners.get(i).setY(y);
 
 		}
 
 	}
 
+
+
 
 
 

diff --git a/src/view/MainMenu.java b/src/view/MainMenu.java
@@ -10,10 +10,7 @@ import java.io.*;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
-
-import controller.Cashflow;
 import model.Instructions;
-import model.Player;
 
 public class MainMenu 
 {
@@ -279,7 +276,7 @@ public class MainMenu
 				frame.dispose();
 
 				//Cashflow.go(playerNames);
-				System.exit(0);
+				//System.exit(0);
 			}          
 		});
 		return playerNames;