more analysisHEADmaster

2 files changed, 6 insertions, 4 deletions

diff --git a/src/se/liu/gusso230/tetris/Board.java b/src/se/liu/gusso230/tetris/Board.java
index a3910d2..a1a4a47 100644
--- a/src/se/liu/gusso230/tetris/Board.java
+++ b/src/se/liu/gusso230/tetris/Board.java
@@ -34,7 +34,7 @@ public class Board {
     private HighscoreList highscores;
     private File highscoreFile;
 
-    private Timer timer;
+    private Timer timer = null; // only read and written to in start()
     private int timerDelay;
     private List<BoardListener> boardListeners;
     private BoardInterface boardInterface;
@@ -87,7 +87,7 @@ public class Board {
             }
             if (falling == null) {
                 // only if falling was placed
-                checkFullLines();
+                burnLines();
             }
             updateFallHandler();
         }
@@ -194,7 +194,7 @@ public class Board {
         notifyListeners();
     }
 
-    private void checkFullLines() {
+    private void burnLines() {
         int y = height - 1;
         int linesCleared = 0;
         while (y >= 0) {
diff --git a/src/se/liu/gusso230/tetris/TetrisViewer.java b/src/se/liu/gusso230/tetris/TetrisViewer.java
index 0406c7c..1af83a6 100644
--- a/src/se/liu/gusso230/tetris/TetrisViewer.java
+++ b/src/se/liu/gusso230/tetris/TetrisViewer.java
@@ -11,6 +11,8 @@ public class TetrisViewer {
     private TetrisComponent tetrisComponent;
     private Board board;
 
+    private static final int INITIAL_TIMEOUT = 2000;
+
     public TetrisViewer(final Board board, URL image) {
         menuBar = setUpMenuBar();
         imageComponent = new ImageComponent(image);
@@ -61,7 +63,7 @@ public class TetrisViewer {
         frame.add(imageComponent, BorderLayout.CENTER);
         frame.pack();
         try {
-            Thread.sleep(2000);
+            Thread.sleep(INITIAL_TIMEOUT);
         } catch (InterruptedException ignored) {}
 
         frame.remove(imageComponent);