1 files changed, 22 insertions, 22 deletions

diff --git a/src/ch/epfl/xblast/server/Server.java b/src/ch/epfl/xblast/server/Server.java
index 3f486c6..074b2a7 100644
--- a/src/ch/epfl/xblast/server/Server.java
+++ b/src/ch/epfl/xblast/server/Server.java
@@ -34,7 +34,7 @@ public class Server {
     public static final byte OBSERVER = -1;
 
     /**
-     * Print a log message on the console.
+     * Prints a log message on the console.
      *
      * @param message message to be printed
      */
@@ -48,7 +48,7 @@ public class Server {
     private static class Channel {
 
         /**
-         * Transform a list of bytes to an array of bytes.
+         * Transforms a list of bytes to an array of bytes.
          *
          * @param l the given list of bytes
          * @return the array built from the given list
@@ -63,7 +63,7 @@ public class Server {
         }
 
         /**
-         * Create the socket which will be listened.
+         * Creates the socket which will be listened to.
          *
          * @param host hostname
          * @param port port to be listened
@@ -77,7 +77,7 @@ public class Server {
         }
 
         /**
-         * Open a UDP channel.
+         * Open an UDP channel.
          *
          * @param iface listened socket
          * @return a UDP channel
@@ -119,7 +119,7 @@ public class Server {
         }
 
         /**
-         * Close the channel.
+         * Closes the channel.
          */
         void closeChannel() {
             try {
@@ -130,9 +130,9 @@ public class Server {
         }
 
         /**
-         * Accept the registration of a new client.
+         * Accepts the registration of a new client.
          *
-         * @param registrations
+         * @param registrations number of expected registrations
          * @return a list of the clients.
          */
         List<SocketAddress> acceptRegistrations(int registrations) {
@@ -148,7 +148,7 @@ public class Server {
         }
 
         /**
-         * Collect actions from the players.
+         * Collects actions from the players.
          *
          * @return a list map containing the actions related to each player
          */
@@ -166,10 +166,10 @@ public class Server {
         }
 
         /**
-         * Send data through the socket.
+         * Sends data through the socket.
          *
          * @param content data to be send
-         * @param dst recepient of the data
+         * @param dst recipient of the data
          */
         void send(List<Byte> content, SocketAddress dst) {
             try {
@@ -181,9 +181,9 @@ public class Server {
         }
 
         /**
-         * Receive a Byte from the socket.
+         * Receives a Byte from the socket.
          *
-         * @param block
+         * @param block wait for an incoming byte before returning
          * @return an Optional containing the received data
          */
         private Optional<Map.Entry<SocketAddress, Byte>> receiveByte(boolean block) {
@@ -202,9 +202,9 @@ public class Server {
         }
 
         /**
-         * Receive a player action from the socket.
+         * Receives a player action from the socket.
          *
-         * @param block
+         * @param block wait for an incoming action before returning
          * @return an Optional containing the received player action
          */
         private Optional<Map.Entry<SocketAddress, PlayerAction>> receiveAction(boolean block) {
@@ -218,7 +218,7 @@ public class Server {
         }
 
         /**
-         * Accept an action from the socket.
+         * Accepts an action from the socket.
          *
          * @return the accepted action
          */
@@ -233,7 +233,7 @@ public class Server {
         }
 
         /**
-         * Accept the registration of a player
+         * Accepts the registration of a player.
          *
          * @return the address of the new player
          */
@@ -254,7 +254,7 @@ public class Server {
     private final Channel channel;
 
     /**
-     * Required number of player to start a game (up to 4).
+     * Required number of player to start a game.
      */
     private final int expectedClients;
 
@@ -277,7 +277,7 @@ public class Server {
     }
 
     /**
-     * Run the whole server.
+     * Runs the whole server.
      */
     public void run() {
         log("Starting the server...");
@@ -287,7 +287,7 @@ public class Server {
     }
 
     /**
-     * Handle the registration of new clients.
+     * Handles the registration of new clients.
      */
     private void acceptClientRegistrations() {
         List<SocketAddress> clients = this.channel.acceptRegistrations(this.expectedClients);
@@ -296,7 +296,7 @@ public class Server {
     }
 
     /**
-     * Launch the Game.
+     * Launches the Game.
      */
     private void runGame() {
         GameState gameState = GameState.DEFAULT_GAME_STATE;
@@ -314,7 +314,7 @@ public class Server {
     }
 
     /**
-     * Update the given GameState to the next tick.
+     * Updates the given GameState to the next tick.
      *
      * @param gs the given GameState
      * @return the updated GameState
@@ -325,7 +325,7 @@ public class Server {
     }
 
     /**
-     * Send the GameState to every player.
+     * Sends the GameState to every player.
      *
      * @param gs the GameState to be send.
      */