mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2026-02-05 16:55:34 +00:00
Code Issues Projects Releases Wiki Activity

ContactItem.getDisplayName(): use early return

Browse Source
This commit is contained in:
Sergey Ponomarev
2026-01-07 22:04:31 +02:00
committed by Guus der Kinderen
parent 3b43828b10
commit 6cb33f9415
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/src/main/java/org/jivesoftware/spark/ui/ContactItem.java
View File

@ -162,23 +162,21 @@ public class ContactItem extends JPanel {
* @return a name suitable to be displayed
*/
public String getDisplayName() {
String displayName = null;
if (alias != null && !alias.trim().isEmpty()) {
displayName = alias.trim();
} else if (nickname != null && !nickname.trim().isEmpty()) {
displayName = nickname.trim();
} else {
BareJid bareJid = getJid();
if (bareJid != null) {
displayName = bareJid.toString();
}
}
if (displayName != null) {
return displayName;
} else {
return ""; // weird, but happens.
}
String displayName = null;
if (alias != null && !alias.trim().isEmpty()) {
return alias.trim();
}
if (nickname != null && !nickname.trim().isEmpty()) {
return nickname.trim();
}
BareJid bareJid = getJid();
if (bareJid != null) {
displayName = bareJid.toString();
}
if (displayName != null) {
return displayName;
}
return ""; // weird, but happens.
}
/**
@ -199,7 +197,7 @@ public class ContactItem extends JPanel {
public void setNickname(String nickname) {
this.nickname = nickname;
if (alias == null) {
setDisplayName();
setDisplayName();
}
}
@ -219,8 +217,8 @@ public class ContactItem extends JPanel {
* @param alias the contact alias.
*/
public void setAlias(String alias) {
this.alias = alias;
setDisplayName();
this.alias = alias;
setDisplayName();
}
/**