From 780c88d0dad97132e7c59ebfe2b6e7e8174f7457 Mon Sep 17 00:00:00 2001
From: Persson-dev <sim16.prib@gmail.com>
Date: Tue, 21 Jan 2025 18:47:09 +0100
Subject: [PATCH] fix merge

---
 app/src/main/java/sudoku/Cell.java                 |  9 ++-------
 app/src/main/java/sudoku/Sudoku.java               | 10 +++++++++-
 app/src/main/java/sudoku/io/SudokuPrinter.java     |  2 +-
 app/src/main/java/sudoku/io/SudokuSerializer.java  |  4 ++--
 app/src/test/java/sudoku/SudokuSerializerTest.java |  1 -
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/sudoku/Cell.java b/app/src/main/java/sudoku/Cell.java
index bb8f52a..74dd9b7 100644
--- a/app/src/main/java/sudoku/Cell.java
+++ b/app/src/main/java/sudoku/Cell.java
@@ -1,7 +1,5 @@
 package sudoku;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 public abstract class Cell {
 
 	protected static int NOSYMBOLE = -1;
@@ -32,11 +30,8 @@ public abstract class Cell {
 		this.block = block;
 	}
 
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof Cell otherCell)
-			return otherCell.getSymbolIndex() == this.getSymbolIndex();
-		return false;
+	public boolean equalsValue(Cell otherCell) {
+		return otherCell.getSymbolIndex() == this.getSymbolIndex();
 	}
 
 	@Override
diff --git a/app/src/main/java/sudoku/Sudoku.java b/app/src/main/java/sudoku/Sudoku.java
index e474717..590ed81 100644
--- a/app/src/main/java/sudoku/Sudoku.java
+++ b/app/src/main/java/sudoku/Sudoku.java
@@ -18,7 +18,7 @@ public class Sudoku {
 	public Sudoku(List<Cell> cells, List<Block> blocks, List<IConstraint> constraints) {
 		this.cells = cells;
 		this.blocks = blocks;
-		this.constraints = new ArrayList<>(constraints);
+		this.constraints = constraints;
 	}
 
 	public Cell getCell(int x, int y) {
@@ -45,6 +45,14 @@ public class Sudoku {
 		throw new Error("Function isValid() not implemented");
 	}
 
+	public List<Cell> getCells() {
+		return this.cells;
+	}
+
+	public List<Block> getBlocks() {
+		return this.blocks;
+	}
+
 	public List<MutableCell> getMutableCells() {
 		List<MutableCell> mutableCells = new ArrayList<>();
 		for (Cell cell : this.cells) {
diff --git a/app/src/main/java/sudoku/io/SudokuPrinter.java b/app/src/main/java/sudoku/io/SudokuPrinter.java
index b42ffeb..ced7bff 100644
--- a/app/src/main/java/sudoku/io/SudokuPrinter.java
+++ b/app/src/main/java/sudoku/io/SudokuPrinter.java
@@ -11,7 +11,7 @@ public class SudokuPrinter {
 			}
 			String line = "[ ";
 			for (int x = 0; x < s.getSize(); x++) {
-				line += (s.getCell(x, y).getSymboleIndex() + 1) + " ";
+				line += (s.getCell(x, y).getSymbolIndex() + 1) + " ";
 				if (x % blockWidth == blockWidth - 1 && x != blockWidth * blockHeight - 1) {
 					line += "| ";
 				}
diff --git a/app/src/main/java/sudoku/io/SudokuSerializer.java b/app/src/main/java/sudoku/io/SudokuSerializer.java
index ea10eed..0bb7ca5 100644
--- a/app/src/main/java/sudoku/io/SudokuSerializer.java
+++ b/app/src/main/java/sudoku/io/SudokuSerializer.java
@@ -43,7 +43,7 @@ public class SudokuSerializer {
 				}
 
 				int blockID = blockIds.indexOf(block);
-				int symboleIndex = cell.getSymboleIndex();
+				int symboleIndex = cell.getSymbolIndex();
 
 				JSONObject cellJsonObject = new JSONObject();
 				cellJsonObject.put("blockID", blockID);
@@ -157,7 +157,7 @@ public class SudokuSerializer {
 				sudokuBlocks.add(blocks.get(blockID));
 			}
 
-			sudokus.add(new Sudoku(sudokuCells, sudokuBlocks));
+			sudokus.add(new Sudoku(sudokuCells, sudokuBlocks, null));
 		}
 
 		return new MultiDoku(sudokus);
diff --git a/app/src/test/java/sudoku/SudokuSerializerTest.java b/app/src/test/java/sudoku/SudokuSerializerTest.java
index 663d0a2..fdd68c1 100644
--- a/app/src/test/java/sudoku/SudokuSerializerTest.java
+++ b/app/src/test/java/sudoku/SudokuSerializerTest.java
@@ -1,6 +1,5 @@
 package sudoku;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;