X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=ae34c1c4c7440f1c2077caa0d9239ca8eadf6b29;hb=5bcdc1b924c598b1e59551d44e2302ef29258dad;hp=5b272827ed69e7686088013acd75b3183d4d5782;hpb=88469a40e677180866ae22f991dd547d0a367522;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 5b27282..ae34c1c 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.main;
 
+import static com.google.common.base.Optional.of;
+
 import java.io.File;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
@@ -25,6 +27,7 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.FreenetInterface;
 import net.pterodactylus.sone.core.WebOfTrustUpdater;
+import net.pterodactylus.sone.core.WebOfTrustUpdaterImpl;
 import net.pterodactylus.sone.database.Database;
 import net.pterodactylus.sone.database.PostBuilderFactory;
 import net.pterodactylus.sone.database.PostProvider;
@@ -36,6 +39,7 @@ import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
 import net.pterodactylus.sone.freenet.plugin.PluginConnector;
 import net.pterodactylus.sone.freenet.wot.Context;
 import net.pterodactylus.sone.freenet.wot.IdentityManager;
+import net.pterodactylus.sone.freenet.wot.IdentityManagerImpl;
 import net.pterodactylus.sone.freenet.wot.WebOfTrustConnector;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.config.Configuration;
@@ -45,6 +49,7 @@ import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.logging.LoggingListener;
 import net.pterodactylus.util.version.Version;
 
+import com.google.common.base.Optional;
 import com.google.common.eventbus.EventBus;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
@@ -219,23 +224,12 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 			@Override
 			protected void configure() {
-				bind(Core.class).in(Singleton.class);
-				bind(MemoryDatabase.class).in(Singleton.class);
 				bind(EventBus.class).toInstance(eventBus);
 				bind(Configuration.class).toInstance(startConfiguration);
-				bind(FreenetInterface.class).in(Singleton.class);
-				bind(PluginConnector.class).in(Singleton.class);
-				bind(Context.class).toInstance(new Context("Sone"));
-				bind(WebOfTrustConnector.class).in(Singleton.class);
-				bind(WebOfTrustUpdater.class).in(Singleton.class);
-				bind(IdentityManager.class).in(Singleton.class);
+				Context context = new Context("Sone");
+				bind(Context.class).toInstance(context);
+				bind(getOptionalContextTypeLiteral()).toInstance(of(context));
 				bind(SonePlugin.class).toInstance(SonePlugin.this);
-				bind(FcpInterface.class).in(Singleton.class);
-				bind(Database.class).to(MemoryDatabase.class);
-				bind(PostBuilderFactory.class).to(MemoryDatabase.class);
-				bind(PostReplyBuilderFactory.class).to(MemoryDatabase.class);
-				bind(SoneProvider.class).to(Core.class).in(Singleton.class);
-				bind(PostProvider.class).to(MemoryDatabase.class);
 				bindListener(Matchers.any(), new TypeListener() {
 
 					@Override
@@ -251,6 +245,11 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 				});
 			}
 
+			private TypeLiteral<Optional<Context>> getOptionalContextTypeLiteral() {
+				return new TypeLiteral<Optional<Context>>() {
+				};
+			}
+
 		};
 		Injector injector = Guice.createInjector(freenetModule, soneModule);
 		core = injector.getInstance(Core.class);