X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=91fb5475993256d94a2c15733abe76499184799f;hb=dbb47149d5e2c1e67ec9889587ff24dd7c622862;hp=5199af6ad5c6a8617c84de67203fbd101be765a4;hpb=3e162bec2d62278d32a61aff28fa12de236bb753;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 5199af6..91fb547 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 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,9 +24,10 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.FreenetInterface;
+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.IdentityManager;
-import net.pterodactylus.sone.freenet.wot.PluginConnector;
 import net.pterodactylus.sone.freenet.wot.WebOfTrustConnector;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.config.Configuration;
@@ -40,10 +41,14 @@ import freenet.l10n.BaseL10n.LANGUAGE;
 import freenet.l10n.PluginL10n;
 import freenet.pluginmanager.FredPlugin;
 import freenet.pluginmanager.FredPluginBaseL10n;
+import freenet.pluginmanager.FredPluginFCP;
 import freenet.pluginmanager.FredPluginL10n;
 import freenet.pluginmanager.FredPluginThreadless;
 import freenet.pluginmanager.FredPluginVersioned;
+import freenet.pluginmanager.PluginReplySender;
 import freenet.pluginmanager.PluginRespirator;
+import freenet.support.SimpleFieldSet;
+import freenet.support.api.Bucket;
 
 /**
  * This class interfaces with Freenet. It is the class that is loaded by the
@@ -51,7 +56,7 @@ import freenet.pluginmanager.PluginRespirator;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10n, FredPluginThreadless, FredPluginVersioned {
+public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, FredPluginBaseL10n, FredPluginThreadless, FredPluginVersioned {
 
 	static {
 		/* initialize logging. */
@@ -78,7 +83,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 3, 4);
+	public static final Version VERSION = new Version(0, 6, 7);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -92,6 +97,9 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	/** The web interface. */
 	private WebInterface webInterface;
 
+	/** The FCP interface. */
+	private FcpInterface fcpInterface;
+
 	/** The l10n helper. */
 	private PluginL10n l10n;
 
@@ -137,7 +145,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void runPlugin(PluginRespirator pluginRespirator) {
+	public void runPlugin(@SuppressWarnings("hiding") PluginRespirator pluginRespirator) {
 		this.pluginRespirator = pluginRespirator;
 
 		/* create a configuration. */
@@ -166,28 +174,32 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 			}
 		}
 
-		/* create freenet interface. */
-		FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode(), pluginRespirator.getHLSimpleClient());
+		boolean startupFailed = true;
+		try {
+			/* create freenet interface. */
+			FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode());
 
-		/* create web of trust connector. */
-		PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
-		WebOfTrustConnector webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
-		identityManager = new IdentityManager(webOfTrustConnector);
-		identityManager.setContext("Sone");
+			/* create web of trust connector. */
+			PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
+			WebOfTrustConnector webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
+			identityManager = new IdentityManager(webOfTrustConnector);
+			identityManager.setContext("Sone");
 
-		/* create core. */
-		core = new Core(oldConfiguration, freenetInterface, identityManager);
+			/* create core. */
+			core = new Core(oldConfiguration, freenetInterface, identityManager);
 
-		/* create the web interface. */
-		webInterface = new WebInterface(this);
-		core.addCoreListener(webInterface);
+			/* create the web interface. */
+			webInterface = new WebInterface(this);
+			core.addCoreListener(webInterface);
 
-		/* create the identity manager. */
-		identityManager.addIdentityListener(core);
+			/* create FCP interface. */
+			fcpInterface = new FcpInterface(core);
+			core.setFcpInterface(fcpInterface);
 
-		/* start core! */
-		boolean startupFailed = true;
-		try {
+			/* create the identity manager. */
+			identityManager.addIdentityListener(core);
+
+			/* start core! */
 			core.start();
 			if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
 				logger.log(Level.INFO, "Setting configuration to file-based configuration.");
@@ -233,6 +245,18 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	}
 
 	//
+	// INTERFACE FredPluginFCP
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void handle(PluginReplySender pluginReplySender, SimpleFieldSet parameters, Bucket data, int accessType) {
+		fcpInterface.handle(pluginReplySender, parameters, data, accessType);
+	}
+
+	//
 	// INTERFACE FredPluginL10n
 	//