X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=c1599c9e15bc6dcfcf72d3c69cd9816f308205d2;hb=cbaa38f2f223948fcd27950824a4c920a5a90ee9;hp=0a28656fc1daa9df584ea83531385a0243aeb09a;hpb=4ff19298a886f9aa09ef20309a833f9454284482;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 0a28656..c1599c9 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -1,5 +1,5 @@
 /*
- * FreenetSone - SonePlugin.java - Copyright © 2010 David Roden
+ * Sone - SonePlugin.java - Copyright © 2010–2012 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,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.fcp.FcpInterface;
 import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
 import net.pterodactylus.sone.freenet.plugin.PluginConnector;
@@ -36,9 +37,18 @@ 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.common.eventbus.EventBus;
+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;
@@ -68,22 +78,22 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 				Class<?> loggerClass = Logging.getLoggerClass(logRecord.getLoggerName());
 				int recordLevel = logRecord.getLevel().intValue();
 				if (recordLevel < Level.FINE.intValue()) {
-					freenet.support.Logger.debug(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+					freenet.support.Logger.debug(loggerClass, logRecord.getMessage(), logRecord.getThrown());
 				} else if (recordLevel < Level.INFO.intValue()) {
-					freenet.support.Logger.minor(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+					freenet.support.Logger.minor(loggerClass, logRecord.getMessage(), logRecord.getThrown());
 				} else if (recordLevel < Level.WARNING.intValue()) {
-					freenet.support.Logger.normal(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+					freenet.support.Logger.normal(loggerClass, logRecord.getMessage(), logRecord.getThrown());
 				} else if (recordLevel < Level.SEVERE.intValue()) {
-					freenet.support.Logger.warning(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+					freenet.support.Logger.warning(loggerClass, logRecord.getMessage(), logRecord.getThrown());
 				} else {
-					freenet.support.Logger.error(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+					freenet.support.Logger.error(loggerClass, logRecord.getMessage(), logRecord.getThrown());
 				}
 			}
 		});
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 6);
+	public static final Version VERSION = new Version(0, 8, 4);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -103,8 +113,8 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	/** The l10n helper. */
 	private PluginL10n l10n;
 
-	/** The identity manager. */
-	private IdentityManager identityManager;
+	/** The web of trust connector. */
+	private WebOfTrustConnector webOfTrustConnector;
 
 	//
 	// ACCESSORS
@@ -174,29 +184,52 @@ 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;
+		final EventBus eventBus = new EventBus();
+
+		/* Freenet injector configuration. */
+		AbstractModule freenetModule = new AbstractModule() {
+
+			@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 web of trust connector. */
-			PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
-			WebOfTrustConnector webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
-			identityManager = new IdentityManager(webOfTrustConnector);
-			identityManager.setContext("Sone");
+			@Override
+			protected void configure() {
+				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");
+				bind(SonePlugin.class).toInstance(SonePlugin.this);
+				bind(FcpInterface.class).in(Singleton.class);
+			}
+		};
+		Injector injector = Guice.createInjector(freenetModule, soneModule);
+		core = injector.getInstance(Core.class);
 
-			/* create core. */
-			core = new Core(oldConfiguration, freenetInterface, identityManager);
+		/* 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);
+		/* 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();
@@ -207,7 +240,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 			webInterface.start();
 			webInterface.setFirstStart(firstStart);
 			webInterface.setNewConfig(newConfig);
-			identityManager.start();
 			startupFailed = false;
 		} finally {
 			if (startupFailed) {
@@ -233,8 +265,8 @@ 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) {
 			logger.log(Level.SEVERE, "Error while shutting down!", t1);
 		} finally {