From d7e370536ea914eb50fc431524c0df0cbefaf23d Mon Sep 17 00:00:00 2001
From: Stef <stbuwalda@gmail.com>
Date: Wed, 29 Oct 2025 17:37:21 +0100
Subject: [PATCH] Applied encapsulation principle to TurnBasedBame.java

---
 game/src/main/java/org/toop/game/Connect4/Connect4.java   | 2 +-
 game/src/main/java/org/toop/game/TurnBasedGame.java       | 5 ++---
 game/src/main/java/org/toop/game/reversi/Reversi.java     | 4 ++--
 game/src/main/java/org/toop/game/tictactoe/TicTacToe.java | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/game/src/main/java/org/toop/game/Connect4/Connect4.java b/game/src/main/java/org/toop/game/Connect4/Connect4.java
index 608afe9..99ee13f 100644
--- a/game/src/main/java/org/toop/game/Connect4/Connect4.java
+++ b/game/src/main/java/org/toop/game/Connect4/Connect4.java
@@ -109,7 +109,7 @@ public class Connect4 extends TurnBasedGame {
     }
 
     private char getCurrentValue() {
-        return currentTurn == 0 ? 'X' : 'O';
+        return this.getCurrentTurn() == 0 ? 'X' : 'O';
     }
 }
 
diff --git a/game/src/main/java/org/toop/game/TurnBasedGame.java b/game/src/main/java/org/toop/game/TurnBasedGame.java
index b4eb1d3..4746f56 100644
--- a/game/src/main/java/org/toop/game/TurnBasedGame.java
+++ b/game/src/main/java/org/toop/game/TurnBasedGame.java
@@ -1,9 +1,8 @@
 package org.toop.game;
 
 public abstract class TurnBasedGame extends Game {
-    public final int turns;
-
-    protected int currentTurn;
+    private final int turns;
+    private int currentTurn;
 
     protected TurnBasedGame(int rowSize, int columnSize, int turns) {
         super(rowSize, columnSize);
diff --git a/game/src/main/java/org/toop/game/reversi/Reversi.java b/game/src/main/java/org/toop/game/reversi/Reversi.java
index 134af20..92db367 100644
--- a/game/src/main/java/org/toop/game/reversi/Reversi.java
+++ b/game/src/main/java/org/toop/game/reversi/Reversi.java
@@ -50,7 +50,7 @@ public final class Reversi extends TurnBasedGame {
 	public Move[] getLegalMoves() {
         final ArrayList<Move> legalMoves = new ArrayList<>();
         char[][] boardGrid = makeBoardAGrid();
-        char currentPlayer = (currentTurn==0) ? 'B' : 'W';
+        char currentPlayer = (this.getCurrentTurn()==0) ? 'B' : 'W';
         Set<Point> adjCell = getAdjacentCells(boardGrid);
         for (Point point : adjCell){
             Move[] moves = getFlipsForPotentialMove(point,boardGrid,currentPlayer);
@@ -176,7 +176,7 @@ public final class Reversi extends TurnBasedGame {
     }
 
     public char getCurrentPlayer() {
-        if (currentTurn == 0){
+        if (this.getCurrentTurn() == 0){
             return 'B';
         }
         else {
diff --git a/game/src/main/java/org/toop/game/tictactoe/TicTacToe.java b/game/src/main/java/org/toop/game/tictactoe/TicTacToe.java
index 4c50d66..19d48a3 100644
--- a/game/src/main/java/org/toop/game/tictactoe/TicTacToe.java
+++ b/game/src/main/java/org/toop/game/tictactoe/TicTacToe.java
@@ -98,6 +98,6 @@ public final class TicTacToe extends TurnBasedGame {
     }
 
     private char getCurrentValue() {
-        return currentTurn == 0 ? 'X' : 'O';
+        return this.getCurrentTurn() == 0 ? 'X' : 'O';
     }
 }