From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 1 Nov 2010 20:32:55 +0000 (+0100)
Subject: Use the identity manager.
X-Git-Tag: 0.2-RC1~71
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=fd4e3c59035c9321a63507e2100c66532c8f1938;p=Sone.git

Use the identity manager.
---

diff --git a/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java b/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java
index 4ea956d..84989b3 100644
--- a/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java
@@ -17,13 +17,11 @@
 
 package net.pterodactylus.sone.template;
 
-import java.util.Collections;
 import java.util.Set;
 
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
-import net.pterodactylus.sone.freenet.wot.PluginException;
 import net.pterodactylus.util.template.Accessor;
 import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.ReflectionAccessor;
@@ -59,11 +57,7 @@ public class IdentityAccessor extends ReflectionAccessor {
 			int minLength = -1;
 			boolean found = false;
 			Set<OwnIdentity> ownIdentities = null;
-			try {
-				ownIdentities = core.getWebOfTrustConnector().loadAllOwnIdentities();
-			} catch (PluginException e) {
-				ownIdentities = Collections.emptySet();
-			}
+			ownIdentities = core.getIdentityManager().getAllOwnIdentities();
 			do {
 				boolean unique = true;
 				String abbreviatedWantedNickname = getAbbreviatedNickname(identity, ++minLength);