From 9bf9e55428a830e03ac5ea391d498323a559711d Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Tue, 26 Mar 2013 17:44:23 -0500 Subject: [PATCH] More fixes to displayed text when default has delay. --- .../SeparationConfigurationPanel.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 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 3a6abdedc..35fb47def 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java +++ b/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java @@ -164,18 +164,19 @@ public class SeparationConfigurationPanel extends JPanel { String id = rocket.getDefaultConfiguration().getFlightConfigurationID(); StageSeparationConfiguration separationConfig = d.getStageSeparationConfiguration().get(id); + boolean isDefault = d.getStageSeparationConfiguration().isDefault(id); + SeparationEvent event = separationConfig.getSeparationEvent(); String str = event.toString(); - - if (d.getStageSeparationConfiguration().isDefault(id)) { - str = trans.get("SeparationConfigurationPanel.table.separation.default"); - str = str.replace("{0}", event.toString()); - } else { - str = event.toString(); - if (separationConfig.getSeparationDelay() > 0) { - str = str + " + " + UnitGroup.UNITS_SHORT_TIME.toStringUnit(separationConfig.getSeparationDelay()); - } + if (separationConfig.getSeparationDelay() > 0) { + str = str + " + " + UnitGroup.UNITS_SHORT_TIME.toStringUnit(separationConfig.getSeparationDelay()); } + + if (isDefault) { + String def = trans.get("SeparationConfigurationPanel.table.separation.default"); + str = def.replace("{0}", str); + } + return str; default: