2 files changed, 30 insertions, 38 deletions

diff --git a/src/ch/epfl/xblast/server/Board.java b/src/ch/epfl/xblast/server/Board.java
index 4d2e743..5e03671 100644
--- a/src/ch/epfl/xblast/server/Board.java
+++ b/src/ch/epfl/xblast/server/Board.java
@@ -32,15 +32,12 @@ public final class Board {
      * @throws IllegalArgumentException if the matrix does not comply with the given sizes.
      */
     private static void checkBlockMatrix(List<List<Block>> matrix, int rows, int columns) {
-        if (matrix.size() != rows) {
+        if (matrix == null || matrix.size() != rows)
             throw new IllegalArgumentException();
-        } else {
-            for (int i = 0; i < rows; i++) {
-                if (matrix.get(i).size() != columns) {
-                    throw new IllegalArgumentException();
-                }
-            }
-        }
+
+        for (int i = 0; i < rows; i++)
+            if (matrix.get(i).size() != columns)
+                throw new IllegalArgumentException();
     }
 
     /**
@@ -55,9 +52,9 @@ public final class Board {
      * @throws IllegalArgumentException if the blocks is not composed of BLOC_LIST_SIZE elements
      */
     public Board(List<Sq<Block>> blocks) {
-        if (blocks.size() != BLOCKS_LIST_SIZE) {
+        if (blocks == null || blocks.size() != BLOCKS_LIST_SIZE)
             throw new IllegalArgumentException();
-        }
+
         this.blocks = blocks;
     }
 
@@ -72,11 +69,9 @@ public final class Board {
         checkBlockMatrix(rows, BOARD_ROWS, BOARD_COLUMNS);
         List<Sq<Block>> blocksSequence = new ArrayList<>();
 
-        for (int i = 0; i < rows.size(); i++) {
-            for (int j = 0; j < rows.get(i).size(); j++) {
-                blocksSequence.add(Sq.constant(rows.get(i).get(j)));
-            }
-        }
+        for (List<Block> row : rows)
+            for (Block aRow : row)
+                blocksSequence.add(Sq.constant(aRow));
 
         return new Board(blocksSequence);
     }
@@ -93,12 +88,10 @@ public final class Board {
         List<List<Block>> rowsList = new ArrayList<>();
         List<Block> wallLine = new ArrayList<>();
 
-        for (int i = 0; i < BOARD_COLUMNS; i++) {
+        for (int i = 0; i < BOARD_COLUMNS; i++)
             wallLine.add(Block.INDESTRUCTIBLE_WALL);
-        }
 
-        for (int i = 0; i < innerBlocks.size(); i++) {
-            List<Block> row = innerBlocks.get(i);
+        for (List<Block> row : innerBlocks) {
             row.add(0, Block.INDESTRUCTIBLE_WALL);
             row.add(Block.INDESTRUCTIBLE_WALL);
 
@@ -123,9 +116,9 @@ public final class Board {
         List<List<Block>> rowsList = new ArrayList<>();
         List<List<Block>> halfInnerBoard = Lists.mirrored(quadrantNWBlocks);
 
-        for (int i = 0; i < halfInnerBoard.size(); i++) {
-            rowsList.add(Lists.mirrored(halfInnerBoard.get(i)));
-        }
+        for (List<Block> aHalfInnerBoard : halfInnerBoard)
+            rowsList.add(Lists.mirrored(aHalfInnerBoard));
+
         return ofInnerBlocksWalled(rowsList);
     }
 
diff --git a/test/ch/epfl/xblast/server/BoardTest.java b/test/ch/epfl/xblast/server/BoardTest.java
index 5cf2aef..014bd17 100644
--- a/test/ch/epfl/xblast/server/BoardTest.java
+++ b/test/ch/epfl/xblast/server/BoardTest.java
@@ -26,9 +26,8 @@ public class BoardTest {
     public void isBoardBuilderIllegalInputThrowingException() {
         List<Sq<Block>> blocks = new ArrayList<>();
 
-        for (int i = 0; i < 8; i++) {
+        for (int i = 0; i < 8; i++)
             blocks.add(Sq.constant(Block.FREE));
-        }
 
         new Board(blocks);
     }
@@ -44,9 +43,9 @@ public class BoardTest {
         List<List<Block>> rowsList = new ArrayList<>();
         List<Block> sampleRow = new ArrayList<>();
 
-        for (int i = 0; i < 8; i++) {
+        for (int i = 0; i < 8; i++)
             sampleRow.add(Block.FREE);
-        }
+
         rowsList.add(sampleRow);
 
         assertTrue(Board.ofRows(rowsList) instanceof Board);
@@ -58,9 +57,9 @@ public class BoardTest {
 
         for (int i = 0; i < 13; i++) {
             List<Block> sampleRow = new ArrayList<>();
-            for (int j = 0; j < 15; j++) {
+            for (int j = 0; j < 15; j++)
                 sampleRow.add(Block.FREE);
-            }
+
             rowsList.add(sampleRow);
         }
 
@@ -78,9 +77,9 @@ public class BoardTest {
         List<List<Block>> rowsList = new ArrayList<>();
         List<Block> sampleRow = new ArrayList<>();
 
-        for (int i = 0; i < 8; i++) {
+        for (int i = 0; i < 8; i++)
             sampleRow.add(Block.FREE);
-        }
+
         rowsList.add(sampleRow);
 
         assertTrue(Board.ofInnerBlocksWalled(rowsList) instanceof Board);
@@ -92,9 +91,9 @@ public class BoardTest {
 
         for (int i = 0; i < 11; i++) {
             List<Block> sampleRow = new ArrayList<>();
-            for (int j = 0; j < 13; j++) {
+            for (int j = 0; j < 13; j++)
                 sampleRow.add(Block.FREE);
-            }
+
             rowsList.add(sampleRow);
         }
 
@@ -112,9 +111,9 @@ public class BoardTest {
         List<List<Block>> rowsList = new ArrayList<>();
         List<Block> sampleRow = new ArrayList<>();
 
-        for (int i = 0; i < 8; i++) {
+        for (int i = 0; i < 8; i++)
             sampleRow.add(Block.FREE);
-        }
+
         rowsList.add(sampleRow);
 
         assertTrue(Board.ofQuadrantNWBlocksWalled(rowsList) instanceof Board);
@@ -126,9 +125,9 @@ public class BoardTest {
 
         for (int i = 0; i < 6; i++) {
             List<Block> sampleRow = new ArrayList<>();
-            for (int j = 0; j < 7; j++) {
+            for (int j = 0; j < 7; j++)
                 sampleRow.add(Block.FREE);
-            }
+
             rowsList.add(sampleRow);
         }
 
@@ -143,9 +142,9 @@ public class BoardTest {
         List<Sq<Block>> blocksList = new ArrayList<>();
 
         blocksList.add(Sq.constant(Block.INDESTRUCTIBLE_WALL));
-        for (int i = 0; i < 194; i++) {
+        for (int i = 0; i < 194; i++)
             blocksList.add(Sq.constant(Block.FREE));
-        }
+
         Board sampleBoard = new Board(blocksList);
 
         assertTrue(sampleBoard.blockAt(sampleCell) == Block.INDESTRUCTIBLE_WALL);