From f38c8a48c959ff77ad4507f9c5583079f5fac03b Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Tue, 14 Feb 2023 04:59:44 +0000
Subject: [PATCH] Use proper substitutor for flight config name

---
 .../rocketcomponent/FlightConfiguration.java  | 36 +++----------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index 889d0f6d7..1b2ec0f0d 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import net.sf.openrocket.formatting.RocketDescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,6 +37,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 
     private String configurationName;
 	public static String DEFAULT_CONFIG_NAME = "[{motors}]";
+	private final RocketDescriptor descriptor = Application.getInjector().getInstance(RocketDescriptor.class);
 	
 	protected final Rocket rocket;
 	protected final FlightConfigurationId fcid;
@@ -566,9 +568,9 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 	 */
 	public String getName() {
 		if (configurationName == null) {
-			return getOneLineMotorDescription();
+			configurationName = DEFAULT_CONFIG_NAME;
 		}
-		return configurationName.replace(DEFAULT_CONFIG_NAME, getOneLineMotorDescription());
+		return descriptor.format(configurationName, rocket, fcid);
 	}
 
 	/**
@@ -582,34 +584,6 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 		}
 		return configurationName;
 	}
-	
-	private String getOneLineMotorDescription(){
-		StringBuilder buff = new StringBuilder("[");
-		boolean first = true;
-		int activeMotorCount = 0;
-		for ( RocketComponent comp : getActiveComponents() ){
-			if (( comp instanceof MotorMount )&&( ((MotorMount)comp).isMotorMount())){ 
-				MotorMount mount = (MotorMount)comp;
-				MotorConfiguration motorConfig = mount.getMotorConfig( fcid);
-				
-				if( first ){
-					first = false;
-				}else{
-					buff.append(";");
-				}
-				
-				if( ! motorConfig.isEmpty()){
-					buff.append(motorConfig.toMotorCommonName());
-					++activeMotorCount;
-				}
-			}
-		}
-		if( 0 == activeMotorCount ){
-			return trans.get("noMotors");
-		}
-		buff.append("]");
-		return buff.toString();
-	}
 
 	@Override
 	public String toString() { return this.getName(); }
@@ -932,7 +906,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 	}
 	
 	public String toDebug() {
-		return this.fcid.toDebug()+" (#"+configurationInstanceId+") "+ getOneLineMotorDescription();
+		return this.fcid.toDebug()+" (#"+configurationInstanceId+") "+ getName();
 	}
 	
 	// DEBUG / DEVEL