ManualTicTacToe: Moved GameUI, etc., to subpackage "ui".

Daniel Barclay · Daniel Barclay · commit 92e26d0eb828 · 2022-01-23T12:16:58.000-05:00
diff --git a/src/main/scala/com/us/dsb/explore/algs/ttt/manual/ManualTicTacToe.scala b/src/main/scala/com/us/dsb/explore/algs/ttt/manual/ManualTicTacToe.scala
@@ -1,5 +1,7 @@
 package com.us.dsb.explore.algs.ttt.manual
 
+import com.us.dsb.explore.algs.ttt.manual.ui.GameUI
+
 object ManualTicTacToe extends App {
 
   val gameResult = GameUI.runGame(GameUI.ColoredConsoleTextIO)  // ?? specify starting user?
diff --git a/src/main/scala/com/us/dsb/explore/algs/ttt/manual/ui/GameUI.scala b/src/main/scala/com/us/dsb/explore/algs/ttt/manual/ui/GameUI.scala
@@ -1,4 +1,4 @@
-package com.us.dsb.explore.algs.ttt.manual
+package com.us.dsb.explore.algs.ttt.manual.ui
 
 import cats.syntax.option._
 import cats.syntax.either._
diff --git a/src/main/scala/com/us/dsb/explore/algs/ttt/manual/ui/GameUIState.scala b/src/main/scala/com/us/dsb/explore/algs/ttt/manual/ui/GameUIState.scala
@@ -1,4 +1,4 @@
-package com.us.dsb.explore.algs.ttt.manual
+package com.us.dsb.explore.algs.ttt.manual.ui
 
 import com.us.dsb.explore.algs.ttt.manual.game._
 
diff --git a/src/main/scala/com/us/dsb/explore/lang/Quasiquotes.scala b/src/main/scala/com/us/dsb/explore/lang/Quasiquotes.scala
@@ -27,7 +27,7 @@ object Quasiquotes extends App {
 
       val x13: Any = {
         println("- execution val x13 = x12.apply:")
-        x12.apply
+        x12.apply()
       }
       println("- returned value x13:\n" + x13)
 
diff --git a/src/main/scala/com/us/dsb/explore/libs/scalatest/see_test_subtree.scala b/src/main/scala/com/us/dsb/explore/libs/scalatest/see_test_subtree.scala
diff --git a/src/test/scala/com/us/dsb/explore/algs/ttt/manual/ui/GameUITest.scala b/src/test/scala/com/us/dsb/explore/algs/ttt/manual/ui/GameUITest.scala
@@ -1,6 +1,6 @@
-package com.us.dsb.explore.algs.ttt.manual
+package com.us.dsb.explore.algs.ttt.manual.ui
 
-import com.us.dsb.explore.algs.ttt.manual.GameUI.{GameUIResult, SegregatedTextIO}
+import com.us.dsb.explore.algs.ttt.manual.ui.GameUI.{GameUIResult, SegregatedTextIO}
 import org.scalatest.funspec.AnyFunSpec
 import org.scalatest.matchers.should.Matchers._
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.us.dsb.explore.algs.ttt.manual`
	`1`	`+package com.us.dsb.explore.algs.ttt.manual.ui`
`2`	`2`
`3`	`3`	`import cats.syntax.option._`
`4`	`4`	`import cats.syntax.either._`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ object Quasiquotes extends App {`
`27`	`27`
`28`	`28`	`val x13: Any = {`
`29`	`29`	`println("- execution val x13 = x12.apply:")`
`30`		`- x12.apply`
	`30`	`+ x12.apply()`
`31`	`31`	`}`
`32`	`32`	`println("- returned value x13:\n" + x13)`
`33`	`33`