From 81aed3a4ca824da1914af3a6361f3792c67aacfd Mon Sep 17 00:00:00 2001
From: steyer <steyer10@gmail.com>
Date: Wed, 27 Nov 2019 13:09:07 +0100
Subject: [PATCH] =?UTF-8?q?=C3=9Aj=20GameModel=20construtor=20GameBoard-da?=
=?UTF-8?q?l?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/game/GameModel.java | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/game/GameModel.java b/src/game/GameModel.java
index d64720b..3a911f8 100644
--- a/src/game/GameModel.java
+++ b/src/game/GameModel.java
@@ -4,25 +4,32 @@ import javax.swing.table.AbstractTableModel;
public class GameModel extends AbstractTableModel {
- private GameBoard cells;
+ private GameBoard board;
private GameRunner runner;
private GameRunner2 runner2; //TODO runners
private boolean editable;
public GameModel(int height, int width) {
- cells = new GameBoard(height, width);
- runner = new GameRunner(this, cells);
- runner2 = new GameRunner2(this, cells);
+ board = new GameBoard(height, width);
+ runner = new GameRunner(this, board);
+ runner2 = new GameRunner2(this, board);
+ runner2.start();
+ editable = true;
+ }
+
+ public GameModel(GameBoard board){
+ this.board = board;
+ runner2 = new GameRunner2(this, board);
runner2.start();
editable = true;
}
public int getRowCount() {
- return cells.getHeight();
+ return board.getHeight();
}
public int getColumnCount() {
- return cells.getWidth();
+ return board.getWidth();
}
public String getColumnName(int columnIndex) {
@@ -53,7 +60,7 @@ public class GameModel extends AbstractTableModel {
*/
//TODO runners
runner2.pauseRunner();
- synchronized (cells) {
+ synchronized (board) {
editable = true;
}
}
@@ -63,17 +70,17 @@ public class GameModel extends AbstractTableModel {
}
public Object getValueAt(int rowIndex, int columnIndex) {
- return cells.get(rowIndex, columnIndex).isAlive();
+ return board.get(rowIndex, columnIndex).isAlive();
}
public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
- cells.get(rowIndex, columnIndex).setAlive((boolean) aValue);
+ board.get(rowIndex, columnIndex).setAlive((boolean) aValue);
}
public void step() {
//TODO törölni
- cells.step();
+ board.step();
fireTableDataChanged();
}
--
GitLab