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

prepared a ground to run AI inputs skipping EDT thread

Browse Source
This commit is contained in:
Maxmtg
2013-03-29 09:13:27 +00:00
parent 2f596e68fb
commit ac31e95453
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -13881,6 +13881,7 @@ src/main/java/forge/game/PlanarDice.java -text
src/main/java/forge/game/PlayerStartConditions.java -text src/main/java/forge/game/PlayerStartConditions.java -text
src/main/java/forge/game/ai/AiAttackController.java svneol=native#text/plain src/main/java/forge/game/ai/AiAttackController.java svneol=native#text/plain
src/main/java/forge/game/ai/AiController.java svneol=native#text/plain src/main/java/forge/game/ai/AiController.java svneol=native#text/plain
src/main/java/forge/game/ai/AiInput.java -text
src/main/java/forge/game/ai/AiInputBlock.java -text src/main/java/forge/game/ai/AiInputBlock.java -text
src/main/java/forge/game/ai/AiInputCommon.java svneol=native#text/plain src/main/java/forge/game/ai/AiInputCommon.java svneol=native#text/plain
src/main/java/forge/game/ai/AiProfileUtil.java -text src/main/java/forge/game/ai/AiProfileUtil.java -text

8
src/main/java/forge/game/ai/AiInput.java Normal file
View File

@@ -0,0 +1,8 @@
package forge.game.ai;
import forge.control.input.Input;
// This interface indicates that the showMessage has to be invoked in a new pooled thread, not EDT.
public interface AiInput extends Input {
}

2
src/main/java/forge/game/ai/AiInputCommon.java
View File

@@ -28,7 +28,7 @@ import forge.control.input.InputBase;
* @author Forge * @author Forge
* @version $Id$ * @version $Id$
*/ */
public class AiInputCommon extends InputBase { public class AiInputCommon extends InputBase implements AiInput {
/** Constant <code>serialVersionUID=-3091338639571662216L</code>. */ /** Constant <code>serialVersionUID=-3091338639571662216L</code>. */
private static final long serialVersionUID = -3091338639571662216L; private static final long serialVersionUID = -3091338639571662216L;

7
src/main/java/forge/gui/InputProxy.java
View File

@@ -26,6 +26,7 @@ import forge.FThreads;
import forge.control.input.Input; import forge.control.input.Input;
import forge.game.GameState; import forge.game.GameState;
import forge.game.MatchController; import forge.game.MatchController;
import forge.game.ai.AiInput;
import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseHandler;
import forge.game.player.Player; import forge.game.player.Player;
@@ -70,7 +71,11 @@ public class InputProxy implements Observer {
if (nextInput != null) { if (nextInput != null) {
this.input.set(nextInput); this.input.set(nextInput);
FThreads.invokeInEDT(new Runnable() { @Override public void run() { nextInput.showMessage(); } }); Runnable showMessage = new Runnable() { @Override public void run() { nextInput.showMessage(); } };
// if( nextInput instanceof AiInput )
// FThreads.invokeInNewThread(showMessage, true);
// else
FThreads.invokeInEDT(showMessage);
} else if (!ph.isPlayerPriorityAllowed()) { } else if (!ph.isPlayerPriorityAllowed()) {
ph.getPriorityPlayer().getController().passPriority(); ph.getPriorityPlayer().getController().passPriority();
} }