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

More fixes to displayed text when default has delay.

Browse Source
This commit is contained in:
kruland2607 2013-03-26 17:44:23 -05:00
parent 31241bc0b9
commit 9bf9e55428
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java
View File

@ -164,18 +164,19 @@ public class SeparationConfigurationPanel extends JPanel {
String id = rocket.getDefaultConfiguration().getFlightConfigurationID(); String id = rocket.getDefaultConfiguration().getFlightConfigurationID();
StageSeparationConfiguration separationConfig = d.getStageSeparationConfiguration().get(id); StageSeparationConfiguration separationConfig = d.getStageSeparationConfiguration().get(id);
boolean isDefault = d.getStageSeparationConfiguration().isDefault(id);
SeparationEvent event = separationConfig.getSeparationEvent(); SeparationEvent event = separationConfig.getSeparationEvent();
String str = event.toString(); String str = event.toString();
if (separationConfig.getSeparationDelay() > 0) {
if (d.getStageSeparationConfiguration().isDefault(id)) { str = str + " + " + UnitGroup.UNITS_SHORT_TIME.toStringUnit(separationConfig.getSeparationDelay());
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 (isDefault) {
String def = trans.get("SeparationConfigurationPanel.table.separation.default");
str = def.replace("{0}", str);
}
return str; return str;
default: default: