Did some GUI stuff

joh13010 · Apr 25, 2017 · d34d54a · d34d54a
1 parent af04e34
commit d34d54a
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 2 deletions.
diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class
diff --git a/bin/model/DealTile.class b/bin/model/DealTile.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/src/model/CharityTile.java b/src/model/CharityTile.java
@@ -1,5 +1,7 @@
 package model;
 
+import view.CharityWindow;
+
 public class CharityTile extends Tile
 {
 
@@ -15,6 +17,24 @@ public class CharityTile extends Tile
 		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())
 		{

diff --git a/src/model/DealTile.java b/src/model/DealTile.java
@@ -43,7 +43,7 @@ public class DealTile extends Tile
 		}
 		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:

diff --git a/src/view/CharityWindow.java b/src/view/CharityWindow.java
@@ -60,7 +60,6 @@ public class CharityWindow {
       JButton DontDonate = new JButton("Don't Donate");
       DontDonate.setHorizontalTextPosition(SwingConstants.LEFT);   
 
-      boolean donate = false;
 
       Donate.addMouseListener(new MouseListener() {
 		@Override