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

Added support for Manufacturer and ComponentPreset.Type.

Browse Source
This commit is contained in:
Kevin Ruland 2012-04-02 20:05:18 +00:00
parent 871ff23523
commit 340bf068ce
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/net/sf/openrocket/preset/TypedKey.java
View File

@ -2,6 +2,7 @@ package net.sf.openrocket.preset;
import net.sf.openrocket.database.Databases; import net.sf.openrocket.database.Databases;
import net.sf.openrocket.material.Material; import net.sf.openrocket.material.Material;
import net.sf.openrocket.motor.Manufacturer;
import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish; import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
@ -34,33 +35,41 @@ public class TypedKey<T> {
return unitGroup; return unitGroup;
} }
public Object parseFromString(String value) { public Object parseFromString( String value ) {
if (type.equals(Boolean.class)) { if ( type.equals(Manufacturer.class)) {
Manufacturer m = Manufacturer.getManufacturer(value);
return m;
}
if ( type.equals(ComponentPreset.Type.class) ) {
ComponentPreset.Type t = ComponentPreset.Type.valueOf(value);
return t;
}
if ( type.equals(Boolean.class) ) {
return Boolean.parseBoolean(value); return Boolean.parseBoolean(value);
} }
if (type.isAssignableFrom(Double.class)) { if ( type.isAssignableFrom(Double.class) ) {
return Double.parseDouble(value); return Double.parseDouble(value);
} }
if (type.equals(String.class)) { if ( type.equals(String.class ) ) {
return value; return value;
} }
if (type.equals(Finish.class)) { if ( type.equals(Finish.class) ) {
return Finish.valueOf(value); return Finish.valueOf(value);
} }
if (type.equals(Material.class)) { if ( type.equals(Material.class) ) {
// need to translate the value first! // need to translate the value first!
String translated_value = Application.getTranslator().get(value); String translated_value = Application.getTranslator().get(value);
Material material; Material material;
material = Databases.findMaterial(Material.Type.BULK, translated_value); material = Databases.findMaterial(Material.Type.BULK, translated_value);
if (material != null) { if ( material != null ) {
return material; return material;
} }
material = Databases.findMaterial(Material.Type.LINE, translated_value); material = Databases.findMaterial(Material.Type.LINE, translated_value);
if (material != null) { if ( material != null ) {
return material; return material;
} }
material = Databases.findMaterial(Material.Type.SURFACE, translated_value); material = Databases.findMaterial(Material.Type.SURFACE, translated_value);
if (material != null) { if ( material != null ) {
return material; return material;
} }
throw new IllegalArgumentException("Invalid material " + value + " in component preset."); throw new IllegalArgumentException("Invalid material " + value + " in component preset.");