9 files changed, 143 insertions, 46 deletions

diff --git a/src/docs/class.puml b/src/docs/class.puml
index 869a707..6a527ae 100644
--- a/src/docs/class.puml
+++ b/src/docs/class.puml
@@ -12,20 +12,23 @@ package utils {
 
 package viewer {
   class Viewer {
-    Game
-    Stage
+    final Game
+    Viewer(List<Board>)
     void main(String[])
     void eventLoop(ApplicationContext)
-    void renderFrame(Graphics2D,ApplicationContext)
+    void renderFrame(Graphics2D,ApplicationContext,List<Event>)
   }
 }
 
 package context {
   class Context {
-    Context(Stage,List<Event>,GraphicsContext)
-    final Stage
+    Context(Game,List<Event>,GraphicsContext)
+    final Game
     final List<Event>
     final GraphicsContext
+    Game getGame()
+    List<Event> getEvents()
+    GraphicsContext getGraphicsContext()
   }
 
   class GraphicsContext {
@@ -49,10 +52,18 @@ package context {
   }
 
   class Game {
-    final GameController
-    int index
+    Stage
+    final List<Controller>
+    int indexBoard
     final List<Board>
-    Game(GameController,List<Board>)
+    bool over
+    Game(List<Board>)
+    Stage getStage()
+    bool isOver()
+    void setOver()
+    void nextStage()
+    void retryStage()
+    List<Event> update(Context context)
   }
 }
 
@@ -77,6 +88,8 @@ package event {
   }
 
   class ConfirmEvent implements InputEvent
+  class GameOverEvent implements Event
+
 
   class ExplosionEvent implements GameEvent {
     Block source
@@ -157,8 +170,8 @@ package model {
   class RobotBlock extends Block
 
   class Stage {
-    StageController
     List<Block>
+    Board
     Stage(Board)
     List<Block> getBlocks()
     List<Event> update(Context)
@@ -179,9 +192,7 @@ package controller {
   class BlockControllerFactory {
     BlockController build(Block)
   }
-
   class GameController implements Controller
-  class StageController implements Controller
 
   abstract class PhysicsController extends BlockController
   abstract class DisplayController extends BlockController
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 Stage currentStage;