1 files changed, 40 insertions, 33 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java b/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
index f81f423..11cf25f 100644
--- a/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
+++ b/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
@@ -4,17 +4,16 @@ import fr.umlv.java.wallj.board.Board;
 import fr.umlv.java.wallj.board.PathFinder;
 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.context.Stage;
+import fr.umlv.java.wallj.context.Updateables;
 import fr.umlv.java.wallj.event.*;
 import fr.umlv.java.wallj.event.Event;
 import org.jbox2d.common.Vec2;
 import org.jbox2d.dynamics.World;
 
 import java.awt.*;
-import java.time.Duration;
 import java.util.*;
-import java.util.List;
+import java.util.stream.Stream;
 
 /**
  * A robot block.
@@ -50,47 +49,55 @@ public class RobotBlock extends Block {
   }
 
   @Override
-  public List<Event> update(Context context) {
-    Events.findFirst(context.getEvents(), MoveRobotOrder.class)
-    .ifPresent(event -> updatePath(context.getGame().getCurrentStage().getBoard(), event.getTarget()));
-
-    move(context.getTimeDelta());
-    paint(context.getGraphicsContext());
-    return setupBomb(context.getEvents(), context.getGame().getCurrentStage());
+  public Stream<Event> update(Context context) {
+    return Updateables.updateAll(context,
+    this::updatePath,
+    this::move,
+    this::paint,
+    this::setupBomb);
   }
 
-  private List<Event> setupBomb(List<Event> events, Stage stage) {
-    return Events.findFirst(events, BombSetupOrder.class)
-           .map(event -> isOnBomb(stage) ?
-                         Collections.<Event>singletonList(new BombTimerIncrEvent(getTile())) :
-                         dropBomb(event))
-           .orElse(Collections.emptyList());
+  private Stream<Event> setupBomb(Context context) {
+    return Events.findFirst(context.getEvents(), BombSetupOrder.class)
+           .flatMap(event -> isOnBomb(context.getGame().getCurrentStage()) ?
+                             Optional.of(new BombTimerIncrEvent(getTile())) :
+                             dropBomb())
+           .map(Stream::of) // Optional.stream() only available in Java 9
+           .orElseGet(Stream::empty);
   }
 
-  private List<Event> dropBomb(BombSetupOrder order) {
-    if (droppedBombCount >= Stage.BOMB_PLACEMENTS) return Collections.emptyList();
-
+  private Optional<Event> dropBomb() {
+    if (droppedBombCount >= Stage.BOMB_PLACEMENTS) return Optional.empty();
     droppedBombCount++;
-    return Collections.singletonList(new BlockCreateEvent(BlockType.BOMB, getTile()));
+    return Optional.of(new BlockCreateEvent(BlockType.BOMB, getTile()));
   }
 
-  private void updatePath(Board board, TileVec2 target) {
-    if (!board.inside(target) || !board.getBlockTypeAt(target).isTraversable()) return;
-    if (pathFinder == null) pathFinder = new PathFinder(board);
-    path = new LinkedList<>(pathFinder.findPath(TileVec2.of(pos), target));
+  private Stream<Event> updatePath(Context context) {
+    Events.findFirst(context.getEvents(), MoveRobotOrder.class)
+    .ifPresent(event -> {
+      Board board = context.getGame().getCurrentStage().getBoard();
+      TileVec2 target = event.getTarget();
+      if (!board.inside(target) || !board.getBlockTypeAt(target).isTraversable()) return;
+      if (pathFinder == null) pathFinder = new PathFinder(board);
+      path = new LinkedList<>(pathFinder.findPath(TileVec2.of(pos), target));
+    });
+    return Stream.empty();
   }
 
-  private void move(Duration timeDelta) {
-    if (path.isEmpty()) return;
-    Vec2 dest = path.getFirst().toVec2();
-    Vec2 dir = dest.sub(pos);
-    float dist = dir.normalize();
-    Vec2 dp = dir.mul(timeDelta.toMillis() * SPEED);
-    pos = dp.length() < dist ? pos.add(dp) : path.removeFirst().toVec2();
+  private Stream<Event> move(Context context) {
+    if (!path.isEmpty()) {
+      Vec2 dest = path.getFirst().toVec2();
+      Vec2 dir = dest.sub(pos);
+      float dist = dir.normalize();
+      Vec2 dp = dir.mul(context.getTimeDelta().toMillis() * SPEED);
+      pos = dp.length() < dist ? pos.add(dp) : path.removeFirst().toVec2();
+    }
+    return Stream.empty();
   }
 
-  private void paint(GraphicsContext graphicsContext) {
-    graphicsContext.paintCircle(Color.BLUE, getPos(), TileVec2.TILE_DIM / 2);
+  private Stream<Event> paint(Context context) {
+    context.getGraphicsContext().paintCircle(Color.BLUE, getPos(), TileVec2.TILE_DIM / 2);
+    return Stream.empty();
   }
 
   /**