From d6482a5be5542839c2560928d343f7a354ccc1f9 Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Tue, 24 Aug 2021 14:34:55 -0600 Subject: [PATCH] Use motor common name instead of designation in MotorConfigurationPanel --- core/src/net/sf/openrocket/motor/MotorConfiguration.java | 8 ++++---- .../net/sf/openrocket/motor/MotorConfigurationSet.java | 2 +- .../openrocket/rocketcomponent/FlightConfiguration.java | 2 +- .../main/flightconfigpanel/MotorConfigurationPanel.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/net/sf/openrocket/motor/MotorConfiguration.java b/core/src/net/sf/openrocket/motor/MotorConfiguration.java index 4920a9421..25b6f8593 100644 --- a/core/src/net/sf/openrocket/motor/MotorConfiguration.java +++ b/core/src/net/sf/openrocket/motor/MotorConfiguration.java @@ -62,11 +62,11 @@ public class MotorConfiguration implements FlightConfigurableParameter throw new NullPointerException("Motor has a null mount... this should never happen: "+curMotorInstance.getID()); } - String str = motor.getDesignation(curMotorInstance.getEjectionDelay()); + String str = motor.getCommonName(curMotorInstance.getEjectionDelay()); int count = mount.getInstanceCount(); if (count > 1) { str = "" + count + Chars.TIMES + " " + str;