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

Since FlightConfiguration:getContextListAt() is now only returning contexts which are active, change name to getActiveContextListAt(). Note that it's only ever called from FlightConfiguration:getActiveInstances() and recursively, so this is making the two method names consistent.

Browse Source
This commit is contained in:
JoePfeiffer 2020-09-12 14:49:21 -06:00
parent 5e64b3e565
commit a44c90d522
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,11 +289,11 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
*/ */
public InstanceMap getActiveInstances() { public InstanceMap getActiveInstances() {
InstanceMap contexts = new InstanceMap(); InstanceMap contexts = new InstanceMap();
getContextListAt( this.rocket, contexts, Transformation.IDENTITY); getActiveContextListAt( this.rocket, contexts, Transformation.IDENTITY);
return contexts; return contexts;
} }
private InstanceMap getContextListAt(final RocketComponent component, final InstanceMap results, final Transformation parentTransform ){ private InstanceMap getActiveContextListAt(final RocketComponent component, final InstanceMap results, final Transformation parentTransform ){
final boolean active = this.isComponentActive(component); final boolean active = this.isComponentActive(component);
if (!active) if (!active)
return results; return results;
@ -315,7 +315,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
results.emplace(component, active, currentInstanceNumber, currentTransform); results.emplace(component, active, currentInstanceNumber, currentTransform);
for(RocketComponent child : component.getChildren()) { for(RocketComponent child : component.getChildren()) {
getContextListAt(child, results, currentTransform); getActiveContextListAt(child, results, currentTransform);
} }
} }