From d6482a5be5542839c2560928d343f7a354ccc1f9 Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
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<MotorConf
 		return ignitionOveride;
 	}
 
-	public String toMotorDesignation(){
+	public String toMotorCommonName(){
 		if( motor == null ){
 			return trans.get("empty");
 		}else{
-			return this.motor.getDesignation(this.getEjectionDelay());
+			return this.motor.getCommonName(this.getEjectionDelay());
 		}
 	}
 	
@@ -235,7 +235,7 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
 	}
 
 	public String toDescription(){
-		return ( this.toMotorDesignation()+
+		return ( this.toMotorCommonName()+
 				" in: "+mount.getDebugName()+
 				" ign@: "+this.toIgnitionDescription() );
 	}
@@ -251,7 +251,7 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
 				mount.getDebugName(),
 				fcid.toShortKey(),
 				mid.toDebug(),
-				toMotorDesignation(),
+				toMotorCommonName(),
 				toIgnitionDescription() ));
 		
 		return buf.toString();
diff --git a/core/src/net/sf/openrocket/motor/MotorConfigurationSet.java b/core/src/net/sf/openrocket/motor/MotorConfigurationSet.java
index 0a28467f7..c908a4fc7 100644
--- a/core/src/net/sf/openrocket/motor/MotorConfigurationSet.java
+++ b/core/src/net/sf/openrocket/motor/MotorConfigurationSet.java
@@ -58,7 +58,7 @@ public class MotorConfigurationSet extends FlightConfigurableParameterSet<MotorC
 					loopFCID.toShortKey(),
 					curConfig.getFCID().toShortKey(),
 					curConfig.getMID().toShortKey(),
-					curConfig.toMotorDesignation(),
+					curConfig.toMotorCommonName(),
 					curConfig.toIgnitionDescription() ));
 						
 		}
diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index b131bec1e..e1fbfef99 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -441,7 +441,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 				}
 				
 				if( ! motorConfig.isEmpty()){
-					buff.append(motorConfig.toMotorDesignation());
+					buff.append(motorConfig.toMotorCommonName());
 					++activeMotorCount;
 				}
 			}
diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
index 974c9d794..0cc61a925 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
@@ -291,7 +291,7 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
 				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;