Rearranging the code

13 files changed, 142 insertions, 144 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/block/BlockFactory.java b/src/main/java/fr/umlv/java/wallj/block/BlockFactory.java
index 6911c88..411696d 100644
--- a/src/main/java/fr/umlv/java/wallj/block/BlockFactory.java
+++ b/src/main/java/fr/umlv/java/wallj/block/BlockFactory.java
@@ -9,6 +9,10 @@ import org.jbox2d.common.Vec2;
  * @author Pacien TRAN-GIRARD
  */
 public final class BlockFactory {
+  private BlockFactory() {
+    // static class
+  }
+
   private static Block forType(BlockType t, Vec2 pos) {
     switch (t) {
       case WALL:
@@ -35,8 +39,4 @@ public final class BlockFactory {
   public static Block build(BlockType type, TileVec2 pos) {
     return forType(type, pos.toVec2());
   }
-
-  private BlockFactory() {
-    // static class
-  }
 }
diff --git a/src/main/java/fr/umlv/java/wallj/block/SolidDef.java b/src/main/java/fr/umlv/java/wallj/block/SolidDef.java
index 6fb7dc3..25ff022 100644
--- a/src/main/java/fr/umlv/java/wallj/block/SolidDef.java
+++ b/src/main/java/fr/umlv/java/wallj/block/SolidDef.java
@@ -13,6 +13,10 @@ import org.jbox2d.dynamics.FixtureDef;
  * @author Pacien TRAN-GIRARD
  */
 public final class SolidDef {
+  private SolidDef() {
+    // static class
+  }
+
   /**
    * @param bodyType type of body
    * @param pos      initial position of the body
@@ -53,8 +57,4 @@ public final class SolidDef {
     shape.m_radius = TileVec2.TILE_DIM / 2;
     return shape;
   }
-
-  private SolidDef() {
-    // static class
-  }
 }
diff --git a/src/main/java/fr/umlv/java/wallj/board/Board.java b/src/main/java/fr/umlv/java/wallj/board/Board.java
index 2e67c53..077dd26 100644
--- a/src/main/java/fr/umlv/java/wallj/board/Board.java
+++ b/src/main/java/fr/umlv/java/wallj/board/Board.java
@@ -15,38 +15,6 @@ import java.util.stream.Stream;
  */
 public final class Board {
 
-  /**
-   * Board Builder
-   */
-  public static final class Builder {
-    private final BlockType[][] map;
-
-    /**
-     * @param width  width in tiles
-     * @param height height in tiles
-     */
-    public Builder(int width, int height) {
-      map = new BlockType[height][width];
-    }
-
-    /**
-     * @param pos  the tile position vector
-     * @param type the BlockType to set
-     * @return the Builder
-     */
-    public Builder setBlockTypeAt(TileVec2 pos, BlockType type) {
-      map[pos.getRow()][pos.getCol()] = type;
-      return this;
-    }
-
-    /**
-     * @return the immutable Board
-     */
-    public Board build() {
-      return new Board(map);
-    }
-  }
-
   private final BlockType[][] map;
 
   private Board(BlockType[][] map) {
@@ -103,4 +71,36 @@ public final class Board {
     return Arrays.hashCode(map);
   }
 
+  /**
+   * Board Builder
+   */
+  public static final class Builder {
+    private final BlockType[][] map;
+
+    /**
+     * @param width  width in tiles
+     * @param height height in tiles
+     */
+    public Builder(int width, int height) {
+      map = new BlockType[height][width];
+    }
+
+    /**
+     * @param pos  the tile position vector
+     * @param type the BlockType to set
+     * @return the Builder
+     */
+    public Builder setBlockTypeAt(TileVec2 pos, BlockType type) {
+      map[pos.getRow()][pos.getCol()] = type;
+      return this;
+    }
+
+    /**
+     * @return the immutable Board
+     */
+    public Board build() {
+      return new Board(map);
+    }
+  }
+
 }
diff --git a/src/main/java/fr/umlv/java/wallj/board/BoardParser.java b/src/main/java/fr/umlv/java/wallj/board/BoardParser.java
index 90fd9c2..71bdc51 100644
--- a/src/main/java/fr/umlv/java/wallj/board/BoardParser.java
+++ b/src/main/java/fr/umlv/java/wallj/board/BoardParser.java
@@ -15,6 +15,10 @@ import java.util.stream.Collectors;
  * @author Pacien TRAN-GIRARD
  */
 public final class BoardParser {
+  private BoardParser() {
+    // static class
+  }
+
   private static Board buildBoard(List<List<BlockType>> map) {
     if (!Matrix.isShapeValid(map)) throw new IllegalArgumentException("Board must be rectangular.");
 
@@ -60,8 +64,4 @@ public final class BoardParser {
                       .map(BoardParser::parseLine)
                       .collect(Collectors.toList()));
   }
-
-  private BoardParser() {
-    // static class
-  }
 }
diff --git a/src/main/java/fr/umlv/java/wallj/board/BoardValidator.java b/src/main/java/fr/umlv/java/wallj/board/BoardValidator.java
index 011ca8b..d7d3583 100644
--- a/src/main/java/fr/umlv/java/wallj/board/BoardValidator.java
+++ b/src/main/java/fr/umlv/java/wallj/board/BoardValidator.java
@@ -13,6 +13,39 @@ import java.util.stream.IntStream;
  */
 public class BoardValidator {
 
+  private final Board board;
+  private final ValidationException errors = new ValidationException();
+
+  /**
+   * @param board the board to validate
+   */
+  public BoardValidator(Board board) {
+    this.board = board;
+  }
+
+  /**
+   * Tests the board against a given validator, using the supplied error message if the validation fails.
+   *
+   * @param validator a validity test
+   * @param msg       a failure message
+   * @return the board validator
+   */
+  public BoardValidator validate(Predicate<Board> validator, String msg) {
+    if (!validator.test(board)) errors.addSuppressed(new ValidationException(msg));
+    return this;
+  }
+
+  /**
+   * @return the validated board
+   * @throws ValidationException in case of failure
+   */
+  public Board get() throws ValidationException {
+    if (errors.getSuppressed().length > 0)
+      throw errors;
+    else
+      return board;
+  }
+
   /**
    * A validation exception, witness of validation error(s).
    */
@@ -33,6 +66,10 @@ public class BoardValidator {