From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Wed, 6 Jun 2012 17:56:32 +0000 (+0000)
Subject: Added conversion constructor from List<Material>.
X-Git-Tag: upstream/12.09^2~195
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=5b6b2be99a43b416f1c67fc8adb4f54b3d0aeceb;p=debian%2Fopenrocket

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 52d5a931..5c6d9d48 100644
--- 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: