From f82fef44d7ab8188c6d89ba208b79549764b082e Mon Sep 17 00:00:00 2001
From: Joe Pfeiffer <joseph@pfeifferfamily.net>
Date: Fri, 1 Jun 2018 09:23:05 -0600
Subject: [PATCH] Fix Configuration name in motor configuration panel.

Formerly just used delay value directly, resulting in huge delay for
plugged motors; now uses motor.getDesignation so it translates to "P" as
expected.

Changed name of toMotorDesription method to toMotorDesignation to match
usage of getDesignation() in ThrustCurveMotor.java

Changed toMotorDesignation to use motor.getDesignation
---
 core/src/net/sf/openrocket/motor/MotorConfiguration.java  | 8 ++++----
 .../net/sf/openrocket/motor/MotorConfigurationSet.java    | 2 +-
 .../openrocket/rocketcomponent/FlightConfiguration.java   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/net/sf/openrocket/motor/MotorConfiguration.java b/core/src/net/sf/openrocket/motor/MotorConfiguration.java
index c7c12b11e..4920a9421 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 toMotorDescription(){
+	public String toMotorDesignation(){
 		if( motor == null ){
 			return trans.get("empty");
 		}else{
-			return this.motor.getDesignation() + "-" + (int)this.getEjectionDelay();
+			return this.motor.getDesignation(this.getEjectionDelay());
 		}
 	}
 	
@@ -235,7 +235,7 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
 	}
 
 	public String toDescription(){
-		return ( this.toMotorDescription()+
+		return ( this.toMotorDesignation()+
 				" in: "+mount.getDebugName()+
 				" ign@: "+this.toIgnitionDescription() );
 	}
@@ -251,7 +251,7 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
 				mount.getDebugName(),
 				fcid.toShortKey(),
 				mid.toDebug(),
-				toMotorDescription(),
+				toMotorDesignation(),
 				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 78d1d9d69..0a28467f7 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.toMotorDescription(),
+					curConfig.toMotorDesignation(),
 					curConfig.toIgnitionDescription() ));
 						
 		}
diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index b2079c153..651e24296 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -307,7 +307,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 				}
 				
 				if( ! motorConfig.isEmpty()){
-					buff.append( motorConfig.toMotorDescription());
+					buff.append(motorConfig.toMotorDesignation());
 					++activeMotorCount;
 				}
 			}