From c0dbb74eef6c2dc236a76895a8b88a4bad685599 Mon Sep 17 00:00:00 2001
From: jackie <jackie@137.99.182.176>
Date: Fri, 21 Apr 2017 19:31:11 -0400
Subject: [PATCH] trying to pull

---
 bin/.gitignore            |   6 ------
 bin/model/CardStack.class | Bin 1828 -> 1828 bytes
 bin/model/Handler.class   | Bin 741 -> 0 bytes
 bin/view/TileButton.class | Bin 1204 -> 820 bytes
 src/model/Handler.java    |  25 -------------------------
 src/view/TileButton.java  |  17 -----------------
 6 files changed, 48 deletions(-)
 delete mode 100644 bin/model/Handler.class
 delete mode 100644 src/model/Handler.java

diff --git a/bin/.gitignore b/bin/.gitignore
index 4a6964c..66905d0 100644
--- 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
index d9e4bf91d77e8940b9adac3ddc072f4a7d4d563c..158a0abd37987cf05ebabaeda4e8f892d442f058 100644
GIT binary patch
delta 19
bcmZ3&w}fxQYPQMu*i0s`U^AX9#4ZE?Olk(B

delta 19
bcmZ3&w}fxQYPQLb*bFAGU^AaA#4ZE?Ooj%h

diff --git a/bin/model/Handler.class b/bin/model/Handler.class
deleted file mode 100644
index 168fca9f0006f3bd9506aa83659ccce633696c44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 741
zcmaJ<+fLg+5IvJP2?U3Pa4Qf>3k8Cu;urcvh16EPM6yaHP~JDrLKitUS`7R{|E3R7
zB_8?#{V3F#by`}fsw``6XJ^iw-5>XN-vJz8w}uj-G0KKI2|uWGm}pyrM`&HB8x<xh
zJr9ou7dp;ss1nv)R^8^IzR_tOzKU~`rIESHb*e4Fvz#SRk5IX^Cf0;zlEq3;$LZ@#
z*&%~+lW@V0im9g@9TKW9O=|KZ!dAD}`?K^bc&|p<bvWGXbCWkrxsEdCd^FG|l)HQV
zX%H5COk+yCB_FlId*ovVzT{SY)G@`ZB9rQm*Q0^9r)nT{+7a_i`pO!KCrK~=Y_0_T
zmq5(6GAMSLn^YdiF<LoQK52WF*^%arH@eY3g?lR^x^*f}PeSK^KtlZ_ySA}@R|q({
zuYKu_r@UR6{|Y>mWO2UVl1Sk!FYPSL;4I%cW*Ob&=nLbjY*&MCXa#Fy%m<w@7K7(w
zEC-9;7%N}hnKi*U<P6VfaPL|EnwUomD`=y`^`oK_*72Al!3zU&o^UETPgs<lC%io8
pZQu!WC*EUo!s`X+1y2v-tFG0u8?{sve~;pqgJ)bPY`cRyKLJZ!j3WR5

diff --git a/bin/view/TileButton.class b/bin/view/TileButton.class
index 2c088ecaf781e31ddf8d792328c7fe983e8cdd13..56055d01c712aab61a54f145344334a33cbed63b 100644
GIT binary patch
delta 354
zcmYLD%}&B#5S(ohWBruMPX&RBC<;ZaCVEl4crhm2Ot{z3keX5=5UxH$^F4_P*2IGk
z;1l>X#%(d0FPU$5XJ=*?Ym2n@`ThO@;2dY6HV<X@S{D%5A{3gvM`!NXz7q`X``N?`
zhF7h=h8zm3$P+T7@xb-%TW93njGf6qz`(W?RMSfW8rC%s$^sQsWtZx?U4a^^1a0ch
z`rg!g@LkzZ0)_5msF?CgaY&JuYWbNseuK4}eAN?Fr1&pc?KfnsP9;M26-7&puw$hn
zm@iB!*kd%X!l*N5S(@iF4HWs+d1@_9u#W@o*bWUGaztDmp~(($)#5!BJwhADzxfwT
b#3cRaq!XQ)_!>*{&zI1_3G)Oy5uW}4mhvwh

literal 1204
zcmZuwYflqV5IvW+RLWv`KP$>ZX&1|?peRL@hd@cAAHW*@wzM~J&9WuCTkvOTqBYUP
z#IOD+<GH&lAkyT%c4p3;nK}LS``Zry3)oJhO(1)s<f*l%9J$sEf`*$$QlRg>ePVyG
z{8Qx~SUZtHpxc+8vYo2*eARGYmp25&jzHIX!}SB(4XU=&lqq8CpAbj}L=`Y9M~%94
z!W<=j^`sjxvMi7~_Ee1??aRtl!HU34zM?Z*j?KKgfyeZvavZ*8AIY_b?bS<#DpA&n
znLz@52D0cE7`P&|P|aWv!)Xk$&WOYrih&V~3ZxHYpo^zNzFfG-v;zV;0~vH?cpEox
z6SoBVeHpOcfHkao(%w{#BkQD-f2WfPOd6QNG;!%yb^~7^k&i5Q49sYR3@ugVt9?hN
zQDFNbV%xS`cciDY&KkImE`2K+Fwm7j9+ocip1@ST{I?;R_LbeyJRTUB$AUnQU9Yd!
z0?w<Ve6p4vImWHBPXkMyuoCNEkFdenigM-4=Fz_N_H1$$=&dwroW4yB@Ew0l28W78
z_Eav(NDtcO#B|tyBNgb><X^erJgI|yJy(r#X-FF7kd5JVVpH6vQW~pl<+-r5m~5qm
zHF%-AEzdqaR5d@WNE}eu5gA?inT<HRjiy(V9H!QRrWQ$lPBX^@+nJ!ElNdz`?R=&A
zYQr@ysw2E}O5w@5@l4Psi*D{ce0`+9{#PuSvtQ9`7IQ5Oe8HHRXyJz0!i1S@;r4gr
z-<qFca^2+`%N4(3ZYgPw(0Kn-i2abe$&4Us3Vqbb0QX@GQOP-SD`E_DJm>j(f^j^e
z=R%Yji+IczInc61Uiwxd*S7GsjHl#0Po67y#yTl8OvmgOd20U-&FUwfzd0w93BxDZ
rh}kfi5jn=m1lF(~gJ|kHl{gR9eFUs9a4<5Su@u<A3)%%X!@#XSA^`WP

diff --git a/src/model/Handler.java b/src/model/Handler.java
deleted file mode 100644
index 8515231..0000000
--- a/src/model/Handler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package model;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
-public class Handler implements ActionListener {
-	private int rent, price, locationOnBoard;
-	private Tile tile;
-
-	public Handler(int price, int rent, Tile tile, int locationOnBoard,
-			GameBoard board) {
-		this.price = price;
-		this.rent = rent;
-		this.tile = tile;
-		this.locationOnBoard = locationOnBoard;
-
-	}
-
-	public void actionPerformed(ActionEvent event) {
-		// refer to getLandedOn? Or one of the decision/card windows? How do i do this i am tired 
-
-	}
-
-}
diff --git a/src/view/TileButton.java b/src/view/TileButton.java
index c3c06c8..3aafc82 100644
--- 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 }