From bf61c548647357f96446d116416a2e636185a02a Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Wed, 18 Apr 2012 19:48:56 +0000 Subject: [PATCH] Hack for working around unknown materials. Need to address the FIXME git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@569 180e2498-e6e9-4542-8430-84ac67f01cd8 --- .../net/sf/openrocket/file/preset/ColumnDefinition.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/net/sf/openrocket/file/preset/ColumnDefinition.java b/core/src/net/sf/openrocket/file/preset/ColumnDefinition.java index e58a042b..69286427 100644 --- a/core/src/net/sf/openrocket/file/preset/ColumnDefinition.java +++ b/core/src/net/sf/openrocket/file/preset/ColumnDefinition.java @@ -52,7 +52,14 @@ public class ColumnDefinition { String translated_value = Application.getTranslator().get("Databases.materials.Paperoffice"); 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) ) { //FIXME - ignore case! -- 2.47.2