hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjusted getName() method to be more descriptive

Browse Source
This commit is contained in:
Daniel_M_Williams 2016-01-01 17:02:34 -05:00
parent 513e74fd15
commit 96f2cc048b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
View File

@ -29,6 +29,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
private static final Logger log = LoggerFactory.getLogger(FlightConfiguration.class); private static final Logger log = LoggerFactory.getLogger(FlightConfiguration.class);
public final static String DEFAULT_CONFIGURATION_NAME = "Default Configuration"; public final static String DEFAULT_CONFIGURATION_NAME = "Default Configuration";
public final static String NO_MOTORS_TEXT = "(No Motors Defined)";
protected boolean isNamed = false; protected boolean isNamed = false;
protected String configurationName; protected String configurationName;
@ -303,14 +304,14 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
return configurationName; return configurationName;
}else{ }else{
if( this.hasMotors()){ if( this.hasMotors()){
return fcid.toDebug()+" - "+this.getOnelineMotorDescription(); return this.getOneLineMotorDescription();
}else{ }else{
return fcid.getFullKeyText(); return NO_MOTORS_TEXT ;
} }
} }
} }
public String getOnelineMotorDescription(){ private String getOneLineMotorDescription(){
StringBuilder buff = new StringBuilder("["); StringBuilder buff = new StringBuilder("[");
boolean first = true; boolean first = true;
int activeMotorCount = 0; int activeMotorCount = 0;
@ -516,7 +517,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
public String toDebug() { public String toDebug() {
return this.fcid.toDebug()+" (#"+instanceNumber+")"; return this.fcid.toDebug()+" (#"+instanceNumber+") "+ getOneLineMotorDescription();
} }
// DEBUG / DEVEL // DEBUG / DEVEL