diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/java/view/FirefighterGrid.java b/src/main/java/view/FirefighterGrid.java index ecc8129c023c3a84787bb12b7db4de3bbb7cde95..e5061a3b16c98a44bfa670cb6423dc2b61dbf22f 100644 --- a/src/main/java/view/FirefighterGrid.java +++ b/src/main/java/view/FirefighterGrid.java @@ -7,11 +7,12 @@ import javafx.scene.paint.Color; import javafx.util.Pair; import util.Position; -public class FirefighterGrid extends Canvas implements Grid<ViewElement>{ +public class FirefighterGrid extends Canvas implements Grid<ViewElement> { private void paintElementAtPosition(ViewElement element, Position position) { paintBox(position.x(), position.y(), element.getColor()); } + private int boxWidth; private int boxHeight; private int columnCount; @@ -32,7 +33,7 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{ } private void paint(List<Pair<Position, ViewElement>> positionedElements) { - for(Pair<Position, ViewElement> pair : positionedElements){ + for (Pair<Position, ViewElement> pair : positionedElements) { paintElementAtPosition(pair.getValue(), pair.getKey()); } } @@ -45,12 +46,12 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{ } private void clear() { - getGraphicsContext2D().clearRect(0,0,getWidth(), getHeight()); + getGraphicsContext2D().clearRect(0, 0, getWidth(), getHeight()); } private void paint(ViewElement[][] elements) { - for(int column = 0; column < columnCount; column++) - for(int row = 0; row < rowCount; row++){ + for (int column = 0; column < columnCount; column++) + for (int row = 0; row < rowCount; row++) { paintElementAtPosition(elements[row][column], new Position(row, column)); } } @@ -73,27 +74,27 @@ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{ super.setHeight(boxHeight * rowCount); } - private void paintLines(){ + private void paintLines() { paintHorizontalLines(); paintVerticalLines(); } private void paintVerticalLines() { - for(int column = 0; column < columnCount; column++) - getGraphicsContext2D().strokeLine(column * boxWidth, 0,column * boxWidth, getHeight()); + for (int column = 0; column < columnCount; column++) + getGraphicsContext2D().strokeLine(column * boxWidth, 0, column * boxWidth, getHeight()); } private void paintHorizontalLines() { - for(int row = 0; row < rowCount; row++) + for (int row = 0; row < rowCount; row++) getGraphicsContext2D().strokeLine(0, row * boxHeight, getWidth(), row * boxHeight); } - private void paintBox(int row, int column, Color color){ + private void paintBox(int row, int column, Color color) { getGraphicsContext2D().setFill(color); - getGraphicsContext2D().fillRect(column * boxWidth,row * boxHeight, boxWidth, boxHeight); + getGraphicsContext2D().fillRect(column * boxWidth, row * boxHeight, boxWidth, boxHeight); } - private void clearBox(int row, int column){ - getGraphicsContext2D().clearRect(column * boxWidth,row * boxHeight, boxWidth, boxHeight); + private void clearBox(int row, int column) { + getGraphicsContext2D().clearRect(column * boxWidth, row * boxHeight, boxWidth, boxHeight); } } \ No newline at end of file