diff --git a/src/main/java/forge/control/input/InputQueue.java b/src/main/java/forge/control/input/InputQueue.java index 8ea55638524..96a21036da9 100644 --- a/src/main/java/forge/control/input/InputQueue.java +++ b/src/main/java/forge/control/input/InputQueue.java @@ -62,7 +62,7 @@ public class InputQueue extends MyObservable implements java.io.Serializable { * @param in * a {@link forge.control.input.InputBase} object. */ - public final void setInput(final Input in) { + private final void setInput(final Input in) { //System.out.println(in.getClass().getName()); this.inputStack.push(in); // System.out.print("Current: " + input + "; Stack = " + inputStack); @@ -99,7 +99,7 @@ public class InputQueue extends MyObservable implements java.io.Serializable { * @param update * a boolean. */ - public final void removeInput(Input inp) { + final void removeInput(Input inp) { FThreads.assertExecutedByEdt(false); Input topMostInput = inputStack.isEmpty() ? null : inputStack.pop(); diff --git a/src/main/java/forge/gui/InputProxy.java b/src/main/java/forge/gui/InputProxy.java index 670b24931a4..702db29bcf7 100644 --- a/src/main/java/forge/gui/InputProxy.java +++ b/src/main/java/forge/gui/InputProxy.java @@ -53,8 +53,8 @@ public class InputProxy implements Observer { } @Override - public final synchronized void update(final Observable observable, final Object obj) { - //synchronized(this) {} // want to update all changes to memory + public final void update(final Observable observable, final Object obj) { + synchronized(this) {} // want to update all changes to memory FThreads.assertExecutedByEdt(false); final PhaseHandler ph = game.getPhaseHandler(); @@ -76,7 +76,7 @@ public class InputProxy implements Observer { }; if( nextInput instanceof InputAutoPassPriority ) - nextInput.showMessage(game.getInputQueue()); + ph.getPriorityPlayer().getController().passPriority(); else FThreads.invokeInEdtLater(showMessage); }