From eed7fbbabf8c09ec53b1167ed84fca0ed7e5868d Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sun, 9 Mar 2014 21:20:08 +0000
Subject: [PATCH] Support passing priority

---
 forge-m-base/src/forge/FThreads.java                   |  4 +++-
 .../forge/screens/constructed/ConstructedScreen.java   | 10 ++++------
 .../forge/screens/match/FControlGameEventHandler.java  |  9 ++++++---
 .../screens/match/input/InputPlaybackControl.java      |  4 ----
 .../src/forge/screens/match/input/InputQueue.java      |  7 ++-----
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/forge-m-base/src/forge/FThreads.java b/forge-m-base/src/forge/FThreads.java
index 5394723501d..f8df8077894 100644
--- a/forge-m-base/src/forge/FThreads.java
+++ b/forge-m-base/src/forge/FThreads.java
@@ -2,6 +2,8 @@ package forge;
 
 import java.io.PrintStream;
 
+import com.badlogic.gdx.Gdx;
+
 import forge.util.ThreadUtil;
 
 /** 
@@ -16,7 +18,7 @@ public class FThreads {
     }
 
     public static void invokeInEdtLater(Runnable runnable) {
-        //SwingUtilities.invokeLater(runnable);
+        Gdx.app.postRunnable(runnable);
     }
 
     public static void invokeInEdtNowOrLater(Runnable proc) {
diff --git a/forge-m-base/src/forge/screens/constructed/ConstructedScreen.java b/forge-m-base/src/forge/screens/constructed/ConstructedScreen.java
index 1c06868fcb5..dc740bee7b1 100644
--- a/forge-m-base/src/forge/screens/constructed/ConstructedScreen.java
+++ b/forge-m-base/src/forge/screens/constructed/ConstructedScreen.java
@@ -1,10 +1,10 @@
 package forge.screens.constructed;
 
-import forge.ai.LobbyPlayerAi;
 import forge.deck.Deck;
 import forge.game.GameType;
+import forge.game.player.LobbyPlayer;
 import forge.game.player.RegisteredPlayer;
-import forge.player.LobbyPlayerHuman;
+import forge.net.FServer;
 import forge.screens.LaunchScreen;
 import forge.utils.Utils;
 
@@ -25,15 +25,13 @@ public class ConstructedScreen extends LaunchScreen {
 
         //TODO: Allow picking decks
         Deck humanDeck = Utils.generateRandomDeck(2);
-        LobbyPlayerHuman humanLobbyPlayer = new LobbyPlayerHuman("Human");
-        humanLobbyPlayer.setAvatarIndex(0);
+        LobbyPlayer humanLobbyPlayer = FServer.getLobby().getGuiPlayer();
         RegisteredPlayer humanRegisteredPlayer = new RegisteredPlayer(humanDeck);
         humanRegisteredPlayer.setPlayer(humanLobbyPlayer);
         launchParams.players.add(humanRegisteredPlayer);
 
         Deck aiDeck = Utils.generateRandomDeck(2);
-        LobbyPlayerAi aiLobbyPlayer = new LobbyPlayerAi("AI Player");
-        aiLobbyPlayer.setAvatarIndex(1);
+        LobbyPlayer aiLobbyPlayer = FServer.getLobby().getAiPlayer();
         RegisteredPlayer aiRegisteredPlayer = new RegisteredPlayer(aiDeck);
         aiRegisteredPlayer.setPlayer(aiLobbyPlayer);
         launchParams.players.add(aiRegisteredPlayer);
diff --git a/forge-m-base/src/forge/screens/match/FControlGameEventHandler.java b/forge-m-base/src/forge/screens/match/FControlGameEventHandler.java
index ad928ea108c..f6245adc5f7 100644
--- a/forge-m-base/src/forge/screens/match/FControlGameEventHandler.java
+++ b/forge-m-base/src/forge/screens/match/FControlGameEventHandler.java
@@ -118,9 +118,12 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
         return null;
     }
 
-    private final Runnable unlockGameThreadOnGameOver = new Runnable() { @Override public void run() {
-        FControl.getInputQueue().onGameOver(true); // this will unlock any game threads waiting for inputs to complete
-    } };
+    private final Runnable unlockGameThreadOnGameOver = new Runnable() {
+        @Override
+        public void run() {
+            FControl.getInputQueue().onGameOver(true); // this will unlock any game threads waiting for inputs to complete
+        }
+    };
 
     @Override
     public Void visit(GameEventGameOutcome ev) {
diff --git a/forge-m-base/src/forge/screens/match/input/InputPlaybackControl.java b/forge-m-base/src/forge/screens/match/input/InputPlaybackControl.java
index 8ddd1d652d7..9ce5b4a6d3e 100644
--- a/forge-m-base/src/forge/screens/match/input/InputPlaybackControl.java
+++ b/forge-m-base/src/forge/screens/match/input/InputPlaybackControl.java
@@ -3,10 +3,6 @@ package forge.screens.match.input;
 import forge.screens.match.FControl;
 import forge.screens.match.FControlGamePlayback;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
 public class InputPlaybackControl extends InputSyncronizedBase implements InputSynchronized {
     private static final long serialVersionUID = 7979208993306642072L;
 
diff --git a/forge-m-base/src/forge/screens/match/input/InputQueue.java b/forge-m-base/src/forge/screens/match/input/InputQueue.java
index 6880d42aae9..f4c9de7ee9f 100644
--- a/forge-m-base/src/forge/screens/match/input/InputQueue.java
+++ b/forge-m-base/src/forge/screens/match/input/InputQueue.java
@@ -69,7 +69,7 @@ public class InputQueue extends Observable {
             return topMost;
         }
         return inputLock;
-    } // getInput()
+    }
 
     // only for debug purposes
     public String printInputStack() {
@@ -88,9 +88,6 @@ public class InputQueue extends Observable {
         }
     }
 
-    /**
-     * TODO: Write javadoc for this method.
-     */
     public void onGameOver(boolean releaseAllInputs) {
         for (InputSynchronized inp : inputStack) {
             inp.relaseLatchWhenGameIsOver();
@@ -99,4 +96,4 @@ public class InputQueue extends Observable {
             }
         }
     }
-} // InputControl
+}