X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=1d30efb5cc5f8682992910bc67e4eba917f257f6;hb=62573c314957b1851f4fbe693b8746686caa940a;hp=7938a0969ef365aa4642b3daf3ec4e05444d8b50;hpb=e7e16a55d9ce8bb104b3bd1260875ede6fd921e5;p=Sone.git

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 7938a09..1d30efb 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -1,5 +1,5 @@
 /*
- * Sone - WebOfTrustConnector.java - Copyright © 2010–2013 David Roden
+ * Sone - WebOfTrustConnector.java - Copyright © 2010–2016 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
@@ -17,6 +17,9 @@
 
 package net.pterodactylus.sone.freenet.wot;
 
+import static java.util.logging.Logger.getLogger;
+import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -28,26 +31,24 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.freenet.plugin.PluginConnector;
 import net.pterodactylus.sone.freenet.plugin.PluginException;
 import net.pterodactylus.sone.freenet.plugin.event.ReceivedReplyEvent;
-import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.number.Numbers;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.MapMaker;
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
 
 /**
  * Connector for the Web of Trust plugin.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
+@Singleton
 public class WebOfTrustConnector {
 
 	/** The logger. */
-	private static final Logger logger = Logging.getLogger(WebOfTrustConnector.class);
+	private static final Logger logger = getLogger(WebOfTrustConnector.class.getName());
 
 	/** The name of the WoT plugin. */
 	private static final String WOT_PLUGIN_NAME = "plugins.WebOfTrust.WebOfTrust";
@@ -123,7 +124,7 @@ public class WebOfTrustConnector {
 	 *             if an error occured talking to the Web of Trust plugin
 	 */
 	public Set<Identity> loadTrustedIdentities(OwnIdentity ownIdentity) throws PluginException {
-		return loadTrustedIdentities(ownIdentity, null);
+		return loadTrustedIdentities(ownIdentity, Optional.<String>absent());
 	}
 
 	/**
@@ -153,9 +154,9 @@ public class WebOfTrustConnector {
 			DefaultIdentity identity = new DefaultIdentity(id, nickname, requestUri);
 			identity.setContexts(parseContexts("Contexts" + identityCounter + ".", fields));
 			identity.setProperties(parseProperties("Properties" + identityCounter + ".", fields));
-			Integer trust = Numbers.safeParseInteger(fields.get("Trust" + identityCounter), null);
-			int score = Numbers.safeParseInteger(fields.get("Score" + identityCounter), 0);
-			int rank = Numbers.safeParseInteger(fields.get("Rank" + identityCounter), 0);
+			Integer trust = parseInt(fields.get("Trust" + identityCounter), null);
+			int score = parseInt(fields.get("Score" + identityCounter), 0);
+			int rank = parseInt(fields.get("Rank" + identityCounter), 0);
 			identity.setTrust(ownIdentity, new Trust(trust, score, rank));
 			identities.add(identity);
 		}
@@ -440,8 +441,6 @@ public class WebOfTrustConnector {
 
 	/**
 	 * Container for the data of the reply from a plugin.
-	 *
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
 	private static class Reply {
 
@@ -499,8 +498,6 @@ public class WebOfTrustConnector {
 
 	/**
 	 * Helper method to create {@link SimpleFieldSet}s with terser code.
-	 *
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
 	private static class SimpleFieldSetConstructor {
 
@@ -575,8 +572,6 @@ public class WebOfTrustConnector {
 	/**
 	 * Container for identifying plugins. Plugins are identified by their plugin
 	 * name and their unique identifier.
-	 *
-	 * @author <a href="mailto:d.roden@xplosion.de">David Roden</a>
 	 */
 	private static class PluginIdentifier {