From 0b40c8bb923539ec8b4ad4be52153f9c92574519 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Fri, 17 Apr 2020 13:11:09 +0200
Subject: [PATCH] =?UTF-8?q?Utf=C3=B8rer=20sm=C3=A5=20endringer=20i=20komme?=
 =?UTF-8?q?ntarer,=20navngiving=20og=20kodestil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networking/containers/GameStartInfo.java  | 10 ++++++++-
 .../containers/PowerdownContainer.java        | 21 ++++++++++++++-----
 .../fiasko/roborally/objects/Phase.java       |  4 ++--
 .../roborally/objects/RoboRallyGame.java      |  2 +-
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/main/java/inf112/fiasko/roborally/networking/containers/GameStartInfo.java b/src/main/java/inf112/fiasko/roborally/networking/containers/GameStartInfo.java
index b10ada8..de98d3b 100644
--- a/src/main/java/inf112/fiasko/roborally/networking/containers/GameStartInfo.java
+++ b/src/main/java/inf112/fiasko/roborally/networking/containers/GameStartInfo.java
@@ -13,14 +13,22 @@ public class GameStartInfo {
     private String playerName;
 
     /**
-     * Empty initialization method used by kryo
+     * Empty initialization method required by kryo
      */
     public GameStartInfo() {}
 
+    /**
+     * Sets the player name of the current player
+     * @param playerName The player name of the current player
+     */
     public void setPlayerName(String playerName) {
         this.playerName = playerName;
     }
 
+    /**
+     * Gets the player name of the current player
+     * @return The player name of the current player
+     */
     public String getPlayerName() {
         return playerName;
     }
diff --git a/src/main/java/inf112/fiasko/roborally/networking/containers/PowerdownContainer.java b/src/main/java/inf112/fiasko/roborally/networking/containers/PowerdownContainer.java
index 2b0413b..0bd6880 100644
--- a/src/main/java/inf112/fiasko/roborally/networking/containers/PowerdownContainer.java
+++ b/src/main/java/inf112/fiasko/roborally/networking/containers/PowerdownContainer.java
@@ -2,14 +2,25 @@ package inf112.fiasko.roborally.networking.containers;
 
 import java.util.Map;
 
+/**
+ * This class is used to contain power down status for all players
+ */
 public class PowerdownContainer {
-    private Map<String,Boolean> powerdown;
+    private final Map<String, Boolean> powerDown;
 
-    public PowerdownContainer(Map<String, Boolean> powerdown) {
-        this.powerdown = powerdown;
+    /**
+     * Instantiates a new power down container
+     * @param powerDown A map between player names and whether they should remain in power down
+     */
+    public PowerdownContainer(Map<String, Boolean> powerDown) {
+        this.powerDown = powerDown;
     }
 
-    public Map<String, Boolean> getPowerdown() {
-        return powerdown;
+    /**
+     * Gets the power down map stored in the container
+     * @return A map between player name and stay in power down
+     */
+    public Map<String, Boolean> getPowerDown() {
+        return powerDown;
     }
 }
diff --git a/src/main/java/inf112/fiasko/roborally/objects/Phase.java b/src/main/java/inf112/fiasko/roborally/objects/Phase.java
index f581739..648b9ff 100644
--- a/src/main/java/inf112/fiasko/roborally/objects/Phase.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/Phase.java
@@ -9,9 +9,9 @@ import java.util.concurrent.TimeUnit;
  * This class handles everything that should happen during a phase
  */
 public class Phase {
-    private Board gameBoard;
+    private final Board gameBoard;
     private final List<Player> playerList;
-    private int cycleDelay;
+    private final int cycleDelay;
     private List<BoardElementContainer<Tile>> cogwheels;
     private List<BoardElementContainer<Tile>> conveyorBelts;
     private List<BoardElementContainer<Tile>> fastConveyorBelts;
diff --git a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
index 19ff2b7..3c5b593 100644
--- a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
@@ -183,7 +183,7 @@ public class RoboRallyGame implements IRoboRallyGame {
     @Override
     public void receiveStayInPowerDown(PowerdownContainer powerDowns) {
         for (Player player : playerList) {
-            player.setPowerDownNextRound(powerDowns.getPowerdown().get(player.getName()));
+            player.setPowerDownNextRound(powerDowns.getPowerDown().get(player.getName()));
         }
         respawnRobots();
         resetHasTouchedFlagThisTurnForAllRobots();