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

[refactor] streamlined null checks in SymmetricComponent.get{Prev|Next}SymmetricComponent

Browse Source
This commit is contained in:
Daniel_M_Williams 2020-08-14 18:22:54 -04:00
parent bbf9c4d8a4
commit ac1d6b698a
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java
View File

@ -577,17 +577,16 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou
* @return the previous SymmetricComponent, or null. * @return the previous SymmetricComponent, or null.
*/ */
public final SymmetricComponent getPreviousSymmetricComponent() { public final SymmetricComponent getPreviousSymmetricComponent() {
if(null == this.parent) { if((null == this.parent) || (null == this.parent.getParent())){
return null; return null;
} }
final ComponentAssembly assembly = this.getAssembly();
// might be: (a) Rocket -- for Centerline/Axial stages // might be: (a) Rocket -- for Centerline/Axial stages
// (b) BodyTube -- for Parallel Stages & PodSets // (b) BodyTube -- for Parallel Stages & PodSets
final RocketComponent grandParent = assembly.getParent(); final RocketComponent grandParent = this.parent.getParent();
// note: this is not guaranteed to _contain_ a stage... but that we're _searching_ for one. // note: this is not guaranteed to _contain_ a stage... but that we're _searching_ for one.
int searchParentIndex = grandParent.getChildPosition(assembly); // position of stage w/in parent int searchParentIndex = grandParent.getChildPosition(this.parent); // position of stage w/in parent
int searchSiblingIndex = this.parent.getChildPosition(this)-1; // guess at index of previous stage int searchSiblingIndex = this.parent.getChildPosition(this)-1; // guess at index of previous stage
while( 0 <= searchParentIndex ) { while( 0 <= searchParentIndex ) {
@ -615,17 +614,16 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou
* @return the next SymmetricComponent, or null. * @return the next SymmetricComponent, or null.
*/ */
public final SymmetricComponent getNextSymmetricComponent() { public final SymmetricComponent getNextSymmetricComponent() {
if(null == this.parent) { if((null == this.parent) || (null == this.parent.getParent())){
return null; return null;
} }
final ComponentAssembly assembly = this.getAssembly();
// might be: (a) Rocket -- for centerline stages // might be: (a) Rocket -- for centerline stages
// (b) BodyTube -- for Parallel Stages // (b) BodyTube -- for Parallel Stages
final RocketComponent grandParent = assembly.getParent(); final RocketComponent grandParent = this.parent.getParent();
// note: this is not guaranteed to _contain_ a stage... but that we're _searching_ for one. // note: this is not guaranteed to _contain_ a stage... but that we're _searching_ for one.
int searchParentIndex = grandParent.getChildPosition(assembly); int searchParentIndex = grandParent.getChildPosition(this.parent);
int searchSiblingIndex = this.parent.getChildPosition(this) + 1; int searchSiblingIndex = this.parent.getChildPosition(this) + 1;
while(searchParentIndex < grandParent.getChildCount()) { while(searchParentIndex < grandParent.getChildCount()) {