From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 30 Sep 2014 19:21:51 +0000 (+0200)
Subject: Remove all occurences of the FCP interface from the core.
X-Git-Tag: 0.9-rc1^2~3^2~79
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=b90a657060b67444ca5d8a403b9cca928ea4fbbd;p=Sone.git

Remove all occurences of the FCP interface from the core.
---

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index f3927d9..3462f88 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -154,9 +154,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	/** The trust updater. */
 	private final WebOfTrustUpdater webOfTrustUpdater;
 
-	/** The FCP interface. */
-	private volatile FcpInterface fcpInterface;
-
 	/** The times Sones were followed. */
 	private final Map<String, Long> soneFollowingTimes = new HashMap<String, Long>();
 
@@ -281,16 +278,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	}
 
 	/**
-	 * Sets the FCP interface to use.
-	 *
-	 * @param fcpInterface
-	 *            The FCP interface to use
-	 */
-	public void setFcpInterface(FcpInterface fcpInterface) {
-		this.fcpInterface = fcpInterface;
-	}
-
-	/**
 	 * Returns the Sone rescuer for the given local Sone.
 	 *
 	 * @param sone
diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index ae34c1c..d86ed9f 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -259,7 +259,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 		/* create FCP interface. */
 		fcpInterface = injector.getInstance(FcpInterface.class);
-		core.setFcpInterface(fcpInterface);
 
 		/* create the web interface. */
 		webInterface = injector.getInstance(WebInterface.class);