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=4b0f3eb29a43710d7cb49c52377c266538ffef00;hpb=3c04419570520b0c7158dbb8c27083d419afdf47;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 4b0f3eb..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;
@@ -24,17 +26,20 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.FreenetInterface;
-import net.pterodactylus.sone.core.PostProvider;
-import net.pterodactylus.sone.core.SoneProvider;
 import net.pterodactylus.sone.core.WebOfTrustUpdater;
-import net.pterodactylus.sone.data.PostBuilderFactory;
-import net.pterodactylus.sone.data.PostReplyBuilderFactory;
-import net.pterodactylus.sone.data.impl.DefaultPostBuilderFactory;
-import net.pterodactylus.sone.data.impl.DefaultPostReplyBuilderFactory;
+import net.pterodactylus.sone.core.WebOfTrustUpdaterImpl;
+import net.pterodactylus.sone.database.Database;
+import net.pterodactylus.sone.database.PostBuilderFactory;
+import net.pterodactylus.sone.database.PostProvider;
+import net.pterodactylus.sone.database.PostReplyBuilderFactory;
+import net.pterodactylus.sone.database.SoneProvider;
+import net.pterodactylus.sone.database.memory.MemoryDatabase;
 import net.pterodactylus.sone.fcp.FcpInterface;
 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;
@@ -44,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;
@@ -51,7 +57,6 @@ import com.google.inject.Injector;
 import com.google.inject.Singleton;
 import com.google.inject.TypeLiteral;
 import com.google.inject.matcher.Matchers;
-import com.google.inject.name.Names;
 import com.google.inject.spi.InjectionListener;
 import com.google.inject.spi.TypeEncounter;
 import com.google.inject.spi.TypeListener;
@@ -104,7 +109,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 8, 4);
+	public static final Version VERSION = new Version(0, 8, 9);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -195,7 +200,13 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 			}
 		}
 
-		final Configuration startConfiguration = oldConfiguration;
+		final Configuration startConfiguration;
+		if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
+			logger.log(Level.INFO, "Setting configuration to file-based configuration.");
+			startConfiguration = newConfiguration;
+		} else {
+			startConfiguration = oldConfiguration;
+		}
 		final EventBus eventBus = new EventBus();
 
 		/* Freenet injector configuration. */
@@ -213,21 +224,12 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 			@Override
 			protected void configure() {
-				bind(Core.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(WebOfTrustConnector.class).in(Singleton.class);
-				bind(WebOfTrustUpdater.class).in(Singleton.class);
-				bind(IdentityManager.class).in(Singleton.class);
-				bind(String.class).annotatedWith(Names.named("WebOfTrustContext")).toInstance("Sone");
+				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(PostBuilderFactory.class).to(DefaultPostBuilderFactory.class).in(Singleton.class);
-				bind(PostReplyBuilderFactory.class).to(DefaultPostReplyBuilderFactory.class).in(Singleton.class);
-				bind(SoneProvider.class).to(Core.class).in(Singleton.class);
-				bind(PostProvider.class).to(Core.class).in(Singleton.class);
 				bindListener(Matchers.any(), new TypeListener() {
 
 					@Override
@@ -243,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);
@@ -262,10 +269,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 			/* start core! */
 			core.start();
-			if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
-				logger.log(Level.INFO, "Setting configuration to file-based configuration.");
-				core.setConfiguration(newConfiguration);
-			}
 			webInterface.start();
 			webInterface.setFirstStart(firstStart);
 			webInterface.setNewConfig(newConfig);