sort muc users by affiliation, name. fixes #1913
This commit is contained in:
parent
95a51ea2e0
commit
f9600b950f
|
@ -296,16 +296,22 @@ public class MucOptions {
|
|||
|
||||
@Override
|
||||
public int compareTo(User another) {
|
||||
Contact ourContact = getContact();
|
||||
Contact anotherContact = another.getContact();
|
||||
if (ourContact != null && anotherContact != null) {
|
||||
return ourContact.compareTo(anotherContact);
|
||||
} else if (ourContact == null && anotherContact != null) {
|
||||
return getName().compareToIgnoreCase(anotherContact.getDisplayName());
|
||||
} else if (ourContact != null) {
|
||||
return ourContact.getDisplayName().compareToIgnoreCase(another.getName());
|
||||
if (another.getAffiliation().outranks(getAffiliation())) {
|
||||
return 1;
|
||||
} else if (getAffiliation().outranks(another.getAffiliation())) {
|
||||
return -1;
|
||||
} else {
|
||||
return getName().compareToIgnoreCase(another.getName());
|
||||
Contact ourContact = getContact();
|
||||
Contact anotherContact = another.getContact();
|
||||
if (ourContact != null && anotherContact != null) {
|
||||
return ourContact.compareTo(anotherContact);
|
||||
} else if (ourContact == null && anotherContact != null) {
|
||||
return getName().compareToIgnoreCase(anotherContact.getDisplayName());
|
||||
} else if (ourContact != null) {
|
||||
return ourContact.getDisplayName().compareToIgnoreCase(another.getName());
|
||||
} else {
|
||||
return getName().compareToIgnoreCase(another.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue