X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FIdentityAccessor.java;h=efb4d168fb69dd8e95b8a541cbc6a32c9eab411a;hp=eec9347738804e2025376abd0dcf9de1d9b7e4b8;hb=0e8f7804ce344bdd69f5ecc7febe25a60a53561d;hpb=9e4db46b86d084eba9029906e779ec1d96f78ac4 diff --git a/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java b/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java index eec9347..efb4d16 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–2013 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 @@ -55,9 +55,8 @@ public class IdentityAccessor extends ReflectionAccessor { Identity identity = (Identity) object; if ("uniqueNickname".equals(member)) { int minLength = -1; - boolean found = false; - Set ownIdentities = null; - ownIdentities = core.getIdentityManager().getAllOwnIdentities(); + boolean found; + Set ownIdentities = core.getIdentityManager().getAllOwnIdentities(); do { boolean unique = true; String abbreviatedWantedNickname = getAbbreviatedNickname(identity, ++minLength); @@ -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) : ""); }