25 files changed, 505 insertions, 47 deletions

diff --git a/src/docs/class.puml b/src/docs/class.puml
index 21add0d..68aaf5e 100644
--- a/src/docs/class.puml
+++ b/src/docs/class.puml
@@ -126,26 +126,33 @@ package model {
     GARBAGE
     ROBOT
     BOMB
+
+    boolean isBounding()
+    boolean mustBeReachable()
+    boolean isTraversable()
+    boolean isMovableByExplosion()
   }
 
   class BlockFactory {
-    Block build(BlockType, Vec2)
+    Block build(BlockType, TileVec2)
   }
 
   abstract class Block {
+    BlockType
     List<Controller>
+    Vec2
 
-    Block(Vec2)
-    Vec2 getPosition()
-    void setPosition(Vec2)
+    Block(BlockType, List<Controller>, Vec2)
+    void setPos(Vec2)
+    BlockType getBlockType()
+    Vec2 getPos()
+    TileVec2 getTile()
     List<Event> update(Context)
   }
 
-  abstract class StaticBlock extends Block
-  class WallBlock extends StaticBlock
-  class TrashBlock extends StaticBlock
-  class BombBlock extends StaticBlock
-
+  class WallBlock extends Block
+  class TrashBlock extends Block
+  class BombBlock extends Block
   class GarbageBlock extends Block
   class RobotBlock extends Block
 
@@ -167,7 +174,6 @@ package controller {
   abstract class BlockController implements Controller {
     Block
     Controller(Block)
-    Block getBlock()
   }
 
   class BlockControllerFactory {
diff --git a/src/main/java/fr/umlv/java/wallj/controller/BlockController.java b/src/main/java/fr/umlv/java/wallj/controller/BlockController.java
index 7ab6aec..bafa74a 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/BlockController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/BlockController.java
@@ -1,8 +1,21 @@
 package fr.umlv.java.wallj.controller;

 

 import fr.umlv.java.wallj.context.Context;

+import fr.umlv.java.wallj.event.Event;

+import fr.umlv.java.wallj.model.Block;

+

+import java.util.List;

+import java.util.Objects;

+

+public abstract class BlockController implements Controller {

+

+  private final Block block;

+

+  BlockController(Block block) {

+    this.block = Objects.requireNonNull(block);

+  }

 

-public abstract class BlockController implements Controller{

   //TODO Check UML to implement BlockController

-  public abstract void update(Context context);

+  public abstract List<Event> update(Context context);

+

 }

diff --git a/src/main/java/fr/umlv/java/wallj/controller/BlockControllerFactory.java b/src/main/java/fr/umlv/java/wallj/controller/BlockControllerFactory.java
index c820315..89d45ca 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/BlockControllerFactory.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/BlockControllerFactory.java
@@ -1,5 +1,49 @@
 package fr.umlv.java.wallj.controller;

 

-public class BlockControllerFactory {

-  //TODO

+import fr.umlv.java.wallj.model.*;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

+/**

+ * A block controller factory.

+ * "I am the man who arranges the blocks that descend upon me from up above..."

+ *

+ * @author Pacien TRAN-GIRARD

+ */

+public final class BlockControllerFactory {

+

+  /**

+   * @implNote no Lists.of in JDK8

+   */

+  private static List<BlockController> listOf(BlockController... controllers) {

+    return Collections.unmodifiableList(Arrays.asList(controllers));

+  }

+

+  /**

+   * Builds the controllers for the given block.

+   *

+   * @param b block

+   * @return list of controllers

+   */

+  public static List<BlockController> build(Block b) {

+    if (b instanceof WallBlock)

+      return listOf(new WallPhysicsController((WallBlock) b), new WallDisplayController((WallBlock) b));

+    if (b instanceof TrashBlock)

+      return listOf(new TrashPhysicsController((TrashBlock) b), new TrashDisplayController((TrashBlock) b));

+    if (b instanceof GarbageBlock)

+      return listOf(new GarbagePhysicsController((GarbageBlock) b), new GarbageDisplayController((GarbageBlock) b));

+    if (b instanceof RobotBlock)

+      return listOf(new RobotPhysicsController((RobotBlock) b), new RobotDisplayController((RobotBlock) b));

+    if (b instanceof BombBlock)

+      return listOf(new BombPhysicsController((BombBlock) b), new BombDisplayController((BombBlock) b));

+

+    return Collections.emptyList();

+  }

+

+  private BlockControllerFactory() {

+    // static class

+  }

+

 }

diff --git a/src/main/java/fr/umlv/java/wallj/controller/BombDisplayController.java b/src/main/java/fr/umlv/java/wallj/controller/BombDisplayController.java
index 43452d9..3347b73 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/BombDisplayController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/BombDisplayController.java
@@ -1,10 +1,25 @@
 package fr.umlv.java.wallj.controller;

 

 import fr.umlv.java.wallj.context.Context;

+import fr.umlv.java.wallj.event.Event;

+import fr.umlv.java.wallj.model.BombBlock;

+

+import java.util.List;

+import java.util.Objects;

 

 public class BombDisplayController extends DisplayController {

+

+  private final BombBlock bomb;

+

+  BombDisplayController(BombBlock bomb) {

+    super(bomb);

+    this.bomb = Objects.requireNonNull(bomb);

+  }

+

   @Override

-  public void update(Context context) {

+  public List<Event> update(Context context) {

     //TODO

+    return null;

   }

+

 }

diff --git a/src/main/java/fr/umlv/java/wallj/controller/BombPhysicsController.java b/src/main/java/fr/umlv/java/wallj/controller/BombPhysicsController.java
index 948dcfb..02f00a3 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/BombPhysicsController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/BombPhysicsController.java
@@ -1,10 +1,25 @@
 package fr.umlv.java.wallj.controller;

 

 import fr.umlv.java.wallj.context.Context;

+import fr.umlv.java.wallj.event.Event;

+import fr.umlv.java.wallj.model.BombBlock;