Code clean up and reformatting

6 files changed, 78 insertions, 54 deletions

diff --git a/src/ch/epfl/xblast/ArgumentChecker.java b/src/ch/epfl/xblast/ArgumentChecker.java
index 311807e..589c197 100644
--- a/src/ch/epfl/xblast/ArgumentChecker.java
+++ b/src/ch/epfl/xblast/ArgumentChecker.java
@@ -16,11 +16,10 @@ public final class ArgumentChecker {
      * @throws IllegalArgumentException if the value is inferior to 0
      */
     public static int requireNonNegative(int value) {
-        if (value >= 0) {
+        if (value >= 0)
             return value;
-        } else {
+        else
             throw new IllegalArgumentException();
-        }
     }
 
 }
diff --git a/src/ch/epfl/xblast/Time.java b/src/ch/epfl/xblast/Time.java
index d39c3e3..7c84257 100644
--- a/src/ch/epfl/xblast/Time.java
+++ b/src/ch/epfl/xblast/Time.java
@@ -1,6 +1,13 @@
 package ch.epfl.xblast;
 
+/**
+ * Time unit constants.
+ *
+ * @author Pacien TRAN-GIRARD (261948)
+ * @author Timothée FLOURE (257420)
+ */
 public interface Time {
+
     /**
      * Number of seconds per minute.
      */
@@ -14,10 +21,11 @@ public interface Time {
     /**
      * Number of microseconds per second.
      */
-    int US_PER_S = 1000*MS_PER_S;
+    int US_PER_S = 1000 * MS_PER_S;
 
     /**
      * Number of nanoseconds per second.
      */
-    int NS_PER_S = 1000*US_PER_S;
+    int NS_PER_S = 1000 * US_PER_S;
+
 }
diff --git a/src/ch/epfl/xblast/server/Block.java b/src/ch/epfl/xblast/server/Block.java
index fff3819..c90a469 100644
--- a/src/ch/epfl/xblast/server/Block.java
+++ b/src/ch/epfl/xblast/server/Block.java
@@ -31,12 +31,12 @@ public enum Block {
     CRUMBLING_WALL,
 
     /**
-     * Bonus increasing the maximun number of bombs.
+     * Bonus increasing the maximum number of bombs.
      */
     BONUS_BOMB(Bonus.INC_BOMB),
 
     /**
-     * Nomus increasing the range of the bombs.
+     * Bonus increasing the range of the bombs.
      */
     BONUS_RANGE(Bonus.INC_RANGE);
 
@@ -87,7 +87,7 @@ public enum Block {
     }
 
     /**
-     * Returns T(this block is a bonus)
+     * Returns T(this block is a bonus).
      *
      * @return T(this block is a bonus)
      */
@@ -96,15 +96,13 @@ public enum Block {
     }
 
     /**
-     * Return the bonus associated with the block.
+     * Returns the bonus associated with the block.
      *
-     * @throws NoSuchElementException if there is no such bonus.
      * @return the bonus associated with the block.
+     * @throws NoSuchElementException if there is no such bonus.
      */
     public Bonus associatedBonus() {
-        if (this.maybeAssociatedBonus == null) {
-            throw new NoSuchElementException();
-        }
+        if (this.maybeAssociatedBonus == null) throw new NoSuchElementException();
         return this.maybeAssociatedBonus;
     }
 
diff --git a/src/ch/epfl/xblast/server/Bonus.java b/src/ch/epfl/xblast/server/Bonus.java
index 81ae7dd..09a2248 100644
--- a/src/ch/epfl/xblast/server/Bonus.java
+++ b/src/ch/epfl/xblast/server/Bonus.java
@@ -1,24 +1,33 @@
 package ch.epfl.xblast.server;
 
 /**
- * @author TimothéE FLOURE (257420)
+ * Bonuses.
+ *
+ * @author Pacien TRAN-GIRARD (261948)
+ * @author Timothée FLOURE (257420)
  */
 public enum Bonus {
 
     /**
-     * Increase the maximum number of bombs used simultaneously.
+     * Increases the maximum number of bombs used simultaneously.
      */
     INC_BOMB {
-    @Override
-        public Player applyTo(Player player) { return null;  }
+        @Override
+        public Player applyTo(Player player) {
+            // TODO
+            return null;
+        }
     },
 
     /**
-     * Increase the range of the bombs.
+     * Increases the range of the bombs.
      */
     INC_RANGE {
-    @Override
-        public Player applyTo(Player player) { return null; }
+        @Override
+        public Player applyTo(Player player) {
+            // TODO
+            return null;
+        }
     };
 
     /**
@@ -27,4 +36,5 @@ public enum Bonus {
      * @param player receiving the bonus
      */
     abstract public Player applyTo(Player player);
+
 }
diff --git a/src/ch/epfl/xblast/server/GameState.java b/src/ch/epfl/xblast/server/GameState.java
index 3bd1961..e7e6ca7 100644
--- a/src/ch/epfl/xblast/server/GameState.java
+++ b/src/ch/epfl/xblast/server/GameState.java
@@ -1,17 +1,22 @@
 package ch.epfl.xblast.server;
 
+import ch.epfl.cs108.Sq;
+import ch.epfl.xblast.ArgumentChecker;
+import ch.epfl.xblast.Cell;
+import ch.epfl.xblast.PlayerID;
+
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.Objects;
-import java.util.ArrayList;
 import java.util.Optional;
-import ch.epfl.xblast.*;
-import ch.epfl.cs108.Sq;
+import java.util.stream.Collectors;
 
 /**
+ * GameState representing the current game state.
+ *
+ * @author Pacien TRAN-GIRARD (261948)
  * @author Timothée FLOURE (257420)
  */
-
 public final class GameState {
 
     private final int ticks;
@@ -24,8 +29,8 @@ public final class GameState {
     /**
      * Compute the next state of a blast.
      *
-     * @param blasts0 existing particles
-     * @param board0 the game's board
+     * @param blasts0     existing particles
+     * @param board0      the game's board
      * @param explosions0 active explosions
      * @return the position of the explosion's particles for the next state.
      */
@@ -43,16 +48,16 @@ public final class GameState {
     }
 
     /**
-     * Instanciates a new GameState.
+     * Instantiates a new GameState.
      *
-     * @param ticks thie tick corresponding to the state
-     * @param board the game's board
-     * @param players list of the players
-     * @param bombs list of the bombs
+     * @param ticks      the tick corresponding to the state
+     * @param board      the game's board
+     * @param players    list of the players
+     * @param bombs      list of the bombs
      * @param explosions list of the explosions
-     * @param blasts
+     * @param blasts     list of particle blasts