Refactored

Author: luontola

src/main/java/tetris/Board.java

@@ -59,14 +59,7 @@ public char cellAt(int row, int col) {
 
     private char fallingCellAt(int row, int col) {
         if (hasFalling()) {
-            int pieceRow = row - falling.rowOffset;
-            int pieceCol = col - falling.colOffset;
-            if (pieceRow >= 0
-                    && pieceRow < falling.rows()
-                    && pieceCol >= 0
-                    && pieceCol < falling.columns()) {
-                return falling.cellAt(pieceRow, pieceCol);
-            }
+            return falling.boardCellAt(row, col);
         }
         return EMPTY;
     }

src/main/java/tetris/MovableGrid.java

@@ -17,12 +17,14 @@ public MovableGrid(Grid shape, int rowOffset, int colOffset) {
     }
 
     public boolean isOutside(Board board) {
-        for (int row = 0; row < rows(); row++) {
-            for (int col = 0; col < columns(); col++) {
-                if (hasCellAt(row, col)) {
-                    if (colOffset + col < 0
-                            || colOffset + col >= board.columns()
-                            || rowOffset + row >= board.rows()) {
+        for (int myRow = 0; myRow < rows(); myRow++) {
+            for (int myCol = 0; myCol < columns(); myCol++) {
+                if (hasCellAt(myRow, myCol)) {
+                    int boardRow = rowOffset + myRow;
+                    int boardCol = colOffset + myCol;
+                    if (boardCol < 0
+                            || boardCol >= board.columns()
+                            || boardRow >= board.rows()) {
                         return true;
                     }
                 }
@@ -32,11 +34,11 @@ public boolean isOutside(Board board) {
     }
 
     public boolean collidesWith(char[][] board) {
-        for (int row = 0; row < rows(); row++) {
-            for (int col = 0; col < columns(); col++) {
-                if (hasCellAt(row, col)) {
-                    int boardRow = rowOffset + row;
-                    int boardCol = colOffset + col;
+        for (int myRow = 0; myRow < rows(); myRow++) {
+            for (int myCol = 0; myCol < columns(); myCol++) {
+                if (hasCellAt(myRow, myCol)) {
+                    int boardRow = rowOffset + myRow;
+                    int boardCol = colOffset + myCol;
                     if (board[boardRow][boardCol] != EMPTY) {
                         return true;
                     }
@@ -46,6 +48,23 @@ public boolean collidesWith(char[][] board) {
         return false;
     }
 
+    public char boardCellAt(int boardRow, int boardCol) {
+        int myRow = boardRow - rowOffset;
+        int myCol = boardCol - colOffset;
+        if (myRow >= 0
+                && myRow < rows()
+                && myCol >= 0
+                && myCol < columns()) {
+            return cellAt(myRow, myCol);
+        }
+        return EMPTY;
+    }
+
+    @Override
+    public char cellAt(int row, int col) {
+        return shape.cellAt(row, col);
+    }
+
     @Override
     public int rows() {
         return shape.rows();
@@ -56,11 +75,6 @@ public int columns() {
         return shape.columns();
     }
 
-    @Override
-    public char cellAt(int row, int col) {
-        return shape.cellAt(row, col);
-    }
-
     public MovableGrid moveDown() {
         return new MovableGrid(shape, rowOffset + 1, colOffset);
     }