X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=6d32b500d38c00254f7e82a8fe1f0592f076d820;hp=5b28b85a76d05a6e6cefa63cc69994ed9f554c74;hb=5d8f3ac133544177412ec3c533e5f5f92a7b1c35;hpb=a88e930a23b550dae75116d7759924d760941776

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 5b28b85..6d32b50 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -37,9 +37,17 @@ import net.pterodactylus.util.config.MapConfigurationBackend;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.logging.LoggingListener;
 import net.pterodactylus.util.version.Version;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Singleton;
+import com.google.inject.name.Names;
+
 import freenet.client.async.DatabaseDisabledException;
 import freenet.l10n.BaseL10n.LANGUAGE;
 import freenet.l10n.PluginL10n;
+import freenet.node.Node;
 import freenet.pluginmanager.FredPlugin;
 import freenet.pluginmanager.FredPluginBaseL10n;
 import freenet.pluginmanager.FredPluginFCP;
@@ -107,9 +115,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	/** The web of trust connector. */
 	private WebOfTrustConnector webOfTrustConnector;
 
-	/** The identity manager. */
-	private IdentityManager identityManager;
-
 	//
 	// ACCESSORS
 	//
@@ -178,33 +183,50 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 			}
 		}
 
-		boolean startupFailed = true;
-		try {
-			/* create freenet interface. */
-			FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode());
+		final Configuration startConfiguration = oldConfiguration;
 
-			/* create web of trust connector. */
-			PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
-			webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
-			identityManager = new IdentityManager(webOfTrustConnector, "Sone");
+		/* Freenet injector configuration. */
+		AbstractModule freenetModule = new AbstractModule() {
 
-			/* create trust updater. */
-			WebOfTrustUpdater trustUpdater = new WebOfTrustUpdater(webOfTrustConnector);
-			trustUpdater.init();
+			@Override
+			@SuppressWarnings("synthetic-access")
+			protected void configure() {
+				bind(PluginRespirator.class).toInstance(SonePlugin.this.pluginRespirator);
+				bind(Node.class).toInstance(SonePlugin.this.pluginRespirator.getNode());
+			}
+		};
+		/* Sone injector configuration. */
+		AbstractModule soneModule = new AbstractModule() {
 
-			/* create core. */
-			core = new Core(oldConfiguration, freenetInterface, identityManager, trustUpdater);
+			@Override
+			protected void configure() {
+				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");
+				bind(SonePlugin.class).toInstance(SonePlugin.this);
+				bind(FcpInterface.class).in(Singleton.class);
+			}
+		};
+		Injector injector = Guice.createInjector(freenetModule, soneModule);
+		core = injector.getInstance(Core.class);
+
+		/* create web of trust connector. */
+		webOfTrustConnector = injector.getInstance(WebOfTrustConnector.class);
 
-			/* create the web interface. */
-			webInterface = new WebInterface(this);
-			core.addCoreListener(webInterface);
+		/* create FCP interface. */
+		fcpInterface = injector.getInstance(FcpInterface.class);
+		core.setFcpInterface(fcpInterface);
 
-			/* create FCP interface. */
-			fcpInterface = new FcpInterface(core);
-			core.setFcpInterface(fcpInterface);
+		/* create the web interface. */
+		webInterface = injector.getInstance(WebInterface.class);
+		core.addCoreListener(webInterface);
 
-			/* create the identity manager. */
-			identityManager.addIdentityListener(core);
+		boolean startupFailed = true;
+		try {
 
 			/* start core! */
 			core.start();
@@ -215,7 +237,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 			webInterface.start();
 			webInterface.setFirstStart(firstStart);
 			webInterface.setNewConfig(newConfig);
-			identityManager.start();
 			startupFailed = false;
 		} finally {
 			if (startupFailed) {
@@ -241,9 +262,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 			/* stop the core. */
 			core.stop();
 
-			/* stop the identity manager. */
-			identityManager.stop();
-
 			/* stop the web of trust connector. */
 			webOfTrustConnector.stop();
 		} catch (Throwable t1) {