1 files changed, 13 insertions, 10 deletions
diff --git a/src/jrummikub/view/impl/Board.java b/src/jrummikub/view/impl/Board.java
index 1d7cc1a..dc26dd4 100644
--- a/src/jrummikub/view/impl/Board.java
+++ b/src/jrummikub/view/impl/Board.java
@@ -3,18 +3,22 @@ package jrummikub.view.impl;
 import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.Insets;
+import java.util.Collections;
+import java.util.Map;
 
 import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 
+import jrummikub.model.Position;
 import jrummikub.model.Stone;
-import jrummikub.model.StoneColor;
 import jrummikub.view.IBoard;
 
 @SuppressWarnings("serial")
 public class Board extends JPanel implements IBoard {
   private final static ImageIcon background = new ImageIcon(Board.class.getResource("/jrummikub/resource/wood.png"));
 
+  private Map<Stone, Position> stones = Collections.emptyMap();
+
   Board() {
     super(true);
     
@@ -34,14 +38,13 @@ public class Board extends JPanel implements IBoard {
       background.paintIcon(this, g, xpos, 75);
     }
     
-    // TODO Rest of painting code
-    
-    // FIXME Test code
-    StonePainter.paintStone(g, new Stone(1, StoneColor.ORANGE, false),
-        0, 0, StonePainter.BOARD_SCALE);
-    StonePainter.paintStone(g, new Stone(10, StoneColor.BLUE, false),
-        1, 0, StonePainter.BOARD_SCALE);
-    StonePainter.paintStone(g, new Stone(5, StoneColor.RED, false),
-        0.5f, 1, StonePainter.BOARD_SCALE);
+    for (Map.Entry<Stone, Position> stone : stones.entrySet()) {
+      StonePainter.paintStone(g, stone.getKey(), stone.getValue(), StonePainter.BOARD_SCALE);
+    }
+  }
+
+  @Override
+  public void setStones(Map<Stone, Position> stones) {
+    this.stones = stones;
   }
 }