public/ultimatetictactoe-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use enhanced switch form Java 17, Remove unused method

Browse Source
This commit is contained in:
Marcel Schwarz 2021-11-03 23:20:04 +01:00
parent 4c49f939ee
commit 2cfa7130fc
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/de/icaotix/ultimatetictactoe/model/TicTacToeGame.java
View File

@ -53,10 +53,6 @@ public class TicTacToeGame {
return this.state != GameState.RUNNING; return this.state != GameState.RUNNING;
} }
public void setState(GameState state) {
this.state = state;
}
public GameState getState() { public GameState getState() {
return state; return state;
} }
@ -69,12 +65,8 @@ public class TicTacToeGame {
interestingStates.add(this.cells[winningCombination[2]]); interestingStates.add(this.cells[winningCombination[2]]);
if (interestingStates.size() == 1 && !interestingStates.contains(CellState.EMPTY)) { if (interestingStates.size() == 1 && !interestingStates.contains(CellState.EMPTY)) {
switch (this.cells[winningCombination[0]]) { switch (this.cells[winningCombination[0]]) {
case O: case O -> this.state = GameState.O_WON;
this.state = GameState.O_WON; case X -> this.state = GameState.X_WON;
break;
case X:
this.state = GameState.X_WON;
break;
} }
return; return;
} }

8
src/main/java/de/icaotix/ultimatetictactoe/model/UltimateTicTacToe.java
View File

@ -66,12 +66,8 @@ public class UltimateTicTacToe {
interestingStates.add(this.masterGameStates[winningCombination[2]]); interestingStates.add(this.masterGameStates[winningCombination[2]]);
if (interestingStates.size() == 1 && !interestingStates.contains(GameState.RUNNING)) { if (interestingStates.size() == 1 && !interestingStates.contains(GameState.RUNNING)) {
switch (this.masterGameStates[winningCombination[0]]) { switch (this.masterGameStates[winningCombination[0]]) {
case O_WON: case O_WON -> this.gameState = GameState.O_WON;
this.gameState = GameState.O_WON; case X_WON -> this.gameState = GameState.X_WON;
break;
case X_WON:
this.gameState = GameState.X_WON;
break;
} }
return; return;
} }