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

[#2576] Fix Sorting Problem With Sides and Line Count on parachute

Browse Source
This commit is contained in:
stoopipoopy 2024-10-17 00:03:16 -07:00
parent 039759079b
commit 9e05a3d45c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java
View File

@ -6,11 +6,7 @@ import java.awt.event.ItemEvent;
import java.awt.event.ItemListener; import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.ArrayList; import java.util.*;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Set;
import javax.swing.ButtonGroup; import javax.swing.ButtonGroup;
import javax.swing.JCheckBoxMenuItem; import javax.swing.JCheckBoxMenuItem;
@ -58,7 +54,6 @@ public class ComponentPresetTable extends JTable {
this.favorites = Application.getPreferences().getComponentFavorites(presetType); this.favorites = Application.getPreferences().getComponentFavorites(presetType);
this.columns = new ComponentPresetTableColumn[ComponentPreset.ORDERED_KEY_LIST.size() + 1]; this.columns = new ComponentPresetTableColumn[ComponentPreset.ORDERED_KEY_LIST.size() + 1];
this.tableModel = new AbstractTableModel() { this.tableModel = new AbstractTableModel() {
final ComponentPresetTableColumn[] myColumns = columns; final ComponentPresetTableColumn[] myColumns = columns;
@ -135,6 +130,13 @@ public class ComponentPresetTable extends JTable {
} }
}); });
} else if (key.getType() == Integer.class){
sorter.setComparator(index, new Comparator<Integer>() {
@Override
public int compare(Integer o1, Integer o2) {
return Integer.compare(o1.intValue(), o2.intValue());
}
});
} else if (key.getType() == Boolean.class) { } else if (key.getType() == Boolean.class) {
sorter.setComparator(index, new Comparator<Boolean>() { sorter.setComparator(index, new Comparator<Boolean>() {