From 52c8fac4548886a4930a5e70170fc3ddb777c6ae Mon Sep 17 00:00:00 2001 From: SiboVG Date: Thu, 23 Mar 2023 01:40:28 +0100 Subject: [PATCH] Use LinkedList instead of ArrayList to keep body tube order --- .../openrocket/file/rasaero/importt/RecoveryHandler.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/RecoveryHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/RecoveryHandler.java index 8748255ce..b79ccbc57 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/RecoveryHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/RecoveryHandler.java @@ -1,7 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; import net.sf.openrocket.aerodynamics.WarningSet; -import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; import net.sf.openrocket.file.simplesax.PlainTextHandler; @@ -11,16 +10,13 @@ import net.sf.openrocket.rocketcomponent.DeploymentConfiguration; import net.sf.openrocket.rocketcomponent.Parachute; import net.sf.openrocket.rocketcomponent.RecoveryDevice; import net.sf.openrocket.rocketcomponent.Rocket; -import net.sf.openrocket.rocketcomponent.RocketComponent; -import net.sf.openrocket.rocketcomponent.Streamer; import net.sf.openrocket.rocketcomponent.position.AxialMethod; import org.xml.sax.SAXException; -import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; /** * Handles importing the RASAero recovery settings to an OpenRocket recovery device. @@ -377,7 +373,7 @@ public class RecoveryHandler extends AbstractElementHandler { private List getBodyTubesInStage(AxialStage stage) { // Get all body tubes - List bodyTubes = new ArrayList<>(); + List bodyTubes = new LinkedList<>(); for (int i = 0; i < stage.getChildCount(); i++) { if (stage.getChild(i) instanceof BodyTube) { bodyTubes.add((BodyTube) stage.getChild(i));