From 547b10a440cf4a6f1233c556b23808b03b49eed8 Mon Sep 17 00:00:00 2001 From: Charles Gould Date: Sun, 15 Oct 2017 15:18:38 -0400 Subject: [PATCH] Private invalid guess constant --- .../client/multiplayer/MultiplayerPresenter.java | 2 +- .../client/singleplayer/SinglePlayerPresenter.java | 2 +- common/src/main/java/lingo/common/Game.java | 14 +++++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/client/src/main/java/lingo/client/multiplayer/MultiplayerPresenter.java b/client/src/main/java/lingo/client/multiplayer/MultiplayerPresenter.java index c5c4749..aaa4345 100644 --- a/client/src/main/java/lingo/client/multiplayer/MultiplayerPresenter.java +++ b/client/src/main/java/lingo/client/multiplayer/MultiplayerPresenter.java @@ -303,7 +303,7 @@ public class MultiplayerPresenter implements FxmlController { final int[] result = report.getResult(); log.info("My result: " + Arrays.toString(result)); Platform.runLater(() -> { - if (Arrays.equals(result, Game.INVALID_GUESS)) { + if (Game.isInvalid(result)) { playerBoard.addGuess("-----"); } else { for (int i = 0; i < Game.WORD_LENGTH; i++) { diff --git a/client/src/main/java/lingo/client/singleplayer/SinglePlayerPresenter.java b/client/src/main/java/lingo/client/singleplayer/SinglePlayerPresenter.java index 0c514c6..100ae22 100644 --- a/client/src/main/java/lingo/client/singleplayer/SinglePlayerPresenter.java +++ b/client/src/main/java/lingo/client/singleplayer/SinglePlayerPresenter.java @@ -128,7 +128,7 @@ public class SinglePlayerPresenter { final int[] result = report.getResult(); log.info("My result: " + Arrays.toString(result)); Platform.runLater(() -> { - if (Arrays.equals(result, Game.INVALID_GUESS)) { + if (Game.isInvalid(result)) { gameBoard.addGuess("-----"); } else { for (int i = 0; i < Game.WORD_LENGTH; i++) { diff --git a/common/src/main/java/lingo/common/Game.java b/common/src/main/java/lingo/common/Game.java index 86aeaac..8429786 100644 --- a/common/src/main/java/lingo/common/Game.java +++ b/common/src/main/java/lingo/common/Game.java @@ -1,5 +1,6 @@ package lingo.common; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Set; @@ -12,6 +13,9 @@ public class Game { public static final int CORRECT_CHARACTER = 2; public static final int WORD_LENGTH = 5; + /** Nein nein nein nein nein! */ + private static final int[] INVALID_GUESS = new int[] { 9, 9, 9, 9, 9 }; + private static final AtomicInteger idCounter = new AtomicInteger(0); public final int id; @@ -42,10 +46,6 @@ public class Game { return -1; } - private static int[] invalidGuess() { - return new int[] { 9, 9, 9, 9, 9 }; - } - public static boolean isCorrect(int[] result) { for (int i = 0; i < WORD_LENGTH; i++) { if (result[i] != CORRECT_CHARACTER) { @@ -55,9 +55,13 @@ public class Game { return true; } + public static boolean isInvalid(int[] result) { + return Arrays.equals(result, INVALID_GUESS); + } + public int[] evaluate(String guess) { if (!acceptableGuesses.contains(guess)) { - return invalidGuess(); + return INVALID_GUESS; } // the guess is acceptable