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

[#2303] Copy raw name from flight configf

Browse Source
This commit is contained in:
SiboVG 2023-08-25 11:41:42 +02:00
parent ba67e72e59
commit 9ff699bcbc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
View File

@ -882,7 +882,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
} }
public void setName(final String newName) { public void setName(final String newName) {
if ((newName == null) || ("".equals(newName))) { if ((newName == null) || (newName.isEmpty())) {
this.configurationName = DEFAULT_CONFIG_NAME; this.configurationName = DEFAULT_CONFIG_NAME;
return; return;
}else if( ! this.getId().isValid()){ }else if( ! this.getId().isValid()){

4
core/src/net/sf/openrocket/rocketcomponent/Rocket.java
View File

@ -386,7 +386,7 @@ public class Rocket extends ComponentAssembly {
copyRocket.configSet = new FlightConfigurableParameterSet<>(new FlightConfiguration(copyRocket)); copyRocket.configSet = new FlightConfigurableParameterSet<>(new FlightConfiguration(copyRocket));
for (FlightConfigurationId key : this.configSet.getIds()) { for (FlightConfigurationId key : this.configSet.getIds()) {
FlightConfiguration newCfg = new FlightConfiguration(copyRocket, key); FlightConfiguration newCfg = new FlightConfiguration(copyRocket, key);
newCfg.setName(this.configSet.get(key).getName()); // Copy config name newCfg.setName(this.configSet.get(key).getNameRaw()); // Copy config name
copyRocket.configSet.set(key, newCfg); copyRocket.configSet.set(key, newCfg);
} }
@ -438,7 +438,7 @@ public class Rocket extends ComponentAssembly {
this.configSet.setDefault(new FlightConfiguration(this)); this.configSet.setDefault(new FlightConfiguration(this));
for (FlightConfigurationId key : source.configSet.map.keySet()) { for (FlightConfigurationId key : source.configSet.map.keySet()) {
FlightConfiguration newCfg = new FlightConfiguration(this, key); FlightConfiguration newCfg = new FlightConfiguration(this, key);
newCfg.setName(source.configSet.get(key).getName()); // Copy config name newCfg.setName(source.configSet.get(key).getNameRaw()); // Copy config name
this.configSet.set(key, newCfg); this.configSet.set(key, newCfg);
} }
this.selectedConfiguration = this.configSet.get(source.getSelectedConfiguration().getId()); this.selectedConfiguration = this.configSet.get(source.getSelectedConfiguration().getId());