Skip to content
Permalink
Browse files

Did some GUI stuff

  • Loading branch information
Joe Hill
Joe Hill committed Apr 25, 2017
1 parent af04e34 commit d34d54a9df5772ffdb2d6e224f4797eb959d3cb0
BIN +473 Bytes (150%) bin/model/CharityTile.class
Binary file not shown.
BIN +5 Bytes (100%) bin/model/DealTile.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/CharityWindow$2.class
Binary file not shown.
BIN +0 Bytes (100%) bin/view/CharityWindow$3.class
Binary file not shown.
BIN -25 Bytes (99%) bin/view/CharityWindow.class
Binary file not shown.
@@ -1,5 +1,7 @@
package model;

import view.CharityWindow;

public class CharityTile extends Tile
{

@@ -15,6 +17,24 @@ public void getLandedOn(Player p)
FinancialStatement f = p.getFinancialStatement();
// call view method
// TODO
CharityWindow charityWindow = new CharityWindow();
charityWindow.showButtonDemo();


while(!charityWindow.hasAnswered)
{
try {
Thread.sleep(200);
} catch(InterruptedException e) {

}
}
System.out.println(charityWindow.doesDonate);

// Pick card from big/small deal stack:
Card c;
if(charityWindow.doesDonate)


if (p.donateCharity())
{
@@ -43,7 +43,7 @@ public void getLandedOn(Player p)
}
else
{
c = _smallDealStack.pickCard();
c = _bigDealStack.pickCard();
}

// If stock, update price, then ask user if they want to buy and ask everyone if they want to sell:
@@ -60,7 +60,6 @@ public boolean showButtonDemo(){
JButton DontDonate = new JButton("Don't Donate");
DontDonate.setHorizontalTextPosition(SwingConstants.LEFT);

boolean donate = false;

Donate.addMouseListener(new MouseListener() {
@Override

0 comments on commit d34d54a

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