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=1d30efb5cc5f8682992910bc67e4eba917f257f6;hp=b0b6d4219ccf0d4426b79c5b3352a4a6be8b1e90;hb=62573c314957b1851f4fbe693b8746686caa940a;hpb=43740d6a1dfc686ab54d0aebd4a5b1bce75b9ed6
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 b0b6d42..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
@@ -18,6 +18,7 @@
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;
@@ -30,7 +31,6 @@ 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.number.Numbers;
import com.google.common.base.Optional;
import com.google.common.collect.MapMaker;
@@ -43,14 +43,12 @@ import freenet.support.api.Bucket;
/**
* Connector for the Web of Trust plugin.
- *
- * @author David âBombeâ Roden
*/
@Singleton
public class WebOfTrustConnector {
/** The logger. */
- private static final Logger logger = getLogger("Sone.WoT.Connector");
+ 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";
@@ -126,7 +124,7 @@ public class WebOfTrustConnector {
* if an error occured talking to the Web of Trust plugin
*/
public Set loadTrustedIdentities(OwnIdentity ownIdentity) throws PluginException {
- return loadTrustedIdentities(ownIdentity, null);
+ return loadTrustedIdentities(ownIdentity, Optional.absent());
}
/**
@@ -156,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);
}
@@ -443,8 +441,6 @@ public class WebOfTrustConnector {
/**
* Container for the data of the reply from a plugin.
- *
- * @author David âBombeâ Roden
*/
private static class Reply {
@@ -502,8 +498,6 @@ public class WebOfTrustConnector {
/**
* Helper method to create {@link SimpleFieldSet}s with terser code.
- *
- * @author David âBombeâ Roden
*/
private static class SimpleFieldSetConstructor {
@@ -578,8 +572,6 @@ public class WebOfTrustConnector {
/**
* Container for identifying plugins. Plugins are identified by their plugin
* name and their unique identifier.
- *
- * @author David Roden
*/
private static class PluginIdentifier {