X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityLoader.java;h=a3b4f6cb7263936ebbf997f89b4e135245ba2ee9;hp=823653e1d50bf8e2ae4ffb92d52941353b281bcb;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=aa69d7eb1845cffa60b264dd9517ea0fcc54bcd4

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityLoader.java b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityLoader.java
index 823653e..a3b4f6c 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityLoader.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityLoader.java
@@ -1,5 +1,5 @@
 /*
- * Sone - IdentityLoader.java - Copyright © 2013 David Roden
+ * Sone - IdentityLoader.java - Copyright © 2013–2015 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,19 +17,18 @@
 
 package net.pterodactylus.sone.freenet.wot;
 
-import static com.google.common.collect.HashMultimap.create;
+import static java.util.Collections.emptySet;
 import static net.pterodactylus.sone.freenet.wot.Context.extractContext;
 
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
-
 import net.pterodactylus.sone.freenet.plugin.PluginException;
 
-import com.google.common.base.Function;
 import com.google.common.base.Optional;
-import com.google.common.collect.Multimap;
 import com.google.inject.Inject;
 
 /**
@@ -52,21 +51,22 @@ public class IdentityLoader {
 		this.context = context;
 	}
 
-	public Multimap<OwnIdentity, Identity> loadIdentities() throws WebOfTrustException {
+	public Map<OwnIdentity, Collection<Identity>> loadIdentities() throws WebOfTrustException {
 		Collection<OwnIdentity> currentOwnIdentities = webOfTrustConnector.loadAllOwnIdentities();
 		return loadTrustedIdentitiesForOwnIdentities(currentOwnIdentities);
 	}
 
-	private Multimap<OwnIdentity, Identity> loadTrustedIdentitiesForOwnIdentities(Collection<OwnIdentity> ownIdentities) throws PluginException {
-		Multimap<OwnIdentity, Identity> currentIdentities = create();
+	private Map<OwnIdentity, Collection<Identity>> loadTrustedIdentitiesForOwnIdentities(Collection<OwnIdentity> ownIdentities) throws PluginException {
+		Map<OwnIdentity, Collection<Identity>> currentIdentities = new HashMap<OwnIdentity, Collection<Identity>>();
 
 		for (OwnIdentity ownIdentity : ownIdentities) {
 			if (identityDoesNotHaveTheCorrectContext(ownIdentity)) {
+				currentIdentities.put(ownIdentity, Collections.<Identity>emptySet());
 				continue;
 			}
 
 			Set<Identity> trustedIdentities = webOfTrustConnector.loadTrustedIdentities(ownIdentity, context.transform(extractContext));
-			currentIdentities.putAll(ownIdentity, trustedIdentities);
+			currentIdentities.put(ownIdentity, trustedIdentities);
 		}
 
 		return currentIdentities;