Merge branch 'master' of https://github.com/pacien/upem-java-wallj

Signed-off-by: pacien <pacien.trangirard@pacien.net>

# Conflicts:
#	src/main/java/fr/umlv/java/wallj/controller/BombDisplayController.java

9 files changed, 61 insertions, 16 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/Main.java b/src/main/java/fr/umlv/java/wallj/Main.java
index 3b3ad54..0ac4136 100644
--- a/src/main/java/fr/umlv/java/wallj/Main.java
+++ b/src/main/java/fr/umlv/java/wallj/Main.java
@@ -2,6 +2,7 @@ package fr.umlv.java.wallj;
 
 import fr.umlv.java.wallj.board.Board;
 import fr.umlv.java.wallj.board.BoardParser;
+import fr.umlv.java.wallj.board.BoardValidator;
 import fr.umlv.java.wallj.viewer.Viewer;
 import fr.umlv.zen5.Application;
 
@@ -32,20 +33,31 @@ public class Main {
   }
 
   public static void main(String[] args) {
-    java.util.List<Board> boards = new LinkedList<>();
+    List<Board> boards = new LinkedList<>();
     try {
       List<Path> boardPaths = Main.getResourcePaths(args);
       for (Path path : boardPaths) {
-        boards.add(BoardParser.parse(path));
+        BoardValidator boardValidator = new BoardValidator(BoardParser.parse(path));
+        boards.add(
+         boardValidator.validate(BoardValidator.Constraint::hasActualReachableBlocks, "Some supposed reachable blocks are not reachable.")
+          .validate(BoardValidator.Constraint::hasMandatoryBlocks, "Some mandatory blocks are missing.")
+          .validate(BoardValidator.Constraint::isBounded, "The board is not correctly bounded.")
+          .validate(BoardValidator.Constraint::isHollow, "The board must have a unique and simple interior.")
+          .get());
       }
       Viewer viewer = new Viewer(boards);
-      Application.run(Color.BLACK, viewer::eventLoop);
+      Application.run(Color.WHITE, viewer::eventLoop);
     } catch (URISyntaxException e) {
       System.err.println(e.getMessage());
       System.exit(1);
     } catch (IOException e) {
       System.err.println(e.getMessage());
       System.exit(2);
+    } catch (BoardValidator.ValidationException e) {
+      for (Throwable throwable : e.getSuppressed()) {
+        System.err.println(throwable.getMessage());
+      }
+      System.exit(3);
     }
   }
 }
diff --git a/src/main/java/fr/umlv/java/wallj/context/GraphicsContext.java b/src/main/java/fr/umlv/java/wallj/context/GraphicsContext.java
index 0475973..2c1c72a 100644
--- a/src/main/java/fr/umlv/java/wallj/context/GraphicsContext.java
+++ b/src/main/java/fr/umlv/java/wallj/context/GraphicsContext.java
@@ -1,5 +1,6 @@
 package fr.umlv.java.wallj.context;
 
+import fr.umlv.java.wallj.board.TileVec2;
 import fr.umlv.zen5.ScreenInfo;
 import org.jbox2d.common.Vec2;
 
@@ -47,7 +48,7 @@ public final class GraphicsContext {
    */
   public void paintCircle(Color color, Vec2 position, float size) {
     graphics2D.setColor(color);
-    graphics2D.fill(new Ellipse2D.Float(position.x, position.y, size, size));
+    graphics2D.fillOval(Math.round(position.x + (TileVec2.TILE_DIM - size) / 2) - 1, Math.round(position.y + (TileVec2.TILE_DIM - size) / 2) - 1, Math.round(size), Math.round(size));
   }
 
   /**
@@ -58,6 +59,11 @@ public final class GraphicsContext {
    */
   public void paintRectangle(Color color, Vec2 position, float width, float height) {
     graphics2D.setColor(color);
-    graphics2D.fill(new Rectangle2D.Float(position.x, position.y, width, height));
+    graphics2D.fillRect(Math.round(position.x), Math.round(position.y), Math.round(width), Math.round(height));
+  }
+
+  public void paintString(Color color, Vec2 position, String string){
+    graphics2D.setColor(color);
+    graphics2D.drawString(string,position.x, position.y);
   }
 }
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 5a4964d..0c067e1 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/BombDisplayController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/BombDisplayController.java
@@ -1,9 +1,14 @@
 package fr.umlv.java.wallj.controller;
 
+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 fr.umlv.java.wallj.block.BombBlock;
+import org.jbox2d.common.Vec2;
 
+import java.awt.*;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -18,8 +23,13 @@ public class BombDisplayController extends DisplayController {
 
   @Override
   public List<Event> update(Context context) {
-    //TODO
-    return null;
+    GraphicsContext graphicsContext = context.getGraphicsContext();
+    graphicsContext.paintCircle(Color.BLACK, bomb.getPos(), TileVec2.TILE_DIM);
+    Vec2 textPosition = bomb.getPos();
+    textPosition.x += TileVec2.TILE_DIM / 4.0f;
+    textPosition.y += 3 * TileVec2.TILE_DIM / 4.0f;
+    graphicsContext.paintString(Color.RED, textPosition, Integer.toString(bomb.getTimer()));
+    return Collections.emptyList();
   }
 
 }
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 40ee550..2a7c44a 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/BombPhysicsController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/BombPhysicsController.java
@@ -4,6 +4,7 @@ import fr.umlv.java.wallj.context.Context;
 import fr.umlv.java.wallj.event.Event;
 import fr.umlv.java.wallj.block.BombBlock;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -19,7 +20,7 @@ public class BombPhysicsController extends PhysicsController {
   @Override
   public List<Event> update(Context context) {
     //TODO
-    return null;
+    return Collections.emptyList();
   }
 
 }
diff --git a/src/main/java/fr/umlv/java/wallj/controller/GarbageDisplayController.java b/src/main/java/fr/umlv/java/wallj/controller/GarbageDisplayController.java
index 4dd7d70..8951d16 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/GarbageDisplayController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/GarbageDisplayController.java
@@ -1,9 +1,13 @@
 package fr.umlv.java.wallj.controller;
 
+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 fr.umlv.java.wallj.block.GarbageBlock;
 
+import java.awt.*;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -18,8 +22,9 @@ public class GarbageDisplayController extends DisplayController {
 
   @Override
   public List<Event> update(Context context) {
-    //TODO
-    return null;
+    GraphicsContext graphicsContext = context.getGraphicsContext();
+    graphicsContext.paintCircle(new Color(102, 51, 0), garbage.getPos(),TileVec2.TILE_DIM);
+    return Collections.emptyList();
   }
 
 }
diff --git a/src/main/java/fr/umlv/java/wallj/controller/RobotDisplayController.java b/src/main/java/fr/umlv/java/wallj/controller/RobotDisplayController.java
index 680bca8..4272ae7 100644
--- a/src/main/java/fr/umlv/java/wallj/controller/RobotDisplayController.java
+++ b/src/main/java/fr/umlv/java/wallj/controller/RobotDisplayController.java
@@ -1,9 +1,13 @@