Reformat code and doc-blocks

8 files changed, 86 insertions, 62 deletions

diff --git a/src/ch/epfl/xblast/server/Board.java b/src/ch/epfl/xblast/server/Board.java
index bde0ae9..4d2e743 100644
--- a/src/ch/epfl/xblast/server/Board.java
+++ b/src/ch/epfl/xblast/server/Board.java
@@ -1,8 +1,8 @@
 package ch.epfl.xblast.server;
 
 import ch.epfl.cs108.Sq;
-import ch.epfl.xblast.Lists;
 import ch.epfl.xblast.Cell;
+import ch.epfl.xblast.Lists;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,6 +14,7 @@ import java.util.List;
  * @author Timothée FLOURE (257420)
  */
 public final class Board {
+
     private static final int BLOCKS_LIST_SIZE = 195;
     private static final int BOARD_ROWS = 13;
     private static final int BOARD_COLUMNS = 15;
@@ -23,10 +24,10 @@ public final class Board {
     private static final int QUADRANT_COLUMNS = 7;
 
     /**
-     * Throw an exeption if the matrix does not have the given number of rows/columns.
+     * Throw an exception if the matrix does not have the given number of rows/columns.
      *
-     * @param matrix the tested matrix
-     * @param rows the expected number of rows
+     * @param matrix  the tested matrix
+     * @param rows    the expected number of rows
      * @param columns the expected number of columns
      * @throws IllegalArgumentException if the matrix does not comply with the given sizes.
      */
@@ -48,7 +49,7 @@ public final class Board {
     private List<Sq<Block>> blocks;
 
     /**
-     * Instanciates a new Board with the given sequence of blocks.
+     * Instantiates a new Board with the given sequence of blocks.
      *
      * @param blocks sequence containing all the blocks of the Boards
      * @throws IllegalArgumentException if the blocks is not composed of BLOC_LIST_SIZE elements
@@ -85,7 +86,7 @@ public final class Board {
      *
      * @param innerBlocks lists of the internal rows
      * @return a new walled board filled with the given rows
-     * @throws IllegalArgumentException if innerbLocks is not INNER_BOARD_ROWS * INNER_BOARD_COLUMNS
+     * @throws IllegalArgumentException if innerBlocks is not INNER_BOARD_ROWS * INNER_BOARD_COLUMNS
      */
     public static Board ofInnerBlocksWalled(List<List<Block>> innerBlocks) {
         checkBlockMatrix(innerBlocks, INNER_BOARD_ROWS, INNER_BOARD_COLUMNS);
@@ -147,4 +148,5 @@ public final class Board {
     public Block blockAt(Cell c) {
         return blocksAt(c).head();
     }
+
 }
diff --git a/test/ch/epfl/xblast/CellTest.java b/test/ch/epfl/xblast/CellTest.java
index ba8becc..c5d93e8 100644
--- a/test/ch/epfl/xblast/CellTest.java
+++ b/test/ch/epfl/xblast/CellTest.java
@@ -1,15 +1,19 @@
 package ch.epfl.xblast;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-import org.junit.Test;
-
+/**
+ * @author EPFL
+ */
 public class CellTest {
+
     @Test
     public void rowMajorIndexCorrespondsToOrder() {
         int i = 0;
-        for (Cell c: Cell.ROW_MAJOR_ORDER)
+        for (Cell c : Cell.ROW_MAJOR_ORDER)
             assertEquals(i++, c.rowMajorIndex());
         assertEquals(Cell.COUNT, i);
     }
@@ -19,7 +23,7 @@ public class CellTest {
         assertEquals(Cell.COUNT, Cell.SPIRAL_ORDER.size());
 
         boolean[] cellSeen = new boolean[Cell.COUNT];
-        for (Cell c: Cell.SPIRAL_ORDER) {
+        for (Cell c : Cell.SPIRAL_ORDER) {
             assertFalse(cellSeen[c.rowMajorIndex()]);
             cellSeen[c.rowMajorIndex()] = true;
         }
@@ -28,9 +32,9 @@ public class CellTest {
     @Test
     public void spiralOrderNeighborsAreSpatialNeighbors() {
         Cell pred = Cell.SPIRAL_ORDER.get(0);
-        for (Cell c: Cell.SPIRAL_ORDER.subList(1, Cell.SPIRAL_ORDER.size())) {
+        for (Cell c : Cell.SPIRAL_ORDER.subList(1, Cell.SPIRAL_ORDER.size())) {
             int areNeighborsCount = 0;
-            for (Direction d: Direction.values()) {
+            for (Direction d : Direction.values()) {
                 if (pred.equals(c.neighbor(d)))
                     areNeighborsCount += 1;
             }
@@ -51,18 +55,19 @@ public class CellTest {
     @Test
     public void neighborsOfOriginAreCorrect() {
         Cell c = new Cell(0, 0);
-        assertEquals(new Cell( 0, 12), c.neighbor(Direction.N));
-        assertEquals(new Cell( 1,  0), c.neighbor(Direction.E));
-        assertEquals(new Cell( 0,  1), c.neighbor(Direction.S));
-        assertEquals(new Cell(14,  0), c.neighbor(Direction.W));
+        assertEquals(new Cell(0, 12), c.neighbor(Direction.N));
+        assertEquals(new Cell(1, 0), c.neighbor(Direction.E));
+        assertEquals(new Cell(0, 1), c.neighbor(Direction.S));
+        assertEquals(new Cell(14, 0), c.neighbor(Direction.W));
     }
 
     @Test
     public void oppositeNeighborOfNeighborIsThis() {
-        for (Cell c: Cell.ROW_MAJOR_ORDER) {
-            for (Direction d: Direction.values()) {
+        for (Cell c : Cell.ROW_MAJOR_ORDER) {
+            for (Direction d : Direction.values()) {
                 assertEquals(c, c.neighbor(d).neighbor(d.opposite()));
             }
         }
     }
+
 }
diff --git a/test/ch/epfl/xblast/DirectionTest.java b/test/ch/epfl/xblast/DirectionTest.java
index 0ebb3b7..49cf4be 100644
--- a/test/ch/epfl/xblast/DirectionTest.java
+++ b/test/ch/epfl/xblast/DirectionTest.java
@@ -9,6 +9,7 @@ import static org.junit.Assert.*;
  * @author Pacien TRAN-GIRARD (261948)
  */
 public class DirectionTest {
+
     @Test
     public void oppositeOfOppositeIsIdentity() {
         for (Direction d : Direction.values())
@@ -48,4 +49,5 @@ public class DirectionTest {
             assertEquals(0, d.yVector() + d.opposite().yVector());
         }
     }
+
 }
diff --git a/test/ch/epfl/xblast/SubCellTest.java b/test/ch/epfl/xblast/SubCellTest.java
index 1c79791..b3450e1 100644
--- a/test/ch/epfl/xblast/SubCellTest.java
+++ b/test/ch/epfl/xblast/SubCellTest.java
@@ -1,11 +1,15 @@
 package ch.epfl.xblast;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
-
+/**
+ * @author EPFL
+ */
 public class SubCellTest {
+
     @Test
     public void centralSubCellOfKnowCellIsCorrect() {
         SubCell c = SubCell.centralSubCellOf(new Cell(2, 1));
@@ -15,13 +19,13 @@ public class SubCellTest {
 
     @Test
     public void centralSubCellIsCentral() {
-        for (Cell c: Cell.ROW_MAJOR_ORDER)
+        for (Cell c : Cell.ROW_MAJOR_ORDER)
             assertTrue(SubCell.centralSubCellOf(c).isCentral());
     }
 
     @Test
     public void distanceToCentralOfCentralIsZero() {
-        for (Cell c: Cell.ROW_MAJOR_ORDER)
+        for (Cell c : Cell.ROW_MAJOR_ORDER)
             assertEquals(0, SubCell.centralSubCellOf(c).distanceToCentral());
     }
 
@@ -43,18 +47,19 @@ public class SubCellTest {
     @Test