external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

added showAndWait method to InputSyncronizedBase - it holds the long chain of calls to reach Control's input queue.

Browse Source
This commit is contained in:
Maxmtg
2013-12-13 06:25:55 +00:00
parent 38344027ca
commit 8960fa20c3
26 changed files with 56 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-gui/src/main/java/forge/control/InputQueue.java
View File

@@ -80,15 +80,7 @@ public class InputQueue extends Observable {
return inputStack.toString(); return inputStack.toString();
} }
public void setInputAndWait(InputSynchronized input) { public void setInput(InputSynchronized input) {
this.inputStack.push(input);
syncPoint();
this.updateObservers();
input.awaitLatchRelease();
}
void setInput(InputSynchronized input) {
this.inputStack.push(input); this.inputStack.push(input);
syncPoint(); syncPoint();
this.updateObservers(); this.updateObservers();

3
forge-gui/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java
View File

@@ -5,7 +5,6 @@ import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.Singletons;
import forge.ai.ComputerUtil; import forge.ai.ComputerUtil;
import forge.game.GameEntity; import forge.game.GameEntity;
import forge.game.ability.SpellAbilityEffect; import forge.game.ability.SpellAbilityEffect;
@@ -34,7 +33,7 @@ public class CountersProliferateEffect extends SpellAbilityEffect {
if (controller.isHuman()) { if (controller.isHuman()) {
InputProliferate inp = new InputProliferate(); InputProliferate inp = new InputProliferate();
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if ( inp.hasCancelled() ) if ( inp.hasCancelled() )
return; return;

3
forge-gui/src/main/java/forge/game/ability/effects/UntapEffect.java
View File

@@ -4,7 +4,6 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import forge.Singletons;
import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCard;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect; import forge.game.ability.SpellAbilityEffect;
@@ -83,7 +82,7 @@ public class UntapEffect extends SpellAbilityEffect {
if (p.isHuman()) { if (p.isHuman()) {
InputSelectCards sc = new InputSelectCardsFromList(0, num, list); InputSelectCards sc = new InputSelectCardsFromList(0, num, list);
Singletons.getControl().getInputQueue().setInputAndWait(sc); sc.showAndWait();
if( !sc.hasCancelled() ) if( !sc.hasCancelled() )
for( Card c : sc.getSelected() ) for( Card c : sc.getSelected() )
c.untap(); c.untap();

3
forge-gui/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -26,7 +26,6 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import forge.Command; import forge.Command;
import forge.Singletons;
import forge.ai.ComputerUtil; import forge.ai.ComputerUtil;
import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCard;
import forge.ai.ComputerUtilCost; import forge.ai.ComputerUtilCost;
@@ -2859,7 +2858,7 @@ public class CardFactoryUtil {
if (card.getController().isHuman()) { if (card.getController().isHuman()) {
final InputSelectCards target = new InputSelectCardsFromList(1, 1, creats); final InputSelectCards target = new InputSelectCardsFromList(1, 1, creats);
target.setMessage("Choose target creature to haunt."); target.setMessage("Choose target creature to haunt.");
Singletons.getControl().getInputQueue().setInputAndWait(target); target.showAndWait();
toHaunt = target.getSelected().get(0); toHaunt = target.getSelected().get(0);
} else { } else {
// AI choosing what to haunt // AI choosing what to haunt

5
forge-gui/src/main/java/forge/game/cost/CostDiscard.java
View File

@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.Singletons;
import forge.ai.AiController; import forge.ai.AiController;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
@@ -221,7 +220,7 @@ public class CostDiscard extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(1, 1, handList); InputSelectCards inp = new InputSelectCardsFromList(1, 1, handList);
inp.setMessage("Select one of the cards with the same name to discard. Already chosen: " + discarded); inp.setMessage("Select one of the cards with the same name to discard. Already chosen: " + discarded);
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if (inp.hasCancelled()) { if (inp.hasCancelled()) {
return false; return false;
} }
@@ -252,7 +251,7 @@ public class CostDiscard extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(c, c, handList); InputSelectCards inp = new InputSelectCardsFromList(c, c, handList);
inp.setMessage("Select %d more " + getDescriptiveType() + " to discard."); inp.setMessage("Select %d more " + getDescriptiveType() + " to discard.");
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if (inp.hasCancelled() || inp.getSelected().size() != c) { if (inp.hasCancelled() || inp.getSelected().size() != c) {
return false; return false;
} }

3
forge-gui/src/main/java/forge/game/cost/CostExile.java
View File

@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import forge.Singletons;
import forge.ai.ComputerUtil; import forge.ai.ComputerUtil;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
@@ -270,7 +269,7 @@ public class CostExile extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(c, c, list); InputSelectCards inp = new InputSelectCardsFromList(c, c, list);
inp.setMessage("Exile %d card(s) from your" + from); inp.setMessage("Exile %d card(s) from your" + from);
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
return !inp.hasCancelled() && executePayment(ability, inp.getSelected()); return !inp.hasCancelled() && executePayment(ability, inp.getSelected());
} }

3
forge-gui/src/main/java/forge/game/cost/CostGainControl.java
View File

@@ -19,7 +19,6 @@ package forge.game.cost;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import forge.Singletons;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
import forge.game.card.Card; import forge.game.card.Card;
@@ -110,7 +109,7 @@ public class CostGainControl extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(c, c, validCards); InputSelectCards inp = new InputSelectCardsFromList(c, c, validCards);
inp.setMessage("Gain control of %d " + desc); inp.setMessage("Gain control of %d " + desc);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if (inp.hasCancelled()) { if (inp.hasCancelled()) {
return false; return false;
} }

5
forge-gui/src/main/java/forge/game/cost/CostPartMana.java
View File

@@ -17,7 +17,6 @@
*/ */
package forge.game.cost; package forge.game.cost;
import forge.Singletons;
import forge.ai.ComputerUtilMana; import forge.ai.ComputerUtilMana;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
@@ -135,7 +134,7 @@ public class CostPartMana extends CostPart {
} }
if (!toPay.isPaid()) { if (!toPay.isPaid()) {
inpPayment = new InputPayManaOfCostPayment(toPay, ability); inpPayment = new InputPayManaOfCostPayment(toPay, ability);
Singletons.getControl().getInputQueue().setInputAndWait(inpPayment); inpPayment.showAndWait();
if (!inpPayment.isPaid()) { if (!inpPayment.isPaid()) {
return handleOfferingAndConvoke(ability, true, false); return handleOfferingAndConvoke(ability, true, false);
} }
@@ -147,7 +146,7 @@ public class CostPartMana extends CostPart {
if (!ability.isAnnouncing("X") && !xWasBilled) { if (!ability.isAnnouncing("X") && !xWasBilled) {
source.setXManaCostPaid(0); source.setXManaCostPaid(0);
inpPayment = new InputPayManaX(ability, this.getAmountOfX(), this.canXbe0()); inpPayment = new InputPayManaX(ability, this.getAmountOfX(), this.canXbe0());
Singletons.getControl().getInputQueue().setInputAndWait(inpPayment); inpPayment.showAndWait();
if (!inpPayment.isPaid()) { if (!inpPayment.isPaid()) {
return false; return false;
} }

3
forge-gui/src/main/java/forge/game/cost/CostPutCardToLib.java
View File

@@ -20,7 +20,6 @@ package forge.game.cost;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import forge.Singletons;
import forge.ai.ComputerUtil; import forge.ai.ComputerUtil;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
@@ -238,7 +237,7 @@ public class CostPutCardToLib extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(c, c, list); InputSelectCards inp = new InputSelectCardsFromList(c, c, list);
inp.setMessage("Put %d card(s) from your " + from ); inp.setMessage("Put %d card(s) from your " + from );
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
return !inp.hasCancelled() && executePayment(ability, inp.getSelected()); return !inp.hasCancelled() && executePayment(ability, inp.getSelected());
} }

5
forge-gui/src/main/java/forge/game/cost/CostPutCounter.java
View File

@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import forge.Singletons;
import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCard;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
@@ -271,8 +270,8 @@ public class CostPutCounter extends CostPartWithList {
InputSelectCardToPutCounter inp = new InputSelectCardToPutCounter(c, typeList); InputSelectCardToPutCounter inp = new InputSelectCardToPutCounter(c, typeList);
inp.setMessage("Put %d " + getCounter().getName() + " counter on " + getDescriptiveType()); inp.setMessage("Put %d " + getCounter().getName() + " counter on " + getDescriptiveType());
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if(inp.hasCancelled()) if(inp.hasCancelled())
return false; return false;

3
forge-gui/src/main/java/forge/game/cost/CostRemoveAnyCounter.java
View File

@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.Singletons;
import forge.ai.ComputerUtil; import forge.ai.ComputerUtil;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
@@ -133,7 +132,7 @@ public class CostRemoveAnyCounter extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(1, 1, list); InputSelectCards inp = new InputSelectCardsFromList(1, 1, list);
inp.setMessage("Select " + this.getDescriptiveType() + " to remove a counter"); inp.setMessage("Select " + this.getDescriptiveType() + " to remove a counter");
inp.setCancelAllowed(false); inp.setCancelAllowed(false);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
Card selected = inp.getSelected().get(0); Card selected = inp.getSelected().get(0);
final Map<CounterType, Integer> tgtCounters = selected.getCounters(); final Map<CounterType, Integer> tgtCounters = selected.getCounters();
final ArrayList<CounterType> typeChoices = new ArrayList<CounterType>(); final ArrayList<CounterType> typeChoices = new ArrayList<CounterType>();

3
forge-gui/src/main/java/forge/game/cost/CostRemoveCounter.java
View File

@@ -24,7 +24,6 @@ import java.util.Map;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import forge.Singletons;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
import forge.game.card.Card; import forge.game.card.Card;
@@ -164,7 +163,7 @@ public class CostRemoveCounter extends CostPartWithList {
final InputSelectCardToRemoveCounter inp = new InputSelectCardToRemoveCounter(cntRemoved, getCounter(), validCards); final InputSelectCardToRemoveCounter inp = new InputSelectCardToRemoveCounter(cntRemoved, getCounter(), validCards);
inp.setMessage("Remove %d " + getCounter().getName() + " counters from " + getDescriptiveType()); inp.setMessage("Remove %d " + getCounter().getName() + " counters from " + getDescriptiveType());
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if(inp.hasCancelled()) if(inp.hasCancelled())
return false; return false;

3
forge-gui/src/main/java/forge/game/cost/CostReturn.java
View File

@@ -20,7 +20,6 @@ package forge.game.cost;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import forge.Singletons;
import forge.ai.ComputerUtil; import forge.ai.ComputerUtil;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
@@ -147,7 +146,7 @@ public class CostReturn extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(c, c, validCards); InputSelectCards inp = new InputSelectCardsFromList(c, c, validCards);
inp.setMessage("Return %d " + this.getType() + " " + this.getType() + " card(s) to hand"); inp.setMessage("Return %d " + this.getType() + " " + this.getType() + " card(s) to hand");
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if (inp.hasCancelled()) if (inp.hasCancelled())
return false; return false;

5
forge-gui/src/main/java/forge/game/cost/CostReveal.java
View File

@@ -23,7 +23,6 @@ import java.util.List;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import forge.Singletons;
import forge.ai.AiController; import forge.ai.AiController;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
@@ -195,7 +194,7 @@ public class CostReveal extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(1, 1, handList); InputSelectCards inp = new InputSelectCardsFromList(1, 1, handList);
inp.setMessage("Select one of cards to reveal. Already chosen:" + revealed); inp.setMessage("Select one of cards to reveal. Already chosen:" + revealed);
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if (inp.hasCancelled()) if (inp.hasCancelled())
return false; return false;
final Card first = inp.getSelected().get(0); final Card first = inp.getSelected().get(0);
@@ -222,7 +221,7 @@ public class CostReveal extends CostPartWithList {
if ( num == 0 ) return true; if ( num == 0 ) return true;
InputSelectCards inp = new InputSelectCardsFromList(num, num, handList); InputSelectCards inp = new InputSelectCardsFromList(num, num, handList);
inp.setMessage("Select %d more " + getDescriptiveType() + " card(s) to reveal."); inp.setMessage("Select %d more " + getDescriptiveType() + " card(s) to reveal.");
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if ( inp.hasCancelled() ) if ( inp.hasCancelled() )
return false; return false;

3
forge-gui/src/main/java/forge/game/cost/CostSacrifice.java
View File

@@ -20,7 +20,6 @@ package forge.game.cost;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import forge.Singletons;
import forge.ai.ComputerUtil; import forge.ai.ComputerUtil;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
@@ -166,7 +165,7 @@ public class CostSacrifice extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(c, c, list); InputSelectCards inp = new InputSelectCardsFromList(c, c, list);
inp.setMessage("Select a " + this.getDescriptiveType() + " to sacrifice (%d left)"); inp.setMessage("Select a " + this.getDescriptiveType() + " to sacrifice (%d left)");
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if ( inp.hasCancelled() ) if ( inp.hasCancelled() )
return false; return false;

7
forge-gui/src/main/java/forge/game/cost/CostTapType.java
View File

@@ -22,7 +22,6 @@ import java.util.List;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.Singletons;
import forge.ai.ComputerUtil; import forge.ai.ComputerUtil;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
@@ -225,7 +224,7 @@ public class CostTapType extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(1, 1, typeList); InputSelectCards inp = new InputSelectCardsFromList(1, 1, typeList);
inp.setMessage("Select one of the cards to tap. Already chosen: " + tapped); inp.setMessage("Select one of the cards to tap. Already chosen: " + tapped);
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if (inp.hasCancelled()) if (inp.hasCancelled())
return false; return false;
final Card first = inp.getSelected().get(0); final Card first = inp.getSelected().get(0);
@@ -248,7 +247,7 @@ public class CostTapType extends CostPartWithList {
inp.setMessage("Select a card to tap."); inp.setMessage("Select a card to tap.");
inp.setUnselectAllowed(true); inp.setUnselectAllowed(true);
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if (inp.hasCancelled() || CardLists.getTotalPower(inp.getSelected()) < i) { if (inp.hasCancelled() || CardLists.getTotalPower(inp.getSelected()) < i) {
return false; return false;
@@ -259,7 +258,7 @@ public class CostTapType extends CostPartWithList {
InputSelectCards inp = new InputSelectCardsFromList(c, c, typeList); InputSelectCards inp = new InputSelectCardsFromList(c, c, typeList);
inp.setMessage("Select a " + getDescriptiveType() + " to tap (%d left)"); inp.setMessage("Select a " + getDescriptiveType() + " to tap (%d left)");
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if ( inp.hasCancelled() ) if ( inp.hasCancelled() )
return false; return false;

3
forge-gui/src/main/java/forge/game/cost/CostUntapType.java
View File

@@ -18,7 +18,6 @@
package forge.game.cost; package forge.game.cost;
import java.util.List; import java.util.List;
import forge.Singletons;
import forge.ai.ComputerUtil; import forge.ai.ComputerUtil;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;
@@ -153,7 +152,7 @@ public class CostUntapType extends CostPartWithList {
} }
InputSelectCards inp = new InputSelectCardsFromList(c, c, typeList); InputSelectCards inp = new InputSelectCardsFromList(c, c, typeList);
inp.setMessage("Select a " + getDescriptiveType() + " to untap (%d left)"); inp.setMessage("Select a " + getDescriptiveType() + " to untap (%d left)");
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if( inp.hasCancelled() || inp.getSelected().size() != c ) if( inp.hasCancelled() || inp.getSelected().size() != c )
return false; return false;

7
forge-gui/src/main/java/forge/game/phase/Untap.java
View File

@@ -23,7 +23,6 @@ import java.util.List;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import forge.Singletons;
import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCard;
import forge.game.Game; import forge.game.Game;
import forge.game.GameEntity; import forge.game.GameEntity;
@@ -216,7 +215,7 @@ public class Untap extends Phase {
} else { } else {
final InputSelectCards target = new InputSelectCardsFromList(1,1, landList); final InputSelectCards target = new InputSelectCardsFromList(1,1, landList);
target.setMessage("Select one tapped land to untap"); target.setMessage("Select one tapped land to untap");
Singletons.getControl().getInputQueue().setInputAndWait(target); target.showAndWait();
if( !target.hasCancelled() && !target.getSelected().isEmpty()) if( !target.hasCancelled() && !target.getSelected().isEmpty())
toUntap = target.getSelected().get(0); toUntap = target.getSelected().get(0);
} }
@@ -233,7 +232,7 @@ public class Untap extends Phase {
} else { } else {
final InputSelectCards target = new InputSelectCardsFromList(1,1, artList); final InputSelectCards target = new InputSelectCardsFromList(1,1, artList);
target.setMessage("Select one tapped artifact to untap"); target.setMessage("Select one tapped artifact to untap");
Singletons.getControl().getInputQueue().setInputAndWait(target); target.showAndWait();
if( !target.hasCancelled() && !target.getSelected().isEmpty()) if( !target.hasCancelled() && !target.getSelected().isEmpty())
target.getSelected().get(0).untap(); target.getSelected().get(0).untap();
} }
@@ -247,7 +246,7 @@ public class Untap extends Phase {
} else { } else {
final InputSelectCards target = new InputSelectCardsFromList(1, 1, creatures); final InputSelectCards target = new InputSelectCardsFromList(1, 1, creatures);
target.setMessage("Select one creature to untap"); target.setMessage("Select one creature to untap");
Singletons.getControl().getInputQueue().setInputAndWait(target); target.showAndWait();
if( !target.hasCancelled() && !target.getSelected().isEmpty()) if( !target.hasCancelled() && !target.getSelected().isEmpty())
target.getSelected().get(0).untap(); target.getSelected().get(0).untap();
} }

11
forge-gui/src/main/java/forge/game/player/HumanPlay.java
View File

@@ -9,7 +9,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.FThreads; import forge.FThreads;
import forge.Singletons;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.game.GameActionUtil; import forge.game.GameActionUtil;
import forge.game.Game; import forge.game.Game;
@@ -164,7 +163,7 @@ public class HumanPlay {
if (!isPaid) { if (!isPaid) {
InputPayMana inputPay = new InputPayManaSimple(p.getGame(), sa, manaCost); InputPayMana inputPay = new InputPayManaSimple(p.getGame(), sa, manaCost);
Singletons.getControl().getInputQueue().setInputAndWait(inputPay); inputPay.showAndWait();
isPaid = inputPay.isPaid(); isPaid = inputPay.isPaid();
} }
return isPaid; return isPaid;
@@ -440,7 +439,7 @@ public class HumanPlay {
InputSelectCards inp = new InputSelectCardsFromList(1, 1, list); InputSelectCards inp = new InputSelectCardsFromList(1, 1, list);
inp.setMessage("Select a card to add a counter to"); inp.setMessage("Select a card to add a counter to");
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if (inp.hasCancelled()) { if (inp.hasCancelled()) {
continue; continue;
} }
@@ -492,7 +491,7 @@ public class HumanPlay {
InputSelectCards inp = new InputSelectCardsFromList(1, 1, list); InputSelectCards inp = new InputSelectCardsFromList(1, 1, list);
inp.setMessage("Select a card to remove a counter"); inp.setMessage("Select a card to remove a counter");
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if (inp.hasCancelled()) { if (inp.hasCancelled()) {
continue; continue;
} }
@@ -680,7 +679,7 @@ public class HumanPlay {
prompt = source + "\n" + promptCurrent; prompt = source + "\n" + promptCurrent;
} }
InputPayMana toSet = new InputPayManaExecuteCommands(source, p, prompt, cost.getCostMana().getManaToPay()); InputPayMana toSet = new InputPayManaExecuteCommands(source, p, prompt, cost.getCostMana().getManaToPay());
Singletons.getControl().getInputQueue().setInputAndWait(toSet); toSet.showAndWait();
return toSet.isPaid(); return toSet.isPaid();
} }
@@ -691,7 +690,7 @@ public class HumanPlay {
inp.setMessage("Select %d " + cpl.getDescriptiveType() + " card(s) to " + actionName); inp.setMessage("Select %d " + cpl.getDescriptiveType() + " card(s) to " + actionName);
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if (inp.hasCancelled() || inp.getSelected().size() != amount) { if (inp.hasCancelled() || inp.getSelected().size() != amount) {
return false; return false;
} }

22
forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java
View File

@@ -317,7 +317,7 @@ public class PlayerControllerHuman extends PlayerController {
InputSelectCards inp = new InputSelectCardsFromList(min == 0 ? 1 : min, max, valid); InputSelectCards inp = new InputSelectCardsFromList(min == 0 ? 1 : min, max, valid);
inp.setMessage(outerMessage); inp.setMessage(outerMessage);
inp.setCancelAllowed(min == 0); inp.setCancelAllowed(min == 0);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
return inp.hasCancelled() ? Lists.<Card>newArrayList() : inp.getSelected(); return inp.hasCancelled() ? Lists.<Card>newArrayList() : inp.getSelected();
} }
@@ -364,7 +364,7 @@ public class PlayerControllerHuman extends PlayerController {
InputSelectCardsFromList input = new InputSelectCardsFromList(isOptional ? 0 : 1, 1, options); InputSelectCardsFromList input = new InputSelectCardsFromList(isOptional ? 0 : 1, 1, options);
input.setCancelAllowed(isOptional); input.setCancelAllowed(isOptional);
input.setMessage(title); input.setMessage(title);
Singletons.getControl().getInputQueue().setInputAndWait(input); input.showAndWait();
return Iterables.getFirst(input.getSelected(), null); return Iterables.getFirst(input.getSelected(), null);
} }
@@ -441,7 +441,7 @@ public class PlayerControllerHuman extends PlayerController {
@Override @Override
public boolean getWillPlayOnFirstTurn(boolean isFirstGame) { public boolean getWillPlayOnFirstTurn(boolean isFirstGame) {
InputPlayOrDraw inp = new InputPlayOrDraw(player, isFirstGame); InputPlayOrDraw inp = new InputPlayOrDraw(player, isFirstGame);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
return inp.isPlayingFirst(); return inp.isPlayingFirst();
} }
@@ -532,7 +532,7 @@ public class PlayerControllerHuman extends PlayerController {
InputSelectCards inp = new InputSelectCardsFromList(min, max, valid); InputSelectCards inp = new InputSelectCardsFromList(min, max, valid);
inp.setMessage(sa.hasParam("AnyNumber") ? "Discard up to %d card(s)" : "Discard %d card(s)"); inp.setMessage(sa.hasParam("AnyNumber") ? "Discard up to %d card(s)" : "Discard %d card(s)");
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
return inp.getSelected(); return inp.getSelected();
} }
@@ -617,7 +617,7 @@ public class PlayerControllerHuman extends PlayerController {
} }
}; };
target.setMessage("Select %d card(s) to discard, unless you discard a " + uType + "."); target.setMessage("Select %d card(s) to discard, unless you discard a " + uType + ".");
Singletons.getControl().getInputQueue().setInputAndWait(target); target.showAndWait();
return target.getSelected(); return target.getSelected();
} }
@@ -655,7 +655,7 @@ public class PlayerControllerHuman extends PlayerController {
@Override @Override
public List<Card> getCardsToMulligan(boolean isCommander, Player firstPlayer) { public List<Card> getCardsToMulligan(boolean isCommander, Player firstPlayer) {
final InputConfirmMulligan inp = new InputConfirmMulligan(player, firstPlayer, isCommander); final InputConfirmMulligan inp = new InputConfirmMulligan(player, firstPlayer, isCommander);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
return inp.isKeepHand() ? null : isCommander ? inp.getSelectedCards() : player.getCardsIn(ZoneType.Hand); return inp.isKeepHand() ? null : isCommander ? inp.getSelectedCards() : player.getCardsIn(ZoneType.Hand);
} }
@@ -663,14 +663,14 @@ public class PlayerControllerHuman extends PlayerController {
public void declareAttackers(Player attacker, Combat combat) { public void declareAttackers(Player attacker, Combat combat) {
// This input should not modify combat object itself, but should return user choice // This input should not modify combat object itself, but should return user choice
InputAttack inpAttack = new InputAttack(attacker, player, combat); InputAttack inpAttack = new InputAttack(attacker, player, combat);
Singletons.getControl().getInputQueue().setInputAndWait(inpAttack); inpAttack.showAndWait();
} }
@Override @Override
public void declareBlockers(Player defender, Combat combat) { public void declareBlockers(Player defender, Combat combat) {
// This input should not modify combat object itself, but should return user choice // This input should not modify combat object itself, but should return user choice
InputBlock inpBlock = new InputBlock(player, defender, combat); InputBlock inpBlock = new InputBlock(player, defender, combat);
Singletons.getControl().getInputQueue().setInputAndWait(inpBlock); inpBlock.showAndWait();
} }
@Override @Override
@@ -691,7 +691,7 @@ public class PlayerControllerHuman extends PlayerController {
if (game.isGameOver()) { return; } //don't wait to pass priority if player conceded while in middle of playing a spell/ability if (game.isGameOver()) { return; } //don't wait to pass priority if player conceded while in middle of playing a spell/ability
} }
InputPassPriority defaultInput = new InputPassPriority(player); InputPassPriority defaultInput = new InputPassPriority(player);
Singletons.getControl().getInputQueue().setInputAndWait(defaultInput); defaultInput.showAndWait();
chosenSa = defaultInput.getChosenSa(); chosenSa = defaultInput.getChosenSa();
} while (chosenSa != null); } while (chosenSa != null);
} }
@@ -706,7 +706,7 @@ public class PlayerControllerHuman extends PlayerController {
String message = String.format(msgFmt, max, n, nDiscard); String message = String.format(msgFmt, max, n, nDiscard);
inp.setMessage(message); inp.setMessage(message);
inp.setCancelAllowed(false); inp.setCancelAllowed(false);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
return inp.getSelected(); return inp.getSelected();
} }
@@ -719,7 +719,7 @@ public class PlayerControllerHuman extends PlayerController {
min = Math.min(min, max); min = Math.min(min, max);
InputSelectCardsFromList inp = new InputSelectCardsFromList(min, max, valid); InputSelectCardsFromList inp = new InputSelectCardsFromList(min, max, valid);
inp.setMessage("Choose Which Cards to Reveal"); inp.setMessage("Choose Which Cards to Reveal");
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
return inp.getSelected(); return inp.getSelected();
} }

3
forge-gui/src/main/java/forge/game/spellability/TargetSelection.java
View File

@@ -23,7 +23,6 @@ import java.util.List;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import forge.Singletons;
import forge.game.Game; import forge.game.Game;
import forge.game.GameObject; import forge.game.GameObject;
import forge.game.card.Card; import forge.game.card.Card;
@@ -108,7 +107,7 @@ public class TargetSelection {
List<Card> validTargets = this.getValidCardsToTarget(); List<Card> validTargets = this.getValidCardsToTarget();
if (zone.size() == 1 && (zone.get(0) == ZoneType.Battlefield || zone.get(0) == ZoneType.Hand)) { if (zone.size() == 1 && (zone.get(0) == ZoneType.Battlefield || zone.get(0) == ZoneType.Hand)) {
InputSelectTargets inp = new InputSelectTargets(validTargets, ability, mandatory); InputSelectTargets inp = new InputSelectTargets(validTargets, ability, mandatory);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
choiceResult = !inp.hasCancelled(); choiceResult = !inp.hasCancelled();
bTargetingDone = inp.hasPressedOk(); bTargetingDone = inp.hasPressedOk();
} else { } else {

3
forge-gui/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -31,7 +31,6 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import forge.FThreads; import forge.FThreads;
import forge.Singletons;
import forge.ai.ComputerUtil; import forge.ai.ComputerUtil;
import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCard;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
@@ -633,7 +632,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
if (source.getController().isHuman()) { if (source.getController().isHuman()) {
final InputSelectCards targetHaunted = new InputSelectCardsFromList(1,1, creats); final InputSelectCards targetHaunted = new InputSelectCardsFromList(1,1, creats);
targetHaunted.setMessage("Choose target creature to haunt."); targetHaunted.setMessage("Choose target creature to haunt.");
Singletons.getControl().getInputQueue().setInputAndWait(targetHaunted); targetHaunted.showAndWait();
targetCard = targetHaunted.getSelected().get(0); targetCard = targetHaunted.getSelected().get(0);
} else { } else {
// AI choosing what to haunt // AI choosing what to haunt

4
forge-gui/src/main/java/forge/gui/GuiDisplayUtil.java
View File

@@ -295,7 +295,7 @@ public final class GuiDisplayUtil {
InputSelectCardsFromList inp = new InputSelectCardsFromList(0, Integer.MAX_VALUE, untapped); InputSelectCardsFromList inp = new InputSelectCardsFromList(0, Integer.MAX_VALUE, untapped);
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
inp.setMessage("Choose permanents to tap"); inp.setMessage("Choose permanents to tap");
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if( !inp.hasCancelled() ) if( !inp.hasCancelled() )
for(Card c : inp.getSelected()) for(Card c : inp.getSelected())
c.tap(); c.tap();
@@ -322,7 +322,7 @@ public final class GuiDisplayUtil {
InputSelectCardsFromList inp = new InputSelectCardsFromList(0, Integer.MAX_VALUE, tapped); InputSelectCardsFromList inp = new InputSelectCardsFromList(0, Integer.MAX_VALUE, tapped);
inp.setCancelAllowed(true); inp.setCancelAllowed(true);
inp.setMessage("Choose permanents to untap"); inp.setMessage("Choose permanents to untap");
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
if( !inp.hasCancelled() ) if( !inp.hasCancelled() )
for(Card c : inp.getSelected()) for(Card c : inp.getSelected())
c.untap(); c.untap();

2
forge-gui/src/main/java/forge/gui/input/InputPlayOrDraw.java
View File

@@ -40,6 +40,8 @@ public class InputPlayOrDraw extends InputSyncronizedBase {
firstGame = isFirstGame; firstGame = isFirstGame;
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final void showMessage() { public final void showMessage() {

6
forge-gui/src/main/java/forge/gui/input/InputSyncronizedBase.java
View File

@@ -27,6 +27,12 @@ public abstract class InputSyncronizedBase extends InputBase implements InputSyn
cdlDone.countDown(); cdlDone.countDown();
} }
public void showAndWait() {
Singletons.getControl().getInputQueue().setInput(this);
awaitLatchRelease();
}
protected final void stop() { protected final void stop() {
onStop(); onStop();

4
forge-gui/src/main/java/forge/gui/input/InputYesOrNo.java
View File

@@ -17,7 +17,7 @@
*/ */
package forge.gui.input; package forge.gui.input;
import forge.Singletons;
import forge.view.ButtonUtil; import forge.view.ButtonUtil;
/** /**
* <p> * <p>
@@ -41,7 +41,7 @@ public class InputYesOrNo extends InputSyncronizedBase {
} }
public static boolean ask(String message0, String yesButtonText0, String noButtonText0, boolean defaultYes0) { public static boolean ask(String message0, String yesButtonText0, String noButtonText0, boolean defaultYes0) {
InputYesOrNo inp = new InputYesOrNo(message0, yesButtonText0, noButtonText0, defaultYes0); InputYesOrNo inp = new InputYesOrNo(message0, yesButtonText0, noButtonText0, defaultYes0);
Singletons.getControl().getInputQueue().setInputAndWait(inp); inp.showAndWait();
return inp.getResult(); return inp.getResult();
} }