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

Added convenience function RocketComponent.getMotorMounts() returning List<MotorMount>.

Browse Source
This commit is contained in:
Kevin Ruland 2012-05-16 06:49:04 +00:00
parent 7420f5c18b
commit ba4ceccf26
2 changed files with 340 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/net/sf/openrocket/gui/dialogs/EditMotorConfigurationDialog.java
View File

@ -70,15 +70,7 @@ public class EditMotorConfigurationDialog extends JDialog {
this.rocket = rocket;
ArrayList<MotorMount> mountList = new ArrayList<MotorMount>();
Iterator<RocketComponent> iterator = rocket.iterator();
while (iterator.hasNext()) {
RocketComponent c = iterator.next();
if (c instanceof MotorMount) {
mountList.add((MotorMount) c);
}
}
mounts = mountList.toArray(new MotorMount[0]);
mounts = rocket.getMotorMounts().toArray( new MotorMount[0]) ;

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

@ -1669,9 +1669,28 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
return iterator(true);
}
/**
* Retrieve the List of MotorMounts in the Rocket.
*
* Each element returned will a RocketComponent which implements MotorMount. Further isMotorMount()
* returns true.
*
* @return List<MotorMount>
*/
public final List<MotorMount> getMotorMounts() {
Iterator<RocketComponent> it = iterator();
List<MotorMount> mmts = new ArrayList<MotorMount>();
while (it.hasNext()) {
RocketComponent c = it.next();
if (c instanceof MotorMount) {
if ( ((MotorMount)c).isMotorMount() ) {
mmts.add((MotorMount) c);
}
}
}
return mmts;
}
/**
* Compare component equality based on the ID of this component. Only the