hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly sort groupable items in combobox

Browse Source
This commit is contained in:
SiboVG 2024-09-07 11:25:06 +02:00
parent 86aec4e22e
commit 7a51055315
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
swing/src/main/java/info/openrocket/swing/gui/widgets/GroupableAndSearchableComboBox.java
View File

@ -130,20 +130,34 @@ public class GroupableAndSearchableComboBox<G extends Group, T extends Groupable
}
private Map<G, List<T>> constructItemGroupMapFromList(List<T> items) {
Map<G, List<T>> itemGroupMap = new TreeMap<>(new Comparator<G>() {
@Override
public int compare(G g1, G g2) {
return Integer.compare(g1.getPriority(), g2.getPriority());
}
});
Map<G, List<T>> itemGroupMap = new TreeMap<>(Comparator.comparing(Group::getPriority));
for (T item : items) {
G group = item.getGroup();
itemGroupMap.computeIfAbsent(group, k -> new ArrayList<>()).add(item);
}
// Sort items within each group
for (List<T> groupItems : itemGroupMap.values()) {
groupItems.sort(new ItemComparator());
}
return itemGroupMap;
}
private class ItemComparator implements Comparator<T> {
@Override
@SuppressWarnings("unchecked")
public int compare(T item1, T item2) {
if (item1 instanceof Comparable && item2 instanceof Comparable) {
return ((Comparable<T>) item1).compareTo(item2);
} else {
// Fall back to alphabetical sorting using the display string
return getDisplayString(item1).compareToIgnoreCase(getDisplayString(item2));
}
}
}
public void setupMainRenderer() {
setRenderer(new DefaultListCellRenderer() {
@Override