3 files changed, 11 insertions, 10 deletions
diff --git a/src/se/liu/gusso230/tetris/Board.java b/src/se/liu/gusso230/tetris/Board.java
index f31c585..a3910d2 100644
--- a/src/se/liu/gusso230/tetris/Board.java
+++ b/src/se/liu/gusso230/tetris/Board.java
@@ -64,14 +64,18 @@ public class Board {
         highscoreFile = new File("highscores.json");
         readHighscores();
 
+        timerDelay = 250;
+    }
+
+    public void start() {
         final Action tick = new AbstractAction() {
             @Override public void actionPerformed(final ActionEvent actionEvent) {
                 tick();
             }
         };
 
-        timerDelay = 250;
         timer = new Timer(timerDelay, tick);
+        timer.start();
     }
 
     private void tick() {
@@ -290,10 +294,6 @@ public class Board {
         return points;
     }
 
-    public Timer getTimer() {
-        return timer;
-    }
-
     public GameState getState() {
         return state;
     }
diff --git a/src/se/liu/gusso230/tetris/BoardTester.java b/src/se/liu/gusso230/tetris/BoardTester.java
index 8c8dacd..4efd56b 100644
--- a/src/se/liu/gusso230/tetris/BoardTester.java
+++ b/src/se/liu/gusso230/tetris/BoardTester.java
@@ -10,7 +10,7 @@ public class BoardTester implements BoardInterface {
         TetrisViewer viewer = new TetrisViewer(board, ClassLoader.getSystemResource("images/hello_world.png"));
         viewer.show();
 
-        board.getTimer().start();
+        board.start();
     }
 
     @Override public boolean promptUserYesNo(final String prompt) {
diff --git a/src/se/liu/gusso230/tetris/TetrisComponent.java b/src/se/liu/gusso230/tetris/TetrisComponent.java
index b3d0884..3fc37dd 100644
--- a/src/se/liu/gusso230/tetris/TetrisComponent.java
+++ b/src/se/liu/gusso230/tetris/TetrisComponent.java
@@ -11,6 +11,11 @@ public class TetrisComponent extends JComponent implements BoardListener {
     private static final int TILE_GAP = 4;
     private static final int LEFT_MARGIN = 10;
     private static final int LINE_HEIGHT = 40;
+
+    // !!!!!!!!!
+    // This is ONLY used when getting the color and NOWHERE else.
+    // It isn't changed anywhere.
+    // !!!!!!!!!
     private static final EnumMap<SquareType, Color> SQUARE_TYPE_COLORS = getDefaultColors();
 
     private Board board;
@@ -103,10 +108,6 @@ public class TetrisComponent extends JComponent implements BoardListener {
         requestFocus();
     }
 
-    @Override public void onGameOver() {
-
-    }
-
     public Color getColor(int x, int y) {
         return SQUARE_TYPE_COLORS.get(board.getSquareAt(x, y, true));
     }