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

Changed stack of inputs to a concurrent-ready structure.

Browse Source
This commit is contained in:
Maxmtg
2013-04-06 23:28:19 +00:00
parent 2ad0b57bdc
commit 726e350baa
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/forge/control/input/InputControl.java
View File

@@ -17,7 +17,8 @@
*/
package forge.control.input;
import java.util.Stack;
import java.util.concurrent.BlockingDeque;
import java.util.concurrent.LinkedBlockingDeque;
import forge.Singletons;
import forge.game.GameAge;
@@ -44,7 +45,7 @@ public class InputControl extends MyObservable implements java.io.Serializable {
/** Constant <code>serialVersionUID=3955194449319994301L</code>. */
private static final long serialVersionUID = 3955194449319994301L;
private final Stack<Input> inputStack = new Stack<Input>();
private final BlockingDeque<Input> inputStack = new LinkedBlockingDeque<Input>();
private final MatchController match;
public InputControl(MatchController matchController) {
@@ -133,9 +134,9 @@ public class InputControl extends MyObservable implements java.io.Serializable {
if ( age != GameAge.Play )
return inputLock;
if (!this.inputStack.isEmpty()) { // incoming input to Control
return this.inputStack.peek();
}
Input topMost = inputStack.peek(); // incoming input to Control
if (topMost != null )
return topMost;
final PhaseHandler handler = game.getPhaseHandler();
final PhaseType phase = handler.getPhase();