25 files changed, 254 insertions, 435 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/block/Block.java b/src/main/java/fr/umlv/java/wallj/block/Block.java
index ba299b4..7ae9c06 100644
--- a/src/main/java/fr/umlv/java/wallj/block/Block.java
+++ b/src/main/java/fr/umlv/java/wallj/block/Block.java
@@ -1,15 +1,11 @@
 package fr.umlv.java.wallj.block;
 
 import fr.umlv.java.wallj.board.TileVec2;
-import fr.umlv.java.wallj.context.Context;
 import fr.umlv.java.wallj.context.Updateable;
-import fr.umlv.java.wallj.controller.BlockController;
-import fr.umlv.java.wallj.controller.Controller;
-import fr.umlv.java.wallj.event.Event;
 import org.jbox2d.common.Vec2;
+import org.jbox2d.dynamics.World;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * A block.
@@ -17,29 +13,13 @@ import java.util.stream.Collectors;
  * @author Pacien TRAN-GIRARD
  */
 public abstract class Block implements Updateable {
-
   private final BlockType type;
-  private List<Controller> controllers;
-  private Vec2 pos;
 
   /**
    * @param type type of block
-   * @param pos  initial position
    */
-  Block(BlockType type, Vec2 pos) {
+  Block(BlockType type) {
     this.type = Objects.requireNonNull(type);
-    this.pos = Objects.requireNonNull(pos).clone();
-  }
-
-  void setControllers(List<BlockController> l) {
-    controllers = Collections.unmodifiableList(new LinkedList<>(Objects.requireNonNull(l)));
-  }
-
-  /**
-   * @param pos new position to set
-   */
-  public void setPos(Vec2 pos) {
-    this.pos = Objects.requireNonNull(pos).clone();
   }
 
   /**
@@ -50,28 +30,19 @@ public abstract class Block implements Updateable {
   }
 
   /**
-   * @return the current position
-   */
-  public Vec2 getPos() {
-    return pos.clone();
-  }
-
-  /**
    * @return the current tile position
    */
   public TileVec2 getTile() {
-    return TileVec2.of(pos);
+    return TileVec2.of(getPos());
   }
 
   /**
-   * @param ctx execution context
-   * @return list of generated events
+   * @return the current position
    */
-  @Override
-  public List<Event> update(Context ctx) {
-    return controllers.stream()
-           .flatMap(controller -> controller.update(ctx).stream())
-           .collect(Collectors.toList());
-  }
+  public abstract Vec2 getPos();
 
+  /**
+   * @param world a JBox2D world
+   */
+  public abstract void link(World world);
 }
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 951d182..acd280f 100644
--- a/src/main/java/fr/umlv/java/wallj/block/BlockFactory.java
+++ b/src/main/java/fr/umlv/java/wallj/block/BlockFactory.java
@@ -1,7 +1,6 @@
 package fr.umlv.java.wallj.block;
 
 import fr.umlv.java.wallj.board.TileVec2;
-import fr.umlv.java.wallj.controller.BlockControllerFactory;
 import org.jbox2d.common.Vec2;
 
 /**
@@ -30,9 +29,7 @@ public final class BlockFactory {
   }
 
   public static Block build(BlockType type, TileVec2 pos) {
-    Block block = forType(type, pos.toVec2());
-    if (block != null) block.setControllers(BlockControllerFactory.build(block));
-    return block;
+    return forType(type, pos.toVec2());
   }
 
   private BlockFactory() {
diff --git a/src/main/java/fr/umlv/java/wallj/block/BombBlock.java b/src/main/java/fr/umlv/java/wallj/block/BombBlock.java
index de7a3b9..f58f1cc 100644
--- a/src/main/java/fr/umlv/java/wallj/block/BombBlock.java
+++ b/src/main/java/fr/umlv/java/wallj/block/BombBlock.java
@@ -1,28 +1,69 @@
 package fr.umlv.java.wallj.block;
 
+import fr.umlv.java.wallj.board.TileVec2;
+import fr.umlv.java.wallj.context.Context;
+import fr.umlv.java.wallj.context.GraphicsContext;
+import fr.umlv.java.wallj.event.Event;
 import org.jbox2d.common.Vec2;
+import org.jbox2d.dynamics.BodyType;
+
+import java.awt.*;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * A bomb block.
  *
  * @author Pacien TRAN-GIRARD
+ * @author Adam NAILI
  */
-public class BombBlock extends Block {
-
-  private static final int INITIAL_TIMER = 1; // sec
+public class BombBlock extends JBoxBlock {
+  private static final Duration TIME_INCREMENT = Duration.ofSeconds(1);
+  private static final Duration MIN_TIME = Duration.ofSeconds(1);
+  private static final Duration MAX_TIME = Duration.ofSeconds(9);
 
-  private int timer = INITIAL_TIMER;
+  private Duration timer = MIN_TIME;
 
   BombBlock(Vec2 pos) {
-    super(BlockType.BOMB, pos);
+    super(BlockType.BOMB, BodyType.STATIC, SolidDef.squareShape(), pos);
+  }
+
+  private void incrementTimer() {
+    timer = timer.compareTo(MAX_TIME) <= 0 ? timer.plus(TIME_INCREMENT) : MIN_TIME;
+  }
+
+  private void decrementTimer(Duration d) {
+    if (timer.isNegative()) throw new IllegalStateException("This bomb has already exploded.");
+    timer = timer.minus(d);
   }
 
-  public void setTimer(int sec) {
-    timer = sec;
+  @Override
+  public List<Event> update(Context context) {
+    if (containsUpdateEvent(context.getEvents())) incrementTimer();
+    paint(context.getGraphicsContext());