mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2026-02-04 11:45:38 +00:00
Code Issues Projects Releases Wiki Activity

Use equalsIgnoreCase() and compareToIgnoreCase()

Browse Source
This commit is contained in:
Sergey Ponomarev
2026-01-06 20:32:43 +02:00
committed by Guus der Kinderen
parent 75d2cf2f6c
commit acbae2405e
6 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/jivesoftware/spark/ui/ContactList.java
View File

@ -2056,7 +2056,7 @@ public class ContactList extends JPanel implements ActionListener,
return -1; return -1;
} }
return group1.getGroupName().trim().toLowerCase().compareTo(group2.getGroupName().trim().toLowerCase()); return group1.getGroupName().trim().compareToIgnoreCase(group2.getGroupName().trim());
}; };
public JPanel getMainPanel() { public JPanel getMainPanel() {

3
core/src/main/java/org/jivesoftware/spark/ui/RosterPickList.java
View File

@ -159,8 +159,7 @@ public class RosterPickList extends JPanel {
return 0; return 0;
} }
return nickname1.toLowerCase().compareTo(nickname2.toLowerCase()); return nickname1.compareToIgnoreCase(nickname2);
}; };
} }

2
core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatParticipantList.java
View File

@ -1089,7 +1089,7 @@ public class GroupChatParticipantList extends JPanel {
} }
private int compareWithoutRole(String s1, String s2) { private int compareWithoutRole(String s1, String s2) {
return (s1.toLowerCase().compareTo(s2.toLowerCase())); return s1.compareToIgnoreCase(s2);
} }
/** /**

3
core/src/main/java/org/jivesoftware/sparkimpl/plugin/privacy/ui/PrivacyAddDialogUI.java
View File

@ -244,7 +244,6 @@ public class PrivacyAddDialogUI extends JPanel {
return 0; return 0;
} }
return nickname1.toLowerCase().compareTo(nickname2.toLowerCase()); return nickname1.compareToIgnoreCase(nickname2);
}; };
} }

5
plugins/sip/src/main/java/net/java/sipmack/media/JmfMediaManager.java
View File

@ -725,8 +725,7 @@ public class JmfMediaManager {
for(String codec: codecs) { for(String codec: codecs) {
for(String format : formate) { for(String format : formate) {
if(format != null if (format != null && format.equalsIgnoreCase(codec))
&& format.toLowerCase().equals(codec.toLowerCase()))
return new AudioFormat(format); return new AudioFormat(format);
} }
} }
@ -742,7 +741,7 @@ public class JmfMediaManager {
String[] codecs = localPreferences.getSelectedCodecs().split("\\^"); String[] codecs = localPreferences.getSelectedCodecs().split("\\^");
for(AudioFormat form : all) { for(AudioFormat form : all) {
for(String codec: codecs) { for(String codec: codecs) {
if(form.getEncoding().toLowerCase().equals(codec.toLowerCase())){ if (form.getEncoding().equalsIgnoreCase(codec)) {
format.add(form); format.add(form);
} }
} }

4
plugins/sip/src/main/java/org/jivesoftware/sparkplugin/ui/transfer/TransferGroupUI.java
View File

@ -275,9 +275,7 @@ public class TransferGroupUI extends JPanel {
*/ */
final Comparator<RosterEntry> entryComparator = new Comparator<RosterEntry>() { final Comparator<RosterEntry> entryComparator = new Comparator<RosterEntry>() {
public int compare(RosterEntry one, RosterEntry two) { public int compare(RosterEntry one, RosterEntry two) {
final RosterEntry entryOne = one; return one.getName().compareToIgnoreCase(two.getName());
final RosterEntry entryTwo = two;
return entryOne.getName().toLowerCase().compareTo(entryTwo.getName().toLowerCase());
} }
}; };