From ce341302a32a24ba60d470c9570598f30c9edcf1 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Mon, 13 Jan 2014 06:23:32 +0000
Subject: [PATCH] renamed createIngamePlayer method to minimize confusion

---
 forge-gui/src/main/java/forge/game/Game.java                    | 2 +-
 forge-gui/src/main/java/forge/game/player/LobbyPlayer.java      | 2 +-
 forge-gui/src/main/java/forge/game/player/LobbyPlayerAi.java    | 2 +-
 .../src/main/java/forge/game/player/LobbyPlayerRemote.java      | 2 +-
 forge-gui/src/main/java/forge/gui/player/LobbyPlayerHuman.java  | 2 +-
 .../forge/gamesimulationtests/util/LobbyPlayerForTests.java     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/forge-gui/src/main/java/forge/game/Game.java b/forge-gui/src/main/java/forge/game/Game.java
index 982885d9de5..de73f1b3fc1 100644
--- a/forge-gui/src/main/java/forge/game/Game.java
+++ b/forge-gui/src/main/java/forge/game/Game.java
@@ -98,7 +98,7 @@ public class Game {
         roIngamePlayers = Collections.unmodifiableList(ingamePlayers);
 
         for (RegisteredPlayer psc : players0) {
-            Player pl = psc.getPlayer().getPlayer(this);
+            Player pl = psc.getPlayer().createIngamePlayer(this);
             players.add(pl);
             ingamePlayers.add(pl);
 
diff --git a/forge-gui/src/main/java/forge/game/player/LobbyPlayer.java b/forge-gui/src/main/java/forge/game/player/LobbyPlayer.java
index 4d577f7453e..28546e67dea 100644
--- a/forge-gui/src/main/java/forge/game/player/LobbyPlayer.java
+++ b/forge-gui/src/main/java/forge/game/player/LobbyPlayer.java
@@ -84,7 +84,7 @@ public abstract class LobbyPlayer implements IHasIcon {
         this.avatarIndex = avatarIndex;
     }
 
-    public abstract Player getPlayer(Game gameState); // factory method to create player
+    public abstract Player createIngamePlayer(Game gameState); // factory method to create player
     public abstract PlayerController createControllerFor(Player p);
 
     public abstract void hear(LobbyPlayer player, String message);
diff --git a/forge-gui/src/main/java/forge/game/player/LobbyPlayerAi.java b/forge-gui/src/main/java/forge/game/player/LobbyPlayerAi.java
index 7a8a902486b..5c1b2b4bc02 100644
--- a/forge-gui/src/main/java/forge/game/player/LobbyPlayerAi.java
+++ b/forge-gui/src/main/java/forge/game/player/LobbyPlayerAi.java
@@ -31,7 +31,7 @@ public class LobbyPlayerAi extends LobbyPlayer {
     }
     
     @Override
-    public Player getPlayer(Game game) {
+    public Player createIngamePlayer(Game game) {
         Player ai = new Player(getName(), game);
         ai.setFirstController(createControllerFor(ai));
 
diff --git a/forge-gui/src/main/java/forge/game/player/LobbyPlayerRemote.java b/forge-gui/src/main/java/forge/game/player/LobbyPlayerRemote.java
index f40158c6d57..2907e357593 100644
--- a/forge-gui/src/main/java/forge/game/player/LobbyPlayerRemote.java
+++ b/forge-gui/src/main/java/forge/game/player/LobbyPlayerRemote.java
@@ -22,7 +22,7 @@ public class LobbyPlayerRemote extends LobbyPlayer {
      * @see forge.game.player.LobbyPlayer#getPlayer(forge.game.GameState)
      */
     @Override
-    public Player getPlayer(Game gameState) {
+    public Player createIngamePlayer(Game gameState) {
         // Cannot create remote players yet 
         throw new UnsupportedOperationException("method is not implemented");
     }
diff --git a/forge-gui/src/main/java/forge/gui/player/LobbyPlayerHuman.java b/forge-gui/src/main/java/forge/gui/player/LobbyPlayerHuman.java
index 2f56493b67a..6c3b5d9ade2 100644
--- a/forge-gui/src/main/java/forge/gui/player/LobbyPlayerHuman.java
+++ b/forge-gui/src/main/java/forge/gui/player/LobbyPlayerHuman.java
@@ -26,7 +26,7 @@ public class LobbyPlayerHuman extends LobbyPlayer {
     }
     
     @Override
-    public Player getPlayer(Game game) {
+    public Player createIngamePlayer(Game game) {
         Player player = new Player(GuiDisplayUtil.personalizeHuman(getName()), game);
         player.setFirstController(new PlayerControllerHuman(game, player, this));
         
diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java
index 420b478f08e..85ac58215fa 100644
--- a/forge-gui/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java
+++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java
@@ -33,7 +33,7 @@ public class LobbyPlayerForTests extends LobbyPlayer {
 	}
 
 	@Override
-	public Player getPlayer( Game gameState ) {
+	public Player createIngamePlayer( Game gameState ) {
 		Player dummyPlayer = new Player( getName(), gameState );
 		dummyPlayer.setFirstController( createControllerFor( dummyPlayer ) );
 		return dummyPlayer;