X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSoneModule.kt;h=8a3b0c21e02758854c1eee6669428a3096e248b5;hb=c72d9f81be5d2f996fc30ac1c4dd01d1ea46a5fa;hp=6657486984a59d91a5bea9bf90fa62a122a7e01c;hpb=a1c8d845054f6adcc6ef98e46e7b578874cc866a;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
index 6657486..8a3b0c2 100644
--- a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
@@ -7,15 +7,16 @@ import com.google.inject.*
 import com.google.inject.matcher.*
 import com.google.inject.name.Names.*
 import com.google.inject.spi.*
-import freenet.l10n.*
-import net.pterodactylus.sone.core.*
 import net.pterodactylus.sone.database.*
 import net.pterodactylus.sone.database.memory.*
+import net.pterodactylus.sone.freenet.*
 import net.pterodactylus.sone.freenet.wot.*
 import net.pterodactylus.util.config.*
 import net.pterodactylus.util.config.ConfigurationException
+import net.pterodactylus.util.logging.*
 import net.pterodactylus.util.version.Version
 import java.io.*
+import java.util.logging.*
 
 open class SoneModule(private val sonePlugin: SonePlugin, private val eventBus: EventBus) : AbstractModule() {
 
@@ -51,24 +52,22 @@ open class SoneModule(private val sonePlugin: SonePlugin, private val eventBus:
 		bind(PluginYear::class.java).toInstance(PluginYear(sonePlugin.year))
 		bind(PluginHomepage::class.java).toInstance(PluginHomepage(sonePlugin.homepage))
 		bind(Database::class.java).to(MemoryDatabase::class.java).`in`(Singleton::class.java)
-		bind(BaseL10n::class.java).toInstance(sonePlugin.l10n().base)
+		bind(Translation::class.java).toInstance(BaseL10nTranslation(sonePlugin.l10n().base))
 		loaders?.let { bind(Loaders::class.java).toInstance(it) }
 		bind(MetricRegistry::class.java).`in`(Singleton::class.java)
+		bind(WebOfTrustConnector::class.java).to(PluginWebOfTrustConnector::class.java).`in`(Singleton::class.java)
 
 		bindListener(Matchers.any(), object : TypeListener {
 			override fun <I> hear(typeLiteral: TypeLiteral<I>, typeEncounter: TypeEncounter<I>) {
-				typeEncounter.register(InjectionListener { injectee -> eventBus.register(injectee) })
+				typeEncounter.register(InjectionListener { injectee ->
+					logger.fine { "Injecting $injectee..." }
+					eventBus.register(injectee)
+				})
 			}
 		})
 	}
 
-	@Provides
-	@Singleton
-	fun getCore(configuration: Configuration, freenetInterface: FreenetInterface, identityManager: IdentityManager, soneDownloader: SoneDownloader, imageInserter: ImageInserter, updateChecker: UpdateChecker, webOfTrustUpdater: WebOfTrustUpdater, eventBus: EventBus, database: Database) =
-			Core(configuration, freenetInterface, identityManager, soneDownloader, imageInserter, updateChecker, webOfTrustUpdater, eventBus, database).apply {
-				debugInformation.showVersionInformation = configuration.getBooleanValue("Debug/ShowVersionInformation").getValue(false)
-				debugInformation.showMetrics = configuration.getBooleanValue("Debug/ShowMetrics").getValue(false)
-			}.also(eventBus::register)
+	private val logger: Logger = Logging.getLogger(javaClass)
 
 }