Added conversion constructor from List<Material>.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@763 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/core/src/net/sf/openrocket/preset/loader/MaterialHolder.java b/core/src/net/sf/openrocket/preset/loader/MaterialHolder.java
index 52d5a9316e327189f3cb48ba408cbf29c0b6a0ae..5c6d9d4881d0874b87aa0419748e163c38e5d93f 100644 (file)
--- a/core/src/net/sf/openrocket/preset/loader/MaterialHolder.java
+++ b/core/src/net/sf/openrocket/preset/loader/MaterialHolder.java
@@ -3,6 +3,7 @@ package net.sf.openrocket.preset.loader;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 
 import net.sf.openrocket.database.Database;
@@ -17,6 +18,17 @@ public class MaterialHolder {
 
        private final Map<String, Material.Line> lineMaterials = new HashMap<String,Material.Line>();
 
+       public MaterialHolder() {}
+       
+       public MaterialHolder( List<Material> materials ) {
+               if (materials == null) {
+                       return;
+               }
+               for (Material material : materials) {
+                       this.put(material);
+               }
+       }
+       
        public void put( Material material ) {
                switch ( material.getType() ) {
                case BULK: