diff --git a/knockoutwhist b/knockoutwhist index e957198..47761bd 160000 --- a/knockoutwhist +++ b/knockoutwhist @@ -1 +1 @@ -Subproject commit e957198ee4ab52514e38baff45b6c19f1e9f71a0 +Subproject commit 47761bd4a655e0fc0026875aea4dac8e88182c02 diff --git a/knockoutwhistweb/app/components/WebApplicationConfiguration.scala b/knockoutwhistweb/app/components/WebApplicationConfiguration.scala index 5d74d6c..8226cf8 100644 --- a/knockoutwhistweb/app/components/WebApplicationConfiguration.scala +++ b/knockoutwhistweb/app/components/WebApplicationConfiguration.scala @@ -1,7 +1,7 @@ package components -import de.knockoutwhist.components.DefaultConfiguration import controllers.WebUI +import de.knockoutwhist.components.DefaultConfiguration import de.knockoutwhist.ui.UI import de.knockoutwhist.utils.events.EventListener diff --git a/knockoutwhistweb/app/controllers/HomeController.scala b/knockoutwhistweb/app/controllers/HomeController.scala index b60f978..7de648f 100644 --- a/knockoutwhistweb/app/controllers/HomeController.scala +++ b/knockoutwhistweb/app/controllers/HomeController.scala @@ -1,14 +1,14 @@ package controllers -import controllers.sessions.AdvancedSession import com.google.inject.{Guice, Injector} +import controllers.sessions.AdvancedSession import de.knockoutwhist.KnockOutWhist import de.knockoutwhist.components.Configuration import de.knockoutwhist.control.GameState.{InGame, Lobby, SelectTrump, TieBreak} import de.knockoutwhist.control.controllerBaseImpl.BaseGameLogic import di.KnockOutWebConfigurationModule -import play.api.{controllers, *} import play.api.mvc.* +import play.api.* import play.twirl.api.Html import java.util.UUID diff --git a/knockoutwhistweb/app/util/WebUIUtils.scala b/knockoutwhistweb/app/util/WebUIUtils.scala index 63428f3..84e0558 100644 --- a/knockoutwhistweb/app/util/WebUIUtils.scala +++ b/knockoutwhistweb/app/util/WebUIUtils.scala @@ -1,7 +1,7 @@ package util import de.knockoutwhist.cards.Card -import de.knockoutwhist.cards.CardValue.{Ace, Eight, Five, Four, Jack, King, Nine, Queen, Seven, Six, Ten, Three, Two} +import de.knockoutwhist.cards.CardValue.* import de.knockoutwhist.cards.Suit.{Clubs, Diamonds, Hearts, Spades} import play.twirl.api.Html import scalafx.scene.image.Image diff --git a/knockoutwhistweb/test/controllers/HomeControllerSpec.scala b/knockoutwhistweb/test/controllers/HomeControllerSpec.scala index 9794755..cc4ca72 100644 --- a/knockoutwhistweb/test/controllers/HomeControllerSpec.scala +++ b/knockoutwhistweb/test/controllers/HomeControllerSpec.scala @@ -1,9 +1,9 @@ package controllers -import org.scalatestplus.play._ -import org.scalatestplus.play.guice._ -import play.api.test._ -import play.api.test.Helpers._ +import org.scalatestplus.play.* +import org.scalatestplus.play.guice.* +import play.api.test.* +import play.api.test.Helpers.* /** * Add your spec here.