8 files changed, 121 insertions, 35 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/board/BoardConverter.java b/src/main/java/fr/umlv/java/wallj/board/BoardConverter.java
index 6231875..c4d47cc 100644
--- a/src/main/java/fr/umlv/java/wallj/board/BoardConverter.java
+++ b/src/main/java/fr/umlv/java/wallj/board/BoardConverter.java
@@ -6,13 +6,17 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * Operations of conversion on Board and List of blocks
  * @author Adam NAILI
  */
 public final class BoardConverter {
-  //TODO
   private BoardConverter() {
   }
 
+  /**
+   * @param blocks the list of blocks to convert in a board
+   * @return the converted board
+   */
   public static Board worldToBoard(List<Block> blocks) {
     int width = blocks.stream().map(Block::getTile).mapToInt(TileVec2::getCol).max().orElse(-1) + 1;
     int height = blocks.stream().map(Block::getTile).mapToInt(TileVec2::getRow).max().orElse(-1) + 1;
@@ -24,6 +28,10 @@ public final class BoardConverter {
     return builder.build();
   }
 
+  /**
+   * @param board the board to convert into a list of blocks
+   * @return the list of blocks converted
+   */
   public static List<Block> boardToWorld(Board board) {
     ArrayList<Block> blocks = new ArrayList<>();
     int nbRow = board.getDim().getRow();
@@ -31,7 +39,7 @@ public final class BoardConverter {
     for (int i = 0; i < nbRow; i++) {
       for (int j = 0; j < nbCol; j++) {
         Block block;
-        TileVec2 location = TileVec2.of(j,i);
+        TileVec2 location = TileVec2.of(j, i);
         block = BlockFactory.build(board.getBlockTypeAt(location), location);
         if (block != null) {
           blocks.add(block);
diff --git a/src/main/java/fr/umlv/java/wallj/context/Context.java b/src/main/java/fr/umlv/java/wallj/context/Context.java
index 053bc8e..01b1f3f 100644
--- a/src/main/java/fr/umlv/java/wallj/context/Context.java
+++ b/src/main/java/fr/umlv/java/wallj/context/Context.java
@@ -13,17 +13,17 @@ import java.util.Objects;
  */
 public final class Context {
   //TODO Class Context
-  private final Stage stage;
+  private final Game game;
   private final List<Event> events;
   private final GraphicsContext graphicsContext;
 
   /**
-   * @param stage           the current stage
+   * @param game           the current game
    * @param events          the list of events of the tick
    * @param graphicsContext the current graphics context
    */
-  public Context(Stage stage, List<Event> events, GraphicsContext graphicsContext) {
-    this.stage = Objects.requireNonNull(stage);
+  public Context(Game game, List<Event> events, GraphicsContext graphicsContext) {
+    this.game = Objects.requireNonNull(game);
     this.events = Objects.requireNonNull(events);
     this.graphicsContext = Objects.requireNonNull(graphicsContext);
   }
@@ -31,8 +31,8 @@ public final class Context {
   /**
    * @return the stage
    */
-  public Stage getStage() {
-    return stage;
+  public Game getGame() {
+    return game;
   }
 
   /**
diff --git a/src/main/java/fr/umlv/java/wallj/context/Game.java b/src/main/java/fr/umlv/java/wallj/context/Game.java
index 7ddac02..c7dd6f1 100644
--- a/src/main/java/fr/umlv/java/wallj/context/Game.java
+++ b/src/main/java/fr/umlv/java/wallj/context/Game.java
@@ -1,66 +1,84 @@
 package fr.umlv.java.wallj.context;
 
 import fr.umlv.java.wallj.board.Board;
+import fr.umlv.java.wallj.controller.Controller;
 import fr.umlv.java.wallj.controller.GameController;
+import fr.umlv.java.wallj.event.Event;
+import fr.umlv.java.wallj.model.Stage;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * A game.
+ *
  * @author Adam NAILI
  */
 public final class Game {
-  //TODO
-  private final GameController gameController;
+  private Stage currentStage;
+  private final List<Controller> controllers;
   private int indexBoard;
   private final List<Board> boards;
 
   /**
-   * @param gameController the controller of the game
-   * @param boards         the list of boards charged for the game
+   * @param boards the list of boards charged for the game
    */
-  public Game(GameController gameController, List<Board> boards) {
-    this.gameController = Objects.requireNonNull(gameController);
+  public Game(List<Board> boards) {
+    this.controllers = new LinkedList<>();
+    this.controllers.add(new GameController());
     Objects.requireNonNull(boards);
     if (boards.isEmpty()) {
       throw new IllegalArgumentException("The list of boards is empty, not able to create a correct game from this.");
     }
     this.boards = Collections.unmodifiableList(boards);
     this.indexBoard = 0;
+    this.currentStage = new Stage(this.boards.get(0));
   }
 
   /**
-   * @return the game controller
+   * @return a boolean on the condition of having a next Board in our game.
    */
-  public GameController getGameController() {
-    return gameController;
+  public boolean hasNextBoard() {
+    return indexBoard + 1 < boards.size();
   }
 
   /**
-   * @return the current board of the game.
+   * @return the next board
    */
-  public Board getCurrentBoard() {
+  private Board nextBoard() {
+    if (!hasNextBoard()) {
+      throw new IllegalStateException("No more board for the game.");
+    }
+    indexBoard++;
     return boards.get(indexBoard);
   }
 
   /**
-   * @return a boolean on the condition of having a next Board in our game.
+   * @return the current stage
    */
-  public boolean hasNextBoard() {
-    return indexBoard + 1 < boards.size();
+  public Stage getCurrentStage() {
+    return currentStage;
+  }
+
+  public void nextStage() {
+    if (hasNextBoard()) {
+      currentStage = new Stage(nextBoard());
+    }
+  }
+
+  public void retryStage() {
+    currentStage = new Stage(currentStage.getCurrentBoard());
   }
 
   /**