Merge pull request #95 from rubenpirreram/GUI

G UI

src/main/java/it/polimi/ingsw/gc14/Model/Game.java

@@ -122,7 +122,7 @@ public class Game implements Serializable {
     /**
      * The order logic card associated with this game.
      */
-    private OrderLogicCard orderLogicCard;
+    public OrderLogicCard orderLogicCard;
 
     /**
      * The board associated with this game.

src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java

@@ -123,16 +123,17 @@ public abstract class OrderLogicCard implements Serializable {
     }
 
     /**
+     * TODO rifare javadoc
      * Returns the {@code Player}'s position based on it's {@code Username}.
      * @param username The desired {@code Player}'s username.
      * @return {@code int} - the {@code Player}'s position.
      * @see Player
      */
-    protected int getPosition(String username)
+    public int getPosition(String username)
     {
         int pos = 0;
-        for (Player p : players) {
-            if (p.getUserName().equals(username))
+        for (OrderPlayer p : playerList) {
+            if (p.player.getUserName().equals(username))
                 return pos;
             pos++;
         }