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

Make the ComponentPresetChooserDialog more forgiving about presets which are missing parameters.

Browse Source
This commit is contained in:
Kevin Ruland 2012-04-12 19:22:07 +00:00
parent a86e4c3f0c
commit 1a7a658876
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
View File

@ -96,11 +96,15 @@ public class ComponentPresetChooserDialog extends JDialog {
columns[i+1] = new Column(trans.get("table.column." + columnKeys[i].getName())) { columns[i+1] = new Column(trans.get("table.column." + columnKeys[i].getName())) {
@Override @Override
public Object getValueAt(int row) { public Object getValueAt(int row) {
ComponentPreset preset = ComponentPresetChooserDialog.this.presets.get(row);
if ( ! preset.has(key) ) {
return null;
}
Object value = preset.get(key);
if (key.getType() == Double.class && key.getUnitGroup() != null) { if (key.getType() == Double.class && key.getUnitGroup() != null) {
double v = (Double) ComponentPresetChooserDialog.this.presets.get(row).get(key); return new Value( (Double) value, key.getUnitGroup() );
return new Value( v, key.getUnitGroup() );
} else { } else {
return ComponentPresetChooserDialog.this.presets.get(row).get(key); return value;
} }
} }
}; };