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

diff --git a/core/src/net/sf/openrocket/file/preset/ColumnDefinition.java b/core/src/net/sf/openrocket/file/preset/ColumnDefinition.java
index e58a042b0067f95dfa3b02a18670be802009e98f..69286427a7b604239a05eba1689836594d5eb27f 100644 (file)
--- 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<T> {
                                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!