ManualTicTacToe: Narrowed lots to private / private[ui].

Author: Daniel Barclay

src/main/scala/com/us/dsb/explore/algs/ttt/manual/ui/GameUI.scala

@@ -19,32 +19,32 @@ object GameUI {
 
   // ?? revisit name
   trait SegregatedTextIO {
-    def printStateText(lineOrLines: String): Unit
-    def readPromptedLine(prompt: String): String
-    def printError(fullLine: String): Unit
+    private[ui] def printStateText(lineOrLines: String): Unit
+    private[ui] def readPromptedLine(prompt: String): String
+    private[ui] def printError(fullLine: String): Unit
     // ?? first, second, or both?:
-    def printResult(lineOrLines: String): Unit
-    def printResult(result: GameUIResult): Unit = printResult(result.text)
+    private[ui] def printResult(lineOrLines: String): Unit
+    private[ui] def printResult(result: GameUIResult): Unit = printResult(result.text)
   }
 
   class BaseConsoleTextIO extends SegregatedTextIO {
     import scala.io.StdIn.readLine
 
-    override def printStateText(lineOrLines: String): Unit = println(lineOrLines)
-    override def readPromptedLine(prompt: String): String  = readLine(prompt)
-    override def printError(fullLine: String): Unit = println(fullLine)
-    override def printResult(lineOrLines: String): Unit = println(lineOrLines)
+    private[ui] override def printStateText(lineOrLines: String): Unit = println(lineOrLines)
+    private[ui] override def readPromptedLine(prompt: String): String  = readLine(prompt)
+    private[ui] override def printError(fullLine: String): Unit = println(fullLine)
+    private[ui] override def printResult(lineOrLines: String): Unit = println(lineOrLines)
   }
 
   object PlainConsoleTextIO extends BaseConsoleTextIO
 
   object ColoredConsoleTextIO extends BaseConsoleTextIO {
     import scala.io.AnsiColor._
-    override def readPromptedLine(prompt: String): String =
+    private[ui] override def readPromptedLine(prompt: String): String =
       super.readPromptedLine(BLUE + prompt + RESET)
-    override def printError(fullLine: String): Unit =
+    private[ui] override def printError(fullLine: String): Unit =
       super.printError(RED + fullLine + RESET)
-    override def printResult(lineOrLines: String): Unit =
+    private[ui] override def printResult(lineOrLines: String): Unit =
       super.printResult(BOLD + lineOrLines + RESET)
   }
 

src/main/scala/com/us/dsb/explore/algs/ttt/manual/ui/GameUIState.scala

@@ -3,9 +3,9 @@ package com.us.dsb.explore.algs.ttt.manual.ui
 import com.us.dsb.explore.algs.ttt.manual.game._
 
 // ?? somewhere expand to allow for history (maybe via Semigroup or whatever has .compose?)
-case class GameUIState(gameState: GameState,
-                       selectedRow: RowIndex,
-                       selectedColumn: ColumnIndex) {
+private case class GameUIState(gameState: GameState,
+                               selectedRow: RowIndex,
+                               selectedColumn: ColumnIndex) {
 
   // ?? clean up that floorMod; I just want plain mathematical mod:
   private def adjustAndwrapToRange(unincremented: Index, delta: Int): Index = {
@@ -24,10 +24,10 @@ case class GameUIState(gameState: GameState,
   //   our cursor-based row/column specification; what would GUI use, just
   //   9 table-level IDs tied to GUI cells/buttons?);
 
-  def withRowAdustedBy(delta: Int): GameUIState =
+  private[ui] def withRowAdustedBy(delta: Int): GameUIState =
     copy(selectedRow = RowIndex(adjustAndwrapToRange(selectedRow.value, delta)))
 
-  def withColumnAdustedBy(delta: Int): GameUIState =
+  private[ui] def withColumnAdustedBy(delta: Int): GameUIState =
     copy(selectedColumn = ColumnIndex(adjustAndwrapToRange(selectedColumn.value, delta)))
 
   private def renderTableMultilineWithSelection: String = {
@@ -57,7 +57,7 @@ case class GameUIState(gameState: GameState,
 
   }
 
-  def toDisplayString: String = {
+  private[ui] def toDisplayString: String = {
     renderTableMultilineWithSelection + "\n" +
     s"Turn: Player ${gameState.currentPlayer}; marking cursor: <row $selectedRow / column $selectedColumn>"
   }