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

Thanks to Guus der Kinderen for this patch:

Browse Source 
[SPARK-1025] Make rename global and not limited to just the contact list

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@10687 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Andrew Seymour
2008-07-17 18:40:44 +00:00
committed by andrew.seymour
parent bd984dc5a0
commit ae0eacf8ff
20 changed files with 972 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/java/org/jivesoftware/spark/UserManager.java
View File

@ -275,7 +275,7 @@ public class UserManager {
ContactList contactList = SparkManager.getWorkspace().getContactList();
ContactItem item = contactList.getContactItemByJID(jid);
if (item != null) {
return item.getNickname();
return item.getDisplayName();
}
return unescapeJID(jid);
@ -321,15 +321,15 @@ public class UserManager {
}
/**
* Returns the full jid w/ resource of a user by their nickname
* Returns the full jid w/ resource of a user by their display name
* in the ContactList.
*
* @param nickname the nickname of the user.
* @param displayName the displayed name of the user.
* @return the full jid w/ resource of the user.
*/
public String getJIDFromNickname(String nickname) {
public String getJIDFromDisplayName(String displayName) {
ContactList contactList = SparkManager.getWorkspace().getContactList();
ContactItem item = contactList.getContactItemByNickname(nickname);
ContactItem item = contactList.getContactItemByDisplayName(displayName);
if (item != null) {
return getFullJID(item.getJID());
}
@ -398,7 +398,7 @@ public class UserManager {
parent.setGlassPane(glassPane);
parent.getGlassPane().setVisible(false);
contactField.dispose();
SparkManager.getChatManager().activateChat(item.getJID(), item.getNickname());
SparkManager.getChatManager().activateChat(item.getJID(), item.getDisplayName());
}
}
@ -423,7 +423,7 @@ public class UserManager {
parent.setGlassPane(glassPane);
parent.getGlassPane().setVisible(false);
contactField.dispose();
SparkManager.getChatManager().activateChat(item.getJID(), item.getNickname());
SparkManager.getChatManager().activateChat(item.getJID(), item.getDisplayName());
}
}
}
@ -501,10 +501,11 @@ public class UserManager {
*/
final Comparator<ContactItem> itemComparator = new Comparator<ContactItem>() {
public int compare(ContactItem item1, ContactItem item2) {
return item1.getNickname().toLowerCase().compareTo(item2.getNickname().toLowerCase());
return item1.getDisplayName().toLowerCase().compareTo(item2.getDisplayName().toLowerCase());
}
};
}