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

Use safe iterators for RocketFigure

Browse Source
This commit is contained in:
SiboVG 2022-07-27 22:04:27 +02:00
parent 35cd50bc52
commit d5e94ad32d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java
View File

@ -282,7 +282,9 @@ public class RocketFigure extends AbstractScaleFigure {
Color borderColor = ((SwingPreferences)Application.getPreferences()).getMotorBorderColor(); Color borderColor = ((SwingPreferences)Application.getPreferences()).getMotorBorderColor();
FlightConfiguration config = rocket.getSelectedConfiguration(); FlightConfiguration config = rocket.getSelectedConfiguration();
for( MotorConfiguration curInstance : config.getActiveMotors()){ Iterator<MotorConfiguration> itr = config.getActiveMotors().iterator();
while (itr.hasNext()) {
MotorConfiguration curInstance = itr.next();
MotorMount mount = curInstance.getMount(); MotorMount mount = curInstance.getMount();
Motor motor = curInstance.getMotor(); Motor motor = curInstance.getMotor();
double motorLength = motor.getLength(); double motorLength = motor.getLength();
@ -379,7 +381,9 @@ public class RocketFigure extends AbstractScaleFigure {
// allShapes is an output buffer -- it stores all the generated shapes // allShapes is an output buffer -- it stores all the generated shapes
allShapes.clear(); allShapes.clear();
for(Entry<RocketComponent, ArrayList<InstanceContext>> entry: config.getActiveInstances().entrySet() ) { Iterator<Entry<RocketComponent, ArrayList<InstanceContext>>> itr = config.getActiveInstances().entrySet().iterator();
while (itr.hasNext()) {
Entry<RocketComponent, ArrayList<InstanceContext>> entry = itr.next();
final RocketComponent comp = entry.getKey(); final RocketComponent comp = entry.getKey();
// Only draw podsets when they are selected // Only draw podsets when they are selected