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

Hack for working around unknown materials. Need to address the FIXME

Browse Source
This commit is contained in:
Kevin Ruland 2012-04-18 19:48:56 +00:00
parent ce543e485e
commit 21a835ddd1
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/net/sf/openrocket/file/preset/ColumnDefinition.java
View File

@ -52,7 +52,14 @@ public class ColumnDefinition<T> {
String translated_value = Application.getTranslator().get("Databases.materials.Paperoffice"); String translated_value = Application.getTranslator().get("Databases.materials.Paperoffice");
return getMaterialFor(translated_value); return getMaterialFor(translated_value);
} }
throw new IllegalArgumentException("Invalid material " + value + " in component preset."); try {
return getMaterialFor(value);
}
catch (IllegalArgumentException ex ) {
// FIXME - what can we do if the material in the file is not defined?
Material m = new Material.Bulk(value, 0, true);
return m;
}
} }
if ( type.equals(Shape.class) ) { if ( type.equals(Shape.class) ) {
//FIXME - ignore case! //FIXME - ignore case!