Skip to content
Permalink
Browse files

trying to pull

  • Loading branch information
jackie
jackie committed Apr 21, 2017
1 parent 597b3db commit c0dbb74eef6c2dc236a76895a8b88a4bad685599
@@ -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
BIN +0 Bytes (100%) bin/model/CardStack.class
Binary file not shown.
BIN -741 Bytes bin/model/Handler.class
Binary file not shown.
BIN -384 Bytes (68%) bin/view/TileButton.class
Binary file not shown.

This file was deleted.

@@ -11,7 +11,6 @@

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 TileButton(String name, int TileOnBoard, GameBoard board) {
// 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 }

0 comments on commit c0dbb74

Please sign in to comment.
You can’t perform that action at this time.