mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Minor UI improvements for users not subscribed to.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@9226 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-09-26 21:55:39 +00:00
committed by derek
parent 91548b3fcd
commit 6e42a8d9c5
2 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/java/org/jivesoftware/spark/ui/RosterDialog.java
View File

@ -160,6 +160,31 @@ public class RosterDialog implements PropertyChangeListener, ActionListener {
public void focusLost(FocusEvent e) {
String jid = getJID();
String vcardNickname = null;
if (!publicBox.isSelected()) {
// This is not a transport.
String fullJID = getJID();
if (fullJID.indexOf("@") == -1) {
fullJID = fullJID + "@" + SparkManager.getConnection().getServiceName();
}
VCard vCard = SparkManager.getVCardManager().getVCard(fullJID);
if (vCard != null && vCard.getError() == null) {
String firstName = vCard.getFirstName();
String lastName = vCard.getLastName();
String nickname = vCard.getNickName();
if (ModelUtil.hasLength(nickname)) {
vcardNickname = nickname;
}
else if (ModelUtil.hasLength(firstName) && ModelUtil.hasLength(lastName)) {
vcardNickname = firstName + " " + lastName;
}
else if (ModelUtil.hasLength(firstName)) {
vcardNickname = firstName;
}
}
}
String nickname = nicknameField.getText();
if (!ModelUtil.hasLength(nickname) && ModelUtil.hasLength(jid)) {
@ -167,7 +192,8 @@ public class RosterDialog implements PropertyChangeListener, ActionListener {
if (!ModelUtil.hasLength(nickname)) {
nickname = jid;
}
nicknameField.setText(nickname);
nicknameField.setText(vcardNickname != null ? vcardNickname : nickname);
}
}
});