From 0c690560faa25d14ea5a0f1198d0a2296b223354 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Thu, 12 Apr 2012 19:22:07 +0000 Subject: [PATCH] Make the ComponentPresetChooserDialog more forgiving about presets which are missing parameters. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@545 180e2498-e6e9-4542-8430-84ac67f01cd8 --- .../dialogs/preset/ComponentPresetChooserDialog.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java b/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java index 22b9753a..c6a917f6 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java @@ -96,11 +96,15 @@ public class ComponentPresetChooserDialog extends JDialog { columns[i+1] = new Column(trans.get("table.column." + columnKeys[i].getName())) { @Override 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) { - double v = (Double) ComponentPresetChooserDialog.this.presets.get(row).get(key); - return new Value( v, key.getUnitGroup() ); + return new Value( (Double) value, key.getUnitGroup() ); } else { - return ComponentPresetChooserDialog.this.presets.get(row).get(key); + return value; } } }; -- 2.30.2