From 10329f1c245d1c065e088db59df8ff4ef7113cb5 Mon Sep 17 00:00:00 2001
From: steyer <steyer10@gmail.com>
Date: Mon, 9 Dec 2019 19:49:10 +0100
Subject: [PATCH] =?UTF-8?q?for-ok=20lecser=C3=A9l=C3=A9se?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/game/Cell.java | 2 +-
src/game/GameBoard.java | 12 ++++++------
src/game/GameWindowButtonsListener.java | 5 -----
src/game/StartNewButtonListener.java | 8 ++++----
4 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/game/Cell.java b/src/game/Cell.java
index 6873529..36a80f4 100644
--- a/src/game/Cell.java
+++ b/src/game/Cell.java
@@ -6,7 +6,7 @@ import java.util.List;
public class Cell {
private boolean alive, aliveNextTurn;
- private List<Cell> neighbours; //TODO iterator
+ private List<Cell> neighbours;
public Cell() {
alive = false;
diff --git a/src/game/GameBoard.java b/src/game/GameBoard.java
index 326d768..0b46f38 100644
--- a/src/game/GameBoard.java
+++ b/src/game/GameBoard.java
@@ -5,7 +5,7 @@ import java.util.List;
public class GameBoard {
- private List<Cell> cells; //TODO iterator
+ private List<Cell> cells;
private int height, width, size;
public GameBoard(int height, int width) {
@@ -45,12 +45,12 @@ public class GameBoard {
}
synchronized public void step() {
- for (int i=0; i<size; i++)
- cells.get(i).checkNextState();
+ for (Cell i: cells) {
+ i.checkNextState();
+ }
- for (int i = 0; i < size; i++) {
- cells.get(i).nextState();
-
+ for (Cell i: cells) {
+ i.nextState();
}
}
diff --git a/src/game/GameWindowButtonsListener.java b/src/game/GameWindowButtonsListener.java
index 0d86b9e..73cbcb7 100644
--- a/src/game/GameWindowButtonsListener.java
+++ b/src/game/GameWindowButtonsListener.java
@@ -20,11 +20,6 @@ public class GameWindowButtonsListener implements ActionListener {
case "stop":
model.stop();
break;
- /*case "save": //TODO lehet, nem kell
- model.saveToFile();
- break;
-
- */
}
}
}
diff --git a/src/game/StartNewButtonListener.java b/src/game/StartNewButtonListener.java
index cc5b431..05d606c 100644
--- a/src/game/StartNewButtonListener.java
+++ b/src/game/StartNewButtonListener.java
@@ -8,13 +8,13 @@ public class StartNewButtonListener implements ActionListener {
private JTextField heightTextField, widthTextField;
private StartModel model;
- private final int defaultHight, defaultWidth;
+ private final int defaultHeight, defaultWidth;
public StartNewButtonListener(StartModel model, JTextField heightText, JTextField widthText) {
heightTextField = heightText;
widthTextField = widthText;
this.model = model;
- this.defaultHight = model.getDefaultHeight();
+ this.defaultHeight = model.getDefaultHeight();
this.defaultWidth = model.getDefaultWidth();
}
@@ -25,7 +25,7 @@ public class StartNewButtonListener implements ActionListener {
try {
height = Integer.parseInt(heightTextField.getText());
} catch (Exception exc) {
- height = defaultHight;
+ height = defaultHeight;
}
try {
@@ -35,7 +35,7 @@ public class StartNewButtonListener implements ActionListener {
}
if (height < 10) {
- height = defaultHight;
+ height = defaultHeight;
}
if (width < 10) {
--
GitLab