diff --git a/lib/src/main/java/edu/tictactoe/Board.java b/lib/src/main/java/edu/tictactoe/Board.java index e8e29f3..ffab20f 100644 --- a/lib/src/main/java/edu/tictactoe/Board.java +++ b/lib/src/main/java/edu/tictactoe/Board.java @@ -1,8 +1,5 @@ package edu.tictactoe; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; import java.util.Random; import java.util.Timer; import java.util.TimerTask; @@ -11,7 +8,6 @@ import javax.swing.Icon; import javax.swing.ImageIcon; import javax.swing.JOptionPane; -import java.awt.Component; import java.awt.EventQueue; import java.awt.Frame; import java.awt.image.BufferedImage; @@ -83,7 +79,7 @@ public final class Board { } protected boolean winnerCheck() { - HashSet checks = new HashSet(9); + if ((buttons[0].played && buttons[4].played && buttons[8].played) && buttons[0].player == buttons[4].player @@ -101,6 +97,51 @@ public final class Board { return true; } + + if ((buttons[0].played && buttons[1].played && buttons[2].played) + && + buttons[0].player == buttons[1].player + && buttons[1].player == buttons[2].player) { + return true; + + } + + if ((buttons[3].played && buttons[4].played && buttons[5].played) + && + buttons[3].player == buttons[4].player + && buttons[4].player == buttons[5].player) { + + return true; + } + + if ((buttons[6].played && buttons[7].played && buttons[8].played) + && + buttons[6].player == buttons[7].player + && buttons[7].player == buttons[8].player) { + return true; + } + + if ((buttons[0].played && buttons[3].played && buttons[6].played) + && + buttons[0].player == buttons[3].player + && buttons[3].player == buttons[6].player) { + return true; + + } + + if ((buttons[1].played && buttons[4].played && buttons[7].played) + && + buttons[1].player == buttons[4].player + && buttons[4].player == buttons[7].player) { + return true; + } + + if ((buttons[2].played && buttons[5].played && buttons[8].played) + && + buttons[2].player == buttons[5].player + && buttons[5].player == buttons[8].player) { + return true; + } return false; }