X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=d16e93178acddb7f21ebe263da6111f7dd63741e;hp=0a28656fc1daa9df584ea83531385a0243aeb09a;hb=8d5f29fad2c8f6934a41ae5b3a266bcb802c174f;hpb=4ff19298a886f9aa09ef20309a833f9454284482

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 0a28656..d16e931 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;
@@ -68,22 +69,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, 2);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -103,6 +104,9 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	/** The l10n helper. */
 	private PluginL10n l10n;
 
+	/** The web of trust connector. */
+	private WebOfTrustConnector webOfTrustConnector;
+
 	/** The identity manager. */
 	private IdentityManager identityManager;
 
@@ -181,12 +185,16 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 			/* create web of trust connector. */
 			PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
-			WebOfTrustConnector webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
+			webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
 			identityManager = new IdentityManager(webOfTrustConnector);
 			identityManager.setContext("Sone");
 
+			/* create trust updater. */
+			WebOfTrustUpdater trustUpdater = new WebOfTrustUpdater(webOfTrustConnector);
+			trustUpdater.init();
+
 			/* create core. */
-			core = new Core(oldConfiguration, freenetInterface, identityManager);
+			core = new Core(oldConfiguration, freenetInterface, identityManager, trustUpdater);
 
 			/* create the web interface. */
 			webInterface = new WebInterface(this);
@@ -194,6 +202,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 			/* create FCP interface. */
 			fcpInterface = new FcpInterface(core);
+			core.setFcpInterface(fcpInterface);
 
 			/* create the identity manager. */
 			identityManager.addIdentityListener(core);
@@ -235,6 +244,9 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 			/* 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 {