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

Fix sorting on double columns.

Browse Source
This commit is contained in:
Kevin Ruland 2012-05-11 03:38:58 +00:00
parent 751d1d4c52
commit 0cfdc91b2f
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java
View File

@ -6,6 +6,7 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import javax.swing.JCheckBoxMenuItem; import javax.swing.JCheckBoxMenuItem;
@ -28,6 +29,7 @@ import net.sf.openrocket.preset.TypedKey;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.unit.Value;
import net.sf.openrocket.util.AlphanumComparator; import net.sf.openrocket.util.AlphanumComparator;
public class ComponentPresetTable extends JTable { public class ComponentPresetTable extends JTable {
@ -108,6 +110,15 @@ public class ComponentPresetTable extends JTable {
tableColumnModel.addColumn(columns[index]); tableColumnModel.addColumn(columns[index]);
if ( key == ComponentPreset.MANUFACTURER || key == ComponentPreset.PARTNO ) { if ( key == ComponentPreset.MANUFACTURER || key == ComponentPreset.PARTNO ) {
sorter.setComparator(index, new AlphanumComparator()); sorter.setComparator(index, new AlphanumComparator());
} else if ( key.getType() == Double.class ) {
sorter.setComparator(index, new Comparator<Value>() {
@Override
public int compare(Value o1, Value o2) {
return Double.compare(o1.getValue(), o2.getValue());
}
});
} }
if ( visibleColumnKeys.indexOf(key) < 0 ) { if ( visibleColumnKeys.indexOf(key) < 0 ) {
hiddenColumns.add(columns[index]); hiddenColumns.add(columns[index]);