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

[Bugfix] Refactored FlightConfigurationID to UUID directly

Browse Source
This commit is contained in:
Daniel_M_Williams 2015-10-23 18:16:24 -04:00
parent d977733cf5
commit 035427fd5b
3 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,12 +347,25 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
@Override @Override
public String toString() { public String toString() {
if( this.overrideName){ if( this.overrideName){
return this.fcid.key; return fcid.getFullKey();
}else{ }else{
return this.getName() + "["+this.fcid.getShortKey()+"]"; return configurationName + "["+fcid.getShortKey()+"]";
} }
} }
public boolean isNameOverridden(){
return overrideName;
}
public String getName() {
if( overrideName ){
return configurationName;
}else{
return fcid.getFullKey();
}
}
// DEBUG / DEVEL // DEBUG / DEVEL
public String toDebug() { public String toDebug() {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
@ -477,16 +490,4 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
this.configurationName = newName; this.configurationName = newName;
} }
public boolean isNameOverridden(){
return this.overrideName;
}
public String getName() {
if( overrideName ){
return this.configurationName;
}else{
return fcid.key;
}
}
} }

59
core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationID.java
View File

@ -8,37 +8,30 @@ import java.util.UUID;
* straight-up <code>String</code> Key in previous implementations. * straight-up <code>String</code> Key in previous implementations.
*/ */
public final class FlightConfigurationID implements Comparable<FlightConfigurationID> { public final class FlightConfigurationID implements Comparable<FlightConfigurationID> {
final public String key; final public UUID key;
private final static String ERROR_CONFIGURATION_KEYTEXT = "error_key_2489"; private final static long DEFAULT_MOST_SIG_BITS = 0xF4F2F1F0;
private final static UUID ERROR_CONFIGURATION_UUID = new UUID( DEFAULT_MOST_SIG_BITS, 2489);
// private final static String DEFAULT_CONFIGURATION_KEYTEXT = "default_configuration_6602"; // private final static String DEFAULT_CONFIGURATION_KEYTEXT = "default_configuration_6602";
private final static String DEFAULT_VALUE_KEYTEXT = "default_value_5676"; private final static UUID DEFAULT_VALUE_UUID = new UUID( DEFAULT_MOST_SIG_BITS, 5676);
public final static FlightConfigurationID ERROR_CONFIGURATION_FCID = new FlightConfigurationID( FlightConfigurationID.ERROR_CONFIGURATION_KEYTEXT); public final static FlightConfigurationID ERROR_CONFIGURATION_FCID = new FlightConfigurationID( FlightConfigurationID.ERROR_CONFIGURATION_UUID);
// public final static FlightConfigurationID DEFAULT_CONFIGURATION_FCID = new FlightConfigurationID( FlightConfigurationID.DEFAULT_CONFIGURATION_KEYTEXT ); // public final static FlightConfigurationID DEFAULT_CONFIGURATION_FCID = new FlightConfigurationID( FlightConfigurationID.DEFAULT_CONFIGURATION_KEYTEXT );
public final static FlightConfigurationID DEFAULT_VALUE_FCID = new FlightConfigurationID( FlightConfigurationID.DEFAULT_VALUE_KEYTEXT ); public final static FlightConfigurationID DEFAULT_VALUE_FCID = new FlightConfigurationID( FlightConfigurationID.DEFAULT_VALUE_UUID );
public FlightConfigurationID() { public FlightConfigurationID() {
this(UUID.randomUUID().toString()); this(UUID.randomUUID());
} }
public FlightConfigurationID(final String _val) { public FlightConfigurationID(final String _str) {
if (null == _val){ this.key = UUID.fromString( _str);
this.key = FlightConfigurationID.ERROR_CONFIGURATION_KEYTEXT; }
}else if (5 >_val.length()){
this.key = FlightConfigurationID.ERROR_CONFIGURATION_KEYTEXT;
} else {
// vv temp vv
String temp_val = _val;
final String extra = "key: ";
if( _val.contains(extra)){
int index = temp_val.lastIndexOf(extra);
temp_val = _val.substring(index+extra.length());
System.err.println(" correcting FCID from \""+_val+"\" to \""+temp_val+"\".");
}
// ^^ temp ^^
this.key = temp_val; public FlightConfigurationID(final UUID _val) {
if (null == _val){
this.key = FlightConfigurationID.ERROR_CONFIGURATION_UUID;
} else {
this.key = _val;
} }
} }
@ -53,7 +46,11 @@ public final class FlightConfigurationID implements Comparable<FlightConfigurati
} }
public String getShortKey(){ public String getShortKey(){
return this.key.substring(0,8); return this.key.toString().substring(0,8);
}
public String getFullKey(){
return this.key.toString();
} }
@Override @Override
@ -61,25 +58,17 @@ public final class FlightConfigurationID implements Comparable<FlightConfigurati
return this.key.hashCode(); return this.key.hashCode();
} }
public String intern() { public UUID intern() {
return this.key.intern(); return this.key;
} }
public boolean isValid() { public boolean isValid() {
if (this.key.intern() == FlightConfigurationID.ERROR_CONFIGURATION_KEYTEXT) { return (this.key != ERROR_CONFIGURATION_UUID);
return false;
}
return true;
}
public int length() {
return this.key.length();
} }
@Override @Override
public String toString() { public String toString() {
return this.key; return this.key.toString();
} }
@Override @Override

1
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java
View File

@ -145,7 +145,6 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
((FlightConfigurableComponent) c).cloneFlightConfiguration(oldId, newId); ((FlightConfigurableComponent) c).cloneFlightConfiguration(oldId, newId);
} }
} }
newConfig.setName( newId.key );
rocket.setFlightConfiguration(newId, newConfig); rocket.setFlightConfiguration(newId, newConfig);
// Create a new simulation for this configuration. // Create a new simulation for this configuration.