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

[1373] PR review fixes

Browse Source 
Move hasRecoveryDevice to RocketComponent and reimplement
FlightConfiguration version to check for FlightConfiguration errors.
This commit is contained in:
Peter Tsongalis 2022-06-12 16:06:58 -07:00
parent f5cc1f61bf
commit 6c475645d4
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -549,23 +549,16 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
}
/**
* Return true if a rocket has a configured Recovery Device
* Return true if rocket has a RecoveryDevice
*/
public boolean hasRecoveryDevice() {
Rocket rkt = this.getRocket();
RocketComponent nextComponent = rkt.getNextComponent();
while(nextComponent != null) {
if(nextComponent instanceof RecoveryDevice) {
return true;
}
nextComponent = nextComponent.getNextComponent();
}
if (fcid.hasError()) {
return false;
}
return this.getRocket().hasRecoveryDevice();
}
/////////////// Helper methods ///////////////
/**

13
core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
View File

@ -427,6 +427,19 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
}
}
/**
* Return true if any of this component's children are a RecoveryDevice
*/
public boolean hasRecoveryDevice() {
Iterator<RocketComponent> iterator = this.iterator();
while (iterator.hasNext()) {
RocketComponent child = iterator.next();
if (child instanceof RecoveryDevice) {
return true;
}
}
return false;
}
////////////// Methods that may not be overridden ////////////