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=435f078532a4e17775378462c25ea216d99e2ca2;hp=4085b1ac1be331a7d2e17cb108596895ef5f2e69;hb=17ed3b897e37c8b16c559b79bfe97d32a7605bfb;hpb=7086ff8446629c7e3d7acd73b1971205aea179f0

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 4085b1a..435f078 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -99,9 +99,9 @@ public class WebOfTrustConnector implements ConnectorListener {
 			String requestUri = fields.get("RequestURI" + ownIdentityCounter);
 			String insertUri = fields.get("InsertURI" + ownIdentityCounter);
 			String nickname = fields.get("Nickname" + ownIdentityCounter);
-			DefaultOwnIdentity ownIdentity = new DefaultOwnIdentity(this, id, nickname, requestUri, insertUri);
-			ownIdentity.setContextsPrivate(parseContexts("Contexts" + ownIdentityCounter + ".", fields));
-			ownIdentity.setPropertiesPrivate(parseProperties("Properties" + ownIdentityCounter + ".", fields));
+			DefaultOwnIdentity ownIdentity = new DefaultOwnIdentity(id, nickname, requestUri, insertUri);
+			ownIdentity.setContexts(parseContexts("Contexts" + ownIdentityCounter + ".", fields));
+			ownIdentity.setProperties(parseProperties("Properties" + ownIdentityCounter + ".", fields));
 			ownIdentities.add(ownIdentity);
 		}
 		return ownIdentities;
@@ -145,9 +145,9 @@ public class WebOfTrustConnector implements ConnectorListener {
 			}
 			String nickname = fields.get("Nickname" + identityCounter);
 			String requestUri = fields.get("RequestURI" + identityCounter);
-			DefaultIdentity identity = new DefaultIdentity(this, id, nickname, requestUri);
-			identity.setContextsPrivate(parseContexts("Contexts" + identityCounter + ".", fields));
-			identity.setPropertiesPrivate(parseProperties("Properties" + identityCounter + ".", fields));
+			DefaultIdentity identity = new DefaultIdentity(id, nickname, requestUri);
+			identity.setContexts(parseContexts("Contexts" + identityCounter + ".", fields));
+			identity.setProperties(parseProperties("Properties" + identityCounter + ".", fields));
 			identities.add(identity);
 		}
 		return identities;
@@ -382,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"));
 		}
@@ -408,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);