From 56edaeff77f42feccfb1d313c97e5dce1078c185 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Tue, 26 Mar 2013 16:48:32 -0500 Subject: [PATCH] Corrected implementation of reset motor ignition to default. --- .../MotorConfigurationPanel.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java b/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java index 4ce43ffc6..66de63199 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java +++ b/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java @@ -133,8 +133,7 @@ public class MotorConfigurationPanel extends JPanel { resetIgnitionButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - // FIXME - selectIgnition(); + resetIgnition(); } }); this.add(resetIgnitionButton, "sizegroup button, wrap"); @@ -237,4 +236,17 @@ public class MotorConfigurationPanel extends JPanel { updateButtonState(); } + private void resetIgnition() { + String currentID = rocket.getDefaultConfiguration().getFlightConfigurationID(); + MotorMount currentMount = getCurrentMount(); + if (currentID == null || currentMount == null) + return; + + currentMount.getIgnitionConfiguration().resetDefault(currentID); + + flightConfigurationDialog.fireContentsUpdated(); + configurationTableModel.fireTableDataChanged(); + updateButtonState(); + } + }