From 4c8aaee8a8b61242c9368502b5f48bc2c70d922c Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 9 Nov 2022 13:52:42 +0100 Subject: [PATCH] Replace override parent search with overriddenBy object --- .../gui/configdialog/RocketComponentConfig.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java index 039fcd661..c9f17ee38 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java @@ -235,11 +235,9 @@ public class RocketComponentConfig extends JPanel { overridetext = trans.get("RocketCompCfg.lbl.overriddento") + " " + UnitGroup.UNITS_MASS.getDefaultUnit(). toStringUnit(component.getOverrideMass()) + ")"; } - - for (RocketComponent c = component.getParent(); c != null; c = c.getParent()) { - if (c.isMassOverridden() && c.isSubcomponentsOverriddenMass()) { - overridetext = trans.get("RocketCompCfg.lbl.overriddenby") + " " + c.getName() + ")"; - } + + if (component.getMassOverriddenBy() != null) { + overridetext = trans.get("RocketCompCfg.lbl.overriddenby") + " " + component.getMassOverriddenBy().getName() + ")"; } if (overridetext != null) {