Reformat code and doc-blocks

7 files changed, 78 insertions, 56 deletions

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
     public void neighborsOfOriginAreCorrect() {
         SubCell c = new SubCell(0, 0);
-        assertEquals(new SubCell(  0, 207), c.neighbor(Direction.N));
-        assertEquals(new SubCell(  1,   0), c.neighbor(Direction.E));
-        assertEquals(new SubCell(  0,   1), c.neighbor(Direction.S));
-        assertEquals(new SubCell(239,   0), c.neighbor(Direction.W));
+        assertEquals(new SubCell(0, 207), c.neighbor(Direction.N));
+        assertEquals(new SubCell(1, 0), c.neighbor(Direction.E));
+        assertEquals(new SubCell(0, 1), c.neighbor(Direction.S));
+        assertEquals(new SubCell(239, 0), c.neighbor(Direction.W));
     }
 
     @Test
     public void containingCellOfCentralsNeighborIsCorrect() {
-        for (Cell c: Cell.ROW_MAJOR_ORDER) {
+        for (Cell c : Cell.ROW_MAJOR_ORDER) {
             SubCell s = SubCell.centralSubCellOf(c);
-            for (Direction d: Direction.values())
+            for (Direction d : Direction.values())
                 assertEquals(c, s.neighbor(d).containingCell());
         }
     }
+
 }
diff --git a/test/ch/epfl/xblast/namecheck/NameCheck01.java b/test/ch/epfl/xblast/namecheck/NameCheck01.java
index 278d85b..7d079c5 100644
--- a/test/ch/epfl/xblast/namecheck/NameCheck01.java
+++ b/test/ch/epfl/xblast/namecheck/NameCheck01.java
@@ -1,18 +1,20 @@
 package ch.epfl.xblast.namecheck;
 
-import java.util.List;
-
 import ch.epfl.xblast.Cell;
 import ch.epfl.xblast.Direction;
 import ch.epfl.xblast.SubCell;
 
+import java.util.List;
+
 /**
  * Classe abstraite utilisant tous les éléments de l'étape 1, pour essayer de
  * garantir que ceux-ci ont le bon nom et les bons types. Attention, ceci n'est
  * pas un test unitaire, et n'a pas pour but d'être exécuté!
+ *
+ * @author EPFL
  */
-
 abstract class NameCheck01 {
+
     void checkDirection() {
         Direction d = Direction.N;
         d = Direction.E;
@@ -36,7 +38,7 @@ abstract class NameCheck01 {
     }
 
     void checkSubCell() {
-        SubCell c = SubCell.centralSubCellOf(new Cell(0,0));
+        SubCell c = SubCell.centralSubCellOf(new Cell(0, 0));
         c = new SubCell(0, 0);
         int t = c.x() + c.y() + c.distanceToCentral();
         if (t < 10 && c.isCentral())
@@ -46,4 +48,5 @@ abstract class NameCheck01 {