Extracted interface

yadavvi91 · Sep 9, 2023 · fed1a8a · fed1a8a
1 parent 315ba99
commit fed1a8a
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 20 deletions.
diff --git a/src/main/java/org/yadavvi/ConsoleUI.java b/src/main/java/org/yadavvi/ConsoleUI.java
@@ -4,28 +4,34 @@
 import java.io.PrintStream;
 import java.util.Scanner;
 
-public class ConsoleUI {
+public class ConsoleUI implements UI {
 
-    void showNextGuessPrompt(PrintStream out) {
+    @Override
+    public void showNextGuessPrompt(PrintStream out) {
         out.println("Your guess? ");
     }
 
-    char getGuess(InputStream in) {
+    @Override
+    public char getGuess(InputStream in) {
         return new Scanner(in).nextLine().charAt(0);
     }
 
-    void showAlreadyGuessed(String guesses, PrintStream out) {
+    @Override
+    public void showAlreadyGuessed(String guesses, PrintStream out) {
         out.println("You've already guessed '" + guesses + "', try another letter.");
     }
 
-    void showYouWon(PrintStream out) {
+    @Override
+    public void showYouWon(PrintStream out) {
         out.println("YOU WON!");
     }
 
-    void showGuesses(String guesses, PrintStream out) {
+    @Override
+    public void showGuesses(String guesses, PrintStream out) {
         out.println("Guesses: " + guesses);
     }
 
+    @Override
     public void showGallows(int errorCount, PrintStream out) {
         switch (errorCount) {
             case 0:

diff --git a/src/main/java/org/yadavvi/Dictionary.java b/src/main/java/org/yadavvi/Dictionary.java
@@ -0,0 +1,5 @@
+package org.yadavvi;
+
+public interface Dictionary {
+    String selectWord();
+}
diff --git a/src/main/java/org/yadavvi/FixedDictionary.java b/src/main/java/org/yadavvi/FixedDictionary.java
@@ -1,7 +1,8 @@
 package org.yadavvi;
 
-public class FixedDictionary {
-    String selectWord() {
+public class FixedDictionary implements Dictionary {
+    @Override
+    public String selectWord() {
         return "meatball";
     }
 }
diff --git a/src/main/java/org/yadavvi/Main.java b/src/main/java/org/yadavvi/Main.java
@@ -17,22 +17,22 @@ public static void main(String[] args) {
         InputStream in = System.in;
         PrintStream out = System.out;
 
-        FixedDictionary fixedDictionary = new FixedDictionary();
-        ConsoleUI consoleUi = new ConsoleUI();
+        Dictionary dictionary = new FixedDictionary();
+        UI ui = new ConsoleUI();
 
-        String word = fixedDictionary.selectWord();
+        String word = dictionary.selectWord();
         String matched = word;
         String lettersUsed = "";
         String guesses = repeat("_ ", word.length());
         int badGuessCount = 0;
         while (badGuessCount < 6 && !matched.equals(repeat("_", word.length()))) {
-            consoleUi.showGallows(badGuessCount, out);
-            consoleUi.showGuesses(guesses, out);
-            consoleUi.showNextGuessPrompt(out);
-            char guess = consoleUi.getGuess(in);
+            ui.showGallows(badGuessCount, out);
+            ui.showGuesses(guesses, out);
+            ui.showNextGuessPrompt(out);
+            char guess = ui.getGuess(in);
 
             if (lettersUsed.indexOf(guess) >= 0) {
-                consoleUi.showAlreadyGuessed(guesses, out);
+                ui.showAlreadyGuessed(guesses, out);
             } else {
                 lettersUsed += guess;
                 if (matched.indexOf(guess) >= 0) {
@@ -49,15 +49,15 @@ public static void main(String[] args) {
                 } else {
                     ++badGuessCount;
                     if (badGuessCount == 6) {
-                        consoleUi.showGallows(badGuessCount, out);
+                        ui.showGallows(badGuessCount, out);
                         break;
                     }
                 }
             }
             if (matched.equals(repeat("_", word.length()))) {
-                consoleUi.showGallows(badGuessCount, out);
-                consoleUi.showGuesses(guesses, out);
-                consoleUi.showYouWon(out);
+                ui.showGallows(badGuessCount, out);
+                ui.showGuesses(guesses, out);
+                ui.showYouWon(out);
             }
         }
     }

diff --git a/src/main/java/org/yadavvi/UI.java b/src/main/java/org/yadavvi/UI.java
@@ -0,0 +1,18 @@
+package org.yadavvi;
+
+import java.io.InputStream;
+import java.io.PrintStream;
+
+public interface UI {
+    void showNextGuessPrompt(PrintStream out);
+
+    char getGuess(InputStream in);
+
+    void showAlreadyGuessed(String guesses, PrintStream out);
+
+    void showYouWon(PrintStream out);
+
+    void showGuesses(String guesses, PrintStream out);
+
+    void showGallows(int errorCount, PrintStream out);
+}