From 5dbb723736e97b4634d3fbecee67b7ac3e123914 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Tue, 26 Mar 2013 17:37:31 -0500 Subject: [PATCH] Update button states with every selection and corrected display of separation configuration. --- .../SeparationConfigurationPanel.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java b/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java index 05be8b880..3a6abdedc 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java +++ b/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java @@ -22,6 +22,7 @@ import net.sf.openrocket.rocketcomponent.Stage; import net.sf.openrocket.rocketcomponent.StageSeparationConfiguration; import net.sf.openrocket.rocketcomponent.StageSeparationConfiguration.SeparationEvent; import net.sf.openrocket.startup.Application; +import net.sf.openrocket.unit.UnitGroup; public class SeparationConfigurationPanel extends JPanel { @@ -67,11 +68,8 @@ public class SeparationConfigurationPanel extends JPanel { separationTable.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { - if (e.getClickCount() == 1) { - // FIXME: Listen to selection change, not clicks - // Single click updates selection - updateButtonState(); - } else if (e.getClickCount() == 2) { + updateButtonState(); + if (e.getClickCount() == 2) { // Double-click edits selectDeployment(); } @@ -174,6 +172,9 @@ public class SeparationConfigurationPanel extends JPanel { str = str.replace("{0}", event.toString()); } else { str = event.toString(); + if (separationConfig.getSeparationDelay() > 0) { + str = str + " + " + UnitGroup.UNITS_SHORT_TIME.toStringUnit(separationConfig.getSeparationDelay()); + } } return str;