X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityManager.java;h=8e0b1244911063b2a4cfa754d5a4e19844c8010d;hp=fc9d6516273fd91fe72b2af9034e13f39b12954b;hb=17ed3b897e37c8b16c559b79bfe97d32a7605bfb;hpb=1bc88510da721fc90b270e4706ee2bdab41ecd18

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 fc9d651..8e0b124 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
@@ -26,6 +26,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.pterodactylus.sone.freenet.plugin.PluginException;
+import net.pterodactylus.util.collection.mapper.Mapper;
+import net.pterodactylus.util.collection.mapper.Mappers;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
 
@@ -43,6 +45,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. */
 	};
@@ -140,7 +143,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;
@@ -159,94 +162,23 @@ public class IdentityManager extends AbstractService {
 				newOwnIdentities.put(ownIdentity.getId(), ownIdentity);
 			}
 			checkOwnIdentities(newOwnIdentities);
-			return ownIdentities;
-		} catch (PluginException pe1) {
-			logger.log(Level.WARNING, "Could not load all own identities!", pe1);
+			return Mappers.mappedSet(ownIdentities, new Mapper<OwnIdentity, OwnIdentity>() {
+
+				/**
+				 * {@inheritDoc}
+				 */
+				@Override
+				public OwnIdentity map(OwnIdentity input) {
+					return new DefaultOwnIdentity(input);
+				}
+			});
+		} catch (WebOfTrustException wote1) {
+			logger.log(Level.WARNING, "Could not load all own identities!", wote1);
 			return Collections.emptySet();
 		}
 	}
 
 	//
-	// ACTIONS
-	//
-
-	/**
-	 * Adds a context to the given own identity.
-	 *
-	 * @param ownIdentity
-	 *            The own identity
-	 * @param context
-	 *            The context to add
-	 */
-	public void addContext(OwnIdentity ownIdentity, String context) {
-		if (ownIdentity.hasContext(context)) {
-			return;
-		}
-		try {
-			webOfTrustConnector.addContext(ownIdentity, context);
-			ownIdentity.addContext(context);
-		} catch (PluginException pe1) {
-			logger.log(Level.WARNING, "Could not add context " + context + " to OwnIdentity " + ownIdentity + ".", pe1);
-		}
-	}
-
-	/**
-	 * Removes a context from the given own identity.
-	 *
-	 * @param ownIdentity
-	 *            The own identity
-	 * @param context
-	 *            The context to remove
-	 */
-	public void removeContext(OwnIdentity ownIdentity, String context) {
-		if (!ownIdentity.hasContext(context)) {
-			return;
-		}
-		try {
-			webOfTrustConnector.removeContext(ownIdentity, context);
-			ownIdentity.removeContext(context);
-		} catch (PluginException pe1) {
-			logger.log(Level.WARNING, "Could not remove context " + context + " from OwnIdentity " + ownIdentity + ".", pe1);
-		}
-	}
-
-	/**
-	 * Sets the property with the given name to the given value.
-	 *
-	 * @param ownIdentity
-	 *            The own identity
-	 * @param name
-	 *            The name of the property
-	 * @param value
-	 *            The value of the property
-	 */
-	public void setProperty(OwnIdentity ownIdentity, String name, String value) {
-		try {
-			webOfTrustConnector.setProperty(ownIdentity, name, value);
-			ownIdentity.setProperty(name, value);
-		} catch (PluginException pe1) {
-			logger.log(Level.WARNING, "Could not set property “" + name + "” to “" + value + "” for OwnIdentity: " + ownIdentity, pe1);
-		}
-	}
-
-	/**
-	 * Removes the property with the given name.
-	 *
-	 * @param ownIdentity
-	 *            The own identity
-	 * @param name
-	 *            The name of the property to remove
-	 */
-	public void removeProperty(OwnIdentity ownIdentity, String name) {
-		try {
-			webOfTrustConnector.removeProperty(ownIdentity, name);
-			ownIdentity.removeProperty(name);
-		} catch (PluginException pe1) {
-			logger.log(Level.WARNING, "Could not remove property “" + name + "” from OwnIdentity: " + ownIdentity, pe1);
-		}
-	}
-
-	//
 	// SERVICE METHODS
 	//
 
@@ -255,93 +187,103 @@ public class IdentityManager extends AbstractService {
 	 */
 	@Override
 	protected void serviceRun() {
-		Map<String, Identity> oldIdentities = Collections.emptyMap();
+		Map<OwnIdentity, Map<String, Identity>> oldIdentities = Collections.emptyMap();
 		while (!shouldStop()) {
-			Map<String, Identity> currentIdentities = new HashMap<String, Identity>();
+			Map<OwnIdentity, Map<String, Identity>> currentIdentities = new HashMap<OwnIdentity, Map<String, Identity>>();
 			Map<String, OwnIdentity> currentOwnIdentities = new HashMap<String, OwnIdentity>();
 
-			/* get all identities with the wanted context from WoT. */
-			Set<OwnIdentity> ownIdentities;
+			Set<OwnIdentity> ownIdentities = null;
+			boolean identitiesLoaded = false;
 			try {
+				/* get all identities with the wanted context from WoT. */
 				ownIdentities = webOfTrustConnector.loadAllOwnIdentities();
 
-				/* check for changes. */
-				for (OwnIdentity ownIdentity : ownIdentities) {
-					currentOwnIdentities.put(ownIdentity.getId(), ownIdentity);
-				}
-				checkOwnIdentities(currentOwnIdentities);
-
-				/* now filter for context and get all identities. */
-				currentOwnIdentities.clear();
+				/* load trusted identities. */
 				for (OwnIdentity ownIdentity : ownIdentities) {
 					if ((context != null) && !ownIdentity.hasContext(context)) {
 						continue;
 					}
 					currentOwnIdentities.put(ownIdentity.getId(), ownIdentity);
-					for (Identity identity : webOfTrustConnector.loadTrustedIdentities(ownIdentity, context)) {
-						currentIdentities.put(identity.getId(), identity);
-					}
-				}
 
-				/* find removed identities. */
-				for (Identity oldIdentity : oldIdentities.values()) {
-					if (!currentIdentities.containsKey(oldIdentity.getId())) {
-						identityListenerManager.fireIdentityRemoved(oldIdentity);
+					Set<Identity> trustedIdentities = webOfTrustConnector.loadTrustedIdentities(ownIdentity, context);
+					Map<String, Identity> identities = new HashMap<String, Identity>();
+					currentIdentities.put(ownIdentity, identities);
+					for (Identity identity : trustedIdentities) {
+						identities.put(identity.getId(), identity);
 					}
 				}
+				identitiesLoaded = true;
+			} catch (WebOfTrustException wote1) {
+				logger.log(Level.WARNING, "WoT has disappeared!", wote1);
+			}
 
-				/* find new identities. */
-				for (Identity currentIdentity : currentIdentities.values()) {
-					if (!oldIdentities.containsKey(currentIdentity.getId())) {
-						identityListenerManager.fireIdentityAdded(currentIdentity);
-					}
-				}
+			if (identitiesLoaded) {
 
-				/* check for changes in the contexts. */
-				for (Identity oldIdentity : oldIdentities.values()) {
-					if (!currentIdentities.containsKey(oldIdentity.getId())) {
-						continue;
-					}
-					Identity newIdentity = currentIdentities.get(oldIdentity.getId());
-					Set<String> oldContexts = oldIdentity.getContexts();
-					Set<String> newContexts = newIdentity.getContexts();
-					if (oldContexts.size() != newContexts.size()) {
-						identityListenerManager.fireIdentityUpdated(newIdentity);
-						continue;
-					}
-					for (String oldContext : oldContexts) {
-						if (!newContexts.contains(oldContext)) {
-							identityListenerManager.fireIdentityUpdated(newIdentity);
-							break;
+				/* check for changes. */
+				checkOwnIdentities(currentOwnIdentities);
+
+				/* now check for changes in remote identities. */
+				for (OwnIdentity ownIdentity : currentOwnIdentities.values()) {
+
+					/* find new identities. */
+					for (Identity currentIdentity : currentIdentities.get(ownIdentity).values()) {
+						if (!oldIdentities.containsKey(ownIdentity) || !oldIdentities.get(ownIdentity).containsKey(currentIdentity.getId())) {
+							identityListenerManager.fireIdentityAdded(ownIdentity, currentIdentity);
 						}
 					}
-				}
 
-				/* check for changes in the properties. */
-				for (Identity oldIdentity : oldIdentities.values()) {
-					if (!currentIdentities.containsKey(oldIdentity.getId())) {
-						continue;
-					}
-					Identity newIdentity = currentIdentities.get(oldIdentity.getId());
-					Map<String, String> oldProperties = oldIdentity.getProperties();
-					Map<String, String> newProperties = newIdentity.getProperties();
-					if (oldProperties.size() != newProperties.size()) {
-						identityListenerManager.fireIdentityUpdated(newIdentity);
-						continue;
-					}
-					for (Entry<String, String> oldProperty : oldProperties.entrySet()) {
-						if (!newProperties.containsKey(oldProperty.getKey()) || !newProperties.get(oldProperty.getKey()).equals(oldProperty.getValue())) {
-							identityListenerManager.fireIdentityUpdated(newIdentity);
-							break;
+					/* find removed identities. */
+					if (oldIdentities.containsKey(ownIdentity)) {
+						for (Identity oldIdentity : oldIdentities.get(ownIdentity).values()) {
+							if (!currentIdentities.get(ownIdentity).containsKey(oldIdentity.getId())) {
+								identityListenerManager.fireIdentityRemoved(ownIdentity, oldIdentity);
+							}
+						}
+
+						/* check for changes in the contexts. */
+						for (Identity oldIdentity : oldIdentities.get(ownIdentity).values()) {
+							if (!currentIdentities.get(ownIdentity).containsKey(oldIdentity.getId())) {
+								continue;
+							}
+							Identity newIdentity = currentIdentities.get(ownIdentity).get(oldIdentity.getId());
+							Set<String> oldContexts = oldIdentity.getContexts();
+							Set<String> newContexts = newIdentity.getContexts();
+							if (oldContexts.size() != newContexts.size()) {
+								identityListenerManager.fireIdentityUpdated(ownIdentity, newIdentity);
+								continue;
+							}
+							for (String oldContext : oldContexts) {
+								if (!newContexts.contains(oldContext)) {
+									identityListenerManager.fireIdentityUpdated(ownIdentity, newIdentity);
+									break;
+								}
+							}
+						}
+
+						/* check for changes in the properties. */
+						for (Identity oldIdentity : oldIdentities.get(ownIdentity).values()) {
+							if (!currentIdentities.get(ownIdentity).containsKey(oldIdentity.getId())) {
+								continue;
+							}
+							Identity newIdentity = currentIdentities.get(ownIdentity).get(oldIdentity.getId());
+							Map<String, String> oldProperties = oldIdentity.getProperties();
+							Map<String, String> newProperties = newIdentity.getProperties();
+							if (oldProperties.size() != newProperties.size()) {
+								identityListenerManager.fireIdentityUpdated(ownIdentity, newIdentity);
+								continue;
+							}
+							for (Entry<String, String> oldProperty : oldProperties.entrySet()) {
+								if (!newProperties.containsKey(oldProperty.getKey()) || !newProperties.get(oldProperty.getKey()).equals(oldProperty.getValue())) {
+									identityListenerManager.fireIdentityUpdated(ownIdentity, newIdentity);
+									break;
+								}
+							}
 						}
 					}
 				}
 
 				/* remember the current set of identities. */
 				oldIdentities = currentIdentities;
-
-			} catch (PluginException pe1) {
-				logger.log(Level.WARNING, "WoT has disappeared!", pe1);
 			}
 
 			/* wait a minute before checking again. */
@@ -365,15 +307,17 @@ public class IdentityManager extends AbstractService {
 
 			/* find removed own identities: */
 			for (OwnIdentity oldOwnIdentity : currentOwnIdentities.values()) {
-				if (!newOwnIdentities.containsKey(oldOwnIdentity.getId())) {
-					identityListenerManager.fireOwnIdentityRemoved(oldOwnIdentity);
+				OwnIdentity newOwnIdentity = newOwnIdentities.get(oldOwnIdentity.getId());
+				if ((newOwnIdentity == null) || ((context != null) && oldOwnIdentity.hasContext(context) && !newOwnIdentity.hasContext(context))) {
+					identityListenerManager.fireOwnIdentityRemoved(new DefaultOwnIdentity(oldOwnIdentity));
 				}
 			}
 
 			/* find added own identities. */
 			for (OwnIdentity currentOwnIdentity : newOwnIdentities.values()) {
-				if (!currentOwnIdentities.containsKey(currentOwnIdentity.getId())) {
-					identityListenerManager.fireOwnIdentityAdded(currentOwnIdentity);
+				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(new DefaultOwnIdentity(currentOwnIdentity));
 				}
 			}