From c1e580c09e33d35ca7206cc1cd9263fae1cd45f3 Mon Sep 17 00:00:00 2001
From: dragapsy <elghaoutiayman20@gmail.com>
Date: Tue, 15 Nov 2022 14:55:02 +0100
Subject: [PATCH] Revert "MAJ"
This reverts commit 2093223c3608b3e99782c1cddad3b9acd1b319c9.
---
app/src/main/java/model/SquareCell.java | 32 ++-------------------
app/src/test/java/model/SquareCellTest.java | 4 +--
2 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/app/src/main/java/model/SquareCell.java b/app/src/main/java/model/SquareCell.java
index 35f1b09..14f51e9 100644
--- a/app/src/main/java/model/SquareCell.java
+++ b/app/src/main/java/model/SquareCell.java
@@ -2,8 +2,6 @@ package model;
import javafx.scene.paint.Color;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -11,21 +9,6 @@ public class SquareCell extends AbstractCell{
List<Cell> neighbours;
- public SquareCell(){
- setColor(AbstractCell.DEFAULT_CELL_COLOR);
- setNeighbours(null);
-
- }
- public SquareCell( Color color){
- setColor(color);
- setNeighbours(null);
-
- }
- public SquareCell(Color color,List<Cell>neighbours){
- SquareCell Cell=new SquareCell(color);
- setNeighbours( neighbours);
- }
-
/**
* A cell is placed somewhere on a grid. Its neighbours thus depend on the underlying grid.
@@ -34,7 +17,7 @@ public class SquareCell extends AbstractCell{
*/
@Override
public List<Cell> getNeighbours() {
- return neighbours;
+ return null;
}
/**
@@ -45,19 +28,8 @@ public class SquareCell extends AbstractCell{
*/
@Override
public void setNeighbours(List<Cell> cells) {
- if (cells==null){
- neighbours=new ArrayList<>();
- }
- else {
-
- neighbours=new ArrayList<>();
- for (Cell value:cells)
- {
- neighbours.add(value);
- }
- }
}
-}
\ No newline at end of file
+}
diff --git a/app/src/test/java/model/SquareCellTest.java b/app/src/test/java/model/SquareCellTest.java
index fa14572..7551867 100644
--- a/app/src/test/java/model/SquareCellTest.java
+++ b/app/src/test/java/model/SquareCellTest.java
@@ -13,7 +13,7 @@ class SquareCellTest {
// TODO
// uncomment
-
+ /*
private final Cell northCell = new SquareCell(Color.NAVY);
private final Cell southCell = new SquareCell(Color.SALMON);
private final Cell westCell = new SquareCell(Color.WHEAT);
@@ -51,5 +51,5 @@ class SquareCellTest {
assertThat(centralCell.getNeighbours()).containsExactlyInAnyOrder(northCell,southCell);
}
-
+ */
}
\ No newline at end of file
--
GitLab