From e49c6a1481887ab499e49f664bf79e708d85bf41 Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Wed, 6 Jun 2012 17:56:32 +0000 Subject: [PATCH] Added conversion constructor from List. --- .../sf/openrocket/preset/loader/MaterialHolder.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/core/src/net/sf/openrocket/preset/loader/MaterialHolder.java b/core/src/net/sf/openrocket/preset/loader/MaterialHolder.java index 52d5a9316..5c6d9d488 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 lineMaterials = new HashMap(); + public MaterialHolder() {} + + public MaterialHolder( List materials ) { + if (materials == null) { + return; + } + for (Material material : materials) { + this.put(material); + } + } + public void put( Material material ) { switch ( material.getType() ) { case BULK: