X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityManager.java;h=6152c4bb40c4c00884289023d792c187d494e703;hb=e8b0e80a1fda90e908b26d4d138092239fab1ed5;hp=f9af3613bc3e4916e91c222615d5e550839a5f9a;hpb=2463c2c5e852aea6b90294f55ffcb17e9eb822eb;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
index f9af361..6152c4b 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
@@ -1,5 +1,5 @@
 /*
- * Sone - IdentityManager.java - Copyright © 2010 David Roden
+ * Sone - IdentityManager.java - Copyright © 2010–2012 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
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.freenet.wot;
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -43,6 +44,7 @@ import net.pterodactylus.util.service.AbstractService;
 public class IdentityManager extends AbstractService {
 
 	/** Object used for synchronization. */
+	@SuppressWarnings("hiding")
 	private final Object syncObject = new Object() {
 		/* inner class for better lock names. */
 	};
@@ -57,21 +59,25 @@ public class IdentityManager extends AbstractService {
 	private final WebOfTrustConnector webOfTrustConnector;
 
 	/** The context to filter for. */
-	private volatile String context;
+	private final String context;
 
 	/** The currently known own identities. */
 	/* synchronize access on syncObject. */
-	private Map<String, OwnIdentity> currentOwnIdentities = new HashMap<String, OwnIdentity>();
+	private final Map<String, OwnIdentity> currentOwnIdentities = new HashMap<String, OwnIdentity>();
 
 	/**
 	 * Creates a new identity manager.
 	 *
 	 * @param webOfTrustConnector
 	 *            The Web of Trust connector
+	 * @param context
+	 *            The context to focus on (may be {@code null} to ignore
+	 *            contexts)
 	 */
-	public IdentityManager(WebOfTrustConnector webOfTrustConnector) {
+	public IdentityManager(WebOfTrustConnector webOfTrustConnector, String context) {
 		super("Sone Identity Manager", false);
 		this.webOfTrustConnector = webOfTrustConnector;
+		this.context = context;
 	}
 
 	//
@@ -103,16 +109,6 @@ public class IdentityManager extends AbstractService {
 	//
 
 	/**
-	 * Sets the context to filter own identities and trusted identities for.
-	 *
-	 * @param context
-	 *            The context to filter for, or {@code null} to not filter
-	 */
-	public void setContext(String context) {
-		this.context = context;
-	}
-
-	/**
 	 * Returns whether the Web of Trust plugin could be reached during the last
 	 * try.
 	 *
@@ -140,7 +136,7 @@ public class IdentityManager extends AbstractService {
 		Set<OwnIdentity> allOwnIdentities = getAllOwnIdentities();
 		for (OwnIdentity ownIdentity : allOwnIdentities) {
 			if (ownIdentity.getId().equals(id)) {
-				return ownIdentity;
+				return new DefaultOwnIdentity(ownIdentity);
 			}
 		}
 		return null;
@@ -152,18 +148,7 @@ public class IdentityManager extends AbstractService {
 	 * @return All own identities
 	 */
 	public Set<OwnIdentity> getAllOwnIdentities() {
-		try {
-			Set<OwnIdentity> ownIdentities = webOfTrustConnector.loadAllOwnIdentities();
-			Map<String, OwnIdentity> newOwnIdentities = new HashMap<String, OwnIdentity>();
-			for (OwnIdentity ownIdentity : ownIdentities) {
-				newOwnIdentities.put(ownIdentity.getId(), ownIdentity);
-			}
-			checkOwnIdentities(newOwnIdentities);
-			return ownIdentities;
-		} catch (WebOfTrustException wote1) {
-			logger.log(Level.WARNING, "Could not load all own identities!", wote1);
-			return Collections.emptySet();
-		}
+		return new HashSet<OwnIdentity>(currentOwnIdentities.values());
 	}
 
 	//
@@ -297,7 +282,7 @@ public class IdentityManager extends AbstractService {
 			for (OwnIdentity oldOwnIdentity : currentOwnIdentities.values()) {
 				OwnIdentity newOwnIdentity = newOwnIdentities.get(oldOwnIdentity.getId());
 				if ((newOwnIdentity == null) || ((context != null) && oldOwnIdentity.hasContext(context) && !newOwnIdentity.hasContext(context))) {
-					identityListenerManager.fireOwnIdentityRemoved(oldOwnIdentity);
+					identityListenerManager.fireOwnIdentityRemoved(new DefaultOwnIdentity(oldOwnIdentity));
 				}
 			}
 
@@ -305,7 +290,7 @@ public class IdentityManager extends AbstractService {
 			for (OwnIdentity currentOwnIdentity : newOwnIdentities.values()) {
 				OwnIdentity oldOwnIdentity = currentOwnIdentities.get(currentOwnIdentity.getId());
 				if (((oldOwnIdentity == null) && ((context == null) || currentOwnIdentity.hasContext(context))) || ((oldOwnIdentity != null) && (context != null) && (!oldOwnIdentity.hasContext(context) && currentOwnIdentity.hasContext(context)))) {
-					identityListenerManager.fireOwnIdentityAdded(currentOwnIdentity);
+					identityListenerManager.fireOwnIdentityAdded(new DefaultOwnIdentity(currentOwnIdentity));
 				}
 			}