X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=5cacb68636dc64f239a9c7b0052998767755d921;hp=b6d68d356a745d2f8793d8d5c3c294e276279091;hb=c9e306ac8e3ada846e87a0cc256a20fc148f381c;hpb=3ff1cdf09693a28719246a9a98a8b908e8c848f7

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
index b6d68d3..5cacb68 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -42,7 +42,7 @@ public class WebOfTrustConnector implements ConnectorListener {
 	private static final Logger logger = Logging.getLogger(WebOfTrustConnector.class);
 
 	/** The name of the WoT plugin. */
-	private static final String WOT_PLUGIN_NAME = "plugins.WoT.WoT";
+	private static final String WOT_PLUGIN_NAME = "plugins.WebOfTrust.WebOfTrust";
 
 	/** A random connection identifier. */
 	private static final String PLUGIN_CONNECTION_IDENTIFIER = "Sone-WoT-Connector-" + Math.abs(Math.random());
@@ -70,6 +70,16 @@ public class WebOfTrustConnector implements ConnectorListener {
 	//
 
 	/**
+	 * Stops the web of trust connector.
+	 */
+	public void stop() {
+		pluginConnector.removeConnectorListener(WOT_PLUGIN_NAME, PLUGIN_CONNECTION_IDENTIFIER, this);
+		synchronized (reply) {
+			reply.notifyAll();
+		}
+	}
+
+	/**
 	 * Loads all own identities from the Web of Trust plugin.
 	 *
 	 * @return All own identity
@@ -230,7 +240,7 @@ public class WebOfTrustConnector implements ConnectorListener {
 	 *             if an error occured talking to the Web of Trust plugin
 	 */
 	public Trust getTrust(OwnIdentity ownIdentity, Identity identity) throws PluginException {
-		Reply getTrustReply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentity").put("TreeOwner", ownIdentity.getId()).put("Identity", identity.getId()).get());
+		Reply getTrustReply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentity").put("Truster", ownIdentity.getId()).put("Identity", identity.getId()).get());
 		String trust = getTrustReply.getFields().get("Trust");
 		String score = getTrustReply.getFields().get("Score");
 		String rank = getTrustReply.getFields().get("Rank");
@@ -372,16 +382,16 @@ public class WebOfTrustConnector implements ConnectorListener {
 	 */
 	private synchronized Reply performRequest(SimpleFieldSet fields, Bucket data) throws PluginException {
 		reply = new Reply();
-		logger.log(Level.FINE, "Sending FCP Request: " + fields.get("Message"));
+		logger.log(Level.FINE, String.format("Sending FCP Request: %s", fields.get("Message")));
 		synchronized (reply) {
 			pluginConnector.sendRequest(WOT_PLUGIN_NAME, PLUGIN_CONNECTION_IDENTIFIER, fields, data);
 			try {
 				reply.wait();
 			} catch (InterruptedException ie1) {
-				logger.log(Level.WARNING, "Got interrupted while waiting for reply on " + fields.get("Message") + ".", ie1);
+				logger.log(Level.WARNING, String.format("Got interrupted while waiting for reply on %s.", fields.get("Message")), ie1);
 			}
 		}
-		logger.log(Level.FINEST, "Received FCP Response for %s: %s", new Object[] { fields.get("Message"), (reply.getFields() != null) ? reply.getFields().get("Message") : null });
+		logger.log(Level.FINEST, String.format("Received FCP Response for %s: %s", fields.get("Message"), (reply.getFields() != null) ? reply.getFields().get("Message") : null));
 		if ((reply.getFields() == null) || "Error".equals(reply.getFields().get("Message"))) {
 			throw new PluginException("Could not perform request for " + fields.get("Message"));
 		}
@@ -398,7 +408,7 @@ public class WebOfTrustConnector implements ConnectorListener {
 	@Override
 	public void receivedReply(PluginConnector pluginConnector, SimpleFieldSet fields, Bucket data) {
 		String messageName = fields.get("Message");
-		logger.log(Level.FINEST, "Received Reply from Plugin: " + messageName);
+		logger.log(Level.FINEST, String.format("Received Reply from Plugin: %s", messageName));
 		synchronized (reply) {
 			reply.setFields(fields);
 			reply.setData(data);