trying to pull

joh13010 · Apr 21, 2017 · c0dbb74 · c0dbb74
1 parent 597b3db
commit c0dbb74
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 48 deletions.
diff --git a/bin/.gitignore b/bin/.gitignore
@@ -1,10 +1,4 @@
-<<<<<<< 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/model/Handler.class b/bin/model/Handler.class
diff --git a/bin/view/TileButton.class b/bin/view/TileButton.class
diff --git a/src/model/Handler.java b/src/model/Handler.java
diff --git a/src/view/TileButton.java b/src/view/TileButton.java
@@ -11,7 +11,6 @@ public class TileButton extends JButton {
 
 	private static final long serialVersionUID = 1L;
 	private Tile tile;
-	private int rent, price;
 
 	public TileButton(String name, int TileOnBoard, GameBoard board) {
 		super(name);
@@ -20,27 +19,11 @@ public class TileButton extends JButton {
 		// this.setOpaque(false);
 		this.setContentAreaFilled(false);
 		// this.setBorderPainted(false);
-
-		this.setInts();
 		this.setVisible(true);
-		Handler hand = new Handler(price, rent, tile, TileOnBoard,
-				board);
-		this.addActionListener(hand);
 
 	}
 
-	public void setInts() {
-
-		if (this.tile instanceof Tile) {
-			/*
-			 * i dont actually really like this method 
-			 * but i think it should be like that iterator in cash flow
-			 * that determines moving over the tiles and if it's landed on
-			 * the gui should be brought up already in the handler method
-			 */
-		}
 
-	}
 
 	public void paint(Graphics g) { // Do nothing here }