From d5e94ad32d7aa8ec2efc71068b90500a5a2877e4 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 27 Jul 2022 22:04:27 +0200 Subject: [PATCH] Use safe iterators for RocketFigure --- .../sf/openrocket/gui/scalefigure/RocketFigure.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java b/swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java index 6e4bf9e4b..0b7c36f00 100644 --- a/swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java +++ b/swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java @@ -282,7 +282,9 @@ public class RocketFigure extends AbstractScaleFigure { Color borderColor = ((SwingPreferences)Application.getPreferences()).getMotorBorderColor(); FlightConfiguration config = rocket.getSelectedConfiguration(); - for( MotorConfiguration curInstance : config.getActiveMotors()){ + Iterator itr = config.getActiveMotors().iterator(); + while (itr.hasNext()) { + MotorConfiguration curInstance = itr.next(); MotorMount mount = curInstance.getMount(); Motor motor = curInstance.getMotor(); double motorLength = motor.getLength(); @@ -378,8 +380,10 @@ public class RocketFigure extends AbstractScaleFigure { // allShapes is an output buffer -- it stores all the generated shapes allShapes.clear(); - - for(Entry> entry: config.getActiveInstances().entrySet() ) { + + Iterator>> itr = config.getActiveInstances().entrySet().iterator(); + while (itr.hasNext()) { + Entry> entry = itr.next(); final RocketComponent comp = entry.getKey(); // Only draw podsets when they are selected