X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FIdentityAccessor.java;h=3a49aedaf19ad66b3ffec8278d0390ccd29a0f0d;hp=84989b3d0aa695c884d859589224df4fd856b0f4;hb=419098bcd6215125408b29e60bd888e60979d37b;hpb=fd4e3c59035c9321a63507e2100c66532c8f1938

diff --git a/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java b/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java
index 84989b3..3a49aed 100644
--- a/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Sone - IdentityAccessor.java - Copyright © 2010 David Roden
+ * Sone - IdentityAccessor.java - Copyright © 2010–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
@@ -23,8 +23,8 @@ import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.util.template.Accessor;
-import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * {@link Accessor} implementation that adds a “uniqueNickname” member to an
@@ -51,13 +51,12 @@ public class IdentityAccessor extends ReflectionAccessor {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Object get(DataProvider dataProvider, Object object, String member) {
+	public Object get(TemplateContext templateContext, Object object, String member) {
 		Identity identity = (Identity) object;
 		if ("uniqueNickname".equals(member)) {
 			int minLength = -1;
-			boolean found = false;
-			Set<OwnIdentity> ownIdentities = null;
-			ownIdentities = core.getIdentityManager().getAllOwnIdentities();
+			boolean found;
+			Set<OwnIdentity> ownIdentities = core.getIdentityManager().getAllOwnIdentities();
 			do {
 				boolean unique = true;
 				String abbreviatedWantedNickname = getAbbreviatedNickname(identity, ++minLength);
@@ -75,7 +74,7 @@ public class IdentityAccessor extends ReflectionAccessor {
 			} while (!found && (minLength < 43));
 			return getAbbreviatedNickname(identity, minLength);
 		}
-		return super.get(dataProvider, object, member);
+		return super.get(templateContext, object, member);
 	}
 
 	//
@@ -93,7 +92,7 @@ public class IdentityAccessor extends ReflectionAccessor {
 	 *            append to the nickname
 	 * @return The nickname with optional ID appendage
 	 */
-	private String getAbbreviatedNickname(Identity identity, int length) {
+	private static String getAbbreviatedNickname(Identity identity, int length) {
 		return identity.getNickname() + ((length > 0) ? "@" + identity.getId().substring(0, length) : "");
 	}