X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FIdentityAccessor.java;h=7766af30979725207bfffe089c7f4faa1cc41b9d;hp=eec9347738804e2025376abd0dcf9de1d9b7e4b8;hb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae;hpb=ecf753a31601e558b681daab0598009fe9eec99a

diff --git a/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java b/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java
index eec9347..7766af3 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–2016 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,9 @@ package net.pterodactylus.sone.template;
 
 import java.util.Set;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
@@ -32,6 +35,7 @@ import net.pterodactylus.util.template.TemplateContext;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
+@Singleton
 public class IdentityAccessor extends ReflectionAccessor {
 
 	/** The core. */
@@ -43,6 +47,7 @@ public class IdentityAccessor extends ReflectionAccessor {
 	 * @param core
 	 *            The core
 	 */
+	@Inject
 	public IdentityAccessor(Core core) {
 		this.core = core;
 	}
@@ -55,9 +60,8 @@ public class IdentityAccessor extends ReflectionAccessor {
 		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);
@@ -93,7 +97,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) : "");
 	}