Make SystemEnv constructor private

cxd4 · May 10, 2012 · dee6347 · dee6347
1 parent 01f1a48
commit dee6347
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/app/Global.scala b/app/Global.scala
@@ -11,8 +11,8 @@ object Global extends GlobalSettings {
   def env = Option(systemEnv) err "The environment is not ready"
 
   override def onStart(app: Application) {
-    val settings = new Settings(app.configuration.underlying)
-    systemEnv = new SystemEnv(app, settings)
+
+    systemEnv = SystemEnv(app)
 
     if (env.isAiServer) println("Running as AI server")
     else Cron start env

diff --git a/app/SystemEnv.scala b/app/SystemEnv.scala
@@ -12,7 +12,7 @@ import db._
 import ai._
 import memo._
 
-final class SystemEnv(application: Application, settings: Settings) {
+final class SystemEnv private (application: Application, settings: Settings) {
 
   implicit val app = application
 
@@ -186,3 +186,11 @@ final class SystemEnv(application: Application, settings: Settings) {
 
   lazy val gameCleanNextCommand = new command.GameCleanNext(gameRepo = gameRepo)
 }
+
+object SystemEnv {
+
+  def apply(app: Application) = new SystemEnv(
+    app, 
+    new Settings(app.configuration.underlying)
+  )
+}
diff --git a/cli/src/main/scala/Main.scala b/cli/src/main/scala/Main.scala
@@ -14,7 +14,7 @@ object Main {
     sources = None,
     mode = Mode.Dev)
 
-  lazy val env = new SystemEnv(app)
+  lazy val env = SystemEnv(app)
 
   def main(args: Array[String]): Unit = sys exit {