Remove controller from State parameters

patzly · Jan 25, 2024 · e4c9c6c · e4c9c6c
1 parent e6ac8f7
commit e4c9c6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/scala/de/htwg/se/set/controller/IController.scala b/src/main/scala/de/htwg/se/set/controller/IController.scala
@@ -51,7 +51,7 @@ trait ISnapshot:
   def toXml: Elem
   def toJson: JsValue
 
-trait IState(controller: IController):
+trait IState:
 
   def print(): Unit
   def message: String

diff --git a/src/main/scala/de/htwg/se/set/controller/controller/State.scala b/src/main/scala/de/htwg/se/set/controller/controller/State.scala
@@ -7,7 +7,7 @@ import play.api.libs.json.{JsValue, Json}
 
 import scala.xml.Elem
 
-private class State(controller: IController) extends IState(controller):
+private class State extends IState:
 
   def print(): Unit = ()
 
@@ -26,7 +26,7 @@ private class State(controller: IController) extends IState(controller):
 
   override def toJson: JsValue = Json.toJson(getClass.getSimpleName)
 
-case class SettingsState(controller: IController) extends State(controller):
+case class SettingsState(controller: IController) extends State:
 
   override def print(): Unit =
     println(PrintUtil.bold("1") + " Start game")
@@ -40,7 +40,7 @@ case class SettingsState(controller: IController) extends State(controller):
       case NumberInput(3) => SwitchEasyAction()
       case other => super.handleInput(other)
 
-case class ChangePlayerCountState(controller: IController) extends State(controller):
+case class ChangePlayerCountState(controller: IController) extends State:
 
   override def print(): Unit = println("Enter number of players:")
 
@@ -49,7 +49,7 @@ case class ChangePlayerCountState(controller: IController) extends State(control
       case NumberInput(number) => ChangePlayerCountAction(number)
       case other => super.handleInput(other)
 
-case class SelectPlayerState(controller: IController) extends State(controller):
+case class SelectPlayerState(controller: IController) extends State:
 
   override def print(): Unit =
     if !controller.settings.singlePlayer then
@@ -68,7 +68,7 @@ case class SelectPlayerState(controller: IController) extends State(controller):
       case ExitInput => ExitAction()
       case other => super.handleInput(other)
 
-case class GameState(controller: IController) extends State(controller):
+case class GameState(controller: IController) extends State:
 
   private def player =
     controller.game.selectedPlayer match 
@@ -93,7 +93,7 @@ case class GameState(controller: IController) extends State(controller):
       case ExitInput => ExitAction()
       case other => super.handleInput(other)
 
-case class GameEndState(controller: IController) extends State(controller):
+case class GameEndState(controller: IController) extends State:
 
   override def print(): Unit =
     println("\n" + PrintUtil.yellow(PrintUtil.bold("All SETs found!")))